Support flow/typescript parsers with --cursor-offset

josephfrazier · josephfrazier · commit cbc1929c64db · 2017-05-21T15:48:12.000-04:00
See #1637 (comment) For example: prettier tests/flow/any/any.js --cursor-offset 40 --parser flow # prints 44
diff --git a/index.js b/index.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const traverse = require('babel-traverse').default;
+const estraverse = require('estraverse');
 const util = require("./src/util");
 const cursor = require("./src/doc-builders").cursor;
 const comments = require("./src/comments");
@@ -51,23 +52,40 @@ function ensureAllCommentsPrinted(astComments) {
   });
 }
 
-function findCursorNode(ast, cursorOffset) {
+function findCursorNode(ast, opts) {
+  const cursorOffset = opts.cursorOffset;
   let cursorNode;
-  traverse(ast, {
-    enter: function(path) {
-      const node = path.node;
-      const start = util.locStart(node);
-      const end = util.locEnd(node);
-      if (start <= cursorOffset && cursorOffset <= end) {
-        cursorNode = node;
-      } else {
-        return path.skip();
+  if (opts.parser === 'babylon') {
+    traverse(ast, {
+      enter: function(path) {
+        const node = path.node;
+        if (nodeContainsOffset(node, cursorOffset)) {
+          cursorNode = node;
+        } else {
+          return path.skip();
+        }
       }
-    }
-  });
+    });
+  } else {
+    estraverse.traverse(ast, {
+      enter: function(node) {
+        if (nodeContainsOffset(node, cursorOffset)) {
+          cursorNode = node;
+        } else {
+          return this.skip();
+        }
+      }
+    });
+  }
   return cursorNode;
 }
 
+function nodeContainsOffset(node, offset) {
+  const start = util.locStart(node);
+  const end = util.locEnd(node);
+  return start <= offset && offset <= end;
+}
+
 function formatWithCursor(text, opts) {
   let prefix = "";
   if (text.startsWith("#!")) {
@@ -84,7 +102,7 @@ function formatWithCursor(text, opts) {
   const astComments = attachComments(text, ast, opts);
   let cursorOffset;
   if (opts.cursorOffset >= 0) {
-    const cursorNode = findCursorNode(ast, opts.cursorOffset);
+    const cursorNode = findCursorNode(ast, opts);
     if (cursorNode) {
       cursorOffset = opts.cursorOffset - util.locStart(cursorNode);
       opts.cursorNode = cursorNode;
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "babel-traverse": "^6.24.1",
     "babylon": "7.0.0-beta.8",
     "chalk": "1.1.3",
+    "estraverse": "^4.2.0",
     "esutils": "2.0.2",
     "flow-parser": "0.45.0",
     "get-stdin": "5.0.1",
diff --git a/yarn.lock b/yarn.lock
@@ -663,6 +663,10 @@ estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
+estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
 estree-walker@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
