[java-intentions] CreateSwitchIntention: enable on Character, Byte, Short, and Integer

GitOrigin-RevId: 185df516fd2aba29b73b9183a58073eec4d3d118

java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSwitchIntention.java

@@ -60,18 +60,22 @@ public class CreateSwitchIntention extends BaseElementAtCaretIntentionAction imp
   }
 
   private static boolean isValidTypeForSwitch(@Nullable PsiType type, PsiElement context) {
-    if (type == null) {
-      return false;
-    }
-
     if (type instanceof PsiClassType) {
       PsiClass resolvedClass = ((PsiClassType)type).resolve();
       if (resolvedClass == null) {
         return false;
       }
-      return (PsiUtil.isLanguageLevel5OrHigher(context) && resolvedClass.isEnum())
+      return (PsiUtil.isLanguageLevel5OrHigher(context) &&
+              (resolvedClass.isEnum() || isSuitablePrimitiveType(PsiPrimitiveType.getUnboxedType(type))))
              || (PsiUtil.isLanguageLevel7OrHigher(context) && CommonClassNames.JAVA_LANG_STRING.equals(resolvedClass.getQualifiedName()));
     }
+    return isSuitablePrimitiveType(type);
+  }
+
+  private static boolean isSuitablePrimitiveType(@Nullable PsiType type) {
+    if (type == null) {
+      return false;
+    }
     return type.equals(PsiType.INT) || type.equals(PsiType.BYTE) || type.equals(PsiType.SHORT) || type.equals(PsiType.CHAR);
   }
 

java/java-tests/testData/codeInsight/createSwitch/boxedType.java

@@ -0,0 +1,10 @@
+class X {
+
+  void m() {
+
+      Byte foo = 10;
+      fo<caret>o
+
+  }
+
+}

java/java-tests/testData/codeInsight/createSwitch/boxedType_after.java

@@ -0,0 +1,11 @@
+class X {
+
+  void m() {
+
+      Byte foo = 10;
+      switch (foo) {<caret>
+      }
+
+  }
+
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/intention/CreateSwitchTest.java

@@ -47,6 +47,10 @@ public class CreateSwitchTest extends JavaCodeInsightFixtureTestCase {
     doTest();
   }
 
+  public void testBoxedType() {
+    doTest();
+  }
+
   public void testNotAvailable() {
     doTestNotAvailable();
   }