(feat) Support range ignores in HTML top level

` ... ` is now supported at HTML top level Closes sveltejs#225
dummdidumm · May 10, 2021 · 832a98b · 832a98b
1 parent 9d1486e
commit 832a98b
Show file tree

Hide file tree

Showing 11 changed files with 234 additions and 15 deletions.
diff --git a/src/print/index.ts b/src/print/index.ts
@@ -33,6 +33,9 @@ import {
     trimTextNodeRight,
     canOmitSoftlineBeforeClosingTag,
     getNextNode,
+    isIgnoreStartDirective,
+    isIgnoreEndDirective,
+    isNodeTopLevelHTML,
 } from './node-helpers';
 import {
     ASTNode,
@@ -71,6 +74,7 @@ declare module 'prettier' {
 }
 
 let ignoreNext = false;
+let ignoreRange = false;
 let svelteOptionsDoc: Doc | undefined;
 
 function groupConcat(contents: doc.builders.Doc[]): doc.builders.Doc {
@@ -95,8 +99,13 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
     ];
     const node = n as Node;
 
-    if (ignoreNext && (node.type !== 'Text' || !isEmptyTextNode(node))) {
-        ignoreNext = false;
+    if (
+        (ignoreNext || (ignoreRange && !isIgnoreEndDirective(node))) &&
+        (node.type !== 'Text' || !isEmptyTextNode(node))
+    ) {
+        if (ignoreNext) {
+            ignoreNext = false;
+        }
         return concat(
             flatten(
                 options.originalText
@@ -578,14 +587,16 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
         case 'Comment': {
             const nodeAfterComment = getNextNode(path);
 
-            /**
-             * If there is no sibling node that starts right after us but the parent indicates
-             * that there used to be, that means that node was actually an embedded `<style>`
-             * or `<script>` node that was cut out.
-             * If so, the comment does not refer to the next line we will see.
-             * The `embed` function handles printing the comment in the right place.
-             */
-            if (
+            if (isIgnoreStartDirective(node) && isNodeTopLevelHTML(node, path)) {
+                ignoreRange = true;
+            } else if (isIgnoreEndDirective(node) && isNodeTopLevelHTML(node, path)) {
+                ignoreRange = false;
+            } else if (
+                // If there is no sibling node that starts right after us but the parent indicates
+                // that there used to be, that means that node was actually an embedded `<style>`
+                // or `<script>` node that was cut out.
+                // If so, the comment does not refer to the next line we will see.
+                // The `embed` function handles printing the comment in the right place.
                 doesEmbedStartAfterNode(node, path) ||
                 (isEmptyTextNode(nodeAfterComment) &&
                     doesEmbedStartAfterNode(nodeAfterComment, path))
@@ -678,6 +689,7 @@ function printTopLevelParts(
 
     // Need to reset these because they are global and could affect the next formatting run
     ignoreNext = false;
+    ignoreRange = false;
     svelteOptionsDoc = undefined;
 
     // If this is invoked as an embed of markdown, remove the last hardline.
@@ -967,7 +979,7 @@ function prepareChildren(children: Node[], path: FastPath, print: PrintFn): Node
     }
 
     function isCommentFollowedByOptions(node: Node, idx: number): node is CommentNode {
-        if (node.type !== 'Comment') {
+        if (node.type !== 'Comment' || isIgnoreEndDirective(node) || isIgnoreStartDirective(node)) {
             return false;
         }
 

diff --git a/src/print/node-helpers.ts b/src/print/node-helpers.ts
@@ -111,7 +111,11 @@ export function getLeadingComment(path: FastPath): CommentNode | undefined {
     let node: Node = path.getNode();
     let prev: Node | undefined = siblings.find((child) => child.end === node.start);
     while (prev) {
-        if (prev.type === 'Comment') {
+        if (
+            prev.type === 'Comment' &&
+            !isIgnoreStartDirective(prev) &&
+            !isIgnoreEndDirective(prev)
+        ) {
             return prev;
         } else if (isEmptyTextNode(prev)) {
             node = prev;
@@ -127,20 +131,26 @@ export function getLeadingComment(path: FastPath): CommentNode | undefined {
  * at the specified position?
  */
 export function doesEmbedStartAfterNode(node: Node, path: FastPath, siblings = getSiblings(path)) {
-    const position = node.end;
-    const root = path.stack[0];
     // If node is not at the top level of html, an embed cannot start after it,
     // because embeds are only at the top level
-    if (!root.html || !root.html.children || !root.html.children.includes(node)) {
+    if (!isNodeTopLevelHTML(node, path)) {
         return false;
     }
 
+    const position = node.end;
+    const root = path.stack[0];
+
     const embeds = [root.css, root.html, root.instance, root.js, root.module] as Node[];
 
     const nextNode = siblings[siblings.indexOf(node) + 1];
     return embeds.find((n) => n && n.start >= position && (!nextNode || n.end <= nextNode.start));
 }
 
+export function isNodeTopLevelHTML(node: Node, path: FastPath): boolean {
+    const root = path.stack[0];
+    return !!root.html && !!root.html.children && root.html.children.includes(node);
+}
+
 export function isEmptyTextNode(node: Node | undefined): node is TextNode {
     return !!node && node.type === 'Text' && getUnencodedText(node).trim() === '';
 }
@@ -149,6 +159,14 @@ export function isIgnoreDirective(node: Node | undefined | null): boolean {
     return !!node && node.type === 'Comment' && node.data.trim() === 'prettier-ignore';
 }
 
+export function isIgnoreStartDirective(node: Node | undefined | null): boolean {
+    return !!node && node.type === 'Comment' && node.data.trim() === 'prettier-ignore-start';
+}
+
+export function isIgnoreEndDirective(node: Node | undefined | null): boolean {
+    return !!node && node.type === 'Comment' && node.data.trim() === 'prettier-ignore-end';
+}
+
 export function printRaw(
     node:
         | ElementNode

diff --git a/test/formatting/samples/prettier-ignore-range-1/input.html b/test/formatting/samples/prettier-ignore-range-1/input.html
@@ -0,0 +1,23 @@
+<script>
+    const a = true;
+</script>
+
+<div>
+
+    I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+
+<div>I need to adhere sadly
+
+
+</div>
diff --git a/test/formatting/samples/prettier-ignore-range-1/output.html b/test/formatting/samples/prettier-ignore-range-1/output.html
@@ -0,0 +1,18 @@
+<script>
+    const a = true;
+</script>
+
+<div>I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+
+<div>I need to adhere sadly</div>
diff --git a/test/formatting/samples/prettier-ignore-range-2/input.html b/test/formatting/samples/prettier-ignore-range-2/input.html
@@ -0,0 +1,17 @@
+<div>
+
+    I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+<script>
+    const a = true;
+</script>
diff --git a/test/formatting/samples/prettier-ignore-range-2/output.html b/test/formatting/samples/prettier-ignore-range-2/output.html
@@ -0,0 +1,16 @@
+<script>
+    const a = true;
+</script>
+
+<div>I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
diff --git a/test/formatting/samples/prettier-ignore-range-wrong/input.html b/test/formatting/samples/prettier-ignore-range-wrong/input.html
@@ -0,0 +1,14 @@
+<div>
+<!-- prettier-ignore-start -->
+
+<div      > no format madness here </div>
+
+<p>
+    no
+    toplevel
+</p>
+
+<!-- prettier-ignore-end -->
+</div>
+
+<div>We all need to adhere sadly</div>
diff --git a/test/formatting/samples/prettier-ignore-range-wrong/output.html b/test/formatting/samples/prettier-ignore-range-wrong/output.html
@@ -0,0 +1,11 @@
+<div>
+    <!-- prettier-ignore-start -->
+
+    <div>no format madness here</div>
+
+    <p>no toplevel</p>
+
+    <!-- prettier-ignore-end -->
+</div>
+
+<div>We all need to adhere sadly</div>
diff --git a/test/formatting/samples/prettier-ignore-ranges-and-lines/input.html b/test/formatting/samples/prettier-ignore-ranges-and-lines/input.html
@@ -0,0 +1,40 @@
+<div>
+
+    I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+
+<div>I need to adhere sadly
+
+
+</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+
+<!-- prettier-ignore -->
+<p>
+    I'm
+    freeeee!
+</p>
+<div>I need to adhere sadly
+
+
+</div>
diff --git a/test/formatting/samples/prettier-ignore-ranges-and-lines/output.html b/test/formatting/samples/prettier-ignore-ranges-and-lines/output.html
@@ -0,0 +1,32 @@
+<div>I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+
+<div>I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+
+<!-- prettier-ignore -->
+<p>
+    I'm
+    freeeee!
+</p>
+<div>I need to adhere sadly</div>
diff --git a/test/printer/samples/prettier-ignore-range.html b/test/printer/samples/prettier-ignore-range.html
@@ -0,0 +1,18 @@
+<script>
+    const a = true;
+</script>
+
+<div>I need to adhere sadly</div>
+
+<!-- prettier-ignore-start -->
+
+<div      > format madness here </div>
+
+<p>
+    I'm
+    freeeee!
+</p>
+
+<!-- prettier-ignore-end -->
+
+<div>I need to adhere sadly</div>