- KT-1227 Can't see basic types in class completion

- Remove duplicated test

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

@@ -74,10 +74,10 @@ public class JetCompletionContributor extends CompletionContributor {
             @NotNull final Project project) {
 
         if (variant instanceof LookupElement) {
-            addCompletionToResult(result, (LookupElement) variant, positions, project);
+            addCompletionToResult(result, (LookupElement) variant, positions);
         }
         else {
-            addCompletionToResult(result, LookupElementBuilder.create(variant.toString()), positions, project);
+            addCompletionToResult(result, LookupElementBuilder.create(variant.toString()), positions);
         }
     }
 
@@ -97,7 +97,7 @@ public class JetCompletionContributor extends CompletionContributor {
         for (String name : functionNames) {
             if (name.contains(actualPrefix)) {
                 for (FunctionDescriptor function : namesCache.getTopLevelFunctionDescriptorsByName(name, scope)) {
-                    addCompletionToResult(result, DescriptorLookupConverter.createLookupElement(resolutionContext, function), positions, project);
+                    addCompletionToResult(result, DescriptorLookupConverter.createLookupElement(resolutionContext, function), positions);
                 }
             }
         }
@@ -126,7 +126,7 @@ public class JetCompletionContributor extends CompletionContributor {
                             javaPsiReferenceElement.setInsertHandler(JetJavaClassInsertHandler.JAVA_CLASS_INSERT_HANDLER);
                         }
 
-                        addCompletionToResult(result, element, positions, parameters.getPosition().getProject());
+                        addCompletionToResult(result, element, positions);
                     }
                 });
     }
@@ -176,17 +176,23 @@ public class JetCompletionContributor extends CompletionContributor {
     private static void addCompletionToResult(
             @NotNull final CompletionResultSet result,
             @NotNull LookupElement element,
-            @NotNull HashSet<LookupPositionObject> positions,
+            @NotNull HashSet<LookupPositionObject> positions) {
-            @NotNull Project project) {
 
-        final LookupPositionObject lookupPosition = getLookupPosition(element, project);
+        final LookupPositionObject lookupPosition = getLookupPosition(element);
-        if (lookupPosition != null && !positions.contains(lookupPosition)) {
+        if (lookupPosition != null) {
-            positions.add(lookupPosition);
+            if (!positions.contains(lookupPosition)) {
-            result.addElement(element);    
+                positions.add(lookupPosition);
+                result.addElement(element);
+            }
+
+            // There is already an element with same position - ignore duplicate
+        }
+        else {
+            result.addElement(element);
         }
     }
 
-    private static LookupPositionObject getLookupPosition(LookupElement element, Project project) {
+    private static LookupPositionObject getLookupPosition(LookupElement element) {
         final Object lookupObject = element.getObject();
         if (lookupObject instanceof PsiElement) {
             return new LookupPositionObject((PsiElement) lookupObject);

idea/testData/completion/basic/BasicAny.kt

@@ -0,0 +1,5 @@
+fun some() {
+    var a : A<caret>
+}
+
+// EXIST: Any

idea/testData/completion/basic/BasicInt.kt

@@ -0,0 +1,5 @@
+fun some() {
+    var a : In<caret>
+}
+
+// EXIST: Int

idea/testData/completion/handlers/ExistingNoParamsFunction.kt

@@ -1,10 +0,0 @@
-package testing.handlers
-
-fun test() {
-}
-
-fun other() {
-    te<caret>()
-}
-
-// INSERT: test

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

@@ -1,10 +0,0 @@
-package testing.handlers
-
-fun test() {
-}
-
-fun other() {
-    test()<caret>
-}
-
-// INSERT: test

idea/testData/completion/handlers/NoParamsFunction.kt

@@ -1,10 +1,10 @@
 package testing.handlers
 
-fun test() {
+fun testFun() {
 }
 
 fun other() {
-    te<caret>
+    testFu<caret>
 }
 
 // INSERT: test

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

@@ -1,10 +1,10 @@
 package testing.handlers
 
-fun test() {
+fun testFun() {
 }
 
 fun other() {
-    test()<caret>
+    testFun()<caret>
 }
 
 // INSERT: test

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

@@ -9,6 +9,14 @@ import java.io.File;
  */
 public class JetBasicCompletionTest extends JetCompletionTestBase {
 
+    public void testBasicAny() {
+        doTest();
+    }
+
+    public void testBasicInt() {
+        doTest();
+    }
+
     public void testBeforeDotInCall() {
         doTest();
     }

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

@@ -11,10 +11,6 @@ import java.io.File;
  */
 public class CompletionHandlerTest extends LightCompletionTestCase {
 
-    public void testExistingNoParamsFunction() {
-        doTest();
-    }
-
     public void testNoParamsFunction() {
         doTest();
     }