resolve merge conflicts complete

Author: Calvinn Ng

core/autocomplete/completionProvider.ts

@@ -3,7 +3,7 @@ import OpenAI from "openai";
 import path from "path";
 import { v4 as uuidv4 } from "uuid";
 import { RangeInFileWithContents } from "../commands/util.js";
-import { ConfigHandler } from "../config/ConfigHandler.js";
+import { IConfigHandler } from "../config/IConfigHandler.js";
 import { TRIAL_FIM_MODEL } from "../config/onboarding.js";
 import { streamLines } from "../diff/util.js";
 import {
@@ -146,7 +146,7 @@ export class CompletionProvider {
   private static lastUUID: string | undefined = undefined;
 
   constructor(
-    private readonly configHandler: ConfigHandler,
+    private readonly configHandler: IConfigHandler,
     private readonly ide: IDE,
     private readonly getLlm: () => Promise<ILLM | undefined>,
     private readonly _onError: (e: any) => void,

core/config/handler.ts

@@ -368,6 +368,7 @@ async function intermediateToFinalConfig(
         }),
       )
     ).filter((x) => x !== undefined) as BaseLLM[];
+  }
 
   // Command model
   let commandModels: BaseLLM[] = [];
@@ -476,7 +477,6 @@ async function intermediateToFinalConfig(
     reranker: config.reranker as any,
   };
 }
-}
 
 function finalToBrowserConfig(
   final: ContinueConfig,

core/config/load.ts

@@ -13,69 +13,46 @@ export async function* streamDiff(
   oldLines: string[],
   newLines: LineStream,
 ): AsyncGenerator<DiffLine> {
+  const mutatedOldLines = [...oldLines]; // be careful
+
   // If one indentation mistake is made, others are likely. So we are more permissive about matching
   let seenIndentationMistake = false;
 
   let newLineResult = await newLines.next();
-
   while (oldLines.length > 0 && !newLineResult.done) {
-    const { matchIndex, isPerfectMatch, newLine } = matchLine(
+    const [matchIndex, isPerfectMatch, newLine] = matchLine(
       newLineResult.value,
       oldLines,
       seenIndentationMistake,
     );
-
     if (!seenIndentationMistake && newLineResult.value !== newLine) {
       seenIndentationMistake = true;
     }
 
-    let type: DiffLine["type"];
-
-    let isLineRemoval = false;
-    const isNewLine = matchIndex === -1;
-
-    if (isNewLine) {
-      type = "new";
+    if (matchIndex < 0) {
+      // Insert new line
+      yield { type: "new", line: newLine };
     } else {
       // Insert all deleted lines before match
       for (let i = 0; i < matchIndex; i++) {
         yield { type: "old", line: oldLines.shift()! };
       }
 
-      type = isPerfectMatch ? "same" : "old";
-    }
-
-    switch (type) {
-      case "new":
-        yield { type, line: newLine };
-        break;
-
-      case "same":
-        yield { type, line: oldLines.shift()! };
-        break;
-
-      case "old":
-        yield { type, line: oldLines.shift()! };
-
-        if (oldLines[0] !== newLine) {
-          yield { type: "new", line: newLine };
-        } else {
-          isLineRemoval = true;
-        }
-
-        break;
-
-      default:
-        console.error(`Error streaming diff, unrecognized diff type: ${type}`);
+      if (isPerfectMatch) {
+        // Same
+        yield { type: "same", line: oldLines.shift()! };
+      } else {
+        // Delete old line and insert the new
+        yield { type: "old", line: oldLines.shift()! };
+        yield { type: "new", line: newLine };
+      }
     }
 
-    if (!isLineRemoval) {
-      newLineResult = await newLines.next();
-    }
+    newLineResult = await newLines.next();
   }
 
   // Once at the edge, only one choice
-  if (newLineResult.done && oldLines.length > 0) {
+  if (newLineResult.done === true && oldLines.length > 0) {
     for (const oldLine of oldLines) {
       yield { type: "old", line: oldLine };
     }
@@ -87,4 +64,4 @@ export async function* streamDiff(
       yield { type: "new", line: newLine };
     }
   }
-}
+}