Address PR review: rename files, move position calculation to quickfix

- Rename index.ts files to follow repo patterns:
  - code-actions/index.ts → code-actions/code-actions.ts
  - code-actions/quickfix/index.ts → quickfix/quickfix-providers.ts
- Move position calculation from validation to quickfix:
  - MissingInputsDiagnosticData now passes raw token ranges
  - Quickfix computes insertion position and indentation at code action time
  - detectIndentSize moved from validate.ts to validate-action-reference.ts

Author: rentziass

languageservice/src/code-actions/index.ts …service/src/code-actions/code-actions.tslanguageservice/src/code-actions/index.ts renamed to languageservice/src/code-actions/code-actions.ts languageservice/src/code-actions/index.ts renamed to languageservice/src/code-actions/code-actions.ts

@@ -1,7 +1,7 @@
 import {FeatureFlags} from "@actions/expressions";
 import {CodeAction, CodeActionKind, Diagnostic} from "vscode-languageserver-types";
 import {CodeActionContext, CodeActionProvider} from "./types.js";
-import {getQuickfixProviders} from "./quickfix/index.js";
+import {getQuickfixProviders} from "./quickfix/quickfix-providers.js";
 
 export interface CodeActionParams {
   uri: string;

languageservice/src/code-actions/quickfix/add-missing-inputs.ts

@@ -1,4 +1,4 @@
-import {CodeAction, TextEdit} from "vscode-languageserver-types";
+import {CodeAction, Position, TextEdit} from "vscode-languageserver-types";
 import {CodeActionProvider} from "../types.js";
 import {DiagnosticCode, MissingInputsDiagnosticData} from "../../validate-action-reference.js";
 
@@ -12,7 +12,7 @@ export const addMissingInputsProvider: CodeActionProvider = {
     }
 
     const edits = createInputEdits(data);
-    if (!edits) {
+    if (!edits || edits.length === 0) {
       return undefined;
     }
 
@@ -29,37 +29,77 @@ export const addMissingInputsProvider: CodeActionProvider = {
   }
 };
 
+/**
+ * Calculate insert position and indentation, then generate edits for missing inputs.
+ * Position calculation is done here in the quickfix rather than during validation.
+ */
 function createInputEdits(data: MissingInputsDiagnosticData): TextEdit[] {
-  const edits: TextEdit[] = [];
-
   const formatInputLines = (indent: string) =>
     data.missingInputs.map(input => {
       const value = input.default ?? '""';
       return `${indent}${input.name}: ${value}`;
     });
 
-  if (data.hasWithKey && data.withIndent !== undefined) {
-    // `with:` exists - use its indentation + 2 for inputs
-    const inputIndent = " ".repeat(data.withIndent + data.indentSize);
+  if (data.withInfo) {
+    // `with:` exists - calculate indentation from existing structure
+    const withIndent = data.withInfo.keyRange.start.column - 1; // 0-indexed
+    const indentSize = data.withInfo.firstChildColumn
+      ? data.withInfo.firstChildColumn - data.withInfo.keyRange.start.column
+      : data.indentSize;
+
+    const inputIndent = " ".repeat(withIndent + indentSize);
     const inputLines = formatInputLines(inputIndent);
 
-    edits.push({
-      range: {start: data.insertPosition, end: data.insertPosition},
-      newText: inputLines.map(line => line + "\n").join("")
-    });
+    // Calculate insert position
+    const insertPosition = calculateWithInsertPosition(data.withInfo);
+
+    return [
+      {
+        range: {start: insertPosition, end: insertPosition},
+        newText: inputLines.map(line => line + "\n").join("")
+      }
+    ];
   } else {
-    // No `with:` key - `with:` at step indentation, inputs at step indentation + 2
-    const withIndent = " ".repeat(data.stepIndent);
-    const inputIndent = " ".repeat(data.stepIndent + data.indentSize);
+    // No `with:` key - add `with:` at the same level as other step keys (e.g., "uses")
+    const firstKeyColumn = data.firstStepKeyColumn ?? data.stepRange.start.column;
+    const withKeyIndent = firstKeyColumn - 1; // 0-indexed (columns are 1-based)
+
+    const withIndent = " ".repeat(withKeyIndent);
+    const inputIndent = " ".repeat(withKeyIndent + data.indentSize);
     const inputLines = formatInputLines(inputIndent);
 
     const newText = `${withIndent}with:\n` + inputLines.map(line => `${line}\n`).join("");
 
-    edits.push({
-      range: {start: data.insertPosition, end: data.insertPosition},
-      newText
-    });
+    // Insert at end of step (before the line after the step ends)
+    const insertPosition: Position = {
+      line: data.stepRange.end.line - 1,
+      character: 0
+    };
+
+    return [
+      {
+        range: {start: insertPosition, end: insertPosition},
+        newText
+      }
+    ];
   }
+}
 
-  return edits;
+/**
+ * Calculate where to insert new inputs when `with:` already exists.
+ */
+function calculateWithInsertPosition(withInfo: NonNullable<MissingInputsDiagnosticData["withInfo"]>): Position {
+  if (withInfo.hasChildren) {
+    // Insert after the last child (at end of with: block)
+    return {
+      line: withInfo.valueRange.end.line - 1,
+      character: 0
+    };
+  } else {
+    // Empty with: block - insert on the next line after with:
+    return {
+      line: withInfo.keyRange.end.line,
+      character: 0
+    };
+  }
 }

…rvice/src/code-actions/quickfix/index.ts …e-actions/quickfix/quickfix-providers.tslanguageservice/src/code-actions/quickfix/index.ts renamed to languageservice/src/code-actions/quickfix/quickfix-providers.ts languageservice/src/code-actions/quickfix/index.ts renamed to languageservice/src/code-actions/quickfix/quickfix-providers.ts

@@ -4,7 +4,7 @@ import {TextEdit} from "vscode-languageserver-types";
 import {TextDocument} from "vscode-languageserver-textdocument";
 import {FeatureFlags} from "@actions/expressions";
 import {validate, ValidationConfig} from "../../validate.js";
-import {getCodeActions, CodeActionParams} from "../index.js";
+import {getCodeActions, CodeActionParams} from "../code-actions.js";
 
 // Marker pattern: # want "diagnostic message" fix="code-action-name"
 const MARKER_PATTERN = /#\s*want\s+"([^"]+)"(?:\s+fix="([^"]+)")?/;

languageservice/src/code-actions/tests/runner.ts

@@ -6,4 +6,4 @@ export {getInlayHints} from "./inlay-hints.js";
 export {Logger, LogLevel, registerLogger, setLogLevel} from "./log.js";
 export {validate, ValidationConfig, ActionsMetadataProvider} from "./validate.js";
 export {ValueProviderConfig, ValueProviderKind} from "./value-providers/config.js";
-export {getCodeActions, CodeActionParams} from "./code-actions/index.js";
+export {getCodeActions, CodeActionParams} from "./code-actions/code-actions.js";

languageservice/src/index.ts

@@ -257,20 +257,30 @@ jobs:
             owner: "actions",
             ref: "v1"
           },
-          hasWithKey: true,
-          indentSize: 2,
-          insertPosition: {
-            character: 0,
-            line: 9
-          },
           missingInputs: [
             {
               default: undefined,
               name: "path"
             }
           ],
-          stepIndent: 6,
-          withIndent: 6
+          stepRange: {
+            start: {line: 7, column: 7},
+            end: {line: 10, column: 1}
+          },
+          firstStepKeyColumn: 7,
+          indentSize: 2,
+          withInfo: {
+            keyRange: {
+              start: {line: 8, column: 7},
+              end: {line: 8, column: 11}
+            },
+            valueRange: {
+              start: {line: 9, column: 9},
+              end: {line: 10, column: 1}
+            },
+            hasChildren: true,
+            firstChildColumn: 9
+          }
         }
       }
     ]);
