azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/completion/handlers/NonStandardArray.kt
+1
View File
@@ -0,0 +1 @@
val x : Arra<caret>
idea/testData/completion/handlers/NonStandardArray.kt.after
+1
View File
@@ -0,0 +1 @@
val x : java.lang.reflect.Array
idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java
+15 -3
View File
@@ -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());