Improved code quality

usethesource · Mar 1, 2024 · f8bfdf0 · f8bfdf0
1 parent fcd9496
commit f8bfdf0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/model/ParametricFileFacts.java b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/model/ParametricFileFacts.java
@@ -120,7 +120,7 @@ public <T> CompletableFuture<List<T>> extractFromSummaries(
             ISourceLocation file, CompletableFuture<Versioned<ITree>> tree,
             Function<Summary, @Nullable Supplier<InterruptibleFuture<List<T>>>> extractor) {
 
-        return getFile(file).extractFromSummaries(tree, extractor::apply);
+        return getFile(file).extractFromSummaries(tree, extractor);
     }
 
     public void close(ISourceLocation loc) {
@@ -186,17 +186,17 @@ private <T> void reportDiagnostics(AtomicReference<Versioned<T>> current, int ve
 
         public void invalidateAnalyzer(boolean isClosing) {
             analyzer.invalidate(isClosing);
-            invalidate(latestAnalyzerAnalysis);
+            invalidate(latestAnalyzerAnalysis, isClosing);
         }
 
         public void invalidateBuilder(boolean isClosing) {
             builder.invalidate(isClosing);
-            invalidate(latestBuilderAnalysis);
-            invalidate(latestBuilderBuild);
+            invalidate(latestBuilderAnalysis, isClosing);
+            invalidate(latestBuilderBuild, isClosing);
         }
 
-        private void invalidate(@Nullable CompletableFuture<Versioned<Summary>> summary) {
-            if (summary != null) {
+        private void invalidate(@Nullable CompletableFuture<Versioned<Summary>> summary, boolean isClosing) {
+            if (summary != null && !isClosing) {
                 summary
                     .thenApply(Versioned<Summary>::get)
                     .thenAccept(Summary::invalidate);

diff --git a/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/model/Summary.java b/rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/model/Summary.java
@@ -74,6 +74,8 @@ public interface Summary {
     @Nullable InterruptibleFuture<List<Diagnostic>> getMessages();
     void invalidate();
 
+    // TODO: Check if getMessages can be non-nullable
+
     static final Summary NULL_SUMMARY = new Summary() {
         @Override
         public @Nullable Supplier<InterruptibleFuture<List<Either<String, MarkedString>>>> getDocumentation(Position cursor) {