@microsoft/powerquery-language-services 0.2.11 → 0.2.17

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map

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

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.d.ts

@@ -1,6 +1,7 @@
 import * as PQP from "@microsoft/powerquery-parser";
+import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { ActiveNode, TMaybeActiveNode } from "../../activeNode";
 import { AutocompleteItem } from "../autocompleteItem";
 import { TrailingToken, TriedAutocompleteKeyword } from "../commonTypes";
-export declare function tryAutocompleteKeyword(settings: PQP.CommonSettings, nodeIdMapCollection: PQP.Parser.NodeIdMap.Collection, maybeActiveNode: TMaybeActiveNode, maybeTrailingToken: TrailingToken | undefined): TriedAutocompleteKeyword;
-export declare function autocompleteKeyword(nodeIdMapCollection: PQP.Parser.NodeIdMap.Collection, activeNode: ActiveNode, maybeTrailingToken: TrailingToken | undefined): ReadonlyArray<AutocompleteItem>;
+export declare function tryAutocompleteKeyword(settings: PQP.CommonSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeActiveNode: TMaybeActiveNode, maybeTrailingToken: TrailingToken | undefined): TriedAutocompleteKeyword;
+export declare function autocompleteKeyword(nodeIdMapCollection: NodeIdMap.Collection, activeNode: ActiveNode, maybeTrailingToken: TrailingToken | undefined): ReadonlyArray<AutocompleteItem>;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js

@@ -17,15 +17,21 @@ 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));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeyword = exports.tryAutocompleteKeyword = void 0;
 var PQP = require("@microsoft/powerquery-parser");
-var __1 = require("../../..");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 var activeNode_1 = require("../../activeNode");
 var autocompleteItem_1 = require("../autocompleteItem");
 var autocompleteKeywordDefault_1 = require("./autocompleteKeywordDefault");
