fix: positions wrong with multiple quasis in tag name

DylanPiercey · DylanPiercey · commit a3122ddcdf66 · 2022-04-04T20:59:29.000-07:00
diff --git a/src/__tests__/fixtures/argument-and-params/__snapshots__/argument-and-params.expected.txt b/src/__tests__/fixtures/argument-and-params/__snapshots__/argument-and-params.expected.txt
@@ -1,16 +1,16 @@
 1╭─ <${x}(y)/>
  │   │   ││ ╰─ openTagEnd:selfClosed "/>"
- │   │   │├─ tagArgs.value
- │   │   │╰─ tagName.quasis[1]
- │   │   ╰─ tagArgs "(y)"
+ │   │   │╰─ tagArgs.value
+ │   │   ├─ tagArgs "(y)"
+ │   │   ╰─ tagName.quasis[1]
  │   ├─ tagName.expressions[0] "${x}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${x}"
 2╭─ <${x}|y|/>
  │   │   ││ ╰─ openTagEnd:selfClosed "/>"
- │   │   │├─ tagParams.value
- │   │   │╰─ tagName.quasis[1]
- │   │   ╰─ tagParams "|y|"
+ │   │   │╰─ tagParams.value
+ │   │   ├─ tagParams "|y|"
+ │   │   ╰─ tagName.quasis[1]
  │   ├─ tagName.expressions[0] "${x}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${x}"
diff --git a/src/__tests__/fixtures/placeholder-tag-name-concise/__snapshots__/placeholder-tag-name-concise.expected.txt b/src/__tests__/fixtures/placeholder-tag-name-concise/__snapshots__/placeholder-tag-name-concise.expected.txt
@@ -1,10 +1,10 @@
 1╭─ ${test} foo=123
- │  │       │  ││  ├─ closeTag(${test})
- │  │       │  ││  ╰─ openTagEnd
- │  │       │  │╰─ attrValue.value "123"
- │  │       │  ╰─ attrValue "=123"
- │  │       ├─ attrName "foo"
- │  │       ╰─ tagName.quasis[1]
+ │  │      ││  ││  ├─ closeTag(${test})
+ │  │      ││  ││  ╰─ openTagEnd
+ │  │      ││  │╰─ attrValue.value "123"
+ │  │      ││  ╰─ attrValue "=123"
+ │  │      │╰─ attrName "foo"
+ │  │      ╰─ tagName.quasis[1]
  │  ├─ tagName.expressions[0] "${test}"
  │  ├─ tagName.quasis[0]
  ╰─ ╰─ tagName "${test}"
diff --git a/src/__tests__/fixtures/placeholder-tag-name-html/__snapshots__/placeholder-tag-name-html.expected.txt b/src/__tests__/fixtures/placeholder-tag-name-html/__snapshots__/placeholder-tag-name-html.expected.txt
@@ -1,9 +1,9 @@
 1╭─ <${test} foo=123/>
- │   │       │  ││  ╰─ openTagEnd:selfClosed "/>"
- │   │       │  │╰─ attrValue.value "123"
- │   │       │  ╰─ attrValue "=123"
- │   │       ├─ attrName "foo"
- │   │       ╰─ tagName.quasis[1]
+ │   │      ││  ││  ╰─ openTagEnd:selfClosed "/>"
+ │   │      ││  │╰─ attrValue.value "123"
+ │   │      ││  ╰─ attrValue "=123"
+ │   │      │╰─ attrName "foo"
+ │   │      ╰─ tagName.quasis[1]
  │   ├─ tagName.expressions[0] "${test}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${test}"
diff --git a/src/__tests__/fixtures/shorthand-class-dynamic-literal-prefix/__snapshots__/shorthand-class-dynamic-literal-prefix.expected.txt b/src/__tests__/fixtures/shorthand-class-dynamic-literal-prefix/__snapshots__/shorthand-class-dynamic-literal-prefix.expected.txt
@@ -1,7 +1,7 @@
 1╭─ .bar${data.foo}
- │  ││  │          │╰─ tagShorthandClass.quasis[1]
  │  ││  │          ├─ closeTag()
- │  ││  │          ╰─ openTagEnd
+ │  ││  │          ├─ openTagEnd
+ │  ││  │          ╰─ tagShorthandClass.quasis[1]
  │  ││  ╰─ tagShorthandClass.expressions[0] "${data.foo}"
  │  │╰─ tagShorthandClass.quasis[0] "bar"
  │  ├─ tagShorthandClass ".bar${data.foo}"
