Merge pull request #2439 from Haehnchen/feature/access-bundle-lookup

Fix read thread access of bundle files lookup rendering

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundle.java

@@ -16,6 +16,12 @@ public class SymfonyBundle {
     @NotNull
     final private PhpClass phpClass;
 
+    @NotNull
+    final private String phpClassName;
+
+    @NotNull
+    private final String phpClassNameNamespaceName;
+
     @NotNull
     public PhpClass getPhpClass() {
         return this.phpClass;
@@ -28,11 +34,14 @@ public String getNamespaceName() {
 
     @NotNull
     public String getName() {
-        return this.phpClass.getName();
+        return this.phpClassName;
     }
 
     public SymfonyBundle(@NotNull PhpClass phpClass) {
         this.phpClass = phpClass;
+
+        this.phpClassName = this.phpClass.getName();
+        this.phpClassNameNamespaceName = this.phpClass.getNamespaceName();
     }
 
     @Nullable
@@ -41,12 +50,7 @@ public PsiDirectory getDirectory() {
             return null;
         }
 
-        PsiDirectory bundleDirectory = this.phpClass.getContainingFile().getContainingDirectory();
-        if(null == bundleDirectory) {
-            return null;
-        }
-
-        return bundleDirectory;
+        return this.phpClass.getContainingFile().getContainingDirectory();
     }
 
     @Nullable
@@ -78,7 +82,7 @@ public String getRelativePath(@NotNull VirtualFile file) {
     }
 
     public boolean isInBundle(@NotNull PhpClass phpClass) {
-        return phpClass.getNamespaceName().startsWith(this.phpClass.getNamespaceName());
+        return phpClass.getNamespaceName().startsWith(this.phpClassNameNamespaceName);
     }
 
     public boolean isInBundle(@NotNull PsiFile psiFile) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyBundleFileLookupElement.java

@@ -6,17 +6,21 @@
 import com.intellij.codeInsight.lookup.LookupElementPresentation;
 import com.intellij.util.IconUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class SymfonyBundleFileLookupElement extends LookupElement {
-
+    private final @NotNull String bundleName;
     private final BundleFile bundleFile;
     private InsertHandler<LookupElement> insertHandler = null;
+    private final @Nullable String shortcutName;
 
     public SymfonyBundleFileLookupElement(BundleFile bundleFile) {
         this.bundleFile = bundleFile;
+        this.shortcutName = bundleFile.getShortcutPath();
+        this.bundleName = bundleFile.getSymfonyBundle().getName();
     }
 
     public SymfonyBundleFileLookupElement(BundleFile bundleFile, InsertHandler<LookupElement> insertHandler) {
@@ -27,23 +31,21 @@ public SymfonyBundleFileLookupElement(BundleFile bundleFile, InsertHandler<Looku
     @NotNull
     @Override
     public String getLookupString() {
-        String shortcutName = this.bundleFile.getShortcutPath();
-        if(shortcutName == null) {
+        if (shortcutName == null) {
             return "";
         }
 
         // we strip any control char, so only use the pathname
-        if(shortcutName.startsWith("@")) {
-            shortcutName = shortcutName.substring(1);
+        if (shortcutName.startsWith("@")) {
+            return shortcutName.substring(1);
         }
 
         return shortcutName;
     }
 
     @Override
-    public void handleInsert(InsertionContext context) {
-
-        if(this.insertHandler != null) {
+    public void handleInsert(@NotNull InsertionContext context) {
+        if (this.insertHandler != null) {
             this.insertHandler.handleInsert(context, this);
             return;
         }
@@ -53,10 +55,8 @@ public void handleInsert(InsertionContext context) {
 
     public void renderElement(LookupElementPresentation presentation) {
         presentation.setItemText(getLookupString());
-        presentation.setTypeText(this.bundleFile.getSymfonyBundle().getName());
+        presentation.setTypeText(bundleName);
         presentation.setTypeGrayed(true);
         presentation.setIcon(IconUtil.getIcon(this.bundleFile.getVirtualFile(), 0, this.bundleFile.getProject()));
-
     }
-
 }