#18 prevent access to index while service is dumb

maxfilatov · Jun 5, 2016 · 48bad00 · 48bad00
1 parent 1a4f91b
commit 48bad00
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/phpuaca.iml b/phpuaca.iml
@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
-    <orderEntry type="jdk" jdkName="PhpStorm PS-145.1616.3" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="PhpStorm PS-145.258.2" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="PROVIDED" name="php" level="project" />
     <orderEntry type="library" exported="" scope="PROVIDED" name="php-openapi" level="project" />

diff --git a/src/com/phpuaca/util/PhpClassResolver.java b/src/com/phpuaca/util/PhpClassResolver.java
@@ -1,5 +1,6 @@
 package com.phpuaca.util;
 
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -31,13 +32,15 @@ public PhpClass resolveByClassConstantReference(@NotNull ClassConstantReference
 
     @Nullable
     public PhpClass resolveByClassStringLiteralExpression(@NotNull StringLiteralExpression stringLiteralExpression) {
-        String className = stringLiteralExpression.getContents();
-        if (!className.isEmpty()) {
-            className = className.replace("\\\\", "\\");
-            Project project = stringLiteralExpression.getProject();
-            Collection<PhpClass> phpClasses = PhpIndex.getInstance(project).getAnyByFQN(className);
-            if (!phpClasses.isEmpty()) {
-                return phpClasses.iterator().next();
+        Project project = stringLiteralExpression.getProject();
+        if (!DumbService.getInstance(project).isDumb()) {
+            String className = stringLiteralExpression.getContents();
+            if (!className.isEmpty()) {
+                className = className.replace("\\\\", "\\");
+                Collection<PhpClass> phpClasses = PhpIndex.getInstance(project).getAnyByFQN(className);
+                if (!phpClasses.isEmpty()) {
+                    return phpClasses.iterator().next();
+                }
             }
         }