@microsoft/powerquery-language-services 0.6.12 → 0.9.6

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

@@ -28,9 +28,9 @@ const autocompleteKeywordTrailingText_1 = require("./autocompleteKeywordTrailing
 const __1 = require("../../..");
 function tryAutocompleteKeyword(settings, nodeIdMapCollection, activeNode, trailingToken) {
     if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(activeNode)) {
-        return Promise.resolve(powerquery_parser_1.ResultUtils.boxOk([
-            ...language_1.Keyword.ExpressionKeywordKinds.map((keywordKind) => autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind(keywordKind)),
-            autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind("section" /* Section */),
+        return Promise.resolve(powerquery_parser_1.ResultUtils.ok([
+            ...language_1.Keyword.ExpressionKeywordKinds.map((keywordKind) => autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(keywordKind)),
+            autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(language_1.Keyword.KeywordKind.Section),
         ]));
     }
     return powerquery_parser_1.ResultUtils.ensureResultAsync(() => autocompleteKeyword(nodeIdMapCollection, activeNode, trailingToken), settings.locale);
@@ -45,15 +45,19 @@ function autocompleteKeyword(nodeIdMapCollection, activeNode, trailingToken) {
                 positionName = activeNode.exclusiveIdentifierUnderPosition.normalizedLiteral;
             }
             // Matches 'null', 'true', and 'false'.
-            else if (parser_1.XorNodeUtils.isAstXorChecked(ancestryLeaf, "LiteralExpression" /* LiteralExpression */) &&
-                (ancestryLeaf.node.literalKind === "Logical" /* Logical */ ||
-                    ancestryLeaf.node.literalKind === "Null" /* Null */)) {
+            else if (parser_1.XorNodeUtils.isAstChecked(ancestryLeaf, language_1.Ast.NodeKind.LiteralExpression) &&
+                (ancestryLeaf.node.literalKind === language_1.Ast.LiteralKind.Logical ||
+                    ancestryLeaf.node.literalKind === language_1.Ast.LiteralKind.Null)) {
                 positionName = ancestryLeaf.node.literal;
             }
         }
         if (activeNode.ancestry.length < 2) {
             return Promise.resolve(createAutocompleteItems(handleConjunctions(activeNode, [], trailingToken), positionName));
         }
+        const edgeCase = findEdgeCase(activeNode, trailingToken);
+        if (edgeCase !== undefined) {
+            return Promise.resolve(edgeCase);
+        }
         const state = {
             nodeIdMapCollection,
             activeNode,
@@ -62,10 +66,6 @@ function autocompleteKeyword(nodeIdMapCollection, activeNode, trailingToken) {
             child: activeNode_1.ActiveNodeUtils.assertGetLeaf(activeNode),
             ancestryIndex: 0,
         };
-        const edgeCase = findEdgeCase(state, trailingToken);
-        if (edgeCase !== undefined) {
-            return Promise.resolve(edgeCase);
-        }
         const keywordKinds = yield traverseAncestors(state);
         const keywordsSubset = handleConjunctions(state.activeNode, keywordKinds, trailingToken);
         return Promise.resolve(createAutocompleteItems(keywordsSubset, positionName));
@@ -73,11 +73,11 @@ function autocompleteKeyword(nodeIdMapCollection, activeNode, trailingToken) {
 }
 exports.autocompleteKeyword = autocompleteKeyword;
 const ConjunctionKeywords = [
-    "and" /* And */,
-    "as" /* As */,
-    "is" /* Is */,
-    "meta" /* Meta */,
-    "or" /* Or */,
+    language_1.Keyword.KeywordKind.And,
+    language_1.Keyword.KeywordKind.As,
+    language_1.Keyword.KeywordKind.Is,
+    language_1.Keyword.KeywordKind.Meta,
+    language_1.Keyword.KeywordKind.Or,
 ];
 // Travel the ancestry path in Active node in [parent, child] pairs.
 // Without zipping the values we wouldn't know what we're completing for.
@@ -93,20 +93,20 @@ function traverseAncestors(state) {
             state.parent = ancestry[ancestryIndex];
             state.child = ancestry[ancestryIndex - 1];
             switch (state.parent.node.kind) {
-                case "ErrorHandlingExpression" /* ErrorHandlingExpression */:
+                case language_1.Ast.NodeKind.ErrorHandlingExpression:
                     inspected = (0, autocompleteKeywordErrorHandlingExpression_1.autocompleteKeywordErrorHandlingExpression)(state);
                     break;
-                case "IdentifierPairedExpression" /* IdentifierPairedExpression */:
+                case language_1.Ast.NodeKind.IdentifierPairedExpression:
                     inspected = (0, autocompleteKeywordIdentifierPairedExpression_1.autocompleteKeywordIdentifierPairedExpression)(state);
                     break;
-                case "LetExpression" /* LetExpression */:
+                case language_1.Ast.NodeKind.LetExpression:
                     // eslint-disable-next-line no-await-in-loop
                     inspected = yield (0, autocompleteKeywordLetExpression_1.autocompleteKeywordLetExpression)(state);
                     break;
-                case "ListExpression" /* ListExpression */:
+                case language_1.Ast.NodeKind.ListExpression:
                     inspected = (0, autocompleteKeywordListExpression_1.autocompleteKeywordListExpression)(state);
                     break;
-                case "SectionMember" /* SectionMember */:
+                case language_1.Ast.NodeKind.SectionMember:
                     // eslint-disable-next-line no-await-in-loop
                     inspected = yield (0, autocompleteKeywordSectionMember_1.autocompleteKeywordSectionMember)(state);
                     break;
@@ -120,71 +120,70 @@ function traverseAncestors(state) {
         return [];
     });
 }
-function findEdgeCase(state, trailingToken) {
-    const activeNode = state.activeNode;
+function findEdgeCase(activeNode, trailingToken) {
     const ancestry = activeNode.ancestry;
     let inspected;
     // The user is typing in a new file, which the parser defaults to searching for an identifier.
     // `l|` -> `let`
     if (trailingToken === undefined &&
         ancestry.length === 2 &&
-        parser_1.XorNodeUtils.isAstXorChecked(ancestry[0], "Identifier" /* Identifier */) &&
-        parser_1.XorNodeUtils.isNodeKind(ancestry[1], "IdentifierExpression" /* IdentifierExpression */)) {
+        parser_1.XorNodeUtils.isAstChecked(ancestry[0], language_1.Ast.NodeKind.Identifier) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[1], language_1.Ast.NodeKind.IdentifierExpression)) {
         const identifier = ancestry[0].node.literal;
-        inspected = language_1.Keyword.StartOfDocumentKeywords.map((keywordKind) => autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind(keywordKind, identifier));
+        inspected = language_1.Keyword.StartOfDocumentKeywords.map((keywordKind) => autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(keywordKind, identifier));
     }
     // `(x |) => x+1` -> `(x as|) => x+1`
-    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)) {
-        inspected = [autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind("as" /* As */)];
+    else if (parser_1.XorNodeUtils.isAstChecked(ancestry[0], language_1.Ast.NodeKind.Identifier) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[1], language_1.Ast.NodeKind.Parameter) &&
+        activeNode.leafKind === activeNode_1.ActiveNodeLeafKind.IsBeforePosition) {
+        inspected = [autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(language_1.Keyword.KeywordKind.As)];
     }
     // `(foo a|) => foo` -> `(foo as) => foo
     else if ((trailingToken === null || trailingToken === void 0 ? void 0 : trailingToken.data) === "a" &&
-        parser_1.XorNodeUtils.isContextXorChecked(ancestry[0], "Constant" /* Constant */) &&
-        parser_1.XorNodeUtils.isNodeKind(ancestry[1], "ParameterList" /* ParameterList */) &&
-        parser_1.XorNodeUtils.isNodeKind(ancestry[2], "FunctionExpression" /* FunctionExpression */)) {
-        inspected = [autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind("as" /* As */)];
+        parser_1.XorNodeUtils.isContextChecked(ancestry[0], language_1.Ast.NodeKind.Constant) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[1], language_1.Ast.NodeKind.ParameterList) &&
+        parser_1.XorNodeUtils.isNodeKind(ancestry[2], language_1.Ast.NodeKind.FunctionExpression)) {
+        inspected = [autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(language_1.Keyword.KeywordKind.As)];
     }
     return inspected;
 }
 function createAutocompleteItems(keywordKinds, positionName) {
-    return keywordKinds.map((kind) => autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind(kind, positionName));
+    return keywordKinds.map((kind) => autocompleteItem_1.AutocompleteItemUtils.fromKeywordKind(kind, positionName));
 }
 function handleConjunctions(activeNode, inspected, trailingToken) {
-    if (activeNode.leafKind !== "AfterAstNode" /* AfterAstNode */ &&
-        activeNode.leafKind !== "Context" /* ContextNode */) {
+    if (activeNode.leafKind !== activeNode_1.ActiveNodeLeafKind.IsBeforePosition &&
+        activeNode.leafKind !== activeNode_1.ActiveNodeLeafKind.ContextNode) {
         return inspected;
     }
     // Might be a section document.
     // `[x=1] s`
     // `[x=1] |`
     if (activeNode.ancestry.length === 2 &&
-        parser_1.XorNodeUtils.isAstXorChecked(activeNode.ancestry[1], "RecordExpression" /* RecordExpression */)) {
+        parser_1.XorNodeUtils.isAstChecked(activeNode.ancestry[1], language_1.Ast.NodeKind.RecordExpression)) {
         if (trailingToken === undefined) {
-            return PQP.ArrayUtils.concatUnique(inspected, ["section" /* Section */]);
+            return PQP.ArrayUtils.concatUnique(inspected, [language_1.Keyword.KeywordKind.Section]);
         }
-        else if (trailingToken.kind === "Identifier" /* Identifier */ &&
+        else if (trailingToken.kind === PQP.Language.Token.TokenKind.Identifier &&
             __1.PositionUtils.isInToken(activeNode.position, trailingToken, true, true)) {
-            return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, trailingToken, ["section" /* Section */]);
+            return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, trailingToken, [language_1.Keyword.KeywordKind.Section]);
         }
     }
     const activeNodeLeaf = activeNode_1.ActiveNodeUtils.assertGetLeaf(activeNode);
     // `let x = 1 a|`
-    if (trailingToken !== undefined && trailingToken.isInOrOnPosition) {
+    if (trailingToken !== undefined && trailingToken.isPositionEitherInOrOnToken) {
         return (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected, trailingToken, undefined);
     }
     // `let x = |`
     // `let x = 1|`
     // `let x = 1 | a`
-    else if (parser_1.XorNodeUtils.isTUnaryType(activeNodeLeaf)) {
+    else if (parser_1.XorNodeUtils.isTUnaryExpression(activeNodeLeaf)) {
         // `let x = 1 | a`
         if (trailingToken !== undefined &&
             __1.PositionUtils.isAfterTokenPosition(activeNode.position, trailingToken.positionStart, false)) {
             return inspected;
         }
         // `let x = 1|`
-        else if (parser_1.XorNodeUtils.isAstXor(activeNodeLeaf)) {
+        else if (parser_1.XorNodeUtils.isAst(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.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordDefault = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const activeNode_1 = require("../../activeNode");
 const __1 = require("../../..");
 function autocompleteKeywordDefault(state) {
     const activeNode = state.activeNode;
@@ -22,46 +23,46 @@ function autocompleteKeywordDefault(state) {
 }
 exports.autocompleteKeywordDefault = autocompleteKeywordDefault;
 const AutocompleteExpressionKeys = [
-    createMapKey("ErrorRaisingExpression" /* ErrorRaisingExpression */, 1),
-    createMapKey("GeneralizedIdentifierPairedExpression" /* GeneralizedIdentifierPairedExpression */, 2),
-    createMapKey("FunctionExpression" /* FunctionExpression */, 3),
-    createMapKey("IdentifierPairedExpression" /* IdentifierPairedExpression */, 2),
-    createMapKey("IfExpression" /* IfExpression */, 1),
-    createMapKey("IfExpression" /* IfExpression */, 3),
-    createMapKey("IfExpression" /* IfExpression */, 5),
-    createMapKey("InvokeExpression" /* InvokeExpression */, 1),
-    createMapKey("LetExpression" /* LetExpression */, 3),
-    createMapKey("ListExpression" /* ListExpression */, 1),
-    createMapKey("OtherwiseExpression" /* OtherwiseExpression */, 1),
-    createMapKey("ParenthesizedExpression" /* ParenthesizedExpression */, 1),
+    createMapKey(language_1.Ast.NodeKind.ErrorRaisingExpression, 1),
+    createMapKey(language_1.Ast.NodeKind.GeneralizedIdentifierPairedExpression, 2),
+    createMapKey(language_1.Ast.NodeKind.FunctionExpression, 3),
+    createMapKey(language_1.Ast.NodeKind.IdentifierPairedExpression, 2),
+    createMapKey(language_1.Ast.NodeKind.IfExpression, 1),
+    createMapKey(language_1.Ast.NodeKind.IfExpression, 3),
+    createMapKey(language_1.Ast.NodeKind.IfExpression, 5),
+    createMapKey(language_1.Ast.NodeKind.InvokeExpression, 1),
+    createMapKey(language_1.Ast.NodeKind.LetExpression, 3),
+    createMapKey(language_1.Ast.NodeKind.ListExpression, 1),
+    createMapKey(language_1.Ast.NodeKind.OtherwiseExpression, 1),
+    createMapKey(language_1.Ast.NodeKind.ParenthesizedExpression, 1),
 ];
 // If we're coming from a constant then we can quickly evaluate using a map.
 // This is possible because reading a Constant is binary.
 // Either the Constant was read and you're in the next context, or you didn't and you're in the constant's context.
 const AutocompleteConstantMap = new Map([
     // Ast.NodeKind.ErrorRaisingExpression
-    [createMapKey("ErrorRaisingExpression" /* ErrorRaisingExpression */, 0), "error" /* Error */],
+    [createMapKey(language_1.Ast.NodeKind.ErrorRaisingExpression, 0), language_1.Keyword.KeywordKind.Error],
     // Ast.NodeKind.IfExpression
-    [createMapKey("IfExpression" /* IfExpression */, 0), "if" /* If */],
-    [createMapKey("IfExpression" /* IfExpression */, 2), "then" /* Then */],
-    [createMapKey("IfExpression" /* IfExpression */, 4), "else" /* Else */],
+    [createMapKey(language_1.Ast.NodeKind.IfExpression, 0), language_1.Keyword.KeywordKind.If],
+    [createMapKey(language_1.Ast.NodeKind.IfExpression, 2), language_1.Keyword.KeywordKind.Then],
+    [createMapKey(language_1.Ast.NodeKind.IfExpression, 4), language_1.Keyword.KeywordKind.Else],
     // Ast.NodeKind.LetExpression
-    [createMapKey("LetExpression" /* LetExpression */, 2), "in" /* In */],
+    [createMapKey(language_1.Ast.NodeKind.LetExpression, 2), language_1.Keyword.KeywordKind.In],
     // Ast.NodeKind.OtherwiseExpression
-    [createMapKey("OtherwiseExpression" /* OtherwiseExpression */, 0), "otherwise" /* Otherwise */],
+    [createMapKey(language_1.Ast.NodeKind.OtherwiseExpression, 0), language_1.Keyword.KeywordKind.Otherwise],
     // Ast.NodeKind.Section
-    [createMapKey("Section" /* Section */, 1), "section" /* Section */],
+    [createMapKey(language_1.Ast.NodeKind.Section, 1), language_1.Keyword.KeywordKind.Section],
 ]);
 function autocompleteDefaultExpression(state) {
     const activeNode = state.activeNode;
     const child = state.child;
     // '[x=|1]
-    if (activeNode.leafKind === "ShiftedRight" /* ShiftedRight */) {
+    if (activeNode.leafKind === activeNode_1.ActiveNodeLeafKind.IsInAst) {
         return language_1.Keyword.ExpressionKeywordKinds;
     }
     // `if 1|`
-    else if (parser_1.XorNodeUtils.isAstXorChecked(child, "LiteralExpression" /* LiteralExpression */) &&
-        child.node.literalKind === "Numeric" /* Numeric */) {
+    else if (parser_1.XorNodeUtils.isAstChecked(child, language_1.Ast.NodeKind.LiteralExpression) &&
+        child.node.literalKind === language_1.Ast.LiteralKind.Numeric) {
         return [];
     }
     return language_1.Keyword.ExpressionKeywordKinds;
@@ -70,7 +71,7 @@ function autocompleteKeywordConstant(activeNode, child, keywordKind) {
     if (__1.PositionUtils.isBeforeXor(activeNode.position, child, false)) {
         return undefined;
     }
-    else if (parser_1.XorNodeUtils.isAstXor(child)) {
+    else if (parser_1.XorNodeUtils.isAst(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":"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"}

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

@@ -12,7 +12,7 @@ function autocompleteKeywordErrorHandlingExpression(state) {
     const trailingText = state.trailingToken;
     const childAttributeIndex = child.node.attributeIndex;
     if (childAttributeIndex === 0) {
-        return ["try" /* Try */];
+        return [language_1.Keyword.KeywordKind.Try];
     }
     else if (childAttributeIndex === 1) {
         // 'try true o|' creates a ParseError.
@@ -20,19 +20,19 @@ function autocompleteKeywordErrorHandlingExpression(state) {
         if (trailingText !== undefined) {
             const trailingToken = trailingText;
             // First we test if we can autocomplete using the error token.
-            if (trailingToken.kind === "Identifier" /* Identifier */ &&
+            if (trailingToken.kind === language_1.Token.TokenKind.Identifier &&
                 __1.PositionUtils.isInToken(position, trailingToken, false, true)) {
                 const tokenData = trailingText.data;
                 // If we can exclude 'or' then the only thing we can autocomplete is 'otherwise'.
-                if (tokenData.length > 1 && "otherwise" /* Otherwise */.startsWith(tokenData)) {
-                    return ["otherwise" /* Otherwise */];
+                if (tokenData.length > 1 && language_1.Keyword.KeywordKind.Otherwise.startsWith(tokenData)) {
+                    return [language_1.Keyword.KeywordKind.Otherwise];
                 }
                 // In the ambiguous case we don't know what they're typing yet, so we suggest both.
                 // In the case of an identifier that doesn't match a 'or' or 'otherwise'
                 // we still suggest the only valid keywords allowed.
                 // In both cases the return is the same.
                 else {
-                    return ["or" /* Or */, "otherwise" /* Otherwise */];
+                    return [language_1.Keyword.KeywordKind.Or, language_1.Keyword.KeywordKind.Otherwise];
                 }
             }
             // There exists an error token we can't map it to an OtherwiseExpression.
@@ -40,8 +40,8 @@ function autocompleteKeywordErrorHandlingExpression(state) {
                 return undefined;
             }
         }
-        else if (parser_1.XorNodeUtils.isAstXor(child) && __1.PositionUtils.isAfterAst(position, child.node, true)) {
-            return ["otherwise" /* Otherwise */];
+        else if (parser_1.XorNodeUtils.isAst(child) && __1.PositionUtils.isAfterAst(position, child.node, true)) {
+            return [language_1.Keyword.KeywordKind.Otherwise];
         }
         else {
             return language_1.Keyword.ExpressionKeywordKinds;

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,0FAA6F;AAC7F,sFAAmG;AAInG,gCAAyC;AAGzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,MAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,MAAM,YAAY,GAA8B,KAAK,CAAC,aAAa,CAAC;IACpE,MAAM,mBAAmB,GAAuB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAE1E,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAC3B,OAAO,iBAAyB,CAAC;KACpC;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,sCAAsC;QACtC,mFAAmF;QACnF,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,aAAa,GAAkB,YAAY,CAAC;YAElD,8DAA8D;YAC9D,IACI,aAAa,CAAC,IAAI,kCAA+B;gBACjD,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAC/D;gBACE,MAAM,SAAS,GAAW,YAAY,CAAC,IAAI,CAAC;gBAE5C,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"}
+{"version":3,"file":"autocompleteKeywordErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6F;AAC7F,sFAAmG;AAInG,gCAAyC;AAGzC,SAAgB,0CAA0C,CACtD,KAAsC;IAEtC,MAAM,QAAQ,GAAa,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IACpC,MAAM,YAAY,GAA8B,KAAK,CAAC,aAAa,CAAC;IACpE,MAAM,mBAAmB,GAAuB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAE1E,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAC3B,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;KACpC;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,sCAAsC;QACtC,mFAAmF;QACnF,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,aAAa,GAAkB,YAAY,CAAC;YAElD,8DAA8D;YAC9D,IACI,aAAa,CAAC,IAAI,KAAK,gBAAK,CAAC,SAAS,CAAC,UAAU;gBACjD,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAC/D;gBACE,MAAM,SAAS,GAAW,YAAY,CAAC,IAAI,CAAC;gBAE5C,iFAAiF;gBACjF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC7E,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC1C;gBACD,mFAAmF;gBACnF,wEAAwE;gBACxE,oDAAoD;gBACpD,wCAAwC;qBACnC;oBACD,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,EAAE,EAAE,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAClE;aACJ;YAED,yEAAyE;iBACpE;gBACD,OAAO,SAAS,CAAC;aACpB;SACJ;aAAM,IAAI,qBAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YAC1F,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,SAAS,CAAC,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.js

@@ -11,8 +11,8 @@ function autocompleteKeywordIdentifierPairedExpression(state) {
     // `section; s|`
     // `section; [] |`
     if (childAttributeIndex === 0 &&
-        parser_1.AncestryUtils.nextXorChecked(state.activeNode.ancestry, state.ancestryIndex, "SectionMember" /* SectionMember */)) {
-        return ["shared" /* Shared */];
+        parser_1.AncestryUtils.nthChecked(state.activeNode.ancestry, state.ancestryIndex + 1, language_1.Ast.NodeKind.SectionMember)) {
+        return [language_1.Keyword.KeywordKind.Shared];
     }
     else if (childAttributeIndex !== 2) {
         return [];

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,sFAA0G;AAC1G,0FAA2F;AAG3F,gCAAyC;AAEzC,SAAgB,6CAA6C,CACzD,KAAsC;IAEtC,MAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAEhF,gBAAgB;IAChB,kBAAkB;IAClB,IACI,mBAAmB,KAAK,CAAC;QACzB,sBAAa,CAAC,cAAc,CACxB,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,aAAa,sCAEtB,EACH;QACE,OAAO,uBAA4B,CAAC;KACvC;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IAED,MAAM,IAAI,GAA0B,uBAAc,CAAC,YAAY,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhH,UAAU;IACV,WAAW;IACX,IAAI,IAAI,KAAK,SAAS,IAAI,iBAAa,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;QACzF,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AA7BD,sGA6BC"}
+{"version":3,"file":"autocompleteKeywordIdentifierPairedExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAA0G;AAC1G,0FAA2F;AAG3F,gCAAyC;AAEzC,SAAgB,6CAA6C,CACzD,KAAsC;IAEtC,MAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAEhF,gBAAgB;IAChB,kBAAkB;IAClB,IACI,mBAAmB,KAAK,CAAC;QACzB,sBAAa,CAAC,UAAU,CACpB,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,aAAa,GAAG,CAAC,EACvB,cAAG,CAAC,QAAQ,CAAC,aAAa,CAC7B,EACH;QACE,OAAO,CAAC,kBAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;KACvC;SAAM,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IAED,MAAM,IAAI,GAA0B,uBAAc,CAAC,YAAY,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhH,UAAU;IACV,WAAW;IACX,IAAI,IAAI,KAAK,SAAS,IAAI,iBAAa,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;QACzF,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AA7BD,sGA6BC"}

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

@@ -26,29 +26,29 @@ function autocompleteKeywordLetExpression(state) {
         let inspected;
         // Might be either `in` or whatever the autocomplete is for the the last child of the variableList.
         // `let x = 1 |`
-        if (child.node.attributeIndex === 2 && parser_1.XorNodeUtils.isContextXor(child)) {
-            inspected = yield autocompleteLastKeyValuePair(state, parser_1.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsLetExpression(state.parent)));
+        if (child.node.attributeIndex === 2 && parser_1.XorNodeUtils.isContext(child)) {
+            inspected = yield autocompleteLastKeyValuePair(state, parser_1.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(state.parent, language_1.Ast.NodeKind.LetExpression)));
             if (state.trailingToken !== undefined) {
-                if (state.trailingToken.isInOrOnPosition === true) {
+                if (state.trailingToken.isPositionEitherInOrOnToken) {
                     // We don't want inspected to be zero legnth.
                     // It's either undefined or non-zero length.
                     inspected = (0, autocompleteKeywordTrailingText_1.autocompleteKeywordTrailingText)(inspected !== null && inspected !== void 0 ? inspected : [], state.trailingToken, [
-                        "in" /* In */,
+                        language_1.Keyword.KeywordKind.In,
                     ]);
                     return inspected.length ? inspected : undefined;
                 }
                 else if (__1.PositionUtils.isBeforeTokenPosition(state.activeNode.position, state.trailingToken.positionStart, true)) {
-                    return inspected !== undefined ? [...inspected, "in" /* In */] : inspected;
+                    return inspected !== undefined ? [...inspected, language_1.Keyword.KeywordKind.In] : inspected;
                 }
             }
             else {
-                return inspected !== undefined ? [...inspected, "in" /* In */] : ["in" /* In */];
+                return inspected !== undefined ? [...inspected, language_1.Keyword.KeywordKind.In] : [language_1.Keyword.KeywordKind.In];
             }
         }
         // `let foo = e|` where we want to treat the identifier as a potential keyword
         else if (child.node.attributeIndex === 1) {
-            const identifier = parser_1.AncestryUtils.nthPreviousXor(state.activeNode.ancestry, state.ancestryIndex, 5);
-            if (identifier && parser_1.XorNodeUtils.isAstXor(identifier) && language_1.AstUtils.isIdentifier(identifier.node)) {
+            const identifier = parser_1.AncestryUtils.nth(state.activeNode.ancestry, state.ancestryIndex - 5);
+            if (identifier && parser_1.XorNodeUtils.isAstChecked(identifier, language_1.Ast.NodeKind.Identifier)) {
                 const identifierAst = identifier.node;
                 inspected = language_1.Keyword.ExpressionKeywordKinds.filter((value) => value.startsWith(identifierAst.literal));
             }

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

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

@@ -20,16 +20,16 @@ function autocompleteKeywordListExpression(state) {
         attributeIndex: child.node.attributeIndex,
     });
     // ListExpression -> ArrayWrapper -> Csv -> X
-    const nodeOrComma = parser_1.AncestryUtils.assertGetNthPreviousXor(activeNode.ancestry, ancestryIndex, 3);
+    const nodeOrComma = parser_1.AncestryUtils.assertNth(activeNode.ancestry, ancestryIndex - 3);
     if (nodeOrComma.node.attributeIndex !== 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.
-    const itemNode = parser_1.XorNodeUtils.isNodeKind(nodeOrComma, "RangeExpression" /* RangeExpression */)
-        ? parser_1.AncestryUtils.assertGetNthPreviousXor(activeNode.ancestry, ancestryIndex, 4)
+    const itemNode = parser_1.XorNodeUtils.isNodeKind(nodeOrComma, language_1.Ast.NodeKind.RangeExpression)
+        ? parser_1.AncestryUtils.assertNth(activeNode.ancestry, ancestryIndex - 4)
         : nodeOrComma;
-    if (parser_1.XorNodeUtils.isContextXor(itemNode) || __1.PositionUtils.isBeforeXor(activeNode.position, itemNode, false)) {
+    if (parser_1.XorNodeUtils.isContext(itemNode) || __1.PositionUtils.isBeforeXor(activeNode.position, itemNode, false)) {
         return language_1.Keyword.ExpressionKeywordKinds;
     }
     else {

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,sFAAkH;AAClH,0FAA2F;AAC3F,oEAAsD;AAItD,gCAAyC;AAEzC,SAAgB,iCAAiC,CAC7C,KAAsC;IAEtC,MAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,MAAM,aAAa,GAAW,KAAK,CAAC,aAAa,CAAC;IAClD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IAEpC,aAAa;IACb,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACpE,OAAO,SAAS,CAAC;KACpB;IAED,0BAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE,yBAAyB,EAAE;QACtE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;QACrB,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc;KAC5C,CAAC,CAAC;IAEH,6CAA6C;IAC7C,MAAM,WAAW,GAAa,sBAAa,CAAC,uBAAuB,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAE3G,IAAI,WAAW,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACvC,OAAO,SAAS,CAAC;KACpB;IAED,8CAA8C;IAC9C,sEAAsE;IACtE,MAAM,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;AAnCD,8EAmCC"}
+{"version":3,"file":"autocompleteKeywordListExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAAkH;AAClH,0FAA2F;AAC3F,oEAAsD;AAItD,gCAAyC;AAEzC,SAAgB,iCAAiC,CAC7C,KAAsC;IAEtC,MAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,MAAM,aAAa,GAAW,KAAK,CAAC,aAAa,CAAC;IAClD,MAAM,KAAK,GAAa,KAAK,CAAC,KAAK,CAAC;IAEpC,aAAa;IACb,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACpE,OAAO,SAAS,CAAC;KACpB;IAED,0BAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE,yBAAyB,EAAE;QACtE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;QACrB,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc;KAC5C,CAAC,CAAC;IAEH,6CAA6C;IAC7C,MAAM,WAAW,GAAa,sBAAa,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC;IAE9F,IAAI,WAAW,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE;QACvC,OAAO,SAAS,CAAC;KACpB;IAED,8CAA8C;IAC9C,sEAAsE;IACtE,MAAM,QAAQ,GAAa,qBAAY,CAAC,UAAU,CAAC,WAAW,EAAE,cAAG,CAAC,QAAQ,CAAC,eAAe,CAAC;QACzF,CAAC,CAAC,sBAAa,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,GAAG,CAAC,CAAC;QACjE,CAAC,CAAC,WAAW,CAAC;IAElB,IAAI,qBAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,iBAAa,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE;QACrG,OAAO,kBAAO,CAAC,sBAAsB,CAAC;KACzC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAnCD,8EAmCC"}

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

@@ -4,35 +4,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordSectionMember = void 0;
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const common_1 = require("./common");
 function autocompleteKeywordSectionMember(state) {
     const childAttributeIndex = state.child.node.attributeIndex;
     // SectionMember.namePairedExpression
     if (childAttributeIndex === 2) {
         // A test for 'shared', which as we're on namePairedExpression we either parsed it or skipped it.
-        const sharedConstant = parser_1.NodeIdMapUtils.nthChildChecked(state.nodeIdMapCollection, state.parent.node.id, 1, "Constant" /* Constant */);
+        const sharedConstant = parser_1.NodeIdMapUtils.nthChildXorChecked(state.nodeIdMapCollection, state.parent.node.id, 1, language_1.Ast.NodeKind.Constant);
         // 'shared' was parsed so we can exit.
         if (sharedConstant !== undefined) {
             return Promise.resolve(undefined);
         }
         // SectionMember -> IdentifierPairedExpression -> Identifier
-        const name = parser_1.AncestryUtils.nthPreviousXor(state.activeNode.ancestry, state.ancestryIndex, 2);
+        const name = parser_1.AncestryUtils.nth(state.activeNode.ancestry, state.ancestryIndex - 2);
         // Name hasn't been parsed yet so we can exit.
         if (!name ||
-            !parser_1.XorNodeUtils.isAstXorChecked(name, [
-                "IdentifierPairedExpression" /* IdentifierPairedExpression */,
-            ])) {
+            !parser_1.XorNodeUtils.isAstChecked(name, [language_1.Ast.NodeKind.IdentifierPairedExpression])) {
             return Promise.resolve(undefined);
         }
-        if ("shared" /* Shared */.startsWith(name.node.key.literal)) {
-            return Promise.resolve(["shared" /* Shared */]);
+        if (language_1.Keyword.KeywordKind.Shared.startsWith(name.node.key.literal)) {
+            return Promise.resolve([language_1.Keyword.KeywordKind.Shared]);
         }
         return Promise.resolve(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 (childAttributeIndex === 3 && parser_1.XorNodeUtils.isContextXor(state.child)) {
-        const identifierPairedExpression = parser_1.NodeIdMapUtils.assertUnboxNthChildAsAstChecked(state.nodeIdMapCollection, state.parent.node.id, 2, "IdentifierPairedExpression" /* IdentifierPairedExpression */);
+    else if (childAttributeIndex === 3 && parser_1.XorNodeUtils.isContext(state.child)) {
+        const identifierPairedExpression = parser_1.NodeIdMapUtils.assertNthChildAstChecked(state.nodeIdMapCollection, state.parent.node.id, 2, language_1.Ast.NodeKind.IdentifierPairedExpression);
         return (0, common_1.autocompleteKeywordRightMostLeaf)(state, identifierPairedExpression.id);
     }
     else {

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,sFAMmE;AAGnE,qCAA4D;AAG5D,SAAgB,gCAAgC,CAC5C,KAAsC;IAEtC,MAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAEhF,qCAAqC;IACrC,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAC3B,iGAAiG;QACjG,MAAM,cAAc,GAAuC,uBAAc,CAAC,eAAe,CACrF,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,4BAEJ,CAAC;QAEF,sCAAsC;QACtC,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACrC;QAED,4DAA4D;QAC5D,MAAM,IAAI,GAAyB,sBAAa,CAAC,cAAc,CAC3D,KAAK,CAAC,UAAU,CAAC,QAAQ,EACzB,KAAK,CAAC,aAAa,EACnB,CAAC,CACJ,CAAC;QAEF,8CAA8C;QAC9C,IACI,CAAC,IAAI;YACL,CAAC,qBAAY,CAAC,eAAe,CAAiC,IAAI,EAAE;;aAEnE,CAAC,EACJ;YACE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACrC;QAED,IAAI,sBAA2B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,uBAA4B,CAAC,CAAC;SACxD;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KACrC;IACD,2DAA2D;IAC3D,mGAAmG;SAC9F,IAAI,mBAAmB,KAAK,CAAC,IAAI,qBAAY,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC1E,MAAM,0BAA0B,GAC5B,uBAAc,CAAC,+BAA+B,CAC1C,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,gEAEJ,CAAC;QAEN,OAAO,IAAA,yCAAgC,EAAC,KAAK,EAAE,0BAA0B,CAAC,EAAE,CAAC,CAAC;KACjF;SAAM;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KACrC;AACL,CAAC;AA1DD,4EA0DC"}
+{"version":3,"file":"autocompleteKeywordSectionMember.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,sFAMmE;AACnE,0FAA2F;AAE3F,qCAA4D;AAG5D,SAAgB,gCAAgC,CAC5C,KAAsC;IAEtC,MAAM,mBAAmB,GAAuB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;IAEhF,qCAAqC;IACrC,IAAI,mBAAmB,KAAK,CAAC,EAAE;QAC3B,iGAAiG;QACjG,MAAM,cAAc,GAAuC,uBAAc,CAAC,kBAAkB,CACxF,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QAEF,sCAAsC;QACtC,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACrC;QAED,4DAA4D;QAC5D,MAAM,IAAI,GAAyB,sBAAa,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;QAEzG,8CAA8C;QAC9C,IACI,CAAC,IAAI;YACL,CAAC,qBAAY,CAAC,YAAY,CAAiC,IAAI,EAAE,CAAC,cAAG,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC,EAC7G;YACE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACrC;QAED,IAAI,kBAAO,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,kBAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;SACxD;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KACrC;IACD,2DAA2D;IAC3D,mGAAmG;SAC9F,IAAI,mBAAmB,KAAK,CAAC,IAAI,qBAAY,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACvE,MAAM,0BAA0B,GAC5B,uBAAc,CAAC,wBAAwB,CACnC,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,0BAA0B,CAC1C,CAAC;QAEN,OAAO,IAAA,yCAAgC,EAAC,KAAK,EAAE,0BAA0B,CAAC,EAAE,CAAC,CAAC;KACjF;SAAM;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KACrC;AACL,CAAC;AApDD,4EAoDC"}

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

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

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

@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordTrailingText = void 0;
 const PQP = require("@microsoft/powerquery-parser");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 function autocompleteKeywordTrailingText(inspected, trailingToken, allowedKeywords) {
-    if (trailingToken.isInOrOnPosition === false) {
+    if (trailingToken.isPositionEitherInOrOnToken === false) {
         return inspected;
     }
     powerquery_parser_1.Assert.isTrue(trailingToken.data.length > 0, "trailingToken.data.length > 0");
@@ -23,9 +24,9 @@ exports.autocompleteKeywordTrailingText = autocompleteKeywordTrailingText;
 // Used with parseError to see if a user could be typing a conjunctive keyword such as 'or'. Eg.
 // 'Details[UserName] <> "" o|'
 const PartialConjunctionKeywordAutocompleteMap = new Map([
-    ["a", ["and" /* And */, "as" /* As */]],
-    ["i", ["is" /* Is */]],
-    ["m", ["meta" /* Meta */]],
-    ["o", ["or" /* Or */]],
+    ["a", [language_1.Keyword.KeywordKind.And, language_1.Keyword.KeywordKind.As]],
+    ["i", [language_1.Keyword.KeywordKind.Is]],
+    ["m", [language_1.Keyword.KeywordKind.Meta]],
+    ["o", [language_1.Keyword.KeywordKind.Or]],
 ]);
 //# sourceMappingURL=autocompleteKeywordTrailingText.js.map

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,oDAAoD;AACpD,oEAAsD;AAKtD,SAAgB,+BAA+B,CAC3C,SAA6C,EAC7C,aAA4B,EAC5B,eAA+D;IAE/D,IAAI,aAAa,CAAC,gBAAgB,KAAK,KAAK,EAAE;QAC1C,OAAO,SAAS,CAAC;KACpB;IAED,0BAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IAC9E,MAAM,KAAK,GAA6B,aAAa,CAAC;IAEtD,eAAe,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,wCAAwC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjG,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAC9B,SAAS,EACT,eAAe,CAAC,MAAM,CAAC,CAAC,OAA4B,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAC3F,CAAC;KACL;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAtBD,0EAsBC;AAED,gGAAgG;AAChG,+BAA+B;AAC/B,MAAM,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"}
+{"version":3,"file":"autocompleteKeywordTrailingText.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oDAAoD;AACpD,oEAAsD;AACtD,0FAAsF;AAItF,SAAgB,+BAA+B,CAC3C,SAA6C,EAC7C,aAA4B,EAC5B,eAA+D;IAE/D,IAAI,aAAa,CAAC,2BAA2B,KAAK,KAAK,EAAE;QACrD,OAAO,SAAS,CAAC;KACpB;IAED,0BAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,+BAA+B,CAAC,CAAC;IAC9E,MAAM,KAAK,GAA6B,aAAa,CAAC;IAEtD,eAAe,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,wCAAwC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjG,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAC9B,SAAS,EACT,eAAe,CAAC,MAAM,CAAC,CAAC,OAA4B,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAC3F,CAAC;KACL;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAtBD,0EAsBC;AAED,gGAAgG;AAChG,+BAA+B;AAC/B,MAAM,wCAAwC,GAAoD,IAAI,GAAG,CAGvG;IACE,CAAC,GAAG,EAAE,CAAC,kBAAO,CAAC,WAAW,CAAC,GAAG,EAAE,kBAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC,GAAG,EAAE,CAAC,kBAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC,GAAG,EAAE,CAAC,kBAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,GAAG,EAAE,CAAC,kBAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;CAClC,CAAC,CAAC"}