Another Go codegen fix after rebase

Author: SteveSandersonMS

scripts/codegen/go.ts

@@ -228,6 +228,8 @@ async function generateRpc(schemaPath?: string): Promise<void> {
     // Post-process quicktype output: fix enum constant names
     let qtCode = qtResult.lines.filter((l) => !l.startsWith("package ")).join("\n");
     qtCode = postProcessEnumConstants(qtCode);
+    // Strip trailing whitespace from quicktype output (gofmt requirement)
+    qtCode = qtCode.replace(/[ \t]+$/gm, "");
 
     // Extract actual type names generated by quicktype (may differ from toPascalCase)
     const actualTypeNames = new Map<string, string>();
@@ -241,22 +243,7 @@ async function generateRpc(schemaPath?: string): Promise<void> {
     // Extract field name mappings (quicktype may rename fields to avoid Go keyword conflicts)
     const fieldNames = extractFieldNames(qtCode);
 
-    // Build method wrappers
-    const lines: string[] = [];
-    lines.push(`// AUTO-GENERATED FILE - DO NOT EDIT`);
-    lines.push(`// Generated from: api.schema.json`);
-    lines.push(``);
-    lines.push(`package rpc`);
-    lines.push(``);
-    lines.push(`import (`);
-    lines.push(`\t"context"`);
-    lines.push(`\t"encoding/json"`);
-    lines.push(``);
-    lines.push(`\t"github.com/github/copilot-sdk/go/internal/jsonrpc2"`);
-    lines.push(`)`);
-    lines.push(``);
-
-    // Add quicktype-generated types (skip package line), annotating experimental types
+    // Annotate experimental data types
     const experimentalTypeNames = new Set<string>();
     for (const method of allMethods) {
         if (method.stability !== "experimental") continue;
@@ -266,9 +253,6 @@ async function generateRpc(schemaPath?: string): Promise<void> {
             experimentalTypeNames.add(baseName + "Params");
         }
     }
-    let qtCode = qtResult.lines.filter((l) => !l.startsWith("package ")).join("\n");
-    // Strip trailing whitespace from quicktype output (gofmt requirement)
-    qtCode = qtCode.replace(/[ \t]+$/gm, "");
     for (const typeName of experimentalTypeNames) {
         qtCode = qtCode.replace(
             new RegExp(`^(type ${typeName} struct)`, "m"),
@@ -277,6 +261,22 @@ async function generateRpc(schemaPath?: string): Promise<void> {
     }
     // Remove trailing blank lines from quicktype output before appending
     qtCode = qtCode.replace(/\n+$/, "");
+
+    // Build method wrappers
+    const lines: string[] = [];
+    lines.push(`// AUTO-GENERATED FILE - DO NOT EDIT`);
+    lines.push(`// Generated from: api.schema.json`);
+    lines.push(``);
+    lines.push(`package rpc`);
+    lines.push(``);
+    lines.push(`import (`);
+    lines.push(`\t"context"`);
+    lines.push(`\t"encoding/json"`);
+    lines.push(``);
+    lines.push(`\t"github.com/github/copilot-sdk/go/internal/jsonrpc2"`);
+    lines.push(`)`);
+    lines.push(``);
+
     lines.push(qtCode);
     lines.push(``);