fix: issue with parsing division followed by encloused code (#138)

marko-js · Oct 9, 2022 · 8c34227 · 8c34227
1 parent 6b7373f
commit 8c34227
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 5 deletions.
diff --git a/.changeset/mean-buses-mate.md b/.changeset/mean-buses-mate.md
@@ -0,0 +1,5 @@
+---
+"htmljs-parser": patch
+---
+
+Fixes a parse error where division is immediately followed by enclosed code.
diff --git a/...__tests__/fixtures/attr-method-shorthand/__snapshots__/attr-method-shorthand.expected.txt b/...__tests__/fixtures/attr-method-shorthand/__snapshots__/attr-method-shorthand.expected.txt
@@ -173,6 +173,18 @@
   ╰─ ╰─ tagName "foo"
 59├─   console.log("hello"); 
 60├─   event.preventDefault();
-61╭─ }
-  │   ├─ closeTagEnd(foo)
-  ╰─  ╰─ openTagEnd
+61├─ }
+62╭─ 
+  ╰─ ╰─ openTagEnd
+63╭─ <a b() { c / (d) }/>
+  │  ││ │││ ││         ╰─ openTagEnd:selfClosed "/>"
+  │  ││ │││ │╰─ attrMethod.body.value " c / (d) "
+  │  ││ │││ ╰─ attrMethod.body "{ c / (d) }"
+  │  ││ ││╰─ attrMethod.params.value
+  │  ││ │├─ attrMethod.params "()"
+  │  ││ │╰─ attrMethod "() { c / (d) }"
+  │  ││ ╰─ attrName
+  │  │╰─ tagName
+  │  ├─ closeTagEnd(foo)
+  ╰─ ╰─ openTagStart
+64╰─ 
diff --git a/src/__tests__/fixtures/attr-method-shorthand/input.marko b/src/__tests__/fixtures/attr-method-shorthand/input.marko
@@ -58,4 +58,6 @@ foo(event) {
 foo (event) { 
   console.log("hello"); 
   event.preventDefault();
-}
+}
+
+<a b() { c / (d) }/>
diff --git a/...ures/attr-operators-space-between/__snapshots__/attr-operators-space-between.expected.txt b/...ures/attr-operators-space-between/__snapshots__/attr-operators-space-between.expected.txt
@@ -1032,4 +1032,11 @@
    │  ││├─ attrValue "= async function (x) { console.log(\"y\") }"
    │  ││╰─ attrName
    │  │╰─ tagName
+   ╰─ ╰─ openTagStart
+128╭─ <a= x / (y[z])/>
+   │  │││ │         ╰─ openTagEnd:selfClosed "/>"
+   │  │││ ╰─ attrValue.value "x / (y[z])"
+   │  ││├─ attrValue "= x / (y[z])"
+   │  ││╰─ attrName
+   │  │╰─ tagName
    ╰─ ╰─ openTagStart
diff --git a/src/__tests__/fixtures/attr-operators-space-between/input.marko b/src/__tests__/fixtures/attr-operators-space-between/input.marko
@@ -124,4 +124,5 @@ a = async function (x) { console.log("y") } a
 <a= async x => { console.log("y") } a/>
 <a= function (x) { console.log("y") } a/>
 <a= x => { console.log("y") } a/>
-<a= async function (x) { console.log("y") } a/>
+<a= async function (x) { console.log("y") } a/>
+<a= x / (y[z])/>
diff --git a/src/states/EXPRESSION.ts b/src/states/EXPRESSION.ts
@@ -90,6 +90,7 @@ export const EXPRESSION: StateDefinition<ExpressionMeta> = {
           default: {
             if (canFollowDivision(this.getPreviousNonWhitespaceCharCode())) {
               this.pos++;
+              this.forward = 0;
               this.consumeWhitespace();
             } else {
               this.enterState(STATE.REGULAR_EXPRESSION);