IDEA-242810 Add colon to completion after "case" keyword

GitOrigin-RevId: 3b908b2eed06b41e08ef1c739d90a299389db8c9
This commit is contained in:
Peter Gromov
2020-06-09 17:17:28 +03:00
committed by intellij-monorepo-bot
parent f4618a1246
commit 824259dfc0
5 changed files with 22 additions and 8 deletions
@@ -481,13 +481,9 @@ public class JavaCompletionContributor extends CompletionContributor {
MultiMap<CompletionResultSet, LookupElement> items = MultiMap.create();
final PsiElement position = parameters.getPosition();
final boolean first = parameters.getInvocationCount() <= 1;
final TailType switchLabelTail;
if (IN_ENUM_SWITCH_LABEL.accepts(position)) {
PsiSwitchBlock block = Objects.requireNonNull(PsiTreeUtil.getParentOfType(position, PsiSwitchBlock.class));
switchLabelTail = TailTypes.forSwitchLabel(block);
} else {
switchLabelTail = null;
}
final TailType switchLabelTail = IN_SWITCH_LABEL.accepts(position)
? TailTypes.forSwitchLabel(Objects.requireNonNull(PsiTreeUtil.getParentOfType(position, PsiSwitchBlock.class)))
: null;
final boolean isAfterNew = JavaClassNameCompletionContributor.AFTER_NEW.accepts(position);
final boolean pkgContext = JavaCompletionUtil.inSomePackage(position);
final PsiType[] expectedTypes = ExpectedTypesGetter.getExpectedTypes(parameters.getPosition(), true);
@@ -0,0 +1,8 @@
class Main {
public static final String STRING_CONSTANT = "abc";
public static void main(String[] args) {
switch (args[0]) {
case STRC<caret>
}
}
}
@@ -0,0 +1,8 @@
class Main {
public static final String STRING_CONSTANT = "abc";
public static void main(String[] args) {
switch (args[0]) {
case STRING_CONSTANT:<caret>
}
}
}
@@ -1,7 +1,7 @@
public class Demo {
void foo(Integer i){
switch(i) {
case Types.CHAR<caret>
case Types.CHAR:<caret>
}
}
}
@@ -1998,4 +1998,6 @@ class Abc {
myFixture.type('\n')
checkResult()
}
void testCaseColonAfterStringConstant() { doTest() }
}