Skip to content

Clearing diagnostics of transient files after a close event by mimicking a delete #902

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
DavyLandman merged 5 commits into from
Nov 26, 2025
Merged

Clearing diagnostics of transient files after a close event by mimicking a delete #902

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
c9a2cd4
Clearing diagnostics of transient files after a close event by mimick…
rodinaarssen Nov 26, 2025
054f585
Fixed member name
rodinaarssen Nov 26, 2025
a7d62c7
Clearing diagnostics of transient Rascal files after a close event by…
rodinaarssen Nov 26, 2025
3627086
Restored debug print
rodinaarssen Nov 26, 2025
f26917d
Merge branch 'main' into fix-clearing-unknown-files
DavyLandman Nov 26, 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
10 changes: 9 additions & 1 deletion ...-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/ParametricTextDocumentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import org.eclipse.lsp4j.DocumentSymbol;
import org.eclipse.lsp4j.DocumentSymbolParams;
import org.eclipse.lsp4j.ExecuteCommandOptions;
import org.eclipse.lsp4j.FileDelete;
import org.eclipse.lsp4j.FileRename;
import org.eclipse.lsp4j.FoldingRange;
import org.eclipse.lsp4j.FoldingRangeRequestParams;
Expand Down Expand Up @@ -335,14 +336,21 @@ public void didClose(DidCloseTextDocumentParams params) {
throw new ResponseErrorException(unknownFileError(loc, params));
}
facts(loc).close(loc);
exec.execute(() -> {
// If the closed file no longer exists (e.g., if an untitled file is closed without ever having been saved),
// we mimic a delete event to ensure all diagnostics are cleared.
if (!URIResolverRegistry.getInstance().exists(loc)) {
didDeleteFiles(new DeleteFilesParams(List.of(new FileDelete(params.getTextDocument().getUri()))));
}
});
}

@Override
public void didDeleteFiles(DeleteFilesParams params) {
exec.submit(() -> {
// if a file is deleted, and we were tracking it, we remove our diagnostics
for (var f : params.getFiles()) {
if (isLanguageRegistered(URIUtil.assumeCorrectLocation(f.getUri()))) {
if (isLanguageRegistered(Locations.toLoc(f.getUri()))) {
availableClient().publishDiagnostics(new PublishDiagnosticsParams(f.getUri(), List.of()));
}
}
Expand Down
14 changes: 11 additions & 3 deletions rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import org.eclipse.lsp4j.DocumentSymbolParams;
import org.eclipse.lsp4j.ExecuteCommandOptions;
import org.eclipse.lsp4j.FileCreate;
import org.eclipse.lsp4j.FileDelete;
import org.eclipse.lsp4j.FoldingRange;
import org.eclipse.lsp4j.FoldingRangeRequestParams;
import org.eclipse.lsp4j.Hover;
Expand Down Expand Up @@ -283,10 +284,17 @@ public void didChange(DidChangeTextDocumentParams params) {
@Override
public void didClose(DidCloseTextDocumentParams params) {
logger.debug("Close: {}", params.getTextDocument());
if (documents.remove(Locations.toLoc(params.getTextDocument())) == null) {
throw new ResponseErrorException(new ResponseError(ResponseErrorCode.InternalError,
"Unknown file: " + Locations.toLoc(params.getTextDocument()), params));
var loc = Locations.toLoc(params.getTextDocument());
if (documents.remove(loc) == null) {
throw new ResponseErrorException(new ResponseError(ResponseErrorCode.InternalError, "Unknown file: " + loc, params));
}
exec.execute(() -> {
// If the closed file no longer exists (e.g., if an untitled file is closed without ever having been saved),
// we mimic a delete event to ensure all diagnostics are cleared.
if (!URIResolverRegistry.getInstance().exists(loc)) {
didDeleteFiles(new DeleteFilesParams(List.of(new FileDelete(params.getTextDocument().getUri()))));
}
});
}

@Override
Expand Down
Loading