fix: Too many non-blocking read actions submitted at once in

LSPDiagnosticHandler Fixes redhat-developer#1089 Signed-off-by: azerr <[email protected]>
angelozerr · Aug 10, 2023 · 7b9031d · 7b9031d
1 parent 0f6c2bf
commit 7b9031d
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/...java/com/redhat/devtools/intellij/lsp4ij/operations/diagnostics/LSPDiagnosticHandler.java b/...java/com/redhat/devtools/intellij/lsp4ij/operations/diagnostics/LSPDiagnosticHandler.java
@@ -17,6 +17,7 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
@@ -45,12 +46,21 @@ public LSPDiagnosticHandler(LanguageServerWrapper languageServerWrapper) {
 
     @Override
     public void accept(PublishDiagnosticsParams params) {
+        Project project = languageServerWrapper.getProject();
+        if(project.isDisposed()) {
+            return;
+        }
         if (ApplicationManager.getApplication().isReadAccessAllowed()) {
             updateDiagnostics(params);
         } else {
-            ReadAction.nonBlocking(() -> updateDiagnostics(params))
-                    .submit(AppExecutorUtil.getAppExecutorService());
-
+            var executeInSmartMode = DumbService.getInstance(languageServerWrapper.getProject()).isDumb();
+            var action = ReadAction.nonBlocking(() -> updateDiagnostics(params))
+                    .expireWith(languageServerWrapper)
+                    .coalesceBy(params);
+            if (executeInSmartMode) {
+                action.inSmartMode(project);
+            }
+            action.submit(AppExecutorUtil.getAppExecutorService());
         }
     }