Java: Better handling of unreachable code (IDEA-172642)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementWithExpression.java

@@ -0,0 +1,93 @@
+class WithCondition {
+
+  void testIf1(boolean b) {
+    return;
+    <error descr="Unreachable statement">if</error> (b) {
+      System.out.println("Never");
+    }
+    else {
+      System.out.println("Never ever");
+    }
+  }
+
+  void testIf2(boolean b) {
+    return;
+    <error descr="Unreachable statement">if</error> ((b)) {
+      System.out.println("Never");
+    }
+  }
+
+  void testSwitch(int b) {
+    return;
+    <error descr="Unreachable statement">switch</error> (b) {
+      case 1:
+        System.out.println("Never");
+    }
+  }
+
+  void testFor1(int b) {
+    return;
+    <error descr="Unreachable statement">for</error> (int i = 0; i < b; i++) {
+      System.out.println("Never");
+    }
+  }
+
+  void testFor2(int b) {
+    int i;
+    return;
+    <error descr="Unreachable statement">for</error> (i = 0; i < b; i++) {
+      System.out.println("Never");
+    }
+  }
+
+  void testFor3(int b) {
+    int i = 0;
+    return;
+    <error descr="Unreachable statement">for</error> (i++; i < b; i++) {
+      System.out.println("Never");
+    }
+  }
+
+  void testFor3(boolean b) {
+    return;
+    <error descr="Unreachable statement">for</error> (; b; ) {
+      System.out.println("Never");
+    }
+  }
+
+  void testFor4() {
+    return;
+    <error descr="Unreachable statement">for</error> (; ; ) {
+      System.out.println("Never");
+    }
+  }
+
+  void testFor5() {
+    int i = 0;
+    return;
+    <error descr="Unreachable statement">for</error> (; ; i++) {
+      System.out.println("Never");
+    }
+  }
+
+  void testWhile(boolean b) {
+    return;
+    <error descr="Unreachable statement">while</error> (b) {
+      System.out.println("Never");
+    }
+  }
+
+  void testDoWhile1(boolean b) {
+    return;
+    <error descr="Unreachable statement">do</error> System.out.println("Never");
+    while (b);
+  }
+
+  void testDoWhile2(boolean b) {
+    return;
+    <error descr="Unreachable statement">do</error> {
+      System.out.println("Never");
+    }
+    while (b);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/StatementWithExpression.java

@@ -0,0 +1,10 @@
+class WithCondition {
+  void testForEach() {
+    return;
+    <error descr="Unreachable statement">for</error> (int i: this.array()) {
+      System.out.println("Never");
+    }
+  }
+
+  int[] array() { return new int[0]; }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/afterCall.java

@@ -0,0 +1,6 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(int n) {
+    return;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/afterDoWhile.java

@@ -0,0 +1,6 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(boolean b) {
+    return;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/afterFor.java

@@ -0,0 +1,6 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo() {
+    return;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/afterIf.java

@@ -0,0 +1,6 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(boolean b) {
+    return;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/afterSwitch.java

@@ -0,0 +1,6 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(int n) {
+    return;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/beforeCall.java

@@ -0,0 +1,7 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(int n) {
+    return;
+    <caret>System.out.println(n);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/beforeDoWhile.java

@@ -0,0 +1,10 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(boolean b) {
+    return;
+    <caret>do {
+      System.out.println("Never");
+    }
+    while (b);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/beforeFor.java

@@ -0,0 +1,9 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo() {
+    return;
+    <caret>for (int i = 0; i < 2; i++) {
+      System.out.println("Never");
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/beforeIf.java

@@ -0,0 +1,11 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(boolean b) {
+    return;
+    <caret>if (b) {
+      System.out.println("Never");
+    } else {
+      System.out.println("Never ever");
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteUnreachable/beforeSwitch.java

@@ -0,0 +1,10 @@
+// "Delete unreachable statement" "true"
+class Never {
+  void foo(int n) {
+    return;
+    <caret>switch (n) {
+      case 1:
+        System.out.println("Never");
+    }
+  }
+}