fix: Read access issue in refreshSemanticTokensForAllOpenedFiles

Fixes #413 Signed-off-by: azerr <azerr@redhat.com>
redhat-developer · Jul 7, 2024 · 00fc081 · 00fc081
1 parent 4440c6f
commit 00fc081
Showing 1 changed file with 27 additions and 16 deletions.
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/client/LanguageClientImpl.java b/src/main/java/com/redhat/devtools/lsp4ij/client/LanguageClientImpl.java
@@ -13,11 +13,13 @@
 import com.google.gson.JsonObject;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.concurrency.AppExecutorUtil;
 import com.redhat.devtools.lsp4ij.LSPIJUtils;
 import com.redhat.devtools.lsp4ij.LanguageServerWrapper;
 import com.redhat.devtools.lsp4ij.ServerMessageHandler;
@@ -33,6 +35,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
@@ -141,14 +144,18 @@ public CompletableFuture<Void> refreshInlayHints() {
     }
 
     private void refreshInlayHintsForAllOpenedFiles() {
-        for (var fileData : wrapper.getConnectedFiles()) {
-            VirtualFile file = fileData.getFile();
-            final PsiFile psiFile = LSPIJUtils.getPsiFile(file, project);
-            if (psiFile != null) {
-                Editor[] editors = LSPIJUtils.editorsForFile(file, getProject());
-                InlayHintsFactoryBridge.refreshInlayHints(psiFile, editors, true);
-            }
-        }
+        ReadAction.nonBlocking((Callable<Void>) () -> {
+                    for (var fileData : wrapper.getConnectedFiles()) {
+                        VirtualFile file = fileData.getFile();
+                        final PsiFile psiFile = LSPIJUtils.getPsiFile(file, project);
+                        if (psiFile != null) {
+                            Editor[] editors = LSPIJUtils.editorsForFile(file, getProject());
+                            InlayHintsFactoryBridge.refreshInlayHints(psiFile, editors, true);
+                        }
+                    }
+                    return null;
+                }).coalesceBy(this)
+                .submit(AppExecutorUtil.getAppExecutorService());
     }
 
     @Override
@@ -162,14 +169,18 @@ public CompletableFuture<Void> refreshSemanticTokens() {
     }
 
     private void refreshSemanticTokensForAllOpenedFiles() {
-        for (var fileData : wrapper.getConnectedFiles()) {
-            VirtualFile file = fileData.getFile();
-            final PsiFile psiFile = LSPIJUtils.getPsiFile(file, project);
-            if (psiFile != null) {
-                // Should be enough?
-                DaemonCodeAnalyzer.getInstance(psiFile.getProject()).restart(psiFile);
-            }
-        }
+        ReadAction.nonBlocking((Callable<Void>) () -> {
+                    for (var fileData : wrapper.getConnectedFiles()) {
+                        VirtualFile file = fileData.getFile();
+                        final PsiFile psiFile = LSPIJUtils.getPsiFile(file, project);
+                        if (psiFile != null) {
+                            // Should be enough?
+                            DaemonCodeAnalyzer.getInstance(psiFile.getProject()).restart(psiFile);
+                        }
+                    }
+                    return null;
+                }).coalesceBy(this)
+                .submit(AppExecutorUtil.getAppExecutorService());
     }
 
     @Override