fix

Author: ota-meshi

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 - 1)
+    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",

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
         }
     }

tests/fixtures/parser/ast/if-block0101-input.svelte renamed to tests/fixtures/parser/ast/if-block01-input.svelte

@@ -67,13 +67,13 @@
               }
             },
             "range": [
-              37,
+              16,
               49
             ],
             "loc": {
               "start": {
                 "line": 1,
-                "column": 37
+                "column": 16
               },
               "end": {
                 "line": 1,
@@ -207,88 +207,16 @@
       }
     },
     {
-      "type": "Punctuator",
-      "value": ":",
+      "type": "MustacheKeyword",
+      "value": ":else",
       "range": [
         17,
-        18
-      ],
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 17
-        },
-        "end": {
-          "line": 1,
-          "column": 18
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "e",
-      "range": [
-        18,
-        19
-      ],
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 18
-        },
-        "end": {
-          "line": 1,
-          "column": 19
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "l",
-      "range": [
-        19,
-        20
-      ],
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 19
-        },
-        "end": {
-          "line": 1,
-          "column": 20
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "s",
-      "range": [
-        20,
-        21
-      ],
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 20
-        },
-        "end": {
-          "line": 1,
-          "column": 21
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "e",
-      "range": [
-        21,
         22
       ],
       "loc": {
         "start": {
           "line": 1,
-          "column": 21
+          "column": 17
         },
         "end": {
           "line": 1,
@@ -297,34 +225,16 @@
       }
     },
     {
-      "type": "Identifier",
-      "value": "i",
+      "type": "MustacheKeyword",
+      "value": "if",
       "range": [
         23,
-        24
-      ],
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 23
-        },
-        "end": {
-          "line": 1,
-          "column": 24
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "f",
-      "range": [
-        24,
         25
       ],
       "loc": {
         "start": {
           "line": 1,
-          "column": 24
+          "column": 23
         },
         "end": {
           "line": 1,
@@ -404,24 +314,6 @@
         }
       }
     },
-    {
-      "type": "MustacheKeyword",
-      "value": ":else",
-      "range": [
-        38,
-        43
-      ],
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 38
-        },
-        "end": {
-          "line": 1,
-          "column": 43
-        }
-      }
-    },
     {
       "type": "Punctuator",
       "value": "}",
@@ -476,24 +368,6 @@
         }
       }
     },
-    {
-      "type": "MustacheKeyword",
-      "value": "if",
-      "range": [
-        46,
-        48
-      ],
-      "loc": {
-        "start": {
-          "line": 1,
-          "column": 46
-        },
-        "end": {
-          "line": 1,
-          "column": 48
-        }
-      }
-    },
     {
       "type": "Punctuator",
       "value": "}",