@microsoft/powerquery-language-services 0.3.38 → 0.5.0

package/lib/powerquery-language-services/validate/validate.d.ts

@@ -1,5 +1,5 @@
 import { TextDocument } from "vscode-languageserver-textdocument";
-import { TypeCache } from "../inspection";
+import { AnalysisSettings } from "../analysis";
 import type { ValidationResult } from "./validationResult";
 import type { ValidationSettings } from "./validationSettings";
-export declare function validate(textDocument: TextDocument, validationSettings: ValidationSettings, typeCache?: TypeCache): Promise<ValidationResult>;
+export declare function validate(textDocument: TextDocument, analysisSettings: AnalysisSettings, validationSettings: ValidationSettings): Promise<ValidationResult>;

package/lib/powerquery-language-services/validate/validate.js

@@ -12,20 +12,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = void 0;
-const PQP = require("@microsoft/powerquery-parser");
-const inspection_1 = require("../inspection");
+const analysis_1 = require("../analysis");
 const validateDuplicateIdentifiers_1 = require("./validateDuplicateIdentifiers");
 const validateFunctionExpression_1 = require("./validateFunctionExpression");
 const validateInvokeExpression_1 = require("./validateInvokeExpression");
-const validateLexAndParse_1 = require("./validateLexAndParse");
+const validateParse_1 = require("./validateParse");
 const validateUnknownIdentifiers_1 = require("./validateUnknownIdentifiers");
