prefer class to its members

2026-09-18 09:34:34 +07:00 · 2012-06-20 19:33:07 +02:00
parent d7f95f1507
commit 3cba0cb607
4 changed files with 26 additions and 5 deletions
@@ -94,13 +94,19 @@ public class JavaCompletionSorting {
              }
              Object object = shorterElement.getObject();
              if (object instanceof PsiClass) {
-                PsiFile file = ((PsiClass)object).getContainingFile();
+                PsiClass psiClass = (PsiClass)object;
+                PsiFile file = psiClass.getContainingFile();
                if (file != null) {
                  VirtualFile vFile = file.getOriginalFile().getVirtualFile();
                  if (vFile != null && fileIndex.isInSource(vFile)) {
                    return true;
                  }
                }
+                Object longerObject = longerElement.getObject();
+                if (longerObject instanceof PsiMember &&
+                    psiClass.getManager().areElementsEquivalent(psiClass, ((PsiMember)longerObject).getContainingClass())) {
+                  return true;
+                }
              }
              return false;
            }