Merge branch '4.2.2-develop' of github.com:magento/magento2-phpstorm-plugin into 620-exclude-test-files-from-search

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/linemarker/SearchGutterIconNavigationHandler.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.linemarker;
+
+import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
+import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator;
+import com.intellij.ide.util.DefaultPsiElementCellRenderer;
+import com.intellij.psi.NavigatablePsiElement;
+import com.intellij.psi.PsiElement;
+import java.awt.event.MouseEvent;
+import java.util.Collection;
+import org.jetbrains.annotations.NotNull;
+
+public class SearchGutterIconNavigationHandler<T extends PsiElement>
+        implements GutterIconNavigationHandler<T> {
+
+    private final Collection<? extends NavigatablePsiElement> myReferences;
+    private final @NotNull String popupTitle;
+
+    /**
+     * Search gutter icon navigation handler constructor.
+     *
+     * @param references Collection
+     * @param popupTitle String
+     */
+    public SearchGutterIconNavigationHandler(
+            final Collection<? extends NavigatablePsiElement> references,
+            final @NotNull String popupTitle
+    ) {
+        this.popupTitle = popupTitle;
+        myReferences = references;
+    }
+
+    @Override
+    public void navigate(final MouseEvent event, final T elt) {
+        PsiElementListNavigator.openTargets(
+                event,
+                myReferences.toArray(NavigatablePsiElement.EMPTY_NAVIGATABLE_ELEMENT_ARRAY),
+                popupTitle,
+                "Open in Find Tool Window",// Ignored
+                new DefaultPsiElementCellRenderer()
+        );
+    }
+}

src/com/magento/idea/magento2plugin/linemarker/php/PluginLineMarkerProvider.java

@@ -5,17 +5,20 @@
 
 package com.magento.idea.magento2plugin.linemarker.php;
 
+import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
 import com.intellij.codeInsight.daemon.LineMarkerProvider;
 import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
 import com.intellij.icons.AllIcons;
+import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.magento.idea.magento2plugin.linemarker.SearchGutterIconNavigationHandler;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.stubs.indexes.PluginIndex;
 import java.util.ArrayList;
@@ -39,6 +42,7 @@ public class PluginLineMarkerProvider implements LineMarkerProvider {
     }
 
     @Override
+    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     public void collectSlowLineMarkers(
             final @NotNull List<? extends PsiElement> psiElements,
             final @NotNull Collection<? super LineMarkerInfo<?>> collection
@@ -69,12 +73,21 @@ public void collectSlowLineMarkers(
                 }
 
                 if (!results.isEmpty()) {
+                    final GutterIconNavigationHandler<PsiElement> navigationHandler =
+                            new SearchGutterIconNavigationHandler<>(
+                                    (Collection<? extends NavigatablePsiElement>) results,
+                                    TOOLTIP_TEXT
+                            );
+
                     collection.add(
                             NavigationGutterIconBuilder
                                     .create(AllIcons.Nodes.Plugin)
                                     .setTargets(results)
                                     .setTooltipText(TOOLTIP_TEXT)
-                                    .createLineMarkerInfo(PsiTreeUtil.getDeepestFirst(psiElement))
+                                    .createLineMarkerInfo(
+                                            PsiTreeUtil.getDeepestFirst(psiElement),
+                                            navigationHandler
+                                    )
                     );
                 }
             }

src/com/magento/idea/magento2plugin/reference/provider/PhpClassReferenceProvider.java

@@ -74,16 +74,20 @@ public class PhpClassReferenceProvider extends PsiReferenceProvider {
                 psiReferences.add(new PolyVariantReferenceBase(element, range, references));
             }
         }
-
         final String className = classFQN.substring(classFQN.lastIndexOf(92) + 1);
-        final Collection<PhpClass> classes = phpIndex.getAnyByFQN(classFQN);
-
-        if (!classes.isEmpty()) {
-            final TextRange range = new TextRange(
-                    origValue.lastIndexOf(92) + 1,
-                    origValue.lastIndexOf(92) + 1 + className.length()
-            );
-            psiReferences.add(new PolyVariantReferenceBase(element, range, classes));
+
+        try {
+            final Collection<PhpClass> classes = phpIndex.getAnyByFQN(classFQN);
+
+            if (!classes.isEmpty()) {
+                final TextRange range = new TextRange(
+                        origValue.lastIndexOf(92) + 1,
+                        origValue.lastIndexOf(92) + 1 + className.length()
+                );
+                psiReferences.add(new PolyVariantReferenceBase(element, range, classes));
+            }
+        } catch (Exception exception) { //NOPMD
+            return psiReferences.toArray(new PsiReference[0]);
         }
 
         return psiReferences.toArray(new PsiReference[0]);