@microsoft/powerquery-language-services 0.2.17 → 0.3.1

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,kDAAoD;AAIpD,oDAAwE;AACxE,+EAA8E;AAC9E,uEAAsE;AACtE,6DAA4D;AAI5D,SAAgB,QAAQ,CAAC,YAA0B,EAAE,kBAAsC;IACvF,IAAM,SAAS,GAAkC,oCAAmB,CAAC,gBAAgB,CACjF,YAAY,EACZ,kBAAkB,CACrB,CAAC;IAEF,IAAI,2BAAyC,CAAC;IAC9C,IACI,kBAAkB,CAAC,sBAAsB;QACzC,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,EAC9F;QACE,2BAA2B,GAAG,IAAA,mDAAwB,EAClD,kBAAkB,EAClB,SAAS,CAAC,mBAAmB,EAC7B,oCAAmB,CAAC,oBAAoB,CAAC,YAAY,CAAC,CACzD,CAAC;KACL;SAAM;QACH,2BAA2B,GAAG,EAAE,CAAC;KACpC;IAED,OAAO;QACH,WAAW,uDACJ,IAAA,2DAA4B,EAAC,YAAY,EAAE,kBAAkB,CAAC,kBAC9D,IAAA,yCAAmB,EAAC,YAAY,EAAE,kBAAkB,CAAC,kBACrD,2BAA2B,SACjC;QACD,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,SAAS,CAAC;KACzG,CAAC;AACN,CAAC;AA5BD,4BA4BC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAIpD,iFAA8E;AAC9E,yEAAsE;AACtE,+DAA4D;AAG5D,sDAAwD;AAExD,SAAsB,QAAQ,CAC1B,YAA0B,EAC1B,kBAAsC;;QAEtC,MAAM,eAAe,GAAwC,MAAM,oCAAmB,CAAC,uBAAuB,CAC1G,YAAY,EACZ,kBAAkB,CACrB,CAAC;QAEF,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,OAAO;gBACH,WAAW,EAAE,EAAE;gBACf,cAAc,EAAE,KAAK;aACxB,CAAC;SACL;QAED,IAAI,2BAAyC,CAAC;QAE9C,IACI,kBAAkB,CAAC,sBAAsB;YACzC,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC,EAC1G;YACE,2BAA2B,GAAG,MAAM,IAAA,mDAAwB,EACxD,kBAAkB,EAClB,eAAe,CAAC,mBAAmB,EACnC,oCAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CACjD,CAAC;SACL;aAAM;YACH,2BAA2B,GAAG,EAAE,CAAC;SACpC;QAED,OAAO;YACH,WAAW,EAAE;gBACT,GAAG,CAAC,MAAM,IAAA,2DAA4B,EAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;gBACzE,GAAG,CAAC,MAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;gBAChE,GAAG,2BAA2B;aACjC;YACD,cAAc,EACV,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,eAAe,CAAC;SACzG,CAAC;IACN,CAAC;CAAA;AAxCD,4BAwCC"}

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

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

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

@@ -1,84 +1,73 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+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;
-var PQP = require("@microsoft/powerquery-parser");
-var vscode_languageserver_types_1 = require("vscode-languageserver-types");
-var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-var localization_1 = require("../localization");
-var workspaceCache_1 = require("../workspaceCache");
-var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
-var __1 = require("..");
+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 localization_1 = require("../localization");
+const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+const __1 = require("..");
+const workspaceCache_1 = require("../workspaceCache");
 function validateDuplicateIdentifiers(textDocument, validationSettings) {
-    if (!validationSettings.checkForDuplicateIdentifiers) {
-        return [];
-    }
-    var cacheItem = workspaceCache_1.WorkspaceCacheUtils.getOrCreateParse(textDocument, validationSettings);
-    var maybeNodeIdMapCollection;
-    if (PQP.TaskUtils.isParseStageOk(cacheItem)) {
-        maybeNodeIdMapCollection = cacheItem.nodeIdMapCollection;
-    }
-    else if (PQP.TaskUtils.isParseStageParseError(cacheItem)) {
-        maybeNodeIdMapCollection = cacheItem.nodeIdMapCollection;
-    }
-    if (maybeNodeIdMapCollection === undefined) {
-        return [];
-    }
-    var documentUri = textDocument.uri;
-    var nodeIdMapCollection = maybeNodeIdMapCollection;
-    return __spreadArray(__spreadArray(__spreadArray([], __read(validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings)), false), __read(validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings)), false), __read(validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings)), false);
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!validationSettings.checkForDuplicateIdentifiers) {
+            return [];
+        }
+        const maybeParsePromise = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, validationSettings);
+        if (maybeParsePromise === undefined) {
+            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) {
+            return [];
+        }
+        const documentUri = textDocument.uri;
+        const nodeIdMapCollection = maybeNodeIdMapCollection;
+        return [
+            ...validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings),
+            ...validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings),
+            ...validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings),
+        ];
+    });
 }
 exports.validateDuplicateIdentifiers = validateDuplicateIdentifiers;
 function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings) {
     var _a;
-    var letIds = __spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : [])), false);
+    const letIds = [
+        ...((_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : []),
+    ];
     return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, letIds, parser_1.NodeIdMapIterator.iterLetExpression, validationSettings);
 }
 function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings) {
     var _a, _b, _c;
-    var recordIds = __spreadArray(__spreadArray(__spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : [])), false), __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : [])), false), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordType" /* RecordType */)) !== null && _c !== void 0 ? _c : [])), false);
+    const recordIds = [
+        ...((_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : []),
+        ...((_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : []),
+        ...((_c = nodeIdMapCollection.idsByNodeKind.get("RecordType" /* RecordType */)) !== null && _c !== void 0 ? _c : []),
+    ];
     return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterRecord, validationSettings);
 }
 function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings) {
     var _a;
-    var recordIds = __spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : [])), false);
+    const recordIds = [...((_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : [])];
     return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterSection, validationSettings);
 }
 // Generalized logic for iterating over some collection and their children, essentially by doing:
