brighterscript 1.0.0-alpha.32 → 1.0.0-alpha.34

package/dist/bscPlugin/validation/ScopeValidator.js

@@ -117,12 +117,13 @@ class ScopeValidator {
                         this.validateUnaryExpression(file, unaryExpr);
                     },
                     AssignmentStatement: (assignStmt) => {
+                        var _a;
                         this.validateAssignmentStatement(file, assignStmt);
                         // Note: this also includes For statements
                         this.detectShadowedLocalVar(file, {
                             name: assignStmt.tokens.name.text,
                             type: this.getNodeTypeWrapper(file, assignStmt, { flags: 1 /* SymbolTypeFlag.runtime */ }),
-                            nameRange: assignStmt.tokens.name.range
+                            nameRange: (_a = assignStmt.tokens.name.location) === null || _a === void 0 ? void 0 : _a.range
                         });
                     },
                     AugmentedAssignmentStatement: (binaryExpr) => {
@@ -135,17 +136,19 @@ class ScopeValidator {
                         this.validateNewExpression(file, newExpr);
                     },
                     ForEachStatement: (forEachStmt) => {
+                        var _a;
                         this.detectShadowedLocalVar(file, {
                             name: forEachStmt.tokens.item.text,
                             type: this.getNodeTypeWrapper(file, forEachStmt, { flags: 1 /* SymbolTypeFlag.runtime */ }),
-                            nameRange: forEachStmt.tokens.item.range
+                            nameRange: (_a = forEachStmt.tokens.item.location) === null || _a === void 0 ? void 0 : _a.range
                         });
                     },
                     FunctionParameterExpression: (funcParam) => {
+                        var _a;
                         this.detectShadowedLocalVar(file, {
                             name: funcParam.tokens.name.text,
                             type: this.getNodeTypeWrapper(file, funcParam, { flags: 1 /* SymbolTypeFlag.runtime */ }),
-                            nameRange: funcParam.tokens.name.range
+                            nameRange: (_a = funcParam.tokens.name.location) === null || _a === void 0 ? void 0 : _a.range
                         });
                     }
                 });
@@ -220,9 +223,9 @@ class ScopeValidator {
      * do this manually for now.
      */
     validateCreateObjectCall(file, call) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         //skip non CreateObject function calls
-        const callName = (_a = util_1.default.getAllDottedGetPartsAsString(call.callee)) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        const callName = (_a = util_1.util.getAllDottedGetPartsAsString(call.callee)) === null || _a === void 0 ? void 0 : _a.toLowerCase();
         if (callName !== 'createobject' || !(0, reflection_1.isLiteralExpression)(call === null || call === void 0 ? void 0 : call.args[0])) {
             return;
         }
@@ -242,15 +245,15 @@ class ScopeValidator {
             //add diagnostic for unknown components
             const unquotedComponentName = (_g = componentName === null || componentName === void 0 ? void 0 : componentName.text) === null || _g === void 0 ? void 0 : _g.replace(/"/g, '');
             if (unquotedComponentName && !platformNodeNames.has(unquotedComponentName.toLowerCase()) && !this.event.program.getComponent(unquotedComponentName)) {
-                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownRoSGNode(unquotedComponentName)), { range: componentName.range }));
+                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownRoSGNode(unquotedComponentName)), { range: (_h = componentName.location) === null || _h === void 0 ? void 0 : _h.range }));
             }
             else if ((call === null || call === void 0 ? void 0 : call.args.length) !== 2) {
                 // roSgNode should only ever have 2 args in `createObject`
-                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, [2], call === null || call === void 0 ? void 0 : call.args.length)), { range: call.range }));
+                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, [2], call === null || call === void 0 ? void 0 : call.args.length)), { range: (_j = call.location) === null || _j === void 0 ? void 0 : _j.range }));
             }
         }
         else if (!platformComponentNames.has(firstParamStringValueLower)) {
-            this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownBrightScriptComponent(firstParamStringValue)), { range: firstParamToken.range }));
+            this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownBrightScriptComponent(firstParamStringValue)), { range: (_k = firstParamToken.location) === null || _k === void 0 ? void 0 : _k.range }));
         }
         else {
             // This is valid brightscript component
@@ -264,11 +267,11 @@ class ScopeValidator {
             }
             if (!validArgCounts.includes(call === null || call === void 0 ? void 0 : call.args.length)) {
                 // Incorrect number of arguments included in `createObject()`
-                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, validArgCounts, call === null || call === void 0 ? void 0 : call.args.length)), { range: call.range }));
+                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, validArgCounts, call === null || call === void 0 ? void 0 : call.args.length)), { range: (_l = call.location) === null || _l === void 0 ? void 0 : _l.range }));
             }
             // Test for deprecation
             if (brightScriptComponent === null || brightScriptComponent === void 0 ? void 0 : brightScriptComponent.isDeprecated) {
-                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.deprecatedBrightScriptComponent(firstParamStringValue, brightScriptComponent.deprecatedDescription)), { range: call.range }));
+                this.addDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.deprecatedBrightScriptComponent(firstParamStringValue, brightScriptComponent.deprecatedDescription)), { range: (_m = call.location) === null || _m === void 0 ? void 0 : _m.range }));
             }
         }
     }
