feat: support indented comments outside of a parent tag

marko-js · May 26, 2023 · 13a33a3 · 13a33a3
1 parent b105718
commit 13a33a3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.changeset/warm-olives-warn.md b/.changeset/warm-olives-warn.md
@@ -0,0 +1,5 @@
+---
+"htmljs-parser": minor
+---
+
+Allow indented javascript style comments that are not under a parent tag in concise mode.
diff --git a/src/__tests__/fixtures/bad-tag-indent/__snapshots__/bad-tag-indent.expected.txt b/src/__tests__/fixtures/bad-tag-indent/__snapshots__/bad-tag-indent.expected.txt
@@ -1,2 +1,5 @@
-1╭─     var colors=['red', 'green', 'blue']
+1╭─      // I am indented, and that is OK, but the following is not
+ │       │ ╰─ comment.value " I am indented, and that is OK, but the following is not"
+ ╰─      ╰─ comment "// I am indented, and that is OK, but the following is not"
+2╭─     var colors=['red', 'green', 'blue']
  ╰─     ╰─ error(INVALID_INDENTATION:Line has extra indentation at the beginning)
diff --git a/src/__tests__/fixtures/bad-tag-indent/input.marko b/src/__tests__/fixtures/bad-tag-indent/input.marko
@@ -1 +1,2 @@
+     // I am indented, and that is OK, but the following is not
     var colors=['red', 'green', 'blue']
diff --git a/src/states/CONCISE_HTML_CONTENT.ts b/src/states/CONCISE_HTML_CONTENT.ts
@@ -39,12 +39,14 @@ export const CONCISE_HTML_CONTENT: StateDefinition = {
       }
 
       if (!parentTag && curIndent) {
-        this.emitError(
-          this.pos,
-          ErrorCode.INVALID_INDENTATION,
-          "Line has extra indentation at the beginning"
-        );
-        return;
+        if (code !== CODE.FORWARD_SLASH) {
+          this.emitError(
+            this.pos,
+            ErrorCode.INVALID_INDENTATION,
+            "Line has extra indentation at the beginning"
+          );
+          return;
+        }
       }
 
       if (parentTag) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		// I am indented, and that is OK, but the following is not
		var colors=['red', 'green', 'blue']