Fix comment moved into brackets in object type members (#19698)

tests/format/flow/comments/__snapshots__/format.test.js.snap

@@ -302,6 +302,69 @@ type Props3 = {
 ================================================================================
 `;
 
+exports[`object_type_indexer.js format 1`] = `
+====================================options=====================================
+parsers: ["flow"]
+                                                      printWidth: 80 (default) |
+=====================================input======================================
+type A = {
+  [key: string]: /** Comment */ B,
+};
+
+type A = {
+  [key: string]: /** Comment */
+    B,
+};
+
+type A = {
+  [key: string] /** Comment */
+    : B,
+};
+
+type A = {
+  [key: string]: /** Comment */ | B,
+};
+
+type A = {
+  [key: string] /** Comment */: B | C,
+};
+
+type A = {
+  [key: string]: // Comment
+    | B
+    | C,
+};
+
+=====================================output=====================================
+type A = {
+  [key: string]: /** Comment */ B,
+};
+
+type A = {
+  [key: string]: /** Comment */ B,
+};
+
+type A = {
+  [key: string /** Comment */]: B,
+};
+
+type A = {
+  [key: string]: /** Comment */ B,
+};
+
+type A = {
+  [key: string /** Comment */]: B | C,
+};
+
+type A = {
+  [key: string]:
+    // Comment
+    B | C,
+};
+
+================================================================================
+`;
+
 exports[`type_annotations.js format 1`] = `
 ====================================options=====================================
 parsers: ["flow"]

tests/format/flow/comments/object_type_indexer.js

@@ -0,0 +1,27 @@
+type A = {
+  [key: string]: /** Comment */ B,
+};
+
+type A = {
+  [key: string]: /** Comment */
+    B,
+};
+
+type A = {
+  [key: string] /** Comment */
+    : B,
+};
+
+type A = {
+  [key: string]: /** Comment */ | B,
+};
+
+type A = {
+  [key: string] /** Comment */: B | C,
+};
+
+type A = {
+  [key: string]: // Comment
+    | B
+    | C,
+};

tests/format/flow/internal-slot/__snapshots__/format.test.js.snap

@@ -1,5 +1,68 @@
 // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
+exports[`comments.js format 1`] = `
+====================================options=====================================
+parsers: ["flow"]
+                                                      printWidth: 80 (default) |
+=====================================input======================================
+type A = {
+  [[slot]]: /** Comment */ B,
+};
+
+type A = {
+  [[slot]]: /** Comment */
+    B,
+};
+
+type A = {
+  [[slot]] /** Comment */
+    : B,
+};
+
+type A = {
+  [[slot]]: /** Comment */ | B,
+};
+
+type A = {
+  [[slot]] /** Comment */: B | C,
+};
+
+type A = {
+  [[slot]]: // Comment
+    | B
+    | C,
+};
+
+=====================================output=====================================
+type A = {
+  [[slot]]: /** Comment */ B,
+};
+
+type A = {
+  [[slot]]: /** Comment */ B,
+};
+
+type A = {
+  [[slot /** Comment */]]: B,
+};
+
+type A = {
+  [[slot]]: /** Comment */ B,
+};
+
+type A = {
+  [[slot /** Comment */]]: B | C,
+};
+
+type A = {
+  [[slot]]:
+    // Comment
+    B | C,
+};
+
+================================================================================
+`;
+
 exports[`internal_slot.js format 1`] = `
 ====================================options=====================================
 parsers: ["flow"]

tests/format/flow/internal-slot/comments.js

@@ -0,0 +1,27 @@
+type A = {
+  [[slot]]: /** Comment */ B,
+};
+
+type A = {
+  [[slot]]: /** Comment */
+    B,
+};
+
+type A = {
+  [[slot]] /** Comment */
+    : B,
+};
+
+type A = {
+  [[slot]]: /** Comment */ | B,
+};
+
+type A = {
+  [[slot]] /** Comment */: B | C,
+};
+
+type A = {
+  [[slot]]: // Comment
+    | B
+    | C,
+};

tests/format/flow/mapped-types/__snapshots__/format.test.js.snap

@@ -46,6 +46,17 @@ type Type = {
   /* bar */ [T in number]: number;
 };
 
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T]: /** Comment */
+    B,
+};
+
+type Type<T> = { [K in keyof T]: /** Comment */ | B };
+
+type Type<T> = { [K in keyof T] /** Comment */: B | C };
+
 =====================================output=====================================
 type Type = {
   // comment
@@ -87,6 +98,16 @@ type Type = {
   +[/* bar */ T in number]: number, // foo
 };
 
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T]: /** Comment */ B,
+};
+
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = { [K in keyof T /** Comment */]: B | C };
+
 ================================================================================
 `;
 

tests/format/flow/mapped-types/comments.js

@@ -38,3 +38,14 @@ type Type = {
   + // foo
   /* bar */ [T in number]: number;
 };
+
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T]: /** Comment */
+    B,
+};
+
+type Type<T> = { [K in keyof T]: /** Comment */ | B };
+
+type Type<T> = { [K in keyof T] /** Comment */: B | C };

tests/format/typescript/mapped-type/__snapshots__/format.test.js.snap

@@ -1,5 +1,57 @@
 // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
+exports[`comments.ts format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+                                                      printWidth: 80 (default) |
+=====================================input======================================
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T]: /** Comment */
+    B;
+};
+
+type Type<T> = { [K in keyof T]: /** Comment */ | B };
+
+type Type<T> = { [K in keyof T] /** Comment */: B | C };
+
+type Type<T> = { [K in keyof T as \`get\${K}\`]: /** Comment */ B };
+
+type Type<T> = { [K in keyof T as \`get\${K}\`]: /** Comment */ | B };
+
+type Type<T> = { [K in keyof T as K extends string ? K : never]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T as K extends string ? K : never] /** Comment */: B | C;
+};
+
+=====================================output=====================================
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T]: /** Comment */ B;
+};
+
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = { [K in keyof T /** Comment */]: B | C };
+
+type Type<T> = { [K in keyof T as \`get\${K}\`]: /** Comment */ B };
+
+type Type<T> = { [K in keyof T as \`get\${K}\`]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T as K extends string ? K : never]: /** Comment */ B;
+};
+
+type Type<T> = {
+  [K in keyof T as K extends string ? K : never /** Comment */]: B | C;
+};
+
+================================================================================
+`;
+
 exports[`intersection.ts format 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]

tests/format/typescript/mapped-type/comments.ts

@@ -0,0 +1,20 @@
+type Type<T> = { [K in keyof T]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T]: /** Comment */
+    B;
+};
+
+type Type<T> = { [K in keyof T]: /** Comment */ | B };
+
+type Type<T> = { [K in keyof T] /** Comment */: B | C };
+
+type Type<T> = { [K in keyof T as `get${K}`]: /** Comment */ B };
+
+type Type<T> = { [K in keyof T as `get${K}`]: /** Comment */ | B };
+
+type Type<T> = { [K in keyof T as K extends string ? K : never]: /** Comment */ B };
+
+type Type<T> = {
+  [K in keyof T as K extends string ? K : never] /** Comment */: B | C;
+};