@@ -276,7 +279,7 @@ class ScopeValidator {
      * Detect calls to functions with the incorrect number of parameters, or wrong types of arguments
      */
     validateFunctionCall(file, expression) {
-        var _a;
+        var _a, _b, _c;
         const getTypeOptions = { flags: 1 /* SymbolTypeFlag.runtime */, data: {} };
         let funcType = this.getNodeTypeWrapper(file, expression === null || expression === void 0 ? void 0 : expression.callee, getTypeOptions);
         if ((funcType === null || funcType === void 0 ? void 0 : funcType.isResolvable()) && (0, reflection_1.isClassType)(funcType)) {
@@ -303,7 +306,7 @@ class ScopeValidator {
             let expCallArgCount = expression.args.length;
             if (expCallArgCount > maxParams || expCallArgCount < minParams) {
                 let minMaxParamsText = minParams === maxParams ? maxParams : `${minParams}-${maxParams}`;
-                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchArgumentCount(minMaxParamsText, expCallArgCount)), { range: expression.callee.range, 
+                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchArgumentCount(minMaxParamsText, expCallArgCount)), { range: (_a = expression.callee.location) === null || _a === void 0 ? void 0 : _a.range, 
                     //TODO detect end of expression call
                     file: file }));
             }
@@ -311,7 +314,7 @@ class ScopeValidator {
             for (let arg of expression.args) {
                 const data = {};
                 let argType = this.getNodeTypeWrapper(file, arg, { flags: 1 /* SymbolTypeFlag.runtime */, data: data });
-                const paramType = (_a = funcType.params[paramIndex]) === null || _a === void 0 ? void 0 : _a.type;
+                const paramType = (_b = funcType.params[paramIndex]) === null || _b === void 0 ? void 0 : _b.type;
                 if (!paramType) {
                     // unable to find a paramType -- maybe there are more args than params
                     break;
@@ -326,7 +329,7 @@ class ScopeValidator {
                 const compatibilityData = {};
                 const isAllowedArgConversion = this.checkAllowedArgConversions(paramType, argType);
                 if (!isAllowedArgConversion && !(paramType === null || paramType === void 0 ? void 0 : paramType.isTypeCompatible(argType, compatibilityData))) {
-                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.argumentTypeMismatch(argType.toString(), paramType.toString(), compatibilityData)), { range: arg.range, 
+                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.argumentTypeMismatch(argType.toString(), paramType.toString(), compatibilityData)), { range: (_c = arg.location) === null || _c === void 0 ? void 0 : _c.range, 
                         //TODO detect end of expression call
                         file: file }));
                 }
@@ -344,13 +347,14 @@ class ScopeValidator {
      * Detect return statements with incompatible types vs. declared return type
      */
     validateReturnStatement(file, returnStmt) {
+        var _a;
         const getTypeOptions = { flags: 1 /* SymbolTypeFlag.runtime */ };
         let funcType = returnStmt.findAncestor(reflection_1.isFunctionExpression).getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
         if ((0, reflection_1.isTypedFunctionType)(funcType)) {
             const actualReturnType = this.getNodeTypeWrapper(file, returnStmt === null || returnStmt === void 0 ? void 0 : returnStmt.value, getTypeOptions);
             const compatibilityData = {};
             if (actualReturnType && !funcType.returnType.isTypeCompatible(actualReturnType, compatibilityData)) {
-                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.returnTypeMismatch(actualReturnType.toString(), funcType.returnType.toString(), compatibilityData)), { range: returnStmt.value.range, file: file }));
+                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.returnTypeMismatch(actualReturnType.toString(), funcType.returnType.toString(), compatibilityData)), { range: (_a = returnStmt.value.location) === null || _a === void 0 ? void 0 : _a.range, file: file }));
             }
         }
     }
