@microsoft/powerquery-language-services 0.2.18 → 0.3.2

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

@@ -1,22 +1,20 @@
-import type { Hover, Position, Range, SignatureHelp } from "vscode-languageserver-types";
+import type { Hover, Range, SignatureHelp } from "vscode-languageserver-types";
 import { AutocompleteItem } from "../inspection";
 import type { AutocompleteItemProvider, ISymbolProvider } from "../providers/commonTypes";
-import { WorkspaceCache } from "../workspaceCache";
+import { Inspection } from "..";
 import type { Analysis } from "./analysis";
 import type { AnalysisSettings } from "./analysisSettings";
 export declare abstract class AnalysisBase implements Analysis {
     protected analysisSettings: AnalysisSettings;
-    protected maybeInspectionCacheItem: WorkspaceCache.CacheItem;
-    protected position: Position;
+    protected promiseMaybeInspected: Promise<Inspection.Inspected | undefined>;
     protected languageAutocompleteItemProvider: AutocompleteItemProvider;
     protected librarySymbolProvider: ISymbolProvider;
     protected localDocumentSymbolProvider: ISymbolProvider;
-    constructor(analysisSettings: AnalysisSettings, maybeInspectionCacheItem: WorkspaceCache.CacheItem, position: Position);
+    constructor(analysisSettings: AnalysisSettings, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>);
     getAutocompleteItems(): Promise<AutocompleteItem[]>;
     getHover(): Promise<Hover>;
     getSignatureHelp(): Promise<SignatureHelp>;
     abstract dispose(): void;
-    protected abstract getLexerState(): WorkspaceCache.LexCacheItem;
     protected abstract getText(range?: Range): string;
     private static promiseWithTimeout;
     private static resolveProviders;

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

@@ -10,253 +10,138 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalysisBase = void 0;
-var powerquery_parser_1 = require("@microsoft/powerquery-parser");
-var InspectionUtils = require("../inspectionUtils");
-var inspection_1 = require("../inspection");
-var __1 = require("..");
-var commonTypes_1 = require("../commonTypes");
-var providers_1 = require("../providers");
-var workspaceCache_1 = require("../workspaceCache");
-var AnalysisBase = /** @class */ (function () {
-    function AnalysisBase(analysisSettings, maybeInspectionCacheItem, position) {
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const InspectionUtils = require("../inspectionUtils");
+const inspection_1 = require("../inspection");
+const __1 = require("..");
+const commonTypes_1 = require("../commonTypes");
+const providers_1 = require("../providers");
+class AnalysisBase {
+    constructor(analysisSettings, promiseMaybeInspected) {
         this.analysisSettings = analysisSettings;
-        this.maybeInspectionCacheItem = maybeInspectionCacheItem;
-        this.position = position;
-        var library = analysisSettings.library;
+        this.promiseMaybeInspected = promiseMaybeInspected;
+        const library = analysisSettings.library;
         this.languageAutocompleteItemProvider =
             analysisSettings.maybeCreateLanguageAutocompleteItemProviderFn !== undefined
                 ? analysisSettings.maybeCreateLanguageAutocompleteItemProviderFn()
-                : new providers_1.LanguageAutocompleteItemProvider(maybeInspectionCacheItem);
+                : new providers_1.LanguageAutocompleteItemProvider(promiseMaybeInspected);
         this.librarySymbolProvider =
             analysisSettings.maybeCreateLibrarySymbolProviderFn !== undefined
                 ? analysisSettings.maybeCreateLibrarySymbolProviderFn(library)
                 : new providers_1.LibrarySymbolProvider(library);
         this.localDocumentSymbolProvider =
             analysisSettings.maybeCreateLocalDocumentSymbolProviderFn !== undefined
-                ? analysisSettings.maybeCreateLocalDocumentSymbolProviderFn(library, maybeInspectionCacheItem, analysisSettings.createInspectionSettingsFn)
-                : new providers_1.LocalDocumentSymbolProvider(library, maybeInspectionCacheItem, analysisSettings.createInspectionSettingsFn);
+                ? analysisSettings.maybeCreateLocalDocumentSymbolProviderFn(library, promiseMaybeInspected, analysisSettings.createInspectionSettingsFn)
+                : new providers_1.LocalDocumentSymbolProvider(library, promiseMaybeInspected, analysisSettings.createInspectionSettingsFn);
     }
-    AnalysisBase.prototype.getAutocompleteItems = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var context, maybeToken, _a, languageResponse, libraryResponse, localDocumentResponse, partial, _b, _c, collection, _loop_1, collection_1, collection_1_1, item;
-            var e_1, _d, e_2, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        context = {};
-                        maybeToken = this.getMaybePositionIdentifier();
-                        if (maybeToken !== undefined) {
-                            context = {
-                                range: __1.CommonTypesUtils.rangeFromTokenRange(maybeToken.tokenRange),
-                                text: maybeToken.literal,
-                                tokenKind: maybeToken.kind,
-                            };
-                        }
-                        return [4 /*yield*/, Promise.all(AnalysisBase.createAutocompleteItemCalls(context, [this.languageAutocompleteItemProvider, this.librarySymbolProvider, this.localDocumentSymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS))];
-                    case 1:
-                        _a = __read.apply(void 0, [_f.sent(), 3]), languageResponse = _a[0], libraryResponse = _a[1], localDocumentResponse = _a[2];
-                        partial = [];
-                        try {
-                            for (_b = __values([localDocumentResponse, languageResponse, libraryResponse]), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                collection = _c.value;
-                                _loop_1 = function (item) {
-                                    if (partial.find(function (partialItem) { return partialItem.label === item.label; }) === undefined) {
-                                        partial.push(item);
-                                    }
-                                };
-                                try {
-                                    for (collection_1 = (e_2 = void 0, __values(collection)), collection_1_1 = collection_1.next(); !collection_1_1.done; collection_1_1 = collection_1.next()) {
-                                        item = collection_1_1.value;
-                                        _loop_1(item);
-                                    }
-                                }
-                                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                                finally {
-                                    try {
-                                        if (collection_1_1 && !collection_1_1.done && (_e = collection_1.return)) _e.call(collection_1);
-                                    }
-                                    finally { if (e_2) throw e_2.error; }
-                                }
-                            }
-                        }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                        finally {
-                            try {
-                                if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
-                            }
-                            finally { if (e_1) throw e_1.error; }
-                        }
-                        return [2 /*return*/, partial.sort(inspection_1.AutocompleteItemUtils.compareFn)];
-                }
-            });
-        });
-    };
-    AnalysisBase.prototype.getHover = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var identifierToken, maybeActiveNode, context;
-            return __generator(this, function (_a) {
-                identifierToken = this.getMaybePositionIdentifier();
-                if (identifierToken === undefined) {
-                    return [2 /*return*/, commonTypes_1.EmptyHover];
-                }
-                maybeActiveNode = this.getMaybeActiveNode();
-                if (maybeActiveNode === undefined || !AnalysisBase.isValidHoverIdentifier(maybeActiveNode)) {
-                    return [2 /*return*/, commonTypes_1.EmptyHover];
-                }
+    getAutocompleteItems() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let context = {};
+            const maybeToken = yield this.getMaybePositionIdentifier();
+            if (maybeToken !== undefined) {
                 context = {
-                    range: __1.CommonTypesUtils.rangeFromTokenRange(identifierToken.tokenRange),
-                    identifier: identifierToken.literal,
+                    range: __1.CommonTypesUtils.rangeFromTokenRange(maybeToken.tokenRange),
+                    text: maybeToken.literal,
+                    tokenKind: maybeToken.kind,
                 };
-                // Result priority is based on the order of the symbol providers
-                return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptyHover)];
-            });
-        });
-    };
-    AnalysisBase.prototype.getSignatureHelp = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var inspected, maybeContext, context;
-            return __generator(this, function (_a) {
-                if (!workspaceCache_1.WorkspaceCacheUtils.isInspectionTask(this.maybeInspectionCacheItem)) {
-                    return [2 /*return*/, commonTypes_1.EmptySignatureHelp];
-                }
-                inspected = this.maybeInspectionCacheItem;
-                maybeContext = InspectionUtils.getMaybeContextForSignatureProvider(inspected);
-                if (maybeContext === undefined) {
-                    return [2 /*return*/, commonTypes_1.EmptySignatureHelp];
-                }
-                context = maybeContext;
-                if (context.functionName === undefined) {
-                    return [2 /*return*/, commonTypes_1.EmptySignatureHelp];
+            }
+            // 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 partial = [];
+            for (const collection of [localDocumentResponse, languageResponse, libraryResponse]) {
+                for (const item of collection) {
+                    if (partial.find((partialItem) => partialItem.label === item.label) === undefined) {
+                        partial.push(item);
+                    }
                 }
-                // Result priority is based on the order of the symbol providers
-                return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptySignatureHelp)];
-            });
+            }
+            return partial.sort(inspection_1.AutocompleteItemUtils.compareFn);
         });
