Fix indentation for doctype

prettier · Feb 14, 2020 · 51d3860 · 51d3860
1 parent 2048001
commit 51d3860
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,8 +75,6 @@ test/pug-tests/attrs.unescaped.formatted.pug
 test/pug-tests/attrs.unescaped.pug
 test/pug-tests/block-code.formatted.pug
 test/pug-tests/block-code.pug
-test/pug-tests/blocks-in-if.formatted.pug
-test/pug-tests/blocks-in-if.pug
 test/pug-tests/comments.formatted.pug
 test/pug-tests/comments.pug
 test/pug-tests/comments.source.formatted.pug

diff --git a/src/printer.ts b/src/printer.ts
@@ -690,7 +690,7 @@ export class PugPrinter {
 	}
 
 	private doctype(token: DoctypeToken): string {
-		let result = 'doctype';
+		let result = `${this.computedIndent}doctype`;
 		if (token.val) {
 			result += ` ${token.val}`;
 		}

diff --git a/test/pug-tests/blocks-in-if.formatted.pug b/test/pug-tests/blocks-in-if.formatted.pug
@@ -0,0 +1,19 @@
+//- see https://github.com/pugjs/pug/issues/1589
+
+- var ajax = true;
+
+- if( ajax )
+  //- return only contents if ajax requests
+  block contents
+    p ajax contents
+
+- else
+  //- return all html
+  doctype html
+  html
+    head
+      meta(charset="utf8")
+      title sample
+      body
+        block contents
+          p all contetns
diff --git a/test/pug-tests/blocks-in-if.pug b/test/pug-tests/blocks-in-if.pug
@@ -0,0 +1,19 @@
+//- see https://github.com/pugjs/pug/issues/1589
+
+-var ajax = true
+
+-if( ajax )
+    //- return only contents if ajax requests
+    block contents
+        p ajax contents
+
+-else
+    //- return all html
+    doctype html
+    html
+        head
+            meta( charset='utf8' )
+            title sample
+            body
+                block contents
+                    p all contetns