diff --git a/src/__tests__/fixtures/shorthand-class-dynamic-literal-suffix/__snapshots__/shorthand-class-dynamic-literal-suffix.expected.txt b/src/__tests__/fixtures/shorthand-class-dynamic-literal-suffix/__snapshots__/shorthand-class-dynamic-literal-suffix.expected.txt
@@ -1,7 +1,7 @@
 1╭─ .${data.foo}-bar
- │  ││           │  ├─ closeTag()
- │  ││           │  ╰─ openTagEnd
- │  ││           ╰─ tagShorthandClass.quasis[1] "bar"
+ │  ││          │   ├─ closeTag()
+ │  ││          │   ╰─ openTagEnd
+ │  ││          ╰─ tagShorthandClass.quasis[1] "-bar"
  │  │├─ tagShorthandClass.expressions[0] "${data.foo}"
  │  │╰─ tagShorthandClass.quasis[0]
  │  ├─ tagShorthandClass ".${data.foo}-bar"
diff --git a/src/__tests__/fixtures/shorthand-class-dynamic/__snapshots__/shorthand-class-dynamic.expected.txt b/src/__tests__/fixtures/shorthand-class-dynamic/__snapshots__/shorthand-class-dynamic.expected.txt
@@ -1,7 +1,7 @@
 1╭─ span.${data.foo}
- │  │   ││          │╰─ tagShorthandClass.quasis[1]
  │  │   ││          ├─ closeTag(span)
- │  │   ││          ╰─ openTagEnd
+ │  │   ││          ├─ openTagEnd
+ │  │   ││          ╰─ tagShorthandClass.quasis[1]
  │  │   │├─ tagShorthandClass.expressions[0] "${data.foo}"
  │  │   │╰─ tagShorthandClass.quasis[0]
  │  │   ╰─ tagShorthandClass ".${data.foo}"
diff --git a/src/__tests__/fixtures/shorthand-id-dynamic-literal-prefix/__snapshots__/shorthand-id-dynamic-literal-prefix.expected.txt b/src/__tests__/fixtures/shorthand-id-dynamic-literal-prefix/__snapshots__/shorthand-id-dynamic-literal-prefix.expected.txt
@@ -1,7 +1,7 @@
 1╭─ #bar${data.foo}
- │  ││  │          │╰─ tagShorthandId.quasis[1]
  │  ││  │          ├─ closeTag()
- │  ││  │          ╰─ openTagEnd
+ │  ││  │          ├─ openTagEnd
+ │  ││  │          ╰─ tagShorthandId.quasis[1]
  │  ││  ╰─ tagShorthandId.expressions[0] "${data.foo}"
  │  │╰─ tagShorthandId.quasis[0] "bar"
  │  ├─ tagShorthandId "#bar${data.foo}"
diff --git a/src/__tests__/fixtures/shorthand-id-dynamic-literal-suffix/__snapshots__/shorthand-id-dynamic-literal-suffix.expected.txt b/src/__tests__/fixtures/shorthand-id-dynamic-literal-suffix/__snapshots__/shorthand-id-dynamic-literal-suffix.expected.txt
@@ -1,7 +1,7 @@
 1╭─ #${data.foo}-bar
- │  ││           │  ├─ closeTag()
- │  ││           │  ╰─ openTagEnd
- │  ││           ╰─ tagShorthandId.quasis[1] "bar"
+ │  ││          │   ├─ closeTag()
+ │  ││          │   ╰─ openTagEnd
+ │  ││          ╰─ tagShorthandId.quasis[1] "-bar"
  │  │├─ tagShorthandId.expressions[0] "${data.foo}"
  │  │╰─ tagShorthandId.quasis[0]
  │  ├─ tagShorthandId "#${data.foo}-bar"
diff --git a/src/__tests__/fixtures/shorthand-id-dynamic/__snapshots__/shorthand-id-dynamic.expected.txt b/src/__tests__/fixtures/shorthand-id-dynamic/__snapshots__/shorthand-id-dynamic.expected.txt
@@ -1,7 +1,7 @@
 1╭─ span#${data.foo}
- │  │   ││          │╰─ tagShorthandId.quasis[1]
  │  │   ││          ├─ closeTag(span)
