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

Fix KotlinConfidenceTest in 193

Browse Source
This commit is contained in:
Nikolay Krasko
2019-10-25 20:04:08 +03:00
parent 8d50aea471
commit 7160653546
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java.193
+29 -24
View File
@@ -6,18 +6,21 @@
package org.jetbrains.kotlin.idea.completion.test.confidence;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.completion.CodeCompletionHandlerBase;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.completion.LightCompletionTestCase;
import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.lookup.impl.LookupImpl;
import com.intellij.lang.Language;
import com.intellij.lang.injection.InjectedLanguageManager;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.projectRoots.JavaSdk;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ThreeState;
import org.apache.commons.lang.SystemUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.completion.test.CompletionTestUtilKt;
@@ -27,7 +30,6 @@ import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner;
import org.junit.runner.RunWith;
import java.io.File;
import java.lang.reflect.Method;
import java.util.List;
@RunWith(JUnit3WithIdeaConfigurationRunner.class)
@@ -102,26 +104,7 @@ public class KotlinConfidenceTest extends LightCompletionTestCase {
assertFalse("Can't both expect lookup elements and no lookup", !expectedElements.isEmpty() && noLookup);
if (noLookup) {
try {
Method m = null; //Looking for shouldSkipAutoPopup method (note, we can't use name because of scrambling in Ultimate)
for (Method method : CodeCompletionHandlerBase.class.getDeclaredMethods()) {
Class<?>[] parameterTypes = method.getParameterTypes();
if (method.getReturnType().equals(Boolean.TYPE) &&
parameterTypes.length == 2 &&
parameterTypes[0].equals(Editor.class) &&
parameterTypes[1].equals(PsiFile.class)) {
assertNull("Only one method with such signature should exist", m);
m = method;
}
}
assertNotNull(m);
m.setAccessible(true);
Object o = m.invoke(null, getEditor(), getFile());
assert o instanceof Boolean;
assertTrue("Should skip autopopup completion", ((Boolean) o).booleanValue());
} catch (Throwable e) {
throw new AssertionError(e);
}
assertTrue("Should skip autopopup completion", shouldSkipAutoPopup(getEditor(), getFile()));
return;
}
@@ -176,4 +159,26 @@ public class KotlinConfidenceTest extends LightCompletionTestCase {
myItems = lookup == null ? null : lookup.getItems().toArray(LookupElement.EMPTY_ARRAY);
myPrefix = lookup == null ? null : lookup.itemPattern(lookup.getItems().get(0));
}
private static boolean shouldSkipAutoPopup(Editor editor, PsiFile psiFile) {
int offset = editor.getCaretModel().getOffset();
int psiOffset = Math.max(0, offset - 1);
PsiElement elementAt = InjectedLanguageManager.getInstance(psiFile.getProject()).findInjectedElementAt(psiFile, psiOffset);
if (elementAt == null) {
elementAt = psiFile.findElementAt(psiOffset);
}
if (elementAt == null) return true;
Language language = PsiUtilCore.findLanguageFromElement(elementAt);
for (CompletionConfidence confidence : CompletionConfidenceEP.forLanguage(language)) {
ThreeState result = confidence.shouldSkipAutopopup(elementAt, psiFile, offset);
if (result != ThreeState.UNSURE) {
return result == ThreeState.YES;
}
}
return false;
}
}