Propagate breaks after adding an indentation-triggering hardline

josephfrazier · josephfrazier · commit 070b941c5dd0 · 2017-05-16T16:20:44.000-04:00
See https://github.com/prettier/prettier/pull/1609/files/c1a61ebde8be73414c0a54bde3f323ac24295715#r116805581
diff --git a/src/printer.js b/src/printer.js
@@ -4256,13 +4256,13 @@ function printAstToDoc(ast, options, addIndents) {
     );
   }
 
-  const doc = printGenerically(FastPath.from(ast));
-  docUtils.propagateBreaks(doc);
+  let doc = printGenerically(FastPath.from(ast));
   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);
+    doc = addIndentsToDoc(concat([hardline, doc]), addIndents);
   }
+  docUtils.propagateBreaks(doc);
   return doc;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4256,13 +4256,13 @@ function printAstToDoc(ast, options, addIndents) {`
`4256`	`4256`	`);`
`4257`	`4257`	`}`
`4258`	`4258`
`4259`		`- const doc = printGenerically(FastPath.from(ast));`
`4260`		`- docUtils.propagateBreaks(doc);`
	`4259`	`+ let doc = printGenerically(FastPath.from(ast));`
`4261`	`4260`	`if (addIndents > 0) {`
`4262`	`4261`	`// Add a hardline to make the indents take effect`
`4263`	`4262`	`// It should be removed in index.js format()`
`4264`		`- return addIndentsToDoc(concat([hardline, doc]), addIndents);`
	`4263`	`+ doc = addIndentsToDoc(concat([hardline, doc]), addIndents);`
`4265`	`4264`	`}`
	`4265`	`+ docUtils.propagateBreaks(doc);`
`4266`	`4266`	`return doc;`
`4267`	`4267`	`}`
`4268`	`4268`