@microsoft/powerquery-language-services 0.2.10 → 0.2.15

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

@@ -28,24 +28,29 @@ 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.tryAutocompleteFieldAccess = 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 type_1 = require("../type");
 var autocompleteItem_1 = require("./autocompleteItem");
 function tryAutocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache) {
     if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
-        return PQP.ResultUtils.createOk(undefined);
+        return powerquery_parser_1.ResultUtils.boxOk(undefined);
     }
-    return PQP.ResultUtils.ensureResult(settings.locale, function () {
+    return powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
         return autocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache);
     });
 }
@@ -55,10 +60,6 @@ var AllowedExtendedTypeKindsForFieldEntries = [
     "DefinedRecord" /* DefinedRecord */,
     "DefinedTable" /* DefinedTable */,
 ];
-var FieldAccessNodeKinds = [
-    "FieldSelector" /* FieldSelector */,
-    "FieldProjection" /* FieldProjection */,
-];
 function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
     var e_1, _a;
     var maybeInspectedFieldAccess = undefined;
@@ -67,7 +68,10 @@ function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
     try {
         for (var _b = __values(activeNode.ancestry), _c = _b.next(); !_c.done; _c = _b.next()) {
             var ancestor = _c.value;
-            if (FieldAccessNodeKinds.includes(ancestor.node.kind)) {
+            if (parser_1.XorNodeUtils.isNodeKind(ancestor, [
+                "FieldSelector" /* FieldSelector */,
+                "FieldProjection" /* FieldProjection */,
+            ])) {
                 maybeFieldAccessAncestor = ancestor;
             }
         }
@@ -93,7 +97,7 @@ function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
     if (inspectedFieldAccess.isAutocompleteAllowed === false) {
         return undefined;
     }
-    // After a field access was found then find the field it's accessing and inspect the field's PQP.Language.type.
+    // After a field access was found then find the field it's accessing and inspect the field's Type.
     // This is delayed until after the field access because running static type analysis on an
     // arbitrary field could be costly.
     var nodeIdMapCollection = parseState.contextState.nodeIdMapCollection;
@@ -102,8 +106,8 @@ function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
         return undefined;
     }
     var field = maybeField;
-    var triedFieldType = type_1.tryType(settings, nodeIdMapCollection, field.node.id, typeCache);
-    if (PQP.ResultUtils.isError(triedFieldType)) {
+    var triedFieldType = (0, type_1.tryType)(settings, nodeIdMapCollection, field.node.id, typeCache);
+    if (powerquery_parser_1.ResultUtils.isError(triedFieldType)) {
         throw triedFieldType.error;
     }
     var fieldType = triedFieldType.value;
@@ -144,7 +148,7 @@ function fieldEntriesFromFieldType(type) {
         }
         case "DefinedRecord" /* DefinedRecord */:
         case "DefinedTable" /* DefinedTable */:
-            return __spreadArray([], __read(type.fields.entries()));
+            return __spreadArray([], __read(type.fields.entries()), false);
         default:
             return [];
     }
@@ -156,11 +160,7 @@ function inspectFieldAccess(lexerSnapshot, nodeIdMapCollection, position, fieldA
         case "FieldSelector" /* FieldSelector */:
             return inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fieldAccess);
         default:
-            var details = {
-                nodeId: fieldAccess.node.id,
-                nodeKind: fieldAccess.node.kind,
-            };
-            throw new PQP.CommonError.InvariantError("fieldAccess should be either " + "FieldProjection" /* FieldProjection */ + " or " + "FieldSelector" /* FieldSelector */, details);
+            throw powerquery_parser_1.Assert.isNever(fieldAccess.node);
     }
 }
 function inspectFieldProjection(lexerSnapshot, nodeIdMapCollection, position, fieldProjection) {
@@ -169,14 +169,14 @@ function inspectFieldProjection(lexerSnapshot, nodeIdMapCollection, position, fi
     var maybeIdentifierUnderPosition;
     var fieldNames = [];
     try {
-        for (var _b = __values(PQP.Parser.NodeIdMapIterator.iterFieldProjection(nodeIdMapCollection, fieldProjection)), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(parser_1.NodeIdMapIterator.iterFieldProjection(nodeIdMapCollection, fieldProjection)), _c = _b.next(); !_c.done; _c = _b.next()) {
             var fieldSelector = _c.value;
             var inspectedFieldSelector = inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fieldSelector);
             if (inspectedFieldSelector.isAutocompleteAllowed || inspectedFieldSelector.maybeIdentifierUnderPosition) {
                 isAutocompleteAllowed = true;
                 maybeIdentifierUnderPosition = inspectedFieldSelector.maybeIdentifierUnderPosition;
             }
-            fieldNames.push.apply(fieldNames, __spreadArray([], __read(inspectedFieldSelector.fieldNames)));
+            fieldNames.push.apply(fieldNames, __spreadArray([], __read(inspectedFieldSelector.fieldNames), false));
         }
     }
     catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -209,8 +209,7 @@ function inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fiel
         return createInspectedFieldAccess(nodeIdMapCollection.astNodeById.has(childIds[0]));
     }
     var generalizedIdentifierId = childIds[1];
