@microsoft/powerquery-language-services 0.2.11 → 0.2.17

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

@@ -1,6 +1,6 @@
 import type { Hover, SignatureHelp } from "vscode-languageserver-types";
-import { Inspection } from "..";
 import { IDisposable } from "../commonTypes";
+import { Inspection } from "..";
 export interface Analysis extends IDisposable {
     getAutocompleteItems(): Promise<Inspection.AutocompleteItem[]>;
     getHover(): Promise<Hover>;

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

@@ -18,6 +18,7 @@ export declare abstract class AnalysisBase implements Analysis {
     abstract dispose(): void;
     protected abstract getLexerState(): WorkspaceCache.LexCacheItem;
     protected abstract getText(range?: Range): string;
+    private static promiseWithTimeout;
     private static resolveProviders;
     private static createAutocompleteItemCalls;
     private static createHoverCalls;

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

@@ -66,11 +66,11 @@ var __values = (this && this.__values) || function(o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalysisBase = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+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 inspection_1 = require("../inspection");
 var providers_1 = require("../providers");
 var workspaceCache_1 = require("../workspaceCache");
 var AnalysisBase = /** @class */ (function () {
@@ -108,11 +108,7 @@ var AnalysisBase = /** @class */ (function () {
                                 tokenKind: maybeToken.kind,
                             };
                         }
-                        return [4 /*yield*/, Promise.all(AnalysisBase.createAutocompleteItemCalls(context, [
-                                this.languageAutocompleteItemProvider,
-                                this.librarySymbolProvider,
-                                this.localDocumentSymbolProvider,
-                            ]))];
+                        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 = [];
@@ -168,7 +164,7 @@ var AnalysisBase = /** @class */ (function () {
                     identifier: identifierToken.literal,
                 };
                 // Result priority is based on the order of the symbol providers
-                return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider]), commonTypes_1.EmptyHover)];
+                return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptyHover)];
             });
         });
     };
@@ -189,24 +185,36 @@ var AnalysisBase = /** @class */ (function () {
                     return [2 /*return*/, commonTypes_1.EmptySignatureHelp];
                 }
                 // Result priority is based on the order of the symbol providers
-                return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [
-                        this.localDocumentSymbolProvider,
-                        this.librarySymbolProvider,
-                    ]), commonTypes_1.EmptySignatureHelp)];
+                return [2 /*return*/, AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptySignatureHelp)];
             });
         });
     };
