Merge branch 'master' into better-languageserver-error-reporting

rokucommunity · Mar 10, 2021 · 4ca20bf · 4ca20bf
2 parents cab49d9 + 91ff26d
commit 4ca20bf
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/files/BrsFile.ts b/src/files/BrsFile.ts
@@ -572,15 +572,15 @@ export class BrsFile {
 
                 //function call
             } else if (isCallExpression(assignment.value)) {
-                let calleeName = (assignment.value.callee as any).name.text;
+                let calleeName = (assignment.value.callee as any)?.name?.text;
                 if (calleeName) {
                     let func = this.getCallableByName(calleeName);
                     if (func) {
                         return func.type.returnType;
                     }
                 }
             } else if (isVariableExpression(assignment.value)) {
-                let variableName = assignment.value.name.text;
+                let variableName = assignment.value?.name?.text;
                 let variable = scope.getVariableByName(variableName);
                 return variable.type;
             }
@@ -1180,12 +1180,14 @@ export class BrsFile {
     public calleeIsKnownNamespaceFunction(callee: Expression, namespaceName: string) {
         //if we have a variable and a namespace
         if (isVariableExpression(callee) && namespaceName) {
-            let lowerCalleeName = callee.name.text.toLowerCase();
-            let scopes = this.program.getScopesForFile(this);
-            for (let scope of scopes) {
-                let namespace = scope.namespaceLookup[namespaceName.toLowerCase()];
-                if (namespace.functionStatements[lowerCalleeName]) {
-                    return true;
+            let lowerCalleeName = callee?.name?.text?.toLowerCase();
+            if (lowerCalleeName) {
+                let scopes = this.program.getScopesForFile(this);
+                for (let scope of scopes) {
+                    let namespace = scope.namespaceLookup[namespaceName.toLowerCase()];
+                    if (namespace.functionStatements[lowerCalleeName]) {
+                        return true;
+                    }
                 }
             }
         }