@@ -358,13 +362,13 @@ class ScopeValidator {
      * Detect assigned type different from expected member type
      */
     validateDottedSetStatement(file, dottedSetStmt) {
-        var _a;
+        var _a, _b, _c;
         const typeChainExpectedLHS = [];
         const getTypeOpts = { flags: 1 /* SymbolTypeFlag.runtime */ };
         const expectedLHSType = this.getNodeTypeWrapper(file, dottedSetStmt, Object.assign(Object.assign({}, getTypeOpts), { data: {}, typeChain: typeChainExpectedLHS }));
         const actualRHSType = this.getNodeTypeWrapper(file, dottedSetStmt === null || dottedSetStmt === void 0 ? void 0 : dottedSetStmt.value, getTypeOpts);
         const compatibilityData = {};
-        const typeChainScan = util_1.default.processTypeChain(typeChainExpectedLHS);
+        const typeChainScan = util_1.util.processTypeChain(typeChainExpectedLHS);
         // check if anything in typeChain is an AA - if so, just allow it
         if (typeChainExpectedLHS.find(typeChainItem => (0, reflection_1.isAssociativeArrayType)(typeChainItem.type))) {
             // something in the chain is an AA
@@ -372,26 +376,27 @@ class ScopeValidator {
             return;
         }
         if (!expectedLHSType || !(expectedLHSType === null || expectedLHSType === void 0 ? void 0 : expectedLHSType.isResolvable())) {
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: typeChainScan.range }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: (_a = typeChainScan === null || typeChainScan === void 0 ? void 0 : typeChainScan.location) === null || _a === void 0 ? void 0 : _a.range }));
             return;
         }
         let accessibilityIsOk = this.checkMemberAccessibility(file, dottedSetStmt, typeChainExpectedLHS);
         //Most Component fields can be set with strings
         //TODO: be more precise about which fields can actually accept strings
         //TODO: if RHS is a string literal, we can do more validation to make sure it's the correct type