-const workspaceCache_1 = require("../workspaceCache");
-function validate(textDocument, validationSettings, typeCache = inspection_1.TypeCacheUtils.createEmptyCache()) {
+function validate(textDocument, analysisSettings, validationSettings) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validate.name, validationSettings.maybeInitialCorrelationId);
-        const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
-        const maybeTriedParse = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings, updatedSettings.isWorkspaceCacheAllowed);
-        if (maybeTriedParse === undefined) {
+        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validate.name, validationSettings.initialCorrelationId);
+        const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
+        const analysis = analysis_1.AnalysisUtils.createAnalysis(textDocument, analysisSettings);
+        const parseState = yield analysis.getParseState();
+        const parseError = yield analysis.getParseError();
+        if (parseState === undefined) {
             trace.exit();
             return {
                 diagnostics: [],
@@ -35,32 +35,31 @@ function validate(textDocument, validationSettings, typeCache = inspection_1.Typ
         let functionExpressionDiagnostics;
         let invokeExpressionDiagnostics;
         let unknownIdentifiersDiagnostics;
-        const maybeNodeIdMapCollection = PQP.TaskUtils.isParseStageOk(maybeTriedParse) || PQP.TaskUtils.isParseStageParseError(maybeTriedParse)
-            ? maybeTriedParse.nodeIdMapCollection
-            : undefined;
-        if (validationSettings.checkInvokeExpressions && maybeNodeIdMapCollection) {
-            functionExpressionDiagnostics = (0, validateFunctionExpression_1.validateFunctionExpression)(validationSettings, maybeNodeIdMapCollection);
-            invokeExpressionDiagnostics = yield (0, validateInvokeExpression_1.validateInvokeExpression)(validationSettings, maybeNodeIdMapCollection, workspaceCache_1.WorkspaceCacheUtils.getTypeCache(textDocument, validationSettings.isWorkspaceCacheAllowed));
+        const nodeIdMapCollection = parseState.contextState.nodeIdMapCollection;
+        const typeCache = analysis.getTypeCache();
+        if (validationSettings.checkInvokeExpressions && nodeIdMapCollection) {
+            functionExpressionDiagnostics = (0, validateFunctionExpression_1.validateFunctionExpression)(validationSettings, nodeIdMapCollection);
+            invokeExpressionDiagnostics = yield (0, validateInvokeExpression_1.validateInvokeExpression)(validationSettings, nodeIdMapCollection, typeCache);
         }
         else {
             functionExpressionDiagnostics = [];
             invokeExpressionDiagnostics = [];
         }
-        if (validationSettings.checkUnknownIdentifiers && maybeNodeIdMapCollection) {
-            unknownIdentifiersDiagnostics = yield (0, validateUnknownIdentifiers_1.validateUnknownIdentifiers)(validationSettings, maybeNodeIdMapCollection, typeCache);
+        if (validationSettings.checkUnknownIdentifiers && nodeIdMapCollection) {
+            unknownIdentifiersDiagnostics = yield (0, validateUnknownIdentifiers_1.validateUnknownIdentifiers)(validationSettings, nodeIdMapCollection, typeCache);
         }
         else {
             unknownIdentifiersDiagnostics = [];
         }
         const result = {
             diagnostics: [
-                ...(yield (0, validateDuplicateIdentifiers_1.validateDuplicateIdentifiers)(textDocument, updatedSettings)),
-                ...(yield (0, validateLexAndParse_1.validateLexAndParse)(textDocument, updatedSettings)),
+                ...(0, validateDuplicateIdentifiers_1.validateDuplicateIdentifiers)(textDocument, nodeIdMapCollection, updatedSettings),
+                ...(yield (0, validateParse_1.validateParse)(parseError, updatedSettings)),
                 ...functionExpressionDiagnostics,
                 ...invokeExpressionDiagnostics,
                 ...unknownIdentifiersDiagnostics,
             ],
-            hasSyntaxError: PQP.TaskUtils.isLexStageError(maybeTriedParse) || PQP.TaskUtils.isParseStageError(maybeTriedParse),
+            hasSyntaxError: Boolean(yield analysis.getParseError()),
         };
         trace.exit();
         return result;

package/lib/powerquery-language-services/validate/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAMpD,8CAA0D;AAC1D,iFAA8E;AAC9E,6EAA0E;AAC1E,yEAAsE;AACtE,+DAA4D;AAC5D,6EAA0E;AAI1E,sDAAwD;AAExD,SAAsB,QAAQ,CAC1B,YAA0B,EAC1B,kBAAsC,EACtC,YAAuB,2BAAc,CAAC,gBAAgB,EAAE;;QAExD,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,QAAQ,CAAC,IAAI,EACb,kBAAkB,CAAC,yBAAyB,CAC/C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,eAAe,GAAwC,MAAM,oCAAmB,CAAC,uBAAuB,CAC1G,YAAY,EACZ,eAAe,EACf,eAAe,CAAC,uBAAuB,CAC1C,CAAC;QAEF,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO;gBACH,WAAW,EAAE,EAAE;gBACf,cAAc,EAAE,KAAK;aACxB,CAAC;SACL;QAED,IAAI,6BAA2C,CAAC;QAChD,IAAI,2BAAyC,CAAC;QAC9C,IAAI,6BAA2C,CAAC;QAEhD,MAAM,wBAAwB,GAC1B,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,eAAe,CAAC;YAClG,CAAC,CAAC,eAAe,CAAC,mBAAmB;YACrC,CAAC,CAAC,SAAS,CAAC;QAEpB,IAAI,kBAAkB,CAAC,sBAAsB,IAAI,wBAAwB,EAAE;YACvE,6BAA6B,GAAG,IAAA,uDAA0B,EAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC;YAEzG,2BAA2B,GAAG,MAAM,IAAA,mDAAwB,EACxD,kBAAkB,EAClB,wBAAwB,EACxB,oCAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,kBAAkB,CAAC,uBAAuB,CAAC,CAC7F,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;YACnC,2BAA2B,GAAG,EAAE,CAAC;SACpC;QAED,IAAI,kBAAkB,CAAC,uBAAuB,IAAI,wBAAwB,EAAE;YACxE,6BAA6B,GAAG,MAAM,IAAA,uDAA0B,EAC5D,kBAAkB,EAClB,wBAAwB,EACxB,SAAS,CACZ,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;SACtC;QAED,MAAM,MAAM,GAAqB;YAC7B,WAAW,EAAE;gBACT,GAAG,CAAC,MAAM,IAAA,2DAA4B,EAAC,YAAY,EAAE,eAAe,CAAC,CAAC;gBACtE,GAAG,CAAC,MAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,eAAe,CAAC,CAAC;gBAC7D,GAAG,6BAA6B;gBAChC,GAAG,2BAA2B;gBAC9B,GAAG,6BAA6B;aACnC;YACD,cAAc,EACV,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,eAAe,CAAC;SACzG,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AA9ED,4BA8EC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAOlC,0CAAwE;AAExE,iFAA8E;AAC9E,6EAA0E;AAC1E,yEAAsE;AACtE,mDAAgD;AAChD,6EAA0E;AAK1E,SAAsB,QAAQ,CAC1B,YAA0B,EAC1B,gBAAkC,EAClC,kBAAsC;;QAEtC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,QAAQ,CAAC,IAAI,EACb,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,QAAQ,GAAa,wBAAa,CAAC,cAAc,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QACxF,MAAM,UAAU,GAA2B,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC1E,MAAM,UAAU,GAAsC,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;QAErF,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO;gBACH,WAAW,EAAE,EAAE;gBACf,cAAc,EAAE,KAAK;aACxB,CAAC;SACL;QAED,IAAI,6BAA2C,CAAC;QAChD,IAAI,2BAAyC,CAAC;QAC9C,IAAI,6BAA2C,CAAC;QAEhD,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAC9F,MAAM,SAAS,GAAc,QAAQ,CAAC,YAAY,EAAE,CAAC;QAErD,IAAI,kBAAkB,CAAC,sBAAsB,IAAI,mBAAmB,EAAE;YAClE,6BAA6B,GAAG,IAAA,uDAA0B,EAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;YAEpG,2BAA2B,GAAG,MAAM,IAAA,mDAAwB,EACxD,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,CACZ,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;YACnC,2BAA2B,GAAG,EAAE,CAAC;SACpC;QAED,IAAI,kBAAkB,CAAC,uBAAuB,IAAI,mBAAmB,EAAE;YACnE,6BAA6B,GAAG,MAAM,IAAA,uDAA0B,EAC5D,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,CACZ,CAAC;SACL;aAAM;YACH,6BAA6B,GAAG,EAAE,CAAC;SACtC;QAED,MAAM,MAAM,GAAqB;YAC7B,WAAW,EAAE;gBACT,GAAG,IAAA,2DAA4B,EAAC,YAAY,EAAE,mBAAmB,EAAE,eAAe,CAAC;gBACnF,GAAG,CAAC,MAAM,IAAA,6BAAa,EAAC,UAAU,EAAE,eAAe,CAAC,CAAC;gBACrD,GAAG,6BAA6B;gBAChC,GAAG,2BAA2B;gBAC9B,GAAG,6BAA6B;aACnC;YACD,cAAc,EAAE,OAAO,CAAC,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;SAC1D,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAzED,4BAyEC"}

package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.d.ts

@@ -1,4 +1,5 @@
 import { Diagnostic } from "vscode-languageserver-types";
+import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { ValidationSettings } from "./validationSettings";
-export declare function validateDuplicateIdentifiers(textDocument: TextDocument, validationSettings: ValidationSettings): Promise<ReadonlyArray<Diagnostic>>;
+export declare function validateDuplicateIdentifiers(textDocument: TextDocument, nodeIdMapCollection: NodeIdMap.Collection, validationSettings: ValidationSettings): ReadonlyArray<Diagnostic>;

package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js

@@ -1,15 +1,6 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDuplicateIdentifiers = void 0;
 const PQP = require("@microsoft/powerquery-parser");
@@ -18,43 +9,22 @@ const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/par
 const localization_1 = require("../localization");
 const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 const __1 = require("..");
-const workspaceCache_1 = require("../workspaceCache");
-function validateDuplicateIdentifiers(textDocument, validationSettings) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiers.name, validationSettings.maybeInitialCorrelationId);
-        const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
-        if (!updatedSettings.checkForDuplicateIdentifiers) {
-            trace.exit();
-            return [];
-        }
-        const maybeParsePromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, updatedSettings, updatedSettings.isWorkspaceCacheAllowed);
-        if (maybeParsePromise === undefined) {
-            trace.exit();
-            return [];
-        }
-        const triedParse = maybeParsePromise;
-        let maybeNodeIdMapCollection;
-        if (PQP.TaskUtils.isParseStageOk(triedParse)) {
-            maybeNodeIdMapCollection = triedParse.nodeIdMapCollection;
-        }
-        else if (PQP.TaskUtils.isParseStageParseError(triedParse)) {
-            maybeNodeIdMapCollection = triedParse.nodeIdMapCollection;
-        }
-        if (maybeNodeIdMapCollection === undefined) {
-            trace.exit();
-            return [];
-        }
-        const documentUri = textDocument.uri;
-        const nodeIdMapCollection = maybeNodeIdMapCollection;
-        const result = [
-            ...validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
-            ...validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
-            ...validateDuplicateIdentifiersForRecordType(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
-            ...validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
-        ];
+function validateDuplicateIdentifiers(textDocument, nodeIdMapCollection, validationSettings) {
+    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiers.name, validationSettings.initialCorrelationId);
+    const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
+    if (!updatedSettings.checkForDuplicateIdentifiers) {
         trace.exit();
-        return result;
-    });
+        return [];
+    }
+    const documentUri = textDocument.uri;
+    const result = [
+        ...validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
+        ...validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
+        ...validateDuplicateIdentifiersForRecordType(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
+        ...validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, updatedSettings, trace.id),
+    ];
+    trace.exit();
+    return result;
 }
 exports.validateDuplicateIdentifiers = validateDuplicateIdentifiers;
 function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings, correlationId) {
@@ -96,9 +66,9 @@ function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection
 }
 // Generalized logic for iterating over some collection and their children, essentially by doing:
 //  for node in nodeIds:
