Java: Improved inspection "Join Declaration And Assignment" (IDEA-177132)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterComment.java

@@ -1,10 +1,6 @@
 // "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
 class Test {
-    {
-        /*comment 1*/
-        /*comment 2*/
-        /*comment 3*/
-        // comment 4
+    {/*comment 1*//*comment 2*//*comment 3*/// comment 4
         // comment A
         /*comment B*/
         /*comment C*/

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterFarDeclarationComment.java

@@ -0,0 +1,11 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    void foo() {
+        /*comment 1*/
+        bar();/*comment 2*//*comment 3*///comment 4
+        // comment A
+        /*comment B*/
+        int n = 1;// comment C
+    }
+    void bar(){}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterFarDeclarationNoInitializer.java

@@ -0,0 +1,8 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    void foo() {
+        bar();
+        int n = 1;
+    }
+    void bar(){}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeDeclarationInForLoop.java

@@ -0,0 +1,8 @@
+// "Join declaration and assignment" "false"
+class C {
+    void foo(int[] a) {
+        for (int n = 0; ; <caret>n+=1) {
+            if (n >= a.length) break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeFarDeclarationComment.java

@@ -0,0 +1,11 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    void foo() {
+        /*comment 1*/int /*comment 2*/ n /*comment 3*/; //comment 4
+        bar();
+        // comment A
+        /*comment B*/
+        <caret>n = 1; // comment C
+    }
+    void bar(){}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeFarDeclarationNoInitializer.java

@@ -0,0 +1,9 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    void foo() {
+        int n;
+        bar();
+        <caret>n = 1;
+    }
+    void bar(){}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeFarDeclarationSideEffectInitializer.java

@@ -0,0 +1,9 @@
+// "Join declaration and assignment" "false"
+class C {
+    void foo() throws Exception {
+        int n = System.in.read();
+        bar();
+        <caret>n = 1;
+    }
+    void bar(){}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeFarDeclarationVariableUsed.java

@@ -0,0 +1,9 @@
+// "Join declaration and assignment" "false"
+class C {
+    void foo() {
+        int n = 0;
+        bar(n);
+        <caret>n = 1;
+    }
+    void bar(int i){}
+}