Merge branch 'release-1.0.0' into remove_FunctionExpressionfunctionSt…

…atement
rokucommunity · Aug 19, 2024 · 921a07b · 921a07b
2 parents 3befae9 + f9c8b43
commit 921a07b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/DiagnosticCollection.ts b/src/DiagnosticCollection.ts
@@ -30,7 +30,11 @@ export class DiagnosticCollection {
         const keys = {};
         //build the full current set of diagnostics by file
         for (let diagnostic of diagnostics) {
-            const fileUri = diagnostic.location.uri;
+            const fileUri = diagnostic?.location?.uri;
+            if (!fileUri) {
+                continue;
+            }
+
             //ensure the file entry exists
             if (!result[fileUri]) {
                 result[fileUri] = [];

diff --git a/src/DiagnosticManager.ts b/src/DiagnosticManager.ts
@@ -166,7 +166,7 @@ export class DiagnosticManager {
     public clearForFile(fileSrcPath: string) {
         const fileSrcPathUri = util.pathToUri(fileSrcPath).toLowerCase();
         for (const [key, cachedData] of this.diagnosticsCache.entries()) {
-            if (cachedData.diagnostic.location.uri.toLowerCase() === fileSrcPathUri) {
+            if (cachedData.diagnostic.location?.uri.toLowerCase() === fileSrcPathUri) {
                 this.diagnosticsCache.delete(key);
             }
         }

diff --git a/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts b/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts
@@ -20,7 +20,9 @@ export class BrsFileSemanticTokensProcessor {
     public process() {
         const scope = this.event.scopes[0];
         this.result.clear();
-        scope.linkSymbolTable();
+        if (scope) {
+            scope.linkSymbolTable();
+        }
 
         this.event.file.ast.walk(createVisitor({
             VariableExpression: (node) => {
@@ -57,7 +59,9 @@ export class BrsFileSemanticTokensProcessor {
             walkMode: WalkMode.visitAllRecursive
         });
 
-        scope.unlinkSymbolTable();
+        if (scope) {
+            scope.unlinkSymbolTable();
+        }
 
         //add all tokens to the event
         this.event.semanticTokens.push(