Improve cursor tracking (#14812)

changelog_unreleased/javascript/14812.md

@@ -0,0 +1,21 @@
+#### Fix cursor positioning for a special case (#14812 by @fisker)
+
+<!-- prettier-ignore -->
+```js
+// <|> is the cursor position
+
+/* Input */
+// All messages are represented in JSON.
+// So, the prettier.py controls a subprocess which spawns "node {this_file}".
+import {<|>  } from "fs"
+
+/* Prettier stable */
+// All messages are represented in JSON.
+// So, the prettier.py <|>controls a subprocess which spawns "node {this_file}".
+import {} from "fs"
+
+/* Prettier main */
+// All messages are represented in JSON.
+// So, the prettier.py controls a subprocess which spawns "node {this_file}".
+import {<|>} from "fs"
+```

src/main/ast-to-doc.js

@@ -106,6 +106,10 @@ function callPluginPrintFunction(path, options, printPath, args, embeds) {
     doc = printer.print(path, options, printPath, args);
   }
 
+  if (node === options.cursorNode) {
+    doc = inheritLabel(doc, (doc) => [cursor, doc, cursor]);
+  }
+
   // We let JSXElement print its comments itself because it adds () around
   // UnionTypeAnnotation has to align the child without the comments
   if (
@@ -118,10 +122,6 @@ function callPluginPrintFunction(path, options, printPath, args, embeds) {
     doc = printComments(path, doc, options);
   }
 
-  if (node === options.cursorNode) {
-    doc = inheritLabel(doc, (doc) => [cursor, doc, cursor]);
-  }
-
   return doc;
 }
 

tests/format/js/cursor/__snapshots__/jsfmt.spec.js.snap

@@ -320,6 +320,25 @@ haha()<|>;
 ================================================================================
 `;
 
+exports[`file-start-with-comment-3.js format 1`] = `
+====================================options=====================================
+cursorOffset: 127
+parsers: ["babel", "typescript", "flow"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// All messages are represented in JSON.
+// So, the prettier.py controls a subprocess which spawns "node {this_file}".
+import {<|>  } from "fs"
+
+=====================================output=====================================
+// All messages are represented in JSON.
+// So, the prettier.py controls a subprocess which spawns "node {this_file}".
+import {<|>} from "fs";
+
+================================================================================
+`;
+
 exports[`range-0.js format 1`] = `
 ====================================options=====================================
 cursorOffset: 56

tests/format/js/cursor/file-start-with-comment-3.js

@@ -0,0 +1,3 @@
+// All messages are represented in JSON.
+// So, the prettier.py controls a subprocess which spawns "node {this_file}".
+import {<|>  } from "fs"