- │  │   ││          ╰─ openTagEnd
+ │  │   ││          ├─ openTagEnd
+ │  │   ││          ╰─ tagShorthandId.quasis[1]
  │  │   │├─ tagShorthandId.expressions[0] "${data.foo}"
  │  │   │╰─ tagShorthandId.quasis[0]
  │  │   ╰─ tagShorthandId "#${data.foo}"
diff --git a/src/__tests__/fixtures/tag-name-expression-literal-prefix-attrs/__snapshots__/tag-name-expression-literal-prefix-attrs.expected.txt b/src/__tests__/fixtures/tag-name-expression-literal-prefix-attrs/__snapshots__/tag-name-expression-literal-prefix-attrs.expected.txt
@@ -1,9 +1,9 @@
 1╭─ <foo-${bar} hello="world">
- │   │   │      │    ││      ╰─ openTagEnd
- │   │   │      │    │╰─ attrValue.value "\"world\""
- │   │   │      │    ╰─ attrValue "=\"world\""
- │   │   │      ├─ attrName "hello"
- │   │   │      ╰─ tagName.quasis[1]
+ │   │   │     ││    ││      ╰─ openTagEnd
+ │   │   │     ││    │╰─ attrValue.value "\"world\""
+ │   │   │     ││    ╰─ attrValue "=\"world\""
+ │   │   │     │╰─ attrName "hello"
+ │   │   │     ╰─ tagName.quasis[1]
  │   │   ╰─ tagName.expressions[0] "${bar}"
  │   ├─ tagName.quasis[0] "foo-"
  ╰─  ╰─ tagName "foo-${bar}"
diff --git a/src/__tests__/fixtures/tag-name-expression-literal-prefix-suffix/__snapshots__/tag-name-expression-literal-prefix-suffix.expected.txt b/src/__tests__/fixtures/tag-name-expression-literal-prefix-suffix/__snapshots__/tag-name-expression-literal-prefix-suffix.expected.txt
@@ -1,6 +1,6 @@
 1╭─ <foo-${bar}-baz>
- │   │   │      │  ╰─ openTagEnd
- │   │   │      ╰─ tagName.quasis[1] "baz"
+ │   │   │     │   ╰─ openTagEnd
+ │   │   │     ╰─ tagName.quasis[1] "-baz"
  │   │   ╰─ tagName.expressions[0] "${bar}"
  │   ├─ tagName.quasis[0] "foo-"
  ╰─  ╰─ tagName "foo-${bar}-baz"
diff --git a/src/__tests__/fixtures/tag-name-expression-literal-prefix/__snapshots__/tag-name-expression-literal-prefix.expected.txt b/src/__tests__/fixtures/tag-name-expression-literal-prefix/__snapshots__/tag-name-expression-literal-prefix.expected.txt
@@ -1,10 +1,10 @@
 1╭─ <foo-${bar}>
- │   │   │     ╰─ openTagEnd
+ │   │   │     ├─ openTagEnd
+ │   │   │     ╰─ tagName.quasis[1]
  │   │   ╰─ tagName.expressions[0] "${bar}"
  │   ├─ tagName.quasis[0] "foo-"
  ╰─  ╰─ tagName "foo-${bar}"
 2╭─ </>
  │  │ ╰─ closeTag(foo-${bar}).value
  │  ├─ text "\n"
- │  ├─ tagName.quasis[1]
  ╰─ ╰─ closeTag(foo-${bar}) "</>"
diff --git a/src/__tests__/fixtures/tag-name-expression-literal-suffix/__snapshots__/tag-name-expression-literal-suffix.expected.txt b/src/__tests__/fixtures/tag-name-expression-literal-suffix/__snapshots__/tag-name-expression-literal-suffix.expected.txt
@@ -1,6 +1,6 @@
 1╭─ <${foo}-bar>
- │   │      │  ╰─ openTagEnd
- │   │      ╰─ tagName.quasis[1] "bar"
+ │   │     │   ╰─ openTagEnd
+ │   │     ╰─ tagName.quasis[1] "-bar"
  │   ├─ tagName.expressions[0] "${foo}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${foo}-bar"
diff --git a/src/__tests__/fixtures/tag-name-expression-shorthand-id/__snapshots__/tag-name-expression-shorthand-id.expected.txt b/src/__tests__/fixtures/tag-name-expression-shorthand-id/__snapshots__/tag-name-expression-shorthand-id.expected.txt
@@ -2,9 +2,9 @@
  │   │           ││  ││ ╰─ closeTag(${myTagName}).value
  │   │           ││  │╰─ closeTag(${myTagName}) "</>"
  │   │           ││  ╰─ openTagEnd
