[formatter] keep final on the same line with annotation

java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java

@@ -652,4 +652,13 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest {
       "int x = (1 + 2 + 3) * (1 + 2 + 2) * (1 + 2);"
     );
   }
+  
+  public void testKeepFinalOnLine() {
+    doClassTest(
+      "public    static void bar(@NonNls final String[] args) {\n" +
+      "}",
+      "public static void bar(@NonNls final String[] args) {\n" +
+      "}");
+  }
+  
 }

java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java

@@ -3283,8 +3283,7 @@ public void testSCR260() throws Exception {
       "        list.clear();\n" +
       "    }\n" +
       "};",
-      "@SuppressWarnings(\"unchecked\")\n" +
-      "final List<String> list = new ArrayList<String>();\n" +
+      "@SuppressWarnings(\"unchecked\") final List<String> list = new ArrayList<String>();\n" +
       "new Runnable() {\n" +
       "    @Override\n" +
       "    public void run() {\n" +