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

- Add sorting of completion elements into class completion

Browse Source 
- Fix testNonStandardArray (it couldn't move selection to non-first element)
This commit is contained in:
Nikolay Krasko
2012-06-01 18:18:45 +04:00
parent 59bdeda408
commit 87b16b6a1f
2 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetClassCompletionContributor.java
+3 -1
View File
@@ -32,6 +32,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.plugin.caches.JetShortNamesCache;
import org.jetbrains.jet.plugin.completion.handlers.JetJavaClassInsertHandler;
import org.jetbrains.jet.plugin.completion.weigher.JetCompletionSorting;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
import org.jetbrains.jet.plugin.references.JetSimpleNameReference;
@@ -47,6 +48,7 @@ public class JetClassCompletionContributor extends CompletionContributor {
@Override
protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context,
final @NotNull CompletionResultSet result) {
final CompletionResultSet jetResult = JetCompletionSorting.addJetSorting(parameters, result);
final PsiElement position = parameters.getPosition();
if (!(position.getContainingFile() instanceof JetFile)) {
@@ -58,7 +60,7 @@ public class JetClassCompletionContributor extends CompletionContributor {
addClasses(parameters, result, new Consumer<LookupElement>() {
@Override
public void consume(LookupElement lookupElement) {
result.addElement(lookupElement);
jetResult.addElement(lookupElement);
}
});
result.stopHere();
idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java
+54 -15
View File
@@ -17,14 +17,13 @@
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.codeInsight.lookup.LookupElementPresentation;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.lookup.impl.LookupImpl;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.search.GlobalSearchScope;
import junit.framework.Assert;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
@@ -36,14 +35,11 @@ import java.io.File;
public class CompletionHandlerTest extends LightCompletionTestCase {
public void testClassCompletionImport() {
doTest(CompletionType.CLASS_NAME, 1, LookupElementBuilder.create("SortedSet"));
doTest(CompletionType.CLASS_NAME, 1, "SortedSet", null);
}
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));
doTest(CompletionType.CLASS_NAME, 1, "Array", "java.lang.reflect");
}
public void testNoParamsFunction() {
@@ -77,26 +73,69 @@ public class CompletionHandlerTest extends LightCompletionTestCase {
}
public void doTest() {
doTest(CompletionType.BASIC, 2, null);
doTest(CompletionType.BASIC, 2, null, null);
}
public void doTest(CompletionType type, int time, @Nullable LookupElement completeItem) {
public void doTest(CompletionType type, int time, @Nullable String lookupString, @Nullable String tailText) {
try {
configureByFileNoComplete(getBeforeFileName());
setType(type);
complete(time);
if (completeItem != null) {
selectItem(completeItem, '\t');
if (lookupString != null || tailText != null) {
selectItem(getExistentLookupElement(lookupString, tailText), '\t');
}
checkResultByFile(getAfterFileName());
} catch (Exception e) {
}
catch (Exception e) {
throw new AssertionError(e);
}
}
public static LookupElement getExistentLookupElement(@Nullable String lookupString, @Nullable String tailText) {
final LookupImpl lookup = (LookupImpl) LookupManager.getInstance(getProject()).getActiveLookup();
LookupElement foundElement = null;
if (lookup != null) {
final LookupElementPresentation presentation = new LookupElementPresentation();
for (LookupElement lookupElement : lookup.getItems()) {
boolean lookupOk;
if (lookupString != null) {
lookupOk = (lookupElement.getLookupString().contains(lookupString));
}
else {
lookupOk = true;
}
boolean tailOk;
if (tailText != null) {
lookupElement.renderElement(presentation);
String itemTailText = presentation.getTailText();
tailOk = itemTailText != null && itemTailText.contains(tailText);
}
else {
tailOk = true;
}
if (lookupOk && tailOk) {
if (foundElement != null) {
Assert.fail("Several elements satisfy to completion restrictions");
}
foundElement = lookupElement;
}
}
}
Assert.assertNotNull("No element found for given constraints",foundElement);
return foundElement;
}
protected String getBeforeFileName() {
return getTestName(false) + ".kt";
}