Fixed KT-2488 Optimizing imports removes references to enum constants when they are referred via short name in code

2012-08-31 14:50:17 +04:00
parent 737b794935
commit 84e846649f
4 changed files with 34 additions and 2 deletions
@@ -133,7 +133,11 @@ public class JetPsiUtil {
    @Nullable
    public static FqName getFQName(JetNamedDeclaration namedDeclaration) {
        if (namedDeclaration instanceof JetObjectDeclarationName) {
-            JetObjectDeclaration objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetObjectDeclaration.class);
+            JetNamedDeclaration objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetObjectDeclaration.class);
+            if (objectDeclaration == null) {
+                objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetEnumEntry.class);
+            }
+            
            if (objectDeclaration == null) {
                return null;
            }