- │   │           │├─ tagShorthandId.quasis[0] "foo"
- │   │           │╰─ tagName.quasis[1]
- │   │           ╰─ tagShorthandId "#foo"
+ │   │           │╰─ tagShorthandId.quasis[0] "foo"
+ │   │           ├─ tagShorthandId "#foo"
+ │   │           ╰─ tagName.quasis[1]
  │   ├─ tagName.expressions[0] "${myTagName}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${myTagName}"
diff --git a/src/__tests__/fixtures/tag-name-expression-simple-empty-close/__snapshots__/tag-name-expression-simple-empty-close.expected.txt b/src/__tests__/fixtures/tag-name-expression-simple-empty-close/__snapshots__/tag-name-expression-simple-empty-close.expected.txt
@@ -1,10 +1,10 @@
 1╭─ <${foo}>
- │   │     ╰─ openTagEnd
+ │   │     ├─ openTagEnd
+ │   │     ╰─ tagName.quasis[1]
  │   ├─ tagName.expressions[0] "${foo}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${foo}"
 2╭─ </>
  │  │ ╰─ closeTag(${foo}).value
  │  ├─ text "\n"
- │  ├─ tagName.quasis[1]
  ╰─ ╰─ closeTag(${foo}) "</>"
diff --git a/src/__tests__/fixtures/tag-name-expression-simple/__snapshots__/tag-name-expression-simple.expected.txt b/src/__tests__/fixtures/tag-name-expression-simple/__snapshots__/tag-name-expression-simple.expected.txt
@@ -1,10 +1,10 @@
 1╭─ <${foo}>
- │   │     ╰─ openTagEnd
+ │   │     ├─ openTagEnd
+ │   │     ╰─ tagName.quasis[1]
  │   ├─ tagName.expressions[0] "${foo}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${foo}"
 2╭─ </${foo}>
  │  │ ╰─ closeTag(${foo}).value "${foo}"
  │  ├─ text "\n"
- │  ├─ tagName.quasis[1]
  ╰─ ╰─ closeTag(${foo}) "</${foo}>"
diff --git a/src/__tests__/fixtures/tag-var-declaration/__snapshots__/tag-var-declaration.expected.txt b/src/__tests__/fixtures/tag-var-declaration/__snapshots__/tag-var-declaration.expected.txt
@@ -1,8 +1,8 @@
 1╭─ <${foo}/someVar>
  │   │     ││      ╰─ openTagEnd
- │   │     │├─ tagVar.value "someVar"
- │   │     │╰─ tagName.quasis[1]
- │   │     ╰─ tagVar "/someVar"
+ │   │     │╰─ tagVar.value "someVar"
+ │   │     ├─ tagVar "/someVar"
+ │   │     ╰─ tagName.quasis[1]
  │   ├─ tagName.expressions[0] "${foo}"
  │   ├─ tagName.quasis[0]
  ╰─  ╰─ tagName "${foo}"
diff --git a/src/__tests__/fixtures/testing/__snapshots__/testing.expected.txt b/src/__tests__/fixtures/testing/__snapshots__/testing.expected.txt
@@ -0,0 +1,7 @@
+1╭─ <div.hello-${world}-again/>
+ │   │  ││     │       │     ╰─ openTagEnd:selfClosed "/>"
+ │   │  ││     │       ╰─ tagShorthandClass.quasis[1] "-again"
+ │   │  ││     ╰─ tagShorthandClass.expressions[0] "${world}"
+ │   │  │╰─ tagShorthandClass.quasis[0] "hello-"
+ │   │  ╰─ tagShorthandClass ".hello-${world}-again"
+ ╰─  ╰─ tagName "div"
diff --git a/src/__tests__/fixtures/testing/input.marko b/src/__tests__/fixtures/testing/input.marko
@@ -0,0 +1 @@
+<div.hello-${world}-again/>
diff --git a/src/states/TAG_NAME.ts b/src/states/TAG_NAME.ts
@@ -155,7 +155,7 @@ export const TAG_NAME: StateDefinition<TagNameMeta> = {
     const { quasis, expressions } = tagName;
     const start = child.start - 2; // include ${
     const end = ++this.pos; // include }
-    const nextStart = end + 1;
+    const nextStart = end;
     expressions.push({
       start,
       end,
