fix: lexical scoping

thejustinwalsh · thejustinwalsh · commit 741db69bccf4 · 2021-08-22T21:33:23.000-07:00
create scope for switch and remove additional scope for each clause.
diff --git a/src/transformation/visitors/switch.ts b/src/transformation/visitors/switch.ts
@@ -41,10 +41,7 @@ export const transformSwitchStatement: FunctionVisitor<ts.SwitchStatement> = (st
         caseBody[i] = statement.caseBlock.clauses
             .slice(i, end >= 0 ? end + i + 1 : undefined)
             .reduce<lua.Statement[]>(
-                (statements, clause) => [
-                    ...statements,
-                    lua.createDoStatement(context.transformStatements(clause.statements)),
-                ],
+                (statements, clause) => [...statements, ...context.transformStatements(clause.statements)],
                 []
             );
     }
@@ -88,5 +85,5 @@ export const transformSwitchStatement: FunctionVisitor<ts.SwitchStatement> = (st
     const expression = context.transformExpression(statement.expression);
     statements.unshift(lua.createVariableDeclarationStatement(switchVariable, expression));
 
-    return statements;
+    return lua.createDoStatement(statements);
 };
diff --git a/test/unit/__snapshots__/switch.spec.ts.snap b/test/unit/__snapshots__/switch.spec.ts.snap
@@ -4,21 +4,17 @@ exports[`switch uses elseif 1`] = `
 "local ____exports = {}
 function ____exports.__main(self)
     local result = -1
-    local ____switch3 = 2
-    if ____switch3 == 0 then
-        do
+    do
+        local ____switch3 = 2
+        if ____switch3 == 0 then
             do
                 result = 200
             end
-        end
-    elseif ____switch3 == 1 then
-        do
+        elseif ____switch3 == 1 then
             do
                 result = 100
             end
-        end
-    elseif ____switch3 == 2 then
-        do
+        elseif ____switch3 == 2 then
             do
                 result = 1
             end
