@microsoft/powerquery-language-services 0.2.19 → 0.3.3

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

@@ -3,19 +3,19 @@ import { NodeIdMap, TXorNode } from "@microsoft/powerquery-parser/lib/powerquery
 import type { Position, Range } from "vscode-languageserver-types";
 import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 export declare function createPositionFromTokenPosition(tokenPosition: PQP.Language.Token.TokenPosition): Position;
-export declare function createRangeFromXorNode(nodeIdMapCollection: NodeIdMap.Collection, xorNode: TXorNode): Range | undefined;
+export declare function createRangeFromXorNode(nodeIdMapCollection: NodeIdMap.Collection, xorNode: TXorNode): Promise<Range | undefined>;
 export declare function createRangeFromTokenPositions(startTokenPosition: PQP.Language.Token.TokenPosition | undefined, endTokenPosition: PQP.Language.Token.TokenPosition | undefined): Range | undefined;
 export declare function createRangeFromTokenRange(tokenRange: PQP.Language.Token.TokenRange): Range;
 export declare function isBeforeXor(position: Position, xorNode: TXorNode, isBoundIncluded: boolean): boolean;
 export declare function isInXor(nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode, isLowerBoundIncluded: boolean, isUpperBoundIncluded: boolean): boolean;
 export declare function isOnXorStart(position: Position, xorNode: TXorNode): boolean;
-export declare function isOnXorEnd(nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode): boolean;
-export declare function isAfterXor(nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode, isBoundIncluded: boolean): boolean;
+export declare function isOnXorEnd(nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode): Promise<boolean>;
+export declare function isAfterXor(nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode, isBoundIncluded: boolean): Promise<boolean>;
 export declare function isBeforeContext(position: Position, contextNode: PQP.Parser.ParseContext.TNode, isBoundIncluded: boolean): boolean;
 export declare function isInContext(nodeIdMapCollection: NodeIdMap.Collection, position: Position, contextNode: PQP.Parser.ParseContext.TNode, isLowerBoundIncluded: boolean, isHigherBoundIncluded: boolean): boolean;
 export declare function isOnContextStart(position: Position, contextNode: PQP.Parser.ParseContext.TNode): boolean;
-export declare function isOnContextEnd(nodeIdMapCollection: NodeIdMap.Collection, position: Position, contextNode: PQP.Parser.ParseContext.TNode): boolean;
-export declare function isAfterContext(nodeIdMapCollection: NodeIdMap.Collection, position: Position, contextNode: PQP.Parser.ParseContext.TNode, isBoundIncluded: boolean): boolean;
+export declare function isOnContextEnd(nodeIdMapCollection: NodeIdMap.Collection, position: Position, contextNode: PQP.Parser.ParseContext.TNode): Promise<boolean>;
+export declare function isAfterContext(nodeIdMapCollection: NodeIdMap.Collection, position: Position, contextNode: PQP.Parser.ParseContext.TNode, isBoundIncluded: boolean): Promise<boolean>;
 export declare function isBeforeAst(position: Position, astNode: Ast.TNode, isBoundIncluded: boolean): boolean;
 export declare function isInAst(position: Position, astNode: Ast.TNode, isLowerBoundIncluded: boolean, isHigherBoundIncluded: boolean): boolean;
 export declare function isOnAstStart(position: Position, astNode: Ast.TNode): boolean;

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

@@ -1,10 +1,19 @@
 "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.isAfterTokenPosition = exports.isOnTokenPosition = exports.isBeforeTokenPosition = exports.isInToken = exports.isAfterAst = exports.isOnAstEnd = exports.isOnAstStart = exports.isInAst = exports.isBeforeAst = exports.isAfterContext = exports.isOnContextEnd = exports.isOnContextStart = exports.isInContext = exports.isBeforeContext = exports.isAfterXor = exports.isOnXorEnd = exports.isOnXorStart = exports.isInXor = exports.isBeforeXor = exports.createRangeFromTokenRange = exports.createRangeFromTokenPositions = exports.createRangeFromXorNode = exports.createPositionFromTokenPosition = void 0;
