feat: add html-top-level-indent option, resolve prettier#3888

Justineo · Apr 23, 2019 · 9d5c682 · 9d5c682
1 parent ed15b6d
commit 9d5c682
Show file tree

Hide file tree

Showing 23 changed files with 8,363 additions and 986 deletions.
diff --git a/src/language-html/options.js b/src/language-html/options.js
@@ -24,5 +24,28 @@ module.exports = {
         description: "Whitespaces are considered insensitive."
       }
     ]
+  },
+  htmlTopLevelIndent: {
+    since: "1.18.0",
+    category: CATEGORY_HTML,
+    type: "choice",
+    default: "auto",
+    description: "How to handle top-level indent in HTML.",
+    choices: [
+      {
+        value: "always",
+        description:
+          "Always apply top-level indent for templates, scripts and styles."
+      },
+      {
+        value: "never",
+        description: "Avoid top-level indent for templates, scripts and styles."
+      },
+      {
+        value: "auto",
+        description:
+          "Avoid top-level indent for scripts and styles inside Vue files."
+      }
+    ]
   }
 };
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
@@ -227,9 +227,11 @@ function genericPrint(path, options, print) {
                       ? ifBreak(indent(childrenDoc), childrenDoc, {
                           groupId: attrGroupId
                         })
-                      : isScriptLikeTag(node) &&
-                        node.parent.type === "root" &&
-                        options.parser === "vue"
+                      : node.parent.type === "root" &&
+                        ((options.htmlTopLevelIndent === "auto" &&
+                          isScriptLikeTag(node) &&
+                          options.parser === "vue") ||
+                          options.htmlTopLevelIndent === "never")
                       ? childrenDoc
                       : indent(childrenDoc))(
                     concat([

diff --git a/tests/html_aurelia/__snapshots__/jsfmt.spec.js.snap b/tests/html_aurelia/__snapshots__/jsfmt.spec.js.snap
@@ -17,3 +17,60 @@ printWidth: 80
 
 ================================================================================
 `;
+
+exports[`basic.html 2`] = `
+====================================options=====================================
+htmlTopLevelIndent: "auto"
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<template>
+  <i class.bind="icon"></i>
+</template>
+
+=====================================output=====================================
+<template>
+  <i class.bind="icon"></i>
+</template>
+
+================================================================================
+`;
+
+exports[`basic.html 3`] = `
+====================================options=====================================
+htmlTopLevelIndent: "always"
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<template>
+  <i class.bind="icon"></i>
+</template>
+
+=====================================output=====================================
+<template>
+  <i class.bind="icon"></i>
+</template>
+
+================================================================================
+`;
+
+exports[`basic.html 4`] = `
+====================================options=====================================
+htmlTopLevelIndent: "never"
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<template>
+  <i class.bind="icon"></i>
+</template>
+
+=====================================output=====================================
+<template>
+<i class.bind="icon"></i>
+</template>
+
+================================================================================
+`;
diff --git a/tests/html_aurelia/jsfmt.spec.js b/tests/html_aurelia/jsfmt.spec.js
@@ -1 +1,4 @@
 run_spec(__dirname, ["html"]);
+run_spec(__dirname, ["html"], { htmlTopLevelIndent: "auto" });
+run_spec(__dirname, ["html"], { htmlTopLevelIndent: "always" });
+run_spec(__dirname, ["html"], { htmlTopLevelIndent: "never" });