-//      for childOfNode in iterNodeFn(node):
+//      for childOfNode in iterNodeFactory(node):
 //          ...
-function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIdCollections, iterNodeFn, validationSettings, correlationId) {
+function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIdCollections, iterNodeFactory, validationSettings, correlationId) {
     const numIds = nodeIdCollections.reduce((partial, set) => partial + set.size, 0);
     const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateDuplicateIdentifiersForKeyValuePair.name, correlationId, { numIds });
     if (!numIds) {
@@ -110,15 +80,15 @@ function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapColle
             const node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
             const duplicateFieldsByKey = new Map();
             const knownFieldByKey = new Map();
-            for (const field of iterNodeFn(nodeIdMapCollection, node)) {
+            for (const field of iterNodeFactory(nodeIdMapCollection, node)) {
                 const keyLiteral = field.normalizedKeyLiteral;
-                const maybeDuplicateFields = duplicateFieldsByKey.get(keyLiteral);
-                const maybeKnownField = knownFieldByKey.get(keyLiteral);
-                if (maybeDuplicateFields) {
-                    maybeDuplicateFields.push(field);
+                const duplicateFields = duplicateFieldsByKey.get(keyLiteral);
+                const knownFeld = knownFieldByKey.get(keyLiteral);
+                if (duplicateFields) {
+                    duplicateFields.push(field);
                 }
-                else if (maybeKnownField) {
-                    duplicateFieldsByKey.set(keyLiteral, [field, maybeKnownField]);
+                else if (knownFeld) {
+                    duplicateFieldsByKey.set(keyLiteral, [field, knownFeld]);
                 }
                 else {
                     knownFieldByKey.set(keyLiteral, field);

package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validateFunctionExpression.js

@@ -11,17 +11,17 @@ const __1 = require("..");
 // Check for repeat parameter names for FunctionExpressions.
 function validateFunctionExpression(validationSettings, nodeIdMapCollection) {
     var _a;
-    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateFunctionExpression.name, validationSettings.maybeInitialCorrelationId);
-    const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
-    const maybeFnExpressionIds = nodeIdMapCollection.idsByNodeKind.get("FunctionExpression" /* FunctionExpression */);
-    if (maybeFnExpressionIds === undefined) {
+    const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateFunctionExpression.name, validationSettings.initialCorrelationId);
+    const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
+    const fnExpressionIds = nodeIdMapCollection.idsByNodeKind.get("FunctionExpression" /* FunctionExpression */);
+    if (fnExpressionIds === undefined) {
         trace.exit();
         return [];
     }
     const diagnostics = [];
-    for (const nodeId of maybeFnExpressionIds) {
+    for (const nodeId of fnExpressionIds) {
         diagnostics.push(validateNoDuplicateParameter(updatedSettings, nodeIdMapCollection, nodeId));
-        (_a = updatedSettings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        (_a = updatedSettings.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
     }
     trace.exit();
     return diagnostics.flat();

package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateFunctionExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,6EAA6E;AAC7E,sFAKmE;AAKnE,kDAAkE;AAClE,gEAA6D;AAE7D,0BAAmC;AAInC,4DAA4D;AAC5D,SAAgB,0BAA0B,CACtC,kBAAsC,EACtC,mBAAyC;;IAEzC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,CAAC,yBAAyB,CAC/C,CAAC;IAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;IAEF,MAAM,oBAAoB,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG,+CAE1F,CAAC;IAEF,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACpC,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAAmB,EAAE,CAAC;IAEvC,KAAK,MAAM,MAAM,IAAI,oBAAoB,EAAE;QACvC,WAAW,CAAC,IAAI,CAAC,4BAA4B,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7F,MAAA,eAAe,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;KAC9D;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC;AAnCD,gEAmCC;AAED,SAAS,4BAA4B,CACjC,kBAAsC,EACtC,mBAAyC,EACzC,cAAsB;;IAEtB,MAAM,YAAY,GAAa,uBAAc,CAAC,mBAAmB,CAC7D,mBAAmB,EACnB,cAAc,gDAEjB,CAAC;IAEF,MAAM,cAAc,GAAkC,IAAI,GAAG,EAAE,CAAC;IAEhE,KAAK,MAAM,SAAS,IAAI,0BAAiB,CAAC,oCAAoC,CAAC,mBAAmB,EAAE,YAAY,CAAC,EAAE;QAC/G,MAAM,aAAa,GAAqB,MAAA,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC;QACpF,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;KACxD;IAED,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,KAAK,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,IAAI,cAAc,EAAE;QACrD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,WAAW,CAAC,IAAI,CACZ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,UAA0B,EAAE,EAAE;gBACxC,MAAM,cAAc,GAAU,iBAAa,CAAC,yBAAyB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAE7F,OAAO,yCAAyC,CAC5C,kBAAkB,EAClB,cAAc,EACd,iBAAiB,CACpB,CAAC;YACN,CAAC,CAAC,CACL,CAAC;SACL;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,yCAAyC,CAC9C,kBAAsC,EACtC,qBAA4B,EAC5B,aAAqB;IAErB,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,mBAAmB;QAC7C,OAAO,EAAE,2BAAY,CAAC,qCAAqC,CAAC,SAAS,EAAE,aAAa,CAAC;QACrF,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC"}
+{"version":3,"file":"validateFunctionExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,6EAA6E;AAC7E,sFAKmE;AAKnE,kDAAkE;AAClE,gEAA6D;AAE7D,0BAAmC;AAInC,4DAA4D;AAC5D,SAAgB,0BAA0B,CACtC,kBAAsC,EACtC,mBAAyC;;IAEzC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,CAAC,oBAAoB,CAC1C,CAAC;IAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;IAEF,MAAM,eAAe,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG,+CAErF,CAAC;IAEF,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,EAAE,CAAC;KACb;IAED,MAAM,WAAW,GAAmB,EAAE,CAAC;IAEvC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QAClC,WAAW,CAAC,IAAI,CAAC,4BAA4B,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7F,MAAA,eAAe,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;KACzD;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC;AAnCD,gEAmCC;AAED,SAAS,4BAA4B,CACjC,kBAAsC,EACtC,mBAAyC,EACzC,cAAsB;;IAEtB,MAAM,YAAY,GAAa,uBAAc,CAAC,mBAAmB,CAC7D,mBAAmB,EACnB,cAAc,gDAEjB,CAAC;IAEF,MAAM,cAAc,GAAkC,IAAI,GAAG,EAAE,CAAC;IAEhE,KAAK,MAAM,SAAS,IAAI,0BAAiB,CAAC,oCAAoC,CAAC,mBAAmB,EAAE,YAAY,CAAC,EAAE;QAC/G,MAAM,aAAa,GAAqB,MAAA,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC;QACpF,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;KACxD;IAED,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,KAAK,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,IAAI,cAAc,EAAE;QACrD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,WAAW,CAAC,IAAI,CACZ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,UAA0B,EAAE,EAAE;gBACxC,MAAM,cAAc,GAAU,iBAAa,CAAC,yBAAyB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;gBAE7F,OAAO,yCAAyC,CAC5C,kBAAkB,EAClB,cAAc,EACd,iBAAiB,CACpB,CAAC;YACN,CAAC,CAAC,CACL,CAAC;SACL;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,yCAAyC,CAC9C,kBAAsC,EACtC,qBAA4B,EAC5B,aAAqB;IAErB,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,mBAAmB;QAC7C,OAAO,EAAE,2BAAY,CAAC,qCAAqC,CAAC,SAAS,EAAE,aAAa,CAAC;QACrF,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC"}

package/lib/powerquery-language-services/validate/validateInvokeExpression.d.ts

@@ -2,4 +2,4 @@ import { Diagnostic } from "vscode-languageserver-types";
 import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { Inspection } from "..";
 import { ValidationSettings } from "./validationSettings";
-export declare function validateInvokeExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Promise<Diagnostic[]>;
+export declare function validateInvokeExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, typeCache?: Inspection.TypeCache): Promise<Diagnostic[]>;

package/lib/powerquery-language-services/validate/validateInvokeExpression.js

@@ -19,18 +19,18 @@ const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/par
 const __1 = require("..");
 const localization_1 = require("../localization");
 const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
-function validateInvokeExpression(validationSettings, nodeIdMapCollection, maybeCache) {
+function validateInvokeExpression(validationSettings, nodeIdMapCollection, typeCache) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateInvokeExpression.name, validationSettings.maybeInitialCorrelationId);
-        const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
-        const maybeInvokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("InvokeExpression" /* InvokeExpression */);
-        if (maybeInvokeExpressionIds === undefined) {
+        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateInvokeExpression.name, validationSettings.initialCorrelationId);
+        const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
+        const invokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("InvokeExpression" /* InvokeExpression */);
+        if (invokeExpressionIds === undefined) {
             trace.exit();
             return [];
         }
         const inspectionTasks = [];
-        for (const nodeId of maybeInvokeExpressionIds) {
-            inspectionTasks.push(__1.Inspection.tryInvokeExpression(updatedSettings, nodeIdMapCollection, nodeId, maybeCache));
+        for (const nodeId of invokeExpressionIds) {
+            inspectionTasks.push(__1.Inspection.tryInvokeExpression(updatedSettings, nodeIdMapCollection, nodeId, typeCache));
         }
         const inspections = yield Promise.all(inspectionTasks);
         const diagnosticTasks = [];
@@ -52,15 +52,15 @@ exports.validateInvokeExpression = validateInvokeExpression;
 function invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, inspected) {
     return __awaiter(this, void 0, void 0, function* () {
         const result = [];
-        if (inspected.maybeArguments !== undefined) {
-            const invokeExpressionArguments = inspected.maybeArguments;
-            const givenArguments = inspected.maybeArguments.givenArguments;
+        if (inspected.arguments !== undefined) {
+            const invokeExpressionArguments = inspected.arguments;
+            const givenArguments = inspected.arguments.givenArguments;
             const invokeExpressionRange = powerquery_parser_1.Assert.asDefined(yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
-            const maybeFunctionName = parser_1.NodeIdMapUtils.maybeInvokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
+            const functionName = parser_1.NodeIdMapUtils.invokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
             for (const [argIndex, mismatch] of invokeExpressionArguments.typeChecked.invalid.entries()) {
                 // eslint-disable-next-line no-await-in-loop
-                const maybeGivenArgumentRange = yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
-                result.push(createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange));
+                const givenArgRange = yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
+                result.push(createDiagnosticForArgumentMismatch(validationSettings, mismatch, functionName, invokeExpressionRange, givenArgRange));
             }
             const numGivenArguments = invokeExpressionArguments.givenArguments.length;
             if (numGivenArguments < invokeExpressionArguments.numMinExpectedArguments ||
@@ -81,22 +81,22 @@ function createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExp
         source: validationSettings.source,
     };
 }
-function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange) {
+function createDiagnosticForArgumentMismatch(validationSettings, mismatch, functionName, invokeExpressionRange, givenArgRange) {
     var _a;
     let range;
     let message;
     const parameter = mismatch.expected;
     const argName = parameter.nameLiteral;
-    const expected = language_1.TypeUtils.nameOfTypeKind((_a = parameter.maybeType) !== null && _a !== void 0 ? _a : language_1.Type.AnyInstance.kind);
+    const expected = language_1.TypeUtils.nameOfTypeKind((_a = parameter.type) !== null && _a !== void 0 ? _a : language_1.Type.AnyInstance.kind);
     // An argument containing at least one leaf node was given.
-    if (maybeGivenArgumentRange) {
+    if (givenArgRange) {
         const actual = language_1.TypeUtils.nameOfTypeKind(powerquery_parser_1.Assert.asDefined(mismatch.actual).kind);
-        range = maybeGivenArgumentRange;
-        message = createTypeMismatchMessage(validationSettings.locale, maybeFunctionName, argName, expected, actual);
+        range = givenArgRange;
+        message = createTypeMismatchMessage(validationSettings.locale, functionName, argName, expected, actual);
     }
     else {
         range = invokeExpressionRange;
-        message = createMissingMandatoryMessage(validationSettings.locale, maybeFunctionName, argName);
+        message = createMissingMandatoryMessage(validationSettings.locale, functionName, argName);
     }
     return {
         code: diagnosticErrorCode_1.DiagnosticErrorCode.InvokeArgumentTypeMismatch,
@@ -106,12 +106,12 @@ function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybe
         source: validationSettings.source,
     };
 }
-function createMissingMandatoryMessage(locale, maybeFunctionName, argName) {
+function createMissingMandatoryMessage(locale, functionName, argName) {
     const templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
-    return localization_1.Localization.error_validation_invokeExpression_missingMandatory(templates, maybeFunctionName, argName);
+    return localization_1.Localization.error_validation_invokeExpression_missingMandatory(templates, functionName, argName);
 }
-function createTypeMismatchMessage(locale, maybeFunctionName, argName, expected, actual) {
+function createTypeMismatchMessage(locale, functionName, argName, expected, actual) {
     const templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
-    return localization_1.Localization.error_validation_invokeExpression_typeMismatch(templates, maybeFunctionName, argName, expected, actual);
+    return localization_1.Localization.error_validation_invokeExpression_typeMismatch(templates, functionName, argName, expected, actual);
 }
 //# sourceMappingURL=validateInvokeExpression.js.map

package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oEAAmE;AACnE,0FAAmG;AACnG,6EAA6E;AAC7E,sFAAgH;AAIhH,0BAA+C;AAC/C,kDAAkE;AAClE,gEAA6D;AAK7D,SAAsB,wBAAwB,CAC1C,kBAAsC,EACtC,mBAAyC,EACzC,UAAiC;;QAEjC,MAAM,KAAK,GAAU,kBAAkB,CAAC,YAAY,CAAC,KAAK,gCAEtD,wBAAwB,CAAC,IAAI,EAC7B,kBAAkB,CAAC,yBAAyB,CAC/C,CAAC;QAEF,MAAM,eAAe,mCACd,kBAAkB,KACrB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,wBAAwB,GAA4B,mBAAmB,CAAC,aAAa,CAAC,GAAG,2CAE9F,CAAC;QAEF,IAAI,wBAAwB,KAAK,SAAS,EAAE;YACxC,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,EAAE,CAAC;SACb;QAED,MAAM,eAAe,GAAgD,EAAE,CAAC;QAExE,KAAK,MAAM,MAAM,IAAI,wBAAwB,EAAE;YAC3C,eAAe,CAAC,IAAI,CAAC,cAAU,CAAC,mBAAmB,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;SAClH;QAED,MAAM,WAAW,GAAoD,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAExG,MAAM,eAAe,GAAyC,EAAE,CAAC;QAEjE,KAAK,MAAM,qBAAqB,IAAI,WAAW,EAAE;YAC7C,IAAI,+BAAW,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE;gBACzC,eAAe,CAAC,IAAI,CAChB,6BAA6B,CAAC,eAAe,EAAE,mBAAmB,EAAE,qBAAqB,CAAC,KAAK,CAAC,CACnG,CAAC;aACL;iBAAM;gBACH,KAAK,CAAC,IAAI,CAAC,EAAE,+BAA0B,EAAE,IAAI,EAAE,CAAC,CAAC;gBAEjD,MAAM,qBAAqB,CAAC;aAC/B;SACJ;QAED,MAAM,WAAW,GAA6C,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACjG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;CAAA;AApDD,4DAoDC;AAED,SAAe,6BAA6B,CACxC,kBAAsC,EACtC,mBAAyC,EACzC,SAAsC;;QAEtC,MAAM,MAAM,GAAiB,EAAE,CAAC;QAEhC,IAAI,SAAS,CAAC,cAAc,KAAK,SAAS,EAAE;YACxC,MAAM,yBAAyB,GAAyC,SAAS,CAAC,cAAc,CAAC;YACjG,MAAM,cAAc,GAA4B,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC;YAExF,MAAM,qBAAqB,GAAU,0BAAM,CAAC,SAAS,CACjD,MAAM,iBAAa,CAAC,sBAAsB,CAAC,mBAAmB,EAAE,SAAS,CAAC,uBAAuB,CAAC,EAClG,wDAAwD,CAC3D,CAAC;YAEF,MAAM,iBAAiB,GAAuB,uBAAc,CAAC,sCAAsC,CAC/F,mBAAmB,EACnB,SAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAC5C,CAAC;YAEF,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,yBAAyB,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBACxF,4CAA4C;gBAC5C,MAAM,uBAAuB,GAAsB,MAAM,iBAAa,CAAC,sBAAsB,CACzF,mBAAmB,EACnB,cAAc,CAAC,QAAQ,CAAC,CAC3B,CAAC;gBAEF,MAAM,CAAC,IAAI,CACP,mCAAmC,CAC/B,kBAAkB,EAClB,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,CAC1B,CACJ,CAAC;aACL;YAED,MAAM,iBAAiB,GAAW,yBAAyB,CAAC,cAAc,CAAC,MAAM,CAAC;YAElF,IACI,iBAAiB,GAAG,yBAAyB,CAAC,uBAAuB;gBACrE,iBAAiB,GAAG,yBAAyB,CAAC,uBAAuB,EACvE;gBACE,MAAM,CAAC,IAAI,CACP,yCAAyC,CACrC,kBAAkB,EAClB,qBAAqB,EACrB,yBAAyB,CAAC,uBAAuB,EACjD,yBAAyB,CAAC,uBAAuB,EACjD,iBAAiB,CACpB,CACJ,CAAC;aACL;SACJ;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAED,SAAS,yCAAyC,CAC9C,kBAAsC,EACtC,qBAA4B,EAC5B,MAAc,EACd,MAAc,EACd,QAAgB;IAEhB,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEhH,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,2BAA2B;QACrD,OAAO,EAAE,2BAAY,CAAC,yCAAyC,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;QACpG,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC;AAED,SAAS,mCAAmC,CACxC,kBAAsC,EACtC,QAAsC,EACtC,iBAAqC,EACrC,qBAA4B,EAC5B,uBAA0C;;IAE1C,IAAI,KAAY,CAAC;IACjB,IAAI,OAAe,CAAC;IAEpB,MAAM,SAAS,GAA2B,QAAQ,CAAC,QAAQ,CAAC;IAC5D,MAAM,OAAO,GAAW,SAAS,CAAC,WAAW,CAAC;IAC9C,MAAM,QAAQ,GAAW,oBAAS,CAAC,cAAc,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,eAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEhG,2DAA2D;IAC3D,IAAI,uBAAuB,EAAE;QACzB,MAAM,MAAM,GAAW,oBAAS,CAAC,cAAc,CAAC,0BAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QAExF,KAAK,GAAG,uBAAuB,CAAC;QAChC,OAAO,GAAG,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;KAChH;SAAM;QACH,KAAK,GAAG,qBAAqB,CAAC;QAC9B,OAAO,GAAG,6BAA6B,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;KAClG;IAED,OAAO;QACH,IAAI,EAAE,yCAAmB,CAAC,0BAA0B;QACpD,OAAO;QACP,KAAK;QACL,QAAQ,EAAE,gDAAkB,CAAC,KAAK;QAClC,MAAM,EAAE,kBAAkB,CAAC,MAAM;KACpC,CAAC;AACN,CAAC;AAED,SAAS,6BAA6B,CAAC,MAAc,EAAE,iBAAqC,EAAE,OAAe;IACzG,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAE7F,OAAO,2BAAY,CAAC,kDAAkD,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;AAClH,CAAC;AAED,SAAS,yBAAyB,CAC9B,MAAc,EACd,iBAAqC,EACrC,OAAe,EACf,QAAgB,EAChB,MAAc;IAEd,MAAM,SAAS,GAA2B,gCAAiB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAE7F,OAAO,2BAAY,CAAC,8CAA8C,CAC9D,SAAS,EACT,iBAAiB,EACjB,OAAO,EACP,QAAQ,EACR,MAAM,CACT,CAAC;AACN,CAAC"}
+{"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validateParse.d.ts

@@ -0,0 +1,4 @@
+import { Diagnostic } from "vscode-languageserver-types";
+import { ParseError } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
+import { ValidationSettings } from "./validationSettings";
+export declare function validateParse(parseError: ParseError.ParseError | undefined, validationSettings: ValidationSettings): Promise<Diagnostic[]>;

package/lib/powerquery-language-services/validate/validateParse.js

@@ -0,0 +1,74 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateParse = void 0;
+const PQP = require("@microsoft/powerquery-parser");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+function validateParse(parseError, validationSettings) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (parseError === undefined || !parser_1.ParseError.isParseError(parseError)) {
+            return [];
+        }
+        const innerError = parseError.innerError;
+        const errorToken = PQP.Parser.ParseError.tokenFrom(innerError);
+        const message = parseError.message;
+        const parseContextState = parseError.state.contextState;
+        let range;
+        if (errorToken !== undefined) {
+            range = {
+                start: {
+                    line: errorToken.positionStart.lineNumber,
+                    character: errorToken.positionStart.lineCodeUnit,
+                },
+                end: {
+                    line: errorToken.positionEnd.lineNumber,
+                    character: errorToken.positionEnd.lineCodeUnit,
+                },
+            };
+        }
+        else {
+            const root = parseContextState.root;
+            if (root === undefined) {
+                return [];
+            }
+            const leaf = yield parser_1.NodeIdMapUtils.rightMostLeaf(parseError.state.contextState.nodeIdMapCollection, root.id);
+            if (leaf === undefined) {
+                return [];
+            }
+            const leafTokenRange = leaf.tokenRange;
+            range = {
+                start: {
+                    line: leafTokenRange.positionStart.lineNumber,
+                    character: leafTokenRange.positionStart.lineCodeUnit,
+                },
+                end: {
+                    line: leafTokenRange.positionEnd.lineNumber,
+                    character: leafTokenRange.positionEnd.lineCodeUnit,
+                },
+            };
+        }
+        return [
+            {
+                code: diagnosticErrorCode_1.DiagnosticErrorCode.ParseError,
+                message,
+                range,
+                severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
+                source: validationSettings === null || validationSettings === void 0 ? void 0 : validationSettings.source,
+            },
+        ];
+    });
+}
+exports.validateParse = validateParse;
+//# sourceMappingURL=validateParse.js.map

package/lib/powerquery-language-services/validate/validateParse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateParse.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,6EAAoF;AACpF,sFAAqH;AAGrH,gEAA6D;AAG7D,SAAsB,aAAa,CAC/B,UAA6C,EAC7C,kBAAsC;;QAEtC,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,mBAAU,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE;YAClE,OAAO,EAAE,CAAC;SACb;QAED,MAAM,UAAU,GAAgC,UAAU,CAAC,UAAU,CAAC;QACtE,MAAM,UAAU,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACrG,MAAM,OAAO,GAAW,UAAU,CAAC,OAAO,CAAC;QAC3C,MAAM,iBAAiB,GAAkC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC;QAEvF,IAAI,KAAY,CAAC;QAEjB,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,KAAK,GAAG;gBACJ,KAAK,EAAE;oBACH,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,UAAU;oBACzC,SAAS,EAAE,UAAU,CAAC,aAAa,CAAC,YAAY;iBACnD;gBACD,GAAG,EAAE;oBACD,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,UAAU;oBACvC,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,YAAY;iBACjD;aACJ,CAAC;SACL;aAAM;YACH,MAAM,IAAI,GAAmC,iBAAiB,CAAC,IAAI,CAAC;YAEpE,IAAI,IAAI,KAAK,SAAS,EAAE;gBACpB,OAAO,EAAE,CAAC;aACb;YAED,MAAM,IAAI,GAA0B,MAAM,uBAAc,CAAC,aAAa,CAClE,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,mBAAmB,EACjD,IAAI,CAAC,EAAE,CACV,CAAC;YAEF,IAAI,IAAI,KAAK,SAAS,EAAE;gBACpB,OAAO,EAAE,CAAC;aACb;YAED,MAAM,cAAc,GAAkC,IAAI,CAAC,UAAU,CAAC;YAEtE,KAAK,GAAG;gBACJ,KAAK,EAAE;oBACH,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC,UAAU;oBAC7C,SAAS,EAAE,cAAc,CAAC,aAAa,CAAC,YAAY;iBACvD;gBACD,GAAG,EAAE;oBACD,IAAI,EAAE,cAAc,CAAC,WAAW,CAAC,UAAU;oBAC3C,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,YAAY;iBACrD;aACJ,CAAC;SACL;QAED,OAAO;YACH;gBACI,IAAI,EAAE,yCAAmB,CAAC,UAAU;gBACpC,OAAO;gBACP,KAAK;gBACL,QAAQ,EAAE,gDAAkB,CAAC,KAAK;gBAClC,MAAM,EAAE,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM;aACrC;SACJ,CAAC;IACN,CAAC;CAAA;AAjED,sCAiEC"}

package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js

@@ -21,18 +21,18 @@ const jaroWinkler_1 = require("../jaroWinkler");
 const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 function validateUnknownIdentifiers(validationSettings, nodeIdMapCollection, typeCache) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateUnknownIdentifiers.name, validationSettings.maybeInitialCorrelationId);
-        const updatedSettings = Object.assign(Object.assign({}, validationSettings), { maybeInitialCorrelationId: trace.id });
+        const trace = validationSettings.traceManager.entry("Validation" /* Validation */, validateUnknownIdentifiers.name, validationSettings.initialCorrelationId);
+        const updatedSettings = Object.assign(Object.assign({}, validationSettings), { initialCorrelationId: trace.id });
         // Grab all identifiers in the given context.
         const identifierValues = findIdentifierAsts(nodeIdMapCollection);
         // For each identifier create a Promise<TriedScope>, then await on all.
         const identifiersWithNodeScope = yield powerquery_parser_1.ArrayUtils.mapAsync(identifierValues, (identifier) => __awaiter(this, void 0, void 0, function* () {
-            const maybeIdentifierExpression = parser_1.NodeIdMapUtils.maybeParentAstChecked(nodeIdMapCollection, identifier.id, "IdentifierExpression" /* IdentifierExpression */);
-            const literal = maybeIdentifierExpression && maybeIdentifierExpression.maybeInclusiveConstant !== undefined
+            const identifierExpression = parser_1.NodeIdMapUtils.parentAstChecked(nodeIdMapCollection, identifier.id, "IdentifierExpression" /* IdentifierExpression */);
+            const literal = identifierExpression && identifierExpression.inclusiveConstant !== undefined
                 ? `@${identifier.literal}`
                 : identifier.literal;
             return {
-                identifier: maybeIdentifierExpression !== null && maybeIdentifierExpression !== void 0 ? maybeIdentifierExpression : identifier,
+                identifier: identifierExpression !== null && identifierExpression !== void 0 ? identifierExpression : identifier,
                 literal,
                 triedNodeScope: yield __1.Inspection.tryNodeScope(updatedSettings, nodeIdMapCollection, identifier.id, typeCache.scopeById),
             };
@@ -47,17 +47,16 @@ exports.validateUnknownIdentifiers = validateUnknownIdentifiers;
 // For context, "Tbl.AsdC" has a score of ~0.59 against "Table.AddColumn"
 const JaroWinklerSuggestionThreshold = 0.9;
 function findIdentifierAsts(nodeIdMapCollection) {
-    const maybeIdentifiers = nodeIdMapCollection.idsByNodeKind.get("Identifier" /* Identifier */);
-    if (maybeIdentifiers === undefined) {
+    const identifiers = nodeIdMapCollection.idsByNodeKind.get("Identifier" /* Identifier */);
+    if (identifiers === undefined) {
         return [];
     }
     const astNodeById = nodeIdMapCollection.astNodeById;
     const result = [];
-    for (const identifierId of maybeIdentifiers.values()) {
-        const maybeIdentifier = astNodeById.get(identifierId);
-        if (maybeIdentifier !== undefined &&
-            maybeIdentifier.identifierContextKind === "Value" /* Value */) {
-            result.push(maybeIdentifier);
+    for (const identifierId of identifiers.values()) {
+        const identifier = astNodeById.get(identifierId);
+        if (identifier !== undefined && identifier.identifierContextKind === "Value" /* Value */) {
+            result.push(identifier);
         }
     }
     return result;
@@ -74,7 +73,12 @@ function findUnknownIdentifiers(validationSettings, identifiersWithNodeScope, co
         const literal = identifierWithNodeScope.literal;
         if (!nodeScope.has(literal) &&
             !(literal[0] === "@" && nodeScope.has(literal.slice(1))) &&
-            !validationSettings.library.libraryDefinitions.has(literal)) {
+            !validationSettings.library.libraryDefinitions.has(literal) &&
+            // even no external type found
+            !validationSettings.library.externalTypeResolver({
+                kind: "Value" /* Value */,
+                identifierLiteral: literal,
+            })) {
             const knownIdentifiers = [
                 ...nodeScope.keys(),
                 ...validationSettings.library.libraryDefinitions.keys(),
@@ -83,7 +87,7 @@ function findUnknownIdentifiers(validationSettings, identifiersWithNodeScope, co
             unknownIdentifiers.push({
                 identifier,
                 literal,
-                maybeSuggestion: jaroWinklerScore > JaroWinklerSuggestionThreshold ? suggestion : undefined,
+                suggestion: jaroWinklerScore > JaroWinklerSuggestionThreshold ? suggestion : undefined,
             });
         }
     }
@@ -94,7 +98,7 @@ function unknownIdentifiersToDiagnostics(validationSettings, unknownIdentifiers)
     const templates = localization_1.LocalizationUtils.getLocalizationTemplates(validationSettings.locale);
     return unknownIdentifiers.map((unknownIdentifier) => ({
         code: diagnosticErrorCode_1.DiagnosticErrorCode.UnknownIdentifier,
-        message: localization_1.Localization.error_validation_unknownIdentifier(templates, unknownIdentifier.literal, unknownIdentifier.maybeSuggestion),
+        message: localization_1.Localization.error_validation_unknownIdentifier(templates, unknownIdentifier.literal, unknownIdentifier.suggestion),
         range: __1.PositionUtils.createRangeFromTokenRange(unknownIdentifier.identifier.tokenRange),
         severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
         source: validationSettings.source,

package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateUnknownIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateUnknownIdentifiers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateUnknownIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateUnknownIdentifiers.ts"],"names":[],"mappings":"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"}