brighterscript 0.66.0-alpha.1 → 0.66.0-alpha.10

package/dist/Scope.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Scope = void 0;
 const path = require("path");
-const vscode_languageserver_1 = require("vscode-languageserver");
 const chalk_1 = require("chalk");
 const DiagnosticMessages_1 = require("./DiagnosticMessages");
+const interfaces_1 = require("./interfaces");
 const ClassValidator_1 = require("./validators/ClassValidator");
 const Parser_1 = require("./parser/Parser");
 const util_1 = require("./util");
@@ -15,6 +15,17 @@ const Logger_1 = require("./Logger");
 const reflection_1 = require("./astUtils/reflection");
 const SymbolTable_1 = require("./SymbolTable");
 const NamespaceType_1 = require("./types/NamespaceType");
+const ReferenceType_1 = require("./types/ReferenceType");
+const UnionType_1 = require("./types/UnionType");
+const AssociativeArrayType_1 = require("./types/AssociativeArrayType");
+const AstNode_1 = require("./parser/AstNode");
+const visitors_1 = require("./astUtils/visitors");
+/**
+ * Assign some few factories to the SymbolTable to prevent cyclical imports. This file seems like the most intuitive place to do the linking
+ * since Scope will be used by pretty much everything
+ */
+SymbolTable_1.SymbolTable.referenceTypeFactory = ReferenceType_1.referenceTypeFactory;
+SymbolTable_1.SymbolTable.unionTypeFactory = UnionType_1.unionTypeFactory;
 /**
  * A class to keep track of all declarations within a given scope (like source scope, component scope)
  */
