npm - @microsoft/powerquery-language-services - Versions diffs - 0.3.31 → 0.3.36 - Mend

@microsoft/powerquery-language-services 0.3.31 → 0.3.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

package/lib/powerquery-language-services/inspection/type/inspectType/common.js CHANGED Viewed

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createParameterType = exports.recursiveIdentifierDereference = exports.maybeDereferencedIdentifierType = exports.inspectXor = exports.inspectTypeFromChildAttributeIndex = exports.inspectScopeItem = exports.getOrCreateScopeItemType = exports.getOrCreateScope = exports.assertGetOrCreateNodeScope = exports.allForAnyUnion = void 0;
+exports.createParameterType = exports.maybeDereferencedIdentifierType = exports.inspectXor = exports.inspectTypeFromChildAttributeIndex = exports.inspectScopeItem = exports.getOrCreateScopeItemType = exports.getOrCreateScope = exports.assertGetOrCreateNodeScope = exports.allForAnyUnion = void 0;
 const PQP = require("@microsoft/powerquery-parser");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
@@ -44,6 +44,7 @@ const inspectTypeRecursivePrimaryExpression_1 = require("./inspectTypeRecursiveP
 const inspectTypeTableType_1 = require("./inspectTypeTableType");
 const inspectTypeTBinOpExpression_1 = require("./inspectTypeTBinOpExpression");
 const inspectTypeUnaryExpression_1 = require("./inspectTypeUnaryExpression");
+const deferenceIdentifier_1 = require("../../deferenceIdentifier");
 // Recursively flattens all AnyUnion.unionedTypePairs into a single array,
 // maps each entry into a boolean,
 // then calls all(...) on the mapped values.
@@ -294,14 +295,23 @@ function maybeDereferencedIdentifierType(state, xorNode, maybeCorrelationId) {
     return __awaiter(this, void 0, void 0, function* () {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, maybeDereferencedIdentifierType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        const deferenced = yield recursiveIdentifierDereference(state, xorNode, trace.id);
-        const maybeDereferencedLiteral = parser_1.XorNodeUtils.maybeIdentifierExpressionLiteral(deferenced);
+        const updatedSettings = Object.assign(Object.assign({}, state), { maybeInitialCorrelationId: trace.id });
+        const triedDeference = yield (0, deferenceIdentifier_1.tryDeferenceIdentifier)(updatedSettings, state.nodeIdMapCollection, xorNode, state.scopeById);
+        if (powerquery_parser_1.ResultUtils.isError(triedDeference)) {
+            trace.exit({ ["IsThrowing" /* IsThrowing */]: true });
+            throw triedDeference.error;
+        }
+        else if (triedDeference.value === undefined) {
+            trace.exit();
+            return undefined;
+        }
+        const maybeDereferencedLiteral = parser_1.XorNodeUtils.maybeIdentifierExpressionLiteral(triedDeference.value);
         if (maybeDereferencedLiteral === undefined) {
             trace.exit();
             return undefined;
         }
         const deferencedLiteral = maybeDereferencedLiteral;
-        const nodeScope = yield assertGetOrCreateNodeScope(state, deferenced.node.id, trace.id);
+        const nodeScope = yield assertGetOrCreateNodeScope(state, triedDeference.value.node.id, trace.id);
         // When referencing an identifier as a recursive identifier there's no requirements
         // for it to resolve to a recursive reference.
         // This if it's a recursive identifier we need to also try the identifier without the recursive `@` prefix.
@@ -336,6 +346,11 @@ function maybeDereferencedIdentifierType(state, xorNode, maybeCorrelationId) {
             default:
                 throw powerquery_parser_1.Assert.isNever(scopeItem);
         }
+        // Infinite recursion on an inclusive identifier.
+        // There's no good way to handle the type of this as it requires evaluation, so mark it as any.
+        if (deferencedLiteral.startsWith("@") && (maybeNextXorNode === null || maybeNextXorNode === void 0 ? void 0 : maybeNextXorNode.node.id) === xorNode.node.id) {
+            return language_1.Type.AnyInstance;
+        }
         const result = maybeNextXorNode
             ? yield inspectXor(state, maybeNextXorNode, trace.id)
             : undefined;
@@ -344,79 +359,6 @@ function maybeDereferencedIdentifierType(state, xorNode, maybeCorrelationId) {
     });
 }
 exports.maybeDereferencedIdentifierType = maybeDereferencedIdentifierType;
-// Recursively derefence an identifier if it points to another identifier.
-function recursiveIdentifierDereference(state, xorNode, maybeCorrelationId) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, recursiveIdentifierDereference.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsIdentifier(xorNode);
-        const result = powerquery_parser_1.Assert.asDefined(yield recursiveIdentifierDereferenceHelper(state, xorNode, trace.id));
-        trace.exit();
-        return result;
-    });
-}
-exports.recursiveIdentifierDereference = recursiveIdentifierDereference;
-// Recursively derefence an identifier if it points to another identifier.
-function recursiveIdentifierDereferenceHelper(state, xorNode, correlationId) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, recursiveIdentifierDereferenceHelper.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsIdentifier(xorNode);
-        if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
-            trace.exit({ ["Result" /* Result */]: undefined });
-            return undefined;
-        }
-        const identifier = xorNode.node;
-        const identifierId = identifier.id;
-        let identifierLiteral;
-        let isRecursiveIdentifier;
-        switch (identifier.kind) {
-            case "Identifier" /* Identifier */:
-                identifierLiteral = identifier.literal;
-                isRecursiveIdentifier = false;
-                break;
-            case "IdentifierExpression" /* IdentifierExpression */:
-                identifierLiteral = identifier.identifier.literal;
-                isRecursiveIdentifier = identifier.maybeInclusiveConstant !== undefined;
-                break;
-            default:
-                throw powerquery_parser_1.Assert.isNever(identifier);
-        }
-        const nodeScope = yield assertGetOrCreateNodeScope(state, identifierId, trace.id);
-        const maybeScopeItem = nodeScope.get(isRecursiveIdentifier ? `@${identifierLiteral}` : identifierLiteral);
-        if (maybeScopeItem === undefined) {
-            trace.exit();
-            return xorNode;
-        }
-        const scopeItem = maybeScopeItem;
-        let maybeNextXorNode;
-        switch (scopeItem.kind) {
-            case "Each" /* Each */:
-            case "Parameter" /* Parameter */:
-            case "Undefined" /* Undefined */:
-                trace.exit({ ["Result" /* Result */]: scopeItem.kind });
-                return xorNode;
-            case "LetVariable" /* LetVariable */:
-            case "RecordField" /* RecordField */:
-            case "SectionMember" /* SectionMember */:
-                maybeNextXorNode = scopeItem.maybeValue;
-                break;
-            default:
-                throw powerquery_parser_1.Assert.isNever(scopeItem);
-        }
-        const result = maybeNextXorNode !== undefined &&
-            parser_1.XorNodeUtils.isAstXorChecked(maybeNextXorNode, [
-                "Identifier" /* Identifier */,
-                "IdentifierExpression" /* IdentifierExpression */,
-            ])
-            ? yield recursiveIdentifierDereferenceHelper(state, maybeNextXorNode, trace.id)
-            : xorNode;
-        trace.exit();
-        return result;
-    });
-}
 function createParameterType(parameter) {
     return {
         kind: parameter.maybeType

package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map CHANGED Viewed

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

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js CHANGED Viewed

@@ -12,13 +12,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeInvokeExpression = void 0;
-// import * as PQP from "@microsoft/powerquery-parser";
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const externalType_1 = require("../../externalType");
 const __1 = require("../../..");
 const common_1 = require("./common");
+const deferenceIdentifier_1 = require("../../deferenceIdentifier");
 function inspectTypeInvokeExpression(state, xorNode, maybeCorrelationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -61,13 +61,17 @@ function maybeExternalInvokeRequest(state, xorNode, maybeCorrelationId) {
             trace.exit();
             return undefined;
         }
-        const deferencedIdentifier = yield (0, common_1.recursiveIdentifierDereference)(state, maybeIdentifier, trace.id);
+        const updatedSettings = Object.assign(Object.assign({}, state), { maybeInitialCorrelationId: trace.id });
+        const triedDeferencedIdentifier = yield (0, deferenceIdentifier_1.tryDeferenceIdentifier)(updatedSettings, state.nodeIdMapCollection, maybeIdentifier, state.scopeById);
+        if (powerquery_parser_1.ResultUtils.isError(triedDeferencedIdentifier) || triedDeferencedIdentifier.value === undefined) {
+            return undefined;
+        }
         const types = [];
         for (const argument of parser_1.NodeIdMapIterator.iterInvokeExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsInvokeExpression(xorNode))) {
             // eslint-disable-next-line no-await-in-loop
             types.push(yield (0, common_1.inspectXor)(state, argument, trace.id));
         }
-        const result = externalType_1.ExternalTypeUtils.createInvocationTypeRequest(powerquery_parser_1.Assert.asDefined(parser_1.XorNodeUtils.maybeIdentifierExpressionLiteral(deferencedIdentifier)), types);
+        const result = externalType_1.ExternalTypeUtils.createInvocationTypeRequest(powerquery_parser_1.Assert.asDefined(parser_1.XorNodeUtils.maybeIdentifierExpressionLiteral(triedDeferencedIdentifier.value)), types);
         trace.exit();
         return result;
     });

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"inspectTypeInvokeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;~~AAElC~~,~~uDAAuD~~;~~AAEvD~~,0FAAwF;AACxF,sFAMmE;~~AAEnE~~,~~oEAAsD;AAEtD,~~qDAAqE;AACrE,gCAA+D;AAC/D,~~qCAAwF~~;~~AAExF~~,SAAsB,2BAA2B,CAC7C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,2BAA2B,CAAC,IAAI,EAChC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAuB,OAAO,4CAAgC,CAAC;QAE5F,MAAM,YAAY,GAA2D,MAAM,0BAA0B,CACzG,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,SAAS,GAAqC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YAErG,IAAI,SAAS,KAAK,SAAS,EAAE;gBACzB,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAEhF,OAAO,SAAS,CAAC;aACpB;SACJ;QAED,MAAM,eAAe,GAAa,uBAAc,CAAC,2CAA2C,CACxF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,CAClB,CAAC;QAEF,MAAM,mBAAmB,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAErG,IAAI,MAA4B,CAAC;QAEjC,IAAI,mBAAmB,CAAC,IAAI,oBAAsB,EAAE;YAChD,MAAM,GAAG,eAAI,CAAC,WAAW,CAAC;SAC7B;aAAM,IAAI,mBAAmB,CAAC,IAAI,8BAA2B,EAAE;YAC5D,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM,IAAI,mBAAmB,CAAC,iBAAiB,4CAA0C,EAAE;YACxF,MAAM,GAAG,mBAAmB,CAAC,UAAU,CAAC;SAC3C;aAAM;YACH,MAAM,GAAG,eAAI,CAAC,WAAW,CAAC;SAC7B;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AArDD,kEAqDC;AAED,SAAe,0BAA0B,CACrC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAM,eAAe,GACjB,uBAAc,CAAC,+BAA+B,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE/F,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,~~oBAAoB~~,~~GAAa~~,MAAM,IAAA,~~uCAA8B~~,EAAC,KAAK,EAAE,eAAe,EAAE,KAAK,CAAC,~~EAAE~~,CAAC,CAAC;~~QAE9G~~,MAAM,KAAK,GAA2B,EAAE,CAAC;QAEzC,KAAK,MAAM,QAAQ,IAAI,0BAAiB,CAAC,oBAAoB,CACzD,KAAK,CAAC,mBAAmB,EACzB,qBAAY,CAAC,wBAAwB,CAAC,OAAO,CAAC,CACjD,EAAE;YACC,4CAA4C;YAC5C,KAAK,CAAC,IAAI,CAAC,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;SAC3D;QAED,MAAM,MAAM,GAA+C,gCAAiB,CAAC,2BAA2B,CACpG,0BAAM,CAAC,SAAS,CAAC,qBAAY,CAAC,gCAAgC,CAAC,~~oBAAoB~~,CAAC,CAAC,~~EACrF~~,KAAK,CACR,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA"}
1	+ {"version":3,"file":"inspectTypeInvokeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.ts"],"names":[],"mappings":"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"}

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

