@microsoft/powerquery-language-services 0.3.31 → 0.3.32

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

@@ -1,8 +1,9 @@
-import type { Hover, SignatureHelp, TextEdit } from "vscode-languageserver-types";
+import type { Hover, Location, SignatureHelp, TextEdit } from "vscode-languageserver-types";
 import { IDisposable } from "../commonTypes";
 import { Inspection } from "..";
 export interface Analysis extends IDisposable {
     getAutocompleteItems(): Promise<Inspection.AutocompleteItem[]>;
+    getDefinition(): Promise<Location[]>;
     getHover(): Promise<Hover>;
     getSignatureHelp(): Promise<SignatureHelp>;
     getRenameEdits(newName: string): Promise<TextEdit[]>;

package/lib/powerquery-language-services/analysis/analysisBase.d.ts

@@ -1,17 +1,20 @@
-import type { Hover, Range, SignatureHelp, TextEdit } from "vscode-languageserver-types";
+import type { Hover, Location, Range, SignatureHelp, TextEdit } from "vscode-languageserver-types";
+import type { DocumentUri } from "vscode-languageserver-textdocument";
 import { AutocompleteItem } from "../inspection";
-import type { AutocompleteItemProvider, ISymbolProvider } from "../providers/commonTypes";
+import type { IAutocompleteItemProvider, ILocalDocumentProvider, ISymbolProvider } from "../providers/commonTypes";
 import { Inspection } from "..";
 import type { Analysis } from "./analysis";
 import type { AnalysisSettings } from "./analysisSettings";
 export declare abstract class AnalysisBase implements Analysis {
+    protected uri: DocumentUri;
     protected analysisSettings: AnalysisSettings;
     protected promiseMaybeInspected: Promise<Inspection.Inspected | undefined>;
-    protected languageAutocompleteItemProvider: AutocompleteItemProvider;
+    protected languageAutocompleteItemProvider: IAutocompleteItemProvider;
     protected librarySymbolProvider: ISymbolProvider;
-    protected localDocumentSymbolProvider: ISymbolProvider;
-    constructor(analysisSettings: AnalysisSettings, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>);
+    protected localDocumentProvider: ILocalDocumentProvider;
+    constructor(uri: DocumentUri, analysisSettings: AnalysisSettings, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>);
     getAutocompleteItems(): Promise<AutocompleteItem[]>;
+    getDefinition(): Promise<Location[]>;
     getHover(): Promise<Hover>;
     getSignatureHelp(): Promise<SignatureHelp>;
     getRenameEdits(newName: string): Promise<TextEdit[]>;
@@ -23,6 +26,7 @@ export declare abstract class AnalysisBase implements Analysis {
     private static createHoverCalls;
     private static createSignatureHelpCalls;
     private static isValidHoverIdentifier;
+    private getMaybeIdentifierContext;
     private getMaybePositionIdentifier;
     private getMaybeActiveNode;
 }

package/lib/powerquery-language-services/analysis/analysisBase.js

@@ -21,7 +21,8 @@ const commonTypes_1 = require("../commonTypes");
 const scopeUtils_1 = require("../inspection/scope/scopeUtils");
 const providers_1 = require("../providers");
 class AnalysisBase {
-    constructor(analysisSettings, promiseMaybeInspected) {
+    constructor(uri, analysisSettings, promiseMaybeInspected) {
+        this.uri = uri;
         this.analysisSettings = analysisSettings;
         this.promiseMaybeInspected = promiseMaybeInspected;
         const library = analysisSettings.library;
@@ -33,10 +34,10 @@ class AnalysisBase {
             analysisSettings.maybeCreateLibrarySymbolProviderFn !== undefined
                 ? analysisSettings.maybeCreateLibrarySymbolProviderFn(library)
                 : new providers_1.LibrarySymbolProvider(library);
-        this.localDocumentSymbolProvider =
-            analysisSettings.maybeCreateLocalDocumentSymbolProviderFn !== undefined
-                ? analysisSettings.maybeCreateLocalDocumentSymbolProviderFn(library, promiseMaybeInspected, analysisSettings.createInspectionSettingsFn)
-                : new providers_1.LocalDocumentSymbolProvider(library, promiseMaybeInspected, analysisSettings.createInspectionSettingsFn);
+        this.localDocumentProvider =
+            analysisSettings.maybeCreateLocalDocumentProviderFn !== undefined
+                ? analysisSettings.maybeCreateLocalDocumentProviderFn(library, uri, promiseMaybeInspected, analysisSettings.createInspectionSettingsFn)
+                : new providers_1.LocalDocumentProvider(library, uri, promiseMaybeInspected, analysisSettings.createInspectionSettingsFn);
     }
     getAutocompleteItems() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,7 +53,7 @@ class AnalysisBase {
             // TODO: intellisense improvements
             // - honor expected data type
             // - only include current query name after @
-            const [languageResponse, libraryResponse, localDocumentResponse] = yield Promise.all(AnalysisBase.createAutocompleteItemCalls(context, [this.languageAutocompleteItemProvider, this.librarySymbolProvider, this.localDocumentSymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS));
+            const [languageResponse, libraryResponse, localDocumentResponse] = yield Promise.all(AnalysisBase.createAutocompleteItemCalls(context, [this.languageAutocompleteItemProvider, this.librarySymbolProvider, this.localDocumentProvider], this.analysisSettings.symbolProviderTimeoutInMS));
             const partial = [];
             for (const collection of [localDocumentResponse, languageResponse, libraryResponse]) {
                 for (const item of collection) {
@@ -66,26 +67,29 @@ class AnalysisBase {
             return result;
         });
     }
+    getDefinition() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const trace = this.analysisSettings.traceManager.entry("AnalysisBase" /* AnalysisBase */, this.getDefinition.name, this.analysisSettings.maybeInitialCorrelationId);
+            const maybeIdentifierContext = yield this.getMaybeIdentifierContext(trace.id);
+            if (!maybeIdentifierContext) {
+                trace.exit();
+                return [];
+            }
+            const result = yield this.localDocumentProvider.getDefinition(maybeIdentifierContext);
+            trace.exit();
+            return result !== null && result !== void 0 ? result : [];
+        });
+    }
     getHover() {
         return __awaiter(this, void 0, void 0, function* () {
             const trace = this.analysisSettings.traceManager.entry("AnalysisBase" /* AnalysisBase */, this.getHover.name, this.analysisSettings.maybeInitialCorrelationId);
-            const maybeActiveNode = yield this.getMaybeActiveNode();
-            const maybeIdentifierUnderPosition = maybeActiveNode === null || maybeActiveNode === void 0 ? void 0 : maybeActiveNode.maybeExclusiveIdentifierUnderPosition;
-            if (maybeActiveNode === undefined ||
-                maybeIdentifierUnderPosition === undefined ||
-                !AnalysisBase.isValidHoverIdentifier(maybeActiveNode)) {
+            const maybeIdentifierContext = yield this.getMaybeIdentifierContext(trace.id);
+            if (!maybeIdentifierContext) {
                 trace.exit();
                 return commonTypes_1.EmptyHover;
             }
-            const identifier = maybeIdentifierUnderPosition;
-            const context = {
-                traceManager: this.analysisSettings.traceManager,
-                range: __1.CommonTypesUtils.rangeFromTokenRange(identifier.tokenRange),
-                identifier: identifier.literal,
-                maybeInitialCorrelationId: trace.id,
-            };
             // Result priority is based on the order of the symbol providers
-            const result = AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptyHover);
+            const result = AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(maybeIdentifierContext, [this.localDocumentProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptyHover);
             trace.exit();
             return result;
         });
@@ -109,7 +113,7 @@ class AnalysisBase {
                 return commonTypes_1.EmptySignatureHelp;
             }
             // Result priority is based on the order of the symbol providers
-            const result = AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptySignatureHelp);
+            const result = AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [this.localDocumentProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptySignatureHelp);
             trace.exit();
             return result;
         });
@@ -149,7 +153,7 @@ class AnalysisBase {
                         }
                         const scopeItem = (0, scopeUtils_1.findScopeItemByLiteral)(nodeScope, maybeInclusiveIdentifierUnderPosition.literal);
                         if (scopeItem) {
-                            const maybeValueCreator = (0, scopeUtils_1.findTheCreatorIdentifierOfOneScopeItem)(scopeItem);
+                            const maybeValueCreator = (0, scopeUtils_1.maybeScopeCreatorIdentifier)(scopeItem);
                             if ((maybeValueCreator === null || maybeValueCreator === void 0 ? void 0 : maybeValueCreator.kind) === "Identifier" /* Identifier */) {
                                 if (maybeValueCreator.identifierContextKind === "Key" /* Key */ ||
                                     maybeValueCreator.identifierContextKind === "Parameter" /* Parameter */) {
@@ -250,6 +254,28 @@ class AnalysisBase {
         }
         return true;
     }
+    getMaybeIdentifierContext(correlationId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const trace = this.analysisSettings.traceManager.entry("AnalysisBase" /* AnalysisBase */, this.getDefinition.name, correlationId);
+            const maybeActiveNode = yield this.getMaybeActiveNode();
+            const maybeIdentifierUnderPosition = maybeActiveNode === null || maybeActiveNode === void 0 ? void 0 : maybeActiveNode.maybeExclusiveIdentifierUnderPosition;
+            if (maybeActiveNode === undefined ||
+                maybeIdentifierUnderPosition === undefined ||
+                !AnalysisBase.isValidHoverIdentifier(maybeActiveNode)) {
+                trace.exit();
+                return undefined;
+            }
+            const identifier = maybeIdentifierUnderPosition;
+            const context = {
+                traceManager: this.analysisSettings.traceManager,
+                range: __1.CommonTypesUtils.rangeFromTokenRange(identifier.tokenRange),
+                identifier: identifier.literal,
+                maybeInitialCorrelationId: trace.id,
+            };
+            trace.exit();
+            return context;
+        });
+    }
     getMaybePositionIdentifier() {
         return __awaiter(this, void 0, void 0, function* () {
             const maybeActiveNode = yield this.getMaybeActiveNode();

package/lib/powerquery-language-services/analysis/analysisBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAAsD;AAMtD,sDAAsD;AACtD,kDAAkD;AAClD,8CAAwE;AAWxE,0BAAkD;AAClD,gDAAgE;AAChE,+DAAqG;AACrG,4CAA8G;AAM9G,MAAsB,YAAY;IAK9B,YACc,GAAgB,EAChB,gBAAkC,EAClC,qBAAgE;QAFhE,QAAG,GAAH,GAAG,CAAa;QAChB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,0BAAqB,GAArB,qBAAqB,CAA2C;QAE1E,MAAM,OAAO,GAAqB,gBAAgB,CAAC,OAAO,CAAC;QAE3D,IAAI,CAAC,gCAAgC;YACjC,gBAAgB,CAAC,6CAA6C,KAAK,SAAS;gBACxE,CAAC,CAAC,gBAAgB,CAAC,6CAA6C,EAAE;gBAClE,CAAC,CAAC,IAAI,4CAAgC,CAAC,qBAAqB,CAAC,CAAC;QAEtE,IAAI,CAAC,qBAAqB;YACtB,gBAAgB,CAAC,kCAAkC,KAAK,SAAS;gBAC7D,CAAC,CAAC,gBAAgB,CAAC,kCAAkC,CAAC,OAAO,CAAC;gBAC9D,CAAC,CAAC,IAAI,iCAAqB,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,qBAAqB;YACtB,gBAAgB,CAAC,kCAAkC,KAAK,SAAS;gBAC7D,CAAC,CAAC,gBAAgB,CAAC,kCAAkC,CAC/C,OAAO,EACP,GAAG,EACH,qBAAqB,EACrB,gBAAgB,CAAC,0BAA0B,CAC9C;gBACH,CAAC,CAAC,IAAI,iCAAqB,CACrB,OAAO,EACP,GAAG,EACH,qBAAqB,EACrB,gBAAgB,CAAC,0BAA0B,CAC9C,CAAC;IAChB,CAAC;IAEY,oBAAoB;;YAC7B,MAAM,KAAK,GAAU,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,oCAEzD,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAC9B,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,CAAC;YAEF,IAAI,OAAO,GAAoC;gBAC3C,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY;gBAChD,yBAAyB,EAAE,KAAK,CAAC,EAAE;aACtC,CAAC;YAEF,MAAM,UAAU,GACZ,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAE5C,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC1B,OAAO,mCACA,OAAO,KACV,KAAK,EAAE,oBAAgB,CAAC,mBAAmB,CAAC,UAAU,CAAC,UAAU,CAAC,EAClE,IAAI,EAAE,UAAU,CAAC,OAAO,EACxB,SAAS,EAAE,UAAU,CAAC,IAAI,GAC7B,CAAC;aACL;YAED,kCAAkC;YAClC,6BAA6B;YAC7B,4CAA4C;YAC5C,MAAM,CAAC,gBAAgB,EAAE,eAAe,EAAE,qBAAqB,CAAC,GAE5D,MAAM,OAAO,CAAC,GAAG,CACjB,YAAY,CAAC,2BAA2B,CACpC,OAAO,EACP,CAAC,IAAI,CAAC,gCAAgC,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,EAC/F,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,CACJ,CAAC;YAEF,MAAM,OAAO,GAAuB,EAAE,CAAC;YAEvC,KAAK,MAAM,UAAU,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE;gBACjF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;oBAC3B,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,WAA6B,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;wBACjG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBACtB;iBACJ;aACJ;YAED,MAAM,MAAM,GAAuB,OAAO,CAAC,IAAI,CAAC,kCAAqB,CAAC,SAAS,CAAC,CAAC;YACjF,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAEY,aAAa;;YACtB,MAAM,KAAK,GAAU,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,oCAEzD,IAAI,CAAC,aAAa,CAAC,IAAI,EACvB,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,CAAC;YAEF,MAAM,sBAAsB,GAA8C,MAAM,IAAI,CAAC,yBAAyB,CAC1G,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,IAAI,CAAC,sBAAsB,EAAE;gBACzB,KAAK,CAAC,IAAI,EAAE,CAAC;gBAEb,OAAO,EAAE,CAAC;aACb;YAED,MAAM,MAAM,GAAsB,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;YAEzG,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACxB,CAAC;KAAA;IAEY,QAAQ;;YACjB,MAAM,KAAK,GAAU,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,oCAEzD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAClB,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,CAAC;YAEF,MAAM,sBAAsB,GAA8C,MAAM,IAAI,CAAC,yBAAyB,CAC1G,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,IAAI,CAAC,sBAAsB,EAAE;gBACzB,KAAK,CAAC,IAAI,EAAE,CAAC;gBAEb,OAAO,wBAAU,CAAC;aACrB;YAED,gEAAgE;YAChE,MAAM,MAAM,GAAmB,YAAY,CAAC,gBAAgB,CACxD,YAAY,CAAC,gBAAgB,CACzB,sBAAsB,EACtB,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,EACxD,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,EACD,wBAAU,CACb,CAAC;YAEF,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAEY,gBAAgB;;YACzB,MAAM,KAAK,GAAU,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,oCAEzD,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAC1B,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,CAAC;YAEF,MAAM,cAAc,GAAqC,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAE1F,IAAI,cAAc,KAAK,SAAS,EAAE;gBAC9B,KAAK,CAAC,IAAI,EAAE,CAAC;gBAEb,OAAO,gCAAkB,CAAC;aAC7B;YAED,MAAM,YAAY,GACd,MAAM,eAAe,CAAC,mCAAmC,CACrD,cAAc,EACd,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAClC,KAAK,CAAC,EAAE,CACX,CAAC;YAEN,IAAI,YAAY,KAAK,SAAS,EAAE;gBAC5B,KAAK,CAAC,IAAI,EAAE,CAAC;gBAEb,OAAO,gCAAkB,CAAC;aAC7B;YAED,MAAM,OAAO,GAA6B,YAAY,CAAC;YAEvD,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;gBACpC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAEb,OAAO,gCAAkB,CAAC;aAC7B;YAED,gEAAgE;YAChE,MAAM,MAAM,GAA2B,YAAY,CAAC,gBAAgB,CAChE,YAAY,CAAC,wBAAwB,CACjC,OAAO,EACP,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,CAAC,EACxD,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,EACD,gCAAkB,CACrB,CAAC;YAEF,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAEY,cAAc,CAAC,OAAe;;YACvC,MAAM,KAAK,GAAU,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,oCAEzD,IAAI,CAAC,cAAc,CAAC,IAAI,EACxB,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAClD,CAAC;YAEF,MAAM,cAAc,GAAqC,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAC1F,MAAM,UAAU,GAAsC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtF,MAAM,SAAS,GAAqC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,CAAC,SAAS,CAAC;YAExF,MAAM,qCAAqC,GACvC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,qCAAqC,CAAC;YAEtD,IAAI,cAAc,KAAK,SAAS,IAAI,qCAAqC,KAAK,SAAS,EAAE;gBACrF,KAAK,CAAC,IAAI,EAAE,CAAC;gBAEb,OAAO,EAAE,CAAC;aACb;YAED,MAAM,qBAAqB,GAAmD,EAAE,CAAC;YACjF,IAAI,YAAY,GAA2D,SAAS,CAAC;YAErF,IAAI,qCAAqC,CAAC,IAAI,wDAAuC,EAAE;gBACnF,YAAY,GAAG,qCAAqC,CAAC;aACxD;iBAAM,IAAI,qCAAqC,CAAC,IAAI,kCAA4B,IAAI,SAAS,EAAE;gBAC5F,0DAA0D;gBAC1D,MAAM,iBAAiB,GAAmB,qCAAuD,CAAC;gBAElG,QAAQ,iBAAiB,CAAC,qBAAqB,EAAE;oBAC7C,qBAAmC;oBACnC;wBACI,0CAA0C;wBAC1C,YAAY,GAAG,iBAAiB,CAAC;wBACjC,MAAM;oBAEV,wBAAoC,CAAC,CAAC;wBAClC,2CAA2C;wBAC3C,IAAI,SAAS,GAAqC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CACpF,iBAAiB,CAAC,EAAE,CACvB,CAAC;wBAEF,mFAAmF;wBACnF,IAAI,CAAC,SAAS,EAAE;4BACZ,MAAM,cAAc,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;4BACxD,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;yBAC5E;wBAED,MAAM,SAAS,GAAsC,IAAA,mCAAsB,EACvE,SAAS,EACT,qCAAqC,CAAC,OAAO,CAChD,CAAC;wBAEF,IAAI,SAAS,EAAE;4BACX,MAAM,iBAAiB,GACnB,IAAA,wCAA2B,EAAC,SAAS,CAAC,CAAC;4BAE3C,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,mCAA4B,EAAE;gCACrD,IACI,iBAAiB,CAAC,qBAAqB,oBAAkC;oCACzE,iBAAiB,CAAC,qBAAqB,gCAAwC,EACjF;oCACE,YAAY,GAAG,iBAAiB,CAAC;iCACpC;qCAAM;oCACH,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;iCACjD;6BACJ;iCAAM,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,yDAAuC,EAAE;gCACvE,YAAY,GAAG,iBAAiB,CAAC;6BACpC;iCAAM,IAAI,iBAAiB,EAAE;gCAC1B,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;6BACjD;yBACJ;wBAED,MAAM;qBACT;oBAED,6BAAuC;oBACvC;wBACI,mBAAmB;wBACnB,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;wBAC9C,MAAM;iBACb;aACJ;YAED,IAAI,YAAY,EAAE;gBACd,sDAAsD;gBACtD,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,cAAc,CAAC,4BAA4B,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;aACpG;YAED,oFAAoF;YACpF,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,IAAI,qCAAqC,EAAE;gBAC7E,qBAAqB,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;aACrE;YAED,MAAM,MAAM,GAAe,qBAAqB,CAAC,GAAG,CAAC,CAAC,GAA+C,EAAE,EAAE,CAAC,CAAC;gBACvG,KAAK,EAAE,aAAa,CAAC,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC;gBAC9D,OAAO,EAAE,OAAO;aACnB,CAAC,CAAC,CAAC;YAEJ,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAMO,MAAM,CAAC,kBAAkB,CAC7B,OAAyB,EACzB,kBAAqB,EACrB,WAAoB;QAEpB,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,iDAAiD;YACjD,OAAO,OAAO,CAAC,IAAI,CAAC;gBAChB,OAAO,EAAE;gBACT,IAAI,OAAO,CAAI,CAAC,OAA4C,EAAE,EAAE,CAC5D,UAAU,CAAC,GAAG,EAAE;oBACZ,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBAChC,CAAC,EAAE,WAAW,CAAC,CAClB;aACJ,CAAC,CAAC;SACN;QAED,OAAO,OAAO,EAAE,CAAC;IACrB,CAAC;IAEO,MAAM,CAAO,gBAAgB,CACjC,KAAuC,EACvC,kBAAqB;;YAErB,MAAM,OAAO,GAAiB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEvD,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;gBAChD,MAAM,MAAM,GAAa,OAAO,CAAC,CAAC,CAAC,CAAC;gBAEpC,IAAI,MAAM,KAAK,IAAI,EAAE;oBACjB,OAAO,MAAM,CAAC;iBACjB;aACJ;YAED,OAAO,kBAAkB,CAAC;QAC9B,CAAC;KAAA;IAEO,MAAM,CAAC,2BAA2B,CACtC,OAAwC,EACxC,SAAmD,EACnD,WAAoB;QAEpB,sCAAsC;QACtC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAmC,EAAE,EAAE,CACzD,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,CACzF,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAC3B,OAAsC,EACtC,SAA2B,EAC3B,WAAoB;QAEpB,sCAAsC;QACtC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAwB,EAAE,EAAE,CAC9C,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAC/E,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,wBAAwB,CACnC,OAAiC,EACjC,SAAkC,EAClC,WAAoB;QAEpB,sCAAsC;QACtC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAA+B,EAAE,EAAE,CACrD,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CACvF,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,sBAAsB,CAAC,UAAiC;;QACnE,MAAM,QAAQ,GAA4B,UAAU,CAAC,QAAQ,CAAC;QAE9D,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC;SACf;QAED,MAAM,IAAI,GAAa,0BAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,aAAa,GAAyB,QAAQ,CAAC,CAAC,CAAC,CAAC;QAExD,IAAI,CAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,0CAAE,IAAI,iCAA2B,EAAE;YACtD,OAAO,KAAK,CAAC;SAChB;QAED,sFAAsF;QACtF,yEAAyE;aACpE,IACD;;;;SAIC,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;YACnC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,0BAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAC1E;YACE,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,yBAAyB,CAAC,aAAqB;;YACzD,MAAM,KAAK,GAAU,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,oCAEzD,IAAI,CAAC,aAAa,CAAC,IAAI,EACvB,aAAa,CAChB,CAAC;YAEF,MAAM,eAAe,GAAsC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAE3F,MAAM,4BAA4B,GAC9B,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,qCAAqC,CAAC;YAE3D,IACI,eAAe,KAAK,SAAS;gBAC7B,4BAA4B,KAAK,SAAS;gBAC1C,CAAC,YAAY,CAAC,sBAAsB,CAAC,eAAe,CAAC,EACvD;gBACE,KAAK,CAAC,IAAI,EAAE,CAAC;gBAEb,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,UAAU,GAA+C,4BAA4B,CAAC;YAE5F,MAAM,OAAO,GAAkC;gBAC3C,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY;gBAChD,KAAK,EAAE,oBAAgB,CAAC,mBAAmB,CAAC,UAAU,CAAC,UAAU,CAAC;gBAClE,UAAU,EAAE,UAAU,CAAC,OAAO;gBAC9B,yBAAyB,EAAE,KAAK,CAAC,EAAE;aACtC,CAAC;YAEF,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAEa,0BAA0B;;YACpC,MAAM,eAAe,GAAsC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAE3F,OAAO,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,qCAAqC,CAAC;QAClE,CAAC;KAAA;IAEa,kBAAkB;;YAC5B,MAAM,cAAc,GAAqC,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAE1F,IAAI,cAAc,KAAK,SAAS,EAAE;gBAC9B,OAAO,SAAS,CAAC;aACpB;YAED,OAAO,cAAU,CAAC,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,eAAe,CAAC;gBAChF,CAAC,CAAC,cAAc,CAAC,eAAe;gBAChC,CAAC,CAAC,SAAS,CAAC;QACpB,CAAC;KAAA;CACJ;AA3cD,oCA2cC"}

package/lib/powerquery-language-services/analysis/analysisSettings.d.ts

@@ -1,5 +1,6 @@
+import { DocumentUri } from "vscode-languageserver-textdocument";
 import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
-import { AutocompleteItemProvider, ISymbolProvider } from "../providers/commonTypes";
+import { IAutocompleteItemProvider, ILocalDocumentProvider, ISymbolProvider } from "../providers/commonTypes";
 import { Inspection } from "..";
 import { InspectionSettings } from "../inspectionSettings";
 import { Library } from "../library";
@@ -7,9 +8,9 @@ export interface AnalysisSettings {
     readonly createInspectionSettingsFn: () => InspectionSettings;
     readonly isWorkspaceCacheAllowed: boolean;
     readonly library: Library.ILibrary;
-    readonly maybeCreateLanguageAutocompleteItemProviderFn?: () => AutocompleteItemProvider;
+    readonly maybeCreateLanguageAutocompleteItemProviderFn?: () => IAutocompleteItemProvider;
     readonly maybeCreateLibrarySymbolProviderFn?: (library: Library.ILibrary) => ISymbolProvider;
-    readonly maybeCreateLocalDocumentSymbolProviderFn?: (library: Library.ILibrary, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>, createInspectionSettingsFn: () => InspectionSettings) => ISymbolProvider;
+    readonly maybeCreateLocalDocumentProviderFn?: (library: Library.ILibrary, uri: DocumentUri, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>, createInspectionSettingsFn: () => InspectionSettings) => ILocalDocumentProvider;
     readonly maybeInitialCorrelationId: number | undefined;
     readonly symbolProviderTimeoutInMS?: number;
     readonly traceManager: TraceManager;

package/lib/powerquery-language-services/analysis/documentAnalysis.js

@@ -7,7 +7,7 @@ const analysisBase_1 = require("./analysisBase");
 const workspaceCache_1 = require("../workspaceCache");
 class DocumentAnalysis extends analysisBase_1.AnalysisBase {
     constructor(textDocument, analysisSettings, position) {
-        super(analysisSettings, workspaceCache_1.WorkspaceCacheUtils.getOrCreateInspectedPromise(textDocument, analysisSettings.createInspectionSettingsFn(), position));
+        super(textDocument.uri, analysisSettings, workspaceCache_1.WorkspaceCacheUtils.getOrCreateInspectedPromise(textDocument, analysisSettings.createInspectionSettingsFn(), position));
         this.textDocument = textDocument;
     }
     dispose() {

package/lib/powerquery-language-services/analysis/documentAnalysis.js.map

@@ -1 +1 @@
-{"version":3,"file":"documentAnalysis.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/documentAnalysis.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,iDAA8C;AAE9C,sDAAwD;AAExD,MAAa,gBAAiB,SAAQ,2BAAY;IAC9C,YAA6B,YAA0B,EAAE,gBAAkC,EAAE,QAAkB;QAC3G,KAAK,CACD,gBAAgB,EAChB,oCAAmB,CAAC,2BAA2B,CAC3C,YAAY,EACZ,gBAAgB,CAAC,0BAA0B,EAAE,EAC7C,QAAQ,CACX,CACJ,CAAC;QARuB,iBAAY,GAAZ,YAAY,CAAc;IASvD,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE;YAChD,oCAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAChD;IACL,CAAC;IAES,OAAO,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;CACJ;AArBD,4CAqBC"}
+{"version":3,"file":"documentAnalysis.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/documentAnalysis.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,iDAA8C;AAE9C,sDAAwD;AAExD,MAAa,gBAAiB,SAAQ,2BAAY;IAC9C,YAA6B,YAA0B,EAAE,gBAAkC,EAAE,QAAkB;QAC3G,KAAK,CACD,YAAY,CAAC,GAAG,EAChB,gBAAgB,EAChB,oCAAmB,CAAC,2BAA2B,CAC3C,YAAY,EACZ,gBAAgB,CAAC,0BAA0B,EAAE,EAC7C,QAAQ,CACX,CACJ,CAAC;QATuB,iBAAY,GAAZ,YAAY,CAAc;IAUvD,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE;YAChD,oCAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAChD;IACL,CAAC;IAES,OAAO,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;CACJ;AAtBD,4CAsBC"}

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

@@ -1,5 +1,5 @@
-import { DocumentUri, TextDocument, TextDocumentContentChangeEvent } from "vscode-languageserver-textdocument";
 import { CompletionItem, CompletionItemKind, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DocumentSymbol, Hover, Position, Range, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
+import { DocumentUri, TextDocument, TextDocumentContentChangeEvent } from "vscode-languageserver-textdocument";
 export type { CompletionItem, Diagnostic, DiagnosticRelatedInformation, DocumentSymbol, DocumentUri, Hover, Position, Range, SignatureHelp, TextDocument, TextDocumentContentChangeEvent, };
 export { CompletionItemKind, DiagnosticSeverity, SymbolKind };
 export interface IDisposable {

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

@@ -3,11 +3,11 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmptySignatureHelp = exports.EmptyHover = exports.SymbolKind = exports.DiagnosticSeverity = exports.CompletionItemKind = void 0;
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 Object.defineProperty(exports, "CompletionItemKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.CompletionItemKind; } });
 Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return vscode_languageserver_types_1.DiagnosticSeverity; } });
 Object.defineProperty(exports, "SymbolKind", { enumerable: true, get: function () { return vscode_languageserver_types_1.SymbolKind; } });
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 exports.EmptyHover = {
     range: undefined,
     contents: [],

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

@@ -1 +1 @@
-{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2FAA+G;AAE/G,6EAYqC;AAe5B,mGAzBL,gDAAkB,OAyBK;AAAE,mGAtBzB,gDAAkB,OAsByB;AAAE,2FAhB7C,wCAAU,OAgB6C;AAM9C,QAAA,UAAU,GAAU;IAC7B,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,EAAE;CACf,CAAC;AAEW,QAAA,kBAAkB,GAAkB;IAC7C,UAAU,EAAE,EAAE;IACd,eAAe,EAAE,SAAS;IAC1B,eAAe,EAAE,SAAS;CAC7B,CAAC"}
+{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,6EAYqC;AAgB5B,mGA1BL,gDAAkB,OA0BK;AAAE,mGAvBzB,gDAAkB,OAuByB;AAAE,2FAjB7C,wCAAU,OAiB6C;AAf3D,2FAA+G;AAqBlG,QAAA,UAAU,GAAU;IAC7B,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,EAAE;CACf,CAAC;AAEW,QAAA,kBAAkB,GAAkB;IAC7C,UAAU,EAAE,EAAE;IACd,eAAe,EAAE,SAAS;IAC1B,eAAe,EAAE,SAAS;CAC7B,CAAC"}

package/lib/powerquery-language-services/inspection/scope/scopeUtils.d.ts

@@ -11,5 +11,5 @@ export declare function isRecordField(maybeValue: TScopeItem | undefined): maybe
 export declare function isSectionMember(maybeValue: TScopeItem | undefined): maybeValue is SectionMemberScopeItem;
 export declare function isUndefined(maybeValue: TScopeItem | undefined): maybeValue is UndefinedScopeItem;
 export declare function findScopeItemByLiteral(nodeScope: NodeScope | undefined, literalString: string): TScopeItem | undefined;
-export declare function findTheCreatorIdentifierOfOneScopeItem(scopeItem: TScopeItem | undefined): Ast.Identifier | Ast.GeneralizedIdentifier | undefined;
+export declare function maybeScopeCreatorIdentifier(scopeItem: TScopeItem | undefined): Ast.Identifier | Ast.GeneralizedIdentifier | undefined;
 export declare function findDirectUpperScopeExpression(nodeIdMapCollection: NodeIdMap.Collection, nodeId: number): EachExpression | FunctionExpression | LetExpression | RecordExpression | RecordLiteral | SectionMember | undefined;

package/lib/powerquery-language-services/inspection/scope/scopeUtils.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findDirectUpperScopeExpression = exports.findTheCreatorIdentifierOfOneScopeItem = exports.findScopeItemByLiteral = exports.isUndefined = exports.isSectionMember = exports.isRecordField = exports.isParameter = exports.isLetVariable = exports.isEach = void 0;
+exports.findDirectUpperScopeExpression = exports.maybeScopeCreatorIdentifier = exports.findScopeItemByLiteral = exports.isUndefined = exports.isSectionMember = exports.isRecordField = exports.isParameter = exports.isLetVariable = exports.isEach = void 0;
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const PQP = require("@microsoft/powerquery-parser");
@@ -48,7 +48,7 @@ function findScopeItemByLiteral(nodeScope, literalString) {
     return nodeScope === null || nodeScope === void 0 ? void 0 : nodeScope.get(literalString);
 }
 exports.findScopeItemByLiteral = findScopeItemByLiteral;
-function findTheCreatorIdentifierOfOneScopeItem(scopeItem) {
+function maybeScopeCreatorIdentifier(scopeItem) {
     if (!scopeItem) {
         return undefined;
     }
@@ -57,18 +57,16 @@ function findTheCreatorIdentifierOfOneScopeItem(scopeItem) {
         case "Undefined" /* Undefined */:
             return undefined;
         case "LetVariable" /* LetVariable */:
-            return scopeItem.key;
-        case "Parameter" /* Parameter */:
-            return scopeItem.name;
         case "RecordField" /* RecordField */:
-            return scopeItem.key;
         case "SectionMember" /* SectionMember */:
             return scopeItem.key;
+        case "Parameter" /* Parameter */:
+            return scopeItem.name;
         default:
             throw PQP.Assert.isNever(scopeItem);
     }
 }
-exports.findTheCreatorIdentifierOfOneScopeItem = findTheCreatorIdentifierOfOneScopeItem;
+exports.maybeScopeCreatorIdentifier = maybeScopeCreatorIdentifier;
 function findDirectUpperScopeExpression(nodeIdMapCollection, nodeId) {
     const astNodeById = nodeIdMapCollection.astNodeById;
     const parentIdById = nodeIdMapCollection.parentIdById;

package/lib/powerquery-language-services/inspection/scope/scopeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,oDAAoD;AA2BpD,0CAAwB;AACxB,oDAAkC;AAElC,SAAgB,MAAM,CAAC,UAAkC;IACrD,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,uBAAuB,CAAC;AACnD,CAAC;AAFD,wBAEC;AAED,SAAgB,aAAa,CAAC,UAAkC;IAC5D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,qCAA8B,CAAC;AAC1D,CAAC;AAFD,sCAEC;AAED,SAAgB,WAAW,CAAC,UAAkC;IAC1D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,iCAA4B,CAAC;AACxD,CAAC;AAFD,kCAEC;AAED,SAAgB,aAAa,CAAC,UAAkC;IAC5D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,qCAA8B,CAAC;AAC1D,CAAC;AAFD,sCAEC;AAED,SAAgB,eAAe,CAAC,UAAkC;IAC9D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,yCAAgC,CAAC;AAC5D,CAAC;AAFD,0CAEC;AAED,SAAgB,WAAW,CAAC,UAAkC;IAC1D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,iCAA4B,CAAC;AACxD,CAAC;AAFD,kCAEC;AAED,SAAgB,sBAAsB,CAClC,SAAgC,EAChC,aAAqB;IAErB,OAAO,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAC,aAAa,CAAC,CAAC;AACzC,CAAC;AALD,wDAKC;AAED,SAAgB,sCAAsC,CAClD,SAAiC;IAEjC,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,SAAS,CAAC;KACpB;IAED,QAAQ,SAAS,CAAC,IAAI,EAAE;QACpB,uBAAwB;QACxB;YACI,OAAO,SAAS,CAAC;QACrB;YACI,OAAO,SAAS,CAAC,GAAG,CAAC;QACzB;YACI,OAAO,SAAS,CAAC,IAAI,CAAC;QAC1B;YACI,OAAO,SAAS,CAAC,GAAG,CAAC;QACzB;YACI,OAAO,SAAS,CAAC,GAAG,CAAC;QACzB;YACI,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KAC3C;AACL,CAAC;AAtBD,wFAsBC;AAED,SAAgB,8BAA8B,CAC1C,mBAAyC,EACzC,MAAc;IAEd,MAAM,WAAW,GAAgB,mBAAmB,CAAC,WAAW,CAAC;IACjE,MAAM,YAAY,GAAiB,mBAAmB,CAAC,YAAY,CAAC;IAEpE,IAAI,WAAW,GAA0B,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEjE,OACI,WAAW;QACX,WAAW,CAAC,IAAI,0CAAgC;QAChD,WAAW,CAAC,IAAI,kDAAoC;QACpD,WAAW,CAAC,IAAI,wCAA+B;QAC/C,WAAW,CAAC,IAAI,8CAAkC;QAClD,WAAW,CAAC,IAAI,wCAA+B;QAC/C,WAAW,CAAC,IAAI,wCAA+B,EACjD;QACE,MAAM,eAAe,GAAW,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACvE,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;KAClD;IAED,OAAO,WAOQ,CAAC;AACpB,CAAC;AA9BD,wEA8BC"}
+{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,oDAAoD;AA2BpD,0CAAwB;AACxB,oDAAkC;AAElC,SAAgB,MAAM,CAAC,UAAkC;IACrD,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,uBAAuB,CAAC;AACnD,CAAC;AAFD,wBAEC;AAED,SAAgB,aAAa,CAAC,UAAkC;IAC5D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,qCAA8B,CAAC;AAC1D,CAAC;AAFD,sCAEC;AAED,SAAgB,WAAW,CAAC,UAAkC;IAC1D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,iCAA4B,CAAC;AACxD,CAAC;AAFD,kCAEC;AAED,SAAgB,aAAa,CAAC,UAAkC;IAC5D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,qCAA8B,CAAC;AAC1D,CAAC;AAFD,sCAEC;AAED,SAAgB,eAAe,CAAC,UAAkC;IAC9D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,yCAAgC,CAAC;AAC5D,CAAC;AAFD,0CAEC;AAED,SAAgB,WAAW,CAAC,UAAkC;IAC1D,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,iCAA4B,CAAC;AACxD,CAAC;AAFD,kCAEC;AAED,SAAgB,sBAAsB,CAClC,SAAgC,EAChC,aAAqB;IAErB,OAAO,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAC,aAAa,CAAC,CAAC;AACzC,CAAC;AALD,wDAKC;AAED,SAAgB,2BAA2B,CACvC,SAAiC;IAEjC,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,SAAS,CAAC;KACpB;IAED,QAAQ,SAAS,CAAC,IAAI,EAAE;QACpB,uBAAwB;QACxB;YACI,OAAO,SAAS,CAAC;QAErB,qCAA+B;QAC/B,qCAA+B;QAC/B;YACI,OAAO,SAAS,CAAC,GAAG,CAAC;QAEzB;YACI,OAAO,SAAS,CAAC,IAAI,CAAC;QAE1B;YACI,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KAC3C;AACL,CAAC;AAvBD,kEAuBC;AAED,SAAgB,8BAA8B,CAC1C,mBAAyC,EACzC,MAAc;IAEd,MAAM,WAAW,GAAgB,mBAAmB,CAAC,WAAW,CAAC;IACjE,MAAM,YAAY,GAAiB,mBAAmB,CAAC,YAAY,CAAC;IAEpE,IAAI,WAAW,GAA0B,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEjE,OACI,WAAW;QACX,WAAW,CAAC,IAAI,0CAAgC;QAChD,WAAW,CAAC,IAAI,kDAAoC;QACpD,WAAW,CAAC,IAAI,wCAA+B;QAC/C,WAAW,CAAC,IAAI,8CAAkC;QAClD,WAAW,CAAC,IAAI,wCAA+B;QAC/C,WAAW,CAAC,IAAI,wCAA+B,EACjD;QACE,MAAM,eAAe,GAAW,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACvE,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;KAClD;IAED,OAAO,WAOQ,CAAC;AACpB,CAAC;AA9BD,wEA8BC"}

package/lib/powerquery-language-services/inspection/task.js

@@ -84,7 +84,7 @@ class InspectionInstance {
                     else if (oneIdentifierNode.identifierContextKind === "Value" /* Value */) {
                         const theScope = this.typeCache.scopeById.get(oneIdentifierNode.id);
                         const theScopeItem = (0, scopeUtils_1.findScopeItemByLiteral)(theScope, originLiteral);
-                        const theCreatorIdentifier = (0, scopeUtils_1.findTheCreatorIdentifierOfOneScopeItem)(theScopeItem);
+                        const theCreatorIdentifier = (0, scopeUtils_1.maybeScopeCreatorIdentifier)(theScopeItem);
                         return theCreatorIdentifier && theCreatorIdentifier.id === valueCreator.id;
                     }
                     else if (oneIdentifierNode.identifierContextKind === "Key" /* Key */ ||

package/lib/powerquery-language-services/inspection/task.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAKpD,6CAA6E;AAO7E,mDAI4B;AAE5B,iDAAoE;AACpE,mCAAmE;AACnE,iCAAsD;AACtD,2CAAwD;AACxD,iDAA8C;AAI9C,wFAAwF;AAExF,MAAa,kBAAkB;IAC3B,YACoB,QAA4B,EAC5B,mBAAyC,EACzC,eAAiC,EACjC,YAAqC,EACrC,4BAA8E,EAC9E,cAAkD,EAClD,cAAkD,EAClD,iBAAoC,EACpC,SAAoB,EACpB,UAAiC;QATjC,aAAQ,GAAR,QAAQ,CAAoB;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAsB;QACzC,oBAAe,GAAf,eAAe,CAAkB;QACjC,iBAAY,GAAZ,YAAY,CAAyB;QACrC,iCAA4B,GAA5B,4BAA4B,CAAkD;QAC9E,mBAAc,GAAd,cAAc,CAAoC;QAClD,mBAAc,GAAd,cAAc,CAAoC;QAClD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAuB;IAClD,CAAC;IAEG,YAAY,CAAC,EAAU;QAC1B,MAAM,KAAK,GAAU,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,0BAEjD,oBAAY,CAAC,IAAI,EACjB,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAC1C,CAAC;QAEF,MAAM,eAAe,mCACd,IAAI,CAAC,QAAQ,KAChB,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,MAAM,GAAuC,IAAA,oBAAY,EAC3D,eAAe,EACf,IAAI,CAAC,mBAAmB,EACxB,EAAE,EACF,IAAI,CAAC,SAAS,CAAC,SAAS,CAC3B,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;IAEY,4BAA4B,CACrC,YAAwD;;;YAExD,MAAM,WAAW,GAAgB,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC;YACtE,MAAM,YAAY,GAAiB,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC;YACzE,MAAM,aAAa,GAAW,YAAY,CAAC,OAAO,CAAC;YAEnD,MAAM,KAAK,GAA0B,IAAA,2CAA8B,EAAC,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;YAE/G,IAAI,KAAK,EAAE;gBACP,MAAM,kBAAkB,GACpB,MAAA,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,GAAG,+BAAyB,mCAAI,IAAI,GAAG,EAAE,CAAC;gBAErF,MAAM,6BAA6B,GAC/B,MAAA,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,GAAG,qDAAoC,mCAAI,IAAI,GAAG,EAAE,CAAC;gBAEhG,MAAM,OAAO,GAAc,KAAK,CAAC;gBACjC,MAAM,UAAU,GAAe,EAAE,CAAC;gBAClC,IAAI,WAAW,GAAa,CAAC,MAAA,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;gBAEzE,OAAO,WAAW,CAAC,MAAM,EAAE;oBACvB,MAAM,UAAU,GAAa,WAAW,CAAC,MAAM,CAC3C,CAAC,GAAW,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,6BAA6B,CAAC,GAAG,CAAC,GAAG,CAAC,CACzF,CAAC;oBAEF,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACjD,WAAW,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC;oBAClC,IAAI,QAAQ,GAAa,EAAE,CAAC;oBAE5B,OAAO,WAAW,CAAC,MAAM,EAAE;wBACvB,MAAM,OAAO,GAAW,MAAA,WAAW,CAAC,KAAK,EAAE,mCAAI,CAAC,CAAC,CAAC;wBAClD,MAAM,iBAAiB,GAAa,CAAC,MAAA,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;wBAC9E,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;qBACjD;oBAED,WAAW,GAAG,QAAQ,CAAC;iBAC1B;gBAED,uBAAuB;gBACvB,MAAM,uBAAuB,GAAsD,UAAU;qBACxF,IAAI,CAAC,CAAC,CAAC;qBACP,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;qBAC1C,MAAM,CAAC,OAAO,CAAsD,CAAC;gBAE1E,IAAI,uBAAuB,GACvB,uBAAuB,CAAC,MAAM,CAC1B,CAAC,GAA+C,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,KAAK,aAAa,CACrF,CAAC;gBAEN,oCAAoC;gBACpC,MAAM,OAAO,CAAC,GAAG,CACb,uBAAuB;qBAClB,MAAM,CACH,CAAC,aAAyD,EAAE,EAAE,CAC1D,aAAa,CAAC,IAAI,wDAAuC;oBACzD,aAAa,CAAC,qBAAqB,wBAAoC,CAC9E;qBACA,GAAG,CAAC,CAAC,aAAyD,EAAE,EAAE,CAC/D,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CACtC,CACR,CAAC;gBAEF,uBAAuB,GAAG,uBAAuB,CAAC,MAAM,CACpD,CAAC,iBAA6D,EAAE,EAAE;oBAC9D,IAAI,iBAAiB,CAAC,IAAI,wDAAuC,EAAE;wBAC/D,OAAO,iBAAiB,CAAC,EAAE,KAAK,YAAY,CAAC,EAAE,CAAC;qBACnD;yBAAM,IAAI,iBAAiB,CAAC,qBAAqB,wBAAoC,EAAE;wBACpF,MAAM,QAAQ,GAAqC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAC3E,iBAAiB,CAAC,EAAE,CACvB,CAAC;wBAEF,MAAM,YAAY,GAA2B,IAAA,mCAAsB,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;wBAE7F,MAAM,oBAAoB,GACtB,IAAA,mDAAsC,EAAC,YAAY,CAAC,CAAC;wBAEzD,OAAO,oBAAoB,IAAI,oBAAoB,CAAC,EAAE,KAAK,YAAY,CAAC,EAAE,CAAC;qBAC9E;yBAAM,IACH,iBAAiB,CAAC,qBAAqB,oBAAkC;wBACzE,iBAAiB,CAAC,qBAAqB,gCAAwC,EACjF;wBACE,OAAO,iBAAiB,CAAC,EAAE,KAAK,YAAY,CAAC,EAAE,CAAC;qBACnD;oBAED,OAAO,KAAK,CAAC;gBACjB,CAAC,CACJ,CAAC;gBAEF,OAAO,uBAAuB,CAAC;aAClC;YAED,OAAO,EAAE,CAAC;;KACb;CACJ;AAnID,gDAmIC;AAED,SAAsB,OAAO,CACzB,QAA4B,EAC5B,UAAiC,EACjC,eAA6D,EAC7D,QAAkB;AAClB,oGAAoG;AACpG,4DAA4D;AAC5D,YAAuB,0BAAc,CAAC,gBAAgB,EAAE;;QAExD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,0BAE5C,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAE9F,2EAA2E;QAC3E,MAAM,eAAe,GAAqB,4BAAe,CAAC,eAAe,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QAEzG,MAAM,4BAA4B,GAA0C,IAAA,oDAA0B,EAClG,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,SAAS,CACZ,CAAC;QAEF,IAAI,cAAuC,CAAC;QAC5C,IAAI,cAAuC,CAAC;QAC5C,IAAI,iBAAoC,CAAC;QAEzC,IAAI,4BAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE;YACrD,MAAM,UAAU,GAAe,eAAe,CAAC;YAE/C,cAAc,GAAG,IAAA,oBAAY,EACzB,eAAe,EACf,mBAAmB,EACnB,4BAAe,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,EACjD,SAAS,CAAC,SAAS,CACtB,CAAC;YAEF,MAAM,YAAY,GAAa,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC3F,cAAc,GAAG,IAAA,mBAAY,EAAC,eAAe,EAAE,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YAErG,iBAAiB,GAAG,IAAA,8BAAe,EAAC,eAAe,EAAE,UAAU,CAAC,CAAC;SACpE;aAAM;YACH,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;YACnE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;YACnE,iBAAiB,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SACxD;QAED,MAAM,MAAM,GAAuB,IAAI,kBAAkB,CACrD,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,MAAM,IAAA,2BAAY,EAAC,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,EAC5F,4BAA4B,EAC5B,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,SAAS,EACT,UAAU,CACb,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAxED,0BAwEC;AAED,SAAsB,UAAU,CAC5B,QAA4B,EAC5B,IAAY,EACZ,QAAkB,EAClB,YAAuB,0BAAc,CAAC,gBAAgB,EAAE;;QAExD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,0BAE5C,UAAU,CAAC,IAAI,EACf,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,aAAa,GAA+B,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAEzG,IAAI,UAAiC,CAAC;QACtC,IAAI,eAA6D,CAAC;QAElE,IAAI,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,uBAAuB,CAAC,aAAa,CAAC,EAAE;YACtG,KAAK,CAAC,IAAI,CAAC,EAAE,yBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;YAE9C,OAAO,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACxD;aAAM,IAAI,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE;YACvD,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC;YACtC,eAAe,GAAG,aAAa,CAAC,KAAK,CAAC;SACzC;aAAM;YACH,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC;SACzC;QAED,MAAM,MAAM,GAAgD,GAAG,CAAC,WAAW,CAAC,KAAK,CAC7E,OAAO,CAAC,eAAe,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,CAAC,CAC7E,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,yBAAuB,EAAE,KAAK,EAAE,CAAC,CAAC;QAE/C,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AAxCD,gCAwCC"}
+{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/task.ts"],"names":[],"mappings":"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"}

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

@@ -1,21 +1,26 @@
-import type { Hover, Range, SignatureHelp } from "vscode-languageserver-types";
+import type { Hover, Location, Range, SignatureHelp } from "vscode-languageserver-types";
 import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
 import type { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import type { AutocompleteItem } from "../inspection/autocomplete/autocompleteItem";
 import type { ILibrary } from "../library/library";
-export interface AutocompleteItemProvider {
+export interface IAutocompleteItemProvider {
     getAutocompleteItems(context: AutocompleteItemProviderContext): Promise<ReadonlyArray<AutocompleteItem>>;
 }
 export interface AutocompleteItemProviderContext extends ProviderContext {
     readonly text?: string;
     readonly tokenKind?: string;
 }
-export interface HoverProvider {
-    getHover(context: HoverProviderContext): Promise<Hover | null>;
+export interface IDefinitionProvider {
+    getDefinition(context: OverIdentifierProviderContext): Promise<Location[] | null>;
 }
-export interface HoverProviderContext extends ProviderContext {
+export interface IHoverProvider {
+    getHover(context: OverIdentifierProviderContext): Promise<Hover | null>;
+}
+export interface OverIdentifierProviderContext extends ProviderContext {
     readonly identifier: string;
 }
+export interface ILocalDocumentProvider extends IDefinitionProvider, ISymbolProvider {
+}
 export interface ProviderContext {
     readonly traceManager: TraceManager;
     readonly maybeInitialCorrelationId: number | undefined;
@@ -30,5 +35,5 @@ export interface SignatureProviderContext extends ProviderContext {
     readonly isNameInLocalScope: boolean;
     readonly functionType: Type.TPowerQueryType;
 }
-export interface ISymbolProvider extends AutocompleteItemProvider, HoverProvider, SignatureHelpProvider, ILibrary {
+export interface ISymbolProvider extends IAutocompleteItemProvider, IHoverProvider, SignatureHelpProvider, ILibrary {
 }

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

@@ -1,5 +1,5 @@
 export * from "./commonTypes";
 export { LibrarySymbolProvider } from "./librarySymbolProvider";
 export { LanguageAutocompleteItemProvider } from "./languageCompletionItemProvider";
-export { LocalDocumentSymbolProvider } from "./localDocumentSymbolProvider";
+export { LocalDocumentProvider } from "./localDocumentProvider";
 export { NullSymbolProvider } from "./nullSymbolProvider";

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

@@ -16,14 +16,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NullSymbolProvider = exports.LocalDocumentSymbolProvider = exports.LanguageAutocompleteItemProvider = exports.LibrarySymbolProvider = void 0;
+exports.NullSymbolProvider = exports.LocalDocumentProvider = exports.LanguageAutocompleteItemProvider = exports.LibrarySymbolProvider = void 0;
 __exportStar(require("./commonTypes"), exports);
 var librarySymbolProvider_1 = require("./librarySymbolProvider");
 Object.defineProperty(exports, "LibrarySymbolProvider", { enumerable: true, get: function () { return librarySymbolProvider_1.LibrarySymbolProvider; } });
 var languageCompletionItemProvider_1 = require("./languageCompletionItemProvider");
 Object.defineProperty(exports, "LanguageAutocompleteItemProvider", { enumerable: true, get: function () { return languageCompletionItemProvider_1.LanguageAutocompleteItemProvider; } });
-var localDocumentSymbolProvider_1 = require("./localDocumentSymbolProvider");
-Object.defineProperty(exports, "LocalDocumentSymbolProvider", { enumerable: true, get: function () { return localDocumentSymbolProvider_1.LocalDocumentSymbolProvider; } });
+var localDocumentProvider_1 = require("./localDocumentProvider");
+Object.defineProperty(exports, "LocalDocumentProvider", { enumerable: true, get: function () { return localDocumentProvider_1.LocalDocumentProvider; } });
 var nullSymbolProvider_1 = require("./nullSymbolProvider");
 Object.defineProperty(exports, "NullSymbolProvider", { enumerable: true, get: function () { return nullSymbolProvider_1.NullSymbolProvider; } });
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;AAElC,gDAA8B;AAE9B,iEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAC9B,mFAAoF;AAA3E,kJAAA,gCAAgC,OAAA;AACzC,6EAA4E;AAAnE,0IAAA,2BAA2B,OAAA;AACpC,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;AAElC,gDAA8B;AAE9B,iEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAC9B,mFAAoF;AAA3E,kJAAA,gCAAgC,OAAA;AACzC,iEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAC9B,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA"}

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

@@ -1,7 +1,7 @@
-import { AutocompleteItemProvider, AutocompleteItemProviderContext } from "./commonTypes";
+import { AutocompleteItemProviderContext, IAutocompleteItemProvider } from "./commonTypes";
 import { AutocompleteItem } from "../inspection/autocomplete/autocompleteItem";
 import { Inspection } from "..";
-export declare class LanguageAutocompleteItemProvider implements AutocompleteItemProvider {
+export declare class LanguageAutocompleteItemProvider implements IAutocompleteItemProvider {
     private readonly maybePromiseInspection;
     private static readonly ExcludedKeywords;
     constructor(maybePromiseInspection: Promise<Inspection.Inspected | undefined>);

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

@@ -1,5 +1,5 @@
 import { Hover, SignatureHelp, SignatureInformation } from "vscode-languageserver-types";
-import { AutocompleteItemProviderContext, HoverProviderContext, ISymbolProvider, SignatureProviderContext } from "./commonTypes";
+import { AutocompleteItemProviderContext, ISymbolProvider, OverIdentifierProviderContext, SignatureProviderContext } from "./commonTypes";
 import { Library } from "../library";
 import { Inspection } from "..";
 export declare class LibrarySymbolProvider implements ISymbolProvider {
@@ -8,7 +8,7 @@ export declare class LibrarySymbolProvider implements ISymbolProvider {
     protected readonly signatureInformationByLabel: Map<string, SignatureInformation>;
     constructor(library: Library.ILibrary);
     getAutocompleteItems(context: AutocompleteItemProviderContext): Promise<ReadonlyArray<Inspection.AutocompleteItem>>;
-    getHover(context: HoverProviderContext): Promise<Hover | null>;
+    getHover(context: OverIdentifierProviderContext): Promise<Hover | null>;
     getSignatureHelp(context: SignatureProviderContext): Promise<SignatureHelp | null>;
     private static getDefinitionKindText;
     private getOrCreateSignatureInformation;

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

@@ -1 +1 @@
-{"version":3,"file":"librarySymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/librarySymbolProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"librarySymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/librarySymbolProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,6EAAqG;AACrG,oEAAsD;AAEtD,0FAAwF;AAQxF,wCAAmD;AACnD,8CAAsD;AAItD,MAAa,qBAAqB;IAK9B,YAAY,OAAyB;QACjC,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;QACzD,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACrD,IAAI,CAAC,2BAA2B,GAAG,IAAI,GAAG,EAAE,CAAC;IACjD,CAAC;IAED,yCAAyC;IAC5B,oBAAoB,CAC7B,OAAwC;;YAExC,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,sDAE3C,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAC9B,OAAO,CAAC,yBAAyB,CACpC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACjC,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBAErC,OAAO,EAAE,CAAC;aACb;YAED,MAAM,OAAO,GAAkC,EAAE,CAAC;YAClD,MAAM,gBAAgB,GAAuB,OAAO,CAAC,IAAI,CAAC;YAE1D,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE;gBACjE,OAAO,CAAC,IAAI,CAAC,kCAAqB,CAAC,2BAA2B,CAAC,KAAK,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;aACxG;YAED,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAED,yCAAyC;IAC5B,QAAQ,CAAC,OAAsC;;YACxD,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,sDAE3C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAClB,OAAO,CAAC,yBAAyB,CACpC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;gBACrB,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBAErC,OAAO,IAAI,CAAC;aACf;YAED,MAAM,iBAAiB,GAAW,OAAO,CAAC,UAAU,CAAC;YACrD,MAAM,eAAe,GAA2C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEhH,IAAI,eAAe,KAAK,SAAS,EAAE;gBAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBAErC,OAAO,IAAI,CAAC;aACf;YAED,MAAM,UAAU,GAA+B,eAAe,CAAC;YAC/D,MAAM,cAAc,GAAW,qBAAqB,CAAC,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAE5F,MAAM,kBAAkB,GAAW,oBAAS,CAAC,MAAM,CAC/C,UAAU,CAAC,gBAAgB,EAC3B,OAAO,CAAC,YAAY,EACpB,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,KAAK,GAAU;gBACjB,QAAQ,EAAE;oBACN,IAAI,EAAE,wCAAU,CAAC,SAAS;oBAC1B,QAAQ,EAAE,YAAY;oBACtB,KAAK,EAAE,IAAI,cAAc,KAAK,iBAAiB,KAAK,kBAAkB,EAAE;iBAC3E;gBACD,KAAK,EAAE,SAAS;aACnB,CAAC;YAEF,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CAAC,OAAiC;;;YAC3D,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,sDAE3C,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAC1B,OAAO,CAAC,yBAAyB,CACpC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBACvB,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBAErC,OAAO,IAAI,CAAC;aACf;YAED,MAAM,iBAAiB,GAAW,OAAO,CAAC,YAAY,CAAC;YACvD,MAAM,eAAe,GAA2C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAE/G,IAAI,CAAC,sBAAY,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBAC3C,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBAErC,OAAO,IAAI,CAAC;aACf;YAED,MAAM,MAAM,GAAkB;gBAC1B,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,CAAC;gBAC7C,eAAe,EAAE,CAAC;gBAClB,UAAU,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;aACxE,CAAC;YAEF,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,MAAM,CAAC;;KACjB;IAEO,MAAM,CAAC,qBAAqB,CAAC,IAAmC;QACpE,QAAQ,IAAI,EAAE;YACV;gBACI,OAAO,kBAAkB,CAAC;YAE9B;gBACI,OAAO,kBAAkB,CAAC;YAE9B;gBACI,OAAO,cAAc,CAAC;YAE1B;gBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAClC;IACL,CAAC;IAEO,+BAA+B,CAAC,GAAW;QAC/C,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC5C,MAAM,UAAU,GAA4B,sBAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5G,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,GAAG,EAAE,sBAAY,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC,CAAC;SAClG;QAED,OAAO,0BAAM,CAAC,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;CACJ;AA/ID,sDA+IC"}

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

@@ -0,0 +1,21 @@
+import { Hover, Location, SignatureHelp } from "vscode-languageserver-types";
+import { DocumentUri } from "vscode-languageserver-textdocument";
+import { AutocompleteItemProviderContext, IDefinitionProvider, ISymbolProvider, OverIdentifierProviderContext, SignatureProviderContext } from "./commonTypes";
+import { Inspection, Library } from "..";
+import { InspectionSettings } from "../inspectionSettings";
+export declare class LocalDocumentProvider implements IDefinitionProvider, ISymbolProvider {
+    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: OverIdentifierProviderContext): Promise<Location[] | null>;
+    getHover(context: OverIdentifierProviderContext): Promise<Hover | null>;
+    getSignatureHelp(context: SignatureProviderContext): Promise<SignatureHelp | null>;
+    protected static getHoverForIdentifierPairedExpression(context: OverIdentifierProviderContext, inspectionSettings: InspectionSettings, inspected: Inspection.Inspected, activeNode: Inspection.ActiveNode, correlationId: number): Promise<Hover | undefined>;
+    protected static getHoverForScopeItem(context: OverIdentifierProviderContext, nodeScope: Inspection.NodeScope, scopeType: Inspection.ScopeTypeByKey, correlationId: number): Hover | undefined;
+    private getMaybeInspectionInvokeExpression;
+    private getAutocompleteItemsFromFieldAccess;
+}

package/lib/powerquery-language-services/providers/{localDocumentSymbolProvider.js → localDocumentProvider.js}

@@ -11,15 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalDocumentSymbolProvider = void 0;
+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 InspectionUtils = require("../inspectionUtils");
 const __1 = require("..");
-class LocalDocumentSymbolProvider {
-    constructor(library, promiseMaybeInspected, createInspectionSettingsFn) {
+const inspection_1 = require("../inspection");
+class LocalDocumentProvider {
+    constructor(library, uri, promiseMaybeInspected, createInspectionSettingsFn) {
+        this.uri = uri;
         this.promiseMaybeInspected = promiseMaybeInspected;
         this.createInspectionSettingsFn = createInspectionSettingsFn;
         this.externalTypeResolver = library.externalTypeResolver;
@@ -41,6 +43,33 @@ class LocalDocumentSymbolProvider {
             return result;
         });
     }
+    getDefinition(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getDefinition.name, context.maybeInitialCorrelationId);
+            const maybeInspected = yield this.promiseMaybeInspected;
+            if (maybeInspected === undefined) {
+                return null;
+            }
+            const triedNodeScope = yield maybeInspected.triedNodeScope;
+            if (powerquery_parser_1.ResultUtils.isError(triedNodeScope)) {
+                return null;
+            }
+            const maybeScopeItem = triedNodeScope.value.get(context.identifier);
+            if (maybeScopeItem === undefined) {
+                return null;
+            }
+            const creator = inspection_1.ScopeUtils.maybeScopeCreatorIdentifier(maybeScopeItem);
+            if (creator === undefined) {
+                return null;
+            }
+            const result = {
+                range: __1.PositionUtils.createRangeFromTokenRange(creator.tokenRange),
+                uri: this.uri,
+            };
+            trace.exit();
+            return [result];
+        });
+    }
     getHover(context) {
         return __awaiter(this, void 0, void 0, function* () {
             const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getHover.name, context.maybeInitialCorrelationId);
@@ -54,7 +83,7 @@ class LocalDocumentSymbolProvider {
                 trace.exit({ outOfBounds: true });
                 return null;
             }
-            let maybeHover = yield LocalDocumentSymbolProvider.getHoverForIdentifierPairedExpression(context, this.createInspectionSettingsFn(), maybeInspected, activeNode, trace.id);
+            let maybeHover = yield LocalDocumentProvider.getHoverForIdentifierPairedExpression(context, this.createInspectionSettingsFn(), maybeInspected, activeNode, trace.id);
             if (maybeHover !== undefined) {
                 trace.exit({ maybeHover: true });
                 return maybeHover;
@@ -65,7 +94,7 @@ class LocalDocumentSymbolProvider {
                 trace.exit({ inspectionError: true });
                 return null;
             }
-            maybeHover = LocalDocumentSymbolProvider.getHoverForScopeItem(context, triedNodeScope.value, triedScopeType.value, trace.id);
+            maybeHover = LocalDocumentProvider.getHoverForScopeItem(context, triedNodeScope.value, triedScopeType.value, trace.id);
             trace.exit();
             return maybeHover !== null && maybeHover !== void 0 ? maybeHover : null;
         });
@@ -192,5 +221,5 @@ class LocalDocumentSymbolProvider {
             : [];
     }
 }
-exports.LocalDocumentSymbolProvider = LocalDocumentSymbolProvider;
-//# sourceMappingURL=localDocumentSymbolProvider.js.map
+exports.LocalDocumentProvider = LocalDocumentProvider;
+//# sourceMappingURL=localDocumentProvider.js.map

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

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

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

@@ -1,4 +1,5 @@
-import { AutocompleteItemProviderContext, HoverProviderContext, ISymbolProvider, SignatureProviderContext } from "./commonTypes";
+import { Location } from "vscode-languageserver-types";
+import { AutocompleteItemProviderContext, ISymbolProvider, OverIdentifierProviderContext, SignatureProviderContext } from "./commonTypes";
 import { Hover, SignatureHelp } from "../commonTypes";
 import { Inspection, Library } from "..";
 import { AutocompleteItem } from "../inspection/autocomplete";
@@ -8,6 +9,7 @@ export declare class NullSymbolProvider implements ISymbolProvider {
     private static instance;
     static singleton(): NullSymbolProvider;
     getAutocompleteItems(_context: AutocompleteItemProviderContext): Promise<ReadonlyArray<AutocompleteItem>>;
-    getHover(_context: HoverProviderContext): Promise<Hover | null>;
+    getDefinition(_context: OverIdentifierProviderContext): Promise<Location[] | null>;
+    getHover(_context: OverIdentifierProviderContext): Promise<Hover | null>;
     getSignatureHelp(_context: SignatureProviderContext): Promise<SignatureHelp | null>;
 }

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

@@ -31,6 +31,12 @@ class NullSymbolProvider {
         });
     }
     // eslint-disable-next-line require-await
+    getDefinition(_context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return [];
+        });
+    }
+    // eslint-disable-next-line require-await
     getHover(_context) {
         return __awaiter(this, void 0, void 0, function* () {
             return null;

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

@@ -1 +1 @@
-{"version":3,"file":"nullSymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/nullSymbolProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AASlC,0BAAyC;AAGzC,MAAa,kBAAkB;IAA/B;QACoB,yBAAoB,GAChC,cAAU,CAAC,YAAY,CAAC,wBAAwB,CAAC;QACrC,uBAAkB,GAA+B,IAAI,GAAG,EAAE,CAAC;IA4B/E,CAAC;IAxBU,MAAM,CAAC,SAAS;QACnB,IAAI,kBAAkB,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC3C,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;SAC1D;QAED,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACvC,CAAC;IAED,yCAAyC;IAC5B,oBAAoB,CAC7B,QAAyC;;YAEzC,OAAO,EAAE,CAAC;QACd,CAAC;KAAA;IAED,yCAAyC;IAC5B,QAAQ,CAAC,QAA8B;;YAChD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CAAC,QAAkC;;YAC5D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;CACJ;AA/BD,gDA+BC"}
+{"version":3,"file":"nullSymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/nullSymbolProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAWlC,0BAAyC;AAGzC,MAAa,kBAAkB;IAA/B;QACoB,yBAAoB,GAChC,cAAU,CAAC,YAAY,CAAC,wBAAwB,CAAC;QACrC,uBAAkB,GAA+B,IAAI,GAAG,EAAE,CAAC;IAiC/E,CAAC;IA7BU,MAAM,CAAC,SAAS;QACnB,IAAI,kBAAkB,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC3C,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;SAC1D;QAED,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACvC,CAAC;IAED,yCAAyC;IAC5B,oBAAoB,CAC7B,QAAyC;;YAEzC,OAAO,EAAE,CAAC;QACd,CAAC;KAAA;IAED,yCAAyC;IAC5B,aAAa,CAAC,QAAuC;;YAC9D,OAAO,EAAE,CAAC;QACd,CAAC;KAAA;IAED,yCAAyC;IAC5B,QAAQ,CAAC,QAAuC;;YACzD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CAAC,QAAkC;;YAC5D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;CACJ;AApCD,gDAoCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/powerquery-language-services",
-    "version": "0.3.31",
+    "version": "0.3.32",
     "author": "Microsoft",
     "license": "MIT",
     "scripts": {

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

@@ -1,18 +0,0 @@
-import { Hover, SignatureHelp } from "vscode-languageserver-types";
-import { AutocompleteItemProviderContext, HoverProviderContext, ISymbolProvider, SignatureProviderContext } from "./commonTypes";
-import { Inspection, Library } from "..";
-import { InspectionSettings } from "../inspectionSettings";
-export declare class LocalDocumentSymbolProvider implements ISymbolProvider {
-    private readonly promiseMaybeInspected;
-    private readonly createInspectionSettingsFn;
-    readonly externalTypeResolver: Inspection.ExternalType.TExternalTypeResolverFn;
-    readonly libraryDefinitions: Library.LibraryDefinitions;
-    constructor(library: Library.ILibrary, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>, createInspectionSettingsFn: () => InspectionSettings);
-    getAutocompleteItems(context: AutocompleteItemProviderContext): Promise<ReadonlyArray<Inspection.AutocompleteItem>>;
-    getHover(context: HoverProviderContext): Promise<Hover | null>;
-    getSignatureHelp(context: SignatureProviderContext): Promise<SignatureHelp | null>;
-    protected static getHoverForIdentifierPairedExpression(context: HoverProviderContext, inspectionSettings: InspectionSettings, inspected: Inspection.Inspected, activeNode: Inspection.ActiveNode, correlationId: number): Promise<Hover | undefined>;
-    protected static getHoverForScopeItem(context: HoverProviderContext, nodeScope: Inspection.NodeScope, scopeType: Inspection.ScopeTypeByKey, correlationId: number): Hover | undefined;
-    private getMaybeInspectionInvokeExpression;
-    private getAutocompleteItemsFromFieldAccess;
-}

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

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