Fix indentSize detection for code actions after rebase

- Add indentSize to MissingInputsDiagnosticData interface
- Pass indentSize parameter from validate.ts to validateActionReference
- Detect indentSize from workflow structure (jobs key to first child)
- Fall back to detecting from with: block children when available

Author: rentziass

languageservice/src/validate-action-reference.ts

@@ -22,6 +22,8 @@ export interface MissingInputsDiagnosticData {
   // Indentation of the `with:` key if present, or the step's base indentation
   withIndent?: number;
   stepIndent: number;
+  // Indentation size (spaces per level)
+  indentSize: number;
   // Position where new content should be inserted
   insertPosition: {line: number; character: number};
 }
@@ -33,7 +35,8 @@ export async function validateActionReference(
   diagnostics: Diagnostic[],
   stepToken: TemplateToken,
   step: Step | undefined,
-  config: ValidationConfig | undefined
+  config: ValidationConfig | undefined,
+  indentSize: number = 2
 ): Promise<void> {
   if (!isMapping(stepToken) || !step || !isActionStep(step) || !config?.actionsMetadataProvider) {
     return;
@@ -116,6 +119,15 @@ export async function validateActionReference(
     const stepIndent = stepToken.range ? stepToken.range.start.column - 1 : 0; // 0-indexed
     const withIndent = withKey?.range ? withKey.range.start.column - 1 : undefined;
 
+    // Calculate actual indentSize from the first child of with: block, or use the provided default
+    let actualIndentSize = indentSize;
+    if (withToken && isMapping(withToken) && withToken.count > 0) {
+      const firstChild = withToken.get(0);
+      if (firstChild?.key.range && withKey?.range) {
+        actualIndentSize = firstChild.key.range.start.column - withKey.range.start.column;
+      }
+    }
+
     // Calculate insert position
     // For withToken, we need to handle empty mappings specially - insert after the with: line
     let insertPosition: {line: number; character: number};
@@ -146,6 +158,7 @@ export async function validateActionReference(
       hasWithKey: withKey !== undefined,
       withIndent,
       stepIndent,
+      indentSize: actualIndentSize,
       insertPosition
     };
 

languageservice/src/validate.ts

@@ -8,6 +8,7 @@ import {splitAllowedContext} from "@actions/workflow-parser/templates/allowed-co
 import {BasicExpressionToken} from "@actions/workflow-parser/templates/tokens/basic-expression-token";
 import {StringToken} from "@actions/workflow-parser/templates/tokens/string-token";
 import {TemplateToken} from "@actions/workflow-parser/templates/tokens/template-token";
+import {MappingToken} from "@actions/workflow-parser/templates/tokens/mapping-token";
 import {TokenRange} from "@actions/workflow-parser/templates/tokens/token-range";
 import {File} from "@actions/workflow-parser/workflows/file";
 import {FileProvider} from "@actions/workflow-parser/workflows/file-provider";
@@ -169,7 +170,8 @@ async function additionalValidations(
     // Validate action metadata (inputs, required fields) for regular steps
     if (token.definition?.key === "regular-step" && token.range) {
       const context = getProviderContext(documentUri, template, root, token.range);
-      await validateActionReference(diagnostics, token, context.step, config);
+      const indentSize = detectIndentSize(root as MappingToken);
+      await validateActionReference(diagnostics, token, context.step, config, indentSize);
     }
 
     // Validate job-level reusable workflow uses field format
@@ -823,4 +825,31 @@ function getStaticConcurrencyGroup(token: TemplateToken | undefined): StringToke
   return undefined;
 }
 
+/**
+ * Detects the indentation size used in the workflow file by examining the
+ * difference between the "jobs" key column and its first child's column.
+ */
+function detectIndentSize(rootToken: MappingToken): number {
+  // Find the "jobs" key in the root mapping to get its column position
+  let jobsKeyColumn: number | undefined;
+  let jobsValue: TemplateToken | undefined;
+
+  for (const {key, value} of rootToken) {
+    if (key.toString() === "jobs") {
+      jobsKeyColumn = key.range?.start.column;
+      jobsValue = value;
+      break;
+    }
+  }
+
+  if (jobsKeyColumn !== undefined && jobsValue && isMapping(jobsValue) && jobsValue.count > 0) {
+    const firstJob = jobsValue.get(0);
+    if (firstJob?.key.range) {
+      return firstJob.key.range.start.column - jobsKeyColumn;
+    }
+  }
+
+  return 2; // fallback
+}
+