aws-iam-language-server 0.0.9 → 0.0.11

package/src/handlers/completion/action-value.js

@@ -1,29 +1,46 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
-export function completeActionValue(location, _context) {
-    const potentialLabels = ServiceReference.getAllActions();
+import { partialRange } from "./index.js";
+export function completeActionValue(location, context) {
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
-    for (const label of potentialLabels) {
-        if (location.partial && !label.toLowerCase().startsWith(location.partial.toLowerCase()))
-            continue;
-        const item = {
-            label,
-            kind: CompletionItemKind.Enum,
-        };
-        const [service, actionName] = label.split(':');
-        if (service && actionName) {
-            const action = ServiceReference.getAction(service, actionName);
-            if (action) {
+    const parts = location.partial.split(':');
+    if (parts.length === 1) {
+        // suggest services
+        const potentialServices = ServiceReference.getAllServices();
+        for (const service of potentialServices) {
+            if (!service.toLowerCase().startsWith(location.partial.toLowerCase()))
+                continue;
+            const item = {
+                label: service,
+                kind: CompletionItemKind.Enum,
+                textEdit: { range, newText: service },
+            };
+            items.push(item);
+        }
+    }
+    else if (parts.length === 2) {
+        // suggest actions
+        const serviceName = parts[0];
+        const potentialActions = ServiceReference.getActionsForService(serviceName);
+        for (const action of potentialActions) {
+            const label = `${action.service}:${action.name}`;
+            if (!label.toLowerCase().startsWith(location.partial.toLowerCase()))
+                continue;
+            const item = {
+                label,
+                kind: CompletionItemKind.Enum,
+                textEdit: { range, newText: label },
+            };
+            if (action.description) {
                 item.detail = action.description;
-                if (action.description) {
-                    item.documentation = {
-                        kind: MarkupKind.Markdown,
-                        value: formatActionDocumentation(action),
-                    };
-                }
+                item.documentation = {
+                    kind: MarkupKind.Markdown,
+                    value: formatActionDocumentation(action),
+                };
             }
+            items.push(item);
         }
-        items.push(item);
     }
     return { items, isIncomplete: false };
 }

package/src/handlers/completion/condition-block.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { ConditionBlockLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeConditionBlock(location: ConditionBlockLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/condition-block.js

@@ -1,4 +1,5 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
+import { partialRange } from "./index.js";
 const conditionBlockAttributes = {
     test: {
         description: 'The condition operator to evaluate (e.g., `StringEquals`, `ArnLike`, `IpAddress`).',
@@ -12,6 +13,7 @@ const conditionBlockAttributes = {
 };
 export function completeConditionBlock(location, context) {
     const siblingKeys = context.handler.getSiblingKeys(context.uri, context.position);
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [name, attr] of Object.entries(conditionBlockAttributes)) {
         if (siblingKeys.includes(name))
@@ -21,6 +23,7 @@ export function completeConditionBlock(location, context) {
         items.push({
             label: name,
             kind: CompletionItemKind.Field,
+            textEdit: { range, newText: name },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: attr.description,

package/src/handlers/completion/condition-key.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { ConditionKeyLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeConditionKey(location: ConditionKeyLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/condition-key.js

@@ -1,9 +1,11 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
 import { expandActionPattern } from "../../lib/iam-policy/wildcard.js";
+import { partialRange } from "./index.js";
 export function completeConditionKey(location, context) {
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const existingKeys = location.operator ? Object.keys(statement?.Condition?.[location.operator] ?? {}) : [];
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     const seen = new Set();
     // Build a lookup for global keys so we can enrich service-specific keys with descriptions
@@ -34,6 +36,7 @@ export function completeConditionKey(location, context) {
             items.push({
                 label: key.name,
                 kind: CompletionItemKind.Property,
+                textEdit: { range, newText: key.name },
                 documentation: {
                     kind: MarkupKind.Markdown,
                     value: formatDocumentation(key.types, global, conditionKeyData),
@@ -53,6 +56,7 @@ export function completeConditionKey(location, context) {
         items.push({
             label: global.name,
             kind: CompletionItemKind.Property,
+            textEdit: { range, newText: global.name },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: formatDocumentation([], global),

package/src/handlers/completion/condition-operator.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { ConditionOperatorLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeConditionOperator(location: ConditionOperatorLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/condition-operator.js

@@ -1,8 +1,10 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
 import { conditionOperators } from "../../lib/iam-policy/condition-operators.js";
+import { partialRange } from "./index.js";
 export function completeConditionOperator(location, context) {
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const existingOperators = Object.keys(statement?.Condition ?? {});
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [name, operator] of Object.entries(conditionOperators)) {
         if (existingOperators.includes(name))
@@ -12,6 +14,7 @@ export function completeConditionOperator(location, context) {
         items.push({
             label: name,
             kind: CompletionItemKind.Operator,
+            textEdit: { range, newText: name },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: operator.description,

package/src/handlers/completion/effect-value.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { EffectValueLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
-export declare function completeEffectValue(location: EffectValueLocation, _context: CompletionContext): CompletionList;
+import { type CompletionContext } from './index.ts';
+export declare function completeEffectValue(location: EffectValueLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/effect-value.js

@@ -1,6 +1,8 @@
 import { CompletionItemKind } from 'vscode-languageserver';
-export function completeEffectValue(location, _context) {
+import { partialRange } from "./index.js";
+export function completeEffectValue(location, context) {
     const potentialLabels = ['Allow', 'Deny'];
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const label of potentialLabels) {
         if (location.partial && !label.toLowerCase().startsWith(location.partial.toLowerCase()))
@@ -8,6 +10,7 @@ export function completeEffectValue(location, _context) {
         items.push({
             label,
             kind: CompletionItemKind.Enum,
+            textEdit: { range, newText: label },
         });
     }
     return { items, isIncomplete: false };

package/src/handlers/completion/index.d.ts

@@ -1,4 +1,4 @@
-import type { CompletionList, CompletionParams } from 'vscode-languageserver';
+import type { CompletionList, CompletionParams, Connection } from 'vscode-languageserver';
 import type { TextDocuments } from 'vscode-languageserver/node.js';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { TreeBase } from '../../lib/treesitter/base.ts';
@@ -11,4 +11,17 @@ export type CompletionContext = {
         column: number;
     };
 };
-export declare function handleCompletionRequest(params: CompletionParams, _documents: TextDocuments<TextDocument>, treeManager: TreeManager): Promise<CompletionList>;
+export declare function partialRange(position: {
+    line: number;
+    column: number;
+}, partialLength: number): {
+    start: {
+        line: number;
+        character: number;
+    };
+    end: {
+        line: number;
+        character: number;
+    };
+};
+export declare function handleCompletionRequest(params: CompletionParams, _documents: TextDocuments<TextDocument>, treeManager: TreeManager, connection: Connection): Promise<CompletionList>;

package/src/handlers/completion/index.js

@@ -15,7 +15,13 @@ import { completeResourceValue } from "./resource-value.js";
 import { completeStatementBlock } from "./statement-block.js";
 import { completeStatementKey } from "./statement-key.js";
 const emptyResult = { items: [], isIncomplete: false };
-export async function handleCompletionRequest(params, _documents, treeManager) {
+export function partialRange(position, partialLength) {
+    return {
+        start: { line: position.line, character: position.column - partialLength },
+        end: { line: position.line, character: position.column },
+    };
+}
+export async function handleCompletionRequest(params, _documents, treeManager, connection) {
     const handler = treeManager.getLanguageHandler(params.textDocument.uri);
     if (!handler)
         return emptyResult;
@@ -24,12 +30,19 @@ export async function handleCompletionRequest(params, _documents, treeManager) {
     if (!cursorContext)
         return emptyResult;
     const location = resolvePolicyLocation(cursorContext);
+    connection.console.debug(`Completion debug: ${JSON.stringify({
+        uri: params.textDocument.uri,
+        cursorContext,
+        location,
+        position: params.position,
+    })}`);
     const result = handleLocationCompletion(location, {
         handler,
         uri: params.textDocument.uri,
         position,
     });
     result.items = result.items.map(toSnippet);
+    connection.console.debug(`Found ${result.items.length} completion items for ${params.textDocument.uri} at line ${position.line}, column ${position.column}`);
     return result;
 }
 function handleLocationCompletion(location, context) {
@@ -78,7 +91,7 @@ function handleLocationCompletion(location, context) {
     return emptyResult;
 }
 function toSnippet(item) {
-    const text = item.insertText ?? item.label;
+    const text = item.textEdit && 'range' in item.textEdit ? item.textEdit.newText : (item.insertText ?? item.label);
     const snippetPlaceholderPattern = /\$\{([^}]+)\}/g;
     if (!snippetPlaceholderPattern.test(text))
         return item;
@@ -90,7 +103,12 @@ function toSnippet(item) {
         }
         return `\${${seen.get(name)}:${name}}`;
     });
-    item.insertText = snippetText;
+    if (item.textEdit && 'range' in item.textEdit) {
+        item.textEdit.newText = snippetText;
+    }
+    else {
+        item.insertText = snippetText;
+    }
     item.insertTextFormat = InsertTextFormat.Snippet;
     return item;
 }

package/src/handlers/completion/principal-block-identifier.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { PrincipalBlockIdentifierLocation } from '../../lib/iam-policy/location.ts';
 import type { CompletionContext } from './index.ts';
-export declare function completePrincipalBlockIdentifier(location: PrincipalBlockIdentifierLocation, _context: CompletionContext): CompletionList;
+export declare function completePrincipalBlockIdentifier(location: PrincipalBlockIdentifierLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/principal-block-identifier.js

@@ -1,4 +1,4 @@
 import { completePrincipalIdentifier } from "./principal-identifier-completions.js";
-export function completePrincipalBlockIdentifier(location, _context) {
-    return completePrincipalIdentifier(location.principalType, location.partial);
+export function completePrincipalBlockIdentifier(location, context) {
+    return completePrincipalIdentifier(location.principalType, location.partial, context.position);
 }

package/src/handlers/completion/principal-block-type.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { PrincipalBlockTypeLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
-export declare function completePrincipalBlockType(location: PrincipalBlockTypeLocation, _context: CompletionContext): CompletionList;
+import { type CompletionContext } from './index.ts';
+export declare function completePrincipalBlockType(location: PrincipalBlockTypeLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/principal-block-type.js

@@ -1,6 +1,8 @@
 import { CompletionItemKind } from 'vscode-languageserver';
 import { principalTypes } from "../../lib/iam-policy/principals.js";
-export function completePrincipalBlockType(location, _context) {
+import { partialRange } from "./index.js";
+export function completePrincipalBlockType(location, context) {
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [_id, principalType] of Object.entries(Object.assign({}, principalTypes, {
         '*': {
@@ -14,6 +16,7 @@ export function completePrincipalBlockType(location, _context) {
         items.push({
             label: principalType.value,
             kind: CompletionItemKind.Enum,
+            textEdit: { range, newText: principalType.value },
             documentation: {
                 kind: 'markdown',
                 value: principalType.description,

package/src/handlers/completion/principal-block.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { PrincipalBlockLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completePrincipalBlock(location: PrincipalBlockLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/principal-block.js

@@ -1,4 +1,5 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
+import { partialRange } from "./index.js";
 const principalBlockAttributes = {
     type: {
         description: 'The type of principal. Valid values: `*`, `AWS`, `Service`, `Federated`, `CanonicalUser`.',
@@ -9,6 +10,7 @@ const principalBlockAttributes = {
 };
 export function completePrincipalBlock(location, context) {
     const siblingKeys = context.handler.getSiblingKeys(context.uri, context.position);
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [name, attr] of Object.entries(principalBlockAttributes)) {
         if (siblingKeys.includes(name))
@@ -18,6 +20,7 @@ export function completePrincipalBlock(location, context) {
         items.push({
             label: name,
             kind: CompletionItemKind.Field,
+            textEdit: { range, newText: name },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: attr.description,

package/src/handlers/completion/principal-identifier-completions.d.ts

@@ -1,2 +1,5 @@
 import type { CompletionList } from 'vscode-languageserver';
-export declare function completePrincipalIdentifier(principalType: string | null, partial: string): CompletionList;
+export declare function completePrincipalIdentifier(principalType: string | null, partial: string, position: {
+    line: number;
+    column: number;
+}): CompletionList;

package/src/handlers/completion/principal-identifier-completions.js

@@ -1,6 +1,7 @@
 import { CompletionItemKind } from 'vscode-languageserver';
 import { partitions } from "../../lib/iam-policy/partitions.js";
 import { principalTypes } from "../../lib/iam-policy/principals.js";
+import { partialRange } from "./index.js";
 const PARTITION_PLACEHOLDER = `\${Partition}`;
 const REGION_PLACEHOLDER = `\${Region}`;
 const ACCOUNT_PLACEHOLDER = `\${Account}`;
@@ -24,27 +25,28 @@ function getPatternsForType(principalType) {
             return null;
     }
 }
-export function completePrincipalIdentifier(principalType, partial) {
+export function completePrincipalIdentifier(principalType, partial, position) {
     if (!principalType)
         return { items: [], isIncomplete: false };
     const config = getPatternsForType(principalType);
     if (!config)
         return { items: [], isIncomplete: false };
+    const range = partialRange(position, partial.length);
     const items = [];
     if (!partial) {
         for (const pattern of [...config.nonArn, ...config.arn]) {
-            items.push({ label: pattern, kind: CompletionItemKind.Value });
+            items.push({ label: pattern, kind: CompletionItemKind.Value, textEdit: { range, newText: pattern } });
         }
         return { items, isIncomplete: false };
     }
     const parts = partial.split(':');
     if (parts.length === 1) {
         if (config.arn.length > 0 && 'arn'.startsWith(partial.toLowerCase())) {
-            items.push({ label: 'arn', kind: CompletionItemKind.Constant });
+            items.push({ label: 'arn', kind: CompletionItemKind.Constant, textEdit: { range, newText: 'arn' } });
         }
         for (const pattern of config.nonArn) {
             if (pattern.toLowerCase().startsWith(partial.toLowerCase())) {
-                items.push({ label: pattern, kind: CompletionItemKind.Value });
+                items.push({ label: pattern, kind: CompletionItemKind.Value, textEdit: { range, newText: pattern } });
             }
         }
     }
@@ -97,9 +99,11 @@ export function completePrincipalIdentifier(principalType, partial) {
         }
     }
     else if (parts.length === 5) {
+        const label = `${partial}:`;
         items.push({
-            label: `${partial}:`,
+            label,
             kind: CompletionItemKind.Enum,
+            textEdit: { range, newText: label },
             documentation: { kind: 'markdown', value: 'AWS Account ID' },
         });
     }
@@ -124,7 +128,7 @@ export function completePrincipalIdentifier(principalType, partial) {
                 .replace(ACCOUNT_PLACEHOLDER, account);
             if (!label.toLowerCase().startsWith(partial.toLowerCase()))
                 continue;
-            items.push({ label, kind: CompletionItemKind.Value });
+            items.push({ label, kind: CompletionItemKind.Value, textEdit: { range, newText: label } });
         }
     }
     return { items, isIncomplete: false };

package/src/handlers/completion/principal-type.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { PrincipalTypeLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completePrincipalType(location: PrincipalTypeLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/principal-type.js

@@ -1,9 +1,11 @@
 import { CompletionItemKind } from 'vscode-languageserver';
 import { principalTypes } from "../../lib/iam-policy/principals.js";
+import { partialRange } from "./index.js";
 export function completePrincipalType(location, context) {
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const principal = statement?.Principal ?? statement?.NotPrincipal;
     const existingTypes = principal && typeof principal === 'object' ? Object.keys(principal) : [];
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [_id, principalType] of Object.entries(principalTypes)) {
         if (existingTypes.includes(principalType.value))
@@ -13,6 +15,7 @@ export function completePrincipalType(location, context) {
         items.push({
             label: principalType.value,
             kind: CompletionItemKind.Enum,
+            textEdit: { range, newText: principalType.value },
             documentation: {
                 kind: 'markdown',
                 value: principalType.description,

package/src/handlers/completion/principal-typed-value.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { PrincipalTypedValueLocation } from '../../lib/iam-policy/location.ts';
 import type { CompletionContext } from './index.ts';
-export declare function completePrincipalTypedValue(location: PrincipalTypedValueLocation, _context: CompletionContext): CompletionList;
+export declare function completePrincipalTypedValue(location: PrincipalTypedValueLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/principal-typed-value.js

@@ -1,4 +1,4 @@
 import { completePrincipalIdentifier } from "./principal-identifier-completions.js";
-export function completePrincipalTypedValue(location, _context) {
-    return completePrincipalIdentifier(location.principalType, location.partial);
+export function completePrincipalTypedValue(location, context) {
+    return completePrincipalIdentifier(location.principalType, location.partial, context.position);
 }

package/src/handlers/completion/principal-value.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { PrincipalValueLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
-export declare function completePrincipalValue(location: PrincipalValueLocation, _context: CompletionContext): CompletionList;
+import { type CompletionContext } from './index.ts';
+export declare function completePrincipalValue(location: PrincipalValueLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/principal-value.js

@@ -1,6 +1,8 @@
 import { CompletionItemKind } from 'vscode-languageserver';
-export function completePrincipalValue(location, _context) {
+import { partialRange } from "./index.js";
+export function completePrincipalValue(location, context) {
     const potentialLabels = ['*'];
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const label of potentialLabels) {
         if (location.partial && !label.toLowerCase().startsWith(location.partial.toLowerCase()))
@@ -8,6 +10,7 @@ export function completePrincipalValue(location, _context) {
         items.push({
             label,
             kind: CompletionItemKind.Enum,
+            textEdit: { range, newText: label },
             documentation: {
                 kind: 'markdown',
                 value: 'Public Unauthenticated Access',

package/src/handlers/completion/resource-value.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { ResourceValueLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeResourceValue(location: ResourceValueLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/resource-value.js

@@ -2,8 +2,10 @@ import { CompletionItemKind } from 'vscode-languageserver';
 import { partitions } from "../../lib/iam-policy/partitions.js";
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
 import { expandActionPattern } from "../../lib/iam-policy/wildcard.js";
+import { partialRange } from "./index.js";
 export function completeResourceValue(location, context) {
     const parts = location.partial.split(':');
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const statementActions = statement?.Action ?? statement?.NotAction ?? [];
@@ -16,6 +18,7 @@ export function completeResourceValue(location, context) {
             label: arn,
             sortText: `0-${arn}`,
             kind: CompletionItemKind.Value,
+            textEdit: { range, newText: arn },
             detail: `${resource.service}/${resource.name}`,
             documentation: {
                 kind: 'markdown',
@@ -30,6 +33,7 @@ export function completeResourceValue(location, context) {
             items.push({
                 label,
                 kind: CompletionItemKind.Constant,
+                textEdit: { range, newText: label },
             });
         }
     }
@@ -100,9 +104,11 @@ export function completeResourceValue(location, context) {
     }
     else if (parts.length === 5) {
         // suggest account
+        const label = `${location.partial}:`;
         items.push({
-            label: `${location.partial}:`,
+            label,
             kind: CompletionItemKind.Enum,
+            textEdit: { range, newText: label },
             documentation: {
                 kind: 'markdown',
                 value: 'AWS Account ID',
@@ -132,6 +138,7 @@ export function completeResourceValue(location, context) {
             items.push({
                 label,
                 kind: CompletionItemKind.Enum,
+                textEdit: { range, newText: label },
                 detail: resource.name,
                 documentation: {
                     kind: 'markdown',

package/src/handlers/completion/statement-block.d.ts

@@ -1,6 +1,6 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { StatementBlockLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeStatementBlock(location: StatementBlockLocation, context: CompletionContext): CompletionList;
 export declare function findHclElement(key: string): {
     policyTypes: Array<"identity" | "resource">;

package/src/handlers/completion/statement-block.js

@@ -1,5 +1,6 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
 import { StatementKeys } from "../../lib/iam-policy/statement-keys.js";
+import { partialRange } from "./index.js";
 export function completeStatementBlock(location, context) {
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const existingKeys = deriveExistingKeys(statement);
@@ -9,6 +10,7 @@ export function completeStatementBlock(location, context) {
         if (element)
             existingGroups.add(element.group);
     }
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [, element] of Object.entries(StatementKeys)) {
         if (existingKeys.includes(element.hclKey))
@@ -20,6 +22,7 @@ export function completeStatementBlock(location, context) {
         items.push({
             label: element.hclKey,
             kind: CompletionItemKind.Field,
+            textEdit: { range, newText: element.hclKey },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: element.description,

package/src/handlers/completion/statement-key.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { StatementKeyLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeStatementKey(location: StatementKeyLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/statement-key.js

@@ -1,5 +1,6 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
 import { StatementKeys } from "../../lib/iam-policy/statement-keys.js";
+import { partialRange } from "./index.js";
 export function completeStatementKey(location, context) {
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const existingKeys = deriveExistingKeys(statement);
@@ -9,6 +10,7 @@ export function completeStatementKey(location, context) {
         if (element)
             existingGroups.add(element.group);
     }
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [name, element] of Object.entries(StatementKeys)) {
         if (existingKeys.includes(name))
@@ -20,6 +22,7 @@ export function completeStatementKey(location, context) {
         items.push({
             label: name,
             kind: CompletionItemKind.Field,
+            textEdit: { range, newText: name },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: element.description,

package/src/handlers/diagnostics/action.d.ts

@@ -0,0 +1,6 @@
+import type { Diagnostic } from 'vscode-languageclient';
+import type { StatementEntry } from '../../lib/treesitter/base.ts';
+import { ElementValidator } from './base.ts';
+export declare class ActionValidator extends ElementValidator {
+    validate(entry: StatementEntry): Array<Diagnostic>;
+}

package/src/handlers/diagnostics/action.js

@@ -0,0 +1,14 @@
+import { expandActionPattern } from "../../lib/iam-policy/wildcard.js";
+import { ElementValidator } from "./base.js";
+import { createDiagnostic } from "./utils.js";
+export class ActionValidator extends ElementValidator {
+    validate(entry) {
+        const diagnostics = super.validate(entry);
+        for (const value of entry.values) {
+            if (expandActionPattern(value.text).length === 0) {
+                diagnostics.push(createDiagnostic(`Unrecognized action "${value.text}"`, value.range));
+            }
+        }
+        return diagnostics;
+    }
+}

package/src/handlers/diagnostics/base.d.ts

@@ -0,0 +1,9 @@
+import type { Diagnostic } from 'vscode-languageclient';
+import type { StatementEntry } from '../../lib/treesitter/base.ts';
+export declare class ElementValidator {
+    #private;
+    constructor();
+    validate(entry: StatementEntry): Array<Diagnostic>;
+    isValidated(): boolean;
+    resetForStatement(): void;
+}