KT-1931 Duplicate class from Kotlin runtime in completion

#KT-1931 Fixed

idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java

@@ -129,7 +129,7 @@ public final class DescriptorLookupConverter {
         if (declaration instanceof PsiClass) {
             PsiClass psiClass = (PsiClass) declaration;
             if (!DecompiledDataFactory.isCompiledFromKotlin(psiClass)) {
-                return new JavaPsiClassReferenceElement(psiClass).setInsertHandler(JetJavaClassInsertHandler.JAVA_CLASS_INSERT_HANDLER);
+                return new JavaPsiClassReferenceElement(psiClass).setInsertHandler(JetJavaClassInsertHandler.INSTANCE);
             }
         }
 

idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java

@@ -24,10 +24,13 @@ import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.asJava.JetLightClass;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.caches.JetCacheManager;
 import org.jetbrains.jet.plugin.caches.JetShortNamesCache;
 import org.jetbrains.jet.plugin.completion.handlers.JetJavaClassInsertHandler;
+import org.jetbrains.jet.plugin.libraries.DecompiledDataFactory;
 import org.jetbrains.jet.plugin.project.JsModuleDetector;
 
 public class JetTypesCompletionHelper {
@@ -69,25 +72,36 @@ public class JetTypesCompletionHelper {
                             JavaPsiClassReferenceElement javaPsiReferenceElement = (JavaPsiClassReferenceElement) lookupElement;
 
                             PsiClass psiClass = javaPsiReferenceElement.getObject();
-                            if (addJavaClassAsJetLookupElement(psiClass)) {
+                            if (addJavaClassAsJetLookupElement(psiClass, jetCompletionResult)) {
                                 return;
                             }
 
                             // Redefine standard java insert handler which is going to insert fqn
-                            javaPsiReferenceElement.setInsertHandler(JetJavaClassInsertHandler.JAVA_CLASS_INSERT_HANDLER);
+                            jetCompletionResult.addElement(javaPsiReferenceElement.setInsertHandler(JetJavaClassInsertHandler.INSTANCE));
-                            jetCompletionResult.addElement(javaPsiReferenceElement);
                         }
                     }
                 });
 
     }
 
-    private static boolean addJavaClassAsJetLookupElement(PsiClass aClass) {
+    private static boolean addJavaClassAsJetLookupElement(PsiClass aClass, JetCompletionResultSet jetCompletionResult) {
         if (aClass instanceof JetLightClass) {
             // Do nothing. Kotlin not-compiled class should have already been added as kotlin element before.
             return true;
         }
 
+        if (DecompiledDataFactory.isCompiledFromKotlin(aClass)) {
+            // TODO: Filter classes for compiled kotlin objects
+            String qualifiedName = aClass.getQualifiedName();
+            if (qualifiedName != null) {
+                FqName fqName = new FqName(qualifiedName);
+                jetCompletionResult.addAllElements(
+                        ResolveSessionUtils.getClassDescriptorsByFqName(jetCompletionResult.getResolveSession(), fqName));
+            }
+
+            return true;
+        }
+
         return false;
     }
 }

idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.java

@@ -31,7 +31,7 @@ import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
  * @author Nikolay Krasko
  */
 public class JetJavaClassInsertHandler implements InsertHandler<JavaPsiClassReferenceElement> {
-    public static final InsertHandler<JavaPsiClassReferenceElement> JAVA_CLASS_INSERT_HANDLER = new JetJavaClassInsertHandler();
+    public static final InsertHandler<JavaPsiClassReferenceElement> INSTANCE = new JetJavaClassInsertHandler();
 
     @Override
     public void handleInsert(final InsertionContext context, final JavaPsiClassReferenceElement item) {

idea/testData/completion/basic/NoClassNameDuplicationForRuntimeClass.kt

@@ -0,0 +1,6 @@
+val x = LineIterator<caret>
+
+// RUNTIME: 1
+// TIME: 1
+// EXIST: LineIterator
+// NUMBER: 1

idea/testData/completion/handlers/DoNotInsertImportForAlreadyImported.kt

@@ -1,5 +1,5 @@
 // KT-2424 Invoking completion adds unnecessary FQ name
 
 fun main(args: Array<String>) {
-    throw IllegalAccessExceptio<caret>() //Press Ctrl+Space and select it
+    throw IllegalAccessExceptio<caret> //Press Ctrl+Space and select it
 }

idea/testData/completion/handlers/DoNotInsertImportForAlreadyImported.kt.after

@@ -1,5 +1,5 @@
 // KT-2424 Invoking completion adds unnecessary FQ name
 
 fun main(args: Array<String>) {
-    throw IllegalAccessException<caret>() //Press Ctrl+Space and select it
+    throw IllegalAccessException<caret> //Press Ctrl+Space and select it
 }

idea/testData/completion/handlers/InsertFqnForJavaClass.kt

@@ -0,0 +1,5 @@
+class SortedSet
+
+fun test() {
+  val a = SortedSet<caret>
+}

idea/testData/completion/handlers/InsertFqnForJavaClass.kt.after

@@ -0,0 +1,5 @@
+class SortedSet
+
+fun test() {
+  val a = java.util.SortedSet
+}

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

@@ -197,6 +197,10 @@ public class JetBasicCompletionTest extends JetCompletionTestBase {
         doTest();
     }
 
+    public void testNoClassNameDuplicationForRuntimeClass() {
+        doTest();
+    }
+
     public void testNoEmptyNamespace() {
         doTest();
     }

idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java

@@ -103,6 +103,10 @@ public class CompletionHandlerTest extends LightCompletionTestCase {
         doTest();
     }
 
+    public void testInsertFqnForJavaClass() {
+        doTest(CompletionType.BASIC, 2, "SortedSet", "java.util", '\n');
+    }
+
     public void testHigherOrderFunctionWithArg() {
         doTest(CompletionType.BASIC, 2, "filterNot", null, '\n');
     }