Use lastTreeWithoutErrors for calculating code lenses (#673)

PieterOlivier · web-flow · commit 7f0fd7d3ab5b · 2025-07-07T15:20:29.000Z
diff --git a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/TextDocumentState.java b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/TextDocumentState.java
@@ -166,11 +166,11 @@ private void parse() {
                         treeAsync.completeExceptionally(e);
                     } else {
                         var tree = new Versioned<>(version, t, timestamp);
-                        treeAsync.complete(tree);
                         Versioned.replaceIfNewer(last, tree);
                         if (diagnosticsList.isEmpty()) {
                             Versioned.replaceIfNewer(lastWithoutErrors, tree);
                         }
+                        treeAsync.complete(tree);
                     }
 
                     // Complete future to get diagnostics
diff --git a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java
@@ -541,6 +541,8 @@ public CompletableFuture<List<? extends CodeLens>> codeLens(CodeLensParams param
                 }
                 return r;
             })
+            // Replace with the last tree without errors, might be the same as `tree` if the parse succeeded without any error recovery
+            .thenApply(tree -> f.getLastTreeWithoutErrors())
             .thenApply(Versioned::get)
             .thenApplyAsync(rascalServices::locateCodeLenses, ownExecuter)
             .thenApply(List::stream)

Original file line number	Diff line number	Diff line change
`@@ -166,11 +166,11 @@ private void parse() {`
`166`	`166`	`treeAsync.completeExceptionally(e);`
`167`	`167`	`} else {`
`168`	`168`	`var tree = new Versioned<>(version, t, timestamp);`
`169`		`- treeAsync.complete(tree);`
`170`	`169`	`Versioned.replaceIfNewer(last, tree);`
`171`	`170`	`if (diagnosticsList.isEmpty()) {`
`172`	`171`	`Versioned.replaceIfNewer(lastWithoutErrors, tree);`
`173`	`172`	`}`
	`173`	`+ treeAsync.complete(tree);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// Complete future to get diagnostics`
Original file line number	Diff line number	Diff line change
`@@ -541,6 +541,8 @@ public CompletableFuture<List<? extends CodeLens>> codeLens(CodeLensParams param`
`541`	`541`	`}`
`542`	`542`	`return r;`
`543`	`543`	`})`
	`544`	+ // Replace with the last tree without errors, might be the same as `tree` if the parse succeeded without any error recovery
	`545`	`+ .thenApply(tree -> f.getLastTreeWithoutErrors())`
`544`	`546`	`.thenApply(Versioned::get)`
`545`	`547`	`.thenApplyAsync(rascalServices::locateCodeLenses, ownExecuter)`
`546`	`548`	`.thenApply(List::stream)`