fix: tag variable not terminated on concise mode text delimiter (#150)

* fix: tag variable not terminated on concise mode text delimiter
marko-js · Feb 13, 2023 · 0d7210b · 0d7210b
1 parent cfa3483
commit 0d7210b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/.changeset/lovely-chefs-pump.md b/.changeset/lovely-chefs-pump.md
@@ -0,0 +1,5 @@
+---
+"htmljs-parser": patch
+---
+
+Fix issue with tag variable not terminated on concise mode text delimiter
diff --git a/...xtures/tag-var-before-concise-text/__snapshots__/tag-var-before-concise-text.expected.txt b/...xtures/tag-var-before-concise-text/__snapshots__/tag-var-before-concise-text.expected.txt
@@ -0,0 +1,11 @@
+1╭─ style/style --
+ │  │    ││     ╰─ openTagEnd
+ │  │    │╰─ tagVar.value "style"
+ │  │    ╰─ tagVar "/style"
+ ╰─ ╰─ tagName "style"
+2╭─   header {
+ ╰─ ╰─ text "\n  header {\n    color: green\n  }\n"
+3├─     color: green
+4├─   }
+5╭─ 
+ ╰─ ╰─ closeTagEnd(style)
diff --git a/src/__tests__/fixtures/tag-var-before-concise-text/input.marko b/src/__tests__/fixtures/tag-var-before-concise-text/input.marko
@@ -0,0 +1,4 @@
+style/style --
+  header {
+    color: green
+  }
diff --git a/src/__tests__/main.test.ts b/src/__tests__/main.test.ts
@@ -176,7 +176,7 @@ for (const entry of fs.readdirSync(FIXTURES)) {
       onOpenTagEnd(range) {
         if (range.selfClosed) tagStack.pop();
         else
-          switch (tagStack.at(-1)!.type) {
+          switch (tagStack[tagStack.length - 1]!.type) {
             case TagType.statement:
             case TagType.void:
               tagStack.pop();

diff --git a/src/states/OPEN_TAG.ts b/src/states/OPEN_TAG.ts
@@ -478,6 +478,8 @@ function shouldTerminateConciseTagVar(code: number, data: string, pos: number) {
     case CODE.SEMICOLON:
     case CODE.OPEN_ANGLE_BRACKET:
       return true;
+    case CODE.HYPHEN:
+      return data.charCodeAt(pos + 1) === CODE.HYPHEN;
     case CODE.COLON:
       return data.charCodeAt(pos + 1) === CODE.EQUAL;
     default: