@microsoft/powerquery-language-services 0.3.41 → 0.5.0

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

@@ -0,0 +1,129 @@
+"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.LibraryProvider = void 0;
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const library_1 = require("../library");
+const inspection_1 = require("../inspection");
+class LibraryProvider {
+    constructor(library, locale) {
+        this.locale = locale;
+        this.externalTypeResolver = library.externalTypeResolver;
+        this.libraryDefinitions = library.libraryDefinitions;
+        this.signatureInformationByLabel = new Map();
+    }
+    getAutocompleteItems(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // eslint-disable-next-line require-await
+            return yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const trace = context.traceManager.entry("LibrarySymbolProvider" /* LibrarySymbolProvider */, this.getAutocompleteItems.name, context.initialCorrelationId);
+                (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+                if (!context.text || !context.range) {
+                    trace.exit({ invalidContext: true });
+                    return undefined;
+                }
+                const autocompleteItems = [];
+                const contextText = context.text;
+                for (const [label, definition] of this.libraryDefinitions.entries()) {
+                    autocompleteItems.push(inspection_1.AutocompleteItemUtils.createFromLibraryDefinition(label, definition, contextText));
+                }
+                trace.exit();
+                return autocompleteItems;
+            }), this.locale);
+        });
+    }
+    getHover(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // eslint-disable-next-line require-await
+            return yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const trace = context.traceManager.entry("LibrarySymbolProvider" /* LibrarySymbolProvider */, this.getHover.name, context.initialCorrelationId);
+                (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+                if (!context.identifier) {
+                    trace.exit({ invalidContext: true });
+                    return undefined;
+                }
+                const identifierLiteral = context.identifier.literal;
+                const definition = this.libraryDefinitions.get(identifierLiteral);
+                if (definition === undefined) {
+                    trace.exit({ invalidContext: true });
+                    return undefined;
+                }
+                const definitionText = LibraryProvider.getDefinitionKindText(definition.kind);
+                const definitionTypeText = language_1.TypeUtils.nameOf(definition.asPowerQueryType, context.traceManager, trace.id);
+                (_b = context.cancellationToken) === null || _b === void 0 ? void 0 : _b.throwIfCancelled();
+                const hover = {
+                    contents: {
+                        kind: vscode_languageserver_types_1.MarkupKind.PlainText,
+                        language: "powerquery",
+                        value: `[${definitionText}] ${identifierLiteral}: ${definitionTypeText}`,
+                    },
+                    range: undefined,
+                };
+                trace.exit();
+                return hover;
+            }), this.locale);
+        });
+    }
+    getSignatureHelp(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // eslint-disable-next-line require-await
+            return yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const trace = context.traceManager.entry("LibrarySymbolProvider" /* LibrarySymbolProvider */, this.getSignatureHelp.name, context.initialCorrelationId);
+                (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+                if (!context.functionName) {
+                    trace.exit({ invalidContext: true });
+                    return undefined;
+                }
+                const identifierLiteral = context.functionName;
+                const definition = this.libraryDefinitions.get(identifierLiteral);
+                if (!library_1.LibraryUtils.isFunction(definition)) {
+                    trace.exit({ invalidContext: true });
+                    return undefined;
+                }
+                const result = {
+                    activeParameter: (_b = context.argumentOrdinal) !== null && _b !== void 0 ? _b : 0,
+                    activeSignature: 0,
+                    signatures: [this.getOrCreateSignatureInformation(identifierLiteral)],
+                };
+                trace.exit();
+                return result;
+            }), this.locale);
+        });
+    }
+    static getDefinitionKindText(kind) {
+        switch (kind) {
+            case "Function" /* Function */:
+                return "library function";
+            case "Constant" /* Constant */:
+                return "library constant";
+            case "Type" /* Type */:
+                return "library type";
+            default:
+                throw powerquery_parser_1.Assert.isNever(kind);
+        }
+    }
+    getOrCreateSignatureInformation(key) {
+        if (!this.signatureInformationByLabel.has(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));
+    }
+}
+exports.LibraryProvider = LibraryProvider;
+//# sourceMappingURL=libraryProvider.js.map

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

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

package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js

@@ -28,11 +28,11 @@ function getFoldingRanges(nodeIdMapCollection, nodeKind, traceManager, correlati
     const trace = traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, getFoldingRanges.name, correlationId, { nodeKind });
     const foldingRanges = [];
     for (const nodeId of (_a = nodeIdMapCollection.idsByNodeKind.get(nodeKind)) !== null && _a !== void 0 ? _a : []) {
-        const maybeNode = parser_1.NodeIdMapUtils.maybeUnboxIfAstChecked(nodeIdMapCollection, nodeId, nodeKind);
-        if (maybeNode === undefined) {
+        const node = parser_1.NodeIdMapUtils.unboxIfAstChecked(nodeIdMapCollection, nodeId, nodeKind);
+        if (node === undefined) {
             continue;
         }
-        const tokenRange = maybeNode.tokenRange;
+        const tokenRange = node.tokenRange;
         if (tokenRange.positionStart.lineNumber !== tokenRange.positionEnd.lineNumber) {
             foldingRanges.push(asFoldingRange(tokenRange));
         }

package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js.map

@@ -1 +1 @@
-{"version":3,"file":"foldingRanges.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/foldingRanges.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAAsG;AAQtG,SAAgB,mBAAmB,CAC/B,mBAAyC,EACzC,YAA0B,EAC1B,aAAqB;IAErB,MAAM,KAAK,GAAU,YAAY,CAAC,KAAK,kEAEnC,mBAAmB,CAAC,IAAI,EACxB,aAAa,CAChB,CAAC;IAEF,IAAI,aAAa,GAAmB,EAAE,CAAC;IAEvC,aAAa,GAAG,aAAa;SACxB,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,iDAAmC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACtG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,qCAA6B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAChG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,6CAAiC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACpG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,uCAA8B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACjG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,yCAA+B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAClG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,mCAA4B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC/F,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,iDAAmC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACtG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,6CAAiC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACpG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,uCAA8B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACjG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,uCAA8B,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACjG,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,2CAAgC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzG,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,aAAa,CAAC;AACzB,CAAC;AA7BD,kDA6BC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,QAAmB,EACnB,YAA0B,EAC1B,aAAqB;;IAErB,MAAM,KAAK,GAAU,YAAY,CAAC,KAAK,kEAEnC,gBAAgB,CAAC,IAAI,EACrB,aAAa,EACb,EAAE,QAAQ,EAAE,CACf,CAAC;IAEF,MAAM,aAAa,GAAmB,EAAE,CAAC;IAEzC,KAAK,MAAM,MAAM,IAAI,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAI,EAAE,EAAE;QACxE,MAAM,SAAS,GAAkB,uBAAc,CAAC,sBAAsB,CAClE,mBAAmB,EACnB,MAAM,EACN,QAAQ,CACX,CAAC;QAEF,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,SAAS;SACZ;QAED,MAAM,UAAU,GAAe,SAAS,CAAC,UAAU,CAAC;QAEpD,IAAI,UAAU,CAAC,aAAa,CAAC,UAAU,KAAK,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE;YAC3E,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;SAClD;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,SAAS,cAAc,CAAC,UAAsB;IAC1C,OAAO;QACH,cAAc,EAAE,UAAU,CAAC,aAAa,CAAC,YAAY;QACrD,SAAS,EAAE,UAAU,CAAC,aAAa,CAAC,UAAU;QAC9C,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC,YAAY;QACjD,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,UAAU;KAC7C,CAAC;AACN,CAAC"}
+{"version":3,"file":"foldingRanges.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/providers/localDocumentProvider/foldingRanges.ts"],"names":[],"mappings":"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"}

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

@@ -1,23 +1,21 @@
-import { FoldingRange, Hover, Location, SignatureHelp } from "vscode-languageserver-types";
-import { DocumentUri } from "vscode-languageserver-textdocument";
-import { AutocompleteItemProviderContext, IDefinitionProvider, IFoldingRangeProvider, ISemanticTokenProvider, ISymbolProvider, OnIdentifierProviderContext, PartialSemanticToken, ProviderContext, SignatureProviderContext } from "../commonTypes";
-import { Inspection, Library } from "../..";
-import { InspectionSettings } from "../../inspectionSettings";
-export declare class LocalDocumentProvider implements IDefinitionProvider, IFoldingRangeProvider, ISemanticTokenProvider, ISymbolProvider {
+import { CommonError, Result } from "@microsoft/powerquery-parser";
+import { DocumentUri, FoldingRange, Hover, Location, SignatureHelp } from "vscode-languageserver-types";
+import { AutocompleteItemProviderContext, DefinitionProviderContext, FoldingRangeProviderContext, HoverProviderContext, ILocalDocumentProvider, PartialSemanticToken, SemanticTokenProviderContext, SignatureProviderContext } from "../commonTypes";
+import { Inspection } from "../..";
+import { ILibrary } from "../../library/library";
+export declare class LocalDocumentProvider implements ILocalDocumentProvider {
     private readonly uri;
-    private readonly promiseMaybeInspected;
-    private readonly createInspectionSettingsFn;
-    readonly externalTypeResolver: Inspection.ExternalType.TExternalTypeResolverFn;
-    readonly libraryDefinitions: Library.LibraryDefinitions;
-    constructor(library: Library.ILibrary, uri: DocumentUri, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>, createInspectionSettingsFn: () => InspectionSettings);
-    getAutocompleteItems(context: AutocompleteItemProviderContext): Promise<ReadonlyArray<Inspection.AutocompleteItem>>;
-    getDefinition(context: OnIdentifierProviderContext): Promise<Location[] | null>;
-    getFoldingRanges(context: ProviderContext): Promise<FoldingRange[]>;
-    getHover(context: OnIdentifierProviderContext): Promise<Hover | null>;
-    getPartialSemanticTokens(context: ProviderContext): Promise<PartialSemanticToken[]>;
-    getSignatureHelp(context: SignatureProviderContext): Promise<SignatureHelp | null>;
-    protected static getHoverForIdentifierPairedExpression(context: OnIdentifierProviderContext, inspectionSettings: InspectionSettings, inspected: Inspection.Inspected, activeNode: Inspection.ActiveNode, correlationId: number): Promise<Hover | undefined>;
-    protected static getHoverForScopeItem(context: OnIdentifierProviderContext, nodeScope: Inspection.NodeScope, scopeType: Inspection.ScopeTypeByKey, correlationId: number): Hover | undefined;
-    private getMaybeInspectionInvokeExpression;
+    private readonly typeCache;
+    private readonly library;
+    protected readonly locale: string;
+    constructor(uri: DocumentUri, typeCache: Inspection.TypeCache, library: ILibrary, locale: string);
+    getAutocompleteItems(context: AutocompleteItemProviderContext): Promise<Result<Inspection.AutocompleteItem[] | undefined, CommonError.CommonError>>;
+    getDefinition(context: DefinitionProviderContext): Promise<Result<Location[] | undefined, CommonError.CommonError>>;
+    getFoldingRanges(context: FoldingRangeProviderContext): Promise<Result<FoldingRange[], CommonError.CommonError>>;
+    getHover(context: HoverProviderContext): Promise<Result<Hover | undefined, CommonError.CommonError>>;
+    getPartialSemanticTokens(context: SemanticTokenProviderContext): Promise<Result<PartialSemanticToken[] | undefined, CommonError.CommonError>>;
+    getSignatureHelp(context: SignatureProviderContext): Promise<Result<SignatureHelp | undefined, CommonError.CommonError>>;
+    protected getHoverForIdentifierPairedExpression(context: HoverProviderContext, correlationId: number): Promise<Hover | undefined>;
+    protected getHoverForScopeItem(context: HoverProviderContext, nodeScope: Inspection.NodeScope, scopeType: Inspection.ScopeTypeByKey, correlationId: number): Hover | undefined;
     private getAutocompleteItemsFromFieldAccess;
 }

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

@@ -14,141 +14,151 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalDocumentProvider = void 0;
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
-const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const InspectionUtils = require("../../inspectionUtils");
 const __1 = require("../..");
 const foldingRanges_1 = require("./foldingRanges");
 const partialSemanticToken_1 = require("./partialSemanticToken");
 const inspection_1 = require("../../inspection");
 class LocalDocumentProvider {
-    constructor(library, uri, promiseMaybeInspected, createInspectionSettingsFn) {
+    constructor(uri, typeCache, library, locale) {
         this.uri = uri;
-        this.promiseMaybeInspected = promiseMaybeInspected;
-        this.createInspectionSettingsFn = createInspectionSettingsFn;
-        this.externalTypeResolver = library.externalTypeResolver;
-        this.libraryDefinitions = library.libraryDefinitions;
+        this.typeCache = typeCache;
+        this.library = library;
+        this.locale = locale;
     }
     getAutocompleteItems(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getAutocompleteItems.name, context.maybeInitialCorrelationId);
-            const maybeInspected = yield this.promiseMaybeInspected;
-            if (maybeInspected === undefined) {
-                trace.exit({ maybeInspectedUndefined: true });
-                return [];
-            }
-            const result = [
-                ...this.getAutocompleteItemsFromFieldAccess(maybeInspected),
-                ...(yield InspectionUtils.getAutocompleteItemsFromScope(context, maybeInspected)),
-            ];
+        // eslint-disable-next-line require-await
+        return powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getAutocompleteItems.name, context.initialCorrelationId);
+            (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+            const autocompleteItems = [
+                ...this.getAutocompleteItemsFromFieldAccess(context.autocomplete),
+            ].concat(InspectionUtils.getAutocompleteItemsFromScope(context));
             trace.exit();
-            return result;
-        });
+            return autocompleteItems;
+        }), this.locale);
     }
     getDefinition(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getDefinition.name, context.maybeInitialCorrelationId);
+        // eslint-disable-next-line require-await
+        return powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getDefinition.name, context.initialCorrelationId);
+            (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
             if (context.identifier.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */ ||
                 context.identifier.identifierContextKind !== "Value" /* Value */) {
-                return null;
-            }
-            const maybeInspected = yield this.promiseMaybeInspected;
-            if (maybeInspected === undefined) {
-                return null;
+                return undefined;
             }
-            const triedNodeScope = yield maybeInspected.triedNodeScope;
+            const triedNodeScope = context.triedNodeScope;
             if (powerquery_parser_1.ResultUtils.isError(triedNodeScope)) {
-                return null;
+                return undefined;
             }
-            const maybeScopeItem = triedNodeScope.value.get(context.identifier.literal);
-            if (maybeScopeItem === undefined) {
-                return null;
+            const scopeItem = triedNodeScope.value.get(context.identifier.literal);
+            if (scopeItem === undefined) {
+                return undefined;
             }
-            const creator = inspection_1.ScopeUtils.maybeScopeCreatorIdentifier(maybeScopeItem);
+            const creator = inspection_1.ScopeUtils.scopeCreatorIdentifier(scopeItem);
             if (creator === undefined) {
-                return null;
+                return undefined;
             }
-            const result = {
+            const location = {
                 range: __1.PositionUtils.createRangeFromTokenRange(creator.tokenRange),
                 uri: this.uri,
             };
             trace.exit();
-            return [result];
-        });
+            return [location];
+        }), this.locale);
     }
-    // eslint-disable-next-line require-await
     getFoldingRanges(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getHover.name, context.maybeInitialCorrelationId);
-            const maybeInspected = yield this.promiseMaybeInspected;
-            if (maybeInspected === undefined) {
-                return [];
-            }
-            const nodeIdMapCollection = maybeInspected.parseState.contextState.nodeIdMapCollection;
-            const result = (0, foldingRanges_1.createFoldingRanges)(nodeIdMapCollection, context.traceManager, trace.id);
+        // eslint-disable-next-line require-await
+        return powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getFoldingRanges.name, context.initialCorrelationId);
+            (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+            const foldingRanges = (0, foldingRanges_1.createFoldingRanges)(context.nodeIdMapCollection, context.traceManager, trace.id);
             trace.exit();
-            return result;
-        });
+            return foldingRanges;
+        }), this.locale);
     }
     getHover(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getHover.name, context.maybeInitialCorrelationId);
-            const maybeInspected = yield this.promiseMaybeInspected;
-            if (maybeInspected === undefined) {
-                trace.exit({ maybeInspectedUndefined: true });
-                return null;
-            }
-            const activeNode = maybeInspected.maybeActiveNode;
-            if (!__1.Inspection.ActiveNodeUtils.isPositionInBounds(activeNode)) {
-                trace.exit({ outOfBounds: true });
-                return null;
-            }
-            let maybeHover = yield LocalDocumentProvider.getHoverForIdentifierPairedExpression(context, this.createInspectionSettingsFn(), maybeInspected, activeNode, trace.id);
-            if (maybeHover !== undefined) {
-                trace.exit({ maybeHover: true });
-                return maybeHover;
+        return powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getHover.name, context.initialCorrelationId);
+            (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+            let hover = yield this.getHoverForIdentifierPairedExpression(context, trace.id);
+            if (hover !== undefined) {
+                trace.exit({ hover: true });
+                return hover;
             }
-            const triedNodeScope = yield maybeInspected.triedNodeScope;
-            const triedScopeType = yield maybeInspected.triedScopeType;
+            const triedNodeScope = context.triedNodeScope;
+            const triedScopeType = context.triedScopeType;
             if (!powerquery_parser_1.ResultUtils.isOk(triedNodeScope) || !powerquery_parser_1.ResultUtils.isOk(triedScopeType)) {
                 trace.exit({ inspectionError: true });
-                return null;
+                return undefined;
             }
-            maybeHover = LocalDocumentProvider.getHoverForScopeItem(context, triedNodeScope.value, triedScopeType.value, trace.id);
+            hover = this.getHoverForScopeItem(context, triedNodeScope.value, triedScopeType.value, trace.id);
             trace.exit();
-            return maybeHover !== null && maybeHover !== void 0 ? maybeHover : null;
-        });
+            return hover !== null && hover !== void 0 ? hover : undefined;
+        }), this.locale);
     }
     // eslint-disable-next-line require-await
     getPartialSemanticTokens(context) {
         return __awaiter(this, void 0, void 0, function* () {
-            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getPartialSemanticTokens.name, context.maybeInitialCorrelationId);
-            const maybeInspected = yield this.promiseMaybeInspected;
-            if (maybeInspected === undefined) {
-                return [];
-            }
-            const nodeIdMapCollection = maybeInspected.parseState.contextState.nodeIdMapCollection;
-            const tokens = (0, partialSemanticToken_1.createPartialSemanticTokens)(nodeIdMapCollection, this.libraryDefinitions, context.traceManager, trace.id);
-            trace.exit();
-            return tokens;
+            return powerquery_parser_1.ResultUtils.ensureResult(() => {
+                var _a;
+                const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getPartialSemanticTokens.name, context.initialCorrelationId);
+                (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+                const nodeIdMapCollection = context.parseState.contextState.nodeIdMapCollection;
+                const tokens = (0, partialSemanticToken_1.createPartialSemanticTokens)(nodeIdMapCollection, this.library.libraryDefinitions, context.traceManager, trace.id);
+                trace.exit();
+                return tokens;
+            }, this.locale);
         });
     }
+    // eslint-disable-next-line require-await
     getSignatureHelp(context) {
         return __awaiter(this, void 0, void 0, function* () {
-            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getSignatureHelp.name, context.maybeInitialCorrelationId);
-            const maybeInvokeInspection = yield this.getMaybeInspectionInvokeExpression();
-            if (maybeInvokeInspection === undefined) {
-                trace.exit({ maybeInvokeInspectionUndefined: true });
-                return null;
-            }
-            const inspection = maybeInvokeInspection;
-            if (inspection.maybeName && !inspection.isNameInLocalScope) {
-                trace.exit({ unknownName: true });
-                return null;
-            }
-            const result = InspectionUtils.getMaybeSignatureHelp(context, trace.id);
-            trace.exit();
-            return result;
+            return powerquery_parser_1.ResultUtils.ensureResult(() => {
+                var _a;
+                const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getSignatureHelp.name, context.initialCorrelationId);
+                (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+                const invokeInspection = powerquery_parser_1.ResultUtils.isOk(context.triedCurrentInvokeExpression)
+                    ? context.triedCurrentInvokeExpression.value
+                    : undefined;
+                if (invokeInspection === undefined) {
+                    trace.exit({ invokeInspectionUndefined: true });
+                    return undefined;
+                }
+                if (invokeInspection.name && !invokeInspection.isNameInLocalScope) {
+                    trace.exit({ unknownName: true });
+                    return undefined;
+                }
+                const identifierLiteral = context.functionName;
+                if (identifierLiteral === undefined || !language_1.TypeUtils.isDefinedFunction(context.functionType)) {
+                    return undefined;
+                }
+                const nameOfParameters = context.functionType.parameters
+                    .map((parameter) => language_1.TypeUtils.nameOfFunctionParameter(parameter, context.traceManager, trace.id))
+                    .join(", ");
+                const label = `${identifierLiteral}(${nameOfParameters})`;
+                const parameters = context.functionType.parameters;
+                const result = {
+                    activeParameter: context.argumentOrdinal,
+                    activeSignature: 0,
+                    signatures: [
+                        {
+                            label,
+                            parameters: parameters.map((parameter) => ({
+                                label: parameter.nameLiteral,
+                            })),
+                        },
+                    ],
+                };
+                trace.exit();
+                return result;
+            }, this.locale);
         });
     }
     // When hovering over a key it should show the type for the value.
@@ -156,35 +166,35 @@ class LocalDocumentProvider {
     //  * GeneralizedIdentifierPairedAnyLiteral
     //  * GeneralizedIdentifierPairedExpression
     //  * IdentifierPairedExpression
-    static getHoverForIdentifierPairedExpression(context, inspectionSettings, inspected, activeNode, correlationId) {
-        var _a, _b, _c;
+    getHoverForIdentifierPairedExpression(context, correlationId) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getHoverForIdentifierPairedExpression.name, correlationId);
-            const parseState = inspected.parseState;
-            const ancestry = activeNode.ancestry;
-            const maybeLeafKind = (_a = ancestry[0]) === null || _a === void 0 ? void 0 : _a.node.kind;
-            const isValidLeafNodeKind = ["GeneralizedIdentifier" /* GeneralizedIdentifier */, "Identifier" /* Identifier */].includes(maybeLeafKind);
+            (_a = context.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+            const ancestry = context.activeNode.ancestry;
+            const leafKInd = (_b = ancestry[0]) === null || _b === void 0 ? void 0 : _b.node.kind;
+            const isValidLeafNodeKind = ["GeneralizedIdentifier" /* GeneralizedIdentifier */, "Identifier" /* Identifier */].includes(leafKInd);
             if (!isValidLeafNodeKind) {
                 trace.exit();
                 return undefined;
             }
-            const maybeIdentifierPairedExpression = parser_1.AncestryUtils.maybeNthXorChecked(activeNode.ancestry, 1, [
+            const identifierPairedExpression = parser_1.AncestryUtils.nthXorChecked(context.activeNode.ancestry, 1, [
                 "GeneralizedIdentifierPairedAnyLiteral" /* GeneralizedIdentifierPairedAnyLiteral */,
                 "GeneralizedIdentifierPairedExpression" /* GeneralizedIdentifierPairedExpression */,
                 "IdentifierPairedExpression" /* IdentifierPairedExpression */,
             ]);
             // We're on an identifier in some other context which we don't support.
-            if (maybeIdentifierPairedExpression === undefined) {
+            if (identifierPairedExpression === undefined) {
                 trace.exit();
                 return undefined;
             }
-            const maybeExpression = parser_1.NodeIdMapUtils.maybeNthChild(parseState.contextState.nodeIdMapCollection, maybeIdentifierPairedExpression.node.id, 2);
+            const expression = parser_1.NodeIdMapUtils.nthChild(context.parseState.contextState.nodeIdMapCollection, identifierPairedExpression.node.id, 2);
             // We're on an identifier in some other context which we don't support.
-            if (maybeExpression === undefined) {
+            if (expression === undefined) {
                 trace.exit();
                 return undefined;
             }
-            const triedExpressionType = yield __1.Inspection.tryType(inspectionSettings, parseState.contextState.nodeIdMapCollection, maybeExpression.node.id, inspected.typeCache);
+            const triedExpressionType = yield __1.Inspection.tryType(Object.assign(Object.assign({}, context.inspectionSettings), { initialCorrelationId: trace.id }), context.parseState.contextState.nodeIdMapCollection, expression.node.id, this.typeCache);
             // TODO handle error
             if (powerquery_parser_1.ResultUtils.isError(triedExpressionType)) {
                 trace.exit();
@@ -192,17 +202,17 @@ class LocalDocumentProvider {
             }
             let scopeItemText = "unknown";
             // If it's a SectionMember
-            const maybeThirdNodeKind = (_b = ancestry[2]) === null || _b === void 0 ? void 0 : _b.node.kind;
-            if (maybeThirdNodeKind === "SectionMember" /* SectionMember */) {
+            const thirdNodeKind = (_c = ancestry[2]) === null || _c === void 0 ? void 0 : _c.node.kind;
+            if (thirdNodeKind === "SectionMember" /* SectionMember */) {
                 scopeItemText = InspectionUtils.getScopeItemKindText("SectionMember" /* SectionMember */);
             }
             // Else if it's RecordExpression or RecordLiteral
-            const maybeFifthNodeKind = (_c = ancestry[4]) === null || _c === void 0 ? void 0 : _c.node.kind;
-            const isRecordNodeKind = ["RecordExpression" /* RecordExpression */, "RecordLiteral" /* RecordLiteral */].includes(maybeFifthNodeKind);
+            const fifthNodeKind = (_d = ancestry[4]) === null || _d === void 0 ? void 0 : _d.node.kind;
+            const isRecordNodeKind = ["RecordExpression" /* RecordExpression */, "RecordLiteral" /* RecordLiteral */].includes(fifthNodeKind);
             if (isRecordNodeKind) {
                 scopeItemText = InspectionUtils.getScopeItemKindText("RecordField" /* RecordField */);
             }
-            else if (maybeFifthNodeKind === "LetExpression" /* LetExpression */) {
+            else if (fifthNodeKind === "LetExpression" /* LetExpression */) {
                 scopeItemText = InspectionUtils.getScopeItemKindText("LetVariable" /* LetVariable */);
             }
             const nameOfExpressionType = language_1.TypeUtils.nameOf(triedExpressionType.value, context.traceManager, trace.id);
@@ -218,16 +228,16 @@ class LocalDocumentProvider {
             return result;
         });
     }
-    static getHoverForScopeItem(context, nodeScope, scopeType, correlationId) {
+    getHoverForScopeItem(context, nodeScope, scopeType, correlationId) {
         const identifierLiteral = context.identifier.literal;
-        const maybeScopeItem = nodeScope.get(identifierLiteral);
-        if (maybeScopeItem === undefined || maybeScopeItem.kind === "Undefined" /* Undefined */) {
+        const scopeItem = nodeScope.get(identifierLiteral);
+        if (scopeItem === undefined || scopeItem.kind === "Undefined" /* Undefined */) {
             return undefined;
         }
-        const scopeItemText = InspectionUtils.getScopeItemKindText(maybeScopeItem.kind);
-        const maybeScopeItemType = scopeType.get(identifierLiteral);
-        const scopeItemTypeText = maybeScopeItemType !== undefined
-            ? language_1.TypeUtils.nameOf(maybeScopeItemType, context.traceManager, correlationId)
+        const scopeItemText = InspectionUtils.getScopeItemKindText(scopeItem.kind);
+        const scopeItemType = scopeType.get(identifierLiteral);
+        const scopeItemTypeText = scopeItemType !== undefined
+            ? language_1.TypeUtils.nameOf(scopeItemType, context.traceManager, correlationId)
             : "unknown";
         return {
             contents: {
@@ -238,18 +248,8 @@ class LocalDocumentProvider {
             range: undefined,
         };
     }
-    getMaybeInspectionInvokeExpression() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const maybeInspected = yield this.promiseMaybeInspected;
-            if (maybeInspected === undefined) {
-                return undefined;
-            }
-            const triedCurrentInvokeExpression = yield maybeInspected.triedCurrentInvokeExpression;
-            return powerquery_parser_1.ResultUtils.isOk(triedCurrentInvokeExpression) ? triedCurrentInvokeExpression.value : undefined;
-        });
-    }
-    getAutocompleteItemsFromFieldAccess(inspection) {
-        const triedFieldAccess = inspection.autocomplete.triedFieldAccess;
+    getAutocompleteItemsFromFieldAccess(autocomplete) {
+        const triedFieldAccess = autocomplete.triedFieldAccess;
         return powerquery_parser_1.ResultUtils.isOk(triedFieldAccess) && triedFieldAccess.value !== undefined
             ? triedFieldAccess.value.autocompleteItems
             : [];