Extract addAlignmentToDoc(), use instead of addIndentsToDoc()

josephfrazier · josephfrazier · commit 77a8fb03853a · 2017-05-16T17:31:34.000-04:00
See https://github.com/prettier/prettier/pull/1609/files/c1a61ebde8be73414c0a54bde3f323ac24295715#r116804694
diff --git a/index.js b/index.js
@@ -49,8 +49,8 @@ function ensureAllCommentsPrinted(astComments) {
   });
 }
 
-function format(text, opts, addIndents) {
-  addIndents = addIndents || 0;
+function format(text, opts, addAlignmentSize) {
+  addAlignmentSize = addAlignmentSize || 0;
 
   const rangeStart = text.lastIndexOf('\n', opts.rangeStart) + 1;
   // Use `text.length - 1` as the maximum since `indexOf` returns -1 if `fromIndex >= text.length`
@@ -63,25 +63,25 @@ function format(text, opts, addIndents) {
   // so this is just to get the non-range tests passing for now.
   if (opts.rangeEnd !== Infinity && (0 < rangeStart || rangeEnd < text.length)) {
     const rangeString = text.substring(rangeStart, rangeEnd)
-    const numIndents = Math.floor(getAlignmentSize(rangeString.slice(0, rangeString.search(/[^ \t]/)), opts.tabWidth) / opts.tabWidth);
+    const alignmentSize = getAlignmentSize(rangeString.slice(0, rangeString.search(/[^ \t]/)), opts.tabWidth);
 
     const rangeFormatted = format(rangeString, Object.assign({}, opts, {
       rangeStart: 0,
       rangeEnd: Infinity,
-      printWidth: opts.printWidth - numIndents * opts.tabWidth
-    }), numIndents);
+      printWidth: opts.printWidth - alignmentSize
+    }), alignmentSize);
 
     return text.slice(0, rangeStart) + rangeFormatted + text.slice(rangeEnd)
   }
 
   const ast = parser.parse(text, opts);
   const astComments = attachComments(text, ast, opts);
-  const doc = printAstToDoc(ast, opts, addIndents)
+  const doc = printAstToDoc(ast, opts, addAlignmentSize)
   opts.newLine = guessLineEnding(text);
   const str = printDocToString(doc, opts);
   ensureAllCommentsPrinted(astComments);
   // Remove extra leading newline as well as the added indentation after last newline
-  if (addIndents > 0) {
+  if (addAlignmentSize > 0) {
     return str.slice(opts.newLine.length).trimRight() + opts.newLine;
   }
   return str;
diff --git a/src/printer.js b/src/printer.js
@@ -1684,18 +1684,7 @@ function genericPrintNoParens(path, options, print, args) {
             size = getAlignmentSize(value, tabWidth, index + 1);
           }
 
-          let aligned = removeLines(expressions[i]);
-          if (size > 0) {
-            // Use indent to add tabs for all the levels of tabs we need
-            for (var i = 0; i < Math.floor(size / tabWidth); ++i) {
-              aligned = indent(aligned);
-            }
-            // Use align for all the spaces that are needed
-            aligned = align(size % tabWidth, aligned);
-            // size is absolute from 0 and not relative to the current
-            // indentation, so we use -Infinity to reset the indentation to 0
-            aligned = align(-Infinity, aligned);
-          }
+          let aligned = addAlignmentToDoc(expressions[i], size, tabWidth);
 
           parts.push(
             "${",
@@ -4253,8 +4242,8 @@ function removeLines(doc) {
   });
 }
 
-function printAstToDoc(ast, options, addIndents) {
-  addIndents = addIndents || 0;
+function printAstToDoc(ast, options, addAlignmentSize) {
+  addAlignmentSize = addAlignmentSize || 0;
 
   function printGenerically(path, args) {
     return comments.printComments(
@@ -4266,20 +4255,29 @@ function printAstToDoc(ast, options, addIndents) {
   }
 
   let doc = printGenerically(FastPath.from(ast));
-  if (addIndents > 0) {
+  if (addAlignmentSize > 0) {
     // Add a hardline to make the indents take effect
     // It should be removed in index.js format()
-    doc = addIndentsToDoc(concat([hardline, doc]), addIndents);
+    doc = addAlignmentToDoc(concat([hardline, doc]), addAlignmentSize, options.tabWidth);
   }
   docUtils.propagateBreaks(doc);
   return doc;
 }
 
-function addIndentsToDoc(doc, numIndents) {
-  if (numIndents <= 0) {
-    return doc;
+function addAlignmentToDoc(doc, size, tabWidth) {
+  let aligned = removeLines(doc);
+  if (size > 0) {
+    // Use indent to add tabs for all the levels of tabs we need
+    for (var i = 0; i < Math.floor(size / tabWidth); ++i) {
+      aligned = indent(aligned);
+    }
+    // Use align for all the spaces that are needed
+    aligned = align(size % tabWidth, aligned);
+    // size is absolute from 0 and not relative to the current
+    // indentation, so we use -Infinity to reset the indentation to 0
+    aligned = align(-Infinity, aligned);
   }
-  return addIndentsToDoc(indent(doc), numIndents - 1);
+  return aligned;
 }
 
 module.exports = { printAstToDoc, getAlignmentSize };
diff --git a/tests/range/__snapshots__/jsfmt.spec.js.snap b/tests/range/__snapshots__/jsfmt.spec.js.snap
@@ -14,7 +14,7 @@ function ugly ( {a=1,     b     =   2     }      ) {
 function ugly ( {a=1,     b     =   2     }      ) {
   function ugly ( {a=1,     b     =   2     }      ) {
     function ugly ( {a=1,     b     =   2     }      ) {
-            \`multiline template string
+             \`multiline template string
               with too much indentation\`;
       // The [165, 246) range selects the above two lines, including the second newline
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function ugly ( {a=1, b = 2 } ) {`
`14`	`14`	`function ugly ( {a=1, b = 2 } ) {`
`15`	`15`	`function ugly ( {a=1, b = 2 } ) {`
`16`	`16`	`function ugly ( {a=1, b = 2 } ) {`
`17`		- \`multiline template string
	`17`	+ \`multiline template string
`18`	`18`	with too much indentation\`;
`19`	`19`	`// The [165, 246) range selects the above two lines, including the second newline`
`20`	`20`	`}`