@microsoft/powerquery-language-services 0.2.11 → 0.2.17

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;;;AAElC,oFAMmE;AAGnE,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,GACrB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,4BAEJ,CAAC;QAEN,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,GAC5B,uBAAc,CAAC,+BAA+B,CAC1C,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,gEAEJ,CAAC;QACN,OAAO,IAAA,yCAAgC,EAAC,KAAK,EAAE,0BAA0B,CAAC,EAAE,CAAC,CAAC;KACjF;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAzDD,4EAyDC"}

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;AACpD,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,24 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordRightMostLeaf = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var powerquery_parser_1 = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 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_1.CommonError.InvariantError("expected ".concat(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,oFAAoH;AACpH,kEAAmE;AACnE,wFAAyG;AAIzG,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,mBAAY,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,13 +4,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryAutocompleteLanguageConstant = void 0;
 var PQP = require("@microsoft/powerquery-parser");
-var __1 = require("../..");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 var activeNode_1 = require("../activeNode");
 var autocompleteItem_1 = require("./autocompleteItem");
+var __1 = require("../..");
 function tryAutocompleteLanguageConstant(settings, maybeActiveNode) {
-    return PQP.ResultUtils.ensureResult(settings.locale, function () {
+    var _a;
+    var trace = settings.traceManager.entry("LanguageConstant" /* LanguageConstant */, tryAutocompleteLanguageConstant.name);
+    var result = powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
         return autocompleteLanguageConstant(maybeActiveNode);
     });
+    trace.exit((_a = {}, _a["IsError" /* IsError */] = powerquery_parser_1.ResultUtils.isError(result), _a));
+    return result;
 }
 exports.tryAutocompleteLanguageConstant = tryAutocompleteLanguageConstant;
 function autocompleteLanguageConstant(maybeActiveNode) {
@@ -19,10 +25,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 +46,7 @@ function isNullableAllowed(activeNode) {
                 }
                 break;
             case "PrimitiveType" /* PrimitiveType */:
-                if (isNullableAllowedForPrimitiveType(xorNode)) {
+                if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
                     return true;
                 }
                 break;
@@ -51,56 +57,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 +113,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 +122,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":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAGpD,2BAAsC;AACtC,4CAA8E;AAC9E,uDAA6E;AAG7E,SAAgB,+BAA+B,CAC3C,QAA4B,EAC5B,eAAiC;IAEjC,OAAO,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE;QACjD,OAAO,4BAA4B,CAAC,eAAe,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACP,CAAC;AAPD,0EAOC;AAED,SAAS,4BAA4B,CAAC,eAAiC;IACnE,IAAI,CAAC,4BAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE;QACtD,OAAO,SAAS,CAAC;KACpB;IACD,IAAM,UAAU,GAAe,eAAe,CAAC;IAE/C,IAAI,iBAAiB,CAAC,UAAU,CAAC,EAAE;QAC/B,OAAO,wCAAqB,CAAC,8BAA8B,2BAE1D,CAAC;KACL;SAAM,IAAI,iBAAiB,CAAC,UAAU,CAAC,EAAE;QACtC,OAAO,wCAAqB,CAAC,8BAA8B,2BAE1D,CAAC;KACL;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAsB;IAC7C,IAAM,QAAQ,GAAuC,UAAU,CAAC,QAAQ,CAAC;IACzE,IAAM,YAAY,GAAW,QAAQ,CAAC,MAAM,CAAC;IAE7C,KAAK,IAAI,KAAK,GAAW,CAAC,EAAE,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,CAAC,EAAE;QAC1D,IAAM,OAAO,GAAwB,QAAQ,CAAC,KAAK,CAAC,CAAC;QAErD,QAAQ,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;YACvB;gBACI,IAAI,2CAA2C,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE;oBAChE,OAAO,IAAI,CAAC;iBACf;gBACD,MAAM;YAEV;gBACI,IAAI,iCAAiC,CAAC,OAAO,CAAC,EAAE;oBAC5C,OAAO,IAAI,CAAC;iBACf;gBACD,MAAM;YAEV;gBACI,SAAS;SAChB;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,2CAA2C,CAAC,UAAsB,EAAE,aAAqB;IAC9F,IAAM,UAAU,GAAoC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,gBAAgB,CACzF,UAAU,CAAC,QAAQ,EACnB,aAAa,CAChB,CAAC;IACF,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,mBAAmB,MAAK,CAAC,EAAE;QAC5C,OAAO,KAAK,CAAC;KAChB;IACD,2FAA2F;IAC3F,IAAM,MAAM,GAAwB,UAAU,CAAC;IAC/C,IAAM,QAAQ,GAAa,UAAU,CAAC,QAAQ,CAAC;IAE/C,iCAAiC;IACjC,IACI,MAAM,CAAC,IAAI,CAAC,IAAI,wCAA4C;QAC5D,iBAAa,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EACpD;QACE,OAAO,IAAI,CAAC;KACf;IACD,yCAAyC;SACpC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,wDAAoD,EAAE;QAC3E,IAAM,eAAe,GAAoC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CACjG,UAAU,CAAC,QAAQ,EACnB,aAAa,EACb,CAAC,CACJ,CAAC;QACF,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,OAAO,KAAK,CAAC;SAChB;QACD,8DAA8D;QAC9D,IAAM,UAAU,GAAwB,eAAe,CAAC;QAExD,OAAO;QACH,4BAA4B;QAC5B,UAAU,CAAC,IAAI,CAAC,IAAI,8BAAuC;YAC3D,wCAAwC;YACxC,iBAAa,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,CACzD,CAAC;KACL;SAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,wCAA4C,EAAE;QACrE,OAAO,iCAAiC,CAAC,MAAM,CAAC,CAAC;KACpD;SAAM;QACH,OAAO,KAAK,CAAC;KAChB;AACL,CAAC;AAED,SAAS,iCAAiC,CAAC,aAAkC;IACzE,OAAO,aAAa,CAAC,IAAI,4BAAmC,CAAC;AACjE,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAsB;IAC7C,IAAM,wBAAwB,GAAuB,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,yBAAyB,CACnG,UAAU,CAAC,QAAQ,gDAEtB,CAAC;IACF,IAAI,wBAAwB,KAAK,SAAS,EAAE;QACxC,OAAO,KAAK,CAAC;KAChB;IACD,IAAM,mBAAmB,GAAW,wBAAwB,CAAC;IAE7D,iFAAiF;IACjF,IAAM,cAAc,GAEF,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC,UAAU,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC,EAAE;;KAE3G,CAAC,CAAC;IACH,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,OAAO,KAAK,CAAC;KAChB;IAED,IAAM,qBAAqB,GAAoC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,mBAAmB,CACvG,UAAU,CAAC,QAAQ,EACnB,mBAAmB,EACnB,CAAC,CACJ,CAAC;IACF,IAAI,qBAAqB,KAAK,SAAS,EAAE;QACrC,OAAO,IAAI,CAAC;KACf;IACD,IAAM,gBAAgB,GAAwB,qBAAqB,CAAC;IAEpE,QAAQ,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,EAAE;QAC/C,mCAAmC;QACnC,KAAK,CAAC;YACF,OAAO,IAAI,CAAC;QAEhB,kBAAkB;QAClB,KAAK,CAAC;YACF,QAAQ,gBAAgB,CAAC,IAAI,EAAE;gBAC3B,oBAA+B,CAAC,CAAC;oBAC7B,IAAM,OAAO,GAAgC,gBAAgB,CAAC,IAAmC,CAAC;oBAClG,IAAM,MAAI,GAAW,OAAO,CAAC,OAAO,CAAC;oBAErC,OAAO,CACH,0BAAoD,UAAU,CAAC,MAAI,CAAC;wBACpE,MAAI,8BAAwD;wBAC5D,iBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CACnE,CAAC;iBACL;gBAED;oBACI,OAAO,IAAI,CAAC;gBAEhB;oBACI,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;aAClD;QAEL;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC"}
+{"version":3,"file":"autocompleteLanguageConstant.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.ts"],"names":[],"mappings":"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"}

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

@@ -3,25 +3,33 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryAutocompletePrimitiveType = void 0;
-var PQP = require("@microsoft/powerquery-parser");
-var __1 = require("../..");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 var activeNode_1 = require("../activeNode");
 var autocompleteItem_1 = require("./autocompleteItem");
+var __1 = require("../..");
 function tryAutocompletePrimitiveType(settings, maybeActiveNode, maybeTrailingToken) {
+    var trace = settings.traceManager.entry("PrimitiveType" /* PrimitiveType */, tryAutocompletePrimitiveType.name);
+    var result;
     if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
-        return PQP.ResultUtils.createOk([]);
+        result = powerquery_parser_1.ResultUtils.boxOk([]);
     }
-    return PQP.ResultUtils.ensureResult(settings.locale, function () {
-        return autocompletePrimitiveType(maybeActiveNode, maybeTrailingToken === null || maybeTrailingToken === void 0 ? void 0 : maybeTrailingToken.data);
-    });
+    else {
+        result = powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
+            return autocompletePrimitiveType(maybeActiveNode, maybeTrailingToken === null || maybeTrailingToken === void 0 ? void 0 : maybeTrailingToken.data);
+        });
+    }
+    trace.exit();
+    return result;
 }
 exports.tryAutocompletePrimitiveType = tryAutocompletePrimitiveType;
 function autocompletePrimitiveType(activeNode, maybeTrailingText) {
     return createAutocompleteItems(traverseAncestors(activeNode), maybeTrailingText);
 }
