Don't add spaces to //$NON-NLS-x$ comments

Fixes #221 MOE_MIGRATED_REVID=197211890
google · May 18, 2018 · 588b108 · 588b108
1 parent 9cf8dc1
commit 588b108
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java b/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java
@@ -102,8 +102,10 @@ private String indentLineComments(List<String> lines, int column0) {
     return builder.toString();
   }
 
+  // Preserve special `//noinspection` and `//$NON-NLS-x$` comments used by IDEs, which cannot
+  // contain leading spaces.
   private static final Pattern LINE_COMMENT_MISSING_SPACE_PREFIX =
-      Pattern.compile("^(//+)(?!noinspection)[^\\s/]");
+      Pattern.compile("^(//+)(?!noinspection|\\$NON-NLS-\\d+\\$)[^\\s/]");
 
   private List<String> wrapLineComments(
       List<String> lines, int column0, JavaFormatterOptions options) {

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i221.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i221.input
@@ -0,0 +1,8 @@
+class I221 {
+  {
+    logger.log(
+        Level.WARNING,
+        "Unable to obtain jst.web facet version from selected project", //$NON-NLS-1$
+        ex);
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i221.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i221.output
@@ -0,0 +1,8 @@
+class I221 {
+  {
+    logger.log(
+        Level.WARNING,
+        "Unable to obtain jst.web facet version from selected project", //$NON-NLS-1$
+        ex);
+  }
+}