Upgrade to bsc 1.0.0-alpha.25

package.json

@@ -48,7 +48,7 @@
     "@types/node": "^14.6.0",
     "@typescript-eslint/eslint-plugin": "^3.10.1",
     "@typescript-eslint/parser": "^3.10.1",
-    "brighterscript": "^0.66.0-alpha.6",
+    "brighterscript": "^1.0.0-alpha.25",
     "chai": "^4.3.6",
     "coveralls": "^3.1.1",
     "eslint": "^7.7.0",
@@ -60,7 +60,7 @@
     "typescript": "^4.9.4"
   },
   "peerDependencies": {
-    "brighterscript": ">= 0.66.0-alpha.6 < 1"
+    "brighterscript": "^1.0.0-alpha.25"
   },
   "mocha": {
     "spec": "src/**/*.spec.ts",

src/plugins/checkUsage/index.ts

@@ -1,4 +1,4 @@
-import { AfterFileValidateEvent, AfterProgramValidateEvent, AfterScopeValidateEvent, File, CompilerPlugin, createVisitor, DiagnosticSeverity, isBrsFile, isXmlFile, Range, TokenKind, WalkMode, XmlFile } from 'brighterscript';
+import { AfterFileValidateEvent, AfterProgramValidateEvent, AfterScopeValidateEvent, CompilerPlugin, createVisitor, DiagnosticSeverity, isBrsFile, isXmlFile, Range, TokenKind, WalkMode, XmlFile, FunctionExpression, BscFile, isFunctionExpression, Cache } from 'brighterscript';
 import { SGNode } from 'brighterscript/dist/parser/SGTypes';
 import { PluginContext } from '../../util';
 
@@ -37,7 +37,7 @@ export default class CheckUsage implements CompilerPlugin {
         this.walked = walked;
     }
 
-    private walkChildren(v: Vertice, children: SGNode[], file: File) {
+    private walkChildren(v: Vertice, children: SGNode[], file: BscFile) {
         children.forEach(node => {
             const name = node.tagName;
             if (name) {
@@ -108,6 +108,12 @@ export default class CheckUsage implements CompilerPlugin {
         }
     }
 
+    private functionExpressionCache = new Cache<BscFile, FunctionExpression[]>();
+
+    beforeProgramValidate() {
+        this.functionExpressionCache.clear();
+    }
+
     afterScopeValidate(event: AfterScopeValidateEvent) {
         const { scope } = event;
         const files = scope.getAllFiles();
@@ -159,9 +165,16 @@ export default class CheckUsage implements CompilerPlugin {
             if (pkgPath === 'source/main.brs' || pkgPath === 'source/main.bs') {
                 this.main = fv;
             }
+
+            // look up all function expressions exactly 1 time for this file, even if it's used across many scopes
+            const functionExpressions = this.functionExpressionCache.getOrAdd(file, () => {
+                return file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitExpressionsRecursive });
+            });
+
+
             // find strings that look like referring to component names
-            file.parser.references.functionExpressions.forEach(fun => {
-                fun.body.walk(createVisitor({
+            for (const func of functionExpressions) {
+                func.body.walk(createVisitor({
                     LiteralExpression: (e) => {
                         const { kind } = e.token;
                         if (kind === TokenKind.StringLiteral) {
@@ -179,7 +192,7 @@ export default class CheckUsage implements CompilerPlugin {
                         }
                     }
                 }), { walkMode: WalkMode.visitExpressions });
-            });
+            }
         });
     }
 
@@ -220,7 +233,7 @@ function normalizePath(s: string) {
     return p;
 }
 
-function createComponentEdge(name: string, range: Range = null, file: File = null) {
+function createComponentEdge(name: string, range: Range = null, file: BscFile = null) {
     return {
         name: `"${name.toLowerCase()}"`,
         range,
@@ -230,13 +243,13 @@ function createComponentEdge(name: string, range: Range = null, file: File = nul
 
 interface Vertice {
     name: string;
-    file: File;
+    file: BscFile;
     edges: Edge[];
     used?: boolean;
 }
 
 interface Edge {
     name: string;
-    file?: File;
+    file?: BscFile;
     range?: Range;
 }

src/plugins/codeStyle/index.ts

@@ -39,7 +39,6 @@ export default class CodeStyle implements CompilerPlugin {
         const validateCondition = conditionStyle !== 'off';
         const requireConditionGroup = conditionStyle === 'group';
         const validateAAStyle = aaCommaStyle !== 'off';
-        const walkExpressions = validateAAStyle || validateColorFormat;
         const validateEolLast = eolLast !== 'off';
         const disallowEolLast = eolLast === 'never';
         const validateColorStyle = validateColorFormat ? createColorValidator(severity) : undefined;
@@ -85,6 +84,10 @@ export default class CodeStyle implements CompilerPlugin {
         }
 
         file.ast.walk(createVisitor({
+            // validate function style (`function` or `sub`)
+            FunctionExpression: (func) => {
+                this.validateFunctionStyle(func, diagnostics);
+            },
             IfStatement: s => {
                 const hasThenToken = !!s.tokens.then;
                 if (!s.isInline && validateBlockIf) {
@@ -157,12 +160,7 @@ export default class CodeStyle implements CompilerPlugin {
                     diagnostics.push(messages.noStop(s.tokens.stop.range, noStop));
                 }
             }
-        }), { walkMode: walkExpressions ? WalkMode.visitAllRecursive : WalkMode.visitStatementsRecursive });
-
-        // validate function style (`function` or `sub`)
-        for (const fun of file.parser.references.functionExpressions) {
-            this.validateFunctionStyle(fun, diagnostics);
-        }
+        }), { walkMode: WalkMode.visitAllRecursive });
 
         // add file reference
         let bsDiagnostics: BsDiagnostic[] = diagnostics.map(diagnostic => ({

src/plugins/codeStyle/styleFixes.ts

@@ -1,10 +1,10 @@
-import { File, BsDiagnostic, FunctionExpression, GroupingExpression, IfStatement, isIfStatement, isVoidType, Position, Range, SymbolTypeFlag, VoidType, WhileStatement } from 'brighterscript';
+import { BscFile, BsDiagnostic, FunctionExpression, GroupingExpression, IfStatement, isIfStatement, isVoidType, Position, Range, SymbolTypeFlag, VoidType, WhileStatement } from 'brighterscript';
 import { ChangeEntry, comparePos, insertText, replaceText } from '../../textEdit';
 import { CodeStyleError } from './diagnosticMessages';
 import { platform } from 'process';
 
 export function extractFixes(
-    addFixes: (file: File, changes: ChangeEntry) => void,
+    addFixes: (file: BscFile, changes: ChangeEntry) => void,
     diagnostics: BsDiagnostic[]
 ): BsDiagnostic[] {
     return diagnostics.filter(diagnostic => {

src/plugins/trackCodeFlow/index.ts

@@ -1,4 +1,4 @@
-import { BsDiagnostic, BrsFile, OnGetCodeActionsEvent, Statement, EmptyStatement, FunctionExpression, isForEachStatement, isForStatement, isIfStatement, isWhileStatement, Range, createStackedVisitor, isBrsFile, isStatement, isExpression, WalkMode, isTryCatchStatement, isCatchStatement, CompilerPlugin, AfterScopeValidateEvent, AfterFileValidateEvent, util } from 'brighterscript';
+import { BsDiagnostic, BrsFile, OnGetCodeActionsEvent, Statement, EmptyStatement, FunctionExpression, isForEachStatement, isForStatement, isIfStatement, isWhileStatement, Range, createStackedVisitor, isBrsFile, isStatement, isExpression, WalkMode, isTryCatchStatement, isCatchStatement, CompilerPlugin, AfterScopeValidateEvent, AfterFileValidateEvent, util, isFunctionExpression } from 'brighterscript';
 import { PluginContext } from '../../util';
 import { createReturnLinter } from './returnTracking';
 import { createVarLinter, resetVarContext, runDeferredValidation } from './varTracking';
@@ -78,7 +78,7 @@ export default class TrackCodeFlow implements CompilerPlugin {
 
         resetVarContext(file);
 
-        file.parser.references.functionExpressions.forEach((fun) => {
+        for (const fun of file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitExpressionsRecursive })) {
             const state: LintState = {
                 file: file,
                 fun: fun,
@@ -170,7 +170,7 @@ export default class TrackCodeFlow implements CompilerPlugin {
                     varLinter.closeBlock(block);
                 }
             }
-        });
+        }
 
         if (this.lintContext.fix) {
             diagnostics = extractFixes(this.lintContext.addFixes, diagnostics);

src/plugins/trackCodeFlow/returnTracking.ts

@@ -1,4 +1,4 @@
-import { File, FunctionExpression, BsDiagnostic, isCommentStatement, DiagnosticTag, isReturnStatement, isIfStatement, isThrowStatement, TokenKind, util, ReturnStatement, ThrowStatement, isTryCatchStatement, isCatchStatement, isVoidType, SymbolTypeFlag } from 'brighterscript';
+import { BscFile, FunctionExpression, BsDiagnostic, isCommentStatement, DiagnosticTag, isReturnStatement, isIfStatement, isThrowStatement, TokenKind, util, ReturnStatement, ThrowStatement, isTryCatchStatement, isCatchStatement, isVoidType, SymbolTypeFlag } from 'brighterscript';
 import { LintState, StatementInfo } from '.';
 import { PluginContext } from '../../util';
 
@@ -23,7 +23,7 @@ enum ReturnLintError {
 
 export function createReturnLinter(
     lintContext: PluginContext,
-    file: File,
+    file: BscFile,
     fun: FunctionExpression,
     state: LintState,
     diagnostics: BsDiagnostic[]

src/plugins/trackCodeFlow/trackFixes.ts

@@ -1,9 +1,9 @@
-import { File, BsDiagnostic, Range } from 'brighterscript';
+import { BscFile, BsDiagnostic, Range } from 'brighterscript';
 import { ChangeEntry, replaceText } from '../../textEdit';
 import { VarLintError } from './varTracking';
 
 export function extractFixes(
-    addFixes: (file: File, changes: ChangeEntry) => void,
+    addFixes: (file: BscFile, changes: ChangeEntry) => void,
     diagnostics: BsDiagnostic[]
 ): BsDiagnostic[] {
     return diagnostics.filter(diagnostic => {

src/plugins/trackCodeFlow/varTracking.ts

@@ -1,4 +1,4 @@
-import { File, FunctionExpression, BsDiagnostic, Range, isForStatement, isForEachStatement, isIfStatement, isAssignmentStatement, isNamespaceStatement, NamespaceStatement, Expression, isVariableExpression, isBinaryExpression, TokenKind, Scope, CallableContainerMap, DiagnosticSeverity, isLiteralInvalid, isWhileStatement, isCatchStatement, isLabelStatement, isGotoStatement, ParseMode, util, isMethodStatement, isTryCatchStatement } from 'brighterscript';
+import { BscFile, FunctionExpression, BsDiagnostic, Range, isForStatement, isForEachStatement, isIfStatement, isAssignmentStatement, isNamespaceStatement, NamespaceStatement, Expression, isVariableExpression, isBinaryExpression, TokenKind, Scope, CallableContainerMap, DiagnosticSeverity, isLiteralInvalid, isWhileStatement, isCatchStatement, isLabelStatement, isGotoStatement, ParseMode, util, isMethodStatement, isTryCatchStatement } from 'brighterscript';
 import { LintState, StatementInfo, NarrowingInfo, VarInfo, VarRestriction } from '.';
 import { PluginContext } from '../../util';
 
@@ -26,17 +26,17 @@ interface ValidationInfo {
 
 const deferredValidation: Map<string, ValidationInfo[]> = new Map();
 
-function getDeferred(file: File) {
+function getDeferred(file: BscFile) {
     return deferredValidation.get(file.srcPath);
 }
 
-export function resetVarContext(file: File) {
+export function resetVarContext(file: BscFile) {
     deferredValidation.set(file.srcPath, []);
 }
 
 export function createVarLinter(
     lintContext: PluginContext,
-    file: File,
+    file: BscFile,
     fun: FunctionExpression,
     state: LintState,
     diagnostics: BsDiagnostic[]
@@ -376,7 +376,7 @@ export function createVarLinter(
 export function runDeferredValidation(
     lintContext: PluginContext,
     scope: Scope,
-    files: File[],
+    files: BscFile[],
     callables: CallableContainerMap
 ) {
     const topLevelVars = buildTopLevelVars(scope, lintContext.globals);
@@ -415,7 +415,7 @@ function buildTopLevelVars(scope: Scope, globals: string[]) {
 
 function deferredVarLinter(
     scope: Scope,
-    file: File,
+    file: BscFile,
     callables: CallableContainerMap,
     toplevel: Set<string>,
     deferred: ValidationInfo[],

src/testHelpers.spec.ts

@@ -1,4 +1,4 @@
-import { BsDiagnostic, File, DiagnosticSeverity, DiagnosticTag, Range } from 'brighterscript';
+import { BsDiagnostic, BscFile, DiagnosticSeverity, DiagnosticTag, Range } from 'brighterscript';
 import { CodeDescription, DiagnosticRelatedInformation, Diagnostic } from 'vscode-languageserver-types';
 import { expect } from 'chai';
 import { firstBy } from 'thenby';
@@ -50,7 +50,7 @@ interface PartialDiagnostic {
     tags?: Partial<DiagnosticTag>[];
     relatedInformation?: Partial<DiagnosticRelatedInformation>[];
     data?: unknown;
-    file?: Partial<File>;
+    file?: Partial<BscFile>;
 }
 
 /**

src/textEdit.ts

@@ -1,6 +1,6 @@
 import { existsSync } from 'fs';
 import { readFile, writeFile } from 'fs-extra';
-import { File, BsDiagnostic, OnGetCodeActionsEvent, Position, Range } from 'brighterscript';
+import { BscFile, BsDiagnostic, OnGetCodeActionsEvent, Position, Range } from 'brighterscript';
 import { CodeActionKind, codeActionUtil } from 'brighterscript/dist/CodeActionUtil';
 
 interface LintCodeAction {
@@ -125,7 +125,7 @@ export async function applyFixes(fix: boolean, pendingFixes: Map<string, TextEdi
 }
 
 export function addFixesToEvent(event: OnGetCodeActionsEvent) {
-    return (file: File, entry: ChangeEntry) => {
+    return (file: BscFile, entry: ChangeEntry) => {
         const changes: LintCodeAction[] = entry.changes.map(change => ({
             type: 'replace',
             filePath: file.srcPath,

src/util.ts

@@ -3,7 +3,7 @@ import * as minimatch from 'minimatch';
 import { BsLintConfig, BsLintRules, RuleSeverity, BsLintSeverity } from './index';
 import { readFileSync, existsSync } from 'fs';
 import * as path from 'path';
-import { Program, File, DiagnosticSeverity } from 'brighterscript';
+import { Program, BscFile, DiagnosticSeverity } from 'brighterscript';
 import { applyFixes, ChangeEntry, TextEdit } from './textEdit';
 import { addJob } from './Linter';
 
@@ -99,10 +99,10 @@ export interface PluginContext {
     severity: Readonly<BsLintRules>;
     todoPattern: Readonly<RegExp>;
     globals: string[];
-    ignores: (file: File) => boolean;
+    ignores: (file: BscFile) => boolean;
     fix: Readonly<boolean>;
     checkUsage: Readonly<boolean>;
-    addFixes: (file: File, entry: ChangeEntry) => void;
+    addFixes: (file: BscFile, entry: ChangeEntry) => void;
 }
 
 export interface PluginWrapperContext extends PluginContext {
@@ -121,12 +121,12 @@ export function createContext(program: Program): PluginWrapperContext {
         severity: rulesToSeverity(rules),
         todoPattern: rules['todo-pattern'] ? new RegExp(rules['todo-pattern']) : /TODO|todo|FIXME/,
         globals,
-        ignores: (file: File) => {
+        ignores: (file: BscFile) => {
             return !file || ignorePatterns.some(pattern => minimatch(file.srcPath, pattern));
         },
         fix,
         checkUsage,
-        addFixes: (file: File, entry: ChangeEntry) => {
+        addFixes: (file: BscFile, entry: ChangeEntry) => {
             if (!pendingFixes.has(file.srcPath)) {
                 pendingFixes.set(file.srcPath, entry.changes);
             } else {