(fix) Don't step out of if block on else if (#874)

`else if`s are represented with an if block node inside them, which is correctly handled when entering, but when leaving it would previously incorrectly step out of the if block leading to an internal error.
sveltejs · Mar 11, 2021 · bb40cb8 · bb40cb8
1 parent 4411fce
commit bb40cb8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/packages/svelte2tsx/src/htmlxtojsx/index.ts b/packages/svelte2tsx/src/htmlxtojsx/index.ts
@@ -188,7 +188,9 @@ export function convertHtmlxToJsx(
             try {
                 switch (node.type) {
                     case 'IfBlock':
-                        ifScope = ifScope.getParent();
+                        if (!node.elseif) {
+                            ifScope = ifScope.getParent();
+                        }
                         break;
                     case 'EachBlock':
                         templateScopeManager.eachLeave(node);

diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/expected.jsx
@@ -0,0 +1,5 @@
+<>{(true) ? <>
+  {(true) ? <></> : (true) ? <></> : <></> }
+</> : <>
+  {__sveltets_each([], (_) => /*Ωignore_startΩ*/(!(true)) && /*Ωignore_endΩ*/<></>)}
+</> }</>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/input.svelte b/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/input.svelte
@@ -0,0 +1,5 @@
+{#if true}
+  {#if true}{:else if true}{/if}
+{:else}
+  {#each [] as _}{/each}
+{/if}