Merge pull request #57 from prettier/issue-52

Indent interpolated-code after outdent
prettier · Jan 4, 2020 · e29fe84 · e29fe84
2 parents 219ea3d + 7a513a9
commit e29fe84
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -508,6 +508,7 @@ export const plugin: Plugin = {
 									break;
 								case 'indent':
 								case 'newline':
+								case 'outdent':
 									result = printIndent(previousToken, result, indent, indentLevel);
 									result += '| ';
 									break;

diff --git a/test/issues/issue-52/formatted.pug b/test/issues/issue-52/formatted.pug
@@ -0,0 +1,8 @@
+- const variableWithHtmlString = '<span></span>';
+div
+  | !{variableWithHtmlString}
+
+div
+  a(href="")
+    h6 A
+  | !{veranstaltung.renderedPresseText()}
diff --git a/test/issues/issue-52/issue-52.test.ts b/test/issues/issue-52/issue-52.test.ts
@@ -0,0 +1,14 @@
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
+import { format } from 'prettier';
+import { plugin } from './../../../src/index';
+
+describe('Issues', () => {
+	test('should handle literal line', () => {
+		const expected: string = readFileSync(resolve(__dirname, 'formatted.pug'), 'utf8');
+		const code: string = readFileSync(resolve(__dirname, 'unformatted.pug'), 'utf8');
+		const actual: string = format(code, { parser: 'pug' as any, plugins: [plugin] });
+
+		expect(actual).toBe(expected);
+	});
+});
diff --git a/test/issues/issue-52/unformatted.pug b/test/issues/issue-52/unformatted.pug
@@ -0,0 +1,8 @@
+- const variableWithHtmlString = '<span></span>';
+div
+  | !{variableWithHtmlString}
+
+div
+  a(href="")
+    h6 A
+  | !{veranstaltung.renderedPresseText()}