-    var generalizedIdentifierXor = PQP.Parser.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, generalizedIdentifierId);
-    powerquery_parser_1.Assert.isTrue(generalizedIdentifierXor.node.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */, "generalizedIdentifier.node.kind === PQP.Language.Ast.NodeKind.GeneralizedIdentifier");
+    var generalizedIdentifierXor = parser_1.NodeIdMapUtils.assertGetXorChecked(nodeIdMapCollection, generalizedIdentifierId, "GeneralizedIdentifier" /* GeneralizedIdentifier */);
     switch (generalizedIdentifierXor.kind) {
         case "Ast" /* Ast */: {
             var generalizedIdentifier = generalizedIdentifierXor.node;
@@ -225,7 +224,7 @@ function inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fiel
             // TODO [Autocomplete]:
             // This doesn't take into account of generalized identifiers consisting of multiple tokens.
             // Eg. `foo[bar baz]` or `foo[#"bar baz"].
-            var openBracketConstant = PQP.Parser.NodeIdMapUtils.assertGetChildAstByAttributeIndex(nodeIdMapCollection, fieldSelector.node.id, 0, ["Constant" /* Constant */]);
+            var openBracketConstant = parser_1.NodeIdMapUtils.assertUnboxNthChildAsAstChecked(nodeIdMapCollection, fieldSelector.node.id, 0, "Constant" /* Constant */);
             var maybeNextTokenPosition = (_a = lexerSnapshot.tokens[openBracketConstant.tokenRange.tokenIndexEnd + 1]) === null || _a === void 0 ? void 0 : _a.positionStart;
             var isAutocompleteAllowed = __1.PositionUtils.isAfterAst(position, openBracketConstant, false) &&
                 (maybeNextTokenPosition === undefined ||
@@ -238,7 +237,7 @@ function inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fiel
             };
         }
         default:
-            throw PQP.Assert.isNever(generalizedIdentifierXor);
+            throw powerquery_parser_1.Assert.isNever(generalizedIdentifierXor);
     }
 }
 function createAutocompleteItems(fieldEntries, inspectedFieldAccess) {
@@ -274,7 +273,7 @@ function maybeTypablePrimaryExpression(nodeIdMapCollection, activeNode) {
         var xorNode = ancestry[index];
         if (xorNode.node.kind === "RecursivePrimaryExpression" /* RecursivePrimaryExpression */) {
             // The previous ancestor must be an attribute of Rpe, which is either its head or ArrrayWrapper.
-            var xorNodeBeforeRpe = PQP.Parser.AncestryUtils.assertGetNthPreviousXor(ancestry, index);
+            var xorNodeBeforeRpe = parser_1.AncestryUtils.assertGetNthPreviousXor(ancestry, index);
             // If we're coming from the head node,
             // then return undefined as there can be no nodes before the head ode.
             if (xorNodeBeforeRpe.node.maybeAttributeIndex === 0) {
@@ -283,8 +282,8 @@ function maybeTypablePrimaryExpression(nodeIdMapCollection, activeNode) {
             // Else if we're coming from the ArrayWrapper,
             // then grab the previous sibling.
             else if (xorNodeBeforeRpe.node.maybeAttributeIndex === 1) {
-                var rpeChild = PQP.Parser.AncestryUtils.assertGetNthPreviousXor(ancestry, index, 2);
-                return PQP.Parser.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(nodeIdMapCollection, rpeChild.node.id);
+                var rpeChild = parser_1.AncestryUtils.assertGetNthPreviousXor(ancestry, index, 2);
+                return parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(nodeIdMapCollection, rpeChild.node.id);
             }
             else {
                 throw new PQP.CommonError.InvariantError("the child of a " + "RecursivePrimaryExpression" /* RecursivePrimaryExpression */ + " should have an attribute index of either 1 or 2", {
@@ -293,7 +292,7 @@ function maybeTypablePrimaryExpression(nodeIdMapCollection, activeNode) {
                 });
             }
         }
-        else if (matchingContiguousPrimaryExpression && PQP.Parser.XorNodeUtils.isTPrimaryExpression(xorNode)) {
+        else if (matchingContiguousPrimaryExpression && parser_1.XorNodeUtils.isTPrimaryExpression(xorNode)) {
             maybeContiguousPrimaryExpression = xorNode;
         }
         else {

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

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

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

@@ -1,6 +1,6 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { CompletionItem } from "vscode-languageserver-types";
 export interface AutocompleteItem extends CompletionItem {
     readonly jaroWinklerScore: number;
-    readonly powerQueryType: PQP.Language.Type.TPowerQueryType;
+    readonly powerQueryType: Type.TPowerQueryType;
 }

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

@@ -1,11 +1,11 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Constant, Keyword, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { Inspection } from "../../..";
 import { Library } from "../../../library";
 import type { AutocompleteItem } from "./autocompleteItem";
-export declare function createFromFieldAccess(label: string, powerQueryType: PQP.Language.Type.TPowerQueryType, maybeOther?: string): AutocompleteItem;
-export declare function createFromKeywordKind(label: PQP.Language.Keyword.KeywordKind, maybeOther?: string): AutocompleteItem;
-export declare function createFromLanguageConstantKind(label: PQP.Language.Constant.LanguageConstantKind, maybeOther?: string): AutocompleteItem;
+export declare function createFromFieldAccess(label: string, powerQueryType: Type.TPowerQueryType, maybeOther?: string): AutocompleteItem;
+export declare function createFromKeywordKind(label: Keyword.KeywordKind, maybeOther?: string): AutocompleteItem;
+export declare function createFromLanguageConstant(label: Constant.LanguageConstant, maybeOther?: string): AutocompleteItem;
 export declare function createFromLibraryDefinition(label: string, libraryDefinition: Library.TLibraryDefinition, maybeOther?: string): Inspection.AutocompleteItem;
-export declare function createFromPrimitiveTypeConstantKind(label: PQP.Language.Constant.PrimitiveTypeConstantKind, maybeOther?: string): AutocompleteItem;
-export declare function maybeCreateFromScopeItem(label: string, scopeItem: Inspection.TScopeItem, powerQueryType: PQP.Language.Type.TPowerQueryType, maybeOther?: string): AutocompleteItem | undefined;
+export declare function createFromPrimitiveTypeConstant(label: Constant.PrimitiveTypeConstant, maybeOther?: string): AutocompleteItem;
+export declare function maybeCreateFromScopeItem(label: string, scopeItem: Inspection.TScopeItem, powerQueryType: Type.TPowerQueryType, maybeOther?: string): AutocompleteItem | undefined;
 export declare function compareFn(left: AutocompleteItem, right: AutocompleteItem): number;

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

@@ -2,12 +2,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareFn = exports.maybeCreateFromScopeItem = exports.createFromPrimitiveTypeConstantKind = exports.createFromLibraryDefinition = exports.createFromLanguageConstantKind = exports.createFromKeywordKind = exports.createFromFieldAccess = void 0;
+exports.compareFn = exports.maybeCreateFromScopeItem = exports.createFromPrimitiveTypeConstant = exports.createFromLibraryDefinition = exports.createFromLanguageConstant = exports.createFromKeywordKind = exports.createFromFieldAccess = 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 vscode_languageserver_types_1 = require("vscode-languageserver-types");
 var jaroWinkler_1 = require("../../jaroWinkler");
 function createFromFieldAccess(label, powerQueryType, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     // If the key is a quoted identifier but doesn't need to be one then slice out the quote contents.
     var identifierKind = PQP.StringUtils.identifierKind(label, false);
     var normalizedLabel = identifierKind === "Quote" /* Quote */ ? label.slice(2, -1) : label;
@@ -20,27 +23,27 @@ function createFromFieldAccess(label, powerQueryType, maybeOther) {
 }
 exports.createFromFieldAccess = createFromFieldAccess;
 function createFromKeywordKind(label, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Keyword,
         label: label,
-        powerQueryType: PQP.Language.Type.NotApplicableInstance,
+        powerQueryType: language_1.Type.NotApplicableInstance,
     };
 }
 exports.createFromKeywordKind = createFromKeywordKind;
-function createFromLanguageConstantKind(label, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+function createFromLanguageConstant(label, maybeOther) {
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Keyword,
         label: label,
-        powerQueryType: PQP.Language.Type.NotApplicableInstance,
+        powerQueryType: language_1.Type.NotApplicableInstance,
     };
 }
-exports.createFromLanguageConstantKind = createFromLanguageConstantKind;
+exports.createFromLanguageConstant = createFromLanguageConstant;
 function createFromLibraryDefinition(label, libraryDefinition, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: libraryDefinition.completionItemKind,
@@ -49,16 +52,16 @@ function createFromLibraryDefinition(label, libraryDefinition, maybeOther) {
     };
 }
 exports.createFromLibraryDefinition = createFromLibraryDefinition;
-function createFromPrimitiveTypeConstantKind(label, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+function createFromPrimitiveTypeConstant(label, maybeOther) {
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Keyword,
         label: label,
-        powerQueryType: PQP.Language.TypeUtils.createPrimitiveType(false, PQP.Language.TypeUtils.typeKindFromPrimitiveTypeConstantKind(label)),
+        powerQueryType: language_1.TypeUtils.createPrimitiveType(label === "null" /* Null */, language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(label)),
     };
 }
-exports.createFromPrimitiveTypeConstantKind = createFromPrimitiveTypeConstantKind;
+exports.createFromPrimitiveTypeConstant = createFromPrimitiveTypeConstant;
 function maybeCreateFromScopeItem(label, scopeItem, powerQueryType, maybeOther) {
     switch (scopeItem.kind) {
         case "LetVariable" /* LetVariable */:
@@ -76,15 +79,15 @@ function maybeCreateFromScopeItem(label, scopeItem, powerQueryType, maybeOther)
             break;
         }
         case "Undefined" /* Undefined */: {
-            if (scopeItem.xorNode.kind !== "Ast" /* Ast */) {
+            if (parser_1.XorNodeUtils.isContextXor(scopeItem.xorNode)) {
                 return undefined;
             }
             break;
         }
         default:
-            throw PQP.Assert.isNever(scopeItem);
+            throw powerquery_parser_1.Assert.isNever(scopeItem);
     }
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Variable,

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"autocompleteKeyword.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autocompleteKeyword.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,kDAAoD;AAEpD,kEAA2D;AAC3D,wFAA2F;AAC3F,oFAA8G;AAE9G,8BAAyC;AACzC,+CAAqG;AACrG,wDAA8E;AAE9E,2EAA0E;AAC1E,2GAA0G;AAC1G,iHAAgH;AAChH,uFAAsF;AACtF,yFAAwF;AACxF,uFAAsF;AACtF,qFAAoF;AAGpF,SAAgB,sBAAsB,CAClC,QAA4B,EAC5B,mBAAyC,EACzC,eAAiC,EACjC,kBAA6C;IAE7C,IAAI,CAAC,4BAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE;QACtD,OAAO,+BAAW,CAAC,KAAK,wCACjB,kBAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAC,WAAgC;YACnE,OAAA,wCAAqB,CAAC,qBAAqB,CAAC,WAAW,CAAC;QAAxD,CAAwD,CAC3D;YACD,wCAAqB,CAAC,qBAAqB,yBAA6B;kBAC1E,CAAC;KACN;IAED,OAAO,+BAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE;QAC7C,OAAO,mBAAmB,CAAC,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;IACzF,CAAC,CAAC,CAAC;AACP,CAAC;AAlBD,wDAkBC;AAED,SAAgB,mBAAmB,CAC/B,mBAAyC,EACzC,UAAsB,EACtB,kBAA6C;IAE7C,IAAM,YAAY,GAAa,4BAAe,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACzE,IAAI,iBAAqC,CAAC;IAE1C,IAAI,iBAAa,CAAC,OAAO,CAAC,mBAAmB,EAAE,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE;QAC5F,IAAI,UAAU,CAAC,4BAA4B,KAAK,SAAS,EAAE;YACvD,iBAAiB,GAAG,UAAU,CAAC,4BAA4B,CAAC,OAAO,CAAC;SACvE;QACD,uCAAuC;aAClC,IACD,qBAAY,CAAC,eAAe,CAAwB,YAAY,8CAAiC;YACjG,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,4BAA4B;gBACtD,YAAY,CAAC,IAAI,CAAC,WAAW,sBAAyB,CAAC,EAC7D;YACE,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;SACjD;KACJ;IAED,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,OAAO,uBAAuB,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,EAAE,kBAAkB,CAAC,EAAE,iBAAiB,CAAC,CAAC;KAC7G;IAED,IAAM,KAAK,GAAoC;QAC3C,mBAAmB,qBAAA;QACnB,UAAU,YAAA;QACV,kBAAkB,oBAAA;QAClB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9B,KAAK,EAAE,4BAAe,CAAC,aAAa,CAAC,UAAU,CAAC;QAChD,aAAa,EAAE,CAAC;KACnB,CAAC;IAEF,IAAM,aAAa,GAAgD,gBAAgB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAC/G,IAAI,aAAa,KAAK,SAAS,EAAE;QAC7B,OAAO,aAAa,CAAC;KACxB;IAED,OAAO,uBAAuB,CAC1B,kBAAkB,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,kBAAkB,CAAC,EAClF,iBAAiB,CACpB,CAAC;AACN,CAAC;AA5CD,kDA4CC;AAED,IAAM,mBAAmB,GAAuC;;;;;;CAM/D,CAAC;AAEF,oEAAoE;AACpE,yEAAyE;AACzE,mFAAmF;AACnF,wDAAwD;AACxD,SAAS,iBAAiB,CAAC,KAAsC;IAC7D,IAAM,QAAQ,GAA4B,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;IACpE,IAAM,QAAQ,GAAW,QAAQ,CAAC,MAAM,CAAC;IAEzC,IAAI,cAA8D,CAAC;IACnE,KAAK,IAAI,aAAa,GAAW,CAAC,EAAE,aAAa,GAAG,QAAQ,EAAE,aAAa,IAAI,CAAC,EAAE;QAC9E,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACpC,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;QACvC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;QAE1C,QAAQ,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;YAC5B;gBACI,cAAc,GAAG,IAAA,uFAA0C,EAAC,KAAK,CAAC,CAAC;gBACnE,MAAM;YAEV;gBACI,cAAc,GAAG,IAAA,6FAA6C,EAAC,KAAK,CAAC,CAAC;gBACtE,MAAM;YAEV;gBACI,cAAc,GAAG,IAAA,mEAAgC,EAAC,KAAK,CAAC,CAAC;gBACzD,MAAM;YAEV;gBACI,cAAc,GAAG,IAAA,qEAAiC,EAAC,KAAK,CAAC,CAAC;gBAC1D,MAAM;YAEV;gBACI,cAAc,GAAG,IAAA,mEAAgC,EAAC,KAAK,CAAC,CAAC;gBACzD,MAAM;YAEV;gBACI,cAAc,GAAG,IAAA,uDAA0B,EAAC,KAAK,CAAC,CAAC;SAC1D;QAED,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,OAAO,cAAc,CAAC;SACzB;KACJ;IAED,OAAO,EAAE,CAAC;AACd,CAAC;AAED,SAAS,gBAAgB,CACrB,KAAsC,EACtC,kBAA6C;IAE7C,IAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAC;IAChD,IAAM,QAAQ,GAA4B,UAAU,CAAC,QAAQ,CAAC;IAC9D,IAAI,cAA2D,CAAC;IAEhE,8FAA8F;IAC9F,gBAAgB;IAChB,IACI,kBAAkB,KAAK,SAAS;QAChC,QAAQ,CAAC,MAAM,KAAK,CAAC;QACrB,qBAAY,CAAC,eAAe,CAAiB,QAAQ,CAAC,CAAC,CAAC,gCAA0B;QAClF,qBAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,oDAAoC,EACzE;QACE,IAAM,YAAU,GAAW,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACpD,cAAc,GAAG,kBAAO,CAAC,uBAAuB,CAAC,GAAG,CAAC,UAAC,WAAgC;YAClF,OAAA,wCAAqB,CAAC,qBAAqB,CAAC,WAAW,EAAE,YAAU,CAAC;QAApE,CAAoE,CACvE,CAAC;KACL;IAED,qCAAqC;SAChC,IACD,qBAAY,CAAC,eAAe,CAAiB,QAAQ,CAAC,CAAC,CAAC,gCAA0B;QAClF,qBAAY,CAAC,UAAU,CAAiB,QAAQ,CAAC,CAAC,CAAC,8BAAyB;QAC5E,iBAAa,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EACvE;QACE,cAAc,GAAG,CAAC,wCAAqB,CAAC,qBAAqB,eAAwB,CAAC,CAAC;KAC1F;IAED,wCAAwC;SACnC,IACD,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,IAAI,MAAK,GAAG;QAChC,qBAAY,CAAC,mBAAmB,CAAgB,QAAQ,CAAC,CAAC,CAAC,4BAAwB;QACnF,qBAAY,CAAC,UAAU,CAAqB,QAAQ,CAAC,CAAC,CAAC,sCAA6B;QACpF,qBAAY,CAAC,UAAU,CAAyB,QAAQ,CAAC,CAAC,CAAC,gDAAkC,EAC/F;QACE,cAAc,GAAG,CAAC,wCAAqB,CAAC,qBAAqB,eAAwB,CAAC,CAAC;KAC1F;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,SAAS,uBAAuB,CAC5B,YAAgD,EAChD,iBAAqC;IAErC,OAAO,YAAY,CAAC,GAAG,CAAC,UAAC,IAAyB;QAC9C,OAAA,wCAAqB,CAAC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAApE,CAAoE,CACvE,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CACvB,UAAsB,EACtB,SAA6C,EAC7C,kBAA6C;IAE7C,IACI,UAAU,CAAC,QAAQ,sCAAoC;QACvD,UAAU,CAAC,QAAQ,gCAAmC,EACxD;QACE,OAAO,SAAS,CAAC;KACpB;IAED,+BAA+B;IAC/B,YAAY;IACZ,YAAY;IACZ,IACI,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QAChC,qBAAY,CAAC,eAAe,CAAuB,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,4CAAgC,EAC3G;QACE,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAClC,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,EAAE,yBAA6B,CAAC,CAAC;SAChF;aAAM,IACH,kBAAkB,CAAC,IAAI,kCAA4C;YACnE,iBAAa,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI,CAAC,EAC9E;YACE,OAAO,IAAA,iEAA+B,EAAC,SAAS,EAAE,kBAAkB,EAAE,yBAA6B,CAAC,CAAC;SACxG;KACJ;IAED,IAAM,cAAc,GAAa,4BAAe,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC3E,iBAAiB;IACjB,IAAI,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,CAAC,gBAAgB,EAAE;QACzE,OAAO,IAAA,iEAA+B,EAAC,SAAS,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;KACpF;IACD,cAAc;IACd,eAAe;IACf,kBAAkB;SACb,IAAI,qBAAY,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;QAChD,kBAAkB;QAClB,IACI,kBAAkB,KAAK,SAAS;YAChC,iBAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,aAAa,EAAE,KAAK,CAAC,EAClG;YACE,OAAO,SAAS,CAAC;SACpB;QACD,eAAe;aACV,IAAI,qBAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;YAC5C,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;SACtE;QACD,cAAc;aACT;YACD,OAAO,SAAS,CAAC;SACpB;KACJ;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC"}

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

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

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

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