aws-iam-language-server 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-iam-language-server",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "type": "module",
   "bin": "./src/server.js",
   "publisher": "MichaelBarney",

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

@@ -13,10 +13,14 @@ export function completeResourceValue(location, context) {
     const statementActions = statement?.Action ?? statement?.NotAction ?? [];
     const expandedActions = statementActions.flatMap(expandActionPattern);
     const resources = ServiceReference.getResourcesForActions(expandedActions);
+    const seenArns = new Set();
     for (const resource of resources) {
         for (const arn of resource.arnFormats) {
             if (location.partial && !arn.toLowerCase().startsWith(location.partial.toLowerCase()))
                 continue;
+            if (seenArns.has(arn))
+                continue;
+            seenArns.add(arn);
             items.push({
                 label: arn,
                 sortText: `0-${arn}`,
@@ -126,6 +130,7 @@ export function completeResourceValue(location, context) {
         const region = parts[3];
         const account = parts[4];
         const resources = ServiceReference.getResourcesForActions(expandActionPattern(`${service}:*`));
+        const seenLabels = new Set();
         for (const resource of resources) {
             for (const arn of resource.arnFormats) {
                 const patternParts = splitArn(arn);
@@ -141,6 +146,9 @@ export function completeResourceValue(location, context) {
                     .replace(`\${Account}`, parts[4]);
                 if (location.partial && !label.toLowerCase().startsWith(location.partial.toLowerCase()))
                     continue;
+                if (seenLabels.has(label))
+                    continue;
+                seenLabels.add(label);
                 items.push({
                     label,
                     kind: CompletionItemKind.Enum,

package/src/lib/treesitter/yaml.js

@@ -141,10 +141,13 @@ export class TreeYaml extends TreeBase {
         }
         return entries;
     }
+    #getPairValueNode(pair) {
+        return pair.namedChildren.find((child, i) => i > 0 && child.type !== 'comment') ?? null;
+    }
     #readPairStatementValues(pair) {
-        if (pair.namedChildren.length < 2)
+        const valueNode = this.#getPairValueNode(pair);
+        if (!valueNode)
             return [];
-        const valueNode = pair.namedChildren[1];
         // Direct flow_node scalar
         if (valueNode.type === 'flow_node') {
             return this.#flowNodeToStatementValue(valueNode);
@@ -188,14 +191,15 @@ export class TreeYaml extends TreeBase {
         return [{ text, range: nodeRange(flowNode) }];
     }
     #getPairValueRange(pair) {
-        if (pair.namedChildren.length < 2) {
+        const valueNode = this.#getPairValueNode(pair);
+        if (!valueNode) {
             // No value — zero-width range at key end
             return {
                 start: { line: pair.endPosition.row, character: pair.endPosition.column },
                 end: { line: pair.endPosition.row, character: pair.endPosition.column },
             };
         }
-        return nodeRange(pair.namedChildren[1]);
+        return nodeRange(valueNode);
     }
     /**
      * Traverse the tree from root, collecting every block_mapping that sits inside
@@ -608,9 +612,9 @@ export class TreeYaml extends TreeBase {
      * Find a block_mapping in a pair's value, unwrapping block_node if present.
      */
     #findValueBlockMapping(pair) {
-        if (pair.namedChildren.length < 2)
+        let value = this.#getPairValueNode(pair);
+        if (!value)
             return null;
-        let value = pair.namedChildren[1];
         if (value.type === 'block_node')
             value = value.namedChildren[0] ?? null;
         return value?.type === 'block_mapping' ? value : null;
@@ -619,9 +623,9 @@ export class TreeYaml extends TreeBase {
      * Find a block_sequence in a pair's value, unwrapping block_node if present.
      */
     #findValueBlockSequence(pair) {
-        if (pair.namedChildren.length < 2)
+        let value = this.#getPairValueNode(pair);
+        if (!value)
             return null;
-        let value = pair.namedChildren[1];
         if (value.type === 'block_node')
             value = value.namedChildren[0] ?? null;
         return value?.type === 'block_sequence' ? value : null;
@@ -984,9 +988,9 @@ export class TreeYaml extends TreeBase {
      * Read string values from a mapping pair's value (scalar, block sequence, or flow sequence).
      */
     #readPairStringValues(pair) {
-        if (pair.namedChildren.length < 2)
+        const valueNode = this.#getPairValueNode(pair);
+        if (!valueNode)
             return [];
-        const valueNode = pair.namedChildren[1];
         // Direct flow_node scalar
         if (valueNode.type === 'flow_node') {
             const text = this.#getScalarText(valueNode);