-    };
-    AnalysisBase.promiseWithTimeout = function (promise, timeoutReturnValue, timeoutInMS) {
+    }
+    getHover() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const maybeActiveNode = yield this.getMaybeActiveNode();
+            const maybeIdentifierUnderPosition = maybeActiveNode === null || maybeActiveNode === void 0 ? void 0 : maybeActiveNode.maybeIdentifierUnderPosition;
+            if (maybeActiveNode === undefined ||
+                maybeIdentifierUnderPosition === undefined ||
+                !AnalysisBase.isValidHoverIdentifier(maybeActiveNode)) {
+                return commonTypes_1.EmptyHover;
+            }
+            const identifier = maybeIdentifierUnderPosition;
+            const context = {
+                range: __1.CommonTypesUtils.rangeFromTokenRange(identifier.tokenRange),
+                identifier: identifier.literal,
+            };
+            // Result priority is based on the order of the symbol providers
+            return AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptyHover);
+        });
+    }
+    getSignatureHelp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const maybeInspected = yield this.promiseMaybeInspected;
+            if (maybeInspected === undefined) {
+                return commonTypes_1.EmptySignatureHelp;
+            }
+            const maybeContext = yield InspectionUtils.getMaybeContextForSignatureProvider(maybeInspected);
+            if (maybeContext === undefined) {
+                return commonTypes_1.EmptySignatureHelp;
+            }
+            const context = maybeContext;
+            if (context.functionName === undefined) {
+                return commonTypes_1.EmptySignatureHelp;
+            }
+            // Result priority is based on the order of the symbol providers
+            return AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptySignatureHelp);
+        });
+    }
+    static promiseWithTimeout(valueFn, timeoutReturnValue, timeoutInMS) {
         if (timeoutInMS !== undefined) {
             // TODO: Enabling trace entry when timeout occurs
             return Promise.race([
-                promise,
-                new Promise(function (resolve) {
-                    return setTimeout(function () {
-                        resolve(timeoutReturnValue);
-                    }, timeoutInMS);
-                }),
+                valueFn(),
+                new Promise((resolve) => setTimeout(() => {
+                    resolve(timeoutReturnValue);
+                }, timeoutInMS)),
             ]);
         }
-        return promise;
-    };
-    AnalysisBase.resolveProviders = function (calls, defaultReturnValue) {
-        return __awaiter(this, void 0, void 0, function () {
-            var results, i, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.all(calls)];
-                    case 1:
-                        results = _a.sent();
-                        for (i = 0; i < results.length; i += 1) {
-                            result = results[i];
-                            if (result !== null) {
-                                return [2 /*return*/, result];
-                            }
-                        }
-                        return [2 /*return*/, defaultReturnValue];
+        return valueFn();
+    }
+    static resolveProviders(calls, defaultReturnValue) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield Promise.all(calls);
+            for (let i = 0; i < results.length; i += 1) {
+                const result = results[i];
+                if (result !== null) {
+                    return result;
                 }
-            });
+            }
+            return defaultReturnValue;
         });