-var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-var powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 function createPositionFromTokenPosition(tokenPosition) {
     return {
         line: tokenPosition.lineNumber,
@@ -15,12 +24,14 @@ exports.createPositionFromTokenPosition = createPositionFromTokenPosition;
 // Attempts to turn a TXorNode into a Range.
 // Returns undefined if there are no leafs nodes.
 function createRangeFromXorNode(nodeIdMapCollection, xorNode) {
-    var nodeId = xorNode.node.id;
-    var maybeLeftMostLeaf = parser_1.NodeIdMapUtils.maybeLeftMostLeaf(nodeIdMapCollection, nodeId);
-    var maybeRightMostLeaf = parser_1.NodeIdMapUtils.maybeRightMostLeaf(nodeIdMapCollection, nodeId);
-    return maybeLeftMostLeaf === undefined || maybeRightMostLeaf === undefined
-        ? undefined
-        : createRangeFromTokenPositions(maybeLeftMostLeaf.tokenRange.positionStart, maybeRightMostLeaf.tokenRange.positionEnd);
+    return __awaiter(this, void 0, void 0, function* () {
+        const nodeId = xorNode.node.id;
+        const maybeLeftMostLeaf = parser_1.NodeIdMapUtils.maybeLeftMostLeaf(nodeIdMapCollection, nodeId);
+        const maybeRightMostLeaf = yield parser_1.NodeIdMapUtils.maybeRightMostLeaf(nodeIdMapCollection, nodeId);
+        return Promise.resolve(maybeLeftMostLeaf === undefined || maybeRightMostLeaf === undefined
+            ? undefined
+            : createRangeFromTokenPositions(maybeLeftMostLeaf.tokenRange.positionStart, maybeRightMostLeaf.tokenRange.positionEnd));
+    });
 }
 exports.createRangeFromXorNode = createRangeFromXorNode;
 function createRangeFromTokenPositions(startTokenPosition, endTokenPosition) {
@@ -73,7 +84,7 @@ exports.isOnXorStart = isOnXorStart;
 function isOnXorEnd(nodeIdMapCollection, position, xorNode) {
     switch (xorNode.kind) {
         case "Ast" /* Ast */:
-            return isOnAstEnd(position, xorNode.node);
+            return Promise.resolve(isOnAstEnd(position, xorNode.node));
         case "Context" /* Context */:
             return isOnContextEnd(nodeIdMapCollection, position, xorNode.node);
         default:
@@ -84,7 +95,7 @@ exports.isOnXorEnd = isOnXorEnd;
 function isAfterXor(nodeIdMapCollection, position, xorNode, isBoundIncluded) {
     switch (xorNode.kind) {
         case "Ast" /* Ast */:
-            return isAfterAst(position, xorNode.node, isBoundIncluded);
+            return Promise.resolve(isAfterAst(position, xorNode.node, isBoundIncluded));
         case "Context" /* Context */:
             return isAfterContext(nodeIdMapCollection, position, xorNode.node, isBoundIncluded);
         default:
@@ -93,11 +104,11 @@ function isAfterXor(nodeIdMapCollection, position, xorNode, isBoundIncluded) {
 }
 exports.isAfterXor = isAfterXor;
 function isBeforeContext(position, contextNode, isBoundIncluded) {
-    var maybeTokenStart = contextNode.maybeTokenStart;
+    const maybeTokenStart = contextNode.maybeTokenStart;
     if (maybeTokenStart === undefined) {
         return false;
     }
-    var tokenStart = maybeTokenStart;
+    const tokenStart = maybeTokenStart;
     return isBeforeTokenPosition(position, tokenStart.positionStart, isBoundIncluded);
 }
 exports.isBeforeContext = isBeforeContext;
@@ -113,27 +124,30 @@ function isOnContextStart(position, contextNode) {
 }
 exports.isOnContextStart = isOnContextStart;
 function isOnContextEnd(nodeIdMapCollection, position, contextNode) {
-    var maybeLeaf = parser_1.NodeIdMapUtils.maybeRightMostLeaf(nodeIdMapCollection, contextNode.id);
-    if (maybeLeaf === undefined) {
-        return false;
-    }
-    return isOnAstEnd(position, maybeLeaf);
+    return __awaiter(this, void 0, void 0, function* () {
+        const maybeLeaf = yield parser_1.NodeIdMapUtils.maybeRightMostLeaf(nodeIdMapCollection, contextNode.id);
+        if (maybeLeaf === undefined) {
+            return Promise.resolve(false);
+        }
+        return Promise.resolve(isOnAstEnd(position, maybeLeaf));
+    });
 }
 exports.isOnContextEnd = isOnContextEnd;
 function isAfterContext(nodeIdMapCollection, position, contextNode, isBoundIncluded) {
-    var maybeLeaf = parser_1.NodeIdMapUtils.maybeRightMostLeaf(nodeIdMapCollection, contextNode.id);
-    if (maybeLeaf === undefined) {
-        // We're assuming position is a valid range for the document.
-        // Therefore if the context node didn't have a token (caused by EOF) we can make this assumption.
-        if (contextNode.maybeTokenStart === undefined) {
-            return false;
+    return __awaiter(this, void 0, void 0, function* () {
+        const maybeLeaf = yield parser_1.NodeIdMapUtils.maybeRightMostLeaf(nodeIdMapCollection, contextNode.id);
+        if (maybeLeaf === undefined) {
+            // We're assuming position is a valid range for the document.
+            // Therefore if the context node didn't have a token (caused by EOF) we can make this assumption.
+            if (contextNode.maybeTokenStart === undefined) {
+                return Promise.resolve(false);
+            }
+            else {
+                return Promise.resolve(isAfterTokenPosition(position, contextNode.maybeTokenStart.positionEnd, isBoundIncluded));
+            }
         }
-        else {
-            return isAfterTokenPosition(position, contextNode.maybeTokenStart.positionEnd, isBoundIncluded);
-        }
-    }
-    var leaf = maybeLeaf;
-    return isAfterAst(position, leaf, isBoundIncluded);
+        return Promise.resolve(isAfterAst(position, maybeLeaf, isBoundIncluded));
+    });
 }
 exports.isAfterContext = isAfterContext;
 function isBeforeAst(position, astNode, isBoundIncluded) {
@@ -162,7 +176,7 @@ function isInToken(position, token, isLowerBoundIncluded, isHigherBoundIncluded)
 }
 exports.isInToken = isInToken;
 function isBeforeTokenPosition(position, tokenPosition, isBoundIncluded) {
-    var positionLineNumber = position.line;
+    const positionLineNumber = position.line;
     if (positionLineNumber < tokenPosition.lineNumber) {
         return true;
     }
@@ -170,7 +184,7 @@ function isBeforeTokenPosition(position, tokenPosition, isBoundIncluded) {
         return false;
     }
     else {
-        var upperBound = isBoundIncluded ? tokenPosition.lineCodeUnit : tokenPosition.lineCodeUnit + 1;
+        const upperBound = isBoundIncluded ? tokenPosition.lineCodeUnit : tokenPosition.lineCodeUnit + 1;
         return position.character < upperBound;
     }
 }
@@ -180,7 +194,7 @@ function isOnTokenPosition(position, tokenPosition) {
 }
 exports.isOnTokenPosition = isOnTokenPosition;
 function isAfterTokenPosition(position, tokenPosition, isBoundIncluded) {
-    var positionLineNumber = position.line;
+    const positionLineNumber = position.line;
     if (positionLineNumber < tokenPosition.lineNumber) {
         return false;
     }
@@ -188,7 +202,7 @@ function isAfterTokenPosition(position, tokenPosition, isBoundIncluded) {
         return true;
     }
     else {
-        var upperBound = isBoundIncluded ? tokenPosition.lineCodeUnit : tokenPosition.lineCodeUnit - 1;
+        const upperBound = isBoundIncluded ? tokenPosition.lineCodeUnit : tokenPosition.lineCodeUnit - 1;
         return position.character > upperBound;
     }
 }

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

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

package/lib/powerquery-language-services/providers/languageCompletionItemProvider.d.ts

@@ -1,10 +1,10 @@
 import { AutocompleteItemProvider, AutocompleteItemProviderContext } from "./commonTypes";
-import { WorkspaceCache } from "../workspaceCache";
 import { AutocompleteItem } from "../inspection/autocomplete/autocompleteItem";
+import { Inspection } from "..";
 export declare class LanguageAutocompleteItemProvider implements AutocompleteItemProvider {
-    private readonly maybeTriedInspection;
+    private readonly maybePromiseInspection;
     private static readonly ExcludedKeywords;
-    constructor(maybeTriedInspection: WorkspaceCache.InspectionCacheItem);
+    constructor(maybePromiseInspection: Promise<Inspection.Inspected | undefined>);
     getAutocompleteItems(_context: AutocompleteItemProviderContext): Promise<ReadonlyArray<AutocompleteItem>>;
     private getKeywords;
     private getLanguageConstants;

package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js

@@ -10,113 +10,58 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-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));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LanguageAutocompleteItemProvider = void 0;
-var powerquery_parser_1 = require("@microsoft/powerquery-parser");
-var workspaceCache_1 = require("../workspaceCache");
-var LanguageAutocompleteItemProvider = /** @class */ (function () {
-    function LanguageAutocompleteItemProvider(maybeTriedInspection) {
-        this.maybeTriedInspection = maybeTriedInspection;
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+class LanguageAutocompleteItemProvider {
+    constructor(maybePromiseInspection) {
+        this.maybePromiseInspection = maybePromiseInspection;
     }
-    // eslint-disable-next-line require-await
-    LanguageAutocompleteItemProvider.prototype.getAutocompleteItems = function (_context) {
-        return __awaiter(this, void 0, void 0, function () {
-            var autocomplete;
-            return __generator(this, function (_a) {
-                if (!workspaceCache_1.WorkspaceCacheUtils.isInspectionTask(this.maybeTriedInspection)) {
-                    return [2 /*return*/, []];
-                }
-                autocomplete = this.maybeTriedInspection.autocomplete;
-                return [2 /*return*/, __spreadArray(__spreadArray(__spreadArray([], __read(this.getKeywords(autocomplete.triedKeyword)), false), __read(this.getLanguageConstants(autocomplete.triedLanguageConstant)), false), __read(this.getPrimitiveTypes(autocomplete.triedPrimitiveType)), false)];
-            });
+    getAutocompleteItems(_context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const maybeInspection = yield this.maybePromiseInspection;
+            if (maybeInspection === undefined) {
+                return [];
+            }
+            const autocomplete = maybeInspection.autocomplete;
+            return [
+                ...this.getKeywords(autocomplete.triedKeyword),
+                ...this.getLanguageConstants(autocomplete.triedLanguageConstant),
+                ...this.getPrimitiveTypes(autocomplete.triedPrimitiveType),
+            ];
         });
-    };
-    LanguageAutocompleteItemProvider.prototype.getKeywords = function (triedKeywordAutocomplete) {
+    }
+    getKeywords(triedKeywordAutocomplete) {
         if (powerquery_parser_1.ResultUtils.isError(triedKeywordAutocomplete)) {
             return [];
         }
-        return triedKeywordAutocomplete.value.filter(function (autocompleteItem) {
-            return LanguageAutocompleteItemProvider.ExcludedKeywords.includes(autocompleteItem.label) === false;
-        });
-    };
-    LanguageAutocompleteItemProvider.prototype.getLanguageConstants = function (triedLanguageConstantAutocomplete) {
+        return triedKeywordAutocomplete.value.filter((autocompleteItem) => LanguageAutocompleteItemProvider.ExcludedKeywords.includes(autocompleteItem.label) === false);
+    }
+    getLanguageConstants(triedLanguageConstantAutocomplete) {
         return powerquery_parser_1.ResultUtils.isOk(triedLanguageConstantAutocomplete) && triedLanguageConstantAutocomplete.value
             ? [triedLanguageConstantAutocomplete.value]
             : [];
-    };
-    LanguageAutocompleteItemProvider.prototype.getPrimitiveTypes = function (triedPrimitiveTypeAutocomplete) {
+    }
+    getPrimitiveTypes(triedPrimitiveTypeAutocomplete) {
         return powerquery_parser_1.ResultUtils.isOk(triedPrimitiveTypeAutocomplete) && triedPrimitiveTypeAutocomplete.value
             ? triedPrimitiveTypeAutocomplete.value
             : [];
-    };
-    // Power Query defines constructor functions (ex. #table()) as keywords, but we want
-    // them to be treated like library functions instead.
-    LanguageAutocompleteItemProvider.ExcludedKeywords = [
-        "#binary" /* HashBinary */,
-        "#date" /* HashDate */,
-        "#datetime" /* HashDateTime */,
-        "#datetimezone" /* HashDateTimeZone */,
-        "#duration" /* HashDuration */,
-        "#infinity" /* HashInfinity */,
-        "#nan" /* HashNan */,
-        "#sections" /* HashSections */,
-        "#shared" /* HashShared */,
-        "#table" /* HashTable */,
-        "#time" /* HashTime */,
-    ];
-    return LanguageAutocompleteItemProvider;
-}());
+    }
+}
 exports.LanguageAutocompleteItemProvider = LanguageAutocompleteItemProvider;
+// Power Query defines constructor functions (ex. #table()) as keywords, but we want
+// them to be treated like library functions instead.
+LanguageAutocompleteItemProvider.ExcludedKeywords = [
+    "#binary" /* HashBinary */,
+    "#date" /* HashDate */,
+    "#datetime" /* HashDateTime */,
+    "#datetimezone" /* HashDateTimeZone */,
+    "#duration" /* HashDuration */,
+    "#infinity" /* HashInfinity */,
+    "#nan" /* HashNan */,
+    "#sections" /* HashSections */,
+    "#shared" /* HashShared */,
+    "#table" /* HashTable */,
+    "#time" /* HashTime */,
+];
 //# sourceMappingURL=languageCompletionItemProvider.js.map

package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"languageCompletionItemProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/languageCompletionItemProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGlC,kEAA2D;AAG3D,oDAAwE;AAIxE;IAiBI,0CAA6B,oBAAwD;QAAxD,yBAAoB,GAApB,oBAAoB,CAAoC;IAAG,CAAC;IAEzF,yCAAyC;IAC5B,+DAAoB,GAAjC,UACI,QAAyC;;;;gBAEzC,IAAI,CAAC,oCAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;oBAClE,sBAAO,EAAE,EAAC;iBACb;gBAEK,YAAY,GAA4B,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC;gBAErF,2EACO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,kBAC3C,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,qBAAqB,CAAC,kBAC7D,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,kBAAkB,CAAC,WAC5D;;;KACL;IAEO,sDAAW,GAAnB,UACI,wBAA6D;QAE7D,IAAI,+BAAW,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE;YAC/C,OAAO,EAAE,CAAC;SACb;QAED,OAAO,wBAAwB,CAAC,KAAK,CAAC,MAAM,CACxC,UAAC,gBAAkC;YAC/B,OAAA,gCAAgC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,KAAK;QAA5F,CAA4F,CACnG,CAAC;IACN,CAAC;IAEO,+DAAoB,GAA5B,UACI,iCAA+E;QAE/E,OAAO,+BAAW,CAAC,IAAI,CAAC,iCAAiC,CAAC,IAAI,iCAAiC,CAAC,KAAK;YACjG,CAAC,CAAC,CAAC,iCAAiC,CAAC,KAAK,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEO,4DAAiB,GAAzB,UACI,8BAAyE;QAEzE,OAAO,+BAAW,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,8BAA8B,CAAC,KAAK;YAC3F,CAAC,CAAC,8BAA8B,CAAC,KAAK;YACtC,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IA9DD,oFAAoF;IACpF,qDAAqD;IAC7B,iDAAgB,GAA0B;;;;;;;;;;;;KAYjE,CAAC;IAiDN,uCAAC;CAAA,AAhED,IAgEC;AAhEY,4EAAgC"}
+{"version":3,"file":"languageCompletionItemProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/languageCompletionItemProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAA2D;AAM3D,MAAa,gCAAgC;IAiBzC,YAA6B,sBAAiE;QAAjE,2BAAsB,GAAtB,sBAAsB,CAA2C;IAAG,CAAC;IAErF,oBAAoB,CAC7B,QAAyC;;YAEzC,MAAM,eAAe,GAAqC,MAAM,IAAI,CAAC,sBAAsB,CAAC;YAE5F,IAAI,eAAe,KAAK,SAAS,EAAE;gBAC/B,OAAO,EAAE,CAAC;aACb;YAED,MAAM,YAAY,GAA4B,eAAe,CAAC,YAAY,CAAC;YAE3E,OAAO;gBACH,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC9C,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,qBAAqB,CAAC;gBAChE,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,kBAAkB,CAAC;aAC7D,CAAC;QACN,CAAC;KAAA;IAEO,WAAW,CACf,wBAA6D;QAE7D,IAAI,+BAAW,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE;YAC/C,OAAO,EAAE,CAAC;SACb;QAED,OAAO,wBAAwB,CAAC,KAAK,CAAC,MAAM,CACxC,CAAC,gBAAkC,EAAE,EAAE,CACnC,gCAAgC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,KAAK,CACnG,CAAC;IACN,CAAC;IAEO,oBAAoB,CACxB,iCAA+E;QAE/E,OAAO,+BAAW,CAAC,IAAI,CAAC,iCAAiC,CAAC,IAAI,iCAAiC,CAAC,KAAK;YACjG,CAAC,CAAC,CAAC,iCAAiC,CAAC,KAAK,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEO,iBAAiB,CACrB,8BAAyE;QAEzE,OAAO,+BAAW,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,8BAA8B,CAAC,KAAK;YAC3F,CAAC,CAAC,8BAA8B,CAAC,KAAK;YACtC,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;;AAhEL,4EAiEC;AAhEG,oFAAoF;AACpF,qDAAqD;AAC7B,iDAAgB,GAA0B;;;;;;;;;;;;CAYjE,CAAC"}

package/lib/powerquery-language-services/providers/librarySymbolProvider.js

@@ -10,151 +10,77 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LibrarySymbolProvider = void 0;
-var vscode_languageserver_types_1 = require("vscode-languageserver-types");
-var powerquery_parser_1 = require("@microsoft/powerquery-parser");
-var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
-var library_1 = require("../library");
-var inspection_1 = require("../inspection");
-var LibrarySymbolProvider = /** @class */ (function () {
-    function LibrarySymbolProvider(library) {
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const library_1 = require("../library");
+const inspection_1 = require("../inspection");
+class LibrarySymbolProvider {
+    constructor(library) {
         this.externalTypeResolver = library.externalTypeResolver;
         this.libraryDefinitions = library.libraryDefinitions;
         this.signatureInformationByLabel = new Map();
     }
     // eslint-disable-next-line require-await
-    LibrarySymbolProvider.prototype.getAutocompleteItems = function (context) {
-        return __awaiter(this, void 0, void 0, function () {
-            var partial, maybeContextText, _a, _b, _c, label, definition;
-            var e_1, _d;
-            return __generator(this, function (_e) {
-                if (!context.text || !context.range) {
-                    return [2 /*return*/, []];
-                }
-                partial = [];
-                maybeContextText = context.text;
-                try {
-                    for (_a = __values(this.libraryDefinitions.entries()), _b = _a.next(); !_b.done; _b = _a.next()) {
-                        _c = __read(_b.value, 2), label = _c[0], definition = _c[1];
-                        partial.push(inspection_1.AutocompleteItemUtils.createFromLibraryDefinition(label, definition, maybeContextText));
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-                return [2 /*return*/, partial];
-            });
+    getAutocompleteItems(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!context.text || !context.range) {
+                return [];
+            }
+            const partial = [];
+            const maybeContextText = context.text;
+            for (const [label, definition] of this.libraryDefinitions.entries()) {
+                partial.push(inspection_1.AutocompleteItemUtils.createFromLibraryDefinition(label, definition, maybeContextText));
+            }
+            return partial;
         });
-    };
+    }
     // eslint-disable-next-line require-await
-    LibrarySymbolProvider.prototype.getHover = function (context) {
-        return __awaiter(this, void 0, void 0, function () {
-            var identifierLiteral, maybeDefinition, definition, definitionText, definitionTypeText;
-            return __generator(this, function (_a) {
-                if (!context.identifier) {
-                    return [2 /*return*/, null];
-                }
-                identifierLiteral = context.identifier;
-                maybeDefinition = this.libraryDefinitions.get(context.identifier);
-                if (maybeDefinition === undefined) {
-                    return [2 /*return*/, null];
-                }
-                definition = maybeDefinition;
-                definitionText = LibrarySymbolProvider.getDefinitionKindText(definition.kind);
-                definitionTypeText = language_1.TypeUtils.nameOf(definition.asPowerQueryType);
-                return [2 /*return*/, {
-                        contents: {
-                            kind: vscode_languageserver_types_1.MarkupKind.PlainText,
-                            language: "powerquery",
-                            value: "[".concat(definitionText, "] ").concat(identifierLiteral, ": ").concat(definitionTypeText),
-                        },
-                        range: undefined,
-                    }];
-            });
+    getHover(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!context.identifier) {
+                return null;
+            }
+            const identifierLiteral = context.identifier;
+            const maybeDefinition = this.libraryDefinitions.get(context.identifier);
+            if (maybeDefinition === undefined) {
+                return null;
+            }
+            const definition = maybeDefinition;
+            const definitionText = LibrarySymbolProvider.getDefinitionKindText(definition.kind);
+            const definitionTypeText = language_1.TypeUtils.nameOf(definition.asPowerQueryType);
+            return {
+                contents: {
+                    kind: vscode_languageserver_types_1.MarkupKind.PlainText,
+                    language: "powerquery",
+                    value: `[${definitionText}] ${identifierLiteral}: ${definitionTypeText}`,
+                },
+                range: undefined,
+            };
         });
-    };
+    }
     // eslint-disable-next-line require-await
-    LibrarySymbolProvider.prototype.getSignatureHelp = function (context) {
+    getSignatureHelp(context) {
         var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var identifierLiteral, maybeDefinition;
-            return __generator(this, function (_b) {
-                if (!context.functionName) {
-                    return [2 /*return*/, null];
-                }
-                identifierLiteral = context.functionName;
-                maybeDefinition = this.libraryDefinitions.get(identifierLiteral);
-                if (!library_1.LibraryUtils.isFunction(maybeDefinition)) {
-                    return [2 /*return*/, null];
-                }
-                return [2 /*return*/, {
-                        activeParameter: (_a = context.argumentOrdinal) !== null && _a !== void 0 ? _a : 0,
-                        activeSignature: 0,
-                        signatures: [this.getOrCreateSignatureInformation(identifierLiteral)],
-                    }];
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!context.functionName) {
+                return null;
+            }
+            const identifierLiteral = context.functionName;
+            const maybeDefinition = this.libraryDefinitions.get(identifierLiteral);
+            if (!library_1.LibraryUtils.isFunction(maybeDefinition)) {
+                return null;
+            }
+            return {
+                activeParameter: (_a = context.argumentOrdinal) !== null && _a !== void 0 ? _a : 0,
+                activeSignature: 0,
+                signatures: [this.getOrCreateSignatureInformation(identifierLiteral)],
+            };
         });
-    };
-    LibrarySymbolProvider.getDefinitionKindText = function (kind) {
+    }
+    static getDefinitionKindText(kind) {
         switch (kind) {
             case "Function" /* Function */:
                 return "library function";
@@ -165,15 +91,14 @@ var LibrarySymbolProvider = /** @class */ (function () {
             default:
                 throw powerquery_parser_1.Assert.isNever(kind);
         }
-    };
-    LibrarySymbolProvider.prototype.getOrCreateSignatureInformation = function (key) {
+    }
+    getOrCreateSignatureInformation(key) {
         if (!this.signatureInformationByLabel.has(key)) {
-            var definition = library_1.LibraryUtils.assertAsFunction(this.libraryDefinitions.get(key));
+            const definition = library_1.LibraryUtils.assertAsFunction(this.libraryDefinitions.get(key));
             this.signatureInformationByLabel.set(key, library_1.LibraryUtils.createSignatureInformation(definition));
         }
         return powerquery_parser_1.Assert.asDefined(this.signatureInformationByLabel.get(key));
-    };
-    return LibrarySymbolProvider;
-}());
+    }
+}
 exports.LibrarySymbolProvider = LibrarySymbolProvider;
 //# sourceMappingURL=librarySymbolProvider.js.map