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 · 4f4df61 · 4f4df61
1 parent bd549b4
commit 4f4df61
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 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());
         }
     }
 

diff --git a/...va/com/redhat/devtools/intellij/lsp4mp4ij/classpath/ClasspathResourceChangedNotifier.java b/...va/com/redhat/devtools/intellij/lsp4mp4ij/classpath/ClasspathResourceChangedNotifier.java
@@ -35,7 +35,7 @@
 /**
  * Source file change notifier with a debounce mode.
  */
-public class ClasspathResourceChangedNotifier implements Disposable  {
+public class ClasspathResourceChangedNotifier implements Disposable {
 
     private static final long DEBOUNCE_DELAY = 1000;
 
@@ -46,7 +46,8 @@ public class ClasspathResourceChangedNotifier implements Disposable  {
 
     private final Set<Pair<VirtualFile, Module>> sourceFiles;
     private boolean librariesChanged;
-private final List<RunnableProgress> processBeforeLibrariesChanged;
+    private final List<RunnableProgress> processBeforeLibrariesChanged;
+    private boolean disposed;
 
     public ClasspathResourceChangedNotifier(Project project, List<RunnableProgress> preprocessors) {
         this.project = project;
@@ -74,6 +75,9 @@ public synchronized void addSourceFile(Pair<VirtualFile, Module> pair) {
     }
 
     private void asyncNotifyChanges() {
+        if (isDisposed()) {
+            return;
+        }
         if (ApplicationManager.getApplication().isUnitTestMode()) {
             notifyChanges();
         } else {
@@ -93,6 +97,9 @@ public void run() {
     }
 
     private void notifyChanges() {
+        if (isDisposed()) {
+            return;
+        }
         synchronized (sourceFiles) {
             // Java, config sources files has changed
             project.getMessageBus().syncPublisher(ClasspathResourceChangedManager.TOPIC).sourceFilesChanged(sourceFiles);
@@ -121,8 +128,7 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
                                 for (var runnable : processBeforeLibrariesChanged) {
                                     runnable.run(progressIndicator);
                                 }
-                            }
-                            finally {
+                            } finally {
                                 // Send the libraries changed event
                                 project.getMessageBus().syncPublisher(ClasspathResourceChangedManager.TOPIC).librariesChanged();
                                 librariesChanged = false;
@@ -134,12 +140,17 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
         }
     }
 
+    public boolean isDisposed() {
+        return disposed;
+    }
+
     @Override
     public void dispose() {
+        this.disposed = true;
         if (debounceTask != null) {
             debounceTask.cancel();
         }
-        if(debounceTimer != null) {
+        if (debounceTimer != null) {
             debounceTimer.cancel();
         }
     }