IDEA-123782 "Complete current statement" doesn't put colon for case branches

java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CaseColonFixer.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.editorActions.smartEnter;
+
+import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiSwitchLabelStatement;
+import com.intellij.util.IncorrectOperationException;
+
+/**
+ * @author peter
+ */
+public class CaseColonFixer implements Fixer {
+  @Override
+  public void apply(Editor editor, JavaSmartEnterProcessor processor, PsiElement psiElement) throws IncorrectOperationException {
+    if (psiElement instanceof PsiSwitchLabelStatement &&
+        ((PsiSwitchLabelStatement)psiElement).getCaseValue() != null &&
+        !psiElement.getText().endsWith(":")) {
+      editor.getDocument().insertString(psiElement.getTextRange().getEndOffset(), ":");
+    }
+  }
+}

java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java

@@ -58,6 +58,7 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
     fixers.add(new WhileConditionFixer());
     fixers.add(new CatchDeclarationFixer());
     fixers.add(new SwitchExpressionFixer());
+    fixers.add(new CaseColonFixer());
     fixers.add(new DoWhileConditionFixer());
     fixers.add(new BlockBraceFixer());
     fixers.add(new MissingIfBranchesFixer());

java/java-tests/testData/codeInsight/completeStatement/CaseColon.java

@@ -0,0 +1,8 @@
+
+class Foo {
+    void foo(String a) {
+        switch (a) {
+            case "asdf<caret>"
+        }
+    }
+}

java/java-tests/testData/codeInsight/completeStatement/CaseColon_after.java

@@ -0,0 +1,9 @@
+
+class Foo {
+    void foo(String a) {
+        switch (a) {
+            case "asdf":
+                <caret>
+        }
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java

@@ -201,6 +201,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
   public void testSwitchKeyword() throws Exception { doTest(); }
 
   public void testSwitchKeywordWithCondition() throws Exception { doTest(); }
+  public void testCaseColon() { doTest(); }
 
   public void testNewInParentheses() throws Exception { doTest(); }