KT-2139 java.sql.Array inserted by completion is inserted by short name, and import is not added

#KT-2139 fixed
This commit is contained in:
Evgeny Gerashchenko
2012-05-30 18:05:49 +04:00
parent b767e1a8a6
commit b3e211a3ba
4 changed files with 18 additions and 4 deletions
@@ -178,7 +178,7 @@ public class JetClass extends JetTypeParameterListOwner
String fq2 = ((JetClass) another).getQualifiedName(); String fq2 = ((JetClass) another).getQualifiedName();
return fq1 != null && fq2 != null && fq1.equals(fq2); return fq1 != null && fq2 != null && fq1.equals(fq2);
} }
return true; return false;
} }
@Nullable @Nullable
@@ -0,0 +1 @@
val x : Arra<caret>
@@ -0,0 +1 @@
val x : java.lang.reflect.Array
@@ -17,9 +17,14 @@
package org.jetbrains.jet.completion.handlers; package org.jetbrains.jet.completion.handlers;
import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.completion.JavaLookupElementBuilder;
import com.intellij.codeInsight.completion.LightCompletionTestCase; import com.intellij.codeInsight.completion.LightCompletionTestCase;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.openapi.projectRoots.Sdk; 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.annotations.Nullable;
import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.PluginTestCaseBase;
@@ -31,7 +36,14 @@ import java.io.File;
public class CompletionHandlerTest extends LightCompletionTestCase { public class CompletionHandlerTest extends LightCompletionTestCase {
public void testClassCompletionImport() { 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() { public void testNoParamsFunction() {
@@ -68,7 +80,7 @@ public class CompletionHandlerTest extends LightCompletionTestCase {
doTest(CompletionType.BASIC, 2, null); 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 { try {
configureByFileNoComplete(getBeforeFileName()); configureByFileNoComplete(getBeforeFileName());
setType(type); setType(type);
@@ -76,7 +88,7 @@ public class CompletionHandlerTest extends LightCompletionTestCase {
complete(time); complete(time);
if (completeItem != null) { if (completeItem != null) {
selectItem(LookupElementBuilder.create(completeItem), '\t'); selectItem(completeItem, '\t');
} }
checkResultByFile(getAfterFileName()); checkResultByFile(getAfterFileName());