Merge branch 'test-inspection-plugin-duplication' into 1.0.0-develop-adrii

# Conflicts:
#	src/com/magento/idea/magento2plugin/actions/generation/CreateAnObserverAction.java

Author: Vitaliy Boyko

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

@@ -12,21 +12,23 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiReference;
 import com.intellij.psi.tree.IElementType;
 import com.jetbrains.php.lang.lexer.PhpTokenTypes;
 import com.jetbrains.php.lang.psi.PhpFile;
+import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.MethodReference;
 import com.jetbrains.php.lang.psi.elements.ParameterList;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.dialog.CreateAnObserverDialog;
+import com.magento.idea.magento2plugin.magento.files.Observer;
 import com.magento.idea.magento2plugin.project.Settings;
 import org.jetbrains.annotations.NotNull;
 
 public class CreateAnObserverAction extends DumbAwareAction {
     public static final String ACTION_NAME = "Create a Magento Observer...";
     static final String ACTION_DESCRIPTION = "Create a new Magento 2 Observer for the event";
-    static final String SIGNATURE_INTERFACE = "#M#C\\Magento\\Framework\\Event\\ManagerInterface.dispatch";
-    static final String SIGNATURE_CONTEXT = "#M#M#C\\Magento\\Framework\\App\\Action\\Context.getEventManager.dispatch";
     public String targetEvent;
 
     public CreateAnObserverAction() {
@@ -100,20 +102,23 @@ private boolean checkIsMethodReference(@NotNull PsiElement element) {
     }
 
     private boolean checkIsEventDispatchMethod(MethodReference element) {
-        return element.getSignature().equals(SIGNATURE_INTERFACE) ||
-                element.getSignature().equals(SIGNATURE_CONTEXT) ||
-                checkIsDispatchMethodGiven(element);
-    }
-
-    private boolean checkIsDispatchMethodGiven(MethodReference element) {
-        String methodName = element.getName();
-        String elementType = element.getType().toString().replace("|?","");
-
-        if (element.getSignature().equals(elementType) && methodName.equals("dispatch")) {
-            return true;
+        PsiReference elementReference = element.getReference();
+        if (elementReference == null) {
+            return false;
         }
-
-        return false;
+        PsiElement method = elementReference.resolve();
+        if (!(method instanceof Method)) {
+            return false;
+        }
+        if (!((Method) method).getName().equals(Observer.DISPATCH_METHOD)) {
+            return false;
+        }
+        PsiElement phpClass = method.getParent();
+        if (!(phpClass instanceof PhpClass)) {
+            return false;
+        }
+        String fqn = ((PhpClass) phpClass).getPresentableFQN();
+        return fqn.equals(Observer.INTERFACE);
     }
 
     private boolean checkIsElementStringLiteral(@NotNull PsiElement element) {

src/com/magento/idea/magento2plugin/completion/provider/ModuleNameCompletionProvider.java

@@ -8,14 +8,12 @@
 import com.intellij.codeInsight.completion.CompletionProvider;
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.icons.AllIcons;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.stubs.indexes.ModuleNameIndex;
 import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
 
 public class ModuleNameCompletionProvider extends CompletionProvider<CompletionParameters> {
@@ -33,7 +31,6 @@ protected void addCompletions(@NotNull CompletionParameters parameters,
         Collection<String> moduleNames
                 = FileBasedIndex.getInstance().getAllKeys(ModuleNameIndex.KEY, position.getProject());
 
-
         moduleNames.removeIf(m -> !m.startsWith(prefix));
         for (String moduleName : moduleNames) {
             result.addElement(

src/com/magento/idea/magento2plugin/magento/files/Observer.java

@@ -10,6 +10,8 @@
 public class Observer implements ModuleFileInterface {
 
     private String fileName;
+    public static final String INTERFACE = "Magento\\Framework\\Event\\ManagerInterface";
+    public static final String DISPATCH_METHOD = "dispatch";
 
     public Observer(String className) {
         fileName = className.concat(".php");