Hackily fix indentation of range formatting

josephfrazier · josephfrazier · commit c1a61ebde8be · 2017-05-15T19:07:27.000-04:00
See #1609 (comment) Also update the snapshot to reflect that the indentation actually should decrease by one space, since there were 13 spaces in the input and we round down after dividing by tabWidth.
diff --git a/index.js b/index.js
@@ -73,9 +73,9 @@ function format(text, opts, addIndents) {
   opts.newLine = guessLineEnding(text);
   const str = printDocToString(doc, opts);
   ensureAllCommentsPrinted(astComments);
-  // Remove added indentation after last newline
+  // Remove extra leading newline as well as the added indentation after last newline
   if (addIndents > 0) {
-    return str.trimRight() + opts.newLine;
+    return str.slice(opts.newLine.length).trimRight() + opts.newLine;
   }
   return str;
 }
diff --git a/src/printer.js b/src/printer.js
@@ -4262,7 +4262,12 @@ function printAstToDoc(ast, options, addIndents) {
 
   const doc = printGenerically(FastPath.from(ast));
   docUtils.propagateBreaks(doc);
-  return addIndentsToDoc(doc, addIndents);
+  if (addIndents > 0) {
+    // Add a hardline to make the indents take effect
+    // It should be removed in index.js format()
+    return addIndentsToDoc(concat([hardline, doc]), addIndents);
+  }
+  return doc;
 }
 
 function addIndentsToDoc(doc, numIndents) {
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
`@@ -73,9 +73,9 @@ function format(text, opts, addIndents) {`
`73`	`73`	`opts.newLine = guessLineEnding(text);`
`74`	`74`	`const str = printDocToString(doc, opts);`
`75`	`75`	`ensureAllCommentsPrinted(astComments);`
`76`		`- // Remove added indentation after last newline`
	`76`	`+ // Remove extra leading newline as well as the added indentation after last newline`
`77`	`77`	`if (addIndents > 0) {`
`78`		`- return str.trimRight() + opts.newLine;`
	`78`	`+ return str.slice(opts.newLine.length).trimRight() + opts.newLine;`
`79`	`79`	`}`
`80`	`80`	`return str;`
`81`	`81`	`}`
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`	`}`