doc-print cursor placeholder in comments.printComments()

josephfrazier · josephfrazier · commit d75906d69ae8 · 2017-06-01T18:07:45.000-04:00
See #1637 (comment)
diff --git a/src/comments.js b/src/comments.js
@@ -8,6 +8,7 @@ const breakParent = docBuilders.breakParent;
 const indent = docBuilders.indent;
 const lineSuffix = docBuilders.lineSuffix;
 const join = docBuilders.join;
+const cursor = docBuilders.cursor;
 const util = require("./util");
 const childNodesCacheKey = Symbol("child-nodes");
 const locStart = util.locStart;
@@ -924,13 +925,20 @@ function printDanglingComments(path, options, sameIndent) {
   return indent(concat([hardline, join(hardline, parts)]));
 }
 
+function prependCursorPlaceholder(path, options, printed) {
+  if (path.getNode() === options.cursorNode) {
+    return concat([cursor, printed]);
+  }
+  return printed;
+}
+
 function printComments(path, print, options, needsSemi) {
   const value = path.getValue();
   const printed = print(path);
   const comments = value && value.comments;
 
   if (!comments || comments.length === 0) {
-    return printed;
+    return prependCursorPlaceholder(path, options, printed);
   }
 
   const leadingParts = [];
@@ -957,7 +965,11 @@ function printComments(path, print, options, needsSemi) {
     }
   }, "comments");
 
-  return concat(leadingParts.concat(trailingParts));
+  return prependCursorPlaceholder(
+    path,
+    options,
+    concat(leadingParts.concat(trailingParts))
+  );
 }
 
 module.exports = {
diff --git a/src/printer.js b/src/printer.js
@@ -22,7 +22,6 @@ const ifBreak = docBuilders.ifBreak;
 const breakParent = docBuilders.breakParent;
 const lineSuffixBoundary = docBuilders.lineSuffixBoundary;
 const addAlignmentToDoc = docBuilders.addAlignmentToDoc;
-const cursor = docBuilders.cursor;
 
 const docUtils = require("./doc-utils");
 const willBreak = docUtils.willBreak;
@@ -4799,18 +4798,12 @@ function printAstToDoc(ast, options, addAlignmentSize) {
       return genericPrint(path, options, printGenerically, args);
     }
 
-    const withComments = comments.printComments(
+    return comments.printComments(
       path,
       p => genericPrint(p, options, printGenerically, args),
       options,
       args && args.needsSemi
     );
-
-    if (path.getNode() === options.cursorNode) {
-      return concat([cursor, withComments]);
-    }
-
-    return withComments;
   }
 
   let doc = printGenerically(new FastPath(ast));
