use PhpCodeInsightUtil for collecting use imports, simplify class equal name check

Haehnchen · Haehnchen · commit 91b85af7bb6d · 2016-11-01T12:57:21.000+01:00
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java b/src/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java
@@ -81,33 +81,21 @@ public static Map<String, String> getUseImportMap(@NotNull PhpDocComment phpDocC
         // search for use alias in local file
         final Map<String, String> useImports = new HashMap<>();
 
-        PsiElement scope = PsiTreeUtil.getParentOfType(phpDocComment, PhpNamespace.class);
-        if(scope == null) {
-            scope = PsiTreeUtil.getParentOfType(phpDocComment, GroupStatement.class);
-        }
-
+        PhpPsiElement scope = PhpCodeInsightUtil.findScopeForUseOperator(phpDocComment);
         if(scope == null) {
             return useImports;
         }
 
-        scope.acceptChildren(new PsiRecursiveElementWalkingVisitor() {
-            @Override
-            public void visitElement(PsiElement element) {
-                if (element instanceof PhpUse) {
-                    visitUse((PhpUse) element);
-                }
-                super.visitElement(element);
-            }
-
-            private void visitUse(PhpUse phpUse) {
+        for (PhpUseList phpUseList : PhpCodeInsightUtil.collectImports(scope)) {
+            for (PhpUse phpUse : phpUseList.getDeclarations()) {
                 String alias = phpUse.getAliasName();
                 if (alias != null) {
                     useImports.put(alias, phpUse.getFQN());
                 } else {
                     useImports.put(phpUse.getName(), phpUse.getFQN());
                 }
             }
-        });
+        }
 
         return useImports;
     }
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java b/src/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java
@@ -825,25 +825,12 @@ public static boolean isEqualClassName(@NotNull PhpClass phpClass, @NotNull PhpC
     }
 
     public static boolean isEqualClassName(@Nullable PhpClass phpClass, @Nullable String compareClassName) {
-
         if(phpClass == null || compareClassName == null) {
             return false;
         }
 
-        String phpClassName = phpClass.getPresentableFQN();
-        if(phpClassName == null) {
-            return false;
-        }
-
-        if(phpClassName.startsWith("\\")) {
-            phpClassName = phpClassName.substring(1);
-        }
-
-        if(compareClassName.startsWith("\\")) {
-            compareClassName = compareClassName.substring(1);
-        }
-
-        return phpClassName.equals(compareClassName);
+        return StringUtils.stripStart(phpClass.getPresentableFQN(), "\\")
+            .equals(StringUtils.stripStart(compareClassName, "\\"));
     }
 
     @Nullable
