diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java index 4b3b5480b77..764e0451346 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java @@ -178,7 +178,7 @@ public class JetClass extends JetTypeParameterListOwner String fq2 = ((JetClass) another).getQualifiedName(); return fq1 != null && fq2 != null && fq1.equals(fq2); } - return true; + return false; } @Nullable diff --git a/idea/testData/completion/handlers/NonStandardArray.kt b/idea/testData/completion/handlers/NonStandardArray.kt new file mode 100644 index 00000000000..e4306630eeb --- /dev/null +++ b/idea/testData/completion/handlers/NonStandardArray.kt @@ -0,0 +1 @@ +val x : Arra \ No newline at end of file diff --git a/idea/testData/completion/handlers/NonStandardArray.kt.after b/idea/testData/completion/handlers/NonStandardArray.kt.after new file mode 100644 index 00000000000..4b09502ebf7 --- /dev/null +++ b/idea/testData/completion/handlers/NonStandardArray.kt.after @@ -0,0 +1 @@ +val x : java.lang.reflect.Array \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java index 314a211b276..7cd9c7d4d03 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java @@ -17,9 +17,14 @@ package org.jetbrains.jet.completion.handlers; import com.intellij.codeInsight.completion.CompletionType; +import com.intellij.codeInsight.completion.JavaLookupElementBuilder; import com.intellij.codeInsight.completion.LightCompletionTestCase; +import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiClass; +import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.PluginTestCaseBase; @@ -31,7 +36,14 @@ import java.io.File; public class CompletionHandlerTest extends LightCompletionTestCase { public void testClassCompletionImport() { - doTest(CompletionType.CLASS_NAME, 1, "SortedSet"); + doTest(CompletionType.CLASS_NAME, 1, LookupElementBuilder.create("SortedSet")); + } + + public void testNonStandardArray() { + PsiClass reflectArrayClass = JavaPsiFacade.getInstance(getProject()).findClass( + "java.lang.reflect.Array", GlobalSearchScope.allScope(getProject())); + assert reflectArrayClass != null; + doTest(CompletionType.CLASS_NAME, 1, JavaLookupElementBuilder.forClass(reflectArrayClass)); } public void testNoParamsFunction() { @@ -68,7 +80,7 @@ public class CompletionHandlerTest extends LightCompletionTestCase { doTest(CompletionType.BASIC, 2, null); } - public void doTest(CompletionType type, int time, @Nullable String completeItem) { + public void doTest(CompletionType type, int time, @Nullable LookupElement completeItem) { try { configureByFileNoComplete(getBeforeFileName()); setType(type); @@ -76,7 +88,7 @@ public class CompletionHandlerTest extends LightCompletionTestCase { complete(time); if (completeItem != null) { - selectItem(LookupElementBuilder.create(completeItem), '\t'); + selectItem(completeItem, '\t'); } checkResultByFile(getAfterFileName());