Fix else block location (#112)

* Fix else block location * fix
sveltejs · Nov 28, 2021 · e9b249f · e9b249f
1 parent 6f66a88
commit e9b249f
Show file tree

Hide file tree

Showing 6 changed files with 645 additions and 5 deletions.
diff --git a/src/parser/converts/block.ts b/src/parser/converts/block.ts
@@ -13,6 +13,30 @@ import type { Context } from "../../context"
 import { convertChildren } from "./element"
 import { getWithLoc, indexOf, lastIndexOf } from "./common"
 
+/** Get start index of block */
+function startBlockIndex(code: string, endIndex: number): number {
+    return lastIndexOf(
+        code,
+        (c, index) => {
+            if (c !== "{") {
+                return false
+            }
+            for (let next = index + 1; next < code.length; next++) {
+                const nextC = code[next]
+                if (!nextC.trim()) {
+                    continue
+                }
+                return (
+                    code.startsWith("#if", next) ||
+                    code.startsWith(":else", next)
+                )
+            }
+            return false
+        },
+        endIndex,
+    )
+}
+
 /** Convert for IfBlock */
 export function convertIfBlock(
     node: SvAST.IfBlock,
@@ -22,7 +46,7 @@ export function convertIfBlock(
     // {#if expr} {:else} {/if}
     // {:else if expr} {/if}
     const nodeStart = node.elseif
-        ? ctx.code.lastIndexOf("{", node.start)
+        ? startBlockIndex(ctx.code, node.start - 1)
         : node.start
     const ifBlock: SvelteIfBlock = {
         type: "SvelteIfBlock",
@@ -49,7 +73,7 @@ export function convertIfBlock(
         return ifBlock
     }
 
-    const elseStart = ctx.code.lastIndexOf("{", node.else.start)
+    const elseStart = startBlockIndex(ctx.code, node.else.start - 1)
 
     const elseBlock: SvelteElseBlock = {
         type: "SvelteElseBlock",
@@ -149,7 +173,7 @@ export function convertEachBlock(
         return eachBlock
     }
 
-    const elseStart = ctx.code.lastIndexOf("{", node.else.start)
+    const elseStart = startBlockIndex(ctx.code, node.else.start - 1)
 
     const elseBlock: SvelteElseBlock = {
         type: "SvelteElseBlock",

diff --git a/src/parser/converts/common.ts b/src/parser/converts/common.ts
@@ -17,12 +17,12 @@ export function indexOf(
 /** lastIndexOf */
 export function lastIndexOf(
     str: string,
-    search: (c: string) => boolean,
+    search: (c: string, index: number) => boolean,
     end: number,
 ): number {
     for (let index = end; index >= 0; index--) {
         const c = str[index]
-        if (search(c)) {
+        if (search(c, index)) {
             return index
         }
     }

diff --git a/tests/fixtures/parser/ast/if-block01-input.svelte b/tests/fixtures/parser/ast/if-block01-input.svelte
@@ -0,0 +1 @@
+{#if expression}{:else if expression}{:else}{/if}
diff --git a/tests/fixtures/parser/ast/if-block01-no-undef-result.json b/tests/fixtures/parser/ast/if-block01-no-undef-result.json
@@ -0,0 +1,14 @@
+[
+  {
+    "ruleId": "no-undef",
+    "code": "expression",
+    "line": 1,
+    "column": 6
+  },
+  {
+    "ruleId": "no-undef",
+    "code": "expression",
+    "line": 1,
+    "column": 27
+  }
+]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{#if expression}{:else if expression}{:else}{/if}