-    };
-    AnalysisBase.createAutocompleteItemCalls = function (context, providers, timeoutInMS) {
-        var _this = this;
+    }
+    static createAutocompleteItemCalls(context, providers, timeoutInMS) {
         // TODO: add tracing to the catch case
-        return providers.map(function (provider) {
-            return _this.promiseWithTimeout(provider.getAutocompleteItems(context).catch(function () {
-                return [];
-            }), [], timeoutInMS);
-        });
-    };
-    AnalysisBase.createHoverCalls = function (context, providers, timeoutInMS) {
-        var _this = this;
+        return providers.map((provider) => this.promiseWithTimeout(() => provider.getAutocompleteItems(context), [], timeoutInMS));
+    }
+    static createHoverCalls(context, providers, timeoutInMS) {
         // TODO: add tracing to the catch case
-        return providers.map(function (provider) {
-            return _this.promiseWithTimeout(provider.getHover(context).catch(function () {
-                return null;
-            }), null, timeoutInMS);
-        });
-    };
-    AnalysisBase.createSignatureHelpCalls = function (context, providers, timeoutInMS) {
-        var _this = this;
+        return providers.map((provider) => this.promiseWithTimeout(() => provider.getHover(context), null, timeoutInMS));
+    }
+    static createSignatureHelpCalls(context, providers, timeoutInMS) {
         // TODO: add tracing to the catch case
-        return providers.map(function (provider) {
-            return _this.promiseWithTimeout(provider.getSignatureHelp(context).catch(function () {
-                return null;
-            }), null, timeoutInMS);
-        });
-    };
-    AnalysisBase.isValidHoverIdentifier = function (activeNode) {
+        return providers.map((provider) => this.promiseWithTimeout(() => provider.getSignatureHelp(context), null, timeoutInMS));
+    }
+    static isValidHoverIdentifier(activeNode) {
         var _a;
-        var ancestry = activeNode.ancestry;
+        const ancestry = activeNode.ancestry;
         if (ancestry.length <= 1) {
             return true;
         }
-        var leaf = powerquery_parser_1.Assert.asDefined(ancestry[0]);
-        var followingNode = ancestry[1];
+        const leaf = powerquery_parser_1.Assert.asDefined(ancestry[0]);
+        const followingNode = ancestry[1];
         if (((_a = followingNode === null || followingNode === void 0 ? void 0 : followingNode.node) === null || _a === void 0 ? void 0 : _a.kind) === "Parameter" /* Parameter */) {
             return false;
         }
@@ -271,18 +156,24 @@ var AnalysisBase = /** @class */ (function () {
             return false;
         }
         return true;
-    };
-    AnalysisBase.prototype.getMaybePositionIdentifier = function () {
-        var _a;
-        return (_a = this.getMaybeActiveNode()) === null || _a === void 0 ? void 0 : _a.maybeIdentifierUnderPosition;
-    };
-    AnalysisBase.prototype.getMaybeActiveNode = function () {
-        return workspaceCache_1.WorkspaceCacheUtils.isInspectionTask(this.maybeInspectionCacheItem) &&
-            __1.Inspection.ActiveNodeUtils.isPositionInBounds(this.maybeInspectionCacheItem.maybeActiveNode)
-            ? this.maybeInspectionCacheItem.maybeActiveNode
-            : undefined;
-    };
-    return AnalysisBase;
-}());
+    }
+    getMaybePositionIdentifier() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const maybeActiveNode = yield this.getMaybeActiveNode();
+            return maybeActiveNode === null || maybeActiveNode === void 0 ? void 0 : maybeActiveNode.maybeIdentifierUnderPosition;
+        });
+    }
+    getMaybeActiveNode() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const maybeInspected = yield this.promiseMaybeInspected;
+            if (maybeInspected === undefined) {
+                return undefined;
+            }
+            return __1.Inspection.ActiveNodeUtils.isPositionInBounds(maybeInspected.maybeActiveNode)
+                ? maybeInspected.maybeActiveNode
+                : undefined;
+        });
+    }
+}
 exports.AnalysisBase = AnalysisBase;
 //# sourceMappingURL=analysisBase.js.map

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":"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"}

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