@@ -28,6 +39,11 @@ class Scope {
          * The list of diagnostics found specifically for this scope. Individual file diagnostics are stored on the files themselves.
          */
         this.diagnostics = [];
+        /**
+         * A list of functions that will be called whenever `unlinkSymbolTable` is called
+         */
+        this.linkSymbolTableDisposables = [];
+        this.symbolsAddedDuringLinking = [];
         this.isValidated = false;
         //used for improved logging performance
         this._debugLogComponentName = `Scope '${chalk_1.default.redBright(this.name)}'`;
@@ -41,6 +57,20 @@ class Scope {
      * "namea", "namea.nameb", "namea.nameb.namec"
      */
     get namespaceLookup() {
+        let allFilesValidated = true;
+        for (const file of this.getAllFiles()) {
+            if ((0, reflection_1.isBrsFile)(file) && !file.hasTypedef) {
+                allFilesValidated = allFilesValidated && file.isValidated;
+                if (!allFilesValidated) {
+                    break;
+                }
+            }
+        }
+        if (!allFilesValidated) {
+            // This is not fit to cache
+            // Since the files have not been validated, all namespace info might not have been available
+            return this.buildNamespaceLookup();
+        }
         return this.cache.getOrAdd('namespaceLookup', () => this.buildNamespaceLookup());
     }
     /**
@@ -59,6 +89,20 @@ class Scope {
         }
         return ns;
     }
+    /**
+     * Get a NamespaceContainer by its name, looking for a fully qualified version first, then global version next if not found
+     */
+    getNamespacesWithRoot(rootName, containingNamespace) {
+        const nameLower = rootName === null || rootName === void 0 ? void 0 : rootName.toLowerCase();
+        const lookup = this.namespaceLookup;
+        const lookupKeys = [...lookup.keys()];
+        let lookupName = nameLower;
+        if (containingNamespace) {
+            lookupName = `${containingNamespace === null || containingNamespace === void 0 ? void 0 : containingNamespace.toLowerCase()}.${nameLower}`;
+        }
+        const nsList = lookupKeys.filter(key => key.startsWith(lookupName)).map(key => lookup.get(key));
+        return nsList;
+    }
     /**
      * Get the class with the specified name.
      * @param className - The class name, including the namespace of the class if possible
@@ -140,7 +184,7 @@ class Scope {
         var _a, _b;
         let lowerNameParts = (_a = enumMemberName === null || enumMemberName === void 0 ? void 0 : enumMemberName.toLowerCase()) === null || _a === void 0 ? void 0 : _a.split('.');
         let memberName = (_b = lowerNameParts === null || lowerNameParts === void 0 ? void 0 : lowerNameParts.splice(lowerNameParts.length - 1, 1)) === null || _b === void 0 ? void 0 : _b[0];
-        let lowerName = lowerNameParts === null || lowerNameParts === void 0 ? void 0 : lowerNameParts.join('.').toLowerCase();
+        let lowerName = lowerNameParts === null || lowerNameParts === void 0 ? void 0 : lowerNameParts.join('.');
         const enumMap = this.getEnumMap();
         let enumeration = enumMap.get(util_1.util.getFullyQualifiedClassName(lowerName, containingNamespace === null || containingNamespace === void 0 ? void 0 : containingNamespace.toLowerCase()));
         //if we couldn't find the enum by its full namespaced name, look for a global enum with that name
@@ -168,6 +212,24 @@ class Scope {
         }
         return result;
     }
+    getAllFileLinks(name, containingNamespace) {
+        var _a, _b, _c, _d, _e, _f;
+        let links = [];
+        links.push((_a = this.getClassFileLink(name)) !== null && _a !== void 0 ? _a : this.getClassFileLink(name, containingNamespace), (_b = this.getInterfaceFileLink(name)) !== null && _b !== void 0 ? _b : this.getInterfaceFileLink(name, containingNamespace), (_c = this.getConstFileLink(name)) !== null && _c !== void 0 ? _c : this.getConstFileLink(name, containingNamespace), (_d = this.getEnumFileLink(name)) !== null && _d !== void 0 ? _d : this.getEnumFileLink(name, containingNamespace));
+        const nameSpaces = this.getNamespacesWithRoot(name, containingNamespace);
+        if ((nameSpaces === null || nameSpaces === void 0 ? void 0 : nameSpaces.length) > 0) {
+            const nsContainersWithStatement = (_e = nameSpaces.filter(nsContainer => { var _a; return ((_a = nsContainer === null || nsContainer === void 0 ? void 0 : nsContainer.namespaceStatements) === null || _a === void 0 ? void 0 : _a.length) > 0; })) === null || _e === void 0 ? void 0 : _e[0];
+            if (nsContainersWithStatement) {
+                links.push({ item: (_f = nsContainersWithStatement === null || nsContainersWithStatement === void 0 ? void 0 : nsContainersWithStatement.namespaceStatements) === null || _f === void 0 ? void 0 : _f[0], file: nsContainersWithStatement === null || nsContainersWithStatement === void 0 ? void 0 : nsContainersWithStatement.file });
+            }
+        }
+        const callable = this.getCallableByName(name);
+        if (callable) {
+            links.push({ item: callable.functionStatement, file: callable.file });
+        }
+        // remove empty links
+        return links.filter(link => link);
+    }
     /**
      * Get a map of all enums by their member name.
      * The keys are lower-case fully-qualified paths to the enum and its member. For example:
@@ -216,13 +278,12 @@ class Scope {
         return this.cache.getOrAdd('classMap', () => {
             const map = new Map();
             this.enumerateBrsFiles((file) => {
-                var _a;
                 if ((0, reflection_1.isBrsFile)(file)) {
                     for (let cls of file.parser.references.classStatements) {
-                        const lowerClassName = (_a = cls.getName(Parser_1.ParseMode.BrighterScript)) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                        const className = cls.getName(Parser_1.ParseMode.BrighterScript);
                         //only track classes with a defined name (i.e. exclude nameless malformed classes)
-                        if (lowerClassName) {
-                            map.set(lowerClassName, { item: cls, file: file });
+                        if (className) {
+                            map.set(className.toLowerCase(), { item: cls, file: file });
                         }
                     }
                 }
@@ -238,13 +299,12 @@ class Scope {
         return this.cache.getOrAdd('interfaceMap', () => {
             const map = new Map();
             this.enumerateBrsFiles((file) => {
-                var _a;
                 if ((0, reflection_1.isBrsFile)(file)) {
                     for (let iface of file.parser.references.interfaceStatements) {
-                        const lowerIfaceName = (_a = iface.getName(Parser_1.ParseMode.BrighterScript)) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                        const ifaceName = iface.getName(Parser_1.ParseMode.BrighterScript);
                         //only track classes with a defined name (i.e. exclude nameless malformed classes)
-                        if (lowerIfaceName) {
-                            map.set(lowerIfaceName, { item: iface, file: file });
+                        if (ifaceName) {
+                            map.set(ifaceName.toLowerCase(), { item: iface, file: file });
                         }
                     }
                 }
@@ -261,10 +321,9 @@ class Scope {
             const map = new Map();
             this.enumerateBrsFiles((file) => {
                 for (let enumStmt of file.parser.references.enumStatements) {
-                    const lowerEnumName = enumStmt.fullName.toLowerCase();
                     //only track enums with a defined name (i.e. exclude nameless malformed enums)
-                    if (lowerEnumName) {
-                        map.set(lowerEnumName, { item: enumStmt, file: file });
+                    if (enumStmt.fullName) {
+                        map.set(enumStmt.fullName.toLowerCase(), { item: enumStmt, file: file });
                     }
                 }
             });
@@ -280,10 +339,9 @@ class Scope {
             const map = new Map();
             this.enumerateBrsFiles((file) => {
                 for (let stmt of file.parser.references.constStatements) {
-                    const lowerEnumName = stmt.fullName.toLowerCase();
                     //only track enums with a defined name (i.e. exclude nameless malformed enums)
-                    if (lowerEnumName) {
-                        map.set(lowerEnumName, { item: stmt, file: file });
+                    if (stmt.fullName) {
+                        map.set(stmt.fullName.toLowerCase(), { item: stmt, file: file });
                     }
                 }
             });
@@ -348,14 +406,14 @@ class Scope {
     }
     /**
      * Get the file from this scope with the given path.
-     * @param filePath can be a srcPath or pkgPath
+     * @param filePath can be a srcPath or destPath
      * @param normalizePath should this function repair and standardize the path? Passing false should have a performance boost if you can guarantee your path is already sanitized
      */
     getFile(filePath, normalizePath = true) {
         if (typeof filePath !== 'string') {
             return undefined;
         }
-        const key = path.isAbsolute(filePath) ? 'srcPath' : 'pkgPath';
+        const key = path.isAbsolute(filePath) ? 'srcPath' : 'destPath';
         let map = this.cache.getOrAdd('fileMaps-srcPath', () => {
             const result = new Map();
             for (const file of this.getAllFiles()) {
@@ -396,26 +454,26 @@ class Scope {
                     }
                 }
             }
-            this.logDebug('getAllFiles', () => result.map(x => x.pkgPath));
+            this.logDebug('getAllFiles', () => result.map(x => x.destPath));
             return result;
         });
     }
     /**
-     * Get the list of errors for this scope. It's calculated on the fly, so
-     * call this sparingly.
+     * Get the list of errors for this scope. It's calculated on the fly, so call this sparingly.
      */
     getDiagnostics() {
-        let diagnosticLists = [this.diagnostics];
         //add diagnostics from every referenced file
-        this.enumerateOwnFiles((file) => {
-            diagnosticLists.push(file.getDiagnostics());
-        });
-        let allDiagnostics = Array.prototype.concat.apply([], diagnosticLists);
-        let filteredDiagnostics = allDiagnostics.filter((x) => {
+        const diagnostics = [
+            //diagnostics raised on this scope
+            ...this.diagnostics,
+            //get diagnostics from all files
+            ...this.getOwnFiles().map(x => { var _a; return (_a = x.diagnostics) !== null && _a !== void 0 ? _a : []; }).flat()
+        ]
+            //exclude diagnostics that match any of the comment flags
+            .filter((x) => {
             return !util_1.util.diagnosticIsSuppressed(x);
         });
-        //filter out diangostics that match any of the comment flags
-        return filteredDiagnostics;
+        return diagnostics;
     }
     addDiagnostics(diagnostics) {
         this.diagnostics.push(...diagnostics);
@@ -473,7 +531,7 @@ class Scope {
         const files = this.getOwnFiles();
         for (const file of files) {
             //either XML components or files without a typedef
-            if ((0, reflection_1.isXmlFile)(file) || !file.hasTypedef) {
+            if ((0, reflection_1.isXmlFile)(file) || ((0, reflection_1.isBrsFile)(file) && !file.hasTypedef)) {
                 callback(file);
             }
         }
@@ -484,14 +542,16 @@ class Scope {
      */
     getOwnCallables() {
         let result = [];
-        this.logDebug('getOwnCallables() files: ', () => this.getOwnFiles().map(x => x.pkgPath));
+        this.logDebug('getOwnCallables() files: ', () => this.getOwnFiles().map(x => x.destPath));
         //get callables from own files
         this.enumerateOwnFiles((file) => {
-            for (let callable of file.callables) {
-                result.push({
-                    callable: callable,
-                    scope: this
-                });
+            if ((0, reflection_1.isBrsFile)(file)) {
+                for (let callable of file.callables) {
+                    result.push({
+                        callable: callable,
+                        scope: this
+                    });
+                }
             }
         });
         return result;
@@ -499,64 +559,27 @@ class Scope {
     /**
      * Builds a tree of namespace objects
      */
-    buildNamespaceLookup() {
+    buildNamespaceLookup(options = { okToCache: true }) {
         let namespaceLookup = new Map();
+        options.okToCache = true;
         this.enumerateBrsFiles((file) => {
-            for (let namespaceStatement of file.parser.references.namespaceStatements) {
-                //TODO should we handle non-brighterscript?
-                let name = namespaceStatement.getName(Parser_1.ParseMode.BrighterScript);
-                let nameParts = name.split('.');
-                let loopName = null;
-                //ensure each namespace section is represented in the results
-                //(so if the namespace name is A.B.C, this will make an entry for "A", an entry for "A.B", and an entry for "A.B.C"
-                for (let part of nameParts) {
-                    loopName = loopName === null ? part : `${loopName}.${part}`;
-                    let lowerLoopName = loopName.toLowerCase();
-                    if (!namespaceLookup.has(lowerLoopName)) {
-                        namespaceLookup.set(lowerLoopName, {
-                            file: file,
-                            fullName: loopName,
-                            nameRange: namespaceStatement.nameExpression.range,
-                            lastPartName: part,
-                            namespaces: new Map(),
-                            classStatements: {},
-                            functionStatements: {},
-                            enumStatements: new Map(),
-                            constStatements: new Map(),
-                            statements: [],
-                            symbolTable: new SymbolTable_1.SymbolTable(`Namespace Aggregate: '${loopName}'`, () => this.symbolTable)
-                        });
-                    }
-                }
-                let ns = namespaceLookup.get(name.toLowerCase());
-                ns.statements.push(...namespaceStatement.body.statements);
-                for (let statement of namespaceStatement.body.statements) {
-                    if ((0, reflection_1.isClassStatement)(statement) && statement.name) {
-                        ns.classStatements[statement.name.text.toLowerCase()] = statement;
-                    }
-                    else if ((0, reflection_1.isFunctionStatement)(statement) && statement.name) {
-                        ns.functionStatements[statement.name.text.toLowerCase()] = statement;
-                    }
-                    else if ((0, reflection_1.isEnumStatement)(statement) && statement.fullName) {
-                        ns.enumStatements.set(statement.fullName.toLowerCase(), statement);
-                    }
-                    else if ((0, reflection_1.isConstStatement)(statement) && statement.fullName) {
-                        ns.constStatements.set(statement.fullName.toLowerCase(), statement);
-                    }
+            options.okToCache = options.okToCache && file.isValidated;
+            const fileNamespaceLookup = file.getNamespaceLookupObject();
+            for (const [lowerNamespaceName, nsContainer] of fileNamespaceLookup) {
+                if (!namespaceLookup.has(lowerNamespaceName)) {
+                    const clonedNsContainer = Object.assign(Object.assign({}, nsContainer), { namespaceStatements: [...nsContainer.namespaceStatements], symbolTable: new SymbolTable_1.SymbolTable(`Namespace Aggregate: '${nsContainer.fullName}'`) });
+                    clonedNsContainer.symbolTable.mergeSymbolTable(nsContainer.symbolTable);
+                    namespaceLookup.set(lowerNamespaceName, clonedNsContainer);
                 }
-                // Merges all the symbol tables of the namespace statements into the new symbol table created above.
-                // Set those symbol tables to have this new merged table as a parent
-                ns.symbolTable.mergeSymbolTable(namespaceStatement.body.getSymbolTable());
-            }
-            //associate child namespaces with their parents
-            for (let [, ns] of namespaceLookup) {
-                let parts = ns.fullName.split('.');
-                if (parts.length > 1) {
-                    //remove the last part
-                    parts.pop();
-                    let parentName = parts.join('.');
-                    const parent = namespaceLookup.get(parentName.toLowerCase());
-                    parent.namespaces.set(ns.lastPartName.toLowerCase(), ns);
+                else {
+                    const existingContainer = namespaceLookup.get(lowerNamespaceName);
+                    existingContainer.classStatements = new Map([...existingContainer.classStatements, ...nsContainer.classStatements]);
+                    existingContainer.constStatements = new Map([...existingContainer.constStatements, ...nsContainer.constStatements]);
+                    existingContainer.enumStatements = new Map([...existingContainer.enumStatements, ...nsContainer.enumStatements]);
+                    existingContainer.functionStatements = new Map([...existingContainer.functionStatements, ...nsContainer.functionStatements]);
+                    existingContainer.namespaces = new Map([...existingContainer.namespaces, ...nsContainer.namespaces]);
+                    existingContainer.namespaceStatements.push(...nsContainer.namespaceStatements);
+                    existingContainer.symbolTable.mergeSymbolTable(nsContainer.symbolTable);
                 }
             }
         });
@@ -572,9 +595,9 @@ class Scope {
     logDebug(...args) {
         this.program.logger.debug(this._debugLogComponentName, ...args);
     }
-    validate(force = false) {
+    validate(validationOptions = { force: false }) {
         //if this scope is already validated, no need to revalidate
-        if (this.isValidated === true && !force) {
+        if (this.isValidated === true && !validationOptions.force) {
             this.logDebug('validate(): already validated');
             return;
         }
@@ -583,10 +606,10 @@ class Scope {
             //validate our parent before we validate ourself
             if (parentScope && parentScope.isValidated === false) {
                 this.logDebug('validate(): validating parent first');
-                parentScope.validate(force);
+                parentScope.validate(validationOptions);
             }
             //clear the scope's errors list (we will populate them from this method)
-            this.diagnostics = [];
+            this.clearScopeLevelDiagnostics();
             let callables = this.getAllCallables();
             //sort the callables by filepath and then method name, so the errors will be consistent
             // eslint-disable-next-line prefer-arrow-callback
@@ -617,7 +640,9 @@ class Scope {
             this.linkSymbolTable();
             const scopeValidateEvent = {
                 program: this.program,
-                scope: this
+                scope: this,
+                changedFiles: validationOptions === null || validationOptions === void 0 ? void 0 : validationOptions.changedFiles,
+                changedSymbols: validationOptions === null || validationOptions === void 0 ? void 0 : validationOptions.changedSymbols
             };
             this.program.plugins.emit('beforeScopeValidate', scopeValidateEvent);
             this.program.plugins.emit('onScopeValidate', scopeValidateEvent);
@@ -637,12 +662,22 @@ class Scope {
         this.validateClasses();
         //do many per-file checks
         this.enumerateBrsFiles((file) => {
-            this.diagnosticDetectFunctionCallsWithWrongParamCount(file, callableContainerMap);
             this.diagnosticDetectShadowedLocalVars(file, callableContainerMap);
             this.diagnosticDetectFunctionCollisions(file);
             this.detectVariableNamespaceCollisions(file);
+            this.detectNameCollisions(file);
         });
     }
+    clearAstSegmentDiagnostics(astSegment) {
+        this.diagnostics = this.diagnostics.filter(diag => !(diag.origin === interfaces_1.DiagnosticOrigin.ASTSegment && diag.astSegment === astSegment));
+    }
+    clearAstSegmentDiagnosticsByFile(file) {
+        const lowerSrcPath = file.srcPath.toLowerCase();
+        this.diagnostics = this.diagnostics.filter(diag => !(diag.origin === interfaces_1.DiagnosticOrigin.ASTSegment && diag.file.srcPath.toLowerCase() === lowerSrcPath));
+    }
+    clearScopeLevelDiagnostics() {
+        this.diagnostics = this.diagnostics.filter(diag => diag.origin !== interfaces_1.DiagnosticOrigin.Scope);
+    }
     /**
      * Mark this scope as invalid, which means its `validate()` function needs to be called again before use.
      */
@@ -655,6 +690,7 @@ class Scope {
         return this.cache.getOrAdd('symbolTable', () => {
             var _a;
             const result = new SymbolTable_1.SymbolTable(`Scope: '${this.name}'`, () => { var _a; return (_a = this.getParentScope()) === null || _a === void 0 ? void 0 : _a.symbolTable; });
+            result.addSymbol('m', undefined, new AssociativeArrayType_1.AssociativeArrayType(), SymbolTable_1.SymbolTypeFlag.runtime);
             for (let file of this.getOwnFiles()) {
                 if ((0, reflection_1.isBrsFile)(file)) {
                     result.mergeSymbolTable((_a = file.parser) === null || _a === void 0 ? void 0 : _a.symbolTable);
@@ -667,71 +703,88 @@ class Scope {
      * Builds the current symbol table for the scope, by merging the tables for all the files in this scope.
      * Also links all file symbols tables to this new table
      * This will only rebuilt if the symbol table has not been built before
+     *
+     *  Tree of symbol tables:
+     *  ```
+     *  Global Scope Symbol Table
+     *      -  Source Scope Symbol Table :: Aggregate Namespaces Symbol Table (Siblings)
+     *          - File 1 Symbol Table
+     *          - File 2 Symbol Table
+     *      -  Component A Scope Symbol Table :: Aggregate Namespaces Symbol Table (Siblings)
+     *          - File 1 Symbol Table
+     *          - File 2 Symbol Table
+     *      -  Component B Scope Symbol Table :: Aggregate Namespaces Symbol Table (Siblings)
+     *          - File 1 Symbol Table
+     *          - File 2 Symbol Table
+     * ```
      */
     linkSymbolTable() {
-        const allNameSpaces = [];
+        var _a;
+        SymbolTable_1.SymbolTable.cacheVerifier.generateToken();
         for (const file of this.getAllFiles()) {
             if ((0, reflection_1.isBrsFile)(file)) {
-                file.parser.symbolTable.pushParentProvider(() => this.symbolTable);
-                allNameSpaces.push(...file.parser.references.namespaceStatements);
+                this.linkSymbolTableDisposables.push(file.parser.symbolTable.pushParentProvider(() => this.symbolTable));
             }
         }
         //Add namespace aggregates to namespace member tables
-        for (const namespace of allNameSpaces) {
-            //link each NamespaceType member table with the aggregate NamespaceLookup SymbolTable
-            let fullNamespaceName = namespace.getName(Parser_1.ParseMode.BrighterScript);
-            let namespaceParts = fullNamespaceName.split('.');
-            // eslint-disable-next-line no-bitwise
-            let getSymbolFlags = { flags: SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.typetime };
+        const namespaceTypesKnown = new Map();
+        // eslint-disable-next-line no-bitwise
+        let getTypeOptions = { flags: SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.typetime };
+        for (const [nsName, nsContainer] of this.namespaceLookup) {
             let currentNSType = null;
-            let nameSoFar = '';
-            for (const nsNamePart of namespaceParts) {
-                // for each section of the namespace name, add it as either a top level symbol (if it is the first part)
-                // or as a member to the containing namespace.
-                let previousNSType = currentNSType;
-                currentNSType = currentNSType === null
-                    ? this.symbolTable.getSymbolType(nsNamePart, getSymbolFlags)
-                    : currentNSType.getMemberType(nsNamePart, getSymbolFlags);
-                nameSoFar = nameSoFar === '' ? nsNamePart : `${nameSoFar}.${nsNamePart}`;
-                let isFinalNamespace = nameSoFar.toLowerCase() === fullNamespaceName.toLowerCase();
-                if (!(0, reflection_1.isNamespaceType)(currentNSType)) {
-                    if (!currentNSType || (0, reflection_1.isReferenceType)(currentNSType)) {
-                        currentNSType = isFinalNamespace
-                            ? namespace.getType(getSymbolFlags)
-                            : new NamespaceType_1.NamespaceType(nameSoFar);
-                        if (previousNSType) {
-                            // adding as a member of existing NS
-                            previousNSType.addMember(nsNamePart, namespace.range, currentNSType, getSymbolFlags.flags);
-                        }
-                        else {
-                            this.symbolTable.addSymbol(nsNamePart, namespace.range, currentNSType, getSymbolFlags.flags);
-                        }
+            let parentNSType = null;
+            const existingNsStmt = (_a = nsContainer.namespaceStatements) === null || _a === void 0 ? void 0 : _a[0];
+            if (!nsContainer.isTopLevel) {
+                parentNSType = namespaceTypesKnown.get(nsContainer.parentNameLower);
+                if (!parentNSType) {
+                    // we don't know about the parent namespace... uh, oh!
+                    break;
+                }
+                currentNSType = parentNSType.getMemberType(nsContainer.fullNameLower, getTypeOptions);
+            }
+            else {
+                currentNSType = this.symbolTable.getSymbolType(nsContainer.fullNameLower, getTypeOptions);
+            }
+            if (!(0, reflection_1.isNamespaceType)(currentNSType)) {
+                if (!currentNSType || (0, reflection_1.isReferenceType)(currentNSType)) {
+                    currentNSType = existingNsStmt
+                        ? existingNsStmt.getType(getTypeOptions)
+                        : new NamespaceType_1.NamespaceType(nsName);
+                    if (parentNSType) {
+                        // adding as a member of existing NS
+                        parentNSType.addMember(nsContainer.lastPartName, { definingNode: existingNsStmt }, currentNSType, getTypeOptions.flags);
+                        this.symbolsAddedDuringLinking.push({ symbolTable: parentNSType.getMemberTable(), name: nsContainer.lastPartName, flags: getTypeOptions.flags });
                     }
                     else {
-                        break;
+                        this.symbolTable.addSymbol(nsContainer.lastPartName, { definingNode: existingNsStmt }, currentNSType, getTypeOptions.flags);
+                        this.symbolsAddedDuringLinking.push({ symbolTable: this.symbolTable, name: nsContainer.lastPartName, flags: getTypeOptions.flags });
                     }
                 }
-                // Now the namespace type is built, add the aggregate as a sibling
-                let aggregateNSSymbolTable = this.namespaceLookup.get(nameSoFar.toLowerCase()).symbolTable;
-                currentNSType.memberTable.addSibling(aggregateNSSymbolTable);
-                if (isFinalNamespace) {
-                    namespace.body.getSymbolTable().addSibling(aggregateNSSymbolTable);
+                else {
+                    break;
                 }
             }
+            else {
+                // Existing known namespace
+            }
+            if (!namespaceTypesKnown.has(nsName)) {
+                namespaceTypesKnown.set(nsName, currentNSType);
+            }
+            for (let nsStmt of nsContainer.namespaceStatements) {
+                this.linkSymbolTableDisposables.push(nsStmt === null || nsStmt === void 0 ? void 0 : nsStmt.getSymbolTable().addSibling(nsContainer.symbolTable));
+            }
+            this.linkSymbolTableDisposables.push(currentNSType.memberTable.addSibling(nsContainer.symbolTable));
         }
-        this.program.typeCacheVerifier.generateToken();
     }
     unlinkSymbolTable() {
-        var _a;
-        for (let file of this.getOwnFiles()) {
-            if ((0, reflection_1.isBrsFile)(file)) {
-                (_a = file.parser) === null || _a === void 0 ? void 0 : _a.symbolTable.popParentProvider();
-                for (const namespace of file.parser.references.namespaceStatements) {
-                    const namespaceNameLower = namespace.getName(Parser_1.ParseMode.BrighterScript).toLowerCase();
-                    namespace.getSymbolTable().removeSibling(this.namespaceLookup.get(namespaceNameLower).symbolTable);
-                }
-            }
+        for (const symbolToRemove of this.symbolsAddedDuringLinking) {
+            this.symbolTable.removeSymbol(symbolToRemove.name);
+        }
+        this.symbolsAddedDuringLinking = [];
+        for (const dispose of this.linkSymbolTableDisposables) {
+            dispose();
         }
+        this.linkSymbolTableDisposables = [];
     }
     detectVariableNamespaceCollisions(file) {
         var _a, _b;
@@ -742,7 +795,7 @@ class Scope {
                 let namespace = this.getNamespace(lowerParamName, (_a = param.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript).toLowerCase());
                 //see if the param matches any starting namespace part
                 if (namespace) {
-                    this.diagnostics.push(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.parameterMayNotHaveSameNameAsNamespace(param.name.text)), { range: param.name.range, relatedInformation: [{
+                    this.diagnostics.push(Object.assign(Object.assign({ origin: interfaces_1.DiagnosticOrigin.Scope, file: file }, DiagnosticMessages_1.DiagnosticMessages.parameterMayNotHaveSameNameAsNamespace(param.name.text)), { range: param.name.range, relatedInformation: [{
                                 message: 'Namespace declared here',
                                 location: util_1.util.createLocation(vscode_uri_1.URI.file(namespace.file.srcPath).toString(), namespace.nameRange)
                             }] }));
@@ -754,7 +807,7 @@ class Scope {
             let namespace = this.getNamespace(lowerAssignmentName, (_b = assignment.findAncestor(reflection_1.isNamespaceStatement)) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript).toLowerCase());
             //see if the param matches any starting namespace part
             if (namespace) {
-                this.diagnostics.push(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.variableMayNotHaveSameNameAsNamespace(assignment.name.text)), { range: assignment.name.range, relatedInformation: [{
+                this.diagnostics.push(Object.assign(Object.assign({ origin: interfaces_1.DiagnosticOrigin.Scope, file: file }, DiagnosticMessages_1.DiagnosticMessages.variableMayNotHaveSameNameAsNamespace(assignment.name.text)), { range: assignment.name.range, relatedInformation: [{
                             message: 'Namespace declared here',
                             location: util_1.util.createLocation(vscode_uri_1.URI.file(namespace.file.srcPath).toString(), namespace.nameRange)
                         }] }));
@@ -771,15 +824,80 @@ class Scope {
             if (lowerFuncName) {
                 //find function declarations with the same name as a stdlib function
                 if (globalCallables_1.globalCallableMap.has(lowerFuncName)) {
-                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.scopeFunctionShadowedByBuiltInFunction()), { range: func.nameRange, file: file }));
+                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.scopeFunctionShadowedByBuiltInFunction()), { range: func.nameRange, file: file, origin: interfaces_1.DiagnosticOrigin.Scope }));
                 }
                 //find any functions that have the same name as a class
-                if (this.hasClass(lowerFuncName)) {
-                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionCannotHaveSameNameAsClass(funcName)), { range: func.nameRange, file: file }));
+                const klassLink = this.getClassFileLink(lowerFuncName);
+                if (klassLink) {
+                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionCannotHaveSameNameAsClass(funcName)), { range: func.nameRange, file: file, origin: interfaces_1.DiagnosticOrigin.Scope, relatedInformation: [{
+                                location: util_1.util.createLocation(vscode_uri_1.URI.file(klassLink.file.srcPath).toString(), klassLink.item.name.range),
+                                message: 'Original class declared here'
+                            }] }));
                 }
             }
         }
     }
+    detectNameCollisions(file) {
+        file.ast.walk((0, visitors_1.createVisitor)({
+            NamespaceStatement: (nsStmt) => {
+                var _a;
+                this.validateNameCollision(file, nsStmt, (_a = nsStmt.getNameParts()) === null || _a === void 0 ? void 0 : _a[0]);
+            },
+            ClassStatement: (classStmt) => {
+                this.validateNameCollision(file, classStmt, classStmt.name);
+            },
+            InterfaceStatement: (ifaceStmt) => {
+                this.validateNameCollision(file, ifaceStmt, ifaceStmt.tokens.name);
+            },
+            ConstStatement: (constStmt) => {
+                this.validateNameCollision(file, constStmt, constStmt.tokens.name);
+            },
+            EnumStatement: (enumStmt) => {
+                this.validateNameCollision(file, enumStmt, enumStmt.tokens.name);
+            }
+        }), {
+            walkMode: visitors_1.WalkMode.visitStatements
+        });
+    }
+    validateNameCollision(file, node, nameIdentifier) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        const name = nameIdentifier === null || nameIdentifier === void 0 ? void 0 : nameIdentifier.text;
+        if (!name || !node) {
+            return;
+        }
+        const nameRange = nameIdentifier.range;
+        const containingNamespace = (_a = node.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript);
+        const links = this.getAllFileLinks(name, containingNamespace);
+        for (let link of links) {
+            if (!link || link.item === node) {
+                // refers to same node
+                continue;
+            }
+            if ((0, reflection_1.isNamespaceStatement)(link.item) && (0, reflection_1.isNamespaceStatement)(node)) {
+                // namespace can be declared multiple times
+                continue;
+            }
+            const thisNodeKindName = util_1.util.getAstNodeFriendlyName(node);
+            const thatNodeKindName = link.file.srcPath === 'global' ? 'Global Function' : (_b = util_1.util.getAstNodeFriendlyName(link.item)) !== null && _b !== void 0 ? _b : '';
+            let thatNameRange = (_f = (_e = (_d = (_c = link.item) === null || _c === void 0 ? void 0 : _c.tokens) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : (_g = link.item) === null || _g === void 0 ? void 0 : _g.range;
+            // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+            switch ((_h = link.item) === null || _h === void 0 ? void 0 : _h.kind) {
+                case AstNode_1.AstNodeKind.ClassStatement: {
+                    thatNameRange = (_j = link.item.name) === null || _j === void 0 ? void 0 : _j.range;
+                    break;
+                }
+                case AstNode_1.AstNodeKind.NamespaceStatement: {
+                    thatNameRange = (_l = (_k = link.item.getNameParts()) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.range;
+                    break;
+                }
+            }
+            const relatedInformation = thatNameRange ? [{
+                    message: `${thatNodeKindName} declared here`,
+                    location: util_1.util.createLocation(vscode_uri_1.URI.file((_m = link.file) === null || _m === void 0 ? void 0 : _m.srcPath).toString(), thatNameRange)
+                }] : undefined;
+            this.diagnostics.push(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.nameCollision(thisNodeKindName, thatNodeKindName, name)), { origin: interfaces_1.DiagnosticOrigin.Scope, range: nameRange, relatedInformation: relatedInformation }));
+        }
+    }
     getNewExpressions() {
         let result = [];
         this.enumerateBrsFiles((file) => {
@@ -794,38 +912,9 @@ class Scope {
     validateClasses() {
         let validator = new ClassValidator_1.BsClassValidator();
         validator.validate(this);
-        this.diagnostics.push(...validator.diagnostics);
-    }
-    /**
-     * Detect calls to functions with the incorrect number of parameters
-     */
-    diagnosticDetectFunctionCallsWithWrongParamCount(file, callableContainersByLowerName) {
-        //validate all function calls
-        for (let expCall of file.functionCalls) {
-            let callableContainersWithThisName = callableContainersByLowerName.get(expCall.name.toLowerCase());
-            //use the first item from callablesByLowerName, because if there are more, that's a separate error
-            let knownCallableContainer = callableContainersWithThisName ? callableContainersWithThisName[0] : undefined;
-            if (knownCallableContainer) {
-                //get min/max parameter count for callable
-                let minParams = 0;
-                let maxParams = 0;
-                for (let param of knownCallableContainer.callable.params) {
-                    maxParams++;
-                    //optional parameters must come last, so we can assume that minParams won't increase once we hit
-                    //the first isOptional
-                    if (param.isOptional !== true) {
-                        minParams++;
-                    }
-                }
-                let expCallArgCount = expCall.args.length;
-                if (expCall.args.length > maxParams || expCall.args.length < minParams) {
-                    let minMaxParamsText = minParams === maxParams ? maxParams : `${minParams}-${maxParams}`;
-                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchArgumentCount(minMaxParamsText, expCallArgCount)), { range: expCall.nameRange, 
-                        //TODO detect end of expression call
-                        file: file }));
-                }
-            }
-        }
+        this.diagnostics.push(...validator.diagnostics.map(diag => {
+            return Object.assign(Object.assign({}, diag), { origin: interfaces_1.DiagnosticOrigin.Scope });
+        }));
     }
     /**
      * Detect local variables (function scope) that have the same name as scope calls
@@ -834,39 +923,34 @@ class Scope {
         var _a;
         const classMap = this.getClassMap();
         //loop through every function scope
-        for (let scope of file.functionScopes) {
+        for (let funcScope of file.functionScopes) {
             //every var declaration in this function scope
-            for (let varDeclaration of scope.variableDeclarations) {
+            for (let varDeclaration of funcScope.variableDeclarations) {
                 const varName = varDeclaration.name;
                 const lowerVarName = varName.toLowerCase();
-                //if the var is a function
-                if ((0, reflection_1.isFunctionType)(varDeclaration.getType())) {
+                const varIsFunction = () => {
+                    return (0, reflection_1.isCallableType)(varDeclaration.getType());
+                };
+                if (
+                //has same name as stdlib
+                globalCallables_1.globalCallableMap.has(lowerVarName)) {
                     //local var function with same name as stdlib function
-                    if (
-                    //has same name as stdlib
-                    globalCallables_1.globalCallableMap.has(lowerVarName)) {
-                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarFunctionShadowsParentFunction('stdlib')), { range: varDeclaration.nameRange, file: file }));
-                        //this check needs to come after the stdlib one, because the stdlib functions are included
-                        //in the scope function list
+                    if (varIsFunction()) {
+                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarFunctionShadowsParentFunction('stdlib')), { range: varDeclaration.nameRange, file: file, origin: interfaces_1.DiagnosticOrigin.Scope }));
                     }
-                    else if (
-                    //has same name as scope function
-                    callableContainerMap.has(lowerVarName)) {
-                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarFunctionShadowsParentFunction('scope')), { range: varDeclaration.nameRange, file: file }));
-                    }
-                    //var is not a function
                 }
-                else if (
-                //is NOT a callable from stdlib (because non-function local vars can have same name as stdlib names)
-                !globalCallables_1.globalCallableMap.has(lowerVarName)) {
+                else if (callableContainerMap.has(lowerVarName)) {
                     //is same name as a callable
-                    if (callableContainerMap.has(lowerVarName)) {
-                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarShadowedByScopedFunction()), { range: varDeclaration.nameRange, file: file }));
-                        //has the same name as an in-scope class
+                    if (varIsFunction()) {
+                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarFunctionShadowsParentFunction('scope')), { range: varDeclaration.nameRange, file: file, origin: interfaces_1.DiagnosticOrigin.Scope }));
                     }
-                    else if (classMap.has(lowerVarName)) {
-                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarSameNameAsClass((_a = classMap.get(lowerVarName)) === null || _a === void 0 ? void 0 : _a.item.getName(Parser_1.ParseMode.BrighterScript))), { range: varDeclaration.nameRange, file: file }));
+                    else {
+                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarShadowedByScopedFunction()), { range: varDeclaration.nameRange, file: file, origin: interfaces_1.DiagnosticOrigin.Scope }));
                     }
+                    //has the same name as an in-scope class
+                }
+                else if (classMap.has(lowerVarName)) {
+                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarSameNameAsClass((_a = classMap.get(lowerVarName)) === null || _a === void 0 ? void 0 : _a.item.getName(Parser_1.ParseMode.BrighterScript))), { range: varDeclaration.nameRange, file: file, origin: interfaces_1.DiagnosticOrigin.Scope }));
                 }
             }
         }
@@ -905,9 +989,9 @@ class Scope {
                             //same file: skip redundant imports
                             continue;
                         }
-                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.overridesAncestorFunction(container.callable.name, container.scope.name, shadowedCallable.callable.file.pkgPath, 
+                        this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.overridesAncestorFunction(container.callable.name, container.scope.name, shadowedCallable.callable.file.destPath, 
                         //grab the last item in the list, which should be the closest ancestor's version
-                        shadowedCallable.scope.name)), { range: container.callable.nameRange, file: container.callable.file }));
+                        shadowedCallable.scope.name)), { range: container.callable.nameRange, file: container.callable.file, origin: interfaces_1.DiagnosticOrigin.Scope }));
                     }
                 }
             }
@@ -915,7 +999,7 @@ class Scope {
             if (ownCallables.length > 1) {
                 for (let callableContainer of ownCallables) {
                     let callable = callableContainer.callable;
-                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateFunctionImplementation(callable.name, callableContainer.scope.name)), { range: util_1.util.createRange(callable.nameRange.start.line, callable.nameRange.start.character, callable.nameRange.start.line, callable.nameRange.end.character), file: callable.file }));
+                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateFunctionImplementation(callable.name, callableContainer.scope.name)), { range: util_1.util.createRange(callable.nameRange.start.line, callable.nameRange.start.character, callable.nameRange.start.line, callable.nameRange.end.character), file: callable.file, origin: interfaces_1.DiagnosticOrigin.Scope }));
                 }
             }
         }
@@ -942,11 +1026,11 @@ class Scope {
         let scriptImports = this.getOwnScriptImports();
         //verify every script import
         for (let scriptImport of scriptImports) {
-            let referencedFile = this.getFileByRelativePath(scriptImport.pkgPath);
+            let referencedFile = this.getFileByRelativePath(scriptImport.destPath);
             //if we can't find the file
             if (!referencedFile) {
                 //skip the default bslib file, it will exist at transpile time but should not show up in the program during validation cycle
-                if (scriptImport.pkgPath === `source${path.sep}bslib.brs`) {
+                if (scriptImport.destPath === this.program.bslibPkgPath) {
                     continue;
                 }
                 let dInfo;
@@ -956,11 +1040,11 @@ class Scope {
                 else {
                     dInfo = DiagnosticMessages_1.DiagnosticMessages.referencedFileDoesNotExist();
                 }
-                this.diagnostics.push(Object.assign(Object.assign({}, dInfo), { range: scriptImport.filePathRange, file: scriptImport.sourceFile }));
+                this.diagnostics.push(Object.assign(Object.assign({}, dInfo), { range: scriptImport.filePathRange, file: scriptImport.sourceFile, origin: interfaces_1.DiagnosticOrigin.Scope }));
                 //if the character casing of the script import path does not match that of the actual path
             }
-            else if (scriptImport.pkgPath !== referencedFile.pkgPath) {
-                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.scriptImportCaseMismatch(referencedFile.pkgPath)), { range: scriptImport.filePathRange, file: scriptImport.sourceFile }));
+            else if (scriptImport.destPath !== referencedFile.destPath) {
+                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.scriptImportCaseMismatch(referencedFile.destPath)), { range: scriptImport.filePathRange, file: scriptImport.sourceFile, origin: interfaces_1.DiagnosticOrigin.Scope }));
             }
         }
     }
@@ -973,7 +1057,7 @@ class Scope {
         }
         let files = this.getAllFiles();
         for (let file of files) {
-            if (file.pkgPath.toLowerCase() === relativePath.toLowerCase()) {
+            if (file.destPath.toLowerCase() === relativePath.toLowerCase()) {
                 return file;
             }
         }
@@ -986,35 +1070,6 @@ class Scope {
         let hasFile = files.includes(file);
         return hasFile;
     }
-    /**
-     * Get all callables as completionItems
-     */
-    getCallablesAsCompletions(parseMode) {
-        let completions = [];
-        let callables = this.getAllCallables();
-        if (parseMode === Parser_1.ParseMode.BrighterScript) {
-            //throw out the namespaced callables (they will be handled by another method)
-            callables = callables.filter(x => x.callable.hasNamespace === false);
-        }
-        for (let callableContainer of callables) {
-            completions.push(this.createCompletionFromCallable(callableContainer));
-        }
-        return completions;
-    }
-    createCompletionFromCallable(callableContainer) {
-        return {
-            label: callableContainer.callable.getName(Parser_1.ParseMode.BrighterScript),
-            kind: vscode_languageserver_1.CompletionItemKind.Function,
-            detail: callableContainer.callable.shortDescription,
-            documentation: callableContainer.callable.documentation ? { kind: 'markdown', value: callableContainer.callable.documentation } : undefined
-        };
-    }
-    createCompletionFromFunctionStatement(statement) {
-        return {
-            label: statement.getName(Parser_1.ParseMode.BrighterScript),
-            kind: vscode_languageserver_1.CompletionItemKind.Function
-        };
-    }
     /**
      * Get the definition (where was this thing first defined) of the symbol under the position
      */
@@ -1022,37 +1077,6 @@ class Scope {
         // Overridden in XMLScope. Brs files use implementation in BrsFile
         return [];
     }
-    /**
-     * Scan all files for property names, and return them as completions
-     */
-    getPropertyNameCompletions() {
-        let results = [];
-        this.enumerateBrsFiles((file) => {
-            results.push(...file.propertyNameCompletions);
-        });
-        return results;
-    }
-    getAllClassMemberCompletions() {
-        let results = new Map();
-        let filesSearched = new Set();
-        for (const file of this.getAllFiles()) {
-            if ((0, reflection_1.isXmlFile)(file) || filesSearched.has(file)) {
-                continue;
-            }
-            filesSearched.add(file);
-            for (let cs of file.parser.references.classStatements) {
-                for (let s of [...cs.methods, ...cs.fields]) {
-                    if (!results.has(s.name.text) && s.name.text.toLowerCase() !== 'new') {
-                        results.set(s.name.text, {
-                            label: s.name.text,
-                            kind: (0, reflection_1.isMethodStatement)(s) ? vscode_languageserver_1.CompletionItemKind.Method : vscode_languageserver_1.CompletionItemKind.Field
-                        });
-                    }
-                }
-            }
-        }
-        return results;
-    }
     /**
      * @param className - The name of the class (including namespace if possible)
      * @param callsiteNamespace - the name of the namespace where the call site resides (this is NOT the known namespace of the class).