@@ -1,20 +1,25 @@
-import type { Hover, Range, SignatureHelp } from "vscode-languageserver-types";
+import type { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+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: OnIdentifierProviderContext): Promise<Location[] | null>;
 }
-export interface HoverProviderContext extends ProviderContext {
-    readonly identifier: string;
+export interface IHoverProvider {
+    getHover(context: OnIdentifierProviderContext): Promise<Hover | null>;
+}
+export interface OnIdentifierProviderContext extends ProviderContext {
+    readonly identifier: Ast.GeneralizedIdentifier | Ast.Identifier;
+}
+export interface ILocalDocumentProvider extends IDefinitionProvider, ISymbolProvider {
 }
 export interface ProviderContext {
     readonly traceManager: TraceManager;
@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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,iEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAC9B,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA"}

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

@@ -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 CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Hover, SignatureHelp, SignatureInformation } from "vscode-languageserver-types";
-import { AutocompleteItemProviderContext, HoverProviderContext, ISymbolProvider, SignatureProviderContext } from "./commonTypes";
+import { AutocompleteItemProviderContext, ISymbolProvider, OnIdentifierProviderContext, 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: OnIdentifierProviderContext): Promise<Hover | null>;
     getSignatureHelp(context: SignatureProviderContext): Promise<SignatureHelp | null>;
     private static getDefinitionKindText;
     private getOrCreateSignatureInformation;

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

@@ -48,8 +48,8 @@ class LibrarySymbolProvider {
                 trace.exit({ invalidContext: true });
                 return null;
             }
-            const identifierLiteral = context.identifier;
-            const maybeDefinition = this.libraryDefinitions.get(context.identifier);
+            const identifierLiteral = context.identifier.literal;
+            const maybeDefinition = this.libraryDefinitions.get(identifierLiteral);
             if (maybeDefinition === undefined) {
                 trace.exit({ invalidContext: true });
                 return null;

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

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

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

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

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

@@ -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,37 @@ 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);
+            if (context.identifier.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */ ||
+                context.identifier.identifierContextKind !== "Value" /* Value */) {
+                return null;
+            }
+            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.literal);
+            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 +87,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 +98,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;
         });
