@microsoft/powerquery-language-services 0.2.10 → 0.2.15

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

@@ -3,15 +3,17 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryAutocompletePrimitiveType = 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");
 function tryAutocompletePrimitiveType(settings, maybeActiveNode, maybeTrailingToken) {
     if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
-        return PQP.ResultUtils.createOk([]);
+        return powerquery_parser_1.ResultUtils.boxOk([]);
     }
-    return PQP.ResultUtils.ensureResult(settings.locale, function () {
+    return powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
         return autocompletePrimitiveType(maybeActiveNode, maybeTrailingToken === null || maybeTrailingToken === void 0 ? void 0 : maybeTrailingToken.data);
     });
 }
@@ -19,9 +21,9 @@ 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 +38,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":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,kEAA2D;AAC3D,wFAA4F;AAC5F,oFAAkH;AAElH,2BAAsC;AACtC,4CAA8E;AAC9E,uDAA6E;AAG7E,SAAgB,4BAA4B,CACxC,QAA4B,EAC5B,eAAiC,EACjC,kBAA6C;IAE7C,IAAI,CAAC,4BAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE;QACtD,OAAO,+BAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KAChC;IAED,OAAO,+BAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE;QAC7C,OAAO,yBAAyB,CAAC,eAAe,EAAE,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,IAAI,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACP,CAAC;AAZD,oEAYC;AAED,SAAS,yBAAyB,CAC9B,UAAsB,EACtB,iBAAqC;IAErC,OAAO,uBAAuB,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,uBAAuB,CAC5B,sBAAqE,EACrE,iBAAqC;IAErC,OAAO,sBAAsB,CAAC,GAAG,CAAC,UAAC,qBAAqD;QACpF,OAAA,wCAAqB,CAAC,+BAA+B,CAAC,qBAAqB,EAAE,iBAAiB,CAAC;IAA/F,CAA+F,CAClG,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAsB;IAC7C,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IAED,IAAM,QAAQ,GAA4B,UAAU,CAAC,QAAQ,CAAC;IAE9D,IAAM,YAAY,GAAW,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxD,KAAK,IAAI,KAAK,GAAW,CAAC,EAAE,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,CAAC,EAAE;QAC1D,IAAM,QAAM,GAAa,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzC,IAAM,UAAU,GAAyB,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAE7D,+CAA+C;QAC/C,2FAA2F;QAC3F,WAAW;QACX,IAAI,qBAAY,CAAC,mBAAmB,CAAC,QAAM,sCAA6B,EAAE;YACtE,OAAO,mBAAQ,CAAC,sBAAsB,CAAC;SAC1C;QACD,kDAAkD;QAClD,WAAW;aACN,IAAI,QAAM,CAAC,IAAI,CAAC,IAAI,4CAAiC,EAAE;YACxD,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC1B,OAAO,mBAAQ,CAAC,sBAAsB,CAAC;aAC1C;iBAAM,IACH,UAAU,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC;gBACzC,qBAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACjC,iBAAa,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EACtE;gBACE,OAAO,mBAAQ,CAAC,sBAAsB,CAAC;aAC1C;SACJ;QACD,wCAAwC;aACnC,IACD,QAAM,CAAC,IAAI,CAAC,IAAI,gCAA2B;YAC3C,sBAAa,CAAC,sBAAsB,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,gDAAkC,KAAK,SAAS,EACzG;YACE,0FAA0F;YAC1F,IAAM,eAAe,GAAyB,sBAAa,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACpG,IAAI,eAAe,KAAK,SAAS,EAAE;gBAC/B,SAAS;aACZ;YACD,qBAAqB;YACrB,kBAAkB;iBACb,IACD,qBAAY,CAAC,eAAe,CAAgB,eAAe,4BAAwB;gBACnF,eAAe,CAAC,IAAI,CAAC,YAAY,kBAAgC;gBACjE,iBAAa,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,EAC3E;gBACE,OAAO,mBAAQ,CAAC,sBAAsB,CAAC;aAC1C;YACD,6BAA6B;YAC7B,2BAA2B;iBACtB,IACD,eAAe,CAAC,IAAI,CAAC,IAAI,wDAAuC;gBAChE,6BAA6B;gBAC7B,sBAAa,CAAC,0BAA0B,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,sCAA6B,EAC1F;gBACE,OAAO,mBAAQ,CAAC,sBAAsB,CAAC;aAC1C;SACJ;KACJ;IAED,OAAO,EAAE,CAAC;AACd,CAAC"}

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;AAM3D,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/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.js

