@microsoft/powerquery-language-services 0.6.12 → 0.9.6

package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js

@@ -1,81 +1,134 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable max-len */
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findXorOfNodeKind = exports.isPositionInBounds = exports.assertPositionInBounds = exports.assertGetLeaf = exports.assertActiveNode = exports.createOutOfBoundPosition = exports.activeNode = void 0;
-const PQP = require("@microsoft/powerquery-parser");
+exports.findNodeKind = exports.isPositionInBounds = exports.assertPositionInBounds = exports.assertGetLeaf = exports.assertActiveNode = exports.createOutOfBoundPosition = exports.activeNode = void 0;
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const activeNode_1 = require("./activeNode");
 const __1 = require("../..");
-// Searches all leaf Ast.TNodes and all Context nodes to find the "active" node.
-// ' 1 + |' -> the second operand, a Context node, in an ArithmeticExpression.
-// 'let x=|1 in x' -> the value part of the key-value-pair.
-// 'foo(|)' -> the zero length ArrayWrapper of an InvokeExpression
-//
-// The naive approach is to find the closest Ast or Context node either to the left of or ends on the cursor.
-// This approach breaks under several edge cases.
-//
-// Take a look at the ArithmeticExpression example above,
-// it doesn't make sense for the ActiveNode to be the '+' Constant.
-// When the position is on a constant the selected Ast.TNode might need to be shifted one to the right.
-// This happens with atomic constants such as '+', '=>', '[', '(' etc.
-// However if you shifted right on '(' for 'foo(|)' then the ActiveNode would be ')' instead of the ArrayWrapper.
-//
-// Sometimes we don't want to shift at all.
-// Nodes that prevent shifting are called anchor nodes.
-// '[foo = bar|' should be anchored on the identifier 'bar' and not the context node for the ']' Constant.
 function activeNode(nodeIdMapCollection, position) {
-    // Search for the closest Ast node on or to the left of Position, as well as the closest shifted right Ast node.
-    const astSearch = astNodeSearch(nodeIdMapCollection, position);
-    // Search for the closest Context node on or to the right of the closest Ast node.
-    const contextNode = findContext(nodeIdMapCollection, astSearch);
+    const astSearched = leafSearch(nodeIdMapCollection, position);
+    const { nodeClosestBeforePosition, nodeOnPosition, nodeClosestAfterPosition } = leafSearch(nodeIdMapCollection, position);
+    const contextClosestOnOrAfterPosition = findContext(nodeIdMapCollection, astSearched);
     let leaf;
     let leafKind;
-    // Order of node priority:
-    //  * shifted
-    //  * anchor
-    //  * Context
-    //  * Ast
-    if (astSearch.shiftedRightNode !== undefined) {
-        leaf = parser_1.XorNodeUtils.boxAst(astSearch.shiftedRightNode);
-        leafKind = "ShiftedRight" /* ShiftedRight */;
+    // Case 1: empty document
+    if (nodeClosestBeforePosition === undefined &&
+        nodeOnPosition === undefined &&
+        nodeClosestAfterPosition === undefined) {
+        return createOutOfBoundPosition(position);
+    }
+    // Case 2: There's only 1 leaf
+    // Case 2a: truthy left
+    // `not |`
+    // `foo |`
+    else if (nodeClosestBeforePosition !== undefined &&
+        nodeOnPosition === undefined &&
+        nodeClosestAfterPosition === undefined) {
+        // With context
+        // `not |`
+        if (contextClosestOnOrAfterPosition !== undefined) {
+            leaf = parser_1.XorNodeUtils.boxContext(contextClosestOnOrAfterPosition);
+            leafKind = activeNode_1.ActiveNodeLeafKind.ContextNode;
+        }
+        // Without context
+        // `foo |`
+        else {
+            leaf = parser_1.XorNodeUtils.boxAst(nodeClosestBeforePosition);
+            leafKind = activeNode_1.ActiveNodeLeafKind.IsBeforePosition;
+        }
+    }
+    // Case 2b: truthy center
+    // `|not`
+    // `not|`
+    // `|foo`
+    // `foo|`
+    else if (nodeClosestBeforePosition === undefined &&
+        nodeOnPosition !== undefined &&
+        nodeClosestAfterPosition === undefined) {
+        // With or without context
+        leaf = parser_1.XorNodeUtils.boxAst(nodeOnPosition);
+        leafKind = activeNode_1.ActiveNodeLeafKind.IsInAst;
+    }
+    // Case 2c: truthy right
+    // `| not`
+    // `| 1`
+    else if (nodeClosestBeforePosition === undefined &&
+        nodeOnPosition === undefined &&
+        nodeClosestAfterPosition !== undefined) {
+        // With or without context
+        return createOutOfBoundPosition(position);
     }
-    else if (astSearch.bestOnOrBeforeNode !== undefined && isAnchorNode(position, astSearch.bestOnOrBeforeNode)) {
-        leaf = parser_1.XorNodeUtils.boxAst(astSearch.bestOnOrBeforeNode);
-        leafKind = "Anchored" /* Anchored */;
+    // Case 3: There's 2 leafs.
+    // Case 3a: truthy left and center
+    // `1+|1`
+    // `if |true`
+    // `if true|`
+    // `{1, foo|`
+    else if (nodeClosestBeforePosition !== undefined &&
+        nodeOnPosition !== undefined &&
+        nodeClosestAfterPosition == undefined) {
+        // With or without context
+        leaf = parser_1.XorNodeUtils.boxAst(nodeOnPosition);
+        leafKind = activeNode_1.ActiveNodeLeafKind.IsInAst;
     }
-    else if (contextNode !== undefined) {
-        leaf = parser_1.XorNodeUtils.boxContext(contextNode);
-        leafKind = "Context" /* ContextNode */;
+    // Case 3b: truthy left and right
+    else if (nodeClosestBeforePosition !== undefined &&
+        nodeOnPosition === undefined &&
+        nodeClosestAfterPosition !== undefined) {
+        if (language_1.AstUtils.isNodeKind(nodeClosestBeforePosition, language_1.Ast.NodeKind.Constant) &&
+            ShiftRightConstantKinds.includes(nodeClosestBeforePosition.constantKind)) {
+            leaf = parser_1.XorNodeUtils.boxAst(nodeClosestAfterPosition);
+            leafKind = activeNode_1.ActiveNodeLeafKind.IsAfterPosition;
+        }
+        else {
+            leaf = parser_1.XorNodeUtils.boxAst(nodeClosestBeforePosition);
+            leafKind = activeNode_1.ActiveNodeLeafKind.IsBeforePosition;
+        }
     }
-    else if (astSearch.bestOnOrBeforeNode !== undefined) {
-        leaf = parser_1.XorNodeUtils.boxAst(astSearch.bestOnOrBeforeNode);
-        leafKind = __1.PositionUtils.isAfterAst(position, astSearch.bestOnOrBeforeNode, false)
-            ? "AfterAstNode" /* AfterAstNode */
-            : "OnAstNode" /* OnAstNode */;
+    // Case 3c: truthy center and right
+    // `|not true
+    else if (nodeClosestBeforePosition === undefined &&
+        nodeOnPosition !== undefined &&
+        nodeClosestAfterPosition !== undefined) {
+        leaf = parser_1.XorNodeUtils.boxAst(nodeOnPosition);
+        leafKind = activeNode_1.ActiveNodeLeafKind.IsInAst;
     }
+    // Case 4: There's 3 leafs
+    else if (nodeClosestBeforePosition !== undefined &&
+        nodeOnPosition !== undefined &&
+        nodeClosestAfterPosition !== undefined) {
+        leaf = parser_1.XorNodeUtils.boxAst(nodeOnPosition);
+        leafKind = activeNode_1.ActiveNodeLeafKind.IsInAst;
+    }
+    // Case 5: TypeScript can't tell this is exhaustive.
     else {
-        return createOutOfBoundPosition(position);
+        throw new powerquery_parser_1.CommonError.InvariantError(`this should never be reached`);
     }
     const inclusiveIdentifierUnderPosition = findLeafIdentifier(nodeIdMapCollection, leaf);
     const exclusiveIdentifierUnderPosition = inclusiveIdentifierUnderPosition &&
         __1.PositionUtils.isInAst(position, inclusiveIdentifierUnderPosition.node, false, true)
         ? inclusiveIdentifierUnderPosition
         : undefined;
-    const ancestry = parser_1.AncestryUtils.assertGetAncestry(nodeIdMapCollection, leaf.node.id);
+    const ancestry = parser_1.AncestryUtils.assertAncestry(nodeIdMapCollection, leaf.node.id);
     return {
-        ancestry,
-        kind: "ActiveNode" /* ActiveNode */,
+        kind: activeNode_1.ActiveNodeKind.ActiveNode,
         leafKind,
+        position,
+        ancestry,
+        isInKey: isInKey(ancestry),
         exclusiveIdentifierUnderPosition,
         inclusiveIdentifierUnderPosition,
-        position,
     };
 }
 exports.activeNode = activeNode;
 function createOutOfBoundPosition(position) {
     return {
-        kind: "OutOfBoundPosition" /* OutOfBoundPosition */,
+        kind: activeNode_1.ActiveNodeKind.OutOfBoundPosition,
         position,
     };
 }
@@ -87,201 +140,170 @@ function assertActiveNode(nodeIdMapCollection, position) {
 }
 exports.assertActiveNode = assertActiveNode;
 function assertGetLeaf(activeNode) {
-    return parser_1.AncestryUtils.assertGetLeaf(activeNode.ancestry);
+    return parser_1.AncestryUtils.assertNth(activeNode.ancestry, 0);
 }
 exports.assertGetLeaf = assertGetLeaf;
 function assertPositionInBounds(value) {
     if (!isPositionInBounds(value)) {
-        throw new PQP.CommonError.InvariantError(`value was not in bounds`);
+        throw new powerquery_parser_1.CommonError.InvariantError(`value was not in bounds`);
     }
 }
 exports.assertPositionInBounds = assertPositionInBounds;
 function isPositionInBounds(value) {
-    return value.kind === "ActiveNode" /* ActiveNode */;
+    return value.kind === activeNode_1.ActiveNodeKind.ActiveNode;
 }
 exports.isPositionInBounds = isPositionInBounds;
-function findXorOfNodeKind(activeNode, nodeKind) {
-    return parser_1.AncestryUtils.findXorOfNodeKind(activeNode.ancestry, nodeKind);
+function findNodeKind(activeNode, nodeKind) {
+    return parser_1.AncestryUtils.findNodeKind(activeNode.ancestry, nodeKind);
 }
-exports.findXorOfNodeKind = findXorOfNodeKind;
-const DrilldownConstantKind = [
-    "{" /* LeftBrace */,
-    "[" /* LeftBracket */,
-    "(" /* LeftParenthesis */,
+exports.findNodeKind = findNodeKind;
+const ShiftLeftConstantKinds = [
+    language_1.Constant.WrapperConstant.RightBrace,
+    language_1.Constant.WrapperConstant.RightBracket,
+    language_1.Constant.WrapperConstant.RightParenthesis,
 ];
 const ShiftRightConstantKinds = [
-    "," /* Comma */,
-    "=" /* Equal */,
-    "=>" /* FatArrow */,
-    "}" /* RightBrace */,
-    "]" /* RightBracket */,
-    ")" /* RightParenthesis */,
-    ";" /* Semicolon */,
-    ...DrilldownConstantKind,
+    ...language_1.Constant.BinOpExpressionOperators,
+    language_1.Constant.MiscConstant.Ampersand,
+    language_1.Constant.MiscConstant.Comma,
+    language_1.Constant.MiscConstant.DotDot,
+    language_1.Constant.MiscConstant.Equal,
+    language_1.Constant.MiscConstant.FatArrow,
+    language_1.Constant.MiscConstant.NullCoalescingOperator,
+    language_1.Constant.MiscConstant.QuestionMark,
+    language_1.Constant.MiscConstant.Semicolon,
+    language_1.Constant.WrapperConstant.LeftBrace,
+    language_1.Constant.WrapperConstant.LeftBracket,
+    language_1.Constant.WrapperConstant.LeftParenthesis,
 ];
-function isAnchorNode(position, astNode) {
-    if (!__1.PositionUtils.isInAst(position, astNode, true, true)) {
-        return false;
-    }
-    if (astNode.kind === "Identifier" /* Identifier */ || astNode.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
-        return true;
-    }
-    else if (astNode.kind === "LiteralExpression" /* LiteralExpression */ && astNode.literalKind === "Numeric" /* Numeric */) {
-        return true;
-    }
-    else if (astNode.kind === "Constant" /* Constant */) {
-        switch (astNode.constantKind) {
-            case "as" /* As */:
-            case "each" /* Each */:
-            case "else" /* Else */:
-            case "error" /* Error */:
-            case "if" /* If */:
-            case "in" /* In */:
-            case "is" /* Is */:
-            case "section" /* Section */:
-            case "shared" /* Shared */:
-            case "let" /* Let */:
-            case "meta" /* Meta */:
-            case "otherwise" /* Otherwise */:
-            case "then" /* Then */:
-            case "try" /* Try */:
-            case "type" /* Type */:
-            case "null" /* Null */:
-                return true;
-            default:
-                return false;
-        }
-    }
-    else {
-        return false;
-    }
-}
-function astNodeSearch(nodeIdMapCollection, position) {
+// Searches for the closest leaf to the left, right, and on the given position if such an option exists.
+function leafSearch(nodeIdMapCollection, position) {
     const astNodeById = nodeIdMapCollection.astNodeById;
-    let bestOnOrBeforeNode;
-    let bestAfter;
-    let shiftedRightNode;
-    // Find:
-    //  the closest leaf to the left or on position.
-    //  the closest leaf to the right of position.
+    let nodeClosestBeforePosition;
+    let nodeOnPosition;
+    let nodeClosestAfterPosition;
+    // Find the closest leaf on or to the left of the position.
     for (const nodeId of nodeIdMapCollection.leafIds) {
         const candidate = astNodeById.get(nodeId);
+        powerquery_parser_1.Assert.isDefined(candidate, `leafIds contained a value that wasn't found in astNodeById`, { nodeId });
+        language_1.AstUtils.assertIsLeaf(candidate);
+        // This shouldn't occur, but safety first.
         if (candidate === undefined) {
             continue;
         }
-        let isBoundIncluded;
-        if (
-        // let x|=1
-        (candidate.kind === "Constant" /* Constant */ &&
-            ShiftRightConstantKinds.indexOf(candidate.constantKind) !== -1) ||
-            // let x=|1
-            ((bestOnOrBeforeNode === null || bestOnOrBeforeNode === void 0 ? void 0 : bestOnOrBeforeNode.kind) === "Constant" /* Constant */ &&
-                ShiftRightConstantKinds.indexOf(bestOnOrBeforeNode.constantKind) !== -1)) {
-            isBoundIncluded = false;
-        }
-        else {
-            isBoundIncluded = true;
-        }
-        if (!__1.PositionUtils.isBeforeTokenPosition(position, candidate.tokenRange.positionStart, isBoundIncluded)) {
-            if (bestOnOrBeforeNode === undefined ||
-                candidate.tokenRange.tokenIndexStart > bestOnOrBeforeNode.tokenRange.tokenIndexStart) {
-                bestOnOrBeforeNode = candidate;
+        let includeLowerBound = true;
+        let includeUpperBound = true;
+        if (language_1.AstUtils.isNodeKind(candidate, language_1.Ast.NodeKind.Constant)) {
+            if (ShiftRightConstantKinds.includes(candidate.constantKind)) {
+                includeLowerBound = false;
+                includeUpperBound = false;
+            }
+            else if (ShiftLeftConstantKinds.includes(candidate.constantKind)) {
+                includeLowerBound = false;
             }
         }
-        // Check if after position.
-        else if (bestAfter === undefined ||
-            candidate.tokenRange.tokenIndexStart < bestAfter.tokenRange.tokenIndexStart) {
-            bestAfter = candidate;
+        // If the candidate starts under the cursor position then it's safe to assume it's the best candidate,
+        // as each leaf node is guaranteed to be non-overlapping.
+        if (__1.PositionUtils.isInAst(position, candidate, includeLowerBound, includeUpperBound)) {
+            nodeOnPosition = candidate;
         }
-    }
-    // Might need to shift.
-    if ((bestOnOrBeforeNode === null || bestOnOrBeforeNode === void 0 ? void 0 : bestOnOrBeforeNode.kind) === "Constant" /* Constant */) {
-        const currentOnOrBefore = bestOnOrBeforeNode;
-        // Requires a shift into an empty ArrayWrapper.
-        if (DrilldownConstantKind.indexOf(bestOnOrBeforeNode.constantKind) !== -1 &&
-            (bestAfter === null || bestAfter === void 0 ? void 0 : bestAfter.kind) === "Constant" /* Constant */ &&
-            PQP.Language.ConstantUtils.isPairedWrapperConstantKinds(bestOnOrBeforeNode.constantKind, bestAfter.constantKind)) {
-            const parent = parser_1.NodeIdMapUtils.assertUnboxParentAstChecked(nodeIdMapCollection, currentOnOrBefore.id, [
-                "RecordExpression" /* RecordExpression */,
-                "RecordLiteral" /* RecordLiteral */,
-                "ListExpression" /* ListExpression */,
-                "ListLiteral" /* ListLiteral */,
-                "InvokeExpression" /* InvokeExpression */,
-            ]);
-            const arrayWrapper = parser_1.NodeIdMapUtils.assertUnboxArrayWrapperAst(nodeIdMapCollection, parent.id);
-            shiftedRightNode = arrayWrapper;
-        }
-        // Requires a shift to the right.
-        else if (ShiftRightConstantKinds.indexOf(currentOnOrBefore.constantKind) !== -1) {
-            shiftedRightNode = bestAfter;
+        // Else if the candidate is before the cursor position
+        else if (__1.PositionUtils.isAfterAst(position, candidate, includeUpperBound)) {
+            // And we either haven't found a closestNodeOnOrBeforePosition yet, or if the candidate is better (more right) than the current closestNodeOnOrBeforePosition.
+            if (nodeClosestBeforePosition === undefined ||
+                nodeClosestBeforePosition.tokenRange.tokenIndexStart < candidate.tokenRange.tokenIndexStart) {
+                nodeClosestBeforePosition = candidate;
+            }
         }
-        // No shifting.
-        else {
-            shiftedRightNode = undefined;
+        // Else the candidate must be after the cursor position.
+        // And we either haven't found a closestAfterPosition yet, or if the candidate is better (more left) than the current nodeClosestAfterPosition.
+        else if (nodeClosestAfterPosition === undefined ||
+            nodeClosestAfterPosition.tokenRange.tokenIndexStart > candidate.tokenRange.tokenIndexStart) {
+            nodeClosestAfterPosition = candidate;
         }
     }
-    else {
-        shiftedRightNode = undefined;
-    }
     return {
-        bestOnOrBeforeNode,
-        shiftedRightNode,
+        nodeClosestBeforePosition,
+        nodeOnPosition,
+        nodeClosestAfterPosition,
     };
 }
-function findContext(nodeIdMapCollection, astNodeSearch) {
-    if (astNodeSearch.bestOnOrBeforeNode === undefined) {
+function findContext(nodeIdMapCollection, searchedLeafs) {
+    var _a, _b, _c, _d, _e;
+    const tokenIndexLowBound = (_d = (_b = (_a = searchedLeafs.nodeClosestAfterPosition) === null || _a === void 0 ? void 0 : _a.tokenRange.tokenIndexStart) !== null && _b !== void 0 ? _b : (_c = searchedLeafs.nodeOnPosition) === null || _c === void 0 ? void 0 : _c.tokenRange.tokenIndexStart) !== null && _d !== void 0 ? _d : (_e = searchedLeafs.nodeClosestBeforePosition) === null || _e === void 0 ? void 0 : _e.tokenRange.tokenIndexStart;
+    if (tokenIndexLowBound === undefined) {
         return undefined;
     }
-    const tokenIndexLowBound = astNodeSearch.bestOnOrBeforeNode.tokenRange.tokenIndexStart;
-    let current = undefined;
+    // Look for the deepest ParseContext that starts on or before the cursor.
+    // We can use searchedLeafs to generate a bound on tokenIndex.
+    // It's possible/likely that multiple ParseContexts exist with the same tokenIndex,
+    // so we pick the "deepest" one.
+    const depthCache = new Map();
+    let closestContextOnOrAfterPosition = undefined;
     for (const candidate of nodeIdMapCollection.contextNodeById.values()) {
-        if (candidate.tokenStart) {
-            if (candidate.tokenIndexStart < tokenIndexLowBound) {
-                continue;
-            }
-            if (current === undefined || current.id < candidate.id) {
-                current = candidate;
-            }
+        if (candidate.tokenIndexStart < tokenIndexLowBound) {
+            continue;
+        }
+        if (closestContextOnOrAfterPosition === undefined ||
+            candidate.tokenIndexStart > closestContextOnOrAfterPosition.tokenIndexStart ||
+            findDepth(nodeIdMapCollection.parentIdById, candidate.id, depthCache) >
+                findDepth(nodeIdMapCollection.parentIdById, closestContextOnOrAfterPosition.id, depthCache)) {
+            closestContextOnOrAfterPosition = candidate;
         }
     }
-    return current;
+    return closestContextOnOrAfterPosition;
+}
+function findDepth(parentIdById, nodeId, depthCache) {
+    const cachedDepth = depthCache.get(nodeId);
+    if (cachedDepth !== undefined) {
+        return cachedDepth;
+    }
+    const parentId = parentIdById.get(nodeId);
+    if (parentId === undefined) {
+        return 0;
+    }
+    const summedDepth = 1 + findDepth(parentIdById, parentId, depthCache);
+    depthCache.set(nodeId, summedDepth);
+    return summedDepth;
 }
 function findLeafIdentifier(nodeIdMapCollection, leafXorNode) {
-    if (parser_1.XorNodeUtils.isContextXor(leafXorNode)) {
+    if (parser_1.XorNodeUtils.isContext(leafXorNode)) {
         return undefined;
     }
     const leaf = leafXorNode.node;
     let identifier;
     const parentId = nodeIdMapCollection.parentIdById.get(leaf.id);
-    if (leaf.kind === "Identifier" /* Identifier */) {
+    if (leaf.kind === language_1.Ast.NodeKind.Identifier) {
         if (parentId === undefined) {
-            return undefined;
-        }
-        const parent = parser_1.NodeIdMapUtils.unboxIfAst(nodeIdMapCollection, parentId);
-        if ((parent === null || parent === void 0 ? void 0 : parent.kind) === "IdentifierPairedExpression" /* IdentifierPairedExpression */) {
             identifier = leaf;
         }
-        else if ((parent === null || parent === void 0 ? void 0 : parent.kind) === "IdentifierExpression" /* IdentifierExpression */) {
-            identifier = parent;
-        }
         else {
-            identifier = leaf;
+            const parent = parser_1.NodeIdMapUtils.ast(nodeIdMapCollection, parentId);
+            if ((parent === null || parent === void 0 ? void 0 : parent.kind) === language_1.Ast.NodeKind.IdentifierPairedExpression) {
+                identifier = leaf;
+            }
+            else if ((parent === null || parent === void 0 ? void 0 : parent.kind) === language_1.Ast.NodeKind.IdentifierExpression) {
+                identifier = parent;
+            }
+            else {
+                identifier = leaf;
+            }
         }
     }
-    // If closestLeaf is '@', then check if it's part of an IdentifierExpression.
-    else if (leaf.kind === "Constant" /* Constant */ && leaf.constantKind === "@" /* AtSign */) {
+    // If '@', then check if it's part of an IdentifierExpression.
+    else if (leaf.kind === language_1.Ast.NodeKind.Constant && leaf.constantKind === language_1.Constant.MiscConstant.AtSign) {
         if (parentId === undefined) {
             return undefined;
         }
-        const parent = parser_1.NodeIdMapUtils.unboxIfAst(nodeIdMapCollection, parentId);
-        if ((parent === null || parent === void 0 ? void 0 : parent.kind) === "IdentifierExpression" /* IdentifierExpression */) {
+        const parent = parser_1.NodeIdMapUtils.ast(nodeIdMapCollection, parentId);
+        if ((parent === null || parent === void 0 ? void 0 : parent.kind) === language_1.Ast.NodeKind.IdentifierExpression) {
             identifier = parent;
         }
         else {
             return undefined;
         }
     }
-    else if (leaf.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
+    else if (leaf.kind === language_1.Ast.NodeKind.GeneralizedIdentifier) {
         identifier = leaf;
     }
     else {
@@ -289,8 +311,8 @@ function findLeafIdentifier(nodeIdMapCollection, leafXorNode) {
     }
     let result;
     switch (identifier.kind) {
-        case "Identifier" /* Identifier */:
-        case "GeneralizedIdentifier" /* GeneralizedIdentifier */:
+        case language_1.Ast.NodeKind.Identifier:
+        case language_1.Ast.NodeKind.GeneralizedIdentifier:
             result = {
                 node: identifier,
                 isRecursive: false,
@@ -298,19 +320,31 @@ function findLeafIdentifier(nodeIdMapCollection, leafXorNode) {
                 normalizedRecursiveLiteral: undefined,
             };
             break;
-        case "IdentifierExpression" /* IdentifierExpression */: {
+        case language_1.Ast.NodeKind.IdentifierExpression: {
             const normalizedLiteral = language_1.TextUtils.normalizeIdentifier(identifier.identifier.literal);
             result = {
                 node: identifier,
-                isRecursive: Boolean(identifier.inclusiveConstant),
                 normalizedLiteral,
-                normalizedRecursiveLiteral: `@${normalizedLiteral}`,
+                normalizedRecursiveLiteral: identifier.inclusiveConstant ? `@${normalizedLiteral}` : undefined,
             };
             break;
         }
         default:
-            throw PQP.Assert.isNever(identifier);
+            throw powerquery_parser_1.Assert.isNever(identifier);
     }
     return result;
 }
+function isInKey(ancestry) {
+    if (ancestry.length < 2) {
+        return false;
+    }
+    const child = powerquery_parser_1.ArrayUtils.assertGet(ancestry, 0);
+    const parent = powerquery_parser_1.ArrayUtils.assertGet(ancestry, 1);
+    // Return true if we're in the key portion of a key-value pair.
+    return ([
+        language_1.Ast.NodeKind.GeneralizedIdentifierPairedAnyLiteral,
+        language_1.Ast.NodeKind.GeneralizedIdentifierPairedExpression,
+        language_1.Ast.NodeKind.IdentifierPairedExpression,
+    ].includes(parent.node.kind) && child.node.attributeIndex === 0);
+}
 //# sourceMappingURL=activeNodeUtils.js.map

package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map

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

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

@@ -1,6 +1,8 @@
 import * as PQP from "@microsoft/powerquery-parser";
-import { TActiveNode } from "../activeNode";
-import { TriedAutocompleteFieldAccess } from "./commonTypes";
+import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
+import { ActiveNode, TActiveNode } from "../activeNode";
+import { InspectedFieldAccess, TriedAutocompleteFieldAccess } from "./commonTypes";
 import { InspectionSettings } from "../../inspectionSettings";
 import { TypeCache } from "../typeCache";
+export declare function inspectFieldAccess(lexerSnapshot: PQP.Lexer.LexerSnapshot, nodeIdMapCollection: NodeIdMap.Collection, activeNode: ActiveNode): InspectedFieldAccess | undefined;
 export declare function tryAutocompleteFieldAccess(settings: InspectionSettings, parseState: PQP.Parser.ParseState, activeNode: TActiveNode, typeCache: TypeCache): Promise<TriedAutocompleteFieldAccess>;