Merge pull request #1166 from anzin/1102-bug-fix-create-observer-not-work-through-the-context-menu

1102: Fix bug create an observer

Author: VitaliyBoyko

src/com/magento/idea/magento2plugin/actions/generation/CreateAnObserverAction.java

@@ -15,6 +15,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.util.SlowOperations;
 import com.jetbrains.php.lang.lexer.PhpTokenTypes;
 import com.jetbrains.php.lang.psi.PhpFile;
 import com.jetbrains.php.lang.psi.elements.Method;
@@ -124,7 +125,7 @@ private boolean checkIsEventDispatchMethod(final MethodReference element) {
         if (elementReference == null) {
             return false;
         }
-        final PsiElement method = elementReference.resolve();
+        final PsiElement method = SlowOperations.allowSlowOperations(elementReference::resolve);
         if (!(method instanceof Method)) {
             return false;
         }

src/com/magento/idea/magento2plugin/lang/php/MagentoProxyDeclarationFilter.java

@@ -10,7 +10,10 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.containers.ContainerUtil;
+import com.jetbrains.php.lang.PhpLangUtil;
 import com.jetbrains.php.lang.psi.PhpMultipleDeclarationFilter;
+import com.jetbrains.php.lang.psi.elements.Method;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
 import com.magento.idea.magento2plugin.project.Settings;
 import java.util.Collection;
@@ -47,7 +50,23 @@ public <E extends PhpNamedElement> Collection<E> filter(
                         return false;
                     }
 
-                    return !virtualFile.getPath().contains("/generated/");
+                    return !virtualFile.getPath().contains("/generated/") && isValidFqn(candidate);
                 });
     }
+
+    private <E extends PhpNamedElement> boolean isValidFqn(final E candidate) {
+        PhpClass targetClass = null;
+
+        if (candidate instanceof Method) {
+            targetClass = (PhpClass) candidate.getParent();
+        } else if (candidate instanceof PhpClass) {
+            targetClass = (PhpClass) candidate;
+        }
+
+        if (targetClass == null) {
+            return true;
+        }
+
+        return PhpLangUtil.isFqn(targetClass.getFQN()) && !targetClass.getFQN().endsWith("\\");
+    }
 }