Remove FunctionScope and improve type tracking

src/Program.spec.ts

@@ -713,6 +713,34 @@ describe('Program', () => {
     });
 
     describe('getCompletions', () => {
+        it('includes `for each` variable', async () => {
+            await program.addOrReplaceFile('source/main.brs', `
+                sub main()
+                    items = [1, 2, 3]
+                    for each thing in items
+                        t =
+                    end for
+                    end for
+                end sub
+            `);
+            await program.validate();
+            let completions = (await program.getCompletions(`${rootDir}/source/main.brs`, Position.create(4, 28))).map(x => x.label);
+            expect(completions).to.include('thing');
+        });
+
+        it('includes `for` variable', async () => {
+            await program.addOrReplaceFile('source/main.brs', `
+                sub main()
+                    for i = 0 to 10
+                        t =
+                    end for
+                end sub
+            `);
+            await program.validate();
+            let completions = (await program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 28))).map(x => x.label);
+            expect(completions).to.include('i');
+        });
+
         it('should include first-level namespace names for brighterscript files', async () => {
             await program.addOrReplaceFile('source/main.bs', `
                 namespace NameA.NameB.NameC

src/files/BrsFile.ts

@@ -537,6 +537,20 @@ export class BrsFile {
                 });
             }
 
+            //add every loop-defined variable
+            func.body.walk(createVisitor({
+                ForEachStatement: (stmt) => {
+                    scope.variableDeclarations.push({
+                        nameRange: stmt.item.range,
+                        lineIndex: stmt.item.range.start.line,
+                        name: stmt.item.name.text,
+                        type: new DynamicType()
+                    });
+                }
+            }), {
+                walkMode: WalkMode.visitStatements
+            });
+
             this.scopesByFunc.set(func, scope);
 
             //find every statement in the scope

src/parser/Parser.ts

@@ -990,7 +990,7 @@ export class Parser {
                 in: maybeIn,
                 endFor: endFor
             },
-            name,
+            new VariableExpression(name as Identifier, this.currentNamespaceName),
             target,
             body
         );

src/parser/Statement.ts

@@ -806,7 +806,7 @@ export class ForEachStatement extends Statement {
             in: Token;
             endFor: Token;
         },
-        readonly item: Token,
+        readonly item: VariableExpression,
         readonly target: Expression,
         readonly body: Block
     ) {
@@ -825,7 +825,7 @@ export class ForEachStatement extends Statement {
         );
         //item
         result.push(
-            new SourceNode(this.tokens.forEach.range.start.line + 1, this.tokens.forEach.range.start.character, state.pathAbsolute, this.item.text),
+            ...this.item.transpile(state),
             ' '
         );
         //in
@@ -852,6 +852,7 @@ export class ForEachStatement extends Statement {
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
         if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'item', visitor, options);
             walk(this, 'target', visitor, options);
         }
         if (options.walkMode & InternalWalkMode.walkStatements) {

src/parser/tests/controlFlow/ForEach.spec.ts

@@ -27,7 +27,7 @@ describe('parser foreach loops', () => {
         let forEach = statements[0] as any;
         expect(forEach).to.be.instanceof(ForEachStatement);
 
-        expect(forEach.item).to.deep.include(identifier('word'));
+        expect(forEach.item.name.text).to.eql('word');
         expect(forEach.target).to.be.instanceof(VariableExpression);
         expect(forEach.target.name).to.deep.include(identifier('lipsum'));
     });