@@ -1,13 +1,13 @@
 import { AutocompleteItemProvider, ISymbolProvider } from "../providers/commonTypes";
 import { ILibrary } from "../library/library";
+import { Inspection } from "..";
 import { InspectionSettings } from "../inspectionSettings";
-import { WorkspaceCache } from "../workspaceCache";
 export interface AnalysisSettings {
     readonly createInspectionSettingsFn: () => InspectionSettings;
     readonly library: ILibrary;
     readonly maintainWorkspaceCache?: boolean;
     readonly maybeCreateLanguageAutocompleteItemProviderFn?: () => AutocompleteItemProvider;
     readonly maybeCreateLibrarySymbolProviderFn?: (library: ILibrary) => ISymbolProvider;
-    readonly maybeCreateLocalDocumentSymbolProviderFn?: (library: ILibrary, maybeTriedInspection: WorkspaceCache.CacheItem | undefined, createInspectionSettingsFn: () => InspectionSettings) => ISymbolProvider;
+    readonly maybeCreateLocalDocumentSymbolProviderFn?: (library: ILibrary, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>, createInspectionSettingsFn: () => InspectionSettings) => ISymbolProvider;
     readonly symbolProviderTimeoutInMS?: number;
 }

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

@@ -3,7 +3,7 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAnalysis = void 0;
-var documentAnalysis_1 = require("./documentAnalysis");
+const documentAnalysis_1 = require("./documentAnalysis");
 function createAnalysis(document, analysisSettings, position) {
     return new documentAnalysis_1.DocumentAnalysis(document, analysisSettings, position);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"analysisUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAOlC,uDAAsD;AAEtD,SAAgB,cAAc,CAC1B,QAAsB,EACtB,gBAAkC,EAClC,QAAkB;IAElB,OAAO,IAAI,mCAAgB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AACtE,CAAC;AAND,wCAMC"}
+{"version":3,"file":"analysisUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAOlC,yDAAsD;AAEtD,SAAgB,cAAc,CAC1B,QAAsB,EACtB,gBAAkC,EAClC,QAAkB;IAElB,OAAO,IAAI,mCAAgB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AACtE,CAAC;AAND,wCAMC"}

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