@@ -147,7 +180,7 @@ class LocalDocumentSymbolProvider {
                 contents: {
                     kind: vscode_languageserver_types_1.MarkupKind.PlainText,
                     language: "powerquery",
-                    value: `[${scopeItemText}] ${context.identifier}: ${nameOfExpressionType}`,
+                    value: `[${scopeItemText}] ${context.identifier.literal}: ${nameOfExpressionType}`,
                 },
                 range: undefined,
             };
@@ -156,7 +189,7 @@ class LocalDocumentSymbolProvider {
         });
     }
     static getHoverForScopeItem(context, nodeScope, scopeType, correlationId) {
-        const identifierLiteral = context.identifier;
+        const identifierLiteral = context.identifier.literal;
         const maybeScopeItem = nodeScope.get(identifierLiteral);
         if (maybeScopeItem === undefined || maybeScopeItem.kind === "Undefined" /* Undefined */) {
             return undefined;
@@ -192,5 +225,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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -1,4 +1,5 @@
-import { AutocompleteItemProviderContext, HoverProviderContext, ISymbolProvider, SignatureProviderContext } from "./commonTypes";
+import { Location } from "vscode-languageserver-types";
+import { AutocompleteItemProviderContext, ISymbolProvider, OnIdentifierProviderContext, 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: OnIdentifierProviderContext): Promise<Location[] | null>;
+    getHover(_context: OnIdentifierProviderContext): Promise<Hover | null>;
     getSignatureHelp(_context: SignatureProviderContext): Promise<SignatureHelp | null>;
 }

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

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
1	+ {"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,QAAqC;;YAC5D,OAAO,EAAE,CAAC;QACd,CAAC;KAAA;IAED,yCAAyC;IAC5B,QAAQ,CAAC,QAAqC;;YACvD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAED,yCAAyC;IAC5B,gBAAgB,CAAC,QAAkC;;YAC5D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;CACJ;AApCD,gDAoCC"}

package/lib/powerquery-language-services/validate/validateLexAndParse.js CHANGED Viewed

@@ -79,26 +79,9 @@ function validateParse(triedParse, validationSettings) {
         }
         const error = triedParse.error;
         const innerError = error.innerError;
+        const maybeErrorToken = PQP.Parser.ParseError.maybeTokenFrom(innerError);
         const message = error.message;
         const parseContextState = error.state.contextState;
-        let maybeErrorToken;
-        if ((innerError instanceof PQP.Parser.ParseError.ExpectedAnyTokenKindError ||
-            innerError instanceof PQP.Parser.ParseError.ExpectedTokenKindError) &&
-            innerError.maybeFoundToken !== undefined) {
-            maybeErrorToken = innerError.maybeFoundToken.token;
-        }
-        else if (innerError instanceof PQP.Parser.ParseError.InvalidPrimitiveTypeError) {
-            maybeErrorToken = innerError.token;
-        }
-        else if (innerError instanceof PQP.Parser.ParseError.UnterminatedSequence) {
-            maybeErrorToken = innerError.startToken;
-        }
-        else if (innerError instanceof PQP.Parser.ParseError.UnusedTokensRemainError) {
-            maybeErrorToken = innerError.firstUnusedToken;
-        }
-        else {
-            maybeErrorToken = undefined;
-        }
         let range;
         if (maybeErrorToken !== undefined) {
             range = {

package/lib/powerquery-language-services/validate/validateLexAndParse.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":"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~~OAAO~~,~~GAAW~~,~~KAAK,CAAC,OAAO,CAAC;QACtC,MAAM,iBAAiB,GAAkC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC;QAElF,IAAI,eAAqD,CAAC;QAE1D,IACI,CAAC,UAAU,YAAY,~~GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,~~yBAAyB;YAClE~~,~~UAAU,YAAY,GAAG,~~CAAC,~~MAAM,CAAC,~~UAAU,CAAC,~~sBAAsB,~~CAAC;~~YACvE~~,~~UAAU~~,~~CAAC~~,~~eAAe~~,KAAK,~~SAAS,EAC1C;YACE,eAAe,GAAG,UAAU,~~CAAC,~~eAAe~~,CAAC~~,KAAK,CAAC~~;~~SACtD;aAAM~~,~~IAAI,UAAU,YAAY,GAAG,CAAC,~~MAAM,~~CAAC~~,~~UAAU~~,~~CAAC~~,~~yBAAyB,EAAE;YAC9E,eAAe,GAAG,UAAU,~~CAAC,KAAK,CAAC~~;SACtC;aAAM~~,~~IAAI,UAAU,~~YAAY,~~GAAG,~~CAAC~~,MAAM,CAAC,UAAU,CAAC,oBAAoB,EAAE~~;~~YACzE~~,~~eAAe,GAAG,UAAU,CAAC,UAAU,CAAC;SAC3C;aAAM,~~IAAI,~~UAAU,YAAY,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,uBAAuB,EAAE;YAC5E,eAAe,GAAG,UAAU,CAAC,gBAAgB,CAAC;SACjD;aAAM;YACH,eAAe,GAAG,SAAS,CAAC;SAC/B;QAED,IAAI,~~KAAY,CAAC;QAEjB,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,KAAK,GAAG;gBACJ,KAAK,EAAE;oBACH,IAAI,EAAE,eAAe,CAAC,aAAa,CAAC,UAAU;oBAC9C,SAAS,EAAE,eAAe,CAAC,aAAa,CAAC,YAAY;iBACxD;gBACD,GAAG,EAAE;oBACD,IAAI,EAAE,eAAe,CAAC,WAAW,CAAC,UAAU;oBAC5C,SAAS,EAAE,eAAe,CAAC,WAAW,CAAC,YAAY;iBACtD;aACJ,CAAC;SACL;aAAM;YACH,MAAM,SAAS,GAAmC,iBAAiB,CAAC,SAAS,CAAC;YAE9E,IAAI,SAAS,KAAK,SAAS,EAAE;gBACzB,OAAO,EAAE,CAAC;aACb;YAED,MAAM,SAAS,GAA0B,MAAM,uBAAc,CAAC,kBAAkB,CAC5E,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,mBAAmB,EAC5C,SAAS,CAAC,EAAE,CACf,CAAC;YAEF,IAAI,SAAS,KAAK,SAAS,EAAE;gBACzB,OAAO,EAAE,CAAC;aACb;YAED,MAAM,cAAc,GAAkC,SAAS,CAAC,UAAU,CAAC;YAE3E,KAAK,GAAG;gBACJ,KAAK,EAAE;oBACH,IAAI,EAAE,cAAc,CAAC,aAAa,CAAC,UAAU;oBAC7C,SAAS,EAAE,cAAc,CAAC,aAAa,CAAC,YAAY;iBACvD;gBACD,GAAG,EAAE;oBACD,IAAI,EAAE,cAAc,CAAC,WAAW,CAAC,UAAU;oBAC3C,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,YAAY;iBACrD;aACJ,CAAC;SACL;QAED,OAAO;YACH;gBACI,IAAI,EAAE,yCAAmB,CAAC,UAAU;gBACpC,OAAO;gBACP,KAAK;gBACL,QAAQ,EAAE,gDAAkB,CAAC,KAAK;gBAClC,MAAM,EAAE,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM;aACrC;SACJ,CAAC;IACN,CAAC;CAAA"}
1	+ {"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":"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"}