@microsoft/powerquery-language-services 0.3.40 → 0.5.1

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

@@ -12,16 +12,16 @@ function autocompleteKeywordListExpression(state) {
     const ancestryIndex = state.ancestryIndex;
     const child = state.child;
     // '{' or '}'
-    if (child.node.maybeAttributeIndex === 0 || child.node.maybeAttributeIndex === 2) {
+    if (child.node.attributeIndex === 0 || child.node.attributeIndex === 2) {
         return undefined;
     }
-    powerquery_parser_1.Assert.isTrue(child.node.maybeAttributeIndex === 1, `must be in range [0, 2]`, {
+    powerquery_parser_1.Assert.isTrue(child.node.attributeIndex === 1, `must be in range [0, 2]`, {
         nodeId: child.node.id,
-        maybeAttributeIndex: child.node.maybeAttributeIndex,
+        attributeIndex: child.node.attributeIndex,
     });
     // ListExpression -> ArrayWrapper -> Csv -> X
     const nodeOrComma = parser_1.AncestryUtils.assertGetNthPreviousXor(activeNode.ancestry, ancestryIndex, 3);
-    if (nodeOrComma.node.maybeAttributeIndex !== 0) {
+    if (nodeOrComma.node.attributeIndex !== 0) {
         return undefined;
     }
     // We know it's the node component of the Csv,

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

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

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

@@ -6,32 +6,32 @@ exports.autocompleteKeywordSectionMember = void 0;
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const common_1 = require("./common");
 function autocompleteKeywordSectionMember(state) {
-    const maybeChildAttributeIndex = state.child.node.maybeAttributeIndex;
+    const childAttributeIndex = state.child.node.attributeIndex;
     // SectionMember.namePairedExpression
-    if (maybeChildAttributeIndex === 2) {
+    if (childAttributeIndex === 2) {
         // A test for 'shared', which as we're on namePairedExpression we either parsed it or skipped it.
-        const maybeSharedConstant = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, state.parent.node.id, 1, "Constant" /* Constant */);
+        const sharedConstant = parser_1.NodeIdMapUtils.nthChildChecked(state.nodeIdMapCollection, state.parent.node.id, 1, "Constant" /* Constant */);
         // 'shared' was parsed so we can exit.
-        if (maybeSharedConstant !== undefined) {
+        if (sharedConstant !== undefined) {
             return Promise.resolve(undefined);
         }
         // SectionMember -> IdentifierPairedExpression -> Identifier
-        const maybeName = parser_1.AncestryUtils.maybeNthPreviousXor(state.activeNode.ancestry, state.ancestryIndex, 2);
+        const name = parser_1.AncestryUtils.nthPreviousXor(state.activeNode.ancestry, state.ancestryIndex, 2);
         // Name hasn't been parsed yet so we can exit.
-        if (!maybeName ||
-            !parser_1.XorNodeUtils.isAstXorChecked(maybeName, [
+        if (!name ||
+            !parser_1.XorNodeUtils.isAstXorChecked(name, [
                 "IdentifierPairedExpression" /* IdentifierPairedExpression */,
             ])) {
             return Promise.resolve(undefined);
         }
-        if ("shared" /* Shared */.startsWith(maybeName.node.key.literal)) {
+        if ("shared" /* Shared */.startsWith(name.node.key.literal)) {
             return Promise.resolve(["shared" /* Shared */]);
         }
         return Promise.resolve(undefined);
     }
     // `section foo; bar = 1 |` would be expecting a semicolon.
     // The autocomplete should be for the IdentifierPairedExpression found on the previous child index.
-    else if (maybeChildAttributeIndex === 3 && parser_1.XorNodeUtils.isContextXor(state.child)) {
+    else if (childAttributeIndex === 3 && parser_1.XorNodeUtils.isContextXor(state.child)) {
         const identifierPairedExpression = parser_1.NodeIdMapUtils.assertUnboxNthChildAsAstChecked(state.nodeIdMapCollection, state.parent.node.id, 2, "IdentifierPairedExpression" /* IdentifierPairedExpression */);
         return (0, common_1.autocompleteKeywordRightMostLeaf)(state, identifierPairedExpression.id);
     }

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

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

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

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

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

@@ -5,22 +5,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.autocompleteKeywordTrailingText = void 0;
 const PQP = require("@microsoft/powerquery-parser");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
-function autocompleteKeywordTrailingText(inspected, trailingToken, maybeAllowedKeywords) {
+function autocompleteKeywordTrailingText(inspected, trailingToken, allowedKeywords) {
     if (trailingToken.isInOrOnPosition === false) {
         return inspected;
     }
     powerquery_parser_1.Assert.isTrue(trailingToken.data.length > 0, "trailingToken.data.length > 0");
     const token = trailingToken;
-    maybeAllowedKeywords = maybeAllowedKeywords !== null && maybeAllowedKeywords !== void 0 ? maybeAllowedKeywords : PartialConjunctionKeywordAutocompleteMap.get(token.data[0]);
-    if (maybeAllowedKeywords !== undefined) {
-        return PQP.ArrayUtils.concatUnique(inspected, maybeAllowedKeywords.filter((keyword) => keyword.startsWith(token.data)));
+    allowedKeywords = allowedKeywords !== null && allowedKeywords !== void 0 ? allowedKeywords : PartialConjunctionKeywordAutocompleteMap.get(token.data[0]);
+    if (allowedKeywords !== undefined) {
+        return PQP.ArrayUtils.concatUnique(inspected, allowedKeywords.filter((keyword) => keyword.startsWith(token.data)));
     }
     else {
         return inspected;
     }
 }
 exports.autocompleteKeywordTrailingText = autocompleteKeywordTrailingText;
-// Used with maybeParseError to see if a user could be typing a conjunctive keyword such as 'or'. Eg.
+// Used with parseError to see if a user could be typing a conjunctive keyword such as 'or'. Eg.
 // 'Details[UserName] <> "" o|'
 const PartialConjunctionKeywordAutocompleteMap = new Map([
     ["a", ["and" /* And */, "as" /* As */]],

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

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

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

@@ -19,15 +19,15 @@ const autocompleteKeyword_1 = require("./autocompleteKeyword");
 function autocompleteKeywordRightMostLeaf(state, xorNodeId) {
     return __awaiter(this, void 0, void 0, function* () {
         // Grab the right-most Ast node in the last value.
-        const maybeRightMostAstLeafForLastValue = yield parser_1.NodeIdMapUtils.maybeRightMostLeaf(state.nodeIdMapCollection, xorNodeId, undefined);
-        if (maybeRightMostAstLeafForLastValue === undefined) {
+        const rightMostAstLeafForLastValue = yield parser_1.NodeIdMapUtils.rightMostLeaf(state.nodeIdMapCollection, xorNodeId, undefined);
+        if (rightMostAstLeafForLastValue === undefined) {
             return undefined;
         }
         // Start a new autocomplete inspection where the ActiveNode's ancestry is the right-most Ast node in the last value.
-        const shiftedAncestry = parser_1.AncestryUtils.assertGetAncestry(state.nodeIdMapCollection, maybeRightMostAstLeafForLastValue.id);
+        const shiftedAncestry = parser_1.AncestryUtils.assertGetAncestry(state.nodeIdMapCollection, rightMostAstLeafForLastValue.id);
         powerquery_parser_1.Assert.isTrue(shiftedAncestry.length >= 2, "shiftedAncestry.length >= 2");
         const shiftedActiveNode = Object.assign(Object.assign({}, state.activeNode), { ancestry: shiftedAncestry });
-        const inspected = yield (0, autocompleteKeyword_1.autocompleteKeyword)(state.nodeIdMapCollection, shiftedActiveNode, state.maybeTrailingToken);
+        const inspected = yield (0, autocompleteKeyword_1.autocompleteKeyword)(state.nodeIdMapCollection, shiftedActiveNode, state.trailingToken);
         return inspected.map((autocompleteItem) => {
             if (!language_1.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`);

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,sFAAoH;AACpH,oEAAmE;AACnE,0FAAyG;AAIzG,+DAA4D;AAG5D,SAAsB,gCAAgC,CAClD,KAAsC,EACtC,SAAiB;;QAEjB,kDAAkD;QAClD,MAAM,iCAAiC,GAA0B,MAAM,uBAAc,CAAC,kBAAkB,CACpG,KAAK,CAAC,mBAAmB,EACzB,SAAS,EACT,SAAS,CACZ,CAAC;QAEF,IAAI,iCAAiC,KAAK,SAAS,EAAE;YACjD,OAAO,SAAS,CAAC;SACpB;QAED,oHAAoH;QACpH,MAAM,eAAe,GAA4B,sBAAa,CAAC,iBAAiB,CAC5E,KAAK,CAAC,mBAAmB,EACzB,iCAAiC,CAAC,EAAE,CACvC,CAAC;QAEF,0BAAM,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE,6BAA6B,CAAC,CAAC;QAE1E,MAAM,iBAAiB,mCAChB,KAAK,CAAC,UAAU,KACnB,QAAQ,EAAE,eAAe,GAC5B,CAAC;QAEF,MAAM,SAAS,GAAoC,MAAM,IAAA,yCAAmB,EACxE,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,EACjB,KAAK,CAAC,kBAAkB,CAC3B,CAAC;QAEF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,gBAAkC,EAAE,EAAE;YACxD,IAAI,CAAC,uBAAY,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;gBACjD,MAAM,IAAI,+BAAW,CAAC,cAAc,CAChC,YAAY,yCAAmB,CAAC,IAAI,oEAAoE,CAC3G,CAAC;aACL;YAED,OAAO,gBAAgB,CAAC,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AA3CD,4EA2CC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAoH;AACpH,oEAAmE;AACnE,0FAAyG;AAIzG,+DAA4D;AAG5D,SAAsB,gCAAgC,CAClD,KAAsC,EACtC,SAAiB;;QAEjB,kDAAkD;QAClD,MAAM,4BAA4B,GAA0B,MAAM,uBAAc,CAAC,aAAa,CAC1F,KAAK,CAAC,mBAAmB,EACzB,SAAS,EACT,SAAS,CACZ,CAAC;QAEF,IAAI,4BAA4B,KAAK,SAAS,EAAE;YAC5C,OAAO,SAAS,CAAC;SACpB;QAED,oHAAoH;QACpH,MAAM,eAAe,GAA4B,sBAAa,CAAC,iBAAiB,CAC5E,KAAK,CAAC,mBAAmB,EACzB,4BAA4B,CAAC,EAAE,CAClC,CAAC;QAEF,0BAAM,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE,6BAA6B,CAAC,CAAC;QAE1E,MAAM,iBAAiB,mCAChB,KAAK,CAAC,UAAU,KACnB,QAAQ,EAAE,eAAe,GAC5B,CAAC;QAEF,MAAM,SAAS,GAAoC,MAAM,IAAA,yCAAmB,EACxE,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,EACjB,KAAK,CAAC,aAAa,CACtB,CAAC;QAEF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,gBAAkC,EAAE,EAAE;YACxD,IAAI,CAAC,uBAAY,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;gBACjD,MAAM,IAAI,+BAAW,CAAC,cAAc,CAChC,YAAY,yCAAmB,CAAC,IAAI,oEAAoE,CAC3G,CAAC;aACL;YAED,OAAO,gBAAgB,CAAC,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AA3CD,4EA2CC"}

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

@@ -4,7 +4,7 @@ import { TrailingToken } from "../commonTypes";
 export interface InspectAutocompleteKeywordState {
     readonly nodeIdMapCollection: NodeIdMap.Collection;
     readonly activeNode: ActiveNode;
-    readonly maybeTrailingToken: TrailingToken | undefined;
+    readonly trailingToken: TrailingToken | undefined;
     parent: TXorNode;
     child: TXorNode;
     ancestryIndex: number;

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

@@ -1,5 +1,5 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
-import { TMaybeActiveNode } from "../activeNode";
+import { TActiveNode } from "../activeNode";
 import { TrailingToken, TriedAutocompleteLanguageConstant } from "./commonTypes";
-export declare function tryAutocompleteLanguageConstant(settings: PQP.CommonSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeActiveNode: TMaybeActiveNode, maybeTrailingToken: TrailingToken | undefined): TriedAutocompleteLanguageConstant;
+export declare function tryAutocompleteLanguageConstant(settings: PQP.CommonSettings, nodeIdMapCollection: NodeIdMap.Collection, activeNode: TActiveNode, trailingToken: TrailingToken | undefined): TriedAutocompleteLanguageConstant;

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

@@ -9,19 +9,18 @@ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const activeNode_1 = require("../activeNode");
 const autocompleteItem_1 = require("./autocompleteItem");
 const __1 = require("../..");
-function tryAutocompleteLanguageConstant(settings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken) {
-    const trace = settings.traceManager.entry("LanguageConstant" /* AutocompleteLanguageConstant */, tryAutocompleteLanguageConstant.name, settings.maybeInitialCorrelationId);
-    const result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompleteLanguageConstant(nodeIdMapCollection, maybeActiveNode, maybeTrailingToken), settings.locale);
+function tryAutocompleteLanguageConstant(settings, nodeIdMapCollection, activeNode, trailingToken) {
+    const trace = settings.traceManager.entry("LanguageConstant" /* AutocompleteLanguageConstant */, tryAutocompleteLanguageConstant.name, settings.initialCorrelationId);
+    const result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompleteLanguageConstant(nodeIdMapCollection, activeNode, trailingToken), settings.locale);
     trace.exit({ ["IsError" /* IsError */]: powerquery_parser_1.ResultUtils.isError(result) });
     return result;
 }
 exports.tryAutocompleteLanguageConstant = tryAutocompleteLanguageConstant;
-function autocompleteLanguageConstant(nodeIdMapCollection, maybeActiveNode, maybeTrailingToken) {
-    if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
+function autocompleteLanguageConstant(nodeIdMapCollection, activeNode, trailingToken) {
+    if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(activeNode)) {
         return undefined;
     }
-    const activeNode = maybeActiveNode;
-    if (isCatchAllowed(nodeIdMapCollection, activeNode, maybeTrailingToken)) {
+    if (isCatchAllowed(nodeIdMapCollection, activeNode, trailingToken)) {
         return autocompleteItem_1.AutocompleteItemUtils.createFromLanguageConstant("catch" /* Catch */);
     }
     else if (isNullableAllowed(activeNode)) {
@@ -34,7 +33,7 @@ function autocompleteLanguageConstant(nodeIdMapCollection, maybeActiveNode, mayb
         return undefined;
     }
 }
-function isCatchAllowed(nodeIdMapCollection, activeNode, maybeTrailingToken) {
+function isCatchAllowed(nodeIdMapCollection, activeNode, trailingToken) {
     const ancestry = activeNode.ancestry;
     const numAncestors = ancestry.length;
     for (let index = 0; index < numAncestors; index += 1) {
@@ -48,7 +47,7 @@ function isCatchAllowed(nodeIdMapCollection, activeNode, maybeTrailingToken) {
             activeNode.leafKind === "AfterAstNode" /* AfterAstNode */ &&
             // And it only has two children, meaning it hasn't parsed an error handler
             parser_1.NodeIdMapUtils.assertGetChildren(nodeIdMapCollection.childIdsById, xorNode.node.id).length === 2) {
-            return maybeTrailingToken ? "catch" /* Catch */.startsWith(maybeTrailingToken.data) : true;
+            return trailingToken ? "catch" /* Catch */.startsWith(trailingToken.data) : true;
         }
     }
     return false;
@@ -76,12 +75,12 @@ function isNullableAllowed(activeNode) {
     return false;
 }
 function isNullableAllowedForAsNullablePrimitiveType(activeNode, ancestryIndex) {
-    const maybeChild = parser_1.AncestryUtils.maybePreviousXor(activeNode.ancestry, ancestryIndex);
-    if ((maybeChild === null || maybeChild === void 0 ? void 0 : maybeChild.node.maybeAttributeIndex) !== 1) {
+    const child = parser_1.AncestryUtils.previousXor(activeNode.ancestry, ancestryIndex);
+    if ((child === null || child === void 0 ? void 0 : child.node.attributeIndex) !== 1) {
         return false;
     }
     // Ast.AsNullablePrimitiveType.paired: Ast.TNullablePrimitiveType
-    const paired = maybeChild;
+    const paired = child;
     const position = activeNode.position;
     // Ast.PrimitiveType
     if (paired.node.kind === "PrimitiveType" /* PrimitiveType */ && __1.PositionUtils.isBeforeXor(position, paired, false)) {
@@ -89,12 +88,10 @@ function isNullableAllowedForAsNullablePrimitiveType(activeNode, ancestryIndex)
     }
     // Ast.NullablePrimitiveType
     else if (paired.node.kind === "NullablePrimitiveType" /* NullablePrimitiveType */) {
-        const maybeGrandchild = parser_1.AncestryUtils.maybeNthPreviousXor(activeNode.ancestry, ancestryIndex, 2);
-        if (maybeGrandchild === undefined) {
+        const grandchild = parser_1.AncestryUtils.nthPreviousXor(activeNode.ancestry, ancestryIndex, 2);
+        if (grandchild === undefined) {
             return false;
         }
-        // Ast.Constant || Ast.PrimitiveType
-        const grandchild = maybeGrandchild;
         return (
         // Ast.Constant
         grandchild.node.kind === "Constant" /* Constant */ ||
@@ -109,23 +106,21 @@ function isNullableAllowedForAsNullablePrimitiveType(activeNode, ancestryIndex)
     }
 }
 function isOptionalAllowed(activeNode) {
-    const maybeFnExprAncestryIndex = parser_1.AncestryUtils.maybeFirstIndexOfNodeKind(activeNode.ancestry, "FunctionExpression" /* FunctionExpression */);
-    if (maybeFnExprAncestryIndex === undefined) {
+    const fnExprAncestryIndex = parser_1.AncestryUtils.findIndexOfNodeKind(activeNode.ancestry, "FunctionExpression" /* FunctionExpression */);
+    if (fnExprAncestryIndex === undefined) {
         return false;
     }
-    const fnExprAncestryIndex = maybeFnExprAncestryIndex;
     // FunctionExpression -> IParenthesisWrapped -> ParameterList -> Csv -> Parameter
-    const maybeParameter = parser_1.AncestryUtils.maybeNthPreviousXorChecked(activeNode.ancestry, fnExprAncestryIndex, 4, "Parameter" /* Parameter */);
-    if (maybeParameter === undefined) {
+    const parameter = parser_1.AncestryUtils.nthPreviousXorChecked(activeNode.ancestry, fnExprAncestryIndex, 4, "Parameter" /* Parameter */);
+    if (parameter === undefined) {
         return false;
     }
-    const maybeChildOfParameter = parser_1.AncestryUtils.maybeNthPreviousXor(activeNode.ancestry, fnExprAncestryIndex, 5);
-    if (maybeChildOfParameter === undefined) {
+    const childOfParameter = parser_1.AncestryUtils.nthPreviousXor(activeNode.ancestry, fnExprAncestryIndex, 5);
+    if (childOfParameter === undefined) {
         return true;
     }
-    const childOfParameter = maybeChildOfParameter;
-    switch (childOfParameter.node.maybeAttributeIndex) {
-        // IParameter.maybeOptionalConstant
+    switch (childOfParameter.node.attributeIndex) {
+        // IParameter.optionalConstant
         case 0:
             return true;
         // IParameter.name

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

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

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

@@ -1,4 +1,4 @@
 import * as PQP from "@microsoft/powerquery-parser";
-import { TMaybeActiveNode } from "../activeNode";
+import { TActiveNode } from "../activeNode";
 import { TrailingToken, TriedAutocompletePrimitiveType } from "./commonTypes";
-export declare function tryAutocompletePrimitiveType(settings: PQP.CommonSettings, maybeActiveNode: TMaybeActiveNode, maybeTrailingToken: TrailingToken | undefined): TriedAutocompletePrimitiveType;
+export declare function tryAutocompletePrimitiveType(settings: PQP.CommonSettings, activeNode: TActiveNode, trailingToken: TrailingToken | undefined): TriedAutocompletePrimitiveType;

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

@@ -9,24 +9,24 @@ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const activeNode_1 = require("../activeNode");
 const autocompleteItem_1 = require("./autocompleteItem");
 const __1 = require("../..");
-function tryAutocompletePrimitiveType(settings, maybeActiveNode, maybeTrailingToken) {
-    const trace = settings.traceManager.entry("PrimitiveType" /* AutocompletePrimitiveType */, tryAutocompletePrimitiveType.name, settings.maybeInitialCorrelationId);
+function tryAutocompletePrimitiveType(settings, activeNode, trailingToken) {
+    const trace = settings.traceManager.entry("PrimitiveType" /* AutocompletePrimitiveType */, tryAutocompletePrimitiveType.name, settings.initialCorrelationId);
     let result;
-    if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
+    if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(activeNode)) {
         result = powerquery_parser_1.ResultUtils.boxOk([]);
     }
     else {
-        result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompletePrimitiveType(maybeActiveNode, maybeTrailingToken === null || maybeTrailingToken === void 0 ? void 0 : maybeTrailingToken.data), settings.locale);
+        result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompletePrimitiveType(activeNode, trailingToken === null || trailingToken === void 0 ? void 0 : trailingToken.data), settings.locale);
     }
     trace.exit();
     return result;
 }
 exports.tryAutocompletePrimitiveType = tryAutocompletePrimitiveType;
-function autocompletePrimitiveType(activeNode, maybeTrailingText) {
-    return createAutocompleteItems(traverseAncestors(activeNode), maybeTrailingText);
+function autocompletePrimitiveType(activeNode, trailingText) {
+    return createAutocompleteItems(traverseAncestors(activeNode), trailingText);
 }
-function createAutocompleteItems(PrimitiveTypeConstants, maybeTrailingText) {
-    return PrimitiveTypeConstants.map((PrimitiveTypeConstant) => autocompleteItem_1.AutocompleteItemUtils.createFromPrimitiveTypeConstant(PrimitiveTypeConstant, maybeTrailingText));
+function createAutocompleteItems(PrimitiveTypeConstants, trailingText) {
+    return PrimitiveTypeConstants.map((PrimitiveTypeConstant) => autocompleteItem_1.AutocompleteItemUtils.createFromPrimitiveTypeConstant(PrimitiveTypeConstant, trailingText));
 }
 function traverseAncestors(activeNode) {
     if (activeNode.ancestry.length === 0) {
@@ -36,7 +36,7 @@ function traverseAncestors(activeNode) {
     const numAncestors = activeNode.ancestry.length;
     for (let index = 0; index < numAncestors; index += 1) {
         const parent = ancestry[index];
-        const maybeChild = ancestry[index - 1];
+        const child = ancestry[index - 1];
         // 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 |`
@@ -46,35 +46,35 @@ function traverseAncestors(activeNode) {
         // If on the second attribute for TypePrimaryType.
         // `type |`
         else if (parent.node.kind === "TypePrimaryType" /* TypePrimaryType */) {
-            if (maybeChild === undefined) {
+            if (child === undefined) {
                 return language_1.Constant.PrimitiveTypeConstants;
             }
-            else if (maybeChild.node.maybeAttributeIndex === 0 &&
-                parser_1.XorNodeUtils.isAstXor(maybeChild) &&
-                __1.PositionUtils.isAfterAst(activeNode.position, maybeChild.node, true)) {
+            else if (child.node.attributeIndex === 0 &&
+                parser_1.XorNodeUtils.isAstXor(child) &&
+                __1.PositionUtils.isAfterAst(activeNode.position, child.node, true)) {
                 return language_1.Constant.PrimitiveTypeConstants;
             }
         }
         // If on a FunctionExpression parameter.
         else if (parent.node.kind === "Parameter" /* Parameter */ &&
-            parser_1.AncestryUtils.maybeNthNextXorChecked(ancestry, index, 4, "FunctionExpression" /* FunctionExpression */) !== undefined) {
+            parser_1.AncestryUtils.nthNextXorChecked(ancestry, index, 4, "FunctionExpression" /* FunctionExpression */) !== undefined) {
             // Things get messy when testing if it's on a nullable primitive type OR a primitive type.
-            const maybeGrandchild = parser_1.AncestryUtils.maybeNthPreviousXor(ancestry, index, 2);
-            if (maybeGrandchild === undefined) {
+            const grandchild = parser_1.AncestryUtils.nthPreviousXor(ancestry, index, 2);
+            if (grandchild === undefined) {
                 continue;
             }
             // On primitive type.
             // `(x as |) => 0`
-            else if (parser_1.XorNodeUtils.isAstXorChecked(maybeGrandchild, "Constant" /* Constant */) &&
-                maybeGrandchild.node.constantKind === "as" /* As */ &&
-                __1.PositionUtils.isAfterAst(activeNode.position, maybeGrandchild.node, true)) {
+            else if (parser_1.XorNodeUtils.isAstXorChecked(grandchild, "Constant" /* Constant */) &&
+                grandchild.node.constantKind === "as" /* As */ &&
+                __1.PositionUtils.isAfterAst(activeNode.position, grandchild.node, true)) {
                 return language_1.Constant.PrimitiveTypeConstants;
             }
             // On nullable primitive type
             // `(x as nullable |) => 0`
-            else if (maybeGrandchild.node.kind === "NullablePrimitiveType" /* NullablePrimitiveType */ &&
+            else if (grandchild.node.kind === "NullablePrimitiveType" /* NullablePrimitiveType */ &&
                 // Check the great grandchild
-                parser_1.AncestryUtils.maybeNthPreviousXorChecked(ancestry, index, 3, "PrimitiveType" /* PrimitiveType */)) {
+                parser_1.AncestryUtils.nthPreviousXorChecked(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/commonTypes.d.ts

@@ -20,7 +20,7 @@ export interface AutocompleteFieldAccess {
 }
 export interface InspectedFieldAccess {
     readonly isAutocompleteAllowed: boolean;
-    readonly maybeIdentifierUnderPosition: Ast.GeneralizedIdentifier | undefined;
+    readonly identifierUnderPosition: 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 { TActiveNode } from "../activeNode";
 import { TypeCache } from "../typeCache";
-export declare function autocomplete(settings: InspectionSettings, parseState: PQP.Parser.ParseState, typeCache: TypeCache, maybeActiveNode: TMaybeActiveNode, maybeParseError: PQP.Parser.ParseError.ParseError | undefined): Promise<Autocomplete>;
+export declare function autocomplete(settings: InspectionSettings, parseState: PQP.Parser.ParseState, typeCache: TypeCache, activeNode: TActiveNode, parseError: PQP.Parser.ParseError.ParseError | undefined): Promise<Autocomplete>;

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

@@ -19,22 +19,22 @@ const autocompleteKeyword_1 = require("./autocompleteKeyword/autocompleteKeyword
 const autocompleteLanguageConstant_1 = require("./autocompleteLanguageConstant");
 const autocompletePrimitiveType_1 = require("./autocompletePrimitiveType");
 // Given some Position and ParseState, return autocomplete suggestions.
-function autocomplete(settings, parseState, typeCache, maybeActiveNode, maybeParseError) {
+function autocomplete(settings, parseState, typeCache, activeNode, parseError) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = settings.traceManager.entry("Autocomplete" /* Autocomplete */, autocomplete.name, settings.maybeInitialCorrelationId);
-        const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
+        const trace = settings.traceManager.entry("Autocomplete" /* Autocomplete */, autocomplete.name, settings.initialCorrelationId);
+        const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
         const nodeIdMapCollection = parseState.contextState.nodeIdMapCollection;
-        let maybeTrailingToken;
-        if (maybeParseError !== undefined) {
-            const maybeParseErrorToken = PQP.Parser.ParseError.maybeTokenFrom(maybeParseError.innerError);
-            if (maybeParseErrorToken !== undefined) {
-                maybeTrailingToken = (0, common_1.createTrailingToken)(maybeActiveNode.position, maybeParseErrorToken);
+        let trailingToken;
+        if (parseError !== undefined) {
+            const parseErrorToken = PQP.Parser.ParseError.tokenFrom(parseError.innerError);
+            if (parseErrorToken !== undefined) {
+                trailingToken = (0, common_1.createTrailingToken)(activeNode.position, parseErrorToken);
             }
         }
-        const triedFieldAccess = yield (0, autocompleteFieldAccess_1.tryAutocompleteFieldAccess)(updatedSettings, parseState, maybeActiveNode, typeCache);
-        const triedKeyword = yield (0, autocompleteKeyword_1.tryAutocompleteKeyword)(updatedSettings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
-        const triedLanguageConstant = (0, autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant)(updatedSettings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
-        const triedPrimitiveType = (0, autocompletePrimitiveType_1.tryAutocompletePrimitiveType)(updatedSettings, maybeActiveNode, maybeTrailingToken);
+        const triedFieldAccess = yield (0, autocompleteFieldAccess_1.tryAutocompleteFieldAccess)(updatedSettings, parseState, activeNode, typeCache);
+        const triedKeyword = yield (0, autocompleteKeyword_1.tryAutocompleteKeyword)(updatedSettings, nodeIdMapCollection, activeNode, trailingToken);
+        const triedLanguageConstant = (0, autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant)(updatedSettings, nodeIdMapCollection, activeNode, trailingToken);
+        const triedPrimitiveType = (0, autocompletePrimitiveType_1.tryAutocompletePrimitiveType)(updatedSettings, activeNode, trailingToken);
         trace.exit();
         return {
             triedFieldAccess,

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,oDAAoD;AAapD,qCAA+C;AAG/C,uEAAuE;AACvE,mFAAmF;AACnF,iFAAiF;AACjF,2EAA2E;AAG3E,uEAAuE;AACvE,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,eAAiC,EACjC,eAA6D;;QAE7D,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,oCAE5C,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAE9F,IAAI,kBAA6C,CAAC;QAElD,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,MAAM,oBAAoB,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CACnG,eAAe,CAAC,UAAU,CAC7B,CAAC;YAEF,IAAI,oBAAoB,KAAK,SAAS,EAAE;gBACpC,kBAAkB,GAAG,IAAA,4BAAmB,EAAC,eAAe,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;aAC5F;SACJ;QAED,MAAM,gBAAgB,GAAiC,MAAM,IAAA,oDAA0B,EACnF,eAAe,EACf,UAAU,EACV,eAAe,EACf,SAAS,CACZ,CAAC;QAEF,MAAM,YAAY,GAA6B,MAAM,IAAA,4CAAsB,EACvE,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,MAAM,qBAAqB,GAAsC,IAAA,8DAA+B,EAC5F,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,MAAM,kBAAkB,GAAmC,IAAA,wDAA4B,EACnF,eAAe,EACf,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO;YACH,gBAAgB;YAChB,YAAY;YACZ,qBAAqB;YACrB,kBAAkB;SACrB,CAAC;IACN,CAAC;CAAA;AAnED,oCAmEC"}
+{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAapD,qCAA+C;AAG/C,uEAAuE;AACvE,mFAAmF;AACnF,iFAAiF;AACjF,2EAA2E;AAG3E,uEAAuE;AACvE,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,UAAuB,EACvB,UAAwD;;QAExD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,oCAE5C,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,oBAAoB,CAChC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAE9F,IAAI,aAAwC,CAAC;QAE7C,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,MAAM,eAAe,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CACzF,UAAU,CAAC,UAAU,CACxB,CAAC;YAEF,IAAI,eAAe,KAAK,SAAS,EAAE;gBAC/B,aAAa,GAAG,IAAA,4BAAmB,EAAC,UAAU,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;aAC7E;SACJ;QAED,MAAM,gBAAgB,GAAiC,MAAM,IAAA,oDAA0B,EACnF,eAAe,EACf,UAAU,EACV,UAAU,EACV,SAAS,CACZ,CAAC;QAEF,MAAM,YAAY,GAA6B,MAAM,IAAA,4CAAsB,EACvE,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,aAAa,CAChB,CAAC;QAEF,MAAM,qBAAqB,GAAsC,IAAA,8DAA+B,EAC5F,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,aAAa,CAChB,CAAC;QAEF,MAAM,kBAAkB,GAAmC,IAAA,wDAA4B,EACnF,eAAe,EACf,UAAU,EACV,aAAa,CAChB,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO;YACH,gBAAgB;YAChB,YAAY;YACZ,qBAAqB;YACrB,kBAAkB;SACrB,CAAC;IACN,CAAC;CAAA;AAnED,oCAmEC"}

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

@@ -1,13 +1,13 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { Inspection } from "..";
-import { TMaybeActiveNode } from "./activeNode";
+import { TActiveNode } from "./activeNode";
 import { TriedExpectedType } from "./expectedType";
 import { TriedNodeScope } from "./scope";
 import { TypeCache } from "./typeCache";
 export declare type TriedInspection = PQP.Result<Inspected, PQP.CommonError.CommonError>;
 export interface Inspected {
-    readonly maybeActiveNode: TMaybeActiveNode;
+    readonly activeNode: TActiveNode;
     readonly autocomplete: Inspection.Autocomplete;
     readonly triedCurrentInvokeExpression: Promise<Inspection.TriedCurrentInvokeExpression>;
     readonly triedNodeScope: Promise<Inspection.TriedNodeScope>;

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

@@ -23,8 +23,8 @@ function tryDeferenceIdentifier(settings, nodeIdMapCollection, xorNode,
 // Else create a new Map instance and return that instead.
 scopeById = new Map()) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = settings.traceManager.entry("Inspection.Scope" /* InspectScope */, tryDeferenceIdentifier.name, settings.maybeInitialCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
+        const trace = settings.traceManager.entry("Inspection.Scope" /* InspectScope */, tryDeferenceIdentifier.name, settings.initialCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
         parser_1.XorNodeUtils.assertIsIdentifier(xorNode);
         if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
             trace.exit({ ["Result" /* Result */]: undefined });
@@ -48,16 +48,15 @@ scopeById = new Map()) {
             return triedNodeScope;
         }
         const nodeScope = triedNodeScope.value;
-        const maybeScopeItem = nodeScope.get(identifierLiteral);
+        const scopeItem = nodeScope.get(identifierLiteral);
         if (
         // If the identifier couldn't be found in the generated scope,
         // then either the scope generation is incorrect or it's an external identifier.
-        maybeScopeItem === undefined) {
+        scopeItem === undefined) {
             trace.exit({ ["Result" /* Result */]: undefined });
             return powerquery_parser_1.ResultUtils.boxOk(xorNode);
         }
-        const scopeItem = maybeScopeItem;
-        let maybeNextXorNode;
+        let nextXorNode;
         switch (scopeItem.kind) {
             case "Each" /* Each */:
             case "Parameter" /* Parameter */:
@@ -65,25 +64,25 @@ scopeById = new Map()) {
                 break;
             case "LetVariable" /* LetVariable */:
             case "RecordField" /* RecordField */:
-                maybeNextXorNode = scopeItem.maybeValue;
+                nextXorNode = scopeItem.value;
                 break;
             case "SectionMember" /* SectionMember */:
-                maybeNextXorNode = scopeItem.maybeValue;
+                nextXorNode = scopeItem.value;
                 break;
             default:
                 throw powerquery_parser_1.Assert.isNever(scopeItem);
         }
         let result;
-        if (maybeNextXorNode === undefined) {
+        if (nextXorNode === undefined) {
             result = Promise.resolve(powerquery_parser_1.ResultUtils.boxOk(xorNode));
         }
-        else if (parser_1.XorNodeUtils.isContextXor(maybeNextXorNode) ||
-            (maybeNextXorNode.node.kind !== "Identifier" /* Identifier */ &&
-                maybeNextXorNode.node.kind !== "IdentifierExpression" /* IdentifierExpression */)) {
+        else if (parser_1.XorNodeUtils.isContextXor(nextXorNode) ||
+            (nextXorNode.node.kind !== "Identifier" /* Identifier */ &&
+                nextXorNode.node.kind !== "IdentifierExpression" /* IdentifierExpression */)) {
             result = Promise.resolve(powerquery_parser_1.ResultUtils.boxOk(xorNode));
         }
         else {
-            result = tryDeferenceIdentifier(updatedSettings, nodeIdMapCollection, maybeNextXorNode, scopeById);
+            result = tryDeferenceIdentifier(updatedSettings, nodeIdMapCollection, nextXorNode, scopeById);
         }
         trace.exit();
         return result;