@microsoft/powerquery-language-services 0.2.10 → 0.2.15

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

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;AAIzC,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 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 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,wFAA2F;AAC3F,oFAA0G;AAE1G,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,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,14 +17,18 @@ 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 parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var __1 = require("../../..");
 var autocompleteKeywordDefault_1 = require("./autocompleteKeywordDefault");
 var autocompleteKeywordTrailingText_1 = require("./autocompleteKeywordTrailingText");
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGlC,oFAAsH;AAEtH,8BAAyC;AACzC,2EAA0E;AAC1E,qFAAoF;AACpF,mCAA4D;AAG5D,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,8 +3,9 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordListExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
 var powerquery_parser_1 = 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 autocompleteKeywordListExpression(state) {
     var activeNode = state.activeNode;
@@ -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,kEAAsD;AACtD,wFAA2F;AAC3F,oFAAkH;AAElH,8BAAyC;AAIzC,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;

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

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeywordSectionMember.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,mCAA4D;AAG5D,SAAgB,gCAAgC,CAC5C,KAAsC;IAEtC,IAAM,wBAAwB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAE1F,qCAAqC;IACrC,IAAI,wBAAwB,KAAK,CAAC,EAAE;QAChC,iGAAiG;QACjG,IAAM,mBAAmB,GAEP,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,6BAA6B,CACrE,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,EACD,2BAAoC,CACvC,CAAC;QAEF,sCAAsC;QACtC,IAAI,mBAAmB,KAAK,SAAS,EAAE;YACnC,OAAO,SAAS,CAAC;SACpB;QAED,4DAA4D;QAC5D,IAAM,SAAS,GAAoC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAC3F,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,aAAa,EACnB,CAAC,EACD,8FAA4F,CAC/F,CAAC;QAEF,8CAA8C;QAC9C,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,qBAA+B,EAAE;YAChD,OAAO,SAAS,CAAC;SACpB;QAED,IAAM,MAAI,GAAgC,SAAS,CAAC,IAAmC,CAAC;QACxF,IAAI,sBAAwC,UAAU,CAAC,MAAI,CAAC,OAAO,CAAC,EAAE;YAClE,OAAO,uBAAyC,CAAC;SACpD;QAED,OAAO,SAAS,CAAC;KACpB;IACD,2DAA2D;IAC3D,mGAAmG;SAC9F,IAAI,wBAAwB,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,4BAAmC,EAAE;QAC5F,IAAM,0BAA0B,GAA2B,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,iCAAiC,CAClH,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,EACD,+DAAsD,CACzD,CAAC;QACF,OAAO,yCAAgC,CAAC,KAAK,EAAE,0BAA0B,CAAC,EAAE,CAAC,CAAC;KACjF;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAvDD,4EAuDC"}
+{"version":3,"file":"autocompleteKeywordSectionMember.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,oFAMmE;AAEnE,mCAA4D;AAG5D,SAAgB,gCAAgC,CAC5C,KAAsC;IAEtC,IAAM,wBAAwB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC;IAE1F,qCAAqC;IACrC,IAAI,wBAAwB,KAAK,CAAC,EAAE;QAChC,iGAAiG;QACjG,IAAM,mBAAmB,GAAuC,uBAAc,CAAC,oBAAoB,CAEjG,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,4BAAwB,CAAC;QAE7E,sCAAsC;QACtC,IAAI,mBAAmB,KAAK,SAAS,EAAE;YACnC,OAAO,SAAS,CAAC;SACpB;QAED,4DAA4D;QAC5D,IAAM,SAAS,GAAyB,sBAAa,CAAC,mBAAmB,CACrE,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,aAAa,EACnB,CAAC,CACJ,CAAC;QACF,8CAA8C;QAC9C,IACI,CAAC,SAAS;YACV,CAAC,qBAAY,CAAC,eAAe,CAAiC,SAAS,EAAE;;aAExE,CAAC,EACJ;YACE,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,sBAA2B,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACnE,OAAO,uBAA4B,CAAC;SACvC;QAED,OAAO,SAAS,CAAC;KACpB;IACD,2DAA2D;IAC3D,mGAAmG;SAC9F,IAAI,wBAAwB,KAAK,CAAC,IAAI,qBAAY,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC/E,IAAM,0BAA0B,GAAmC,uBAAc,CAAC,+BAA+B,CAC7G,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,gEAEJ,CAAC;QACF,OAAO,IAAA,yCAAgC,EAAC,KAAK,EAAE,0BAA0B,CAAC,EAAE,CAAC,CAAC;KACjF;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AApDD,4EAoDC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeywordTrailingText.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,kEAAsD;AAItD,SAAgB,+BAA+B,CAC3C,SAA0D,EAC1D,aAA4B,EAC5B,oBAAiF;IAEjF,IAAI,aAAa,CAAC,gBAAgB,KAAK,KAAK,EAAE;QAC1C,OAAO,SAAS,CAAC;KACpB;IACD,0BAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IAC9E,IAAM,KAAK,GAA6B,aAAa,CAAC;IAEtD,oBAAoB,GAAG,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,wCAAwC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3G,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACpC,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAC9B,SAAS,EACT,oBAAoB,CAAC,MAAM,CAAC,UAAC,OAAyC,IAAK,OAAA,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAA9B,CAA8B,CAAC,CAC7G,CAAC;KACL;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AArBD,0EAqBC;AAED,qGAAqG;AACrG,+BAA+B;AAC/B,IAAM,wCAAwC,GAAiE,IAAI,GAAG,CAGpH;IACE,CAAC,GAAG,EAAE,gCAA2E,CAAC;IAClF,CAAC,GAAG,EAAE,eAAqC,CAAC;IAC5C,CAAC,GAAG,EAAE,mBAAuC,CAAC;IAC9C,CAAC,GAAG,EAAE,eAAqC,CAAC;CAC/C,CAAC,CAAC"}
+{"version":3,"file":"autocompleteKeywordTrailingText.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,kEAAsD;AAKtD,SAAgB,+BAA+B,CAC3C,SAA6C,EAC7C,aAA4B,EAC5B,oBAAoE;IAEpE,IAAI,aAAa,CAAC,gBAAgB,KAAK,KAAK,EAAE;QAC1C,OAAO,SAAS,CAAC;KACpB;IACD,0BAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IAC9E,IAAM,KAAK,GAA6B,aAAa,CAAC;IAEtD,oBAAoB,GAAG,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,wCAAwC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3G,IAAI,oBAAoB,KAAK,SAAS,EAAE;QACpC,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAC9B,SAAS,EACT,oBAAoB,CAAC,MAAM,CAAC,UAAC,OAA4B,IAAK,OAAA,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAA9B,CAA8B,CAAC,CAChG,CAAC;KACL;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AArBD,0EAqBC;AAED,qGAAqG;AACrG,+BAA+B;AAC/B,IAAM,wCAAwC,GAAoD,IAAI,GAAG,CAGvG;IACE,CAAC,GAAG,EAAE,gCAAiD,CAAC;IACxD,CAAC,GAAG,EAAE,eAAwB,CAAC;IAC/B,CAAC,GAAG,EAAE,mBAA0B,CAAC;IACjC,CAAC,GAAG,EAAE,eAAwB,CAAC;CAClC,CAAC,CAAC"}

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.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 autocompleteKeywordRightMostLeaf(state: InspectAutocompleteKeywordState, xorNodeId: number): ReadonlyArray<PQP.Language.Keyword.KeywordKind> | undefined;
+export declare function autocompleteKeywordRightMostLeaf(state: InspectAutocompleteKeywordState, xorNodeId: number): ReadonlyArray<Keyword.KeywordKind> | undefined;

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

@@ -14,23 +14,25 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordRightMostLeaf = void 0;
-var PQP = require("@microsoft/powerquery-parser");
 var powerquery_parser_1 = 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 powerquery_parser_2 = require("@microsoft/powerquery-parser");
 var autocompleteKeyword_1 = require("./autocompleteKeyword");
 function autocompleteKeywordRightMostLeaf(state, xorNodeId) {
     // Grab the right-most Ast node in the last value.
-    var maybeRightMostAstLeafForLastValue = PQP.Parser.NodeIdMapUtils.maybeRightMostLeaf(state.nodeIdMapCollection, xorNodeId, undefined);
+    var maybeRightMostAstLeafForLastValue = parser_1.NodeIdMapUtils.maybeRightMostLeaf(state.nodeIdMapCollection, xorNodeId, undefined);
     if (maybeRightMostAstLeafForLastValue === undefined) {
         return undefined;
     }
     // Start a new autocomplete inspection where the ActiveNode's ancestry is the right-most Ast node in the last value.
-    var shiftedAncestry = PQP.Parser.AncestryUtils.assertGetAncestry(state.nodeIdMapCollection, maybeRightMostAstLeafForLastValue.id);
+    var shiftedAncestry = parser_1.AncestryUtils.assertGetAncestry(state.nodeIdMapCollection, maybeRightMostAstLeafForLastValue.id);
     powerquery_parser_1.Assert.isTrue(shiftedAncestry.length >= 2, "shiftedAncestry.length >= 2");
     var shiftedActiveNode = __assign(__assign({}, state.activeNode), { ancestry: shiftedAncestry });
-    var inspected = autocompleteKeyword_1.autocompleteKeyword(state.nodeIdMapCollection, shiftedActiveNode, state.maybeTrailingToken);
+    var inspected = (0, autocompleteKeyword_1.autocompleteKeyword)(state.nodeIdMapCollection, shiftedActiveNode, state.maybeTrailingToken);
     return inspected.map(function (autocompleteItem) {
-        if (!PQP.Language.KeywordUtils.isKeyword(autocompleteItem.label)) {
-            throw new powerquery_parser_1.CommonError.InvariantError("expected " + autocompleteKeyword_1.autocompleteKeyword.name + " to return only with KeywordKind values for AutocompleteItem.label");
+        if (!language_1.KeywordUtils.isKeyword(autocompleteItem.label)) {
+            throw new powerquery_parser_2.CommonError.InvariantError("expected " + autocompleteKeyword_1.autocompleteKeyword.name + " to return only with KeywordKind values for AutocompleteItem.label");
         }
         return autocompleteItem.label;
     });

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,kDAAoD;AAEpD,kEAAmE;AAInE,6DAA4D;AAG5D,SAAgB,gCAAgC,CAC5C,KAAsC,EACtC,SAAiB;IAEjB,kDAAkD;IAClD,IAAM,iCAAiC,GAErB,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,mBAAmB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAChH,IAAI,iCAAiC,KAAK,SAAS,EAAE;QACjD,OAAO,SAAS,CAAC;KACpB;IAED,oHAAoH;IACpH,IAAM,eAAe,GAAuC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAClG,KAAK,CAAC,mBAAmB,EACzB,iCAAiC,CAAC,EAAE,CACvC,CAAC;IACF,0BAAM,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE,6BAA6B,CAAC,CAAC;IAC1E,IAAM,iBAAiB,yBAChB,KAAK,CAAC,UAAU,KACnB,QAAQ,EAAE,eAAe,GAC5B,CAAC;IAEF,IAAM,SAAS,GAAoC,yCAAmB,CAClE,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,EACjB,KAAK,CAAC,kBAAkB,CAC3B,CAAC;IAEF,OAAO,SAAS,CAAC,GAAG,CAAC,UAAC,gBAAkC;QACpD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YAC9D,MAAM,IAAI,+BAAW,CAAC,cAAc,CAChC,cAAY,yCAAmB,CAAC,IAAI,uEAAoE,CAC3G,CAAC;SACL;QAED,OAAO,gBAAgB,CAAC,KAAK,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC;AAtCD,4EAsCC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,kEAAsD;AACtD,wFAAyG;AACzG,oFAAoH;AAEpH,kEAA2D;AAI3D,6DAA4D;AAG5D,SAAgB,gCAAgC,CAC5C,KAAsC,EACtC,SAAiB;IAEjB,kDAAkD;IAClD,IAAM,iCAAiC,GAA0B,uBAAc,CAAC,kBAAkB,CAC9F,KAAK,CAAC,mBAAmB,EACzB,SAAS,EACT,SAAS,CACZ,CAAC;IACF,IAAI,iCAAiC,KAAK,SAAS,EAAE;QACjD,OAAO,SAAS,CAAC;KACpB;IAED,oHAAoH;IACpH,IAAM,eAAe,GAA4B,sBAAa,CAAC,iBAAiB,CAC5E,KAAK,CAAC,mBAAmB,EACzB,iCAAiC,CAAC,EAAE,CACvC,CAAC;IACF,0BAAM,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE,6BAA6B,CAAC,CAAC;IAC1E,IAAM,iBAAiB,yBAChB,KAAK,CAAC,UAAU,KACnB,QAAQ,EAAE,eAAe,GAC5B,CAAC;IAEF,IAAM,SAAS,GAAoC,IAAA,yCAAmB,EAClE,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,EACjB,KAAK,CAAC,kBAAkB,CAC3B,CAAC;IAEF,OAAO,SAAS,CAAC,GAAG,CAAC,UAAC,gBAAkC;QACpD,IAAI,CAAC,uBAAY,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACjD,MAAM,IAAI,+BAAW,CAAC,cAAc,CAChC,cAAY,yCAAmB,CAAC,IAAI,uEAAoE,CAC3G,CAAC;SACL;QAED,OAAO,gBAAgB,CAAC,KAAK,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC;AAxCD,4EAwCC"}

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

@@ -1,11 +1,11 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { NodeIdMap, TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { ActiveNode } from "../../activeNode";
 import { TrailingToken } from "../commonTypes";
 export interface InspectAutocompleteKeywordState {
-    readonly nodeIdMapCollection: PQP.Parser.NodeIdMap.Collection;
+    readonly nodeIdMapCollection: NodeIdMap.Collection;
     readonly activeNode: ActiveNode;
     readonly maybeTrailingToken: TrailingToken | undefined;
-    parent: PQP.Parser.TXorNode;
-    child: PQP.Parser.TXorNode;
+    parent: TXorNode;
+    child: TXorNode;
     ancestryIndex: number;
 }

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

@@ -4,11 +4,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryAutocompleteLanguageConstant = void 0;
 var PQP = require("@microsoft/powerquery-parser");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var __1 = require("../..");
 var activeNode_1 = require("../activeNode");
 var autocompleteItem_1 = require("./autocompleteItem");
 function tryAutocompleteLanguageConstant(settings, maybeActiveNode) {
-    return PQP.ResultUtils.ensureResult(settings.locale, function () {
+    return powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
         return autocompleteLanguageConstant(maybeActiveNode);
     });
 }
@@ -19,10 +21,10 @@ function autocompleteLanguageConstant(maybeActiveNode) {
     }
     var activeNode = maybeActiveNode;
     if (isNullableAllowed(activeNode)) {
-        return autocompleteItem_1.AutocompleteItemUtils.createFromLanguageConstantKind("nullable" /* Nullable */);
+        return autocompleteItem_1.AutocompleteItemUtils.createFromLanguageConstant("nullable" /* Nullable */);
     }
     else if (isOptionalAllowed(activeNode)) {
-        return autocompleteItem_1.AutocompleteItemUtils.createFromLanguageConstantKind("optional" /* Optional */);
+        return autocompleteItem_1.AutocompleteItemUtils.createFromLanguageConstant("optional" /* Optional */);
     }
     else {
         return undefined;
@@ -40,7 +42,7 @@ function isNullableAllowed(activeNode) {
                 }
                 break;
             case "PrimitiveType" /* PrimitiveType */:
-                if (isNullableAllowedForPrimitiveType(xorNode)) {
+                if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
                     return true;
                 }
                 break;
@@ -51,56 +53,50 @@ function isNullableAllowed(activeNode) {
     return false;
 }
 function isNullableAllowedForAsNullablePrimitiveType(activeNode, ancestryIndex) {
-    var maybeChild = PQP.Parser.AncestryUtils.maybePreviousXor(activeNode.ancestry, ancestryIndex);
+    var maybeChild = parser_1.AncestryUtils.maybePreviousXor(activeNode.ancestry, ancestryIndex);
     if ((maybeChild === null || maybeChild === void 0 ? void 0 : maybeChild.node.maybeAttributeIndex) !== 1) {
         return false;
     }
-    // PQP.Language.Ast.AsNullablePrimitiveType.paired: PQP.Language.Ast.TNullablePrimitiveType
+    // Ast.AsNullablePrimitiveType.paired: Ast.TNullablePrimitiveType
     var paired = maybeChild;
     var position = activeNode.position;
-    // PQP.Language.Ast.PrimitiveType
-    if (paired.node.kind === "PrimitiveType" /* PrimitiveType */ &&
-        __1.PositionUtils.isBeforeXor(position, paired, false)) {
+    // Ast.PrimitiveType
+    if (paired.node.kind === "PrimitiveType" /* PrimitiveType */ && __1.PositionUtils.isBeforeXor(position, paired, false)) {
         return true;
     }
-    // PQP.Language.Ast.NullablePrimitiveType
+    // Ast.NullablePrimitiveType
     else if (paired.node.kind === "NullablePrimitiveType" /* NullablePrimitiveType */) {
-        var maybeGrandchild = PQP.Parser.AncestryUtils.maybeNthPreviousXor(activeNode.ancestry, ancestryIndex, 2);
+        var maybeGrandchild = parser_1.AncestryUtils.maybeNthPreviousXor(activeNode.ancestry, ancestryIndex, 2);
         if (maybeGrandchild === undefined) {
             return false;
         }
-        // PQP.Language.Ast.Constant || PQP.Language.Ast.PrimitiveType
+        // Ast.Constant || Ast.PrimitiveType
         var grandchild = maybeGrandchild;
         return (
-        // PQP.Language.Ast.Constant
+        // Ast.Constant
         grandchild.node.kind === "Constant" /* Constant */ ||
-            // before PQP.Language.Ast.PrimitiveType
+            // before Ast.PrimitiveType
             __1.PositionUtils.isBeforeXor(position, grandchild, false));
     }
     else if (paired.node.kind === "PrimitiveType" /* PrimitiveType */) {
-        return isNullableAllowedForPrimitiveType(paired);
+        return parser_1.XorNodeUtils.isContextXor(paired);
     }
     else {
         return false;
     }
 }
-function isNullableAllowedForPrimitiveType(primitiveType) {
-    return primitiveType.kind === "Context" /* Context */;
-}
 function isOptionalAllowed(activeNode) {
-    var maybeFnExprAncestryIndex = PQP.Parser.AncestryUtils.maybeFirstIndexOfNodeKind(activeNode.ancestry, "FunctionExpression" /* FunctionExpression */);
+    var maybeFnExprAncestryIndex = parser_1.AncestryUtils.maybeFirstIndexOfNodeKind(activeNode.ancestry, "FunctionExpression" /* FunctionExpression */);
     if (maybeFnExprAncestryIndex === undefined) {
         return false;
     }
     var fnExprAncestryIndex = maybeFnExprAncestryIndex;
     // FunctionExpression -> IParenthesisWrapped -> ParameterList -> Csv -> Parameter
-    var maybeParameter = PQP.Parser.AncestryUtils.maybeNthPreviousXor(activeNode.ancestry, fnExprAncestryIndex, 4, [
-        "Parameter" /* Parameter */,
-    ]);
+    var maybeParameter = parser_1.AncestryUtils.maybeNthPreviousXorChecked(activeNode.ancestry, fnExprAncestryIndex, 4, "Parameter" /* Parameter */);
     if (maybeParameter === undefined) {
         return false;
     }
-    var maybeChildOfParameter = PQP.Parser.AncestryUtils.maybeNthPreviousXor(activeNode.ancestry, fnExprAncestryIndex, 5);
+    var maybeChildOfParameter = parser_1.AncestryUtils.maybeNthPreviousXor(activeNode.ancestry, fnExprAncestryIndex, 5);
     if (maybeChildOfParameter === undefined) {
         return true;
     }
@@ -113,7 +109,7 @@ function isOptionalAllowed(activeNode) {
         case 1:
             switch (childOfParameter.kind) {
                 case "Ast" /* Ast */: {
-                    var nameAst = childOfParameter.node;
+                    var nameAst = parser_1.XorNodeUtils.assertUnboxAstChecked(childOfParameter, "Identifier" /* Identifier */);
                     var name_1 = nameAst.literal;
                     return ("optional" /* Optional */.startsWith(name_1) &&
                         name_1 !== "optional" /* Optional */ &&
@@ -122,7 +118,7 @@ function isOptionalAllowed(activeNode) {
                 case "Context" /* Context */:
                     return true;
                 default:
-                    throw PQP.Assert.isNever(childOfParameter);
+                    throw powerquery_parser_1.Assert.isNever(childOfParameter);
             }
         default:
             return false;

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

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