-        if ((0, reflection_1.isComponentType)((_a = dottedSetStmt.obj) === null || _a === void 0 ? void 0 : _a.getType({ flags: 1 /* SymbolTypeFlag.runtime */ }))) {
+        if ((0, reflection_1.isComponentType)((_b = dottedSetStmt.obj) === null || _b === void 0 ? void 0 : _b.getType({ flags: 1 /* SymbolTypeFlag.runtime */ }))) {
             if ((0, reflection_1.isStringType)(actualRHSType)) {
                 return;
             }
         }
         if (accessibilityIsOk && !(expectedLHSType === null || expectedLHSType === void 0 ? void 0 : expectedLHSType.isTypeCompatible(actualRHSType, compatibilityData))) {
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.assignmentTypeMismatch(actualRHSType.toString(), expectedLHSType.toString(), compatibilityData)), { range: dottedSetStmt.range, file: file }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.assignmentTypeMismatch(actualRHSType.toString(), expectedLHSType.toString(), compatibilityData)), { range: (_c = dottedSetStmt.location) === null || _c === void 0 ? void 0 : _c.range, file: file }));
         }
     }
     /**
      * Detect when declared type does not match rhs type
      */
     validateAssignmentStatement(file, assignStmt) {
+        var _a;
         if (!(assignStmt === null || assignStmt === void 0 ? void 0 : assignStmt.typeExpression)) {
             // nothing to check
             return;
@@ -405,15 +410,16 @@ class ScopeValidator {
             // LHS is not resolvable... handled elsewhere
         }
         else if (!(expectedLHSType === null || expectedLHSType === void 0 ? void 0 : expectedLHSType.isTypeCompatible(actualRHSType, compatibilityData))) {
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.assignmentTypeMismatch(actualRHSType.toString(), expectedLHSType.toString(), compatibilityData)), { range: assignStmt.range, file: file }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.assignmentTypeMismatch(actualRHSType.toString(), expectedLHSType.toString(), compatibilityData)), { range: (_a = assignStmt.location) === null || _a === void 0 ? void 0 : _a.range, file: file }));
         }
     }
     /**
      * Detect invalid use of a binary operator
      */
     validateBinaryExpression(file, binaryExpr) {
+        var _a;
         const getTypeOpts = { flags: 1 /* SymbolTypeFlag.runtime */ };
-        if (util_1.default.isInTypeExpression(binaryExpr)) {
+        if (util_1.util.isInTypeExpression(binaryExpr)) {
             return;
         }
         let leftType = (0, reflection_1.isBinaryExpression)(binaryExpr)
@@ -451,16 +457,17 @@ class ScopeValidator {
             // one operand is basically "any" type... ignore;
             return;
         }
-        const opResult = util_1.default.binaryOperatorResultType(leftTypeToTest, binaryExpr.tokens.operator, rightTypeToTest);
+        const opResult = util_1.util.binaryOperatorResultType(leftTypeToTest, binaryExpr.tokens.operator, rightTypeToTest);
         if ((0, reflection_1.isDynamicType)(opResult)) {
             // if the result was dynamic, that means there wasn't a valid operation
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(binaryExpr.tokens.operator.text, leftType.toString(), rightType.toString())), { range: binaryExpr.range, file: file }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(binaryExpr.tokens.operator.text, leftType.toString(), rightType.toString())), { range: (_a = binaryExpr.location) === null || _a === void 0 ? void 0 : _a.range, file: file }));
         }
     }
     /**
      * Detect invalid use of a Unary operator
      */
     validateUnaryExpression(file, unaryExpr) {
+        var _a, _b;
         const getTypeOpts = { flags: 1 /* SymbolTypeFlag.runtime */ };
         let rightType = this.getNodeTypeWrapper(file, unaryExpr.right, getTypeOpts);
         if (!rightType.isResolvable()) {
@@ -479,17 +486,18 @@ class ScopeValidator {
             // operand is basically "any" type... ignore;
         }
         else if ((0, reflection_1.isPrimitiveType)(rightType)) {
-            const opResult = util_1.default.unaryOperatorResultType(unaryExpr.tokens.operator, rightTypeToTest);
+            const opResult = util_1.util.unaryOperatorResultType(unaryExpr.tokens.operator, rightTypeToTest);
             if ((0, reflection_1.isDynamicType)(opResult)) {
-                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(unaryExpr.tokens.operator.text, rightType.toString())), { range: unaryExpr.range, file: file }));
+                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(unaryExpr.tokens.operator.text, rightType.toString())), { range: (_a = unaryExpr.location) === null || _a === void 0 ? void 0 : _a.range, file: file }));
             }
         }
         else {
             // rhs is not a primitive, so no binary operator is allowed
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(unaryExpr.tokens.operator.text, rightType.toString())), { range: unaryExpr.range, file: file }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(unaryExpr.tokens.operator.text, rightType.toString())), { range: (_b = unaryExpr.location) === null || _b === void 0 ? void 0 : _b.range, file: file }));
         }
     }
     validateIncrementStatement(file, incStmt) {
+        var _a;
         const getTypeOpts = { flags: 1 /* SymbolTypeFlag.runtime */ };
         let rightType = this.getNodeTypeWrapper(file, incStmt.value, getTypeOpts);
         if (!rightType.isResolvable()) {
@@ -508,11 +516,11 @@ class ScopeValidator {
         }
         else {
             // rhs is not a number, so no increment operator is not allowed
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(incStmt.tokens.operator.text, rightType.toString())), { range: incStmt.range, file: file }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.operatorTypeMismatch(incStmt.tokens.operator.text, rightType.toString())), { range: (_a = incStmt.location) === null || _a === void 0 ? void 0 : _a.range, file: file }));
         }
     }
     validateVariableAndDottedGetExpressions(file, expression) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         if ((0, reflection_1.isDottedGetExpression)(expression.parent)) {
             // We validate dottedGetExpressions at the top-most level
             return;
@@ -528,7 +536,7 @@ class ScopeValidator {
         }
         let symbolType = 1 /* SymbolTypeFlag.runtime */;
         let oppositeSymbolType = 2 /* SymbolTypeFlag.typetime */;
-        const isUsedAsType = util_1.default.isInTypeExpression(expression);
+        const isUsedAsType = util_1.util.isInTypeExpression(expression);
         if (isUsedAsType) {
             // This is used in a TypeExpression - only look up types from SymbolTable
             symbolType = 2 /* SymbolTypeFlag.typetime */;
@@ -546,51 +554,51 @@ class ScopeValidator {
         const hasValidDeclaration = this.hasValidDeclaration(expression, exprType, typeData === null || typeData === void 0 ? void 0 : typeData.definingNode);
         //include a hint diagnostic if this type is marked as deprecated
         if (typeData.flags & 64 /* SymbolTypeFlag.deprecated */) { // eslint-disable-line no-bitwise
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemIsDeprecated()), { range: expression.tokens.name.range, file: file, tags: [vscode_languageserver_1.DiagnosticTag.Deprecated] }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemIsDeprecated()), { range: (_a = expression.tokens.name.location) === null || _a === void 0 ? void 0 : _a.range, file: file, tags: [vscode_languageserver_1.DiagnosticTag.Deprecated] }));
         }
         if (!this.isTypeKnown(exprType) && !hasValidDeclaration) {
-            if ((_a = this.getNodeTypeWrapper(file, expression, { flags: oppositeSymbolType, isExistenceTest: true })) === null || _a === void 0 ? void 0 : _a.isResolvable()) {
+            if ((_b = this.getNodeTypeWrapper(file, expression, { flags: oppositeSymbolType, isExistenceTest: true })) === null || _b === void 0 ? void 0 : _b.isResolvable()) {
                 const oppoSiteTypeChain = [];
                 const invalidlyUsedResolvedType = this.getNodeTypeWrapper(file, expression, { flags: oppositeSymbolType, typeChain: oppoSiteTypeChain, isExistenceTest: true });
-                const typeChainScan = util_1.default.processTypeChain(oppoSiteTypeChain);
+                const typeChainScan = util_1.util.processTypeChain(oppoSiteTypeChain);
                 if (isUsedAsType) {
-                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsType(typeChainScan.fullChainName)), { range: expression.range, file: file }));
+                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsType(typeChainScan.fullChainName)), { range: (_c = expression.location) === null || _c === void 0 ? void 0 : _c.range, file: file }));
                 }
                 else if (invalidlyUsedResolvedType && !(0, reflection_1.isReferenceType)(invalidlyUsedResolvedType)) {
                     if (!(0, reflection_1.isAliasStatement)(expression.parent)) {
                         // alias rhs CAN be a type!
-                        this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable(invalidlyUsedResolvedType.toString())), { range: expression.range, file: file }));
+                        this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable(invalidlyUsedResolvedType.toString())), { range: (_d = expression.location) === null || _d === void 0 ? void 0 : _d.range, file: file }));
                     }
                 }
                 else {
-                    const typeChainScan = util_1.default.processTypeChain(typeChain);
+                    const typeChainScan = util_1.util.processTypeChain(typeChain);
                     //if this is a function call, provide a different diganostic code
                     if ((0, reflection_1.isCallExpression)(typeChainScan.astNode.parent) && typeChainScan.astNode.parent.callee === expression) {
-                        this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindFunction(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: typeChainScan.range }));
+                        this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindFunction(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: (_e = typeChainScan === null || typeChainScan === void 0 ? void 0 : typeChainScan.location) === null || _e === void 0 ? void 0 : _e.range }));
                     }
                     else {
-                        this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: typeChainScan.range }));
+                        this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: (_f = typeChainScan === null || typeChainScan === void 0 ? void 0 : typeChainScan.location) === null || _f === void 0 ? void 0 : _f.range }));
                     }
                 }
             }
             else {
-                const typeChainScan = util_1.default.processTypeChain(typeChain);
+                const typeChainScan = util_1.util.processTypeChain(typeChain);
                 if ((0, reflection_1.isCallExpression)(typeChainScan.astNode.parent) && typeChainScan.astNode.parent.callee === expression) {
-                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindFunction(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: typeChainScan.range }));
+                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindFunction(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: (_g = typeChainScan === null || typeChainScan === void 0 ? void 0 : typeChainScan.location) === null || _g === void 0 ? void 0 : _g.range }));
                 }
                 else {
-                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: typeChainScan.range }));
+                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan))), { range: (_h = typeChainScan === null || typeChainScan === void 0 ? void 0 : typeChainScan.location) === null || _h === void 0 ? void 0 : _h.range }));
                 }
             }
         }
         if (isUsedAsType) {
             return;
         }
