rework code

jhipster · Nov 14, 2019 · 180de0c · 180de0c
1 parent f744c9f
commit 180de0c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/packages/java-parser/src/comments.js b/packages/java-parser/src/comments.js
@@ -158,7 +158,7 @@ function shouldIgnore(node, comments, ignoredNodes) {
 function filterFormatterOffOn(comments) {
   return [...comments].filter(comment =>
     comment.image.match(
-      /(\/\/(\s*)@formatter:off(\s*))|(\/\*(\s*)@formatter:off(\s*)\*\/)|(\/\/(\s*)@formatter:on(\s*))|(\/\*(\s*)@formatter:on(\s*)\*\/)/gm
+      /(\/\/(\s*)@formatter:(off|on)(\s*))|(\/\*(\s*)@formatter:(off|on)(\s*)\*\/)/gm
     )
   );
 }
@@ -168,9 +168,8 @@ function matchFormatterOffOnPair(comments) {
   let isCurrentCommentOff = true;
   const pairs = [];
   let paired = {};
-  comments.forEach((comment, index, array) => {
-    isCurrentCommentOff =
-      comment.image.slice(comment.image.length - 3) === "off";
+  comments.forEach(comment => {
+    isCurrentCommentOff = comment.image.slice(-3) === "off";
 
     if (!isPreviousCommentOff) {
       if (isCurrentCommentOff) {
@@ -183,22 +182,20 @@ function matchFormatterOffOnPair(comments) {
         paired = {};
       }
     }
-
-    if (index === array.length - 1 && isCurrentCommentOff) {
-      paired.on = undefined;
-      pairs.push(paired);
-      paired = {};
-    }
-
     isPreviousCommentOff = isCurrentCommentOff;
   });
 
+  if (comments.length > 0 && isCurrentCommentOff) {
+    paired.on = undefined;
+    pairs.push(paired);
+  }
+
   return pairs;
 }
 
 function shouldNotFormat(node, commentPairs) {
-  const matchingPair = _.find(
-    commentPairs.reverse(),
+  const matchingPair = _.findLast(
+    commentPairs,
     comment => comment.off.extendedRange.endOffset < node.location.startOffset
   );
   if (

diff --git a/packages/prettier-plugin-java/scripts/single-printer-run/_input.java b/packages/prettier-plugin-java/scripts/single-printer-run/_input.java
@@ -50,7 +50,6 @@ public void myMethod(int param1, int param2, int param3, int param4, int param5,
 
   }
 }
-
 public class PrettierIgnoreClass {
   public void myMethod(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10) {
 

diff --git a/packages/prettier-plugin-java/scripts/single-printer-run/_output.java b/packages/prettier-plugin-java/scripts/single-printer-run/_output.java
@@ -96,8 +96,19 @@ public void myMethod(int param1, int param2, int param3, int param4, int param5,
   }
 }
 
+// @formatter:on
 public class PrettierIgnoreClass {
-  public void myMethod(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10) {
 
-  }
+  public void myMethod(
+    int param1,
+    int param2,
+    int param3,
+    int param4,
+    int param5,
+    int param6,
+    int param7,
+    int param8,
+    int param9,
+    int param10
+  ) {}
 }
-Original file line number
+Diff line change
@@ Expand Up @@
       }
     }
     public class PrettierIgnoreClass {
       public void myMethod(int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10) {
@@ Expand Down @@