EA-39003 - ISE: ResolveSession.resolveToDescriptor

Lokking up classes and objects by PSI element, rather than by name

idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java

@@ -158,7 +158,9 @@ public class JetShortNamesCache extends PsiShortNamesCache {
 
         Collection<JetObjectDeclaration> topObjects = JetTopLevelShortObjectNameIndex.getInstance().get(name, project, scope);
         for (JetObjectDeclaration objectDeclaration : topObjects) {
-            result.add(resolveSession.getClassDescriptor(objectDeclaration));
+            FqName fqName = JetPsiUtil.getFQName(objectDeclaration);
+            assert fqName != null : "Local object declaration in JetTopLevelShortObjectNameIndex:" + objectDeclaration.getText();
+            result.addAll(ResolveSessionUtils.getClassOrObjectDescriptorsByFqName(resolveSession, fqName, true));
         }
 
         for (PsiClass psiClass : JetFromJavaDescriptorHelper
@@ -166,7 +168,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
             String qualifiedName = psiClass.getQualifiedName();
             if (qualifiedName != null) {
                 FqName fqName = new FqName(qualifiedName);
-                result.addAll(ResolveSessionUtils.getClassDescriptorsByFqName(resolveSession, fqName));
+                result.addAll(ResolveSessionUtils.getClassOrObjectDescriptorsByFqName(resolveSession, fqName, true));
             }
         }
 

idea/src/org/jetbrains/jet/plugin/stubindex/resolve/AbstractStubDeclarationProvider.java

@@ -22,6 +22,8 @@ import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.resolve.lazy.DeclarationProvider;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -34,9 +36,10 @@ public abstract class AbstractStubDeclarationProvider implements DeclarationProv
         return null;
     }
 
+    @NotNull
     @Override
-    public JetClassOrObject getClassOrObjectDeclaration(@NotNull Name name) {
+    public Collection<JetClassOrObject> getClassOrObjectDeclarations(@NotNull Name name) {
         // TODO:
-        return null;
+        return Collections.emptyList();
     }
 }

idea/testData/completion/basic/ClassRedeclaration1.kt

@@ -0,0 +1,9 @@
+class A {
+  fun f() : A<caret>
+}
+
+class A {
+  fun f() : A
+}
+
+// EXIST: A

idea/testData/completion/basic/ClassRedeclaration2.kt

@@ -0,0 +1,9 @@
+class A {
+  fun f() : A
+}
+
+class A {
+  fun f() : A<caret>
+}
+
+// EXIST: A

idea/testData/completion/basic/ObjectRedeclaration1.kt

@@ -0,0 +1,9 @@
+object A {
+  fun f() : S<caret>
+}
+
+object A {
+  fun f() : S
+}
+
+// EXIST: String

idea/testData/completion/basic/ObjectRedeclaration2.kt

@@ -0,0 +1,9 @@
+object A {
+  fun f() : S
+}
+
+object A {
+  fun f() : S<caret>
+}
+
+// EXIST: String

idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java

@@ -269,6 +269,22 @@ public class JetBasicCompletionTest extends JetCompletionTestBase {
         doTest();
     }
 
+    public void testClassRedeclaration1() {
+        doTest();
+    }
+
+    public void testClassRedeclaration2() {
+        doTest();
+    }
+
+    public void testObjectRedeclaration1() {
+        doTest();
+    }
+
+    public void testObjectRedeclaration2() {
+        doTest();
+    }
+
     @NotNull
     @Override
     protected String getTestDataPath() {