diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java index 7ab087b78b8f..c169dc8cf0b6 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java @@ -17,9 +17,11 @@ package com.intellij.codeInsight.completion; import com.intellij.codeInsight.TailType; import com.intellij.codeInsight.daemon.impl.analysis.LambdaHighlightingUtil; +import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.patterns.PsiElementPattern; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.util.Consumer; import static com.intellij.patterns.PsiJavaPatterns.psiElement; @@ -28,14 +30,14 @@ public class Java18CompletionData extends Java15CompletionData { .afterLeaf(psiElement(JavaTokenType.DOUBLE_COLON)); @Override - public void fillCompletions(final CompletionParameters parameters, final CompletionResultSet result) { + public void fillCompletions(final CompletionParameters parameters, final Consumer result) { PsiElement position = parameters.getPosition(); if (!inComment(position)) { if (AFTER_DOUBLE_COLON.accepts(position)) { PsiMethodReferenceExpression parent = PsiTreeUtil.getParentOfType(parameters.getPosition(), PsiMethodReferenceExpression.class); TailType tail = parent != null && !LambdaHighlightingUtil.insertSemicolon(parent.getParent()) ? TailType.SEMICOLON : TailType.NONE; - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.NEW), tail)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.NEW), tail)); return; } @@ -43,7 +45,7 @@ public class Java18CompletionData extends Java15CompletionData { PsiElement scope = position.getParent(); while (scope != null && !(scope instanceof PsiFile)) { if (scope instanceof PsiClass && ((PsiClass)scope).isInterface()) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.DEFAULT), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.DEFAULT), TailType.HUMBLE_SPACE_BEFORE_WORD)); break; } scope = scope.getParent(); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java index c49e78287738..c124826a4b58 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java @@ -86,6 +86,4 @@ public class JavaAwareCompletionData extends CompletionData{ } } - public void fillCompletions(CompletionParameters parameters, CompletionResultSet result) { - } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index b154c38f9f29..9789ec76a99a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -241,6 +241,8 @@ public class JavaCompletionContributor extends CompletionContributor { addKeywords(parameters, result); + addExpressionVariants(parameters, position, result); + Set usedWords = addReferenceVariants(parameters, result, inheritors); if (psiElement().inside(PsiLiteralExpression.class).accepts(position)) { @@ -264,6 +266,16 @@ public class JavaCompletionContributor extends CompletionContributor { result.stopHere(); } + private void addExpressionVariants(@NotNull CompletionParameters parameters, PsiElement position, CompletionResultSet result) { + if (JavaSmartCompletionContributor.INSIDE_EXPRESSION.accepts(position) && + !JavaCompletionData.AFTER_DOT.accepts(position)) { + JavaCompletionData.addExpectedTypeMembers(parameters, result); + if (SameSignatureCallParametersProvider.IN_CALL_ARGUMENT.accepts(position)) { + new SameSignatureCallParametersProvider().addCompletions(parameters, new ProcessingContext(), result); + } + } + } + public static boolean isInJavaContext(PsiElement position) { return PsiUtilCore.findLanguageFromElement(position).isKindOf(JavaLanguage.INSTANCE); } @@ -382,17 +394,26 @@ public class JavaCompletionContributor extends CompletionContributor { return usedWords; } - private static void addKeywords(CompletionParameters parameters, CompletionResultSet result) { + private static void addKeywords(CompletionParameters parameters, final CompletionResultSet result) { + Consumer noMiddleMatches = new Consumer() { + @Override + public void consume(LookupElement element) { + if (element.getLookupString().startsWith(result.getPrefixMatcher().getPrefix())) { + result.addElement(element); + } + } + }; + PsiElement position = parameters.getPosition(); final Set lookupSet = new LinkedHashSet(); final Set keywordVariants = new HashSet(); final JavaCompletionData completionData = getCompletionData(PsiUtil.getLanguageLevel(position)); completionData.addKeywordVariants(keywordVariants, position, parameters.getOriginalFile()); completionData.completeKeywordsBySet(lookupSet, keywordVariants, position, result.getPrefixMatcher(), parameters.getOriginalFile()); - completionData.fillCompletions(parameters, result); + completionData.fillCompletions(parameters, noMiddleMatches); for (final LookupElement item : lookupSet) { - result.addElement(item); + noMiddleMatches.consume(item); } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java index bede9bd170e5..67670d5d2d18 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java @@ -34,6 +34,7 @@ import com.intellij.psi.jsp.JspElementType; import com.intellij.psi.templateLanguages.OuterLanguageElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; +import com.intellij.util.Consumer; import com.intellij.util.ProcessingContext; import org.jetbrains.annotations.NonNls; @@ -368,19 +369,19 @@ public class JavaCompletionData extends JavaAwareCompletionData { } } - private static void addStatementKeywords(CompletionResultSet variant, PsiElement position) { - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.SWITCH), TailTypes.SWITCH_LPARENTH)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.WHILE), TailTypes.WHILE_LPARENTH)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.DO), TailTypes.DO_LBRACE)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.FOR), TailTypes.FOR_LPARENTH)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.IF), TailTypes.IF_LPARENTH)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.TRY), TailTypes.TRY_LBRACE)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.THROW), TailType.INSERT_SPACE)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.NEW), TailType.INSERT_SPACE)); - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.SYNCHRONIZED), TailTypes.SYNCHRONIZED_LPARENTH)); + private static void addStatementKeywords(Consumer variant, PsiElement position) { + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.SWITCH), TailTypes.SWITCH_LPARENTH)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.WHILE), TailTypes.WHILE_LPARENTH)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.DO), TailTypes.DO_LBRACE)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.FOR), TailTypes.FOR_LPARENTH)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.IF), TailTypes.IF_LPARENTH)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.TRY), TailTypes.TRY_LBRACE)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.THROW), TailType.INSERT_SPACE)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.NEW), TailType.INSERT_SPACE)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.SYNCHRONIZED), TailTypes.SYNCHRONIZED_LPARENTH)); if (PsiUtil.getLanguageLevel(position).isAtLeast(LanguageLevel.JDK_1_4)) { - variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.ASSERT), TailType.INSERT_SPACE)); + variant.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.ASSERT), TailType.INSERT_SPACE)); } TailType returnTail = getReturnTail(position); @@ -388,11 +389,10 @@ public class JavaCompletionData extends JavaAwareCompletionData { if (returnTail != TailType.NONE) { ret = new OverrideableSpace(ret, returnTail); } - variant.addElement(ret); + variant.consume(ret); } - @Override - public void fillCompletions(CompletionParameters parameters, final CompletionResultSet result) { + public void fillCompletions(CompletionParameters parameters, final Consumer result) { final PsiElement position = parameters.getPosition(); if (PsiTreeUtil.getParentOfType(position, PsiComment.class, false) != null) { return; @@ -407,15 +407,15 @@ public class JavaCompletionData extends JavaAwareCompletionData { if (!psiElement().withSuperParent(2, PsiSwitchStatement.class).afterLeaf("{").accepts(statement)) { PsiTryStatement tryStatement = PsiTreeUtil.getParentOfType(prevLeaf, PsiTryStatement.class); if (tryStatement == null || tryStatement.getCatchSections().length > 0 || tryStatement.getFinallyBlock() != null) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.FINAL), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.FINAL), TailType.HUMBLE_SPACE_BEFORE_WORD)); } } } if (isStatementPosition(position)) { if (PsiTreeUtil.getParentOfType(position, PsiSwitchStatement.class, false, PsiMember.class) != null) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.CASE), TailType.INSERT_SPACE)); - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.DEFAULT), TailType.CASE_COLON)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.CASE), TailType.INSERT_SPACE)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.DEFAULT), TailType.CASE_COLON)); if (START_SWITCH.accepts(position)) { return; } @@ -431,7 +431,7 @@ public class JavaCompletionData extends JavaAwareCompletionData { final boolean insideInheritorClass = PsiUtil.isLanguageLevel8OrHigher(position) && isInsideInheritorClass(position); if (!afterDot || insideQualifierClass || insideInheritorClass) { if (!afterDot || insideQualifierClass) { - result.addElement(createKeyword(position, PsiKeyword.THIS)); + result.consume(createKeyword(position, PsiKeyword.THIS)); } final LookupItem superItem = (LookupItem)createKeyword(position, PsiKeyword.SUPER); @@ -453,18 +453,18 @@ public class JavaCompletionData extends JavaAwareCompletionData { }); } - result.addElement(superItem); + result.consume(superItem); } } if (isExpressionPosition(position)) { if (PsiTreeUtil.getParentOfType(position, PsiAnnotation.class) == null) { - result.addElement(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.NEW), TailType.INSERT_SPACE)); - result.addElement(createKeyword(position, PsiKeyword.NULL)); + result.consume(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.NEW), TailType.INSERT_SPACE)); + result.consume(createKeyword(position, PsiKeyword.NULL)); } if (mayExpectBoolean(parameters)) { - result.addElement(createKeyword(position, PsiKeyword.TRUE)); - result.addElement(createKeyword(position, PsiKeyword.FALSE)); + result.consume(createKeyword(position, PsiKeyword.TRUE)); + result.consume(createKeyword(position, PsiKeyword.FALSE)); } } @@ -473,22 +473,22 @@ public class JavaCompletionData extends JavaAwareCompletionData { !(file instanceof PsiJavaCodeReferenceCodeFragment) && !(file instanceof PsiTypeCodeFragment)) { if (prevLeaf == null) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.PACKAGE), TailType.HUMBLE_SPACE_BEFORE_WORD)); - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.IMPORT), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.PACKAGE), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.IMPORT), TailType.HUMBLE_SPACE_BEFORE_WORD)); } else if (END_OF_BLOCK.isAcceptable(position, position) && PsiTreeUtil.getParentOfType(position, PsiMember.class) == null) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.IMPORT), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.IMPORT), TailType.HUMBLE_SPACE_BEFORE_WORD)); } } if ((isInsideParameterList(position) || isAtResourceVariableStart(position) || isAtCatchVariableStart(position)) && !psiElement().afterLeaf(PsiKeyword.FINAL).accepts(position) && !AFTER_DOT.accepts(position)) { - result.addElement(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.FINAL), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.FINAL), TailType.HUMBLE_SPACE_BEFORE_WORD)); } if (isInstanceofPlace(position)) { - result.addElement(LookupElementDecorator.withInsertHandler( + result.consume(LookupElementDecorator.withInsertHandler( createKeyword(position, PsiKeyword.INSTANCEOF), new InsertHandler>() { @Override @@ -497,7 +497,7 @@ public class JavaCompletionData extends JavaAwareCompletionData { if (tailType.isApplicable(context)) { tailType.processTail(context.getEditor(), context.getTailOffset()); } - + if ('!' == context.getCompletionChar()) { context.setAddCompletionChar(false); context.commitDocument(); @@ -515,13 +515,13 @@ public class JavaCompletionData extends JavaAwareCompletionData { if (isSuitableForClass(position)) { for (String s : ModifierChooser.getKeywords(position)) { - result.addElement(new OverrideableSpace(createKeyword(position, s), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, s), TailType.HUMBLE_SPACE_BEFORE_WORD)); } - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.CLASS), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.CLASS), TailType.HUMBLE_SPACE_BEFORE_WORD)); if (PsiTreeUtil.getParentOfType(position, PsiCodeBlock.class, true, PsiMember.class) == null) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.INTERFACE), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.INTERFACE), TailType.HUMBLE_SPACE_BEFORE_WORD)); if (PsiUtil.getLanguageLevel(position).isAtLeast(LanguageLevel.JDK_1_5)) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.ENUM), TailType.INSERT_SPACE)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.ENUM), TailType.INSERT_SPACE)); } } } @@ -529,22 +529,14 @@ public class JavaCompletionData extends JavaAwareCompletionData { addPrimitiveTypes(result, position); if (isAfterTypeDot(position)) { - result.addElement(createKeyword(position, PsiKeyword.CLASS)); + result.consume(createKeyword(position, PsiKeyword.CLASS)); } addUnfinishedMethodTypeParameters(position, result); - if (JavaSmartCompletionContributor.INSIDE_EXPRESSION.accepts(position) && - !AFTER_DOT.accepts(position)) { - addExpectedTypeMembers(parameters, result); - if (SameSignatureCallParametersProvider.IN_CALL_ARGUMENT.accepts(position)) { - new SameSignatureCallParametersProvider().addCompletions(parameters, new ProcessingContext(), result); - } - } - if (JavaMemberNameCompletionContributor.INSIDE_TYPE_PARAMS_PATTERN.accepts(position)) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.EXTENDS), TailType.HUMBLE_SPACE_BEFORE_WORD)); - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.SUPER), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.EXTENDS), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.SUPER), TailType.HUMBLE_SPACE_BEFORE_WORD)); } } @@ -608,7 +600,7 @@ public class JavaCompletionData extends JavaAwareCompletionData { } } - private static void addUnfinishedMethodTypeParameters(PsiElement position, CompletionResultSet result) { + private static void addUnfinishedMethodTypeParameters(PsiElement position, final Consumer result) { final ProcessingContext context = new ProcessingContext(); if (psiElement().inside( psiElement(PsiTypeElement.class).afterLeaf( @@ -621,7 +613,7 @@ public class JavaCompletionData extends JavaAwareCompletionData { } if (current instanceof PsiClass) { for (PsiTypeParameter typeParameter : list.getTypeParameters()) { - result.addElement(new JavaPsiClassReferenceElement(typeParameter)); + result.consume(new JavaPsiClassReferenceElement(typeParameter)); } } } @@ -643,7 +635,7 @@ public class JavaCompletionData extends JavaAwareCompletionData { isAfterPrimitiveOrArrayType(position); } - private static void addPrimitiveTypes(CompletionResultSet result, PsiElement position) { + private static void addPrimitiveTypes(final Consumer result, PsiElement position) { if (AFTER_DOT.accepts(position)) { return; } @@ -653,9 +645,9 @@ public class JavaCompletionData extends JavaAwareCompletionData { if (afterNew) { PsiElementFactory factory = JavaPsiFacade.getElementFactory(position.getProject()); for (String primitiveType : PRIMITIVE_TYPES) { - result.addElement(PsiTypeLookupItem.createLookupItem(factory.createTypeFromText(primitiveType + "[]", null), null)); + result.consume(PsiTypeLookupItem.createLookupItem(factory.createTypeFromText(primitiveType + "[]", null), null)); } - result.addElement(PsiTypeLookupItem.createLookupItem(factory.createTypeFromText("void[]", null), null)); + result.consume(PsiTypeLookupItem.createLookupItem(factory.createTypeFromText("void[]", null), null)); return; } @@ -677,14 +669,14 @@ public class JavaCompletionData extends JavaAwareCompletionData { expressionPosition || isStatementPosition(position)) { for (String primitiveType : PRIMITIVE_TYPES) { - result.addElement(createKeyword(position, primitiveType)); + result.consume(createKeyword(position, primitiveType)); } } if (declaration) { - result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.VOID), TailType.HUMBLE_SPACE_BEFORE_WORD)); + result.consume(new OverrideableSpace(createKeyword(position, PsiKeyword.VOID), TailType.HUMBLE_SPACE_BEFORE_WORD)); } else if (typeFragment && ((PsiTypeCodeFragment)position.getContainingFile()).isVoidValid()) { - result.addElement(createKeyword(position, PsiKeyword.VOID)); + result.consume(createKeyword(position, PsiKeyword.VOID)); } } @@ -696,7 +688,7 @@ public class JavaCompletionData extends JavaAwareCompletionData { return psiElement().insideStarting(psiElement(PsiTypeElement.class).withParent(PsiCatchSection.class)).accepts(position); } - private static void addBreakContinue(CompletionResultSet result, PsiElement position) { + private static void addBreakContinue(Consumer result, PsiElement position) { PsiLoopStatement loop = PsiTreeUtil.getParentOfType(position, PsiLoopStatement.class); LookupElement br = createKeyword(position, PsiKeyword.BREAK); @@ -714,11 +706,11 @@ public class JavaCompletionData extends JavaAwareCompletionData { cont = TailTypeDecorator.withTail(cont, tailType); if (loop != null && new InsideElementFilter(new ClassFilter(PsiStatement.class)).isAcceptable(position, loop)) { - result.addElement(br); - result.addElement(cont); + result.consume(br); + result.consume(cont); } if (psiElement().inside(PsiSwitchStatement.class).accepts(position)) { - result.addElement(br); + result.consume(br); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy index 157e7a341be3..3781cfffcf88 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy @@ -1599,7 +1599,7 @@ class Foo { myFixture.configureByText "a.java", "class Foo {{ }}" myFixture.type('a') joinAutopopup() - myFixture.type('\na') + myFixture.type('\nf') joinCompletion() assert lookup } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy index 4c89fb35582d..116bb969dc74 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy @@ -389,7 +389,7 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase { checkResult() } - public void testFieldType() throws Throwable { doTest('\n'); } + public void testFieldType() { doTest(); } public void testPackageInAnnoParam() throws Throwable { doTest(); @@ -903,7 +903,7 @@ public class ListUtils { checkResult(); } - public void testSecondAnonymousClassParameter() throws Throwable { doTest('\n'); } + public void testSecondAnonymousClassParameter() { doTest(); } public void testSpaceAfterReturn() throws Throwable { configure() diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/VariablesCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/VariablesCompletionTest.groovy index 4bf387841eae..afd99d40dee4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/VariablesCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/VariablesCompletionTest.groovy @@ -45,7 +45,7 @@ public class VariablesCompletionTest extends LightFixtureCompletionTestCase { } public void testLocals3() throws Exception { - doSelectTest("TestSource3.java", "TestResult3.java"); + doTest("TestSource3.java", "TestResult3.java"); } public void testLocals4() throws Exception { @@ -53,7 +53,7 @@ public class VariablesCompletionTest extends LightFixtureCompletionTestCase { } public void testLocals5() throws Exception { - doSelectTest("TestSource5.java", "TestResult5.java"); + doTest("TestSource5.java", "TestResult5.java"); } public void testLocals6() throws Exception {