fix: always consume terminator if it is preceded by an operator

marko-js · Mar 15, 2023 · 085451c · 085451c
1 parent be73442
commit 085451c
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 24 deletions.
diff --git a/.changeset/tall-moons-enjoy.md b/.changeset/tall-moons-enjoy.md
@@ -0,0 +1,5 @@
+---
+"htmljs-parser": patch
+---
+
+Always consume next character of expression if terminator was preceded by an operator.
diff --git a/src/__tests__/fixtures/attr-complex-unary/__snapshots__/attr-complex-unary.expected.txt b/src/__tests__/fixtures/attr-complex-unary/__snapshots__/attr-complex-unary.expected.txt
@@ -5,31 +5,31 @@
  ╰─ ╰─ tagName "tag"
 2╭─ 
  ╰─ ╰─ openTagEnd
-3╭─ tag a = class, b
- │  │   │ │ │      ╰─ attrName
- │  │   │ │ ╰─ attrValue.value "class"
- │  │   │ ╰─ attrValue "= class"
+3╭─ tag a = class {}, b
+ │  │   │ │ │         ╰─ attrName
+ │  │   │ │ ╰─ attrValue.value "class {}"
+ │  │   │ ╰─ attrValue "= class {}"
  │  │   ╰─ attrName
  │  ├─ closeTagEnd(tag)
  ╰─ ╰─ tagName "tag"
 4╭─ 
  ╰─ ╰─ openTagEnd
-5╭─ <tag a = class></tag>
- │  ││   │ │ │    ││ │  ╰─ closeTagEnd(tag)
- │  ││   │ │ │    ││ ╰─ closeTagName "tag"
- │  ││   │ │ │    │╰─ closeTagStart "</"
- │  ││   │ │ │    ╰─ openTagEnd
- │  ││   │ │ ╰─ attrValue.value "class"
- │  ││   │ ╰─ attrValue "= class"
+5╭─ <tag a = class {}></tag>
+ │  ││   │ │ │       ││ │  ╰─ closeTagEnd(tag)
+ │  ││   │ │ │       ││ ╰─ closeTagName "tag"
+ │  ││   │ │ │       │╰─ closeTagStart "</"
+ │  ││   │ │ │       ╰─ openTagEnd
+ │  ││   │ │ ╰─ attrValue.value "class {}"
+ │  ││   │ ╰─ attrValue "= class {}"
  │  ││   ╰─ attrName
  │  │╰─ tagName "tag"
  │  ├─ closeTagEnd(tag)
  ╰─ ╰─ openTagStart
 6├─ 
-7╭─ <tag a = class/>
- │  ││   │ │ │    ╰─ openTagEnd:selfClosed "/>"
- │  ││   │ │ ╰─ attrValue.value "class"
- │  ││   │ ╰─ attrValue "= class"
+7╭─ <tag a = class {}/>
+ │  ││   │ │ │       ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │ │ ╰─ attrValue.value "class {}"
+ │  ││   │ ╰─ attrValue "= class {}"
  │  ││   ╰─ attrName
  │  │╰─ tagName "tag"
  ╰─ ╰─ openTagStart
@@ -69,9 +69,9 @@
   ╰─ ╰─ tagName "tag"
 16╭─ 
   ╰─ ╰─ openTagEnd
-17╭─ tag a = test+class b
-  │  │   │ │ ╰─ attrValue.value "test+class b"
-  │  │   │ ╰─ attrValue "= test+class b"
+17╭─ tag a = test+class b {}
+  │  │   │ │ ╰─ attrValue.value "test+class b {}"
+  │  │   │ ╰─ attrValue "= test+class b {}"
   │  │   ╰─ attrName
   │  ├─ closeTagEnd(tag)
   ╰─ ╰─ tagName "tag"

diff --git a/src/__tests__/fixtures/attr-complex-unary/input.marko b/src/__tests__/fixtures/attr-complex-unary/input.marko
@@ -1,10 +1,10 @@
 tag a = class b {}
 
-tag a = class, b
+tag a = class {}, b
 
-<tag a = class></tag>
+<tag a = class {}></tag>
 
-<tag a = class/>
+<tag a = class {}/>
 
 tag a = classthing b
 
