Merge remote-tracking branch 'origin/master'

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterBlocksInSameMethod.java

@@ -1,4 +1,4 @@
-// "Convert field to local variable in method 'IntelliJBugConvertToLocal'" "true"
+// "Convert field to local variable in constructor" "true"
 import java.util.ArrayList;
 
 class ITest {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterFinalFieldIsCopy.java

@@ -1,4 +1,4 @@
-// "Convert field to local variable in method 'Test'" "true"
+// "Convert field to local variable in constructor" "true"
 class Test {
 
     public Test(String param) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterInitializer.java

@@ -1,4 +1,4 @@
-// "Convert to local" "true"
+// "Convert field to local variable in initializer section" "true"
 class TestInitializer {
 
     {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterMultipleMethods.java

@@ -1,4 +1,4 @@
-// "Convert field to local variables in 2 methods" "true"
+// "Convert to local" "true"
 class Test {
 
     int getFoo1() {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterSetterAfterSuperConstructorCall.java

@@ -1,4 +1,4 @@
-// "Convert field to local variable in method 'FieldCanBeLocalTest'" "true"
+// "Convert field to local variable in constructor" "true"
 
 import javax.swing.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeBlocksInSameMethod.java

@@ -1,4 +1,4 @@
-// "Convert field to local variable in method 'IntelliJBugConvertToLocal'" "true"
+// "Convert field to local variable in constructor" "true"
 import java.util.ArrayList;
 
 class ITest {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeFinalFieldIsCopy.java

@@ -1,4 +1,4 @@
-// "Convert field to local variable in method 'Test'" "true"
+// "Convert field to local variable in constructor" "true"
 class Test {
 
   private final String f<caret>ield;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeInitializer.java

@@ -1,4 +1,4 @@
-// "Convert to local" "true"
+// "Convert field to local variable in initializer section" "true"
 class TestInitializer {
 
   private boolean fie<caret>ld;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeMultipleMethods.java

@@ -1,4 +1,4 @@
-// "Convert field to local variables in 2 methods" "true"
+// "Convert to local" "true"
 class Test {
   private int my<caret>Foo;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeMultipleMethodsOnReadOnly.java

@@ -1,4 +1,4 @@
-// "Convert to local" "false"
+// "Fix all 'Field can be local' problems in file" "false"
 class MyClassTest {
 
   private boolean edit<caret>able = false;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeSetterAfterSuperConstructorCall.java

@@ -1,4 +1,4 @@
-// "Convert field to local variable in method 'FieldCanBeLocalTest'" "true"
+// "Convert field to local variable in constructor" "true"
 
 import javax.swing.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeUsedInJavadoc.java

@@ -1,4 +1,4 @@
-// "Convert to local" "false"
+// "Fix all 'Field can be local' problems in file" "false"
 class TestFieldConversion
 {
   private static int som<caret>eInt = 0;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterComments.java

@@ -5,6 +5,8 @@ class Example {
 
   {
       //my comments here
+      //1
+      //2
       Runnable r = this::m
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeComments.java

@@ -6,7 +6,10 @@ class Example {
   {
     Runnable r = () -> {
       //my comments here
-      m<caret>();
+      m<caret>()
+      //1
+      //2
+      ;
     }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterDefalutLabel.java

@@ -0,0 +1,15 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            case 2:
+                s = "x";
+                break;
+            default:
+                s = "x";
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterNonDefalutLabel.java

@@ -0,0 +1,15 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            default:
+            case 2:
+                s = "x";
+                break;
+            case 1:
+                s = "x";
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeDefalutLabel.java

@@ -0,0 +1,13 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            <caret>default:
+            case 2:
+                s = "x";
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeNonDefalutLabel.java

@@ -0,0 +1,13 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            <caret>case 1:
+            default:
+            case 2:
+                s = "x";
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/filter/afterFilterFlatMapCollectionFilterMapCollect.java

@@ -4,7 +4,8 @@ import java.util.stream.Collectors;
 
 public class Main {
   public void test(List<Set<String>> nested) {
-      /*non-equal*//*empty*/
+      /*non-equal*/
+      /*empty*/
       List<String> result = nested.stream().filter(Objects::nonNull).flatMap(Collection::stream).filter(str -> str./*startswith*/startsWith("xyz")).map(String::trim).collect(Collectors.toList());
       // 1
       /*target is here*/

java/java-tests/testData/inspection/dataFlow/fixture/ComplexInitializer.java

@@ -63,7 +63,7 @@ class Constants {
   static native Object get();
 }
 
-class NotTooComplexInitializer {
+class <weak_warning descr="Class initializer is complex: data flow results could be imprecise">NotTooComplexInitializer</weak_warning> {
   static {
     int i = 1;
     for(Object obj = Constants.get(); obj != Constants.C5; obj = Constants.get()) {
@@ -84,7 +84,7 @@ class NotTooComplexInitializer {
     }
   }
 }
-class NotTooComplexMergingInitializer {
+class <weak_warning descr="Class initializer is complex: data flow results could be imprecise">NotTooComplexMergingInitializer</weak_warning> {
   static {
     foo(Constants.C1 == null, Constants.C2 == null, Constants.C3 == null,
                   Constants.C4 == null, Constants.C5 == null, Constants.C6 == null,

java/java-tests/testData/inspection/dataFlow/fixture/EqualsInLoopNotTooComplex.java

@@ -4,7 +4,7 @@ class Test {
   enum A {X, Y, Z};
   List<String> list1, list2;
   
-  void test(List<String> tokens) {
+  void <weak_warning descr="Method 'test' is complex: data flow results could be imprecise">test</weak_warning>(List<String> tokens) {
     String t = "int";
     A s = A.X;
     A l = A.X;

java/java-tests/testData/inspection/dataFlow/fixture/ManyObjectEquals.java

@@ -191,7 +191,7 @@ public class ManyObjectEquals {
   private String test183;
 
   @Override
-  public boolean equals(Object o) {
+  public boolean <weak_warning descr="Method 'equals' is complex: data flow results could be imprecise">equals</weak_warning>(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     ManyObjectEquals test = (ManyObjectEquals) o;

java/java-tests/testData/inspection/dataFlow/fixture/NestedScopeComplexity.java

@@ -30,7 +30,7 @@ class NestedScopeComplexity {
 
   static Object get() {return new Object();}
 
-  void test() {
+  void <weak_warning descr="Method 'test' is complex: data flow results could be imprecise">test</weak_warning>() {
     int i = 1;
     for(Object obj = get(); obj != C100; obj = get()) {
       if (obj == C1) i = 2;

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/CaseLabelsExpression.java

@@ -6,7 +6,7 @@ class C {
       case 2:
         break "b";
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' expression">break "a";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">break "a";</weak_warning>
       default:
         break "";
     };

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/CaseLabelsExpressionDefaultFirst.java

@@ -7,7 +7,7 @@ class C {
       case 2:
         break "b";
       case 3:
-        <weak_warning descr="Branch in 'switch' expression is a duplicate of the default branch">break "a";</weak_warning>
+        <weak_warning descr="Branch in 'switch' is a duplicate of the default branch">break "a";</weak_warning>
     };
   }
 }

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/CaseLabelsExpressionDefaultLast.java

@@ -2,7 +2,7 @@ class C {
   void test(int n) {
     String s = switch (n) {
       case 1:
-        <weak_warning descr="Branch in 'switch' expression is a duplicate of the default branch">break "a";</weak_warning>
+        <weak_warning descr="Branch in 'switch' is a duplicate of the default branch">break "a";</weak_warning>
       case 2:
         break "b";
       case 3:

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/CaseLabelsExpressionSameComments.java

@@ -6,7 +6,7 @@ class C {
       case 2:
         break "b";
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' expression">break "a"; // same comment</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">break "a"; // same comment</weak_warning>
       default:
         break "";
     };

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/ExpressionParentheses.java

@@ -2,7 +2,7 @@ class C {
   String test(int i) {
     return switch (i) {
       case 0 -> null;
-      case 1 -> <weak_warning descr="Duplicate result expression in 'switch' expression">(null);</weak_warning>
+      case 1 -> <weak_warning descr="Duplicate branch in 'switch'">(null);</weak_warning>
       default -> "";
     };
   }

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/ReturnInStatement.java

@@ -3,7 +3,7 @@ class C {
     return switch (n) {
       case 1 -> "A";
       case 2 -> "B";
-      case 3 -> <weak_warning descr="Duplicate result expression in 'switch' expression">"A";</weak_warning>
+      case 3 -> <weak_warning descr="Duplicate branch in 'switch'">"A";</weak_warning>
       default -> "";
     };
   }

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/SimpleExpression.java

@@ -3,7 +3,7 @@ class C {
     String string = switch (n) {
         case 1 -> bar("A");
         case 2 -> bar("B");
-        case 3 -> <weak_warning descr="Duplicate result expression in 'switch' expression">bar("A");</weak_warning>
+        case 3 -> <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
         default -> "";
       };
   }

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/SimpleStatement.java

@@ -3,7 +3,7 @@ class C {
     switch (n) {
       case 1 -> bar("A");
       case 2 -> bar("B");
-      case 3 -> <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+      case 3 -> <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
     }
   }
   void bar(String s){}

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/StatementParentheses.java

@@ -4,7 +4,7 @@ class C {
       case 0 ->{
         return null;
       }
-      case 1 -><weak_warning descr="Duplicate branch in 'switch' statement">{
+      case 1 -><weak_warning descr="Duplicate branch in 'switch'">{
         return (null);
       }</weak_warning>
     }

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/ThrowInExpression.java

@@ -3,7 +3,7 @@ class C {
     String string = switch (n) {
       case 1 -> throw new IllegalArgumentException();
       case 2 -> throw new IllegalStateException();
-      case 3 -> <weak_warning descr="Duplicate branch in 'switch' expression">throw new IllegalArgumentException();</weak_warning>
+      case 3 -> <weak_warning descr="Duplicate branch in 'switch'">throw new IllegalArgumentException();</weak_warning>
       default -> "";
     };
   }

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitch/ThrowInStatement.java

@@ -3,7 +3,7 @@ class C {
     switch (n) {
       case 1 -> throw new IllegalArgumentException();
       case 2 -> throw new IllegalStateException();
-      case 3 -> <weak_warning descr="Duplicate branch in 'switch' statement">throw new IllegalArgumentException();</weak_warning>
+      case 3 -> <weak_warning descr="Duplicate branch in 'switch'">throw new IllegalArgumentException();</weak_warning>
     }
   }
 }

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitchFix/afterExpressionDuplicateAfterDefaultDelete.java

@@ -1,4 +1,4 @@
-// "Delete redundant 'switch' result expression" "GENERIC_ERROR_OR_WARNING"
+// "Delete redundant 'switch' branch" "GENERIC_ERROR_OR_WARNING"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitchFix/afterExpressionDuplicateBeforeDefaultDelete.java

@@ -1,4 +1,4 @@
-// "Delete redundant 'switch' result expression" "GENERIC_ERROR_OR_WARNING"
+// "Delete redundant 'switch' branch" "GENERIC_ERROR_OR_WARNING"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitchFix/afterExpressionDuplicateBeforeDefaultDeleteAdjacent.java

@@ -1,4 +1,4 @@
-// "Delete redundant 'switch' result expression" "GENERIC_ERROR_OR_WARNING"
+// "Delete redundant 'switch' branch" "GENERIC_ERROR_OR_WARNING"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitchFix/beforeExpressionDuplicateAfterDefaultDelete.java

@@ -1,4 +1,4 @@
-// "Delete redundant 'switch' result expression" "GENERIC_ERROR_OR_WARNING"
+// "Delete redundant 'switch' branch" "GENERIC_ERROR_OR_WARNING"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitchFix/beforeExpressionDuplicateBeforeDefaultDelete.java

@@ -1,4 +1,4 @@
-// "Delete redundant 'switch' result expression" "GENERIC_ERROR_OR_WARNING"
+// "Delete redundant 'switch' branch" "GENERIC_ERROR_OR_WARNING"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/inspection/duplicateBranchesInEnhancedSwitchFix/beforeExpressionDuplicateBeforeDefaultDeleteAdjacent.java

@@ -1,4 +1,4 @@
-// "Delete redundant 'switch' result expression" "GENERIC_ERROR_OR_WARNING"
+// "Delete redundant 'switch' branch" "GENERIC_ERROR_OR_WARNING"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/inspection/duplicateBranchesInSwitch/Assignment.java

@@ -3,8 +3,8 @@ class C {
     String s;
     switch (n) {
       case 0: s = a(); break;
-      case 1: <weak_warning descr="Duplicate branch in 'switch' statement">s = a();</weak_warning> break;
-      case 2: <weak_warning descr="Branch in 'switch' statement is a duplicate of the default branch">s = b();</weak_warning> break;
+      case 1: <weak_warning descr="Duplicate branch in 'switch'">s = a();</weak_warning> break;
+      case 2: <weak_warning descr="Branch in 'switch' is a duplicate of the default branch">s = b();</weak_warning> break;
       default: s = b();
     }
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/BreakAndReturnUnderIf.java

@@ -14,7 +14,7 @@ class C {
           break;
         }
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">if(b) {
+        <weak_warning descr="Duplicate branch in 'switch'">if(b) {
           return bar("A");
         } else {
           break;

java/java-tests/testData/inspection/duplicateBranchesInSwitch/ComplexBranches.java

@@ -18,7 +18,7 @@ class C {
         bar("o");
         break;
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">if(b) {
+        <weak_warning descr="Duplicate branch in 'switch'">if(b) {
           bar("A");
         } else {
           bar("z");

java/java-tests/testData/inspection/duplicateBranchesInSwitch/Continue.java

@@ -9,7 +9,7 @@ class C {
         case 2:
           continue;
         case 3:
-          <weak_warning descr="Duplicate branch in 'switch' statement">s += i;
+          <weak_warning descr="Duplicate branch in 'switch'">s += i;
           continue;</weak_warning>
         default:
           s += i;

java/java-tests/testData/inspection/duplicateBranchesInSwitch/DuplicateAfterDefault.java

@@ -8,7 +8,7 @@ class C {
         bar("A");
         break;
       case 1:
-        <weak_warning descr="Branch in 'switch' statement is a duplicate of the default branch">bar("A");</weak_warning>
+        <weak_warning descr="Branch in 'switch' is a duplicate of the default branch">bar("A");</weak_warning>
         break;
     }
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/FallThroughToBreak.java

@@ -6,10 +6,10 @@ class C {
       case 2:
         break;
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
         break;
       case 4:
-        <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
       case 5:
     }
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/ManySimilarBranches.java

@@ -13,7 +13,7 @@ class C {
       case 6: bar("F");break;
       case 7: bar("G");break;
       case 8: bar("H");break;
-      case 9: <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>break;
+      case 9: <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>break;
 
       case 11: return Collections.singletonMap(k + 1, Collections.singletonList("A"));
       case 12: return Collections.singletonMap(k + 2, Collections.singletonList("B"));
@@ -23,7 +23,7 @@ class C {
       case 16: return Collections.singletonMap(k + 6, Collections.singletonList("F"));
       case 17: return Collections.singletonMap(k + 7, Collections.singletonList("G"));
       case 18: return Collections.singletonMap(k + 8, Collections.singletonList("H"));
-      case 19: <weak_warning descr="Duplicate branch in 'switch' statement">return Collections.singletonMap(k + 1, Collections.singletonList("A"));</weak_warning>
+      case 19: <weak_warning descr="Duplicate branch in 'switch'">return Collections.singletonMap(k + 1, Collections.singletonList("A"));</weak_warning>
 
       case 21: synchronized (lock) { bar("A"); }break;
       case 22: synchronized (lock) { bar("B"); }break;
@@ -33,7 +33,7 @@ class C {
       case 26: synchronized (lock) { bar("F"); }break;
       case 27: synchronized (lock) { bar("G"); }break;
       case 28: synchronized (lock) { bar("H"); }break;
-      case 29: <weak_warning descr="Duplicate branch in 'switch' statement">synchronized (lock) { bar("A"); }</weak_warning>break;
+      case 29: <weak_warning descr="Duplicate branch in 'switch'">synchronized (lock) { bar("A"); }</weak_warning>break;
 
       case 31: assert k == 1;break;
       case 32: assert k == 2;break;
@@ -43,36 +43,36 @@ class C {
       case 36: assert k == 6;break;
       case 37: assert k == 7;break;
       case 38: assert k == 8;break;
-      case 39: <weak_warning descr="Duplicate branch in 'switch' statement">assert k == 1;</weak_warning>break;
+      case 39: <weak_warning descr="Duplicate branch in 'switch'">assert k == 1;</weak_warning>break;
 
       case 41: if (k > 0) bar("A"); else bar("B");break;
-      case 42: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 43: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 44: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 45: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 46: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 47: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 48: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 49: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 50: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 51: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 52: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 53: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 54: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 55: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 56: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 57: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 58: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 59: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 61: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 62: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 63: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 64: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 65: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 66: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 67: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 68: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
-      case 69: <weak_warning descr="Duplicate branch in 'switch' statement">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 42: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 43: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 44: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 45: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 46: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 47: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 48: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 49: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 50: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 51: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 52: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 53: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 54: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 55: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 56: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 57: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 58: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 59: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 61: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 62: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 63: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 64: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 65: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 66: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 67: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 68: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
+      case 69: <weak_warning descr="Duplicate branch in 'switch'">if (k > 0) bar("A"); else bar("B");</weak_warning>break;
     }
     return Collections.emptyMap();
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/MethodCallInReturn.java

@@ -7,10 +7,10 @@ enum T {
         return t.ordinal(); // comment 1
 
       case B:
-        <weak_warning descr="Duplicate branch in 'switch' statement">return t.ordinal();</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return t.ordinal();</weak_warning>
 
       case C:
-        <weak_warning descr="Duplicate branch in 'switch' statement">return t.ordinal(); // comment 2</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return t.ordinal(); // comment 2</weak_warning>
 
       default:
         return 0;

java/java-tests/testData/inspection/duplicateBranchesInSwitch/NoLastBreak.java

@@ -8,7 +8,7 @@ class C {
         bar("B");
         break;
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
     }
   }
   void bar(String s){}

java/java-tests/testData/inspection/duplicateBranchesInSwitch/Parentheses.java

@@ -2,7 +2,7 @@ class C {
   String test(int i) {
     switch (i) {
       case 0: return null;
-      case 1: <weak_warning descr="Duplicate branch in 'switch' statement">return (null);</weak_warning>
+      case 1: <weak_warning descr="Duplicate branch in 'switch'">return (null);</weak_warning>
     }
     return "";
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/Return.java

@@ -6,7 +6,7 @@ class C {
       case 2:
         return "B";
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">return "A";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return "A";</weak_warning>
     }
     return "";
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/ReturnWithComments.java

@@ -13,24 +13,24 @@ enum C {
         return "A";
       case LINE_COMMENT:
         // comment 1
-        <weak_warning descr="Duplicate branch in 'switch' statement">return "A";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return "A";</weak_warning>
       case COMMENT_INSIDE_THE_CODE:
-        <weak_warning descr="Duplicate branch in 'switch' statement">return /* comment 1 */"A";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return /* comment 1 */"A";</weak_warning>
       case JAVADOC_COMMENT:
         /** comment 1 */
-        <weak_warning descr="Duplicate branch in 'switch' statement">return "A";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return "A";</weak_warning>
       case COMMENT_WITH_NEW_LINES:
         /*
         comment 1
         */
-        <weak_warning descr="Duplicate branch in 'switch' statement">return "A";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return "A";</weak_warning>
       case EMPTY_COMMENTS_ARE_IGNORED:
         /* comment 1 */
         //
-        <weak_warning descr="Duplicate branch in 'switch' statement">return "A";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return "A";</weak_warning>
       // comment 1
       case COMMENT_RIGHT_BEFORE_A_CASE_IS_ATTACHED_TO_THAT_CASE:
-        <weak_warning descr="Duplicate branch in 'switch' statement">return "A";</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">return "A";</weak_warning>
     }
     return "";
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/Simple.java

@@ -8,7 +8,7 @@ class C {
         bar("B");
         break;
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
         break;
     }
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/ThreeDuplicates.java

@@ -8,10 +8,10 @@ class C {
         bar("B");
         break;
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
         break;
       case 4:
-        <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
         break;
     }
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/ThreeDuplicatesDefault.java

@@ -2,13 +2,13 @@ class C {
   void foo(int n) {
     switch (n) {
       case 1:
-        <weak_warning descr="Branch in 'switch' statement is a duplicate of the default branch">bar("A");</weak_warning>
+        <weak_warning descr="Branch in 'switch' is a duplicate of the default branch">bar("A");</weak_warning>
         break;
       case 2:
         bar("B");
         break;
       case 3:
-        <weak_warning descr="Branch in 'switch' statement is a duplicate of the default branch">bar("A");</weak_warning>
+        <weak_warning descr="Branch in 'switch' is a duplicate of the default branch">bar("A");</weak_warning>
         break;
       default:
         bar("A");

java/java-tests/testData/inspection/duplicateBranchesInSwitch/Throw.java

@@ -6,7 +6,7 @@ class C {
       case 2:
         throw new IllegalStateException("A");
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">throw new IllegalArgumentException("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">throw new IllegalArgumentException("A");</weak_warning>
     }
     return "";
   }

java/java-tests/testData/inspection/duplicateBranchesInSwitch/TwoCaseLabels.java

@@ -6,7 +6,7 @@ class C {
         bar("A");
         break;
       case 3:
-        <weak_warning descr="Duplicate branch in 'switch' statement">bar("A");</weak_warning>
+        <weak_warning descr="Duplicate branch in 'switch'">bar("A");</weak_warning>
         break;
       case 4:
         bar("B");

java/java-tests/testData/inspection/streamApiCallChains/afterEntrySetAdvanced.java

@@ -34,7 +34,8 @@ class Scratch {
   }
 
   void testDecl(Map<String, String> map) {
-      /*5*//*6*/
+      /*5*/
+      /*6*/
       String res = map.values(/*0*/).stream().filter(val1 -> {
           /*1*/
           return !val1./*2*/isEmpty();

java/java-tests/testData/refactoring/introduceVariable/FromSwitchStatementJava12Preview.after.java

@@ -0,0 +1,8 @@
+class MyTest {
+    {
+        String temp = switch (0) {
+            default:
+                break "";
+        };
+    }
+}

java/java-tests/testData/refactoring/introduceVariable/FromSwitchStatementJava12Preview.java

@@ -0,0 +1,7 @@
+class MyTest {
+    {
+        <selection>switch (0) {
+            default: break "";
+        }</selection>
+    }
+}