Skip to content

Fix diagnostics not appearing when semantic tokens are disabled (#7477) #7532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
csyonghe merged 5 commits into from
Jul 2, 2025
Merged

Fix diagnostics not appearing when semantic tokens are disabled (#7477) #7532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c95563b
Fix diagnostics not appearing when semantic tokens are disabled (#7477)
szihs Jun 25, 2025
187a772
Revert: Remove unrelated change - will pick up in seprate PR
szihs Jun 26, 2025
2543f3e
Fix module state corruption when checkAllTranslationUnits throws
szihs Jun 27, 2025
cdc00be
Update to address review comments
szihs Jun 30, 2025
3463127
update: remove explicit checking for .slang and .hlsl
szihs Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions source/slang/slang-language-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,14 @@ SlangResult LanguageServerCore::didOpenTextDocument(const DidOpenTextDocumentPar
{
String canonicalPath = uriToCanonicalPath(args.textDocument.uri);
m_workspace->openDoc(canonicalPath, args.textDocument.text);

auto version = m_workspace->getCurrentVersion();
Module* parsedModule = version->getOrLoadModule(canonicalPath);
if (!parsedModule)
{
return SLANG_FAIL;
}

return SLANG_OK;
}

Expand Down Expand Up @@ -2605,6 +2613,14 @@ SlangResult LanguageServerCore::didChangeTextDocument(const DidChangeTextDocumen
String canonicalPath = uriToCanonicalPath(args.textDocument.uri);
for (auto change : args.contentChanges)
m_workspace->changeDoc(canonicalPath, change.range, change.text);

auto version = m_workspace->getCurrentVersion();
Module* parsedModule = version->getOrLoadModule(canonicalPath);
if (!parsedModule)
{
return SLANG_FAIL;
}

return SLANG_OK;
}

Expand Down
14 changes: 12 additions & 2 deletions source/slang/slang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4161,8 +4161,18 @@ void Linkage::loadParsedModule(
auto sink = translationUnit->compileRequest->getSink();

int errorCountBefore = sink->getErrorCount();
compileRequest->checkAllTranslationUnits();
int errorCountAfter = sink->getErrorCount();
int errorCountAfter;
try
{
compileRequest->checkAllTranslationUnits();
}
catch (...)
{
mapPathToLoadedModule.remove(mostUniqueIdentity);
mapNameToLoadedModules.remove(name);
throw;
}
errorCountAfter = sink->getErrorCount();
if (isInLanguageServer())
{
// Don't generate IR as language server.
Expand Down
Loading