aws-iam-language-server 0.0.13 → 0.0.15

package/src/lib/iam-policy/reference/services.js

@@ -1,4 +1,5 @@
 import { readFileSync } from 'node:fs';
+import { arnMatches, parseArn } from "../arn.js";
 export class ServiceReference {
     static #serviceDataMap = {};
     static #allActions;
@@ -7,30 +8,53 @@ export class ServiceReference {
     static #globalConditionKeys;
     static getServiceData(service) {
         if (!ServiceReference.#serviceDataMap[service]) {
-            ServiceReference.#serviceDataMap[service] = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/services/${service}.json`, 'utf-8'));
+            try {
+                ServiceReference.#serviceDataMap[service] = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/services/${service}.json`, 'utf-8'));
+            }
+            catch {
+                return undefined;
+            }
         }
         return ServiceReference.#serviceDataMap[service];
     }
     static getServicePrincipals() {
         if (!ServiceReference.#servicePrincipals) {
-            ServiceReference.#servicePrincipals = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/service-principals.json`, 'utf-8'));
+            try {
+                ServiceReference.#servicePrincipals = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/service-principals.json`, 'utf-8'));
+            }
+            catch {
+                return [];
+            }
         }
         return ServiceReference.#servicePrincipals;
     }
     static getAllActions() {
         if (!ServiceReference.#allActions) {
-            ServiceReference.#allActions = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/actions.json`, 'utf-8'));
+            try {
+                ServiceReference.#allActions = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/actions.json`, 'utf-8'));
+            }
+            catch {
+                return [];
+            }
         }
         return ServiceReference.#allActions;
     }
     static getAllServices() {
         if (!ServiceReference.#allServices) {
-            ServiceReference.#allServices = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/services.json`, 'utf-8'));
+            try {
+                ServiceReference.#allServices = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/servicereference/services.json`, 'utf-8'));
+            }
+            catch {
+                return [];
+            }
         }
         return ServiceReference.#allServices;
     }
     static getActionsForService(service) {
-        return Object.entries(ServiceReference.getServiceData(service).actions).map(([actionName, action]) => {
+        const serviceData = ServiceReference.getServiceData(service);
+        if (!serviceData)
+            return [];
+        return Object.entries(serviceData.actions).map(([actionName, action]) => {
             if (!action.name)
                 action.name = `${service}:${actionName}`;
             return action;
@@ -41,6 +65,8 @@ export class ServiceReference {
         for (const action of actions) {
             const [service, actionName] = action.split(':');
             const serviceData = ServiceReference.getServiceData(service);
+            if (!serviceData)
+                continue;
             const actionDef = serviceData.actions[actionName];
             if (actionDef?.conditionKeys) {
                 for (const keyName of actionDef.conditionKeys) {
@@ -56,33 +82,46 @@ export class ServiceReference {
     }
     static getGlobalConditionKeys() {
         if (!ServiceReference.#globalConditionKeys) {
-            ServiceReference.#globalConditionKeys = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/condition-keys/global.json`, 'utf-8'));
+            try {
+                ServiceReference.#globalConditionKeys = JSON.parse(readFileSync(`${import.meta.dirname}/../../../data/condition-keys/global.json`, 'utf-8'));
+            }
+            catch {
+                return [];
+            }
         }
         return ServiceReference.#globalConditionKeys;
     }
     static getAction(action) {
-        try {
-            const serviceName = action.split(':')[0];
-            const actionName = action.split(':')[1];
-            return ServiceReference.getServiceData(serviceName).actions[actionName];
-        }
-        catch {
-            return undefined;
-        }
+        const serviceName = action.split(':')[0];
+        const actionName = action.split(':')[1];
+        return ServiceReference.getServiceData(serviceName)?.actions[actionName];
     }
     static getConditionKey(service, keyName) {
-        try {
-            return ServiceReference.getServiceData(service).conditionKeys[keyName];
-        }
-        catch {
-            return undefined;
+        return ServiceReference.getServiceData(service)?.conditionKeys[keyName];
+    }
+    static getResources(arn) {
+        const serviceData = ServiceReference.getServiceData(arn.service);
+        if (!serviceData)
+            return [];
+        const matches = [];
+        for (const resource of serviceData.resources) {
+            for (const format of resource.arnFormats) {
+                const templateArn = parseArn(format);
+                if (templateArn && arnMatches(arn, templateArn)) {
+                    matches.push(resource);
+                    break;
+                }
+            }
         }
+        return matches;
     }
     static getResourcesForActions(actions) {
         const resources = new Map();
         for (const action of actions) {
             const [service, actionName] = action.split(':');
             const serviceData = ServiceReference.getServiceData(service);
+            if (!serviceData)
+                continue;
             const actionDef = serviceData.actions[actionName];
             if (!actionDef?.resources)
                 continue;

package/src/lib/iam-policy/reference/types.d.ts

@@ -70,6 +70,11 @@ export type Action = {
     operationUrl?: string;
     iamUrl?: string;
 };
+export type ResourceDef = {
+    name: string;
+    arnFormats: Array<string>;
+    conditionKeys: Array<string>;
+};
 export type ConditionKey = {
     types: Array<string>;
     description?: string;

package/src/lib/treesitter/base.d.ts

@@ -1,12 +1,6 @@
+import type { Position, Range } from 'vscode-languageserver';
 import type { Language, Node, Tree } from 'web-tree-sitter';
-export type Position = {
-    line: number;
-    column: number;
-};
-export type Range = {
-    start: Position;
-    end: Position;
-};
+export type { Position, Range };
 export type StatementValue = {
     text: string;
     range: Range;
@@ -34,6 +28,7 @@ export type CursorContext = {
     role: 'key' | 'value';
     partial: string;
     value: string;
+    range?: Range;
     policyFormat: PolicyFormat;
 };
 export type StatementContext = {

package/src/lib/treesitter/base.js

@@ -2,8 +2,8 @@ import { Parser } from 'web-tree-sitter';
 await Parser.init();
 export function nodeRange(node) {
     return {
-        start: { line: node.startPosition.row, column: node.startPosition.column },
-        end: { line: node.endPosition.row, column: node.endPosition.column },
+        start: { line: node.startPosition.row, character: node.startPosition.column },
+        end: { line: node.endPosition.row, character: node.endPosition.column },
     };
 }
 export class TreeBase {
@@ -40,7 +40,7 @@ export class TreeBase {
             return null;
         const node = tree.rootNode.descendantForPosition({
             row: position.line,
-            column: position.column,
+            column: position.character,
         });
         return node;
     }

package/src/lib/treesitter/hcl.js

@@ -11,7 +11,9 @@ export class TreeHcl extends TreeBase {
         const node = this.getNodeAtPosition(uri, position);
         if (!node)
             return null;
-        const nodeBefore = position.column > 0 ? this.getNodeAtPosition(uri, { line: position.line, column: position.column - 1 }) : null;
+        const nodeBefore = position.character > 0
+            ? this.getNodeAtPosition(uri, { line: position.line, character: position.character - 1 })
+            : null;
         // Try jsonencode mode first (more specific structure)
         const jsonencodeContext = this.#tryJsonencodeMode(node, nodeBefore, position);
         if (jsonencodeContext)
@@ -174,8 +176,8 @@ export class TreeHcl extends TreeBase {
                 const valueRange = expression
                     ? nodeRange(expression)
                     : {
-                        start: { line: child.endPosition.row, column: child.endPosition.column },
-                        end: { line: child.endPosition.row, column: child.endPosition.column },
+                        start: { line: child.endPosition.row, character: child.endPosition.column },
+                        end: { line: child.endPosition.row, character: child.endPosition.column },
                     };
                 entries.push({ key: id.text, keyRange, values, valueRange });
             }
@@ -242,8 +244,8 @@ export class TreeHcl extends TreeBase {
             const valueRange = valueExpression
                 ? nodeRange(valueExpression)
                 : {
-                    start: { line: child.endPosition.row, column: child.endPosition.column },
-                    end: { line: child.endPosition.row, column: child.endPosition.column },
+                    start: { line: child.endPosition.row, character: child.endPosition.column },
+                    end: { line: child.endPosition.row, character: child.endPosition.column },
                 };
             const nestedKeys = new Set(['Condition', 'Principal', 'NotPrincipal']);
             let children;
@@ -310,8 +312,8 @@ export class TreeHcl extends TreeBase {
             const valueRange = valueExpression
                 ? nodeRange(valueExpression)
                 : {
-                    start: { line: child.endPosition.row, column: child.endPosition.column },
-                    end: { line: child.endPosition.row, column: child.endPosition.column },
+                    start: { line: child.endPosition.row, character: child.endPosition.column },
+                    end: { line: child.endPosition.row, character: child.endPosition.column },
                 };
             let nestedObject;
             if (valueExpression) {
@@ -424,8 +426,8 @@ export class TreeHcl extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const { partial, value } = this.#extractJsonencodePartialAndValue(cursorNode, position);
-        return { keys, role, partial, value };
+        const { partial, value, range } = this.#extractJsonencodePartialAndValue(cursorNode, position);
+        return { keys, role, partial, value, range };
     }
     #getObjectElemKey(element) {
         const keyExpression = element.namedChildren.find((child) => child.type === 'expression');
@@ -457,10 +459,11 @@ export class TreeHcl extends TreeBase {
         while (current) {
             if (current.type === 'identifier' || current.type === 'template_literal') {
                 const value = current.text;
+                const range = nodeRange(current);
                 if (position.line === current.startPosition.row) {
-                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
+                    return { partial: value.slice(0, position.character - current.startPosition.column), value, range };
                 }
-                return { partial: value, value };
+                return { partial: value, value, range };
             }
             if (current.type === 'object' || current.type === 'object_elem')
                 break;
@@ -488,7 +491,7 @@ export class TreeHcl extends TreeBase {
             return this.#pickBestCursorContext(context1, context2);
         }
         // Cursor is on the block itself (outside body span) — statement-key level
-        const { partial, value } = this.#extractBlockPartialAndValue(node, position);
+        const { partial, value, range } = this.#extractBlockPartialAndValue(node, position);
         // Check for incomplete attributes on the same line (may be in ERROR nodes
         // when tree-sitter can't parse the body due to a missing value)
         const searchParent = statementBody ?? statementBlock;
@@ -515,6 +518,7 @@ export class TreeHcl extends TreeBase {
             role: 'key',
             partial,
             value,
+            range,
             policyFormat: 'hcl-block',
         };
     }
@@ -603,8 +607,8 @@ export class TreeHcl extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const { partial, value } = this.#extractBlockPartialAndValue(cursorNode, position);
-        return { keys, role, partial, value };
+        const { partial, value, range } = this.#extractBlockPartialAndValue(cursorNode, position);
+        return { keys, role, partial, value, range };
     }
     #findEnclosingBlock(node, blockName, statementBody) {
         let current = node;
@@ -659,10 +663,11 @@ export class TreeHcl extends TreeBase {
         while (current) {
             if (current.type === 'identifier' || current.type === 'template_literal') {
                 const value = current.text;
+                const range = nodeRange(current);
                 if (position.line === current.startPosition.row) {
-                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
+                    return { partial: value.slice(0, position.character - current.startPosition.column), value, range };
                 }
-                return { partial: value, value };
+                return { partial: value, value, range };
             }
             if (current.type === 'body' || current.type === 'attribute' || current.type === 'block')
                 break;
@@ -711,7 +716,7 @@ export class TreeHcl extends TreeBase {
             (nodeBefore && this.#isInsideQuote(nodeBefore)) ||
             errorNode.children.some((child) => child.type === 'quoted_template_start' &&
                 child.startPosition.row === position.line &&
-                child.endPosition.column <= position.column);
+                child.endPosition.column <= position.character);
         if (!hasQuoteOnLine)
             return null;
         let foundStatement = false;
@@ -804,12 +809,13 @@ export class TreeHcl extends TreeBase {
         // extract from the template_literal. Otherwise extract from ERROR node text.
         let partial = '';
         let value = '';
+        let range;
         if (!lastKeyFromAttribute) {
             if (this.#isInsideQuote(node)) {
-                ({ partial, value } = this.#extractQuotedPartialAndValue(node, position));
+                ({ partial, value, range } = this.#extractQuotedPartialAndValue(node, position));
             }
             else if (nodeBefore && this.#isInsideQuote(nodeBefore)) {
-                ({ partial, value } = this.#extractQuotedPartialAndValue(nodeBefore, position));
+                ({ partial, value, range } = this.#extractQuotedPartialAndValue(nodeBefore, position));
             }
             else {
                 ({ partial, value } = this.#extractPartialAndValueFromErrorNode(errorNode, position));
@@ -828,6 +834,7 @@ export class TreeHcl extends TreeBase {
             role: 'value',
             partial,
             value,
+            range,
             policyFormat,
         };
     }
@@ -840,10 +847,11 @@ export class TreeHcl extends TreeBase {
         while (current) {
             if (current.type === 'template_literal') {
                 const value = current.text;
+                const range = nodeRange(current);
                 if (position.line === current.startPosition.row) {
-                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
+                    return { partial: value.slice(0, position.character - current.startPosition.column), value, range };
                 }
-                return { partial: '', value };
+                return { partial: '', value, range };
             }
             if (current.type === 'quoted_template_start')
                 return { partial: '', value: '' };
@@ -865,10 +873,10 @@ export class TreeHcl extends TreeBase {
             // like attributes have endPosition from a different row)
             if (child.endPosition.row !== position.line)
                 continue;
-            if (child.endPosition.column <= position.column) {
+            if (child.endPosition.column <= position.character) {
                 afterColumn = child.endPosition.column;
             }
-            else if (nextChildColumn === null && child.startPosition.column > position.column) {
+            else if (nextChildColumn === null && child.startPosition.column > position.character) {
                 nextChildColumn = child.startPosition.column;
             }
         }
@@ -878,7 +886,7 @@ export class TreeHcl extends TreeBase {
             return { partial: '', value: '' };
         const line = lines[lineIndex];
         const startColumn = lineIndex === 0 ? errorNode.startPosition.column : 0;
-        const partial = line.slice(afterColumn - startColumn, position.column - startColumn);
+        const partial = line.slice(afterColumn - startColumn, position.character - startColumn);
         const valueEnd = nextChildColumn !== null ? nextChildColumn - startColumn : line.length;
         const value = line.slice(afterColumn - startColumn, valueEnd);
         return { partial, value };

package/src/lib/treesitter/json.js

@@ -11,7 +11,9 @@ export class TreeJson extends TreeBase {
         const node = this.getNodeAtPosition(uri, position);
         if (!node)
             return null;
-        const nodeBefore = position.column > 0 ? this.getNodeAtPosition(uri, { line: position.line, column: position.column - 1 }) : null;
+        const nodeBefore = position.character > 0
+            ? this.getNodeAtPosition(uri, { line: position.line, character: position.character - 1 })
+            : null;
         // Cursor right after closing quote — no completions
         if (this.#isCursorAfterClosingQuote(nodeBefore))
             return null;
@@ -36,8 +38,8 @@ export class TreeJson extends TreeBase {
         if (!node)
             return null;
         let statementObject = this.#findStatementObject(node);
-        if (!statementObject && position.column > 0) {
-            const nodeBefore = this.getNodeAtPosition(uri, { line: position.line, column: position.column - 1 });
+        if (!statementObject && position.character > 0) {
+            const nodeBefore = this.getNodeAtPosition(uri, { line: position.line, character: position.character - 1 });
             if (nodeBefore)
                 statementObject = this.#findStatementObject(nodeBefore);
         }
@@ -50,8 +52,8 @@ export class TreeJson extends TreeBase {
         if (!node)
             return [];
         let statementObject = this.#findStatementObject(node);
-        if (!statementObject && position.column > 0) {
-            const nodeBefore = this.getNodeAtPosition(uri, { line: position.line, column: position.column - 1 });
+        if (!statementObject && position.character > 0) {
+            const nodeBefore = this.getNodeAtPosition(uri, { line: position.line, character: position.character - 1 });
             if (nodeBefore)
                 statementObject = this.#findStatementObject(nodeBefore);
         }
@@ -178,8 +180,8 @@ export class TreeJson extends TreeBase {
         const valueNode = pair.namedChildren[1];
         if (!valueNode) {
             return {
-                start: { line: pair.endPosition.row, column: pair.endPosition.column },
-                end: { line: pair.endPosition.row, column: pair.endPosition.column },
+                start: { line: pair.endPosition.row, character: pair.endPosition.column },
+                end: { line: pair.endPosition.row, character: pair.endPosition.column },
             };
         }
         return nodeRange(valueNode);
@@ -247,8 +249,8 @@ export class TreeJson extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const { partial, value } = this.#extractPartialAndValue(cursorNode, position);
-        return { keys, role, partial, value };
+        const { partial, value, range } = this.#extractPartialAndValue(cursorNode, position);
+        return { keys, role, partial, value, range };
     }
     /**
      * Walk up from a node to find an object that sits inside a Statement array.
@@ -367,10 +369,11 @@ export class TreeJson extends TreeBase {
         while (current) {
             if (current.type === 'string_content') {
                 const value = current.text;
+                const range = nodeRange(current);
                 if (position.line === current.startPosition.row) {
-                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
+                    return { partial: value.slice(0, position.character - current.startPosition.column), value, range };
                 }
-                return { partial: value, value };
+                return { partial: value, value, range };
             }
             if (current.type === 'object' || current.type === 'pair')
                 break;

package/src/lib/treesitter/yaml.js

@@ -11,7 +11,9 @@ export class TreeYaml extends TreeBase {
         const node = this.getNodeAtPosition(uri, position);
         if (!node)
             return null;
-        const nodeBefore = position.column > 0 ? this.getNodeAtPosition(uri, { line: position.line, column: position.column - 1 }) : null;
+        const nodeBefore = position.character > 0
+            ? this.getNodeAtPosition(uri, { line: position.line, character: position.character - 1 })
+            : null;
         const root = this.getTree(uri)?.rootNode;
         if (!root)
             return null;
@@ -189,8 +191,8 @@ export class TreeYaml extends TreeBase {
         if (pair.namedChildren.length < 2) {
             // No value — zero-width range at key end
             return {
-                start: { line: pair.endPosition.row, column: pair.endPosition.column },
-                end: { line: pair.endPosition.row, column: pair.endPosition.column },
+                start: { line: pair.endPosition.row, character: pair.endPosition.column },
+                end: { line: pair.endPosition.row, character: pair.endPosition.column },
             };
         }
         return nodeRange(pair.namedChildren[1]);
@@ -236,10 +238,10 @@ export class TreeYaml extends TreeBase {
         let extendedMatch = null;
         for (const mapping of candidates) {
             const pastEnd = position.line > mapping.endPosition.row ||
-                (position.line === mapping.endPosition.row && position.column >= mapping.endPosition.column);
+                (position.line === mapping.endPosition.row && position.character >= mapping.endPosition.column);
             if (!pastEnd)
                 continue;
-            if (position.column < mapping.startPosition.column)
+            if (position.character < mapping.startPosition.column)
                 continue;
             // Don't extend across sibling statement items. If a sibling block_sequence_item
             // starts between this mapping's end and the cursor, the cursor is in a different statement.
@@ -284,12 +286,13 @@ export class TreeYaml extends TreeBase {
         const resolved = this.#resolveWithinMapping(statementMapping, position);
         if (!resolved)
             return null;
-        const { partial, value } = this.#extractPartialAndValue(cursorNode, position);
+        const { partial, value, range } = this.#extractPartialAndValue(cursorNode, position);
         return {
             keys: resolved.keys,
             role: resolved.role,
             partial,
             value,
+            range,
             policyFormat: 'standard',
         };
     }
@@ -413,7 +416,7 @@ export class TreeYaml extends TreeBase {
                 const keyColumn = ancestorMapping
                     ? ancestorMapping.startPosition.column
                     : statementMapping.startPosition.column;
-                if (position.column > keyColumn)
+                if (position.character > keyColumn)
                     return null;
             }
         }
@@ -443,7 +446,7 @@ export class TreeYaml extends TreeBase {
                 const pairOnLine = current.namedChildren.find((child) => child.type === 'block_mapping_pair' &&
                     child.startPosition.row === position.line &&
                     child.namedChildren.length === 1 &&
-                    position.column > child.endPosition.column);
+                    position.character > child.endPosition.column);
                 if (pairOnLine) {
                     const pairKey = this.#getPairKeyText(pairOnLine);
                     if (pairKey) {
@@ -457,7 +460,7 @@ export class TreeYaml extends TreeBase {
                 // When cursor lands on an inner block_mapping (not the statement mapping),
                 // check if the cursor is actually outside this mapping (column < key column).
                 // If so, skip it — the cursor belongs to a parent mapping level.
-                if (current.id !== statementMapping.id && position.column < current.startPosition.column) {
+                if (current.id !== statementMapping.id && position.character < current.startPosition.column) {
                     previous = current;
                     current = current.parent;
                     continue;
@@ -500,7 +503,7 @@ export class TreeYaml extends TreeBase {
                     // If the cursor column matches the parent mapping's key column, the user
                     // is typing a new sibling key, not editing this pair's value.
                     const parentMapping = current.parent;
-                    const isAtParentKeyColumn = parentMapping?.type === 'block_mapping' && position.column === parentMapping.startPosition.column;
+                    const isAtParentKeyColumn = parentMapping?.type === 'block_mapping' && position.character === parentMapping.startPosition.column;
                     if (isOnKey || isAtParentKeyColumn) {
                         role = 'key';
                     }
@@ -532,10 +535,10 @@ export class TreeYaml extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const { partial: extractedPartial, value: extractedValue } = this.#extractPartialAndValue(cursorNode, position);
+        const { partial: extractedPartial, value: extractedValue, range, } = this.#extractPartialAndValue(cursorNode, position);
         const partial = colonPartial || extractedPartial;
         const value = colonPartial ? colonPartial : extractedValue;
-        return { keys, role, partial, value };
+        return { keys, role, partial, value, range };
     }
     /**
      * Resolve the cursor's position within a block_mapping by finding the pair covering
@@ -543,9 +546,9 @@ export class TreeYaml extends TreeBase {
      */
     #resolveWithinMapping(mapping, position) {
         const keyColumn = mapping.startPosition.column;
-        if (position.column < keyColumn)
+        if (position.character < keyColumn)
             return null;
-        if (position.column === keyColumn)
+        if (position.character === keyColumn)
             return { keys: [], role: 'key' };
         let pairBeforeCursor = null;
         for (const child of mapping.namedChildren) {
@@ -582,7 +585,7 @@ export class TreeYaml extends TreeBase {
             const valueSequence = this.#findValueBlockSequence(pairBeforeCursor);
             if (valueSequence &&
                 position.line <= valueSequence.endPosition.row &&
-                position.column >= valueSequence.startPosition.column) {
+                position.character >= valueSequence.startPosition.column) {
                 return { keys: [pairKey], role: 'value' };
             }
             return null;
@@ -737,10 +740,10 @@ export class TreeYaml extends TreeBase {
         let current = node;
         while (current) {
             if (current.type === 'string_scalar') {
-                return this.#sliceToPositionAndValue(current.text, current.startPosition.column, position, node);
+                return this.#sliceToPositionAndValue(current.text, current.startPosition.column, position, node, current);
             }
             if (current.type === 'double_quote_scalar' || current.type === 'single_quote_scalar') {
-                return this.#sliceToPositionAndValue(current.text.slice(1, -1), current.startPosition.column + 1, position, node);
+                return this.#sliceToPositionAndValue(current.text.slice(1, -1), current.startPosition.column + 1, position, node, current);
             }
             if (current.type === 'block_mapping' || current.type === 'block_mapping_pair')
                 break;
@@ -748,11 +751,11 @@ export class TreeYaml extends TreeBase {
         }
         return { partial: '', value: '' };
     }
-    #sliceToPositionAndValue(text, startColumn, position, node) {
+    #sliceToPositionAndValue(text, startColumn, position, node, scalarNode) {
         if (position.line === node.startPosition.row) {
-            return { partial: text.slice(0, position.column - startColumn), value: text };
+            return { partial: text.slice(0, position.character - startColumn), value: text, range: nodeRange(scalarNode) };
         }
-        return { partial: text, value: text };
+        return { partial: text, value: text, range: nodeRange(scalarNode) };
     }
     /**
      * When tree-sitter produces a root-level ERROR (e.g., unterminated quote in
@@ -796,8 +799,8 @@ export class TreeYaml extends TreeBase {
                 if (!keyText)
                     continue;
                 // Cursor within the key text — still typing the key
-                if (position.column < child.endPosition.column) {
-                    const partial = keyText.slice(0, position.column - child.startPosition.column);
+                if (position.character < child.endPosition.column) {
+                    const partial = keyText.slice(0, position.character - child.startPosition.column);
                     return {
                         keys: [],
                         role: 'key',
@@ -807,7 +810,7 @@ export class TreeYaml extends TreeBase {
                     };
                 }
                 // Cursor at key end — key is complete but ":" hasn't been typed yet
-                if (position.column === child.endPosition.column) {
+                if (position.character === child.endPosition.column) {
                     return null;
                 }
                 return {
@@ -826,7 +829,7 @@ export class TreeYaml extends TreeBase {
                     continue;
                 const valueText = this.#getPairValueText(child) ?? '';
                 // If cursor is past the ERROR end (colon continuation), append ":"
-                const colonSuffix = errorNode.endPosition.row === position.line && position.column > errorNode.endPosition.column ? ':' : '';
+                const colonSuffix = errorNode.endPosition.row === position.line && position.character > errorNode.endPosition.column ? ':' : '';
                 const fullValue = valueText + colonSuffix;
                 return {
                     keys: [pairKey],
@@ -873,10 +876,10 @@ export class TreeYaml extends TreeBase {
         for (const child of errorNode.children) {
             if (child.startPosition.row !== position.line)
                 continue;
-            if (child.endPosition.column <= position.column) {
+            if (child.endPosition.column <= position.character) {
                 afterColumn = child.endPosition.column;
             }
-            else if (nextChildColumn === null && child.startPosition.column > position.column) {
+            else if (nextChildColumn === null && child.startPosition.column > position.character) {
                 nextChildColumn = child.startPosition.column;
             }
         }
@@ -887,7 +890,7 @@ export class TreeYaml extends TreeBase {
             return { partial: '', value: '' };
         const line = lines[lineIndex];
         const startColumn = lineIndex === 0 ? errorNode.startPosition.column : 0;
-        const partial = line.slice(afterColumn - startColumn, position.column - startColumn);
+        const partial = line.slice(afterColumn - startColumn, position.character - startColumn);
         const valueEnd = nextChildColumn !== null ? nextChildColumn - startColumn : line.length;
         const value = line.slice(afterColumn - startColumn, valueEnd);
         return { partial, value };