(fix) handle const in html pre-scanner (#1524)

#1499
sveltejs · Jun 15, 2022 · 83d92c5 · 83d92c5
1 parent 817843d
commit 83d92c5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/language-server/src/lib/documents/utils.ts b/packages/language-server/src/lib/documents/utils.ts
@@ -432,7 +432,8 @@ export function isInsideMoustacheTag(html: string, tagStart: number | null, posi
                 // TODO make this just check for '{'?
                 // Theoretically, someone could do {a < b} in a simple moustache tag
                 charactersBeforePosition.lastIndexOf('{#'),
-                charactersBeforePosition.lastIndexOf('{:')
+                charactersBeforePosition.lastIndexOf('{:'),
+                charactersBeforePosition.lastIndexOf('{@')
             ) > charactersBeforePosition.lastIndexOf('}')
         );
     } else {

diff --git a/packages/language-server/test/lib/documents/parseHtml.test.ts b/packages/language-server/test/lib/documents/parseHtml.test.ts
@@ -37,6 +37,18 @@ describe('parseHtml', () => {
         );
     });
 
+    it('ignore binary operator inside @const', () => {
+        testRootElements(
+            parseHtml(
+                `{#if foo}
+                  {@const bar = 1 << 2}
+                  <Foo  />
+                {/if}
+                <style></style>`
+            )
+        );
+    });
+
     it('ignore less than operator inside control flow moustache', () => {
         testRootElements(
             parseHtml(