Ensure check of named scope is run as a read action (#595)

jshiell · Dec 12, 2022 · 5040930 · 5040930
1 parent 655ed64
commit 5040930
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/org/infernus/idea/checkstyle/model/NamedScopeHelper.java b/src/main/java/org/infernus/idea/checkstyle/model/NamedScopeHelper.java
@@ -1,5 +1,6 @@
 package org.infernus.idea.checkstyle.model;
 
+import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.packageDependencies.DependencyValidationManager;
 import com.intellij.psi.PsiFile;
@@ -9,6 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 
 public final class NamedScopeHelper {
@@ -48,13 +50,15 @@ public static NamedScope getDefaultScope(@NotNull final Project project) {
     }
 
     public static boolean isFileInScope(final PsiFile psiFile, @NotNull final NamedScope namedScope) {
-        final PackageSet packageSet = namedScope.getValue();
-        if (packageSet == null) {
-            return true;
-        }
+        return ReadAction.compute(() -> {
+            final PackageSet packageSet = namedScope.getValue();
+            if (packageSet == null) {
+                return true;
+            }
 
-        return packageSet.contains(
-                psiFile,
-                DependencyValidationManager.getInstance(psiFile.getProject()));
+            return packageSet.contains(
+                    psiFile,
+                    DependencyValidationManager.getInstance(psiFile.getProject()));
+        });
     }
 }