-        const containingNamespaceName = (_b = expression.findAncestor(reflection_1.isNamespaceStatement)) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript);
-        if (!((0, reflection_1.isCallExpression)(expression.parent) && (0, reflection_1.isNewExpression)((_c = expression.parent) === null || _c === void 0 ? void 0 : _c.parent))) {
+        const containingNamespaceName = (_j = expression.findAncestor(reflection_1.isNamespaceStatement)) === null || _j === void 0 ? void 0 : _j.getName(Parser_1.ParseMode.BrighterScript);
+        if (!((0, reflection_1.isCallExpression)(expression.parent) && (0, reflection_1.isNewExpression)((_k = expression.parent) === null || _k === void 0 ? void 0 : _k.parent))) {
             const classUsedAsVarEntry = this.checkTypeChainForClassUsedAsVar(typeChain, containingNamespaceName);
             if (classUsedAsVarEntry) {
-                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable(classUsedAsVarEntry.toString())), { range: expression.range, file: file }));
+                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable(classUsedAsVarEntry.toString())), { range: (_l = expression.location) === null || _l === void 0 ? void 0 : _l.range, file: file }));
                 return;
             }
         }
@@ -598,22 +606,22 @@ class ScopeValidator {
         const parentTypeInfo = typeChain[typeChain.length - 2];
         this.checkMemberAccessibility(file, expression, typeChain);
         if ((0, reflection_1.isNamespaceType)(exprType) && !(0, reflection_1.isAliasStatement)(expression.parent)) {
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')), { range: expression.range, file: file }));
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')), { range: (_m = expression.location) === null || _m === void 0 ? void 0 : _m.range, file: file }));
         }
         else if ((0, reflection_1.isEnumType)(exprType) && !(0, reflection_1.isAliasStatement)(expression.parent)) {
-            const enumStatement = this.event.scope.getEnum(util_1.default.getAllDottedGetPartsAsString(expression));
+            const enumStatement = this.event.scope.getEnum(util_1.util.getAllDottedGetPartsAsString(expression));
             if (enumStatement) {
                 // there's an enum with this name
-                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('enum')), { range: expression.range, file: file }));
+                this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('enum')), { range: (_o = expression.location) === null || _o === void 0 ? void 0 : _o.range, file: file }));
             }
         }
         else if ((0, reflection_1.isDynamicType)(exprType) && (0, reflection_1.isEnumType)(parentTypeInfo === null || parentTypeInfo === void 0 ? void 0 : parentTypeInfo.type) && (0, reflection_1.isDottedGetExpression)(expression)) {
-            const enumFileLink = this.event.scope.getEnumFileLink(util_1.default.getAllDottedGetPartsAsString(expression.obj));
-            const typeChainScanForParent = util_1.default.processTypeChain(typeChain.slice(0, -1));
+            const enumFileLink = this.event.scope.getEnumFileLink(util_1.util.getAllDottedGetPartsAsString(expression.obj));
+            const typeChainScanForParent = util_1.util.processTypeChain(typeChain.slice(0, -1));
             if (enumFileLink) {
-                this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownEnumValue(lastTypeInfo === null || lastTypeInfo === void 0 ? void 0 : lastTypeInfo.name, typeChainScanForParent.fullChainName)), { range: lastTypeInfo === null || lastTypeInfo === void 0 ? void 0 : lastTypeInfo.range, relatedInformation: [{
+                this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownEnumValue(lastTypeInfo === null || lastTypeInfo === void 0 ? void 0 : lastTypeInfo.name, typeChainScanForParent.fullChainName)), { range: (_p = lastTypeInfo === null || lastTypeInfo === void 0 ? void 0 : lastTypeInfo.location) === null || _p === void 0 ? void 0 : _p.range, relatedInformation: [{
                             message: 'Enum declared here',
-                            location: util_1.default.createLocation(vscode_uri_1.URI.file(enumFileLink === null || enumFileLink === void 0 ? void 0 : enumFileLink.file.srcPath).toString(), (_d = enumFileLink === null || enumFileLink === void 0 ? void 0 : enumFileLink.item) === null || _d === void 0 ? void 0 : _d.tokens.name.range)
+                            location: util_1.util.createLocationFromRange(vscode_uri_1.URI.file(enumFileLink === null || enumFileLink === void 0 ? void 0 : enumFileLink.file.srcPath).toString(), (_r = (_q = enumFileLink === null || enumFileLink === void 0 ? void 0 : enumFileLink.item) === null || _q === void 0 ? void 0 : _q.tokens.name.location) === null || _r === void 0 ? void 0 : _r.range)
                         }] }));
             }
         }
