fix formatting of comments in flow enums (prettier#6860)

thorn0 · evilebottnawi · commit b9ab7e2a8174 · 2019-11-07T13:02:41.000+03:00
diff --git a/src/language-js/postprocess.js b/src/language-js/postprocess.js
@@ -27,6 +27,22 @@ function postprocess(ast, options) {
           });
         }
         break;
+      case "EnumDeclaration":
+        // A workaround for what looks like a bug in Flow.
+        // Flow assigns the same range to enum nodes and enum body nodes.
+        if (
+          options.parser === "flow" &&
+          node.body.range[0] === node.range[0] &&
+          node.body.range[1] === node.range[1]
+        ) {
+          node.body.range = [node.id.range[1], node.range[1] - 1];
+        }
+        // Babel does strange things as well. E.g. node.body.start > node.body.end can be true.
+        if (options.parser === "babel-flow") {
+          node.body.start = node.id.end;
+          node.body.end = node.end - 1;
+        }
+        break;
     }
   });
 
diff --git a/tests/flow_enums/__snapshots__/jsfmt.spec.js.snap b/tests/flow_enums/__snapshots__/jsfmt.spec.js.snap
@@ -50,6 +50,72 @@ enum E {
 ================================================================================
 `;
 
+exports[`enum-comments.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel-flow"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+enum E1 {
+  A = 0,
+  // B = 1,
+  C = 2
+}
+
+enum E2 of number {
+  // AA = -1,
+  A = 0,
+  // B = 1,
+  C = 2
+  // D = 100
+}
+
+enum E3 {/*Q*/}
+
+enum E4 of /*Q*/ string {
+  Foo = "foo"
+}
+
+enum E5 of string { // Q
+  Bar = "bar"
+}
+
+enum /*Q*/ E6 of string {}
+
+=====================================output=====================================
+enum E1 {
+  A = 0,
+  // B = 1,
+  C = 2,
+}
+
+enum E2 of number {
+  // AA = -1,
+  A = 0,
+  // B = 1,
+  C = 2,
+  // D = 100
+}
+
+enum E3 {
+  /*Q*/
+}
+
+enum E4 of string {
+  /*Q*/ Foo = "foo",
+}
+
+enum E5 of string {
+  // Q
+  Bar = "bar",
+}
+
+enum /*Q*/ E6 of string {}
+
+================================================================================
+`;
+
 exports[`enum-empty.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "babel-flow"]
diff --git a/tests/flow_enums/enum-comments.js b/tests/flow_enums/enum-comments.js
@@ -0,0 +1,25 @@
+enum E1 {
+  A = 0,
+  // B = 1,
+  C = 2
+}
+
+enum E2 of number {
+  // AA = -1,
+  A = 0,
+  // B = 1,
+  C = 2
+  // D = 100
+}
+
+enum E3 {/*Q*/}
+
+enum E4 of /*Q*/ string {
+  Foo = "foo"
+}
+
+enum E5 of string { // Q
+  Bar = "bar"
+}
+
+enum /*Q*/ E6 of string {}
