brighterscript 1.0.0-alpha.5 → 1.0.0-alpha.50

package/dist/parser/Statement.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"Statement.spec.js","sourceRoot":"","sources":["../../src/parser/Statement.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Statement.spec.js","sourceRoot":"","sources":["../../src/parser/Statement.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAC7C,2CAAiE;AACjE,2CAAmb;AACnb,qCAA6C;AAC7C,mDAAgD;AAChD,uDAAgF;AAChF,wCAAqC;AACrC,0DAA2C;AAE3C,0DAA8C;AAC9C,mDAAkG;AAClG,kDAA+C;AAC/C,6CAAkD;AAGlD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,IAAI,OAAgB,CAAC;IACrB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,iBAAO,CAAC;YAClB,GAAG,EAAE,0BAAO;SACf,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YACzC,MAAM,SAAS,GAAG,IAAI,0BAAc,EAAE,CAAC;YACvC,IAAA,yBAAM,EAAC,SAAS,CAAC,SAAS,CAAC,EAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAChC,MAAM,SAAS,GAAG,IAAI,0BAAc,EAAE,CAAC;YACvC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,IAAA,yBAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YAC7B,CAAC,EAAE,EAAE,QAAQ,EAAE,mBAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QAClB,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACrD,MAAM,IAAI,GAAG,IAAI,gBAAI,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAA,yBAAM,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;YACvB,MAAM,MAAM,GAAG,eAAM,CAAC,KAAK,CAAC;;;aAG3B,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAuB,CAAC;YACjE,IAAA,yBAAM,EAAC,SAAS,CAAC,OAAO,CAAC,kBAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC5E,IAAA,yBAAM,EAAC,SAAS,CAAC,OAAO,CAAC,kBAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;YACvB,OAAO,CAAC,OAAO,CAAU,iBAAiB,EAAE;;;;;;;aAO3C,CAAC,CAAC;YACH,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,iBAAiB,CAAE,CAAC,GAAG,CAAC,SAAS,CAAqB,iCAAoB,CAAC,CAAC;YAChH,OAAO,IAAK,CAAC,SAAS,CAAC,iCAAoB,CAAC,EAAE;gBAC1C,IAAI,GAAG,IAAK,CAAC,SAAS,CAAqB,iCAAoB,CAAC,CAAC;aACpE;YACD,IAAA,yBAAM,EAAC,IAAK,CAAC,OAAO,CAAC,kBAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACxE,IAAA,yBAAM,EAAC,IAAK,CAAC,OAAO,CAAC,kBAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;YACrB,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;gBACnC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,eAAe,EAAE;;;iBAGtD,CAAC,CAAC;gBACH,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAiB,6BAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxE,IAAA,yBAAM,EAAC,IAAI,CAAC,OAAO,CAAC,kBAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAChE,IAAA,yBAAM,EAAC,IAAI,CAAC,OAAO,CAAC,kBAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;YACH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;gBAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,eAAe,EAAE;;;;;iBAKtD,CAAC,CAAC;gBACH,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAiB,6BAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxE,IAAA,yBAAM,EAAC,IAAI,CAAC,OAAO,CAAC,kBAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBACtE,IAAA,yBAAM,EAAC,IAAI,CAAC,OAAO,CAAC,kBAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC7B,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;YACxB,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;gBAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;iBAGvD,CAAC,CAAC;gBAEH,IAAA,yBAAM,EACF,IAAA,uBAAI,EAAA,GAAG,IAAI,CAAC,UAAU,EAAE,EAAE,CAC7B,CAAC,EAAE,CAAC,GAAG,CAAC,IAAA,uBAAI,EAAA;;;iBAGZ,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAE5B,IAAI,aAAa,GAAc,EAAE,CAAC;QAElC,UAAU,CAAC,GAAG,EAAE;YACZ,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,qBAAS,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,IAAA,8BAAmB,EAAC,EAAE,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,qBAAS,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,IAAI,gBAAI,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,UAAU,GAAG,IAAI,+BAAmB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5F,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,+BAAmB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,MAAM,OAAO,GAAG,IAAI,yBAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,IAAI,yBAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YACtE,MAAM,IAAI,GAAG,IAAI,6BAAiB,CAAC;gBAC/B,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,IAAI,+BAAkB,CAAC;oBACzB,UAAU,EAAE,EAAE;oBACd,IAAI,EAAE,KAAK;oBACX,YAAY,EAAE,KAAK;oBACnB,SAAS,EAAE,KAAK;oBAChB,UAAU,EAAE,KAAK;oBACjB,eAAe,EAAE,KAAK;iBACzB,CAAC;aACL,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,uBAAW,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/E,MAAM,SAAS,GAAG,IAAI,8BAAkB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3E,MAAM,KAAK,GAAG,IAAI,0BAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,KAAK,GAAG,IAAI,yBAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/D,MAAM,MAAM,GAAG,IAAI,0BAAc,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACjE,MAAM,OAAO,GAAG,IAAI,2BAAe,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,IAAI,wBAAY,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,IAAI,yBAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAChD,MAAM,IAAI,GAAG,IAAI,wBAAY,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACrK,MAAM,OAAO,GAAG,IAAI,4BAAgB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3H,MAAM,MAAM,GAAG,IAAI,0BAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACnG,MAAM,SAAS,GAAG,IAAI,8BAAkB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAClF,MAAM,UAAU,GAAG,IAAI,+BAAmB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YACpI,MAAM,OAAO,GAAG,IAAI,4BAAgB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1E,MAAM,SAAS,GAAG,IAAI,8BAAkB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,IAAA,mCAAwB,EAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/I,MAAM,GAAG,GAAG,IAAI,0BAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,IAAI,2BAAe,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,IAAI,0BAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,IAAA,mCAAwB,EAAC,GAAG,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;YACvI,MAAM,QAAQ,GAAG,IAAI,6BAAiB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;YACpG,MAAM,OAAO,GAAG,IAAI,0BAAc,CAAC,EAAE,KAAK,EAAE,IAAA,sBAAW,EAAC,qBAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAE5E,aAAa,GAAG;gBACZ,UAAU;gBACV,OAAO;gBACP,SAAS;gBACT,IAAI;gBACJ,GAAG;gBACH,SAAS;gBACT,KAAK;gBACL,KAAK;gBACL,MAAM;gBACN,OAAO;gBACP,IAAI;gBACJ,IAAI;gBACJ,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,SAAS;gBACT,UAAU;gBACV,OAAO;gBACP,SAAS;gBACT,GAAG;gBACH,OAAO;gBACP,SAAS;gBACT,QAAQ;gBACR,OAAO;aACV,CAAC;QAEN,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACnC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;gBAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;gBACxC,IAAA,yBAAM,EAAC,YAAY,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,6BAA6B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAChF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,sBAAW,EAAC,qBAAS,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC,CAAC;gBACpF,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAS,CAAC,OAAO,CAAC,CAAC;gBACnF,IAAA,yBAAM,EAAC,aAAa,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,gCAAgC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACpF,IAAA,yBAAM,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,gCAAgC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC;gBAC9G,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;aAC5B;QACL,CAAC,CAAC,CAAC;IAEP,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}

package/dist/parser/TranspileState.d.ts

@@ -1,6 +1,17 @@
 import { SourceNode } from 'source-map';
-import type { Range } from 'vscode-languageserver';
+import type { Location } from 'vscode-languageserver';
 import type { BsConfig } from '../BsConfig';
+import { TokenKind } from '../lexer/TokenKind';
+import { type Token } from '../lexer/Token';
+import type { RangeLike } from '../util';
+import type { TranspileResult } from '../interfaces';
+interface TranspileToken {
+    location?: Location;
+    text: string;
+    kind?: TokenKind;
+    leadingWhitespace?: string;
+    leadingTrivia?: Array<TranspileToken>;
+}
 /**
  * Holds the state of a transpile operation as it works its way through the transpile process
  */
@@ -32,26 +43,29 @@ export declare class TranspileState {
     set blockDepth(value: number);
     private _blockDepth;
     newline: string;
+    private getSource;
     /**
      * Shorthand for creating a new source node
      */
-    sourceNode(locatable: {
-        range?: Range;
-    }, code: string | SourceNode | Array<string | SourceNode>): SourceNode | undefined;
+    sourceNode(locatable: RangeLike, code: string | SourceNode | TranspileResult): SourceNode;
     /**
      * Create a SourceNode from a token. This is more efficient than the above `sourceNode` function
      * because the entire token is passed by reference, instead of the raw string being copied to the parameter,
      * only to then be copied again for the SourceNode constructor
      */
-    tokenToSourceNode(token: {
-        range?: Range;
-        text: string;
-    }): SourceNode;
+    tokenToSourceNode(token: TranspileToken): SourceNode;
+    transpileLeadingCommentsForAstNode(node: {
+        leadingTrivia?: Token[];
+    }): (string | SourceNode)[];
+    transpileLeadingComments(token: TranspileToken): (string | SourceNode)[];
+    transpileComments(tokens: TranspileToken[], prepNextLine?: boolean): Array<string | SourceNode>;
     /**
      * Create a SourceNode from a token, accounting for missing range and multi-line text
+     * Adds all leading trivia for the token
      */
-    transpileToken(token: {
-        range?: Range;
-        text: string;
-    }, defaultValue?: string): SourceNode;
+    transpileToken(token: TranspileToken, defaultValue?: string, commentOut?: boolean, skipLeadingComments?: boolean): TranspileResult;
+    transpileEndBlockToken(previousLocatable: {
+        location?: Location;
+    }, endToken: Token, defaultValue: string, alwaysAddNewlineBeforeEndToken?: boolean): any[];
 }
+export {};

package/dist/parser/TranspileState.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TranspileState = void 0;
 const source_map_1 = require("source-map");
+const TokenKind_1 = require("../lexer/TokenKind");
+const util_1 = require("../util");
 /**
  * Holds the state of a transpile operation as it works its way through the transpile process
  */
@@ -42,20 +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) {
-        if (locatable.range) {
-            return new source_map_1.SourceNode(
-            //convert 0-based range line to 1-based SourceNode line
-            locatable.range.start.line + 1, 
-            //range and SourceNode character are both 0-based, so no conversion necessary
-            locatable.range.start.character, this.srcPath, code);
-        }
-        else {
-            return new source_map_1.SourceNode(null, null, this.srcPath, code);
-        }
+        let range = util_1.util.extractRange(locatable);
+        return util_1.util.sourceNodeFromTranspileResult(
+        //convert 0-based range line to 1-based SourceNode line
+        range ? range.start.line + 1 : null, 
+        //range and SourceNode character are both 0-based, so no conversion necessary
+        range ? range.start.character : null, this.getSource(locatable), code);
     }
     /**
      * Create a SourceNode from a token. This is more efficient than the above `sourceNode` function
@@ -63,40 +76,118 @@ 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.start.line + 1, 
+        ((_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.start.character, 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);
+    }
+    transpileLeadingCommentsForAstNode(node) {
+        var _a;
+        const leadingTrivia = (_a = node === null || node === void 0 ? void 0 : node.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+        const leadingCommentsSourceNodes = this.transpileComments(leadingTrivia);
+        if (leadingCommentsSourceNodes.length > 0) {
+            // indent in preparation for next text
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+        return leadingCommentsSourceNodes;
+    }
+    transpileLeadingComments(token) {
+        var _a;
+        const leadingTrivia = ((_a = token === null || token === void 0 ? void 0 : token.leadingTrivia) !== null && _a !== void 0 ? _a : []);
+        const leadingCommentsSourceNodes = this.transpileComments(leadingTrivia);
+        if (leadingCommentsSourceNodes.length > 0 && token.text) {
+            // indent in preparation for next text
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+        return leadingCommentsSourceNodes;
+    }
+    transpileComments(tokens, prepNextLine = false) {
+        const leadingCommentsSourceNodes = [];
+        const justComments = tokens.filter(t => t.kind === TokenKind_1.TokenKind.Comment || t.kind === TokenKind_1.TokenKind.Newline);
+        let newLinesSinceComment = 0;
+        let transpiledCommentAlready = false;
+        for (const commentToken of justComments) {
+            if (commentToken.kind === TokenKind_1.TokenKind.Newline && !transpiledCommentAlready) {
+                continue;
+            }
+            if (commentToken.kind === TokenKind_1.TokenKind.Comment) {
+                if (leadingCommentsSourceNodes.length > 0) {
+                    leadingCommentsSourceNodes.push(this.indent());
+                }
+                leadingCommentsSourceNodes.push(this.tokenToSourceNode(commentToken));
+                newLinesSinceComment = 0;
+            }
+            else {
+                newLinesSinceComment++;
+            }
+            if (newLinesSinceComment === 1 || newLinesSinceComment === 2) {
+                //new line that is not touching a previous new line
+                leadingCommentsSourceNodes.push(this.newline);
+            }
+            transpiledCommentAlready = true;
+        }
+        //if we should prepare for the next line, add an indent (only if applicable)
+        if (prepNextLine && transpiledCommentAlready) {
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+        return leadingCommentsSourceNodes;
     }
     /**
      * Create a SourceNode from a token, accounting for missing range and multi-line text
+     * Adds all leading trivia for the token
      */
-    transpileToken(token, defaultValue) {
-        if (!token && defaultValue !== undefined) {
-            return new source_map_1.SourceNode(null, null, null, defaultValue);
+    transpileToken(token, defaultValue, commentOut = false, skipLeadingComments = false) {
+        var _a;
+        const leadingCommentsSourceNodes = skipLeadingComments ? [] : 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) {
-            return new source_map_1.SourceNode(null, null, null, token.text);
+        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 (token.range.end.line > token.range.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, lines[0])
+                this.sourceNode(token, [...leadingCommentsSourceNodes, commentIfCommentedOut, lines[0]])
             ];
             for (let i = 1; i < lines.length; i++) {
-                code.push(this.newline, new source_map_1.SourceNode(
+                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);
+            return [new source_map_1.SourceNode(null, null, null, code)];
         }
         else {
-            return this.tokenToSourceNode(token);
+            return [...leadingCommentsSourceNodes, commentIfCommentedOut, this.tokenToSourceNode(token)];
+        }
+    }
+    transpileEndBlockToken(previousLocatable, endToken, defaultValue, alwaysAddNewlineBeforeEndToken = true) {
+        const result = [];
+        if (util_1.util.hasLeadingComments(endToken)) {
+            // add comments before `end token` - they should be indented
+            if (util_1.util.isLeadingCommentOnSameLine(previousLocatable === null || previousLocatable === void 0 ? void 0 : previousLocatable.location, endToken)) {
+                this.blockDepth++;
+                result.push(' ');
+            }
+            else {
+                result.push(this.newline);
+                result.push(this.indent(1));
+            }
+            result.push(...this.transpileToken(Object.assign(Object.assign({}, endToken), { text: '' })));
+            this.blockDepth--;
+            result.push(this.indent());
+        }
+        else if (alwaysAddNewlineBeforeEndToken) {
+            result.push(this.newline, this.indent());
         }
+        result.push(this.transpileToken(Object.assign(Object.assign({}, endToken), { leadingTrivia: [] }), defaultValue));
+        return result;
     }
 }
 exports.TranspileState = TranspileState;

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,18 +1,12 @@
-import type { Token } from '../../lexer';
-import { TokenKind } from '../../lexer';
+import type { Token } from '../../lexer/Token';
+import { TokenKind } from '../../lexer/TokenKind';
 /**
  * Creates a token with the given `kind` and (optional) `literal` value.
- * @param {TokenKind} kind the tokenKind the produced token should represent.
- * @param {string} text the text represented by this token.
- * @param {*} [literal] the literal value that the produced token should contain, if any
- * @returns {object} a token of `kind` representing `text` with value `literal`.
  */
 export declare function token(kind: TokenKind, text?: string): Token;
 /**
  * Creates an Identifier token with the given `text`.
- * @param {string} text
- * @returns {object} a token with the provided `text`.
  */
-export declare function identifier(text: any): any;
+export declare function identifier(text: string): Token;
 /** An end-of-file token. */
 export declare const EOF: Token;

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

@@ -1,35 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EOF = exports.identifier = exports.token = void 0;
-const lexer_1 = require("../../lexer");
-const creators_1 = require("../../astUtils/creators");
+const TokenKind_1 = require("../../lexer/TokenKind");
 /* A set of utilities to be used while writing tests for the BRS parser. */
 /**
  * Creates a token with the given `kind` and (optional) `literal` value.
- * @param {TokenKind} kind the tokenKind the produced token should represent.
- * @param {string} text the text represented by this token.
- * @param {*} [literal] the literal value that the produced token should contain, if any
- * @returns {object} a token of `kind` representing `text` with value `literal`.
  */
 function token(kind, text) {
     return {
         kind: kind,
         text: text,
-        isReserved: lexer_1.ReservedWords.has((text || '').toLowerCase()),
-        range: creators_1.interpolatedRange,
-        leadingWhitespace: ''
+        isReserved: TokenKind_1.ReservedWords.has((text !== null && text !== void 0 ? text : '').toLowerCase()),
+        location: null,
+        leadingWhitespace: '',
+        leadingTrivia: []
     };
 }
 exports.token = token;
 /**
  * Creates an Identifier token with the given `text`.
- * @param {string} text
- * @returns {object} a token with the provided `text`.
  */
 function identifier(text) {
-    return exports.token(lexer_1.TokenKind.Identifier, text);
+    return token(TokenKind_1.TokenKind.Identifier, text);
 }
 exports.identifier = identifier;
 /** An end-of-file token. */
-exports.EOF = token(lexer_1.TokenKind.Eof, '\0');
+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,uCAAuD;AACvD,sDAA4D;AAE5D,2EAA2E;AAE3E;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,IAAe,EAAE,IAAa;IAChD,OAAO;QACH,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;QACV,UAAU,EAAE,qBAAa,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,KAAK,EAAE,4BAAiB;QACxB,iBAAiB,EAAE,EAAE;KACxB,CAAC;AACN,CAAC;AARD,sBAQC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAI;IAC3B,OAAO,OAAO,CAAC,KAAK,CAAC,iBAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAFD,gCAEC;AAED,4BAA4B;AACf,QAAA,GAAG,GAAG,KAAK,CAAC,iBAAS,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

@@ -1,51 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
+const chai_config_spec_1 = require("../../../chai-config.spec");
 const Parser_1 = require("../../Parser");
-const lexer_1 = require("../../../lexer");
+const TokenKind_1 = require("../../../lexer/TokenKind");
 const Parser_spec_1 = require("../Parser.spec");
 const vscode_languageserver_1 = require("vscode-languageserver");
-const __1 = require("../..");
+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([
-            Parser_spec_1.token(lexer_1.TokenKind.For, 'for'),
-            Parser_spec_1.identifier('i'),
-            Parser_spec_1.token(lexer_1.TokenKind.Equal, '='),
-            Parser_spec_1.token(lexer_1.TokenKind.IntegerLiteral, '0'),
-            Parser_spec_1.token(lexer_1.TokenKind.To, 'to'),
-            Parser_spec_1.token(lexer_1.TokenKind.IntegerLiteral, '5'),
-            Parser_spec_1.token(lexer_1.TokenKind.Step, 'step'),
-            Parser_spec_1.token(lexer_1.TokenKind.IntegerLiteral, '2'),
-            Parser_spec_1.token(lexer_1.TokenKind.Newline, '\n'),
+        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, '='),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '0'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.To, 'to'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '5'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Step, 'step'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '2'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             // body would go here, but it's not necessary for this test
-            Parser_spec_1.token(lexer_1.TokenKind.EndFor, 'end for'),
-            Parser_spec_1.token(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.EndFor, 'end for'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             Parser_spec_1.EOF
         ]);
-        const statement = statements[0];
-        chai_1.expect((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
-        chai_1.expect(statement.increment).to.be.instanceof(__1.LiteralExpression);
-        chai_1.expect(statement.increment.token.text).to.equal('2');
+        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([
-            Parser_spec_1.token(lexer_1.TokenKind.For, 'for'),
-            Parser_spec_1.identifier('i'),
-            Parser_spec_1.token(lexer_1.TokenKind.Equal, '='),
-            Parser_spec_1.token(lexer_1.TokenKind.IntegerLiteral, '0'),
-            Parser_spec_1.token(lexer_1.TokenKind.To, 'to'),
-            Parser_spec_1.token(lexer_1.TokenKind.IntegerLiteral, '5'),
-            Parser_spec_1.token(lexer_1.TokenKind.Newline, '\n'),
+        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, '='),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '0'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.To, 'to'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '5'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             // body would go here, but it's not necessary for this test
-            Parser_spec_1.token(lexer_1.TokenKind.EndFor, 'end for'),
-            Parser_spec_1.token(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.EndFor, 'end for'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             Parser_spec_1.EOF
         ]);
-        chai_1.expect((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
-        chai_1.expect(statements[0].increment).not.to.exist;
+        (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)(ast.statements[0].increment).not.to.exist;
     });
     it('catches unterminated for reaching function boundary', () => {
         const parser = Parser_1.Parser.parse(`
@@ -54,26 +56,27 @@ describe('parser for loops', () => {
                     print "while"
             end function
         `);
-        chai_1.expect(parser.diagnostics).to.be.lengthOf(1);
-        chai_1.expect(parser.statements).to.be.lengthOf(1);
-        chai_1.expect(parser.references.functionStatements[0].func.body.statements).to.be.lengthOf(1);
+        (0, chai_config_spec_1.expect)(parser.diagnostics).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([
-            Parser_spec_1.token(lexer_1.TokenKind.For, 'for'),
-            Parser_spec_1.identifier('i'),
-            Parser_spec_1.token(lexer_1.TokenKind.Equal, '='),
-            Parser_spec_1.token(lexer_1.TokenKind.IntegerLiteral, '0'),
-            Parser_spec_1.token(lexer_1.TokenKind.To, 'to'),
-            Parser_spec_1.token(lexer_1.TokenKind.IntegerLiteral, '5'),
-            Parser_spec_1.token(lexer_1.TokenKind.Newline, '\n'),
+        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, '='),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '0'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.To, 'to'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '5'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             // body would go here, but it's not necessary for this test
-            Parser_spec_1.token(lexer_1.TokenKind.Next, 'next'),
-            Parser_spec_1.token(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Next, 'next'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             Parser_spec_1.EOF
         ]);
-        chai_1.expect(diagnostics).to.be.lengthOf(0);
-        chai_1.expect(statements).to.be.length.greaterThan(0);
+        (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(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;
@@ -82,7 +85,7 @@ describe('parser for loops', () => {
                 print "for"
             end for
         `);
-        chai_1.expect((_a = parser.diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.be.undefined;
+        (0, chai_config_spec_1.expect)((_a = parser.diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.be.undefined;
     });
     it('location tracking', () => {
         /**
@@ -93,69 +96,74 @@ 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: lexer_1.TokenKind.For,
+                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: lexer_1.TokenKind.Identifier,
+                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: lexer_1.TokenKind.Equal,
+                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: lexer_1.TokenKind.IntegerLiteral,
+                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: lexer_1.TokenKind.To,
+                kind: TokenKind_1.TokenKind.To,
                 text: 'to',
                 isReserved: false,
-                range: {
-                    start: { line: 0, column: 10 },
-                    end: { start: 0, column: 12 }
-                }
+                location: util_1.default.createLocation(0, 10, 0, 12),
+                leadingTrivia: []
             },
             {
-                kind: lexer_1.TokenKind.IntegerLiteral,
+                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: lexer_1.TokenKind.Newline,
+                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
-            Parser_spec_1.identifier('Rnd'),
-            Parser_spec_1.token(lexer_1.TokenKind.LeftParen, '('),
-            Parser_spec_1.identifier('i'),
-            Parser_spec_1.token(lexer_1.TokenKind.RightParen, ')'),
-            Parser_spec_1.token(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.identifier)('Rnd'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.LeftParen, '('),
+            (0, Parser_spec_1.identifier)('i'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.RightParen, ')'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             {
-                kind: lexer_1.TokenKind.EndFor,
+                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
         ]);
-        chai_1.expect(diagnostics).to.be.lengthOf(0);
-        chai_1.expect(statements).to.be.lengthOf(1);
-        chai_1.expect(statements[0].range).to.deep.include(vscode_languageserver_1.Range.create(0, 0, 2, 8));
+        (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0);
+        (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