@@ -324,12 +334,6 @@ jobs:
             owner: "actions",
             ref: "v1"
           },
-          hasWithKey: true,
-          indentSize: 2,
-          insertPosition: {
-            character: 0,
-            line: 9
-          },
           missingInputs: [
             {
               default: undefined,
@@ -340,8 +344,24 @@ jobs:
               name: "key"
             }
           ],
-          stepIndent: 6,
-          withIndent: 6
+          stepRange: {
+            start: {line: 7, column: 7},
+            end: {line: 10, column: 1}
+          },
+          firstStepKeyColumn: 7,
+          indentSize: 2,
+          withInfo: {
+            keyRange: {
+              start: {line: 8, column: 7},
+              end: {line: 8, column: 11}
+            },
+            valueRange: {
+              start: {line: 9, column: 9},
+              end: {line: 10, column: 1}
+            },
+            hasChildren: true,
+            firstChildColumn: 9
+          }
         }
       }
     ]);
@@ -379,12 +399,6 @@ jobs:
             owner: "actions",
             ref: "v1"
           },
-          hasWithKey: false,
-          indentSize: 2,
-          insertPosition: {
-            character: 0,
-            line: 7
-          },
           missingInputs: [
             {
               default: undefined,
@@ -395,8 +409,12 @@ jobs:
               name: "key"
             }
           ],
-          stepIndent: 6,
-          withIndent: undefined
+          stepRange: {
+            start: {line: 7, column: 7},
+            end: {line: 8, column: 1}
+          },
+          firstStepKeyColumn: 7,
+          indentSize: 2
         }
       }
     ]);