Fix a bug where ForEach kept variable definitions across loop iterations (#12)

Author: harrisont

CHANGELOG.md

@@ -1,6 +1,11 @@
+# v0.1.7
+
+* Fixed a bug where `ForEach` kept variable definitions across loop iterations. An example of how this bug manifested is that adding to a "current-scope non-existant, parent-scope existant, current-scope variable" in a `ForEach` loop added to the previous loop-iteration value instead of redefining it each time.
+
+
 # v0.1.6
 
-* [#7](https://github.com/harrisont/fbuild-vscode-lsp/issues/7) Wait for a delay before while the user is typing (debounce) before evaluating, to improve performance.
+* [#7](https://github.com/harrisont/fbuild-vscode-lsp/issues/7) Wait for a delay before updating (debounce), to improve performance.
 
 # v0.1.5
 

package.json

@@ -2,7 +2,7 @@
 	"name": "fastbuild-support",
 	"displayName": "FASTBuild Support",
 	"description": "FASTBuild language support. Includes go-to definition, find references, variable evaluation, syntax errors, etc.",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"preview": true,
 	"publisher": "HarrisonT",
 	"author": {

server/src/evaluator.ts

@@ -1157,8 +1157,8 @@ function evaluateStatements(statements: Statement[], context: EvaluationContext)
                 }
 
                 let error: Error | null = null;
-                context.scopeStack.withScope(() => {
-                    for (const arrayItem of arrayItems) {
+                for (const arrayItem of arrayItems) {
+                    context.scopeStack.withScope(() => {
                         const variable = context.scopeStack.setVariableInCurrentScope(evaluatedLoopVarNameValue, arrayItem, definition);
 
                         // The loop variable is a variable reference.
@@ -1176,8 +1176,8 @@ function evaluateStatements(statements: Statement[], context: EvaluationContext)
                             error = evaluatedStatementsAndMaybeError.error;
                             return;
                         }
-                    }
-                });
+                    });
+                }
                 if (error !== null) {
                     return new DataAndMaybeError(result, error);
                 }

server/src/test/2-evaluator.test.ts

@@ -994,6 +994,25 @@ describe('evaluator', () => {
             ]);
         });
 
+        // Similar to the above test, but in a loop
+        it('in a loop, adding to a current-scope non-existant, parent-scope existant, current-scope variable redefines it each time in the current scope to be the sum', () => {
+            const input = `
+                .MyArray = {'a', 'b', 'c'}
+                .MyMessage = 'Base'
+                ForEach( .Item in .MyArray )
+                {
+                    .MyMessage + '-$Item$'
+                    Print( .MyMessage )
+                }
+            `;
+            assertEvaluatedVariablesValueEqual(input, [
+                ['a', 'b', 'c'],
+                'a', 'Base', 'Base-a',
+                'b', 'Base', 'Base-b',
+                'c', 'Base', 'Base-c',
+            ]);
+        });
+
         it('adding to a current-scope non-existant, parent-scope existant, current-scope struct variable defines it in the current scope to be the sum', () => {
             const input = `
                 .MyMessage = 'hello'