Fix golden fixture failures in formatter and extract-literal refactor

Author: henrygarner

extensions/allium/src/format.ts

@@ -134,10 +134,13 @@ export function formatAlliumText(
 
     const isTopLevelDeclaration =
       indentLevel === 0 && isTopLevelDeclarationLine(trimmed);
+    const prevNonBlank = lastNonBlankLine(formattedLines);
     if (
       isTopLevelDeclaration &&
       formattedLines.length > 0 &&
-      blankLinesAtEnd(formattedLines) < topLevelSpacing
+      blankLinesAtEnd(formattedLines) < topLevelSpacing &&
+      prevNonBlank !== null &&
+      !prevNonBlank.trimStart().startsWith("--")
     ) {
       while (blankLinesAtEnd(formattedLines) < topLevelSpacing) {
         formattedLines.push("");
@@ -378,6 +381,15 @@ function wildcardToRegex(pattern: string): RegExp {
   return new RegExp(`^${escaped}$`);
 }
 
+function lastNonBlankLine(lines: string[]): string | null {
+  for (let i = lines.length - 1; i >= 0; i -= 1) {
+    if (lines[i] !== "") {
+      return lines[i];
+    }
+  }
+  return null;
+}
+
 function blankLinesAtEnd(lines: string[]): number {
   let count = 0;
   for (let i = lines.length - 1; i >= 0; i -= 1) {

extensions/allium/src/language-tools/extract-literal-refactor.ts

@@ -48,9 +48,10 @@ export function planExtractLiteralToConfig(
       text: `${configInsert.indent}${key}: ${typeName} = ${selected}\n`,
     });
   } else {
+    const insertOffset = findInsertAfterVersionMarker(text);
     edits.push({
-      startOffset: 0,
-      endOffset: 0,
+      startOffset: insertOffset,
+      endOffset: insertOffset,
       text: `config {\n    ${key}: ${typeName} = ${selected}\n}\n\n`,
     });
   }
@@ -198,6 +199,11 @@ function findMatchingBrace(text: string, openOffset: number): number {
   return -1;
 }
 
+function findInsertAfterVersionMarker(text: string): number {
+  const match = text.match(/^--\s*allium:\s*\d+[^\n]*\n/);
+  return match ? match[0].length : 0;
+}
+
 function escapeRegex(value: string): string {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }