aws-iam-language-server 0.0.8 → 0.0.10

package/src/lib/treesitter/yaml.js

@@ -150,11 +150,12 @@ export class TreeYaml extends TreeBase {
         const resolved = this.#resolveWithinMapping(statementMapping, position);
         if (!resolved)
             return null;
-        const partial = this.#extractPartial(cursorNode, position);
+        const { partial, value } = this.#extractPartialAndValue(cursorNode, position);
         return {
             keys: resolved.keys,
             role: resolved.role,
             partial,
+            value,
             policyFormat: 'standard',
         };
     }
@@ -194,7 +195,7 @@ export class TreeYaml extends TreeBase {
                     return {
                         keys: [],
                         role: 'key',
-                        partial: this.#extractPartial(node, position),
+                        ...this.#extractPartialAndValue(node, position),
                         policyFormat: 'standard',
                     };
                 }
@@ -203,7 +204,7 @@ export class TreeYaml extends TreeBase {
                 return {
                     keys: [],
                     role: 'key',
-                    partial: this.#extractPartial(node, position),
+                    ...this.#extractPartialAndValue(node, position),
                     policyFormat: 'standard',
                 };
             }
@@ -229,7 +230,7 @@ export class TreeYaml extends TreeBase {
                     return {
                         keys: [],
                         role: 'key',
-                        partial: this.#extractPartial(node, position),
+                        ...this.#extractPartialAndValue(node, position),
                         policyFormat: 'standard',
                     };
                 }
@@ -397,8 +398,10 @@ export class TreeYaml extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const partial = colonPartial || this.#extractPartial(cursorNode, position);
-        return { keys, role, partial };
+        const { partial: extractedPartial, value: extractedValue } = this.#extractPartialAndValue(cursorNode, position);
+        const partial = colonPartial || extractedPartial;
+        const value = colonPartial ? colonPartial : extractedValue;
+        return { keys, role, partial, value };
     }
     /**
      * Resolve the cursor's position within a block_mapping by finding the pair covering
@@ -593,29 +596,29 @@ export class TreeYaml extends TreeBase {
             .filter((key) => key !== null);
     }
     /**
-     * Extract the partial text the user has typed, from the nearest scalar node
-     * up to the cursor position.
+     * Extract the partial text (up to cursor) and full value from the nearest
+     * scalar node.
      */
-    #extractPartial(node, position) {
+    #extractPartialAndValue(node, position) {
         let current = node;
         while (current) {
             if (current.type === 'string_scalar') {
-                return this.#sliceToPosition(current.text, current.startPosition.column, position, node);
+                return this.#sliceToPositionAndValue(current.text, current.startPosition.column, position, node);
             }
             if (current.type === 'double_quote_scalar' || current.type === 'single_quote_scalar') {
-                return this.#sliceToPosition(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);
             }
             if (current.type === 'block_mapping' || current.type === 'block_mapping_pair')
                 break;
             current = current.parent;
         }
-        return '';
+        return { partial: '', value: '' };
     }
-    #sliceToPosition(text, startColumn, position, node) {
+    #sliceToPositionAndValue(text, startColumn, position, node) {
         if (position.line === node.startPosition.row) {
-            return text.slice(0, position.column - startColumn);
+            return { partial: text.slice(0, position.column - startColumn), value: text };
         }
-        return text;
+        return { partial: text, value: text };
     }
     /**
      * When tree-sitter produces a root-level ERROR (e.g., unterminated quote in
@@ -658,10 +661,26 @@ export class TreeYaml extends TreeBase {
                 const keyText = this.#getScalarText(child);
                 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);
+                    return {
+                        keys: [],
+                        role: 'key',
+                        partial,
+                        value: partial,
+                        policyFormat: 'standard',
+                    };
+                }
+                // Cursor at key end — key is complete but ":" hasn't been typed yet
+                if (position.column === child.endPosition.column) {
+                    return null;
+                }
                 return {
                     keys: [keyText],
                     role: 'value',
                     partial: '',
+                    value: '',
                     policyFormat: 'standard',
                 };
             }
@@ -674,10 +693,12 @@ export class TreeYaml extends TreeBase {
                 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 fullValue = valueText + colonSuffix;
                 return {
                     keys: [pairKey],
                     role: 'value',
-                    partial: valueText + colonSuffix,
+                    partial: fullValue,
+                    value: fullValue,
                     policyFormat: 'standard',
                 };
             }
@@ -693,39 +714,49 @@ export class TreeYaml extends TreeBase {
         // If we found a key before cursor line and the cursor is in its value area
         // (e.g., `Resource:\n  - !Sub "arn:` where the open quote breaks the parse)
         if (lastKey) {
-            const partial = this.#extractPartialFromErrorNode(errorNode, position);
+            const { partial, value } = this.#extractPartialAndValueFromErrorNode(errorNode, position);
             return {
                 keys: [lastKey],
                 role: 'value',
                 partial,
+                value,
                 policyFormat: 'standard',
             };
         }
         return null;
     }
     /**
-     * Extract the partial text from an ERROR node for the cursor line.
+     * Extract the partial text and full value from an ERROR node for the cursor line.
      * Scans ERROR children on the cursor line to find the last child before/at the
-     * cursor, then takes the substring from its end to the cursor column.
+     * cursor, then takes the substring from its end to the cursor column (partial)
+     * and to the next child or end of content (value).
      */
-    #extractPartialFromErrorNode(errorNode, position) {
-        // Find the rightmost child on the cursor line that ends at or before the cursor
+    #extractPartialAndValueFromErrorNode(errorNode, position) {
+        // Find the rightmost child on the cursor line that ends at or before the cursor,
+        // and the leftmost child that starts after the cursor
         let afterColumn = 0;
+        let nextChildColumn = null;
         for (const child of errorNode.children) {
             if (child.startPosition.row !== position.line)
                 continue;
             if (child.endPosition.column <= position.column) {
                 afterColumn = child.endPosition.column;
             }
+            else if (nextChildColumn === null && child.startPosition.column > position.column) {
+                nextChildColumn = child.startPosition.column;
+            }
         }
         // Extract from the ERROR node's text: find the cursor line and slice
         const lines = errorNode.text.split('\n');
         const lineIndex = position.line - errorNode.startPosition.row;
         if (lineIndex < 0 || lineIndex >= lines.length)
-            return '';
+            return { partial: '', value: '' };
         const line = lines[lineIndex];
         const startColumn = lineIndex === 0 ? errorNode.startPosition.column : 0;
-        return line.slice(afterColumn - startColumn, position.column - startColumn);
+        const partial = line.slice(afterColumn - startColumn, position.column - startColumn);
+        const valueEnd = nextChildColumn !== null ? nextChildColumn - startColumn : line.length;
+        const value = line.slice(afterColumn - startColumn, valueEnd);
+        return { partial, value };
     }
     #getPairValueText(pair) {
         const flowNodes = pair.namedChildren.filter((child) => child.type === 'flow_node');

package/src/server.js

@@ -2,12 +2,13 @@
 import { createConnection, ProposedFeatures, TextDocumentSyncKind, TextDocuments } from 'vscode-languageserver/node.js';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { handleCompletionRequest } from "./handlers/completion/index.js";
+import { documentLinkHandler } from "./handlers/document-link/document-link.js";
 import { TreeManager } from "./lib/treesitter/manager.js";
 const connection = createConnection(ProposedFeatures.all);
 const documents = new TextDocuments(TextDocument);
-const treeManager = new TreeManager();
+const treeManager = new TreeManager(connection);
 connection.onInitialize(async () => {
-    connection.console.log(`Starting the AWS IAM Policy Language Server`);
+    connection.console.log(`Started the AWS IAM Policy Language Server`);
     return {
         capabilities: {
             textDocumentSync: TextDocumentSyncKind.Full,
@@ -15,12 +16,14 @@ connection.onInitialize(async () => {
                 triggerCharacters: ['"', ':', '*'],
             },
             hoverProvider: false,
+            documentLinkProvider: {},
         },
     };
 });
 documents.onDidOpen(({ document }) => treeManager.openDocument(document.uri, document.getText(), document.languageId));
 documents.onDidChangeContent(({ document }) => treeManager.updateDocument(document.uri, document.getText()));
 documents.onDidClose(({ document }) => treeManager.closeDocument(document.uri));
-connection.onCompletion((params) => handleCompletionRequest(params, documents, treeManager));
+connection.onCompletion((params) => handleCompletionRequest(params, documents, treeManager, connection));
+connection.onDocumentLinks((params) => documentLinkHandler(params, documents, treeManager, connection));
 documents.listen(connection);
 connection.listen();