-function createAutocompleteItems(primitiveTypeConstantKinds, maybeTrailingText) {
-    return primitiveTypeConstantKinds.map(function (primitiveTypeConstantKind) {
-        return autocompleteItem_1.AutocompleteItemUtils.createFromPrimitiveTypeConstantKind(primitiveTypeConstantKind, maybeTrailingText);
+function createAutocompleteItems(PrimitiveTypeConstants, maybeTrailingText) {
+    return PrimitiveTypeConstants.map(function (PrimitiveTypeConstant) {
+        return autocompleteItem_1.AutocompleteItemUtils.createFromPrimitiveTypeConstant(PrimitiveTypeConstant, maybeTrailingText);
     });
 }
 function traverseAncestors(activeNode) {
@@ -36,47 +44,42 @@ function traverseAncestors(activeNode) {
         // If the node is a context PrimitiveType node,
         // which is created only when a primitive type was expected but there was nothing to parse.
         // `x as |`
-        if (parent_1.kind === "Context" /* Context */ &&
-            parent_1.node.kind === "PrimitiveType" /* PrimitiveType */) {
-            return PQP.Language.Constant.PrimitiveTypeConstantKinds;
+        if (parser_1.XorNodeUtils.isContextXorChecked(parent_1, "PrimitiveType" /* PrimitiveType */)) {
+            return language_1.Constant.PrimitiveTypeConstants;
         }
         // If on the second attribute for TypePrimaryType.
         // `type |`
         else if (parent_1.node.kind === "TypePrimaryType" /* TypePrimaryType */) {
             if (maybeChild === undefined) {
-                return PQP.Language.Constant.PrimitiveTypeConstantKinds;
+                return language_1.Constant.PrimitiveTypeConstants;
             }
             else if (maybeChild.node.maybeAttributeIndex === 0 &&
-                maybeChild.kind === "Ast" /* Ast */ &&
+                parser_1.XorNodeUtils.isAstXor(maybeChild) &&
                 __1.PositionUtils.isAfterAst(activeNode.position, maybeChild.node, true)) {
-                return PQP.Language.Constant.PrimitiveTypeConstantKinds;
+                return language_1.Constant.PrimitiveTypeConstants;
             }
         }
         // If on a FunctionExpression parameter.
         else if (parent_1.node.kind === "Parameter" /* Parameter */ &&
-            PQP.Parser.AncestryUtils.maybeNthNextXor(ancestry, index, 4, [
-                "FunctionExpression" /* FunctionExpression */,
-            ]) !== undefined) {
+            parser_1.AncestryUtils.maybeNthNextXorChecked(ancestry, index, 4, "FunctionExpression" /* FunctionExpression */) !== undefined) {
             // Things get messy when testing if it's on a nullable primitive type OR a primitive type.
-            var maybeGrandchild = PQP.Parser.AncestryUtils.maybeNthPreviousXor(ancestry, index, 2, undefined);
+            var maybeGrandchild = parser_1.AncestryUtils.maybeNthPreviousXor(ancestry, index, 2);
             if (maybeGrandchild === undefined) {
                 continue;
             }
             // On primitive type.
             // `(x as |) => 0`
-            else if (maybeGrandchild.kind === "Ast" /* Ast */ &&
-                maybeGrandchild.node.kind === "Constant" /* Constant */ &&
+            else if (parser_1.XorNodeUtils.isAstXorChecked(maybeGrandchild, "Constant" /* Constant */) &&
                 maybeGrandchild.node.constantKind === "as" /* As */ &&
                 __1.PositionUtils.isAfterAst(activeNode.position, maybeGrandchild.node, true)) {
-                return PQP.Language.Constant.PrimitiveTypeConstantKinds;
+                return language_1.Constant.PrimitiveTypeConstants;
             }
             // On nullable primitive type
             // `(x as nullable |) => 0`
-            else if (maybeGrandchild.node.kind === "NullablePrimitiveType" /* NullablePrimitiveType */) {
-                var maybeGreatGreatGrandchild = PQP.Parser.AncestryUtils.maybeNthPreviousXor(ancestry, index, 3, undefined);
-                if ((maybeGreatGreatGrandchild === null || maybeGreatGreatGrandchild === void 0 ? void 0 : maybeGreatGreatGrandchild.node.kind) === "PrimitiveType" /* PrimitiveType */) {
-                    return PQP.Language.Constant.PrimitiveTypeConstantKinds;
-                }
+            else if (maybeGrandchild.node.kind === "NullablePrimitiveType" /* NullablePrimitiveType */ &&
+                // Check the great grandchild
+                parser_1.AncestryUtils.maybeNthPreviousXorChecked(ancestry, index, 3, "PrimitiveType" /* PrimitiveType */)) {
+                return language_1.Constant.PrimitiveTypeConstants;
             }
         }
     }

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

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

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

@@ -3,16 +3,16 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keys = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 function keys(autocomplete) {
     var result = [];
-    if (PQP.ResultUtils.isOk(autocomplete.triedFieldAccess) && autocomplete.triedFieldAccess.value !== undefined) {
+    if (powerquery_parser_1.ResultUtils.isOk(autocomplete.triedFieldAccess) && autocomplete.triedFieldAccess.value !== undefined) {
         result = result.concat(autocomplete.triedFieldAccess.value.autocompleteItems.map(function (autocompleteItem) { return autocompleteItem.label; }));
     }
-    if (PQP.ResultUtils.isOk(autocomplete.triedKeyword)) {
+    if (powerquery_parser_1.ResultUtils.isOk(autocomplete.triedKeyword)) {
         result = result.concat(autocomplete.triedKeyword.value.map(function (autocompleteItem) { return autocompleteItem.label; }));
     }
-    if (PQP.ResultUtils.isOk(autocomplete.triedPrimitiveType) && autocomplete.triedPrimitiveType.value !== undefined) {
+    if (powerquery_parser_1.ResultUtils.isOk(autocomplete.triedPrimitiveType) && autocomplete.triedPrimitiveType.value !== undefined) {
         result = result.concat(autocomplete.triedPrimitiveType.value.map(function (autocompleteItem) { return autocompleteItem.label; }));
     }
     return result;

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

@@ -1 +1 @@
-{"version":3,"file":"autocompleteUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAKpD,SAAgB,IAAI,CAAC,YAA0B;IAC3C,IAAI,MAAM,GAAa,EAAE,CAAC;IAE1B,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,YAAY,CAAC,gBAAgB,CAAC,KAAK,KAAK,SAAS,EAAE;QAC1G,MAAM,GAAG,MAAM,CAAC,MAAM,CAClB,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CACrD,UAAC,gBAAkC,IAAK,OAAA,gBAAgB,CAAC,KAAK,EAAtB,CAAsB,CACjE,CACJ,CAAC;KACL;IAED,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE;QACjD,MAAM,GAAG,MAAM,CAAC,MAAM,CAClB,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,gBAAkC,IAAK,OAAA,gBAAgB,CAAC,KAAK,EAAtB,CAAsB,CAAC,CACtG,CAAC;KACL;IAED,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,YAAY,CAAC,kBAAkB,CAAC,KAAK,KAAK,SAAS,EAAE;QAC9G,MAAM,GAAG,MAAM,CAAC,MAAM,CAClB,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,gBAAkC,IAAK,OAAA,gBAAgB,CAAC,KAAK,EAAtB,CAAsB,CAAC,CAC5G,CAAC;KACL;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAxBD,oBAwBC"}
+{"version":3,"file":"autocompleteUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kEAA2D;AAK3D,SAAgB,IAAI,CAAC,YAA0B;IAC3C,IAAI,MAAM,GAAa,EAAE,CAAC;IAE1B,IAAI,+BAAW,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,YAAY,CAAC,gBAAgB,CAAC,KAAK,KAAK,SAAS,EAAE;QACtG,MAAM,GAAG,MAAM,CAAC,MAAM,CAClB,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CACrD,UAAC,gBAAkC,IAAK,OAAA,gBAAgB,CAAC,KAAK,EAAtB,CAAsB,CACjE,CACJ,CAAC;KACL;IAED,IAAI,+BAAW,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE;QAC7C,MAAM,GAAG,MAAM,CAAC,MAAM,CAClB,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,gBAAkC,IAAK,OAAA,gBAAgB,CAAC,KAAK,EAAtB,CAAsB,CAAC,CACtG,CAAC;KACL;IAED,IAAI,+BAAW,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,YAAY,CAAC,kBAAkB,CAAC,KAAK,KAAK,SAAS,EAAE;QAC1G,MAAM,GAAG,MAAM,CAAC,MAAM,CAClB,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,gBAAkC,IAAK,OAAA,gBAAgB,CAAC,KAAK,EAAtB,CAAsB,CAAC,CAC5G,CAAC;KACL;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAxBD,oBAwBC"}

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAMlC,2BAAsC;AAGtC,SAAgB,mBAAmB,CAAC,QAAkB,EAAE,eAAyC;IAC7F,6BACO,eAAe,KAClB,gBAAgB,EAAE,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,IAAI,CAAC,IACnF;AACN,CAAC;AALD,kDAKC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAKlC,2BAAsC;AAGtC,SAAgB,mBAAmB,CAAC,QAAkB,EAAE,eAAyC;IAC7F,6BACO,eAAe,KAClB,gBAAgB,EAAE,iBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,IAAI,CAAC,IACnF;AACN,CAAC;AALD,kDAKC"}

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

@@ -1,4 +1,6 @@
 import * as PQP from "@microsoft/powerquery-parser";
+import { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { AutocompleteItem } from "./autocompleteItem";
 export declare type TriedAutocompleteFieldAccess = PQP.Result<AutocompleteFieldAccess | undefined, PQP.CommonError.CommonError>;
 export declare type TriedAutocompleteKeyword = PQP.Result<ReadonlyArray<AutocompleteItem>, PQP.CommonError.CommonError>;
@@ -11,14 +13,14 @@ export interface Autocomplete {
     readonly triedPrimitiveType: TriedAutocompletePrimitiveType;
 }
 export interface AutocompleteFieldAccess {
-    readonly field: PQP.Parser.TXorNode;
-    readonly fieldType: PQP.Language.Type.TPowerQueryType;
+    readonly field: TXorNode;
+    readonly fieldType: Type.TPowerQueryType;
     readonly inspectedFieldAccess: InspectedFieldAccess;
     readonly autocompleteItems: ReadonlyArray<AutocompleteItem>;
 }
 export interface InspectedFieldAccess {
     readonly isAutocompleteAllowed: boolean;
-    readonly maybeIdentifierUnderPosition: PQP.Language.Ast.GeneralizedIdentifier | undefined;
+    readonly maybeIdentifierUnderPosition: Ast.GeneralizedIdentifier | undefined;
     readonly fieldNames: ReadonlyArray<string>;
 }
 export interface TrailingToken extends PQP.Language.Token.Token {

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

@@ -1,6 +1,6 @@
 import * as PQP from "@microsoft/powerquery-parser";
+import { Autocomplete } from "./commonTypes";
 import { InspectionSettings } from "../../inspectionSettings";
 import { TMaybeActiveNode } from "../activeNode";
 import { TypeCache } from "../typeCache";
-import { Autocomplete } from "./commonTypes";
 export declare function autocomplete(settings: InspectionSettings, parseState: PQP.Parser.ParseState, typeCache: TypeCache, maybeActiveNode: TMaybeActiveNode, maybeParseError: PQP.Parser.ParseError.ParseError | undefined): Autocomplete;

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

@@ -4,24 +4,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocomplete = void 0;
 var PQP = require("@microsoft/powerquery-parser");
+var common_1 = require("./common");
 var autocompleteFieldAccess_1 = require("./autocompleteFieldAccess");
 var autocompleteKeyword_1 = require("./autocompleteKeyword/autocompleteKeyword");
 var autocompleteLanguageConstant_1 = require("./autocompleteLanguageConstant");
 var autocompletePrimitiveType_1 = require("./autocompletePrimitiveType");
-var common_1 = require("./common");
 function autocomplete(settings, parseState, typeCache, maybeActiveNode, maybeParseError) {
+    var trace = settings.traceManager.entry("Autocomplete" /* Autocomplete */, autocomplete.name);
     var nodeIdMapCollection = parseState.contextState.nodeIdMapCollection;
     var maybeTrailingToken;
     if (maybeParseError !== undefined) {
         var maybeParseErrorToken = PQP.Parser.ParseError.maybeTokenFrom(maybeParseError.innerError);
         if (maybeParseErrorToken !== undefined) {
-            maybeTrailingToken = common_1.createTrailingToken(maybeActiveNode.position, maybeParseErrorToken);
+            maybeTrailingToken = (0, common_1.createTrailingToken)(maybeActiveNode.position, maybeParseErrorToken);
         }
     }
-    var triedFieldAccess = autocompleteFieldAccess_1.tryAutocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache);
-    var triedKeyword = autocompleteKeyword_1.tryAutocompleteKeyword(settings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
-    var triedLanguageConstant = autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant(settings, maybeActiveNode);
-    var triedPrimitiveType = autocompletePrimitiveType_1.tryAutocompletePrimitiveType(settings, maybeActiveNode, maybeTrailingToken);
+    var triedFieldAccess = (0, autocompleteFieldAccess_1.tryAutocompleteFieldAccess)(settings, parseState, maybeActiveNode, typeCache);
+    var triedKeyword = (0, autocompleteKeyword_1.tryAutocompleteKeyword)(settings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
+    var triedLanguageConstant = (0, autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant)(settings, maybeActiveNode);
+    var triedPrimitiveType = (0, autocompletePrimitiveType_1.tryAutocompletePrimitiveType)(settings, maybeActiveNode, maybeTrailingToken);
+    trace.exit();
     return {
         triedFieldAccess: triedFieldAccess,
         triedKeyword: triedKeyword,

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

@@ -1 +1 @@
-{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAKpD,qEAAuE;AACvE,iFAAmF;AACnF,+EAAiF;AACjF,yEAA2E;AAC3E,mCAA+C;AAU/C,SAAgB,YAAY,CACxB,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,eAAiC,EACjC,eAA6D;IAE7D,IAAM,mBAAmB,GAAoC,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;IAEzG,IAAI,kBAA6C,CAAC;IAClD,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,IAAM,oBAAoB,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CACnG,eAAe,CAAC,UAAU,CAC7B,CAAC;QACF,IAAI,oBAAoB,KAAK,SAAS,EAAE;YACpC,kBAAkB,GAAG,4BAAmB,CAAC,eAAe,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;SAC5F;KACJ;IAED,IAAM,gBAAgB,GAAiC,oDAA0B,CAC7E,QAAQ,EACR,UAAU,EACV,eAAe,EACf,SAAS,CACZ,CAAC;IAEF,IAAM,YAAY,GAA6B,4CAAsB,CACjE,QAAQ,EACR,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;IAEF,IAAM,qBAAqB,GAAsC,8DAA+B,CAC5F,QAAQ,EACR,eAAe,CAClB,CAAC;IAEF,IAAM,kBAAkB,GAAmC,wDAA4B,CACnF,QAAQ,EACR,eAAe,EACf,kBAAkB,CACrB,CAAC;IAEF,OAAO;QACH,gBAAgB,kBAAA;QAChB,YAAY,cAAA;QACZ,qBAAqB,uBAAA;QACrB,kBAAkB,oBAAA;KACrB,CAAC;AACN,CAAC;AAlDD,oCAkDC"}
+{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAapD,mCAA+C;AAG/C,qEAAuE;AACvE,iFAAmF;AACnF,+EAAiF;AACjF,yEAA2E;AAG3E,SAAgB,YAAY,CACxB,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,eAAiC,EACjC,eAA6D;IAE7D,IAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,oCAAyC,YAAY,CAAC,IAAI,CAAC,CAAC;IAE5G,IAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;IAE9F,IAAI,kBAA6C,CAAC;IAClD,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,IAAM,oBAAoB,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CACnG,eAAe,CAAC,UAAU,CAC7B,CAAC;QACF,IAAI,oBAAoB,KAAK,SAAS,EAAE;YACpC,kBAAkB,GAAG,IAAA,4BAAmB,EAAC,eAAe,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;SAC5F;KACJ;IAED,IAAM,gBAAgB,GAAiC,IAAA,oDAA0B,EAC7E,QAAQ,EACR,UAAU,EACV,eAAe,EACf,SAAS,CACZ,CAAC;IAEF,IAAM,YAAY,GAA6B,IAAA,4CAAsB,EACjE,QAAQ,EACR,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;IAEF,IAAM,qBAAqB,GAAsC,IAAA,8DAA+B,EAC5F,QAAQ,EACR,eAAe,CAClB,CAAC;IAEF,IAAM,kBAAkB,GAAmC,IAAA,wDAA4B,EACnF,QAAQ,EACR,eAAe,EACf,kBAAkB,CACrB,CAAC;IACF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO;QACH,gBAAgB,kBAAA;QAChB,YAAY,cAAA;QACZ,qBAAqB,uBAAA;QACrB,kBAAkB,oBAAA;KACrB,CAAC;AACN,CAAC;AArDD,oCAqDC"}

package/lib/powerquery-language-services/inspection/expectedType.d.ts

@@ -1,6 +1,8 @@
 import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { ActiveNode, TMaybeActiveNode } from "./activeNode";
-export declare type TriedExpectedType = PQP.Result<PQP.Language.Type.TPowerQueryType | undefined, PQP.CommonError.CommonError>;
+export declare type TriedExpectedType = PQP.Result<Type.TPowerQueryType | undefined, PQP.CommonError.CommonError>;
 export declare function tryExpectedType(settings: PQP.CommonSettings, maybeActiveNode: TMaybeActiveNode): TriedExpectedType;
-export declare function maybeExpectedType(activeNode: ActiveNode): PQP.Language.Type.TPowerQueryType | undefined;
-export declare function expectedType(parentXorNode: PQP.Parser.TXorNode, childIndex: number): PQP.Language.Type.TPowerQueryType;
+export declare function maybeExpectedType(activeNode: ActiveNode): Type.TPowerQueryType | undefined;
+export declare function expectedType(parentXorNode: TXorNode, childIndex: number): Type.TPowerQueryType;