SortContentAction: fix \n placement, better layout

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterEnumComments.java

@@ -1,13 +1,13 @@
 // "Sort content" "true"
 
 public enum OSType {
-    LINUX// linux
+    LINUX // linux
     ,
 
-    MAC//mac
+    MAC //mac
     ,
-    WIN//after win
-// win
+    WIN //after win
+    // win
 
 
     ;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterEnumComments2.java

@@ -4,6 +4,6 @@ public enum Enum {
     A,
 
     B,
-    C// foo
+    C // foo
     ;
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterMultipleOnLineComments.java

@@ -7,8 +7,8 @@ public class Main {
     new String[]{
             "aaa", // a
             "bbb",
-            "ccc"/* c */, "dd", // d
-            "ff"// f
+            "ccc" /* c */, "dd", // d
+            "ff" // f
     };
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringArrayComments.java

@@ -7,7 +7,7 @@ public class Main {
     new String[]{
             "aaa", // a
             "bbb", // b
-            "ccc"/* c */
+            "ccc" /* c */
     };
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringArrayComments2.java

@@ -0,0 +1,11 @@
+// "Sort content" "true"
+
+import java.util.*;
+
+public class Main {
+  private void test() {
+    String[] s = new String[]{"a", "b",
+            "c" //simple end comment
+    };
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringArrayCommentsLast.java

@@ -7,6 +7,6 @@ public class Main {
     new String[]{
             "aaa", // a
             "bbb", // b
-            "ccc"/* c */};
+            "ccc" /* c */};
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringArrayCommentsLayout.java

@@ -11,7 +11,7 @@ public class Main {
 
             "Martinez", "Miller", "Moore", "Robinson", "Rodriguez", "Smith", "Taylor",
             "Thomas", "Thompson", "Walker", "White", //B
-            "Williams", "Wilson", "Young"//Z
+            "Williams", "Wilson", "Young" //Z
 
     };
   }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringComments.java

@@ -10,8 +10,7 @@ public class Test {
 
           "100+10",
           "100+3..999",
-          "100..999"//simple end comment
+          "100..999" //simple end comment
           //simple end comment
-
   };
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringVarargComments.java

@@ -10,10 +10,10 @@ public class Main {
             // 4
             "bar",
 
-            "baz"// 7
-// 8
+            "baz" // 7
+            // 8
             ,
-            "foo"/*3*/ // 2
+            "foo" /*3*/ // 2
             // 5
 
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringVarargComments2.java

@@ -10,7 +10,7 @@ public class Main {
             "aaa",
             "bbb",
 
-            "ccc"//comment
+            "ccc" //comment
     );
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/beforeStringArrayComments2.java

@@ -0,0 +1,10 @@
+// "Sort content" "true"
+
+import java.util.*;
+
+public class Main {
+  private void test() {
+    String[] s = new String[]{"a",<caret> "c"//simple end comment
+      , "b"};
+  }
+}