@@ -651,7 +659,7 @@ class ScopeValidator {
      * @returns true if member accesiibility is okay
      */
     checkMemberAccessibility(file, expression, typeChain) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         for (let i = 0; i < typeChain.length - 1; i++) {
             const parentChainItem = typeChain[i];
             const childChainItem = typeChain[i + 1];
@@ -664,7 +672,7 @@ class ScopeValidator {
                     // eslint-disable-next-line no-bitwise
                     if (childChainItem.data.flags & 8 /* SymbolTypeFlag.private */) {
                         if (!inMatchingClassStmt || childChainItem.data.memberOfAncestor) {
-                            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.memberAccessibilityMismatch(childChainItem.name, childChainItem.data.flags, definingClassName)), { range: expression.range, file: file }));
+                            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.memberAccessibilityMismatch(childChainItem.name, childChainItem.data.flags, definingClassName)), { range: (_c = expression.location) === null || _c === void 0 ? void 0 : _c.range, file: file }));
                             // there's an error... don't worry about the rest of the chain
                             return false;
                         }
@@ -672,11 +680,11 @@ class ScopeValidator {
                     // eslint-disable-next-line no-bitwise
                     if (childChainItem.data.flags & 16 /* SymbolTypeFlag.protected */) {
                         const containingClassName = containingClassStmt === null || containingClassStmt === void 0 ? void 0 : containingClassStmt.getName(Parser_1.ParseMode.BrighterScript);
-                        const containingNamespaceName = (_c = expression.findAncestor(reflection_1.isNamespaceStatement)) === null || _c === void 0 ? void 0 : _c.getName(Parser_1.ParseMode.BrighterScript);
+                        const containingNamespaceName = (_d = expression.findAncestor(reflection_1.isNamespaceStatement)) === null || _d === void 0 ? void 0 : _d.getName(Parser_1.ParseMode.BrighterScript);
                         const ancestorClasses = this.event.scope.getClassHierarchy(containingClassName, containingNamespaceName).map(link => link.item);
                         const isSubClassOfDefiningClass = ancestorClasses.includes(classStmtThatDefinesChildMember);
                         if (!isSubClassOfDefiningClass) {
-                            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.memberAccessibilityMismatch(childChainItem.name, childChainItem.data.flags, definingClassName)), { range: expression.range, file: file }));
+                            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.memberAccessibilityMismatch(childChainItem.name, childChainItem.data.flags, definingClassName)), { range: (_e = expression.location) === null || _e === void 0 ? void 0 : _e.range, file: file }));
                             // there's an error... don't worry about the rest of the chain
                             return false;
                         }
