Preserve terminal comments

cushon · cushon · commit 9fbc6e23de8d · 2016-11-23T17:47:36.000-08:00
Fixes google#101 MOE_MIGRATED_REVID=140052456
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavacTokens.java b/core/src/main/java/com/google/googlejavaformat/java/JavacTokens.java
@@ -32,6 +32,10 @@
 /** A wrapper around javac's lexer. */
 public class JavacTokens {
 
+  /** The lexer eats terminal comments, so feed it one we don't care about. */
+  // TODO(b/33103797): fix javac and remove the work-around
+  private static final CharSequence EOF_COMMENT = "\n//EOF";
+
   /** An unprocessed input token, including whitespace and comments. */
   static class RawTok {
     private final String stringVal;
@@ -74,17 +78,14 @@ public static ImmutableList<RawTok> getTokens(
       return ImmutableList.of();
     }
     ScannerFactory fac = ScannerFactory.instance(context);
-    char[] buffer = source.toCharArray();
+    char[] buffer = (source + EOF_COMMENT).toCharArray();
     Scanner scanner =
         new AccessibleScanner(fac, new CommentSavingTokenizer(fac, buffer, buffer.length));
     ImmutableList.Builder<RawTok> tokens = ImmutableList.builder();
     int last = 0;
     do {
       scanner.nextToken();
       Token t = scanner.token();
-      if (stopTokens.contains(t.kind)) {
-        break;
-      }
       if (t.comments != null) {
         for (Comment c : Lists.reverse(t.comments)) {
           if (last < c.getSourcePos(0)) {
@@ -95,6 +96,9 @@ public static ImmutableList<RawTok> getTokens(
           last = c.getSourcePos(0) + c.getText().length();
         }
       }
+      if (stopTokens.contains(t.kind)) {
+        break;
+      }
       if (last < t.pos) {
         tokens.add(new RawTok(null, null, last, t.pos));
       }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i101.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i101.input
@@ -0,0 +1 @@
+public @interface kHz {} // No prefix defined in the annotation itself
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i101.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i101.output
@@ -0,0 +1 @@
+public @interface kHz {} // No prefix defined in the annotation itself

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+public @interface kHz {} // No prefix defined in the annotation itself`