@@ -35,15 +41,16 @@ var autocompleteKeywordLetExpression_1 = require("./autocompleteKeywordLetExpres
 var autocompleteKeywordListExpression_1 = require("./autocompleteKeywordListExpression");
 var autocompleteKeywordSectionMember_1 = require("./autocompleteKeywordSectionMember");
 var autocompleteKeywordTrailingText_1 = require("./autocompleteKeywordTrailingText");
+var __1 = require("../../..");
 function tryAutocompleteKeyword(settings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken) {
     if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
-        return PQP.ResultUtils.createOk(__spreadArray(__spreadArray([], __read(PQP.Language.Keyword.ExpressionKeywordKinds.map(function (keywordKind) {
+        return powerquery_parser_1.ResultUtils.boxOk(__spreadArray(__spreadArray([], __read(language_1.Keyword.ExpressionKeywordKinds.map(function (keywordKind) {
             return autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind(keywordKind);
-        }))), [
+        })), false), [
             autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind("section" /* Section */),
-        ]));
+        ], false));
     }
-    return PQP.ResultUtils.ensureResult(settings.locale, function () {
+    return powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
         return autocompleteKeyword(nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
     });
 }
@@ -56,8 +63,7 @@ function autocompleteKeyword(nodeIdMapCollection, activeNode, maybeTrailingToken
             maybePositionName = activeNode.maybeIdentifierUnderPosition.literal;
         }
         // Matches 'null', 'true', and 'false'.
-        else if (ancestryLeaf.kind === "Ast" /* Ast */ &&
-            ancestryLeaf.node.kind === "LiteralExpression" /* LiteralExpression */ &&
+        else if (parser_1.XorNodeUtils.isAstXorChecked(ancestryLeaf, "LiteralExpression" /* LiteralExpression */) &&
             (ancestryLeaf.node.literalKind === "Logical" /* Logical */ ||
                 ancestryLeaf.node.literalKind === "Null" /* Null */)) {
             maybePositionName = ancestryLeaf.node.literal;
@@ -102,22 +108,22 @@ function traverseAncestors(state) {
         state.child = ancestry[ancestryIndex - 1];
         switch (state.parent.node.kind) {
             case "ErrorHandlingExpression" /* ErrorHandlingExpression */:
-                maybeInspected = autocompleteKeywordErrorHandlingExpression_1.autocompleteKeywordErrorHandlingExpression(state);
+                maybeInspected = (0, autocompleteKeywordErrorHandlingExpression_1.autocompleteKeywordErrorHandlingExpression)(state);
                 break;
             case "IdentifierPairedExpression" /* IdentifierPairedExpression */:
-                maybeInspected = autocompleteKeywordIdentifierPairedExpression_1.autocompleteKeywordIdentifierPairedExpression(state);
+                maybeInspected = (0, autocompleteKeywordIdentifierPairedExpression_1.autocompleteKeywordIdentifierPairedExpression)(state);
                 break;
             case "LetExpression" /* LetExpression */:
-                maybeInspected = autocompleteKeywordLetExpression_1.autocompleteKeywordLetExpression(state);
+                maybeInspected = (0, autocompleteKeywordLetExpression_1.autocompleteKeywordLetExpression)(state);
                 break;
             case "ListExpression" /* ListExpression */:
-                maybeInspected = autocompleteKeywordListExpression_1.autocompleteKeywordListExpression(state);
+                maybeInspected = (0, autocompleteKeywordListExpression_1.autocompleteKeywordListExpression)(state);
                 break;
             case "SectionMember" /* SectionMember */:
-                maybeInspected = autocompleteKeywordSectionMember_1.autocompleteKeywordSectionMember(state);
+                maybeInspected = (0, autocompleteKeywordSectionMember_1.autocompleteKeywordSectionMember)(state);
                 break;
             default:
-                maybeInspected = autocompleteKeywordDefault_1.autocompleteKeywordDefault(state);
+                maybeInspected = (0, autocompleteKeywordDefault_1.autocompleteKeywordDefault)(state);
         }
         if (maybeInspected !== undefined) {
             return maybeInspected;
@@ -133,27 +139,24 @@ function getMaybeEdgeCase(state, maybeTrailingToken) {
     // `l|` -> `let`
     if (maybeTrailingToken === undefined &&
         ancestry.length === 2 &&
-        ancestry[0].kind === "Ast" /* Ast */ &&
-        ancestry[0].node.kind === "Identifier" /* Identifier */ &&
-        ancestry[1].node.kind === "IdentifierExpression" /* IdentifierExpression */) {
+        parser_1.XorNodeUtils.isAstXorChecked(ancestry[0], "Identifier" /* Identifier */) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[1], "IdentifierExpression" /* IdentifierExpression */)) {
         var identifier_1 = ancestry[0].node.literal;
-        maybeInspected = PQP.Language.Keyword.StartOfDocumentKeywords.map(function (keywordKind) {
+        maybeInspected = language_1.Keyword.StartOfDocumentKeywords.map(function (keywordKind) {
             return autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind(keywordKind, identifier_1);
         });
     }
     // `(x |) => x+1` -> `(x as|) => x+1`
-    else if (ancestry[0].kind === "Ast" /* Ast */ &&
-        ancestry[0].node.kind === "Identifier" /* Identifier */ &&
-        ancestry[1].node.kind === "Parameter" /* Parameter */ &&
+    else if (parser_1.XorNodeUtils.isAstXorChecked(ancestry[0], "Identifier" /* Identifier */) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[1], "Parameter" /* Parameter */) &&
         __1.PositionUtils.isAfterAst(activeNode.position, ancestry[0].node, true)) {
         maybeInspected = [autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind("as" /* As */)];
     }
     // `(foo a|) => foo` -> `(foo as) => foo
     else if ((maybeTrailingToken === null || maybeTrailingToken === void 0 ? void 0 : maybeTrailingToken.data) === "a" &&
-        ancestry[0].kind === "Context" /* Context */ &&
-        ancestry[0].node.kind === "Constant" /* Constant */ &&
-        ancestry[1].node.kind === "ParameterList" /* ParameterList */ &&
-        ancestry[2].node.kind === "FunctionExpression" /* FunctionExpression */) {
+        parser_1.XorNodeUtils.isContextXorChecked(ancestry[0], "Constant" /* Constant */) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[1], "ParameterList" /* ParameterList */) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[2], "FunctionExpression" /* FunctionExpression */)) {
         maybeInspected = [autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind("as" /* As */)];
     }
     return maybeInspected;
@@ -172,34 +175,31 @@ function handleConjunctions(activeNode, inspected, maybeTrailingToken) {
     // `[x=1] s`
     // `[x=1] |`
     if (activeNode.ancestry.length === 2 &&
-        activeNode.ancestry[1].kind === "Ast" /* Ast */ &&
-        activeNode.ancestry[1].node.kind === "RecordExpression" /* RecordExpression */) {
+        parser_1.XorNodeUtils.isAstXorChecked(activeNode.ancestry[1], "RecordExpression" /* RecordExpression */)) {
         if (maybeTrailingToken === undefined) {
             return PQP.ArrayUtils.concatUnique(inspected, ["section" /* Section */]);
         }
         else if (maybeTrailingToken.kind === "Identifier" /* Identifier */ &&
             __1.PositionUtils.isInToken(activeNode.position, maybeTrailingToken, true, true)) {
-            return autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText(inspected, maybeTrailingToken, [
-                "section" /* Section */,
-            ]);
+            return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, maybeTrailingToken, ["section" /* Section */]);
         }
     }
     var activeNodeLeaf = activeNode_1.ActiveNodeUtils.assertGetLeaf(activeNode);
     // `let x = 1 a|`
     if (maybeTrailingToken !== undefined && maybeTrailingToken.isInOrOnPosition) {
-        return autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText(inspected, maybeTrailingToken, undefined);
+        return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, maybeTrailingToken, undefined);
     }
     // `let x = |`
     // `let x = 1|`
     // `let x = 1 | a`
-    else if (PQP.Parser.XorNodeUtils.isTUnaryType(activeNodeLeaf)) {
+    else if (parser_1.XorNodeUtils.isTUnaryType(activeNodeLeaf)) {
         // `let x = 1 | a`
         if (maybeTrailingToken !== undefined &&
             __1.PositionUtils.isAfterTokenPosition(activeNode.position, maybeTrailingToken.positionStart, false)) {
             return inspected;
         }
         // `let x = 1|`
-        else if (activeNodeLeaf.kind === "Ast" /* Ast */) {
+        else if (parser_1.XorNodeUtils.isAstXor(activeNodeLeaf)) {
             return PQP.ArrayUtils.concatUnique(inspected, ConjunctionKeywords);
         }
         // `let x = |`

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map

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

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.d.ts

@@ -1,3 +1,3 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Keyword } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectAutocompleteKeywordState } from "./commonTypes";
-export declare function autocompleteKeywordDefault(state: InspectAutocompleteKeywordState): ReadonlyArray<PQP.Language.Keyword.KeywordKind> | undefined;
+export declare function autocompleteKeywordDefault(state: InspectAutocompleteKeywordState): ReadonlyArray<Keyword.KeywordKind> | undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js

@@ -3,7 +3,8 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordDefault = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var __1 = require("../../..");
 function autocompleteKeywordDefault(state) {
     var activeNode = state.activeNode;
@@ -56,21 +57,20 @@ function autocompleteDefaultExpression(state) {
     var child = state.child;
     // '[x=|1]
     if (activeNode.leafKind === "ShiftedRight" /* ShiftedRight */) {
-        return PQP.Language.Keyword.ExpressionKeywordKinds;
+        return language_1.Keyword.ExpressionKeywordKinds;
     }
     // `if 1|`
-    else if (child.kind === "Ast" /* Ast */ &&
-        child.node.kind === "LiteralExpression" /* LiteralExpression */ &&
+    else if (parser_1.XorNodeUtils.isAstXorChecked(child, "LiteralExpression" /* LiteralExpression */) &&
         child.node.literalKind === "Numeric" /* Numeric */) {
         return [];
     }
-    return PQP.Language.Keyword.ExpressionKeywordKinds;
+    return language_1.Keyword.ExpressionKeywordKinds;
 }
 function autocompleteKeywordConstant(activeNode, child, keywordKind) {
     if (__1.PositionUtils.isBeforeXor(activeNode.position, child, false)) {
         return undefined;
     }
-    else if (child.kind === "Ast" /* Ast */) {
+    else if (parser_1.XorNodeUtils.isAstXor(child)) {
         // So long as you're inside of an Ast Constant there's nothing that can be recommended other than the constant.
         // Note that we previously checked isBeforeXorNode so we can use the quicker isOnAstNodeEnd to check
         // if we're inside of the Ast node.

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeywordDefault.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autocompleteKeywordDefault.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAA2F;AAC3F,oFAAmG;AAInG,8BAAyC;AAEzC,SAAgB,0BAA0B,CACtC,KAAsC;IAEtC,IAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,IAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,IAAM,GAAG,GAAW,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAEzF,IAAI,0BAA0B,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;QAChD,OAAO,6BAA6B,CAAC,KAAK,CAAC,CAAC;KAC/C;SAAM;QACH,IAAM,sBAAsB,GAAoC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjG,OAAO,sBAAsB,KAAK,SAAS;YACvC,CAAC,CAAC,2BAA2B,CAAC,UAAU,EAAE,KAAK,EAAE,sBAAsB,CAAC;YACxE,CAAC,CAAC,SAAS,CAAC;KACnB;AACL,CAAC;AAfD,gEAeC;AAED,IAAM,0BAA0B,GAA0B;IACtD,YAAY,wDAAsC,CAAC,CAAC;IACpD,YAAY,sFAAqD,CAAC,CAAC;IACnE,YAAY,gDAAkC,CAAC,CAAC;IAChD,YAAY,gEAA0C,CAAC,CAAC;IACxD,YAAY,oCAA4B,CAAC,CAAC;IAC1C,YAAY,oCAA4B,CAAC,CAAC;IAC1C,YAAY,oCAA4B,CAAC,CAAC;IAC1C,YAAY,4CAAgC,CAAC,CAAC;IAC9C,YAAY,sCAA6B,CAAC,CAAC;IAC3C,YAAY,wCAA8B,CAAC,CAAC;IAC5C,YAAY,kDAAmC,CAAC,CAAC;IACjD,YAAY,0DAAuC,CAAC,CAAC;CACxD,CAAC;AAEF,4EAA4E;AAC5E,yDAAyD;AACzD,mHAAmH;AACnH,IAAM,uBAAuB,GAAqC,IAAI,GAAG,CAA8B;IACnG,sCAAsC;IACtC,CAAC,YAAY,wDAAsC,CAAC,CAAC,sBAA4B;IAEjF,4BAA4B;IAC5B,CAAC,YAAY,oCAA4B,CAAC,CAAC,gBAAyB;IACpE,CAAC,YAAY,oCAA4B,CAAC,CAAC,oBAA2B;IACtE,CAAC,YAAY,oCAA4B,CAAC,CAAC,oBAA2B;IAEtE,6BAA6B;IAC7B,CAAC,YAAY,sCAA6B,CAAC,CAAC,gBAAyB;IAErE,mCAAmC;IACnC,CAAC,YAAY,kDAAmC,CAAC,CAAC,8BAAgC;IAElF,uBAAuB;IACvB,CAAC,YAAY,0BAAuB,CAAC,CAAC,0BAA8B;CACvE,CAAC,CAAC;AAEH,SAAS,6BAA6B,CAClC,KAAsC;IAEtC,IAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,IAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IAEpC,UAAU;IACV,IAAI,UAAU,CAAC,QAAQ,sCAAoC,EAAE;QACzD,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;IACD,UAAU;SACL,IACD,qBAAY,CAAC,eAAe,CAAwB,KAAK,8CAAiC;QAC1F,KAAK,CAAC,IAAI,CAAC,WAAW,4BAA4B,EACpD;QACE,OAAO,EAAE,CAAC;KACb;IAED,OAAO,kBAAO,CAAC,sBAAsB,CAAC;AAC1C,CAAC;AAED,SAAS,2BAA2B,CAChC,UAAsB,EACtB,KAAe,EACf,WAAgC;IAEhC,IAAI,iBAAa,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE;QAC9D,OAAO,SAAS,CAAC;KACpB;SAAM,IAAI,qBAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACrC,+GAA+G;QAC/G,oGAAoG;QACpG,mCAAmC;QACnC,OAAO,iBAAa,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;KACzF;IAED,OAAO,CAAC,WAAW,CAAC,CAAC;AACzB,CAAC;AAED,6EAA6E;AAC7E,yFAAyF;AACzF,+EAA+E;AAC/E,SAAS,YAAY,CAAC,QAAsB,EAAE,mBAAuC;IACjF,OAAO,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACrD,CAAC"}

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.d.ts

@@ -1,3 +1,3 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Keyword } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectAutocompleteKeywordState } from "./commonTypes";
-export declare function autocompleteKeywordErrorHandlingExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<PQP.Language.Keyword.KeywordKind> | undefined;
+export declare function autocompleteKeywordErrorHandlingExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<Keyword.KeywordKind> | undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js

@@ -3,7 +3,8 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordErrorHandlingExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var __1 = require("../../..");
 function autocompleteKeywordErrorHandlingExpression(state) {
     var position = state.activeNode.position;
@@ -39,11 +40,11 @@ function autocompleteKeywordErrorHandlingExpression(state) {
                 return undefined;
             }
         }
-        else if (child.kind === "Ast" /* Ast */ && __1.PositionUtils.isAfterAst(position, child.node, true)) {
+        else if (parser_1.XorNodeUtils.isAstXor(child) && __1.PositionUtils.isAfterAst(position, child.node, true)) {
             return ["otherwise" /* Otherwise */];
         }
         else {
-            return PQP.Language.Keyword.ExpressionKeywordKinds;
+            return language_1.Keyword.ExpressionKeywordKinds;
         }
     }
     else {

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeywordErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAIpD,8BAAyC;AAIzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,IAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,IAAM,KAAK,GAAwB,KAAK,CAAC,KAAK,CAAC;IAC/C,IAAM,iBAAiB,GAA8B,KAAK,CAAC,kBAAkB,CAAC;IAE9E,IAAM,wBAAwB,GAAuB,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IACpF,IAAI,wBAAwB,KAAK,CAAC,EAAE;QAChC,OAAO,iBAAsC,CAAC;KACjD;SAAM,IAAI,wBAAwB,KAAK,CAAC,EAAE;QACvC,sCAAsC;QACtC,yEAAyE;QACzE,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,IAAM,aAAa,GAAkB,iBAAiB,CAAC;YAEvD,8DAA8D;YAC9D,IACI,aAAa,CAAC,IAAI,kCAA4C;gBAC9D,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAC/D;gBACE,IAAM,SAAS,GAAW,iBAAiB,CAAC,IAAI,CAAC;gBAEjD,iFAAiF;gBACjF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,4BAA2C,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC1F,OAAO,6BAA4C,CAAC;iBACvD;gBACD,mFAAmF;gBACnF,wEAAwE;gBACxE,oDAAoD;gBACpD,wCAAwC;qBACnC;oBACD,OAAO,4CAAiF,CAAC;iBAC5F;aACJ;YAED,yEAAyE;iBACpE;gBACD,OAAO,SAAS,CAAC;aACpB;SACJ;aAAM,IAAI,KAAK,CAAC,IAAI,oBAA+B,IAAI,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC1G,OAAO,6BAA4C,CAAC;SACvD;aAAM;YACH,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,CAAC;SACtD;KACJ;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAhDD,gGAgDC"}
+{"version":3,"file":"autocompleteKeywordErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAA6F;AAC7F,oFAAmG;AAInG,8BAAyC;AAGzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,IAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,IAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,IAAM,iBAAiB,GAA8B,KAAK,CAAC,kBAAkB,CAAC;IAE9E,IAAM,wBAAwB,GAAuB,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IACpF,IAAI,wBAAwB,KAAK,CAAC,EAAE;QAChC,OAAO,iBAAyB,CAAC;KACpC;SAAM,IAAI,wBAAwB,KAAK,CAAC,EAAE;QACvC,sCAAsC;QACtC,yEAAyE;QACzE,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,IAAM,aAAa,GAAkB,iBAAiB,CAAC;YAEvD,8DAA8D;YAC9D,IACI,aAAa,CAAC,IAAI,kCAA+B;gBACjD,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAC/D;gBACE,IAAM,SAAS,GAAW,iBAAiB,CAAC,IAAI,CAAC;gBAEjD,iFAAiF;gBACjF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,4BAA8B,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC7E,OAAO,6BAA+B,CAAC;iBAC1C;gBACD,mFAAmF;gBACnF,wEAAwE;gBACxE,oDAAoD;gBACpD,wCAAwC;qBACnC;oBACD,OAAO,4CAAuD,CAAC;iBAClE;aACJ;YAED,yEAAyE;iBACpE;gBACD,OAAO,SAAS,CAAC;aACpB;SACJ;aAAM,IAAI,qBAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC7F,OAAO,6BAA+B,CAAC;SAC1C;aAAM;YACH,OAAO,kBAAO,CAAC,sBAAsB,CAAC;SACzC;KACJ;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAhDD,gGAgDC"}

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.d.ts

@@ -1,3 +1,3 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Keyword } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectAutocompleteKeywordState } from "./commonTypes";
-export declare function autocompleteKeywordIdentifierPairedExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<PQP.Language.Keyword.KeywordKind> | undefined;
+export declare function autocompleteKeywordIdentifierPairedExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<Keyword.KeywordKind> | undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js

@@ -3,26 +3,25 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordIdentifierPairedExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 var __1 = require("../../..");
 function autocompleteKeywordIdentifierPairedExpression(state) {
     var childAttributeIndex = state.child.node.maybeAttributeIndex;
     // `section; s|`
     // `section; [] |`
     if (childAttributeIndex === 0 &&
-        PQP.Parser.AncestryUtils.maybeNextXor(state.activeNode.ancestry, state.ancestryIndex, [
-            "SectionMember" /* SectionMember */,
-        ])) {
+        parser_1.AncestryUtils.maybeNextXorChecked(state.activeNode.ancestry, state.ancestryIndex, "SectionMember" /* SectionMember */)) {
         return ["shared" /* Shared */];
     }
     else if (childAttributeIndex !== 2) {
         return [];
     }
-    var maybeLeaf = PQP.Parser.NodeIdMapUtils.maybeLeftMostLeaf(state.nodeIdMapCollection, state.child.node.id);
+    var maybeLeaf = parser_1.NodeIdMapUtils.maybeLeftMostLeaf(state.nodeIdMapCollection, state.child.node.id);
     // `x = |`
     // `x = |1`
     if (maybeLeaf === undefined || __1.PositionUtils.isBeforeAst(state.activeNode.position, maybeLeaf, false)) {
-        return PQP.Language.Keyword.ExpressionKeywordKinds;
+        return language_1.Keyword.ExpressionKeywordKinds;
     }
     else {
         return undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeywordIdentifierPairedExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,8BAAyC;AAGzC,SAAgB,6CAA6C,CACzD,KAAsC;IAEtC,IAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAErF,gBAAgB;IAChB,kBAAkB;IAClB,IACI,mBAAmB,KAAK,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,EAAE;;SAErF,CAAC,EACJ;QACE,OAAO,uBAAyC,CAAC;KACpD;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IACD,IAAM,SAAS,GAAuC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAC7F,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CACtB,CAAC;IACF,UAAU;IACV,WAAW;IACX,IAAI,SAAS,KAAK,SAAS,IAAI,iBAAa,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE;QACnG,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,CAAC;KACtD;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AA5BD,sGA4BC"}
+{"version":3,"file":"autocompleteKeywordIdentifierPairedExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oFAA0G;AAC1G,wFAA2F;AAG3F,8BAAyC;AAEzC,SAAgB,6CAA6C,CACzD,KAAsC;IAEtC,IAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAErF,gBAAgB;IAChB,kBAAkB;IAClB,IACI,mBAAmB,KAAK,CAAC;QACzB,sBAAa,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,sCAA6B,EAC/G;QACE,OAAO,uBAA4B,CAAC;KACvC;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IACD,IAAM,SAAS,GAA0B,uBAAc,CAAC,iBAAiB,CACrE,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CACtB,CAAC;IACF,UAAU;IACV,WAAW;IACX,IAAI,SAAS,KAAK,SAAS,IAAI,iBAAa,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE;QACnG,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AA1BD,sGA0BC"}

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.d.ts

@@ -1,3 +1,3 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Keyword } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectAutocompleteKeywordState } from "./commonTypes";
-export declare function autocompleteKeywordLetExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<PQP.Language.Keyword.KeywordKind> | undefined;
+export declare function autocompleteKeywordLetExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<Keyword.KeywordKind> | undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js

@@ -17,18 +17,22 @@ 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));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordLetExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
-var __1 = require("../../..");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var autocompleteKeywordDefault_1 = require("./autocompleteKeywordDefault");
-var autocompleteKeywordTrailingText_1 = require("./autocompleteKeywordTrailingText");
 var common_1 = require("./common");
+var autocompleteKeywordTrailingText_1 = require("./autocompleteKeywordTrailingText");
+var __1 = require("../../..");
 function autocompleteKeywordLetExpression(state) {
     // LetExpressions can trigger another inspection which will always hit the same LetExpression.
     // Make sure that it doesn't trigger an infinite recursive call.
@@ -36,28 +40,27 @@ function autocompleteKeywordLetExpression(state) {
     var maybeInspected;
     // Might be either `in` or whatever the autocomplete is for the the last child of the variableList.
     // `let x = 1 |`
-    if (child.node.maybeAttributeIndex === 2 && child.kind === "Context" /* Context */) {
-        maybeInspected = autocompleteLastKeyValuePair(state, PQP.Parser.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, state.parent));
+    if (child.node.maybeAttributeIndex === 2 && parser_1.XorNodeUtils.isContextXor(child)) {
+        maybeInspected = autocompleteLastKeyValuePair(state, parser_1.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsLetExpression(state.parent)));
         if (state.maybeTrailingToken !== undefined) {
             if (state.maybeTrailingToken.isInOrOnPosition === true) {
                 // We don't want maybeInspected to be zero legnth.
                 // It's either undefined or non-zero length.
-                maybeInspected = autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText(maybeInspected !== null && maybeInspected !== void 0 ? maybeInspected : [], state.maybeTrailingToken, [
+                maybeInspected = (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(maybeInspected !== null && maybeInspected !== void 0 ? maybeInspected : [], state.maybeTrailingToken, [
                     "in" /* In */,
                 ]);
                 return maybeInspected.length ? maybeInspected : undefined;
             }
             else if (__1.PositionUtils.isBeforeTokenPosition(state.activeNode.position, state.maybeTrailingToken.positionStart, true)) {
-                return maybeInspected !== undefined
-                    ? __spreadArray(__spreadArray([], __read(maybeInspected)), ["in" /* In */]) : maybeInspected;
+                return maybeInspected !== undefined ? __spreadArray(__spreadArray([], __read(maybeInspected), false), ["in" /* In */], false) : maybeInspected;
             }
         }
         else {
             return maybeInspected !== undefined
-                ? __spreadArray(__spreadArray([], __read(maybeInspected)), ["in" /* In */]) : ["in" /* In */];
+                ? __spreadArray(__spreadArray([], __read(maybeInspected), false), ["in" /* In */], false) : ["in" /* In */];
         }
     }
-    return maybeInspected !== null && maybeInspected !== void 0 ? maybeInspected : autocompleteKeywordDefault_1.autocompleteKeywordDefault(state);
+    return maybeInspected !== null && maybeInspected !== void 0 ? maybeInspected : (0, autocompleteKeywordDefault_1.autocompleteKeywordDefault)(state);
 }
 exports.autocompleteKeywordLetExpression = autocompleteKeywordLetExpression;
 function autocompleteLastKeyValuePair(state, keyValuePairs) {
@@ -69,6 +72,6 @@ function autocompleteLastKeyValuePair(state, keyValuePairs) {
     if (maybeLastValue === undefined) {
         return undefined;
     }
-    return common_1.autocompleteKeywordRightMostLeaf(state, maybeLastValue.node.id);
+    return (0, common_1.autocompleteKeywordRightMostLeaf)(state, maybeLastValue.node.id);
 }
 //# sourceMappingURL=autocompleteKeywordLetExpression.js.map

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeywordLetExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;AAElC,kDAAoD;AAEpD,8BAAyC;AACzC,2EAA0E;AAC1E,qFAAoF;AACpF,mCAA4D;AAG5D,SAAgB,gCAAgC,CAC5C,KAAsC;IAEtC,8FAA8F;IAC9F,gEAAgE;IAChE,IAAM,KAAK,GAAwB,KAAK,CAAC,KAAK,CAAC;IAC/C,IAAI,cAA2E,CAAC;IAEhF,mGAAmG;IACnG,gBAAgB;IAChB,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,4BAAmC,EAAE;QACvF,cAAc,GAAG,4BAA4B,CACzC,KAAK,EACL,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,CAC1F,CAAC;QACF,IAAI,KAAK,CAAC,kBAAkB,KAAK,SAAS,EAAE;YACxC,IAAI,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,KAAK,IAAI,EAAE;gBACpD,kDAAkD;gBAClD,4CAA4C;gBAC5C,cAAc,GAAG,iEAA+B,CAAC,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,EAAE,EAAE,KAAK,CAAC,kBAAkB,EAAE;;iBAEhG,CAAC,CAAC;gBACH,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;aAC7D;iBAAM,IACH,iBAAa,CAAC,qBAAqB,CAC/B,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,kBAAkB,CAAC,aAAa,EACtC,IAAI,CACP,EACH;gBACE,OAAO,cAAc,KAAK,SAAS;oBAC/B,CAAC,wCAAK,cAAc,qBACpB,CAAC,CAAC,cAAc,CAAC;aACxB;SACJ;aAAM;YACH,OAAO,cAAc,KAAK,SAAS;gBAC/B,CAAC,wCAAK,cAAc,qBACpB,CAAC,CAAC,eAAqC,CAAC;SAC/C;KACJ;IAED,OAAO,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,uDAA0B,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AA1CD,4EA0CC;AAED,SAAS,4BAA4B,CACjC,KAAsC,EACtC,aAAwE;IAExE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KACpB;IAED,sCAAsC;IACtC,IAAM,cAAc,GAAoC,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;IAC3G,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,yCAAgC,CAAC,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3E,CAAC"}
+{"version":3,"file":"autocompleteKeywordLetExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,oFAAsH;AAGtH,2EAA0E;AAC1E,mCAA4D;AAC5D,qFAAoF;AAEpF,8BAAyC;AAEzC,SAAgB,gCAAgC,CAC5C,KAAsC;IAEtC,8FAA8F;IAC9F,gEAAgE;IAChE,IAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,IAAI,cAA8D,CAAC;IAEnE,mGAAmG;IACnG,gBAAgB;IAChB,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,IAAI,qBAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;QAC1E,cAAc,GAAG,4BAA4B,CACzC,KAAK,EACL,0BAAiB,CAAC,iBAAiB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,qBAAY,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CACnD,CACJ,CAAC;QACF,IAAI,KAAK,CAAC,kBAAkB,KAAK,SAAS,EAAE;YACxC,IAAI,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,KAAK,IAAI,EAAE;gBACpD,kDAAkD;gBAClD,4CAA4C;gBAC5C,cAAc,GAAG,IAAA,iEAA+B,EAAC,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,EAAE,EAAE,KAAK,CAAC,kBAAkB,EAAE;;iBAEhG,CAAC,CAAC;gBACH,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;aAC7D;iBAAM,IACH,iBAAa,CAAC,qBAAqB,CAC/B,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,kBAAkB,CAAC,aAAa,EACtC,IAAI,CACP,EACH;gBACE,OAAO,cAAc,KAAK,SAAS,CAAC,CAAC,wCAAK,cAAc,mCAA0B,CAAC,CAAC,cAAc,CAAC;aACtG;SACJ;aAAM;YACH,OAAO,cAAc,KAAK,SAAS;gBAC/B,CAAC,wCAAK,cAAc,mCACpB,CAAC,CAAC,eAAwB,CAAC;SAClC;KACJ;IAED,OAAO,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,IAAA,uDAA0B,EAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AA3CD,4EA2CC;AAED,SAAS,4BAA4B,CACjC,KAAsC,EACtC,aAA6D;IAE7D,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,OAAO,SAAS,CAAC;KACpB;IAED,sCAAsC;IACtC,IAAM,cAAc,GAAyB,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;IAChG,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,IAAA,yCAAgC,EAAC,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3E,CAAC"}

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.d.ts

@@ -1,3 +1,3 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Keyword } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectAutocompleteKeywordState } from "./commonTypes";
-export declare function autocompleteKeywordListExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<PQP.Language.Keyword.KeywordKind> | undefined;
+export declare function autocompleteKeywordListExpression(state: InspectAutocompleteKeywordState): ReadonlyArray<Keyword.KeywordKind> | undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js

@@ -3,7 +3,8 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordListExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 var __1 = require("../../..");
 function autocompleteKeywordListExpression(state) {
@@ -19,18 +20,17 @@ function autocompleteKeywordListExpression(state) {
         maybeAttributeIndex: child.node.maybeAttributeIndex,
     });
     // ListExpression -> ArrayWrapper -> Csv -> X
-    var nodeOrComma = PQP.Parser.AncestryUtils.assertGetNthPreviousXor(activeNode.ancestry, ancestryIndex, 3, undefined);
+    var nodeOrComma = parser_1.AncestryUtils.assertGetNthPreviousXor(activeNode.ancestry, ancestryIndex, 3);
     if (nodeOrComma.node.maybeAttributeIndex !== 0) {
         return undefined;
     }
     // We know it's the node component of the Csv,
     // but we have to drill down one more level if it's a RangeExpression.
-    var itemNode = nodeOrComma.node.kind === "RangeExpression" /* RangeExpression */
-        ? PQP.Parser.AncestryUtils.assertGetNthPreviousXor(activeNode.ancestry, ancestryIndex, 4, undefined)
+    var itemNode = parser_1.XorNodeUtils.isNodeKind(nodeOrComma, "RangeExpression" /* RangeExpression */)
+        ? parser_1.AncestryUtils.assertGetNthPreviousXor(activeNode.ancestry, ancestryIndex, 4)
         : nodeOrComma;
-    if (itemNode.kind === "Context" /* Context */ ||
-        __1.PositionUtils.isBeforeXor(activeNode.position, itemNode, false)) {
-        return PQP.Language.Keyword.ExpressionKeywordKinds;
+    if (parser_1.XorNodeUtils.isContextXor(itemNode) || __1.PositionUtils.isBeforeXor(activeNode.position, itemNode, false)) {
+        return language_1.Keyword.ExpressionKeywordKinds;
     }
     else {
         return undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeywordListExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,kEAAsD;AACtD,8BAAyC;AAKzC,SAAgB,iCAAiC,CAC7C,KAAsC;IAEtC,IAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,IAAM,aAAa,GAAW,KAAK,CAAC,aAAa,CAAC;IAClD,IAAM,KAAK,GAAwB,KAAK,CAAC,KAAK,CAAC;IAE/C,aAAa;IACb,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE;QAC9E,OAAO,SAAS,CAAC;KACpB;IACD,0BAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE,yBAAyB,EAAE;QAC3E,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;QACrB,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB;KACtD,CAAC,CAAC;IAEH,6CAA6C;IAC7C,IAAM,WAAW,GAAwB,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAuB,CACrF,UAAU,CAAC,QAAQ,EACnB,aAAa,EACb,CAAC,EACD,SAAS,CACZ,CAAC;IACF,IAAI,WAAW,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE;QAC5C,OAAO,SAAS,CAAC;KACpB;IAED,8CAA8C;IAC9C,sEAAsE;IACtE,IAAM,QAAQ,GACV,WAAW,CAAC,IAAI,CAAC,IAAI,4CAA8C;QAC/D,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,uBAAuB,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,EAAE,SAAS,CAAC;QACpG,CAAC,CAAC,WAAW,CAAC;IAEtB,IACI,QAAQ,CAAC,IAAI,4BAAmC;QAChD,iBAAa,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,EACjE;QACE,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,CAAC;KACtD;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AA1CD,8EA0CC"}
+{"version":3,"file":"autocompleteKeywordListExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oFAAkH;AAClH,wFAA2F;AAC3F,kEAAsD;AAItD,8BAAyC;AAEzC,SAAgB,iCAAiC,CAC7C,KAAsC;IAEtC,IAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,IAAM,aAAa,GAAW,KAAK,CAAC,aAAa,CAAC;IAClD,IAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IAEpC,aAAa;IACb,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE;QAC9E,OAAO,SAAS,CAAC;KACpB;IACD,0BAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE,yBAAyB,EAAE;QAC3E,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;QACrB,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB;KACtD,CAAC,CAAC;IAEH,6CAA6C;IAC7C,IAAM,WAAW,GAAa,sBAAa,CAAC,uBAAuB,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC3G,IAAI,WAAW,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE;QAC5C,OAAO,SAAS,CAAC;KACpB;IAED,8CAA8C;IAC9C,sEAAsE;IACtE,IAAM,QAAQ,GAAa,qBAAY,CAAC,UAAU,CAAC,WAAW,0CAA+B;QACzF,CAAC,CAAC,sBAAa,CAAC,uBAAuB,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9E,CAAC,CAAC,WAAW,CAAC;IAElB,IAAI,qBAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,iBAAa,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE;QACxG,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAjCD,8EAiCC"}

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.d.ts

@@ -1,3 +1,3 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Keyword } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectAutocompleteKeywordState } from "./commonTypes";
-export declare function autocompleteKeywordSectionMember(state: InspectAutocompleteKeywordState): ReadonlyArray<PQP.Language.Keyword.KeywordKind> | undefined;
+export declare function autocompleteKeywordSectionMember(state: InspectAutocompleteKeywordState): ReadonlyArray<Keyword.KeywordKind> | undefined;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js

@@ -3,35 +3,37 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordSectionMember = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var common_1 = require("./common");
 function autocompleteKeywordSectionMember(state) {
     var maybeChildAttributeIndex = state.child.node.maybeAttributeIndex;
     // SectionMember.namePairedExpression
     if (maybeChildAttributeIndex === 2) {
         // A test for 'shared', which as we're on namePairedExpression we either parsed it or skipped it.
-        var maybeSharedConstant = PQP.Parser.NodeIdMapUtils.maybeChildXorByAttributeIndex(state.nodeIdMapCollection, state.parent.node.id, 1, ["Constant" /* Constant */]);
+        var maybeSharedConstant = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, state.parent.node.id, 1, "Constant" /* Constant */);
         // 'shared' was parsed so we can exit.
         if (maybeSharedConstant !== undefined) {
             return undefined;
         }
         // SectionMember -> IdentifierPairedExpression -> Identifier
-        var maybeName = PQP.Parser.AncestryUtils.maybeNthPreviousXor(state.activeNode.ancestry, state.ancestryIndex, 2, ["IdentifierPairedExpression" /* IdentifierPairedExpression */, "Identifier" /* Identifier */]);
+        var maybeName = parser_1.AncestryUtils.maybeNthPreviousXor(state.activeNode.ancestry, state.ancestryIndex, 2);
         // Name hasn't been parsed yet so we can exit.
-        if ((maybeName === null || maybeName === void 0 ? void 0 : maybeName.kind) !== "Ast" /* Ast */) {
+        if (!maybeName ||
+            !parser_1.XorNodeUtils.isAstXorChecked(maybeName, [
+                "IdentifierPairedExpression" /* IdentifierPairedExpression */,
+            ])) {
             return undefined;
         }
-        var name_1 = maybeName.node;
-        if ("shared" /* Shared */.startsWith(name_1.literal)) {
+        if ("shared" /* Shared */.startsWith(maybeName.node.key.literal)) {
             return ["shared" /* Shared */];
         }
         return undefined;
     }
     // `section foo; bar = 1 |` would be expecting a semicolon.
     // The autocomplete should be for the IdentifierPairedExpression found on the previous child index.
-    else if (maybeChildAttributeIndex === 3 && state.child.kind === "Context" /* Context */) {
-        var identifierPairedExpression = PQP.Parser.NodeIdMapUtils.assertGetChildAstByAttributeIndex(state.nodeIdMapCollection, state.parent.node.id, 2, ["IdentifierPairedExpression" /* IdentifierPairedExpression */]);
-        return common_1.autocompleteKeywordRightMostLeaf(state, identifierPairedExpression.id);
+    else if (maybeChildAttributeIndex === 3 && parser_1.XorNodeUtils.isContextXor(state.child)) {
+        var identifierPairedExpression = parser_1.NodeIdMapUtils.assertUnboxNthChildAsAstChecked(state.nodeIdMapCollection, state.parent.node.id, 2, "IdentifierPairedExpression" /* IdentifierPairedExpression */);
+        return (0, common_1.autocompleteKeywordRightMostLeaf)(state, identifierPairedExpression.id);
     }
     else {
         return undefined;