@@ -691,7 +699,7 @@ class ScopeValidator {
      * and make sure we can find a class with that name
      */
     validateNewExpression(file, newExpression) {
-        var _a;
+        var _a, _b;
         const newExprType = this.getNodeTypeWrapper(file, newExpression, { flags: 2 /* SymbolTypeFlag.typetime */ });
         if ((0, reflection_1.isClassType)(newExprType)) {
             return;
@@ -701,8 +709,8 @@ class ScopeValidator {
         let newableClass = this.event.scope.getClass(potentialClassName, namespaceName);
         if (!newableClass) {
             //try and find functions with this name.
-            let fullName = util_1.default.getFullyQualifiedClassName(potentialClassName, namespaceName);
-            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.expressionIsNotConstructable(fullName)), { file: file, range: newExpression.className.range }));
+            let fullName = util_1.util.getFullyQualifiedClassName(potentialClassName, namespaceName);
+            this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.expressionIsNotConstructable(fullName)), { file: file, range: (_b = newExpression.className.location) === null || _b === void 0 ? void 0 : _b.range }));
         }
     }
     /**
@@ -757,7 +765,7 @@ class ScopeValidator {
                         if (ownCallable.callable.nameRange !== callable.nameRange) {
                             related.push({
                                 message: `Function declared here`,
-                                location: util_1.default.createLocation(vscode_uri_1.URI.file((_a = ownCallable.callable.file) === null || _a === void 0 ? void 0 : _a.srcPath).toString(), thatNameRange)
+                                location: util_1.util.createLocationFromRange(vscode_uri_1.URI.file((_a = ownCallable.callable.file) === null || _a === void 0 ? void 0 : _a.srcPath).toString(), thatNameRange)
                             });
                         }
                     }
@@ -824,7 +832,7 @@ class ScopeValidator {
         }
     }
     detectShadowedLocalVar(file, varDeclaration) {
-        var _a;
+        var _a, _b;
         const varName = varDeclaration.name;
         const lowerVarName = varName.toLowerCase();
         const callableContainerMap = this.event.scope.getCallableContainerMap();
@@ -845,13 +853,13 @@ class ScopeValidator {
             if (varIsFunction()) {
                 this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarFunctionShadowsParentFunction('scope')), { range: varDeclaration.nameRange, file: file, relatedInformation: [{
                             message: 'Function declared here',
-                            location: util_1.default.createLocation(vscode_uri_1.URI.file(callable[0].callable.file.srcPath).toString(), callable[0].callable.nameRange)
+                            location: util_1.util.createLocationFromRange(vscode_uri_1.URI.file(callable[0].callable.file.srcPath).toString(), callable[0].callable.nameRange)
                         }] }));
             }
             else {
                 this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarShadowedByScopedFunction()), { range: varDeclaration.nameRange, file: file, relatedInformation: [{
                             message: 'Function declared here',
-                            location: util_1.default.createLocation(vscode_uri_1.URI.file(callable[0].callable.file.srcPath).toString(), callable[0].callable.nameRange)
+                            location: util_1.util.createLocationFromRange(vscode_uri_1.URI.file(callable[0].callable.file.srcPath).toString(), callable[0].callable.nameRange)
                         }] }));
             }
             //has the same name as an in-scope class
@@ -861,13 +869,13 @@ class ScopeValidator {
             if (classStmtLink) {
                 this.addMultiScopeDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.localVarSameNameAsClass((_a = classStmtLink === null || classStmtLink === void 0 ? void 0 : classStmtLink.item) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))), { range: varDeclaration.nameRange, file: file, relatedInformation: [{
                             message: 'Class declared here',
-                            location: util_1.default.createLocation(vscode_uri_1.URI.file(classStmtLink.file.srcPath).toString(), classStmtLink === null || classStmtLink === void 0 ? void 0 : classStmtLink.item.tokens.name.range)
+                            location: util_1.util.createLocationFromRange(vscode_uri_1.URI.file(classStmtLink.file.srcPath).toString(), (_b = classStmtLink === null || classStmtLink === void 0 ? void 0 : classStmtLink.item.tokens.name.location) === null || _b === void 0 ? void 0 : _b.range)
                         }] }));
             }
         }
     }
     detectVariableNamespaceCollisions(file) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, file: file, tag: "ScopeValidatorNamespaceCollisions" /* ScopeValidatorDiagnosticTag.NamespaceCollisions */ });
         //find all function parameters
         // eslint-disable-next-line @typescript-eslint/dot-notation
@@ -877,9 +885,9 @@ class ScopeValidator {
                 let namespace = this.event.scope.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.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.parameterMayNotHaveSameNameAsNamespace(param.tokens.name.text)), { range: param.tokens.name.range, relatedInformation: [{
+                    this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.parameterMayNotHaveSameNameAsNamespace(param.tokens.name.text)), { range: (_b = param.tokens.name.location) === null || _b === void 0 ? void 0 : _b.range, relatedInformation: [{
                                 message: 'Namespace declared here',
-                                location: util_1.default.createLocation(vscode_uri_1.URI.file(namespace.file.srcPath).toString(), namespace.nameRange)
+                                location: util_1.util.createLocationFromRange(vscode_uri_1.URI.file(namespace.file.srcPath).toString(), namespace.nameRange)
                             }] }), "ScopeValidatorNamespaceCollisions" /* ScopeValidatorDiagnosticTag.NamespaceCollisions */);
                 }
             }