+    AnalysisBase.promiseWithTimeout = function (promise, 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);
+                }),
+            ]);
+        }
+        return promise;
+    };
     AnalysisBase.resolveProviders = function (calls, defaultReturnValue) {
         return __awaiter(this, void 0, void 0, function () {
-            var results, i;
+            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++) {
-                            if (results[i] !== null) {
-                                return [2 /*return*/, results[i]];
+                        for (i = 0; i < results.length; i += 1) {
+                            result = results[i];
+                            if (result !== null) {
+                                return [2 /*return*/, result];
                             }
                         }
                         return [2 /*return*/, defaultReturnValue];
@@ -214,30 +222,31 @@ var AnalysisBase = /** @class */ (function () {
             });
         });
     };
-    AnalysisBase.createAutocompleteItemCalls = function (context, providers) {
+    AnalysisBase.createAutocompleteItemCalls = function (context, providers, timeoutInMS) {
+        var _this = this;
         // TODO: add tracing to the catch case
         return providers.map(function (provider) {
-            return provider.getAutocompleteItems(context).catch(function () {
+            return _this.promiseWithTimeout(provider.getAutocompleteItems(context).catch(function () {
                 return [];
-            });
+            }), [], timeoutInMS);
         });
     };
-    AnalysisBase.createHoverCalls = function (context, providers) {
+    AnalysisBase.createHoverCalls = function (context, providers, timeoutInMS) {
+        var _this = this;
         // TODO: add tracing to the catch case
         return providers.map(function (provider) {
-            return provider.getHover(context).catch(function () {
-                // tslint:disable-next-line: no-null-keyword
+            return _this.promiseWithTimeout(provider.getHover(context).catch(function () {
                 return null;
-            });
+            }), null, timeoutInMS);
         });
     };
-    AnalysisBase.createSignatureHelpCalls = function (context, providers) {
+    AnalysisBase.createSignatureHelpCalls = function (context, providers, timeoutInMS) {
+        var _this = this;
         // TODO: add tracing to the catch case
         return providers.map(function (provider) {
-            return provider.getSignatureHelp(context).catch(function () {
-                // tslint:disable-next-line: no-null-keyword
+            return _this.promiseWithTimeout(provider.getSignatureHelp(context).catch(function () {
                 return null;
-            });
+            }), null, timeoutInMS);
         });
     };
     AnalysisBase.isValidHoverIdentifier = function (activeNode) {
@@ -246,7 +255,7 @@ var AnalysisBase = /** @class */ (function () {
         if (ancestry.length <= 1) {
             return true;
         }
-        var leaf = PQP.Assert.asDefined(ancestry[0]);
+        var leaf = powerquery_parser_1.Assert.asDefined(ancestry[0]);
         var 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;
@@ -258,7 +267,7 @@ var AnalysisBase = /** @class */ (function () {
             "GeneralizedIdentifierPairedExpression" /* GeneralizedIdentifierPairedExpression */,
             "IdentifierPairedExpression" /* IdentifierPairedExpression */,
         ].includes(followingNode.node.kind) &&
-            [undefined, 1].includes(PQP.Assert.asDefined(leaf.node.maybeAttributeIndex))) {
+            [undefined, 1].includes(powerquery_parser_1.Assert.asDefined(leaf.node.maybeAttributeIndex))) {
             return false;
         }
         return true;

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,6 +1,6 @@
-import { InspectionSettings } from "../inspectionSettings";
-import { ILibrary } from "../library/library";
 import { AutocompleteItemProvider, ISymbolProvider } from "../providers/commonTypes";
+import { ILibrary } from "../library/library";
+import { InspectionSettings } from "../inspectionSettings";
 import { WorkspaceCache } from "../workspaceCache";
 export interface AnalysisSettings {
     readonly createInspectionSettingsFn: () => InspectionSettings;
@@ -9,4 +9,5 @@ export interface AnalysisSettings {
     readonly maybeCreateLanguageAutocompleteItemProviderFn?: () => AutocompleteItemProvider;
     readonly maybeCreateLibrarySymbolProviderFn?: (library: ILibrary) => ISymbolProvider;
     readonly maybeCreateLocalDocumentSymbolProviderFn?: (library: ILibrary, maybeTriedInspection: WorkspaceCache.CacheItem | undefined, createInspectionSettingsFn: () => InspectionSettings) => ISymbolProvider;
+    readonly symbolProviderTimeoutInMS?: number;
 }

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

@@ -1,5 +1,5 @@
-import type { TextDocument } from "vscode-languageserver-textdocument";
 import type { Position } from "vscode-languageserver-types";
+import type { TextDocument } from "vscode-languageserver-textdocument";
 import { Analysis } from "./analysis";
 import { AnalysisSettings } from "./analysisSettings";
 export declare function createAnalysis(document: TextDocument, analysisSettings: AnalysisSettings, position: Position): Analysis;

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

@@ -1,5 +1,5 @@
-import type { TextDocument } from "vscode-languageserver-textdocument";
 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";

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

@@ -1,6 +1,5 @@
+import { CompletionItem, CompletionItemKind, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DocumentSymbol, Hover, Position, Range, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
 import type { DocumentUri, TextDocument, TextDocumentContentChangeEvent } from "vscode-languageserver-textdocument";
-import type { CompletionItem, Diagnostic, DiagnosticRelatedInformation, DocumentSymbol, Hover, Position, Range, SignatureHelp } from "vscode-languageserver-types";
-import { CompletionItemKind, DiagnosticSeverity, SymbolKind } from "vscode-languageserver-types";
 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

@@ -13,9 +13,7 @@ exports.EmptyHover = {
 };
 exports.EmptySignatureHelp = {
     signatures: [],
-    // tslint:disable-next-line: no-null-keyword
     activeParameter: null,
-    // tslint:disable-next-line: no-null-keyword
     activeSignature: null,
 };
 //# sourceMappingURL=commonTypes.js.map

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;;;AAalC,2EAAiG;AAexF,mGAfA,gDAAkB,OAeA;AAAE,mGAfA,gDAAkB,OAeA;AAAE,2FAfA,wCAAU,OAeA;AAM9C,QAAA,UAAU,GAAU;IAC7B,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,EAAE;CACf,CAAC;AAEW,QAAA,kBAAkB,GAAkB;IAC7C,UAAU,EAAE,EAAE;IACd,4CAA4C;IAC5C,eAAe,EAAE,IAAI;IACrB,4CAA4C;IAC5C,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,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"}

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

@@ -1 +1 @@
-{"version":3,"file":"commonTypesUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypesUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,mBAAmB,CAAC,UAAyC;IACzE,OAAO;QACH,KAAK,EAAE,yBAAyB,CAAC,UAAU,CAAC,aAAa,CAAC;QAC1D,GAAG,EAAE,yBAAyB,CAAC,UAAU,CAAC,WAAW,CAAC;KACzD,CAAC;AACN,CAAC;AALD,kDAKC;AAED,SAAgB,yBAAyB,CAAC,aAA+C;IACrF,OAAO;QACH,SAAS,EAAE,aAAa,CAAC,YAAY;QACrC,IAAI,EAAE,aAAa,CAAC,UAAU;KACjC,CAAC;AACN,CAAC;AALD,8DAKC"}
+{"version":3,"file":"commonTypesUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypesUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAMlC,SAAgB,mBAAmB,CAAC,UAAyC;IACzE,OAAO;QACH,KAAK,EAAE,yBAAyB,CAAC,UAAU,CAAC,aAAa,CAAC;QAC1D,GAAG,EAAE,yBAAyB,CAAC,UAAU,CAAC,WAAW,CAAC;KACzD,CAAC;AACN,CAAC;AALD,kDAKC;AAED,SAAgB,yBAAyB,CAAC,aAA+C;IACrF,OAAO;QACH,SAAS,EAAE,aAAa,CAAC,YAAY;QACrC,IAAI,EAAE,aAAa,CAAC,UAAU;KACjC,CAAC;AACN,CAAC;AALD,8DAKC"}

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

@@ -17,10 +17,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
@@ -36,6 +40,7 @@ var __values = (this && this.__values) || function(o) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDocumentSymbols = void 0;
 var PQP = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var InspectionUtils = require("./inspectionUtils");
 var commonTypes_1 = require("./commonTypes");
 var workspaceCache_1 = require("./workspaceCache");
@@ -59,17 +64,17 @@ function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbol
     var e_1, _a;
     var _b;
     var identifierPairedExpressionIds = (_b = nodeIdMapCollection.idsByNodeKind.get("IdentifierPairedExpression" /* IdentifierPairedExpression */)) !== null && _b !== void 0 ? _b : new Set();
-    var identifierPairedExpressionsXorNodes = PQP.Parser.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, __spreadArray([], __read(identifierPairedExpressionIds.values())));
+    var identifierPairedExpressionsXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, __spreadArray([], __read(identifierPairedExpressionIds.values()), false));
     try {
         for (var identifierPairedExpressionsXorNodes_1 = __values(identifierPairedExpressionsXorNodes), identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next(); !identifierPairedExpressionsXorNodes_1_1.done; identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next()) {
             var xorNode = identifierPairedExpressionsXorNodes_1_1.value;
-            if (!PQP.Parser.XorNodeUtils.isAst(xorNode)) {
+            if (!parser_1.XorNodeUtils.isAstXorChecked(xorNode, "IdentifierPairedExpression" /* IdentifierPairedExpression */)) {
                 continue;
             }
-            var asAst = xorNode.node;
-            var asDocumentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(asAst);
-            addDocumentSymbols(nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols, asDocumentSymbol);
-            parentSymbolById.set(asAst.id, asDocumentSymbol);
+            var nodeId = xorNode.node.id;
+            var documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(xorNode.node);
+            addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols, documentSymbol);
+            parentSymbolById.set(nodeId, documentSymbol);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -83,12 +88,12 @@ function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbol
 function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
     var e_2, _a;
     var _b, _c;
-    var recordIds = __spreadArray(__spreadArray([], __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _b !== void 0 ? _b : new Set()).values())), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _c !== void 0 ? _c : new Set()).values()));
-    var recordXorNodes = PQP.Parser.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, recordIds);
+    var recordIds = __spreadArray(__spreadArray([], __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _b !== void 0 ? _b : new Set()).values()), false), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _c !== void 0 ? _c : new Set()).values()), false);
+    var recordXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, recordIds);
     try {
         for (var recordXorNodes_1 = __values(recordXorNodes), recordXorNodes_1_1 = recordXorNodes_1.next(); !recordXorNodes_1_1.done; recordXorNodes_1_1 = recordXorNodes_1.next()) {
             var xorNode = recordXorNodes_1_1.value;
-            if (!PQP.Parser.XorNodeUtils.isAst(xorNode)) {
+            if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
                 continue;
             }
             var asAst = xorNode.node;
@@ -98,7 +103,7 @@ function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById)
             if (parentSymbol && parentSymbol.kind === commonTypes_1.SymbolKind.Struct) {
                 var fieldSymbols = InspectionUtils.getSymbolsForRecord(asAst);
                 if (fieldSymbols.length > 0) {
-                    addDocumentSymbols.apply(void 0, __spreadArray([nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols], __read(fieldSymbols)));
+                    addDocumentSymbols.apply(void 0, __spreadArray([nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols], __read(fieldSymbols), false));
                 }
             }
         }