@@ -86,80 +75,44 @@ function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection
 //      for childOfNode in iterNodeFn(node):
 //          ...
 function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, nodeIds, iterNodeFn, validationSettings) {
-    var e_1, _a, e_2, _b, e_3, _c;
     if (!nodeIds.length) {
         return [];
     }
-    var result = [];
-    try {
-        for (var nodeIds_1 = __values(nodeIds), nodeIds_1_1 = nodeIds_1.next(); !nodeIds_1_1.done; nodeIds_1_1 = nodeIds_1.next()) {
-            var nodeId = nodeIds_1_1.value;
-            var node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
-            var duplicateFieldsByKey = new Map();
-            var knownFieldByKey = new Map();
-            try {
-                for (var _d = (e_2 = void 0, __values(iterNodeFn(nodeIdMapCollection, node))), _e = _d.next(); !_e.done; _e = _d.next()) {
-                    var field = _e.value;
-                    var keyLiteral = field.normalizedKeyLiteral;
-                    var maybeDuplicateFields = duplicateFieldsByKey.get(keyLiteral);
-                    var maybeKnownField = knownFieldByKey.get(keyLiteral);
-                    if (maybeDuplicateFields) {
-                        maybeDuplicateFields.push(field);
-                    }
-                    else if (maybeKnownField) {
-                        duplicateFieldsByKey.set(keyLiteral, [field, maybeKnownField]);
-                    }
-                    else {
-                        knownFieldByKey.set(keyLiteral, field);
-                    }
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
-                }
-                finally { if (e_2) throw e_2.error; }
+    const result = [];
+    for (const nodeId of nodeIds) {
+        const node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
+        const duplicateFieldsByKey = new Map();
+        const knownFieldByKey = new Map();
+        for (const field of iterNodeFn(nodeIdMapCollection, node)) {
+            const keyLiteral = field.normalizedKeyLiteral;
+            const maybeDuplicateFields = duplicateFieldsByKey.get(keyLiteral);
+            const maybeKnownField = knownFieldByKey.get(keyLiteral);
+            if (maybeDuplicateFields) {
+                maybeDuplicateFields.push(field);
             }
-            try {
-                for (var _f = (e_3 = void 0, __values(duplicateFieldsByKey.values())), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var duplicates = _g.value;
-                    var numFields = duplicates.length;
-                    var asRelatedInformation = duplicates.map(function (keyValuePair) {
-                        return {
-                            location: {
-                                uri: documentUri,
-                                range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
-                            },
-                            message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
-                        };
-                    });
-                    var _loop_1 = function (index) {
-                        var duplicate = duplicates[index];
-                        // Grab all DiagnosticRelatedInformation for a given key besides the one we're iterating over.
-                        var relatedInformation = asRelatedInformation.filter(function (_, relatedIndex) { return index !== relatedIndex; });
-                        result.push(createDuplicateIdentifierDiagnostic(duplicate, relatedInformation, validationSettings));
-                    };
-                    for (var index = 0; index < numFields; index += 1) {
-                        _loop_1(index);
-                    }
-                }
+            else if (maybeKnownField) {
+                duplicateFieldsByKey.set(keyLiteral, [field, maybeKnownField]);
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_g && !_g.done && (_c = _f.return)) _c.call(_f);
-                }
-                finally { if (e_3) throw e_3.error; }
+            else {
+                knownFieldByKey.set(keyLiteral, field);
             }
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (nodeIds_1_1 && !nodeIds_1_1.done && (_a = nodeIds_1.return)) _a.call(nodeIds_1);
+        for (const duplicates of duplicateFieldsByKey.values()) {
+            const numFields = duplicates.length;
+            const asRelatedInformation = duplicates.map((keyValuePair) => ({
+                location: {
+                    uri: documentUri,
+                    range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
+                },
+                message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
+            }));
+            for (let index = 0; index < numFields; index += 1) {
+                const duplicate = duplicates[index];
+                // Grab all DiagnosticRelatedInformation for a given key besides the one we're iterating over.
+                const relatedInformation = asRelatedInformation.filter((_, relatedIndex) => index !== relatedIndex);
+                result.push(createDuplicateIdentifierDiagnostic(duplicate, relatedInformation, validationSettings));
+            }
         }
-        finally { if (e_1) throw e_1.error; }
     }
     return result;
 }
@@ -168,7 +121,7 @@ function createDuplicateIdentifierDiagnostic(keyValuePair, relatedInformation, v
         code: diagnosticErrorCode_1.DiagnosticErrorCode.DuplicateIdentifier,
         message: createDuplicateIdentifierDiagnosticMessage(keyValuePair, validationSettings),
         range: __1.PositionUtils.createRangeFromTokenRange(keyValuePair.key.tokenRange),
-        relatedInformation: relatedInformation,
+        relatedInformation,
         severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
         source: validationSettings.source,
     };

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.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 validateFunctionExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Diagnostic[];
+export declare function validateFunctionExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Promise<Diagnostic[]>;

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

@@ -1,110 +1,70 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+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.validateFunctionExpression = void 0;
-var powerquery_parser_1 = require("@microsoft/powerquery-parser");
-var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
-var vscode_languageserver_types_1 = require("vscode-languageserver-types");
-var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-var __1 = require("..");
-var localization_1 = require("../localization");
-var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const __1 = require("..");
+const localization_1 = require("../localization");
+const diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 function validateFunctionExpression(validationSettings, nodeIdMapCollection, maybeCache) {
-    var e_1, _a;
-    var maybeInvokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("FunctionExpression" /* FunctionExpression */);
-    if (maybeInvokeExpressionIds === undefined) {
-        return [];
-    }
-    var result = [];
-    try {
-        for (var maybeInvokeExpressionIds_1 = __values(maybeInvokeExpressionIds), maybeInvokeExpressionIds_1_1 = maybeInvokeExpressionIds_1.next(); !maybeInvokeExpressionIds_1_1.done; maybeInvokeExpressionIds_1_1 = maybeInvokeExpressionIds_1.next()) {
-            var nodeId = maybeInvokeExpressionIds_1_1.value;
-            var triedInvokeExpression = __1.Inspection.tryInvokeExpression(validationSettings, nodeIdMapCollection, nodeId, maybeCache);
-            if (powerquery_parser_1.ResultUtils.isError(triedInvokeExpression)) {
-                throw triedInvokeExpression;
-            }
-            result.push.apply(result, __spreadArray([], __read(invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, triedInvokeExpression.value)), false));
+    return __awaiter(this, void 0, void 0, function* () {
+        const maybeInvokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("FunctionExpression" /* FunctionExpression */);
+        if (maybeInvokeExpressionIds === undefined) {
+            return [];
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (maybeInvokeExpressionIds_1_1 && !maybeInvokeExpressionIds_1_1.done && (_a = maybeInvokeExpressionIds_1.return)) _a.call(maybeInvokeExpressionIds_1);
+        const inspectionTasks = [];
+        for (const nodeId of maybeInvokeExpressionIds) {
+            inspectionTasks.push(__1.Inspection.tryInvokeExpression(validationSettings, nodeIdMapCollection, nodeId, maybeCache));
         }
-        finally { if (e_1) throw e_1.error; }
-    }
-    return result;
+        const inspections = yield Promise.all(inspectionTasks);
+        const invokeExpressionTasks = [];
+        for (const inspection of inspections) {
+            if (powerquery_parser_1.ResultUtils.isError(inspection)) {
+                throw inspection;
+            }
+            invokeExpressionTasks.push(invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, inspection.value));
+        }
+        return (yield Promise.all(invokeExpressionTasks)).flat();
+    });
 }
 exports.validateFunctionExpression = validateFunctionExpression;
 function invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, inspected) {
-    var e_2, _a;
-    var result = [];
-    if (inspected.maybeArguments !== undefined) {
-        var invokeExpressionArguments = inspected.maybeArguments;
-        var givenArguments = inspected.maybeArguments.givenArguments;
-        var invokeExpressionRange = powerquery_parser_1.Assert.asDefined(__1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
-        var maybeFunctionName = parser_1.NodeIdMapUtils.maybeInvokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
-        try {
-            for (var _b = __values(invokeExpressionArguments.typeChecked.invalid.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), argIndex = _d[0], mismatch = _d[1];
-                var maybeGivenArgumentRange = __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
-                result.push(createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange));
+    return __awaiter(this, void 0, void 0, function* () {
+        const result = [];
+        if (inspected.maybeArguments !== undefined) {
+            const invokeExpressionArguments = inspected.maybeArguments;
+            const givenArguments = inspected.maybeArguments.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);
+            let result = [];
+            result = result.concat(yield powerquery_parser_1.ArrayUtils.mapAsync([...invokeExpressionArguments.typeChecked.invalid.entries()], ([argIndex, mismatch]) => __awaiter(this, void 0, void 0, function* () {
+                const maybeGivenArgumentRange = yield __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
+                return createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange);
+            })));
+            const numGivenArguments = invokeExpressionArguments.givenArguments.length;
+            if (numGivenArguments < invokeExpressionArguments.numMinExpectedArguments ||
+                numGivenArguments > invokeExpressionArguments.numMaxExpectedArguments) {
+                result.push(createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, invokeExpressionArguments.numMinExpectedArguments, invokeExpressionArguments.numMaxExpectedArguments, numGivenArguments));
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        var numGivenArguments = invokeExpressionArguments.givenArguments.length;
-        if (numGivenArguments < invokeExpressionArguments.numMinExpectedArguments ||
-            numGivenArguments > invokeExpressionArguments.numMaxExpectedArguments) {
-            result.push(createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, invokeExpressionArguments.numMinExpectedArguments, invokeExpressionArguments.numMaxExpectedArguments, numGivenArguments));
-        }
-    }
-    return result;
+        return result;
+    });
 }
 function createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, numMin, numMax, numGiven) {
-    var templates = localization_1.LocalizationUtils.getLocalizationTemplates(validationSettings.locale);
+    const templates = localization_1.LocalizationUtils.getLocalizationTemplates(validationSettings.locale);
     return {
         code: diagnosticErrorCode_1.DiagnosticErrorCode.InvokeArgumentCountMismatch,
         message: localization_1.Localization.error_validation_invokeExpression_numArgs(templates, numMin, numMax, numGiven),
@@ -115,14 +75,14 @@ function createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExp
 }
 function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange) {
     var _a;
-    var range;
-    var message;
-    var parameter = mismatch.expected;
-    var argName = parameter.nameLiteral;
-    var expected = language_1.TypeUtils.nameOfTypeKind((_a = parameter.maybeType) !== null && _a !== void 0 ? _a : language_1.Type.AnyInstance.kind);
+    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);
     // An argument containing at least one leaf node was given.
     if (maybeGivenArgumentRange) {
-        var actual = language_1.TypeUtils.nameOfTypeKind(powerquery_parser_1.Assert.asDefined(mismatch.actual).kind);
+        const actual = language_1.TypeUtils.nameOfTypeKind(powerquery_parser_1.Assert.asDefined(mismatch.actual).kind);
         range = maybeGivenArgumentRange;
         message = createTypeMismatchMessage(validationSettings.locale, maybeFunctionName, argName, expected, actual);
     }
@@ -132,18 +92,18 @@ function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybe
     }
     return {
         code: diagnosticErrorCode_1.DiagnosticErrorCode.InvokeArgumentTypeMismatch,
-        message: message,
-        range: range,
+        message,
+        range,
         severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
         source: validationSettings.source,
     };
 }
 function createMissingMandatoryMessage(locale, maybeFunctionName, argName) {
-    var templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
+    const templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
     return localization_1.Localization.error_validation_invokeExpression_missingMandatory(templates, maybeFunctionName, argName);
 }
 function createTypeMismatchMessage(locale, maybeFunctionName, argName, expected, actual) {
-    var templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
+    const templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
     return localization_1.Localization.error_validation_invokeExpression_typeMismatch(templates, maybeFunctionName, argName, expected, actual);
 }
 //# sourceMappingURL=validateFunctionExpression.js.map

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

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): Diagnostic[];
+export declare function validateInvokeExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Promise<Diagnostic[]>;