@@ -887,18 +895,18 @@ class ScopeValidator {
         // eslint-disable-next-line @typescript-eslint/dot-notation
         for (let assignment of file['_cachedLookups'].assignmentStatements) {
             let lowerAssignmentName = assignment.tokens.name.text.toLowerCase();
-            let namespace = this.event.scope.getNamespace(lowerAssignmentName, (_b = assignment.findAncestor(reflection_1.isNamespaceStatement)) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript).toLowerCase());
+            let namespace = this.event.scope.getNamespace(lowerAssignmentName, (_c = assignment.findAncestor(reflection_1.isNamespaceStatement)) === null || _c === void 0 ? void 0 : _c.getName(Parser_1.ParseMode.BrighterScript).toLowerCase());
             //see if the param matches any starting namespace part
             if (namespace) {
-                this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.variableMayNotHaveSameNameAsNamespace(assignment.tokens.name.text)), { range: assignment.tokens.name.range, relatedInformation: [{
+                this.addMultiScopeDiagnostic(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.variableMayNotHaveSameNameAsNamespace(assignment.tokens.name.text)), { range: (_d = assignment.tokens.name.location) === null || _d === void 0 ? void 0 : _d.range, relatedInformation: [{
                             message: 'Namespace declared here',
-                            location: util_1.default.createLocation(vscode_uri_1.URI.file(namespace.file.srcPath).toString(), namespace.nameRange)
+                            location: util_1.util.createLocationFromRange(vscode_uri_1.URI.file(namespace.file.srcPath).toString(), namespace.nameRange)
                         }] }), "ScopeValidatorNamespaceCollisions" /* ScopeValidatorDiagnosticTag.NamespaceCollisions */);
             }
         }
     }
     validateXmlInterface(scope) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (!((_b = (_a = scope.xmlFile.parser.ast) === null || _a === void 0 ? void 0 : _a.componentElement) === null || _b === void 0 ? void 0 : _b.interfaceElement)) {
             return;
         }
@@ -909,29 +917,29 @@ class ScopeValidator {
         for (const func of iface.functions) {
             const name = func.name;
             if (!name) {
-                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(func.tokens.startTagName.text, 'name')), { range: func.tokens.startTagName.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
+                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(func.tokens.startTagName.text, 'name')), { range: (_c = func.tokens.startTagName.location) === null || _c === void 0 ? void 0 : _c.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
             }
             else if (!callableContainerMap.has(name.toLowerCase())) {
-                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(name)), { range: (_c = func.getAttribute('name')) === null || _c === void 0 ? void 0 : _c.tokens.value.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
+                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(name)), { range: (_e = (_d = func.getAttribute('name')) === null || _d === void 0 ? void 0 : _d.tokens.value.location) === null || _e === void 0 ? void 0 : _e.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
             }
         }
         //validate fields
         for (const field of iface.fields) {
             const { id, type, onChange } = field;
             if (!id) {
-                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(field.tokens.startTagName.text, 'id')), { range: field.tokens.startTagName.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
+                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(field.tokens.startTagName.text, 'id')), { range: (_f = field.tokens.startTagName.location) === null || _f === void 0 ? void 0 : _f.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
             }
             if (!type) {
                 if (!field.alias) {
-                    this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(field.tokens.startTagName.text, 'type')), { range: field.tokens.startTagName.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
+                    this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(field.tokens.startTagName.text, 'type')), { range: (_g = field.tokens.startTagName.location) === null || _g === void 0 ? void 0 : _g.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
                 }
             }
             else if (!SGTypes_1.SGFieldTypes.includes(type.toLowerCase())) {
-                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlInvalidFieldType(type)), { range: (_d = field.getAttribute('type')) === null || _d === void 0 ? void 0 : _d.tokens.value.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
+                this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlInvalidFieldType(type)), { range: (_j = (_h = field.getAttribute('type')) === null || _h === void 0 ? void 0 : _h.tokens.value.location) === null || _j === void 0 ? void 0 : _j.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
             }
             if (onChange) {
                 if (!callableContainerMap.has(onChange.toLowerCase())) {
-                    this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(onChange)), { range: (_e = field.getAttribute('onchange')) === null || _e === void 0 ? void 0 : _e.tokens.value.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
+                    this.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(onChange)), { range: (_l = (_k = field.getAttribute('onchange')) === null || _k === void 0 ? void 0 : _k.tokens.value.location) === null || _l === void 0 ? void 0 : _l.range, file: scope.xmlFile }), "ScopeValidatorXML" /* ScopeValidatorDiagnosticTag.XMLInterface */);
                 }
             }
         }