brighterscript 1.0.0-alpha.32 → 1.0.0-alpha.34

package/dist/parser/TranspileState.js

@@ -44,15 +44,31 @@ class TranspileState {
         this._blockDepth = value;
         this.indentText = value === 0 ? '' : '    '.repeat(value);
     }
+    getSource(locatable) {
+        var _a, _b;
+        let srcPath = (_b = (_a = locatable === null || locatable === void 0 ? void 0 : locatable.location) === null || _a === void 0 ? void 0 : _a.uri) !== null && _b !== void 0 ? _b : locatable.uri;
+        if (srcPath) {
+            srcPath = util_1.util.uriToPath(srcPath);
+            //if a sourceRoot is specified, use that instead of the rootDir
+            if (this.options.sourceRoot) {
+                srcPath = srcPath.replace(this.options.rootDir, this.options.sourceRoot);
+            }
+            return srcPath;
+        }
+        else {
+            return this.srcPath;
+        }
+    }
     /**
      * Shorthand for creating a new source node
      */
     sourceNode(locatable, code) {
-        return util_1.default.sourceNodeFromTranspileResult(
+        let range = util_1.util.extractRange(locatable);
+        return util_1.util.sourceNodeFromTranspileResult(
         //convert 0-based range line to 1-based SourceNode line
-        locatable.range ? locatable.range.start.line + 1 : null, 
+        range ? range.start.line + 1 : null, 
         //range and SourceNode character are both 0-based, so no conversion necessary
-        locatable.range ? locatable.range.start.character : null, this.srcPath, code);
+        range ? range.start.character : null, this.getSource(locatable), code);
     }
     /**
      * Create a SourceNode from a token. This is more efficient than the above `sourceNode` function
@@ -60,11 +76,12 @@ class TranspileState {
      * only to then be copied again for the SourceNode constructor
      */
     tokenToSourceNode(token) {
+        var _a, _b;
         return new source_map_1.SourceNode(
         //convert 0-based range line to 1-based SourceNode line
-        token.range ? token.range.start.line + 1 : null, 
+        ((_a = token.location) === null || _a === void 0 ? void 0 : _a.range) ? token.location.range.start.line + 1 : null, 
         //range and SourceNode character are both 0-based, so no conversion necessary
-        token.range ? token.range.start.character : null, this.srcPath, token.text);
+        ((_b = token.location) === null || _b === void 0 ? void 0 : _b.range) ? token.location.range.start.character : null, this.getSource(token), token.text);
     }
     transpileLeadingComments(token) {
         var _a;
@@ -104,17 +121,17 @@ class TranspileState {
      * Adds all leading trivia for the token
      */
     transpileToken(token, defaultValue, commentOut = false) {
-        var _a, _b;
+        var _a;
         const leadingCommentsSourceNodes = this.transpileLeadingComments(token);
         const commentIfCommentedOut = commentOut ? `'` : '';
         if (!(token === null || token === void 0 ? void 0 : token.text) && defaultValue !== undefined) {
             return [new source_map_1.SourceNode(null, null, null, [...leadingCommentsSourceNodes, commentIfCommentedOut, defaultValue])];
         }
-        if (!token.range) {
+        if (!((_a = token === null || token === void 0 ? void 0 : token.location) === null || _a === void 0 ? void 0 : _a.range)) {
             return [new source_map_1.SourceNode(null, null, null, [...leadingCommentsSourceNodes, commentIfCommentedOut, token.text])];
         }
         //split multi-line text
-        if (((_a = token.range) === null || _a === void 0 ? void 0 : _a.end.line) > ((_b = token.range) === null || _b === void 0 ? void 0 : _b.start.line)) {
+        if (token.location.range.end.line > token.location.range.start.line) {
             const lines = token.text.split(/\r?\n/g);
             const code = [
                 this.sourceNode(token, [...leadingCommentsSourceNodes, commentIfCommentedOut, lines[0]])
@@ -122,9 +139,9 @@ class TranspileState {
             for (let i = 1; i < lines.length; i++) {
                 code.push(this.newline, commentIfCommentedOut, new source_map_1.SourceNode(
                 //convert 0-based range line to 1-based SourceNode line
-                token.range.start.line + i + 1, 
+                token.location.range.start.line + i + 1, 
                 //SourceNode column is 0-based, and this starts at the beginning of the line
-                0, this.srcPath, lines[i]));
+                0, this.getSource(token), lines[i]));
             }
             return [new source_map_1.SourceNode(null, null, null, code)];
         }
@@ -134,9 +151,9 @@ class TranspileState {
     }
     transpileEndBlockToken(previousLocatable, endToken, defaultValue, alwaysAddNewlineBeforeEndToken = true) {
         const result = [];
-        if (util_1.default.hasLeadingComments(endToken)) {
+        if (util_1.util.hasLeadingComments(endToken)) {
             // add comments before `end token` - they should be indented
-            if (util_1.default.isLeadingCommentOnSameLine(previousLocatable, endToken)) {
+            if (util_1.util.isLeadingCommentOnSameLine(previousLocatable === null || previousLocatable === void 0 ? void 0 : previousLocatable.location, endToken)) {
                 this.blockDepth++;
                 result.push(' ');
             }

package/dist/parser/TranspileState.js.map

@@ -1 +1 @@
-{"version":3,"file":"TranspileState.js","sourceRoot":"","sources":["../../src/parser/TranspileState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TranspileState.js","sourceRoot":"","sources":["../../src/parser/TranspileState.ts"],"names":[],"mappings":"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"}

package/dist/parser/tests/Parser.spec.d.ts

@@ -1,6 +1,5 @@
 import type { Token } from '../../lexer/Token';
 import { TokenKind } from '../../lexer/TokenKind';
-import type { Range } from 'vscode-languageserver';
 /**
  * Creates a token with the given `kind` and (optional) `literal` value.
  */
@@ -9,11 +8,5 @@ export declare function token(kind: TokenKind, text?: string): Token;
  * Creates an Identifier token with the given `text`.
  */
 export declare function identifier(text: string): Token;
-/**
- * Test whether a range matches a group of elements with a `range`
- */
-export declare function rangeMatch(range: Range, elements: ({
-    range?: Range;
-})[]): boolean;
 /** An end-of-file token. */
 export declare const EOF: Token;

package/dist/parser/tests/Parser.spec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EOF = exports.rangeMatch = exports.identifier = exports.token = void 0;
+exports.EOF = exports.identifier = exports.token = void 0;
 const TokenKind_1 = require("../../lexer/TokenKind");
 /* A set of utilities to be used while writing tests for the BRS parser. */
 /**
@@ -11,7 +11,7 @@ function token(kind, text) {
         kind: kind,
         text: text,
         isReserved: TokenKind_1.ReservedWords.has((text !== null && text !== void 0 ? text : '').toLowerCase()),
-        range: null,
+        location: null,
         leadingWhitespace: '',
         leadingTrivia: []
     };
@@ -24,16 +24,6 @@ function identifier(text) {
     return token(TokenKind_1.TokenKind.Identifier, text);
 }
 exports.identifier = identifier;
-/**
- * Test whether a range matches a group of elements with a `range`
- */
-function rangeMatch(range, elements) {
-    return range.start.line === elements[0].range.start.line &&
-        range.start.character === elements[0].range.start.character &&
-        range.end.line === elements[elements.length - 1].range.end.line &&
-        range.end.character === elements[elements.length - 1].range.end.character;
-}
-exports.rangeMatch = rangeMatch;
 /** An end-of-file token. */
 exports.EOF = token(TokenKind_1.TokenKind.Eof, '\0');
 //# sourceMappingURL=Parser.spec.js.map

package/dist/parser/tests/Parser.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"Parser.spec.js","sourceRoot":"","sources":["../../../src/parser/tests/Parser.spec.ts"],"names":[],"mappings":";;;AACA,qDAAiE;AAGjE,2EAA2E;AAE3E;;GAEG;AACH,SAAgB,KAAK,CAAC,IAAe,EAAE,IAAa;IAChD,OAAO;QACH,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAK;QACX,UAAU,EAAE,yBAAa,CAAC,GAAG,CAAC,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,KAAK,EAAE,IAAI;QACX,iBAAiB,EAAE,EAAE;QACrB,aAAa,EAAE,EAAE;KACpB,CAAC;AACN,CAAC;AATD,sBASC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,IAAY;IACnC,OAAO,KAAK,CAAC,qBAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC;AAFD,gCAEC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,KAAY,EAAE,QAA+B;IACpE,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI;QACpD,KAAK,CAAC,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS;QAC3D,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI;QAC/D,KAAK,CAAC,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC;AAClF,CAAC;AALD,gCAKC;AAED,4BAA4B;AACf,QAAA,GAAG,GAAG,KAAK,CAAC,qBAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC"}
+{"version":3,"file":"Parser.spec.js","sourceRoot":"","sources":["../../../src/parser/tests/Parser.spec.ts"],"names":[],"mappings":";;;AACA,qDAAiE;AAEjE,2EAA2E;AAE3E;;GAEG;AACH,SAAgB,KAAK,CAAC,IAAe,EAAE,IAAa;IAChD,OAAO;QACH,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAK;QACX,UAAU,EAAE,yBAAa,CAAC,GAAG,CAAC,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,EAAE;QACrB,aAAa,EAAE,EAAE;KACpB,CAAC;AACN,CAAC;AATD,sBASC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,IAAY;IACnC,OAAO,KAAK,CAAC,qBAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC;AAFD,gCAEC;AAED,4BAA4B;AACf,QAAA,GAAG,GAAG,KAAK,CAAC,qBAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC"}

package/dist/parser/tests/controlFlow/For.spec.js

@@ -7,10 +7,11 @@ const Parser_spec_1 = require("../Parser.spec");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const Expression_1 = require("../../Expression");
 const reflection_1 = require("../../../astUtils/reflection");
+const util_1 = require("../../../util");
 describe('parser for loops', () => {
     it('accepts a \'step\' clause', () => {
         var _a;
-        let { statements, diagnostics } = Parser_1.Parser.parse([
+        let { ast, diagnostics } = Parser_1.Parser.parse([
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.For, 'for'),
             (0, Parser_spec_1.identifier)('i'),
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
@@ -25,14 +26,14 @@ describe('parser for loops', () => {
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             Parser_spec_1.EOF
         ]);
-        const statement = statements[0];
+        const statement = ast.statements[0];
         (0, chai_config_spec_1.expect)((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
         (0, chai_config_spec_1.expect)(statement.increment).to.be.instanceof(Expression_1.LiteralExpression);
         (0, chai_config_spec_1.expect)(statement.increment.tokens.value.text).to.equal('2');
     });
     it('supports omitted \'step\' clause', () => {
         var _a;
-        let { statements, diagnostics } = Parser_1.Parser.parse([
+        let { ast, diagnostics } = Parser_1.Parser.parse([
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.For, 'for'),
             (0, Parser_spec_1.identifier)('i'),
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
@@ -46,7 +47,7 @@ describe('parser for loops', () => {
             Parser_spec_1.EOF
         ]);
         (0, chai_config_spec_1.expect)((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
-        (0, chai_config_spec_1.expect)(statements[0].increment).not.to.exist;
+        (0, chai_config_spec_1.expect)(ast.statements[0].increment).not.to.exist;
     });
     it('catches unterminated for reaching function boundary', () => {
         const parser = Parser_1.Parser.parse(`
@@ -56,12 +57,12 @@ describe('parser for loops', () => {
             end function
         `);
         (0, chai_config_spec_1.expect)(parser.diagnostics).to.be.lengthOf(1);
-        (0, chai_config_spec_1.expect)(parser.statements).to.be.lengthOf(1);
+        (0, chai_config_spec_1.expect)(parser.ast.statements).to.be.lengthOf(1);
         const functionStatements = parser.ast.findChildren(reflection_1.isFunctionStatement);
         (0, chai_config_spec_1.expect)(functionStatements[0].func.body.statements).to.be.lengthOf(1);
     });
     it('allows \'next\' to terminate loop', () => {
-        let { statements, diagnostics } = Parser_1.Parser.parse([
+        let { ast, diagnostics } = Parser_1.Parser.parse([
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.For, 'for'),
             (0, Parser_spec_1.identifier)('i'),
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
@@ -75,7 +76,7 @@ describe('parser for loops', () => {
             Parser_spec_1.EOF
         ]);
         (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0);
-        (0, chai_config_spec_1.expect)(statements).to.be.length.greaterThan(0);
+        (0, chai_config_spec_1.expect)(ast.statements).to.be.length.greaterThan(0);
     });
     it('supports a single trailing colon after the `to` expression', () => {
         var _a;
@@ -95,57 +96,54 @@ describe('parser for loops', () => {
          * 1|   Rnd(i)
          * 2| end for
          */
-        let { statements, diagnostics } = Parser_1.Parser.parse([
+        let { ast, diagnostics } = Parser_1.Parser.parse([
             {
                 kind: TokenKind_1.TokenKind.For,
                 text: 'for',
                 isReserved: true,
-                range: vscode_languageserver_1.Range.create(0, 0, 0, 3),
+                location: util_1.default.createLocation(0, 0, 0, 3),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.Identifier,
                 text: 'i',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 4, 0, 5),
+                location: util_1.default.createLocation(0, 4, 0, 5),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.Equal,
                 text: '=',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 6, 0, 7),
+                location: util_1.default.createLocation(0, 6, 0, 7),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.IntegerLiteral,
                 text: '0',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 8, 0, 9),
+                location: util_1.default.createLocation(0, 8, 0, 9),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.To,
                 text: 'to',
                 isReserved: false,
-                range: {
-                    start: { line: 0, character: 10 },
-                    end: { line: 0, character: 12 }
-                },
+                location: util_1.default.createLocation(0, 10, 0, 12),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.IntegerLiteral,
                 text: '10',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 13, 0, 15),
+                location: util_1.default.createLocation(0, 13, 0, 15),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.Newline,
                 text: '\n',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 15, 0, 16),
+                location: util_1.default.createLocation(0, 15, 0, 16),
                 leadingTrivia: []
             },
             // loop body isn't significant for location tracking, so helper functions are safe
@@ -158,14 +156,14 @@ describe('parser for loops', () => {
                 kind: TokenKind_1.TokenKind.EndFor,
                 text: 'end for',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(2, 0, 2, 8),
+                location: util_1.default.createLocation(2, 0, 2, 8),
                 leadingTrivia: []
             },
             Parser_spec_1.EOF
         ]);
         (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0);
-        (0, chai_config_spec_1.expect)(statements).to.be.lengthOf(1);
-        (0, chai_config_spec_1.expect)(statements[0].range).to.deep.include(vscode_languageserver_1.Range.create(0, 0, 2, 8));
+        (0, chai_config_spec_1.expect)(ast.statements).to.be.lengthOf(1);
+        (0, chai_config_spec_1.expect)(ast.statements[0].location.range).to.deep.include(vscode_languageserver_1.Range.create(0, 0, 2, 8));
     });
 });
 //# sourceMappingURL=For.spec.js.map

package/dist/parser/tests/controlFlow/For.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"For.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/controlFlow/For.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"For.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/controlFlow/For.spec.ts"],"names":[],"mappings":"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"}

package/dist/parser/tests/controlFlow/ForEach.spec.js

@@ -7,9 +7,10 @@ const Parser_spec_1 = require("../Parser.spec");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const Statement_1 = require("../../Statement");
 const Expression_1 = require("../../Expression");
+const util_1 = require("../../../util");
 describe('parser foreach loops', () => {
     it('requires a name and target', () => {
-        let { statements, diagnostics } = Parser_1.Parser.parse([
+        let { ast, diagnostics } = Parser_1.Parser.parse([
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.ForEach, 'for each'),
             (0, Parser_spec_1.identifier)('word'),
             (0, Parser_spec_1.identifier)('in'),
@@ -21,15 +22,15 @@ describe('parser foreach loops', () => {
             Parser_spec_1.EOF
         ]);
         (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0);
-        (0, chai_config_spec_1.expect)(statements).to.exist;
-        let forEach = statements[0];
+        (0, chai_config_spec_1.expect)(ast.statements).to.exist;
+        let forEach = ast.statements[0];
         (0, chai_config_spec_1.expect)(forEach).to.be.instanceof(Statement_1.ForEachStatement);
         (0, chai_config_spec_1.expect)(forEach.tokens.item).to.deep.include((0, Parser_spec_1.identifier)('word'));
         (0, chai_config_spec_1.expect)(forEach.target).to.be.instanceof(Expression_1.VariableExpression);
         (0, chai_config_spec_1.expect)(forEach.target.tokens.name).to.deep.include((0, Parser_spec_1.identifier)('lipsum'));
     });
     it('allows \'next\' to terminate loop', () => {
-        let { statements, diagnostics } = Parser_1.Parser.parse([
+        let { ast, diagnostics } = Parser_1.Parser.parse([
             (0, Parser_spec_1.token)(TokenKind_1.TokenKind.ForEach, 'for each'),
             (0, Parser_spec_1.identifier)('word'),
             (0, Parser_spec_1.identifier)('in'),
@@ -41,8 +42,8 @@ describe('parser foreach loops', () => {
             Parser_spec_1.EOF
         ]);
         (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0);
-        (0, chai_config_spec_1.expect)(statements).to.exist;
-        (0, chai_config_spec_1.expect)(statements).to.be.length.greaterThan(0);
+        (0, chai_config_spec_1.expect)(ast.statements).to.exist;
+        (0, chai_config_spec_1.expect)(ast.statements).to.be.length.greaterThan(0);
     });
     it('location tracking', () => {
         /**
@@ -53,40 +54,40 @@ describe('parser foreach loops', () => {
          * 1|   Rnd(a)
          * 2| end for
          */
-        let { statements, diagnostics } = Parser_1.Parser.parse([
+        let { ast, diagnostics } = Parser_1.Parser.parse([
             {
                 kind: TokenKind_1.TokenKind.ForEach,
                 text: 'for each',
                 isReserved: true,
-                range: vscode_languageserver_1.Range.create(0, 0, 0, 8),
+                location: util_1.default.createLocation(0, 0, 0, 8),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.Identifier,
                 text: 'a',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 9, 0, 10),
+                location: util_1.default.createLocation(0, 9, 0, 10),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.Identifier,
                 text: 'in',
                 isReserved: true,
-                range: vscode_languageserver_1.Range.create(0, 11, 0, 13),
+                location: util_1.default.createLocation(0, 11, 0, 13),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.Identifier,
                 text: 'b',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 14, 0, 15),
+                location: util_1.default.createLocation(0, 14, 0, 15),
                 leadingTrivia: []
             },
             {
                 kind: TokenKind_1.TokenKind.Newline,
                 text: '\n',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(0, 15, 0, 16),
+                location: util_1.default.createLocation(0, 15, 0, 16),
                 leadingTrivia: []
             },
             // loop body isn't significant for location tracking, so helper functions are safe
@@ -99,14 +100,14 @@ describe('parser foreach loops', () => {
                 kind: TokenKind_1.TokenKind.EndFor,
                 text: 'end for',
                 isReserved: false,
-                range: vscode_languageserver_1.Range.create(2, 0, 2, 7),
+                location: util_1.default.createLocation(2, 0, 2, 7),
                 leadingTrivia: []
             },
             Parser_spec_1.EOF
         ]);
         (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0);
-        (0, chai_config_spec_1.expect)(statements).to.be.lengthOf(1);
-        (0, chai_config_spec_1.expect)(statements[0].range).deep.include(vscode_languageserver_1.Range.create(0, 0, 2, 7));
+        (0, chai_config_spec_1.expect)(ast.statements).to.be.lengthOf(1);
+        (0, chai_config_spec_1.expect)(ast.statements[0].location.range).deep.include(vscode_languageserver_1.Range.create(0, 0, 2, 7));
     });
 });
 //# sourceMappingURL=ForEach.spec.js.map

package/dist/parser/tests/controlFlow/ForEach.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ForEach.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/controlFlow/ForEach.spec.ts"],"names":[],"mappings":";;AAAA,gEAAmD;AAEnD,yCAAsC;AACtC,wDAAqD;AACrD,gDAAwD;AACxD,iEAA8C;AAC9C,+CAAmD;AACnD,iDAAsD;AAEtD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC;YAC3C,IAAA,mBAAK,EAAC,qBAAS,CAAC,OAAO,EAAE,UAAU,CAAC;YACpC,IAAA,wBAAU,EAAC,MAAM,CAAC;YAClB,IAAA,wBAAU,EAAC,IAAI,CAAC;YAChB,IAAA,wBAAU,EAAC,QAAQ,CAAC;YACpB,IAAA,mBAAK,EAAC,qBAAS,CAAC,OAAO,EAAE,IAAI,CAAC;YAE9B,2DAA2D;YAC3D,IAAA,mBAAK,EAAC,qBAAS,CAAC,MAAM,EAAE,SAAS,CAAC;YAClC,IAAA,mBAAK,EAAC,qBAAS,CAAC,OAAO,EAAE,IAAI,CAAC;YAC9B,iBAAG;SACN,CAAC,CAAC;QAEH,IAAA,yBAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtC,IAAA,yBAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;QAE5B,IAAI,OAAO,GAAG,UAAU,CAAC,CAAC,CAAQ,CAAC;QACnC,IAAA,yBAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,4BAAgB,CAAC,CAAC;QAEnD,IAAA,yBAAM,EAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAA,wBAAU,EAAC,MAAM,CAAC,CAAC,CAAC;QAChE,IAAA,yBAAM,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,+BAAkB,CAAC,CAAC;QAC5D,IAAA,yBAAM,EAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QACzC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC;YAC3C,IAAA,mBAAK,EAAC,qBAAS,CAAC,OAAO,EAAE,UAAU,CAAC;YACpC,IAAA,wBAAU,EAAC,MAAM,CAAC;YAClB,IAAA,wBAAU,EAAC,IAAI,CAAC;YAChB,IAAA,wBAAU,EAAC,QAAQ,CAAC;YACpB,IAAA,mBAAK,EAAC,qBAAS,CAAC,OAAO,EAAE,IAAI,CAAC;YAE9B,2DAA2D;YAC3D,IAAA,mBAAK,EAAC,qBAAS,CAAC,IAAI,EAAE,MAAM,CAAC;YAC7B,IAAA,mBAAK,EAAC,qBAAS,CAAC,OAAO,EAAE,IAAI,CAAC;YAC9B,iBAAG;SACN,CAAC,CAAC;QAEH,IAAA,yBAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtC,IAAA,yBAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;QAC5B,IAAA,yBAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACzB;;;;;;;WAOG;QACH,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC;YAC3C;gBACI,IAAI,EAAE,qBAAS,CAAC,OAAO;gBACvB,IAAI,EAAE,UAAU;gBAChB,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC/B,aAAa,EAAE,EAAE;aACpB;YACD;gBACI,IAAI,EAAE,qBAAS,CAAC,UAAU;gBAC1B,IAAI,EAAE,GAAG;gBACT,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChC,aAAa,EAAE,EAAE;aACpB;YACD;gBACI,IAAI,EAAE,qBAAS,CAAC,UAAU;gBAC1B,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjC,aAAa,EAAE,EAAE;aACpB;YACD;gBACI,IAAI,EAAE,qBAAS,CAAC,UAAU;gBAC1B,IAAI,EAAE,GAAG;gBACT,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjC,aAAa,EAAE,EAAE;aACpB;YACD;gBACI,IAAI,EAAE,qBAAS,CAAC,OAAO;gBACvB,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjC,aAAa,EAAE,EAAE;aACpB;YACD,kFAAkF;YAClF,IAAA,wBAAU,EAAC,KAAK,CAAC;YACjB,IAAA,mBAAK,EAAC,qBAAS,CAAC,SAAS,EAAE,GAAG,CAAC;YAC/B,IAAA,wBAAU,EAAC,GAAG,CAAC;YACf,IAAA,mBAAK,EAAC,qBAAS,CAAC,UAAU,EAAE,GAAG,CAAC;YAChC,IAAA,mBAAK,EAAC,qBAAS,CAAC,OAAO,EAAE,IAAI,CAAC;YAC9B;gBACI,IAAI,EAAE,qBAAS,CAAC,MAAM;gBACtB,IAAI,EAAE,SAAS;gBACf,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC/B,aAAa,EAAE,EAAE;aACpB;YACD,iBAAG;SACN,CAAC,CAAC;QAEH,IAAA,yBAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtC,IAAA,yBAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrC,IAAA,yBAAM,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CACpC,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAC3B,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ForEach.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/controlFlow/ForEach.spec.ts"],"names":[],"mappings":"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"}