@@ -122,11 +127,11 @@ function addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, curre
         if (!parentSymbol.children) {
             parentSymbol.children = [];
         }
-        (_a = parentSymbol.children).push.apply(_a, __spreadArray([], __read(newSymbols)));
+        (_a = parentSymbol.children).push.apply(_a, __spreadArray([], __read(newSymbols), false));
         return;
     }
     // Add to the top level
-    currentSymbols.push.apply(currentSymbols, __spreadArray([], __read(newSymbols)));
+    currentSymbols.push.apply(currentSymbols, __spreadArray([], __read(newSymbols), false));
 }
 function findParentSymbol(nodeIdMapCollection, parentSymbolById, nodeId) {
     // Get parent for current node

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

@@ -1 +1 @@
-{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,kDAAoD;AACpD,oFAKmE;AAGnE,mDAAqD;AACrD,6CAAyE;AACzE,mDAAuE;AAEvE,SAAgB,kBAAkB,CAC9B,YAA0B,EAC1B,mBAAwD,EACxD,sBAA+B;IAE/B,IAAM,SAAS,GAAkC,oCAAmB,CAAC,gBAAgB,CACjF,YAAY,EACZ,mBAAmB,CACtB,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE;QAC9F,OAAO,EAAE,CAAC;KACb;IAED,IAAM,mBAAmB,GAAyB,SAAS,CAAC,mBAAmB,CAAC;IAChF,IAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,IAAM,gBAAgB,GAAgC,IAAI,GAAG,EAAE,CAAC;IAEhE,oCAAoC,CAAC,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC5F,gBAAgB,CAAC,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAExE,IAAI,CAAC,sBAAsB,EAAE;QACzB,oCAAmB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;KAC3C;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC;AA1BD,gDA0BC;AAED,SAAS,oCAAoC,CACzC,mBAAyC,EACzC,cAAgC,EAChC,gBAA6C;;;IAE7C,IAAM,6BAA6B,GAC/B,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,+DAAyC,mCAAI,IAAI,GAAG,EAAE,CAAC;IAChG,IAAM,mCAAmC,GAA4B,0BAAiB,CAAC,aAAa,CAChG,mBAAmB,2BACf,6BAA6B,CAAC,MAAM,EAAE,UAC7C,CAAC;;QAEF,KAAsB,IAAA,wCAAA,SAAA,mCAAmC,CAAA,wFAAA,yIAAE;YAAtD,IAAM,OAAO,gDAAA;YACd,IACI,CAAC,qBAAY,CAAC,eAAe,CACzB,OAAO,gEAEV,EACH;gBACE,SAAS;aACZ;YAED,IAAM,MAAM,GAAW,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,IAAM,cAAc,GAAmB,eAAe,CAAC,sCAAsC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE5G,kBAAkB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;YAClG,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;SAChD;;;;;;;;;AACL,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,cAAgC,EAChC,gBAA6C;;;IAE7C,IAAM,SAAS,0CACR,CAAC,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,2CAA+B,mCAAI,IAAI,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,kBAC5F,CAAC,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,qCAA4B,mCAAI,IAAI,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,SAC/F,CAAC;IACF,IAAM,cAAc,GAA4B,0BAAiB,CAAC,aAAa,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;;QAEhH,KAAsB,IAAA,mBAAA,SAAA,cAAc,CAAA,8CAAA,0EAAE;YAAjC,IAAM,OAAO,2BAAA;YACd,IAAI,CAAC,qBAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACjC,SAAS;aACZ;YAED,IAAM,KAAK,GAA6C,OAAO,CAAC,IAEzC,CAAC;YAExB,yDAAyD;YACzD,IAAM,QAAQ,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3F,IAAM,YAAY,GAA+B,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACvG,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,wBAAU,CAAC,MAAM,EAAE;gBACzD,IAAM,YAAY,GAAkC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBAC/F,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzB,kBAAkB,8BAAC,mBAAmB,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,cAAc,UAAK,YAAY,WAAE;iBACxG;aACJ;SACJ;;;;;;;;;AACL,CAAC;AAED,SAAS,kBAAkB,CACvB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc,EACd,cAAgC;;IAChC,oBAA+B;SAA/B,UAA+B,EAA/B,qBAA+B,EAA/B,IAA+B;QAA/B,mCAA+B;;IAE/B,IAAM,YAAY,GAA+B,gBAAgB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACjH,IAAI,YAAY,EAAE;QACd,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;YACxB,YAAY,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC9B;QAED,CAAA,KAAA,YAAY,CAAC,QAAQ,CAAA,CAAC,IAAI,oCAAI,UAAU,WAAE;QAC1C,OAAO;KACV;IAED,uBAAuB;IACvB,cAAc,CAAC,IAAI,OAAnB,cAAc,2BAAS,UAAU,WAAE;AACvC,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc;IAEd,8BAA8B;IAC9B,IAAM,YAAY,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtF,IAAI,CAAC,YAAY,EAAE;QACf,2BAA2B;QAC3B,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,YAAY,GAA+B,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClF,IAAI,CAAC,YAAY,EAAE;QACf,YAAY,GAAG,gBAAgB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;KACxF;IAED,OAAO,YAAY,CAAC;AACxB,CAAC"}

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

@@ -1,3 +1,3 @@
-import { TextDocument } from "vscode-languageserver-textdocument";
 import { FormattingOptions, TextEdit } from "vscode-languageserver-types";
+import { TextDocument } from "vscode-languageserver-textdocument";
 export declare function tryFormat(document: TextDocument, formattingOptions: FormattingOptions, locale: string): TextEdit[];

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

@@ -17,6 +17,7 @@ exports.tryFormat = void 0;
 var PQF = require("@microsoft/powerquery-formatter");
 var PQP = require("@microsoft/powerquery-parser");
 var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 function tryFormat(document, formattingOptions, locale) {
     var indentationLiteral;
     if (formattingOptions.insertSpaces) {
@@ -27,7 +28,7 @@ function tryFormat(document, formattingOptions, locale) {
     }
     var formatSettings = __assign(__assign({}, PQF.DefaultSettings), { locale: locale, indentationLiteral: indentationLiteral });
     var triedFormat = PQF.tryFormat(formatSettings, document.getText());
-    if (PQP.ResultUtils.isOk(triedFormat)) {
+    if (powerquery_parser_1.ResultUtils.isOk(triedFormat)) {
         return [vscode_languageserver_types_1.TextEdit.replace(fullDocumentRange(document), triedFormat.value)];
     }
     // If an unhandled exception was returned.

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

@@ -1 +1 @@
-{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,qDAAuD;AACvD,kDAAoD;AAGpD,2EAAiF;AAEjF,SAAgB,SAAS,CAAC,QAAsB,EAAE,iBAAoC,EAAE,MAAc;IAClG,IAAI,kBAA0C,CAAC;IAC/C,IAAI,iBAAiB,CAAC,YAAY,EAAE;QAChC,kBAAkB,uBAAiC,CAAC;KACvD;SAAM;QACH,kBAAkB,iBAA6B,CAAC;KACnD;IAED,IAAM,cAAc,yBACb,GAAG,CAAC,eAAe,KACtB,MAAM,QAAA,EACN,kBAAkB,oBAAA,GACrB,CAAC;IACF,IAAM,WAAW,GAAoB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEvF,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QACnC,OAAO,CAAC,sCAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7E;IACD,0CAA0C;SACrC,IAAI,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QACvD,MAAM,WAAW,CAAC,KAAK,CAAC;KAC3B;IACD,mEAAmE;SAC9D;QACD,OAAO,EAAE,CAAC;KACb;AACL,CAAC;AA1BD,8BA0BC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,QAAsB;IAC7C,OAAO;QACH,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7B,GAAG,EAAE;YACD,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,SAAS;SAC9B;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,qDAAuD;AACvD,kDAAoD;AACpD,2EAAiF;AACjF,kEAA2D;AAG3D,SAAgB,SAAS,CAAC,QAAsB,EAAE,iBAAoC,EAAE,MAAc;IAClG,IAAI,kBAA0C,CAAC;IAC/C,IAAI,iBAAiB,CAAC,YAAY,EAAE;QAChC,kBAAkB,uBAAiC,CAAC;KACvD;SAAM;QACH,kBAAkB,iBAA6B,CAAC;KACnD;IAED,IAAM,cAAc,yBACb,GAAG,CAAC,eAAe,KACtB,MAAM,QAAA,EACN,kBAAkB,oBAAA,GACrB,CAAC;IACF,IAAM,WAAW,GAAoB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEvF,IAAI,+BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC/B,OAAO,CAAC,sCAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7E;IACD,0CAA0C;SACrC,IAAI,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QACvD,MAAM,WAAW,CAAC,KAAK,CAAC;KAC3B;IACD,mEAAmE;SAC9D;QACD,OAAO,EAAE,CAAC;KACb;AACL,CAAC;AA1BD,8BA0BC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,QAAsB;IAC7C,OAAO;QACH,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7B,GAAG,EAAE;YACD,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,SAAS;SAC9B;KACJ,CAAC;AACN,CAAC"}

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

@@ -3,6 +3,7 @@ export * as CommonTypesUtils from "./commonTypesUtils";
 export * as Inspection from "./inspection";
 export * as InspectionUtils from "./inspectionUtils";
 export * as PositionUtils from "./positionUtils";
+export * as TraceUtils from "./traceUtils";
 export * from "./analysis";
 export * from "./commonTypes";
 export * from "./diagnosticErrorCode";
@@ -11,6 +12,7 @@ export * from "./formatter";
 export * from "./inspectionSettings";
 export * from "./library";
 export * from "./providers";
+export * from "./trace";
 export * from "./validate";
 export * from "./workspaceCache";
 export declare function createTextDocument(id: string, version: number, content: string): TextDocument;

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

@@ -12,13 +12,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.documentClosed = exports.documentUpdated = exports.createTextDocument = exports.PositionUtils = exports.InspectionUtils = exports.Inspection = exports.CommonTypesUtils = void 0;
+exports.documentClosed = exports.documentUpdated = exports.createTextDocument = exports.TraceUtils = exports.PositionUtils = exports.InspectionUtils = exports.Inspection = exports.CommonTypesUtils = void 0;
 var vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 var workspaceCache_1 = require("./workspaceCache");
 exports.CommonTypesUtils = require("./commonTypesUtils");
 exports.Inspection = require("./inspection");
 exports.InspectionUtils = require("./inspectionUtils");
 exports.PositionUtils = require("./positionUtils");
+exports.TraceUtils = require("./traceUtils");
 __exportStar(require("./analysis"), exports);
 __exportStar(require("./commonTypes"), exports);
 __exportStar(require("./diagnosticErrorCode"), exports);
@@ -27,6 +28,7 @@ __exportStar(require("./formatter"), exports);
 __exportStar(require("./inspectionSettings"), exports);
 __exportStar(require("./library"), exports);
 __exportStar(require("./providers"), exports);
+__exportStar(require("./trace"), exports);
 __exportStar(require("./validate"), exports);
 __exportStar(require("./workspaceCache"), exports);
 function createTextDocument(id, version, content) {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/powerquery-language-services/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;AAElC,yFAAkG;AAClG,mDAAuD;AAEvD,yDAAuD;AACvD,6CAA2C;AAC3C,uDAAqD;AACrD,mDAAiD;AACjD,6CAA2B;AAC3B,gDAA8B;AAC9B,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,4CAA0B;AAC1B,8CAA4B;AAC5B,6CAA2B;AAC3B,mDAAiC;AAEjC,SAAgB,kBAAkB,CAAC,EAAU,EAAE,OAAe,EAAE,OAAe;IAC3E,OAAO,iDAAY,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAFD,gDAEC;AAED,SAAgB,eAAe,CAC3B,QAAsB,EACtB,OAAsD,EACtD,OAAe;IAEf,oCAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAND,0CAMC;AAED,SAAgB,cAAc,CAAC,QAAsB;IACjD,oCAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/powerquery-language-services/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;AAElC,yFAAkG;AAClG,mDAAuD;AAEvD,yDAAuD;AACvD,6CAA2C;AAC3C,uDAAqD;AACrD,mDAAiD;AACjD,6CAA2C;AAC3C,6CAA2B;AAC3B,gDAA8B;AAC9B,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB;AACxB,6CAA2B;AAC3B,mDAAiC;AAEjC,SAAgB,kBAAkB,CAAC,EAAU,EAAE,OAAe,EAAE,OAAe;IAC3E,OAAO,iDAAY,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAFD,gDAEC;AAED,SAAgB,eAAe,CAC3B,QAAsB,EACtB,OAAsD,EACtD,OAAe;IAEf,oCAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAND,0CAMC;AAED,SAAgB,cAAc,CAAC,QAAsB;IACjD,oCAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}

package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts

@@ -1,5 +1,6 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import type { Position } from "vscode-languageserver-types";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 export declare type TMaybeActiveNode = ActiveNode | OutOfBoundPosition;
 export interface IActiveNode {
     readonly kind: ActiveNodeKind;
@@ -8,8 +9,8 @@ export interface IActiveNode {
 export interface ActiveNode extends IActiveNode {
     readonly kind: ActiveNodeKind.ActiveNode;
     readonly leafKind: ActiveNodeLeafKind;
-    readonly ancestry: ReadonlyArray<PQP.Parser.TXorNode>;
-    readonly maybeIdentifierUnderPosition: PQP.Language.Ast.Identifier | PQP.Language.Ast.GeneralizedIdentifier | undefined;
+    readonly ancestry: ReadonlyArray<TXorNode>;
+    readonly maybeIdentifierUnderPosition: Ast.Identifier | Ast.GeneralizedIdentifier | undefined;
 }
 export interface OutOfBoundPosition extends IActiveNode {
     readonly kind: ActiveNodeKind.OutOfBoundPosition;

package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.d.ts

@@ -1,11 +1,12 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { NodeIdMap, TXorNode, XorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
+import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import type { Position } from "vscode-languageserver-types";
 import { ActiveNode, ActiveNodeLeafKind, OutOfBoundPosition, TMaybeActiveNode } from "./activeNode";
-export declare function maybeActiveNode(nodeIdMapCollection: PQP.Parser.NodeIdMap.Collection, position: Position): TMaybeActiveNode;
-export declare function createActiveNode(leafKind: ActiveNodeLeafKind, position: Position, ancestry: ReadonlyArray<PQP.Parser.TXorNode>, maybeIdentifierUnderPosition: PQP.Language.Ast.Identifier | PQP.Language.Ast.GeneralizedIdentifier | undefined): ActiveNode;
+export declare function maybeActiveNode(nodeIdMapCollection: NodeIdMap.Collection, position: Position): TMaybeActiveNode;
+export declare function createActiveNode(leafKind: ActiveNodeLeafKind, position: Position, ancestry: ReadonlyArray<TXorNode>, maybeIdentifierUnderPosition: Ast.Identifier | Ast.GeneralizedIdentifier | undefined): ActiveNode;
 export declare function createOutOfBoundPosition(position: Position): OutOfBoundPosition;
-export declare function assertActiveNode(nodeIdMapCollection: PQP.Parser.NodeIdMap.Collection, position: Position): ActiveNode;
-export declare function assertGetLeaf(activeNode: ActiveNode): PQP.Parser.TXorNode;
+export declare function assertActiveNode(nodeIdMapCollection: NodeIdMap.Collection, position: Position): ActiveNode;
+export declare function assertGetLeaf(activeNode: ActiveNode): TXorNode;
 export declare function assertPositionInBounds(maybeValue: TMaybeActiveNode): asserts maybeValue is ActiveNode;
 export declare function isPositionInBounds(maybeValue: TMaybeActiveNode): maybeValue is ActiveNode;
-export declare function maybeFirstXorOfNodeKind(activeNode: ActiveNode, nodeKind: PQP.Language.Ast.NodeKind): PQP.Parser.TXorNode | undefined;
+export declare function maybeFirstXorOfNodeKind<T extends Ast.TNode>(activeNode: ActiveNode, nodeKind: T["kind"]): XorNode<T> | undefined;