@@ -15,13 +15,13 @@ function autocomplete(settings, parseState, typeCache, maybeActiveNode, maybePar
     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);
     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;AAQpD,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,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;IAEF,OAAO;QACH,gBAAgB,kBAAA;QAChB,YAAY,cAAA;QACZ,qBAAqB,uBAAA;QACrB,kBAAkB,oBAAA;KACrB,CAAC;AACN,CAAC;AAlDD,oCAkDC"}

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;

package/lib/powerquery-language-services/inspection/expectedType.js

@@ -4,12 +4,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectedType = exports.maybeExpectedType = exports.tryExpectedType = 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 activeNode_1 = require("./activeNode");
 function tryExpectedType(settings, maybeActiveNode) {
     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 maybeExpectedType(maybeActiveNode); });
+    return powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () { return maybeExpectedType(maybeActiveNode); });
 }
 exports.tryExpectedType = tryExpectedType;
 // Traverse up the ancestry and find what type is expected as the nth child of a node's kind.
@@ -22,8 +25,8 @@ function maybeExpectedType(activeNode) {
     for (var index = 0; index < upperBound; index += 1) {
         var parent_1 = ancestry[index + 1];
         var child = ancestry[index];
-        var childAttributeIndex = PQP.Assert.asDefined(child.node.maybeAttributeIndex, "Expected child to have an attribute index.", { childId: child.node.id });
-        var attributeIndex = parent_1.kind === "Ast" /* Ast */ && activeNode.leafKind === "AfterAstNode" /* AfterAstNode */
+        var childAttributeIndex = powerquery_parser_1.Assert.asDefined(child.node.maybeAttributeIndex, "Expected child to have an attribute index.", { childId: child.node.id });
+        var attributeIndex = parser_1.XorNodeUtils.isAstXor(parent_1) && activeNode.leafKind === "AfterAstNode" /* AfterAstNode */
             ? childAttributeIndex + 1
             : childAttributeIndex;
         var allowedType = expectedType(parent_1, attributeIndex);
@@ -57,7 +60,7 @@ function expectedType(parentXorNode, childIndex) {
         case "PrimitiveType" /* PrimitiveType */:
         case "RecordExpression" /* RecordExpression */:
         case "RecursivePrimaryExpression" /* RecursivePrimaryExpression */:
-            return PQP.Language.Type.NotApplicableInstance;
+            return language_1.Type.NotApplicableInstance;
         case "ArithmeticExpression" /* ArithmeticExpression */:
         case "EqualityExpression" /* EqualityExpression */:
         case "LogicalExpression" /* LogicalExpression */:
@@ -65,9 +68,9 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 2:
-                    return PQP.Language.Type.TypeExpressionInstance;
+                    return language_1.Type.TypeExpressionInstance;
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -75,11 +78,11 @@ function expectedType(parentXorNode, childIndex) {
         case "IsExpression" /* IsExpression */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.TypeExpressionInstance;
+                    return language_1.Type.TypeExpressionInstance;
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 2:
-                    return PQP.Language.Type.NullablePrimitiveInstance;
+                    return language_1.Type.NullablePrimitiveInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -87,58 +90,58 @@ function expectedType(parentXorNode, childIndex) {
         case "SectionMember" /* SectionMember */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.RecordInstance;
+                    return language_1.Type.RecordInstance;
                 default:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
             }
         case "AsType" /* AsType */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.TypeProductionInstance;
+                    return language_1.Type.TypeProductionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "AsNullablePrimitiveType" /* AsNullablePrimitiveType */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.NullablePrimitiveInstance;
+                    return language_1.Type.NullablePrimitiveInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "EachExpression" /* EachExpression */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "ErrorHandlingExpression" /* ErrorHandlingExpression */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 case 2:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         // TODO: how should error raising be typed?
         case "ErrorRaisingExpression" /* ErrorRaisingExpression */:
-            return PQP.Language.Type.NotApplicableInstance;
+            return language_1.Type.NotApplicableInstance;
         case "GeneralizedIdentifierPairedAnyLiteral" /* GeneralizedIdentifierPairedAnyLiteral */:
             switch (childIndex) {
                 case 0:
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 2:
-                    return PQP.Language.Type.AnyLiteralInstance;
+                    return language_1.Type.AnyLiteralInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -147,9 +150,9 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 2:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -157,18 +160,18 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 2:
-                    return PQP.Language.Type.TypeProductionInstance;
+                    return language_1.Type.TypeProductionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "FieldTypeSpecification" /* FieldTypeSpecification */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.TypeProductionInstance;
+                    return language_1.Type.TypeProductionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -176,11 +179,11 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 2:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.NullablePrimitiveInstance;
+                    return language_1.Type.NullablePrimitiveInstance;
                 case 3:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -188,9 +191,9 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 2:
-                    return PQP.Language.Type.NullablePrimitiveInstance;
+                    return language_1.Type.NullablePrimitiveInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -199,21 +202,21 @@ function expectedType(parentXorNode, childIndex) {
                 case 0:
                 case 2:
                 case 4:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.LogicalInstance;
+                    return language_1.Type.LogicalInstance;
                 case 3:
                 case 5:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "IsNullablePrimitiveType" /* IsNullablePrimitiveType */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.NullablePrimitiveInstance;
+                    return language_1.Type.NullablePrimitiveInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -222,9 +225,9 @@ function expectedType(parentXorNode, childIndex) {
                 case 0:
                 case 2:
                 case 3:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -233,9 +236,9 @@ function expectedType(parentXorNode, childIndex) {
                 case 0:
                 case 1:
                 case 2:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 3:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -243,26 +246,26 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 2:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.TypeProductionInstance;
+                    return language_1.Type.TypeProductionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "MetadataExpression" /* MetadataExpression */:
             switch (childIndex) {
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 0:
                 case 2:
-                    return PQP.Language.Type.TypeExpressionInstance;
+                    return language_1.Type.TypeExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "NotImplementedExpression" /* NotImplementedExpression */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -270,36 +273,36 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 2:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "NullablePrimitiveType" /* NullablePrimitiveType */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.PrimitiveInstance;
+                    return language_1.Type.PrimitiveInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "NullableType" /* NullableType */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.TypeProductionInstance;
+                    return language_1.Type.TypeProductionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "OtherwiseExpression" /* OtherwiseExpression */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -307,9 +310,9 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 2:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -317,9 +320,9 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 0:
                 case 2:
-                    return PQP.Language.Type.ExpressionInstance;
+                    return language_1.Type.ExpressionInstance;
                 case 1:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
@@ -327,30 +330,30 @@ function expectedType(parentXorNode, childIndex) {
             switch (childIndex) {
                 case 1:
                 case 2:
-                    return PQP.Language.Type.PrimaryExpressionInstance;
+                    return language_1.Type.PrimaryExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "TypePrimaryType" /* TypePrimaryType */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.PrimaryTypeInstance;
+                    return language_1.Type.PrimaryTypeInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         case "UnaryExpression" /* UnaryExpression */:
             switch (childIndex) {
                 case 0:
-                    return PQP.Language.Type.NotApplicableInstance;
+                    return language_1.Type.NotApplicableInstance;
                 case 1:
-                    return PQP.Language.Type.TypeExpressionInstance;
+                    return language_1.Type.TypeExpressionInstance;
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
         default:
-            throw PQP.Assert.isNever(parentXorNode.node);
+            throw powerquery_parser_1.Assert.isNever(parentXorNode.node);
     }
 }
 exports.expectedType = expectedType;