Java files always end with a new line (#1433)

Java files always end with a new line

Author: crogoz

palantir-java-format-jdk-bootstrap/src/test/java/com/palantir/javaformat/bootstrap/FormatterServicesTest.java

@@ -22,6 +22,7 @@
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
+import com.palantir.javaformat.Utils;
 import com.palantir.javaformat.java.FormatterException;
 import com.palantir.javaformat.java.FormatterService;
 import com.palantir.javaformat.java.Replacement;
@@ -48,6 +49,8 @@ void can_format_file_with_replacement(FormatterService formatterService) throws
 
         assertThat(replacements).hasSize(1);
         assertThat(replacements.get(0).getReplacementString()).isEqualTo(expectedOutput);
+
+        assertThat(Utils.applyReplacements(input, replacements)).isEqualTo(expectedOutput);
     }
 
     @ParameterizedTest

palantir-java-format-jdk-bootstrap/src/test/resources/format.input

@@ -9,4 +9,4 @@ class B {
         break;
     }
   }
-}
+}

palantir-java-format/src/main/java/com/palantir/javaformat/java/CommandLineOptionsParser.java

@@ -79,7 +79,7 @@ static CommandLineOptions parse(Iterable<String> options) {
                 case "-character-ranges":
                 case "--character-range":
                 case "-character-range":
-                    parseRangeSet(optionsBuilder.characterRangesBuilder(), getValue(flag, it, value));
+                    parseCharacterRanges(optionsBuilder.characterRangesBuilder(), getValue(flag, it, value));
                     break;
                 case "--offset":
                 case "-offset":
@@ -163,6 +163,35 @@ private static String getValue(String flag, Iterator<String> it, @Nullable Strin
         return it.next();
     }
 
+    /**
+     * Parse multiple --character-ranges flags, like {"0:12,14,20:36", "0:45,50"}. Multiple ranges can be given with multiple
+     * --character-ranges flags or separated by commas. A single character can be set by a single number.
+     * See more details on how character ranges are set in {@code com.palantir.javaformat.bootstrap.RangeUtils}
+     */
+    private static void parseCharacterRanges(ImmutableRangeSet.Builder<Integer> result, String ranges) {
+        for (String range : COMMA_SPLITTER.split(ranges)) {
+            result.add(parseCharacterRange(range));
+        }
+    }
+
+    /**
+     * Parse a character range, as in "0:45" or "45". Character ranges provided are {@code 0}-based, closed ranges.
+     */
+    private static Range<Integer> parseCharacterRange(String range) {
+        List<String> args = COLON_SPLITTER.splitToList(range);
+        switch (args.size()) {
+            case 1:
+                int lowerUpperRange = Integer.parseInt(args.get(0));
+                return Range.closed(lowerUpperRange, lowerUpperRange);
+            case 2:
+                int lower = Integer.parseInt(args.get(0));
+                int higher = Integer.parseInt(args.get(1));
+                return Range.closed(lower, higher);
+            default:
+                throw new IllegalArgumentException(range);
+        }
+    }
+
     /**
      * Parse multiple --lines flags, like {"1:12,14,20:36", "40:45,50"}. Multiple ranges can be given with multiple
      * --lines flags or separated by commas. A single line can be set by a single number. Line numbers are

palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

@@ -384,6 +384,8 @@ public Void visitCompilationUnit(CompilationUnitTree node, Void unused) {
         handleModule(first, node);
         // set a partial format marker at EOF to make sure we can format the entire file
         markForPartialFormat();
+        // Ensure the file ends with a newline
+        builder.forcedBreak();
         return null;
     }
 

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/JavaFileNoNewLine.input

@@ -0,0 +1,3 @@
+class MyClass {
+    private void myFile() {}
+}

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/JavaFileNoNewLine.output

@@ -0,0 +1,3 @@
+class MyClass {
+    private void myFile() {}
+}

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/JavaFileWithExtraSpaces.input

@@ -0,0 +1,3 @@
+class MyClass {
+    private void myFile() {}
+}    

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/JavaFileWithExtraSpaces.output

@@ -0,0 +1,3 @@
+class MyClass {
+    private void myFile() {}
+}

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/JavaFileWithMultipleLines.input

@@ -0,0 +1,7 @@
+class MyClass {
+    private void myFile() {}
+}
+
+
+
+

palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/JavaFileWithMultipleLines.output

@@ -0,0 +1,3 @@
+class MyClass {
+    private void myFile() {}
+}