@@ -1,12 +1,10 @@
 import type { Position, Range } from "vscode-languageserver-types";
 import type { TextDocument } from "vscode-languageserver-textdocument";
-import { WorkspaceCache } from "../workspaceCache";
 import { AnalysisBase } from "./analysisBase";
 import { AnalysisSettings } from "./analysisSettings";
 export declare class DocumentAnalysis extends AnalysisBase {
     private readonly textDocument;
     constructor(textDocument: TextDocument, analysisSettings: AnalysisSettings, position: Position);
     dispose(): void;
-    protected getLexerState(): WorkspaceCache.LexCacheItem;
     protected getText(range?: Range): string;
 }

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

@@ -1,44 +1,23 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentAnalysis = void 0;
-var workspaceCache_1 = require("../workspaceCache");
-var analysisBase_1 = require("./analysisBase");
-var DocumentAnalysis = /** @class */ (function (_super) {
-    __extends(DocumentAnalysis, _super);
-    function DocumentAnalysis(textDocument, analysisSettings, position) {
-        var _this = _super.call(this, analysisSettings, workspaceCache_1.WorkspaceCacheUtils.getOrCreateInspection(textDocument, analysisSettings.createInspectionSettingsFn(), position), position) || this;
-        _this.textDocument = textDocument;
-        return _this;
+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));
+        this.textDocument = textDocument;
     }
-    DocumentAnalysis.prototype.dispose = function () {
+    dispose() {
         if (!this.analysisSettings.maintainWorkspaceCache) {
             workspaceCache_1.WorkspaceCacheUtils.close(this.textDocument);
         }
-    };
-    DocumentAnalysis.prototype.getLexerState = function () {
-        return workspaceCache_1.WorkspaceCacheUtils.getOrCreateLex(this.textDocument, this.analysisSettings.createInspectionSettingsFn());
-    };
-    DocumentAnalysis.prototype.getText = function (range) {
+    }
+    getText(range) {
         return this.textDocument.getText(range);
-    };
-    return DocumentAnalysis;
-}(analysisBase_1.AnalysisBase));
+    }
+}
 exports.DocumentAnalysis = DocumentAnalysis;
 //# sourceMappingURL=documentAnalysis.js.map

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,oDAAwE;AACxE,+CAA8C;AAG9C;IAAsC,oCAAY;IAC9C,0BAA6B,YAA0B,EAAE,gBAAkC,EAAE,QAAkB;QAA/G,YACI,kBACI,gBAAgB,EAChB,oCAAmB,CAAC,qBAAqB,CACrC,YAAY,EACZ,gBAAgB,CAAC,0BAA0B,EAAE,EAC7C,QAAQ,CACX,EACD,QAAQ,CACX,SACJ;QAV4B,kBAAY,GAAZ,YAAY,CAAc;;IAUvD,CAAC;IAEM,kCAAO,GAAd;QACI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,EAAE;YAC/C,oCAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAChD;IACL,CAAC;IAES,wCAAa,GAAvB;QACI,OAAO,oCAAmB,CAAC,cAAc,CACrC,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,EAAE,CACrD,CAAC;IACN,CAAC;IAES,kCAAO,GAAjB,UAAkB,KAAa;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IACL,uBAAC;AAAD,CAAC,AA7BD,CAAsC,2BAAY,GA6BjD;AA7BY,4CAAgB"}
+{"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,sBAAsB,EAAE;YAC/C,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"}

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

@@ -3,7 +3,7 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmptySignatureHelp = exports.EmptyHover = exports.SymbolKind = exports.DiagnosticSeverity = exports.CompletionItemKind = void 0;
-var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+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; } });

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,2EAYqC;AAgB5B,mGA1BL,gDAAkB,OA0BK;AAAE,mGAvBzB,gDAAkB,OAuByB;AAAE,2FAjB7C,wCAAU,OAiB6C;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,IAAI;IACrB,eAAe,EAAE,IAAI;CACxB,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;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,IAAI;IACrB,eAAe,EAAE,IAAI;CACxB,CAAC"}

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

@@ -1,3 +1,3 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { DocumentSymbol, TextDocument } from "./commonTypes";
-export declare function getDocumentSymbols(textDocument: TextDocument, lexAndParseSettings: PQP.LexSettings & PQP.ParseSettings, maintainWorkspaceCache: boolean): DocumentSymbol[];
+export declare function getDocumentSymbols(textDocument: TextDocument, lexAndParseSettings: PQP.LexSettings & PQP.ParseSettings, maintainWorkspaceCache: boolean): Promise<DocumentSymbol[]>;