@@ -14,4 +14,4 @@ tag a = test_class b
 
 tag a = test$class b
 
-tag a = test+class b
+tag a = test+class b {}
diff --git a/...s__/fixtures/tag-var-type-with-parens/__snapshots__/tag-var-type-with-parens.expected.txt b/...s__/fixtures/tag-var-type-with-parens/__snapshots__/tag-var-type-with-parens.expected.txt
@@ -0,0 +1,50 @@
+1╭─ let/a:(B | C) = D
+ │  │  ││         │ ╰─ attrValue.value
+ │  │  ││         ├─ attrValue "= D"
+ │  │  ││         ╰─ attrName
+ │  │  │╰─ tagVar.value "a:(B | C)"
+ │  │  ╰─ tagVar "/a:(B | C)"
+ ╰─ ╰─ tagName "let"
+2╭─ 
+ ╰─ ╰─ openTagEnd
+3╭─ let/a: (B | C) = D
+ │  │  ││          │ ╰─ attrValue.value
+ │  │  ││          ├─ attrValue "= D"
+ │  │  ││          ╰─ attrName
+ │  │  │╰─ tagVar.value "a: (B | C)"
+ │  │  ╰─ tagVar "/a: (B | C)"
+ │  ├─ closeTagEnd(let)
+ ╰─ ╰─ tagName "let"
+4╭─ 
+ ╰─ ╰─ openTagEnd
+5╭─ let/a : (B | C) = D
+ │  │  ││           │ ╰─ attrValue.value
+ │  │  ││           ├─ attrValue "= D"
+ │  │  ││           ╰─ attrName
+ │  │  │╰─ tagVar.value "a : (B | C)"
+ │  │  ╰─ tagVar "/a : (B | C)"
+ │  ├─ closeTagEnd(let)
+ ╰─ ╰─ tagName "let"
+6╭─ 
+ ╰─ ╰─ openTagEnd
+7╭─ let/a :(B | C) = D
+ │  │  ││          │ ╰─ attrValue.value
+ │  │  ││          ├─ attrValue "= D"
+ │  │  ││          ╰─ attrName
+ │  │  │╰─ tagVar.value "a :(B | C)"
+ │  │  ╰─ tagVar "/a :(B | C)"
+ │  ├─ closeTagEnd(let)
+ ╰─ ╰─ tagName "let"
+8╭─ 
+ ╰─ ╰─ openTagEnd
+9╭─ let/a: B & (C | D) = D
+ │  │  ││              │ ╰─ attrValue.value
+ │  │  ││              ├─ attrValue "= D"
+ │  │  ││              ╰─ attrName
+ │  │  │╰─ tagVar.value "a: B & (C | D)"
+ │  │  ╰─ tagVar "/a: B & (C | D)"
+ │  ├─ closeTagEnd(let)
+ ╰─ ╰─ tagName "let"
+10╭─ 
+  │  ├─ openTagEnd
+  ╰─ ╰─ closeTagEnd(let)
diff --git a/src/__tests__/fixtures/tag-var-type-with-parens/input.marko b/src/__tests__/fixtures/tag-var-type-with-parens/input.marko
@@ -0,0 +1,9 @@
+let/a:(B | C) = D
+
+let/a: (B | C) = D
+
+let/a : (B | C) = D
+
+let/a :(B | C) = D
+
+let/a: B & (C | D) = D
diff --git a/src/states/EXPRESSION.ts b/src/states/EXPRESSION.ts
@@ -61,8 +61,23 @@ export const EXPRESSION: StateDefinition<ExpressionMeta> = {
       }
 
       if (expression.shouldTerminate(code, this.data, this.pos)) {
-        this.exitState();
-        return;
+        let wasExpression = false;
+        if (expression.operators) {
+          const prevNonWhitespacePos = lookBehindWhile(
+            isWhitespaceCode,
+            this.data,
+            this.pos - 1
+          );
+          if (prevNonWhitespacePos > expression.start) {
+            wasExpression =
+              lookBehindForOperator(this.data, prevNonWhitespacePos) !== -1;
+          }
+        }
+
+        if (!wasExpression) {
+          this.exitState();
+          return;
+        }
       }
     }