Merge pull request #5272 from continuedev/nate/apply-fixes

Nate/apply-fixes

Author: sestinj

core/diff/myers.test.ts

@@ -41,4 +41,16 @@ describe("Test myers diff function", () => {
       { type: "same", line: "C" },
     ]);
   });
+
+  test("should ignore single-line whitespace-only differences", () => {
+    const linesA = "A\n    B\nC\n";
+    const linesB = "A\nB\nC";
+
+    const diffLines = myersDiff(linesA, linesB);
+    expect(diffLines).toEqual([
+      { type: "same", line: "A" },
+      { type: "same", line: "    B" },
+      { type: "same", line: "C" },
+    ]);
+  });
 });

core/diff/myers.ts

@@ -30,8 +30,21 @@ export function myersDiff(oldContent: string, newContent: string): DiffLine[] {
   const theirFormat = diffLines(oldContent, newContent, {
     ignoreNewlineAtEof: true,
   });
-  const ourFormat = theirFormat.flatMap(convertMyersChangeToDiffLines);
+  let ourFormat = theirFormat.flatMap(convertMyersChangeToDiffLines);
 
+  // Combine consecutive old/new pairs that are identical after trimming
+  for (let i = 0; i < ourFormat.length - 1; i++) {
+    if (
+      ourFormat[i]?.type === "old" &&
+      ourFormat[i + 1]?.type === "new" &&
+      ourFormat[i].line.trim() === ourFormat[i + 1].line.trim()
+    ) {
+      ourFormat[i] = { type: "same", line: ourFormat[i].line };
+      ourFormat.splice(i + 1, 1);
+    }
+  }
+
+  // Remove trailing empty old lines
   while (
     ourFormat.length > 0 &&
     ourFormat[ourFormat.length - 1].type === "old" &&

core/edit/streamDiffLines.ts

@@ -123,11 +123,13 @@ export async function* streamDiffLines({
 
   if (systemMessage) {
     if (typeof prompt === "string") {
+      // Removed system prompt because it was causing it to be used for Apply
+      // We should bring it back only for Edit
       prompt = [
-        {
-          role: "system",
-          content: systemMessage,
-        },
+        // {
+        //   role: "system",
+        //   content: systemMessage,
+        // },
         {
           role: "user",
           content: prompt,
@@ -138,10 +140,10 @@ export async function* streamDiffLines({
       if (curSysMsg) {
         curSysMsg.content = systemMessage + "\n\n" + curSysMsg.content;
       } else {
-        prompt.unshift({
-          role: "system",
-          content: systemMessage,
-        });
+        // prompt.unshift({
+        //   role: "system",
+        //   content: systemMessage,
+        // });
       }
     }
   }

core/llm/constructMessages.ts

@@ -20,9 +20,9 @@ export const DEFAULT_CHAT_SYSTEM_MESSAGE = `\
 
   When addressing code modification requests, present a concise code snippet that
   emphasizes only the necessary changes and uses abbreviated placeholders for
-  unmodified sections. For instance:
+  unmodified sections. For example:
 
-  \`\`\`typescript /path/to/file
+  \`\`\`language /path/to/file
   // ... rest of code here ...
 
   {{ modified code here }}
@@ -34,6 +34,22 @@ export const DEFAULT_CHAT_SYSTEM_MESSAGE = `\
   // ... rest of code here ...
   \`\`\`
 
+  In existing files, you should always restate the function or class that the snippet belongs to:
+
+  \`\`\`language /path/to/file
+  // ... rest of code here ...
+  
+  function exampleFunction() {
+    // ... rest of code here ...
+    
+    {{ modified code here }}
+    
+    // ... rest of code here ...
+  }
+  
+  // ... rest of code here ...
+  \`\`\`
+
   Since users have access to their complete file, they prefer reading only the
   relevant modifications. It's perfectly acceptable to omit unmodified portions
   at the beginning, middle, or end of files using these "lazy" comments. Only

core/llm/llms/OpenAI.ts

@@ -102,7 +102,12 @@ class OpenAI extends BaseLLM {
   }
 
   protected supportsPrediction(model: string): boolean {
-    const SUPPORTED_MODELS = ["gpt-4o-mini", "gpt-4o", "mistral-large"];
+    const SUPPORTED_MODELS = [
+      "gpt-4o-mini",
+      "gpt-4o",
+      "mistral-large",
+      "Fast-Apply",
+    ];
     return SUPPORTED_MODELS.some((m) => model.includes(m));
   }
 

core/llm/llms/Relace.ts

@@ -11,6 +11,10 @@ export class Relace extends OpenAI {
   };
   protected useOpenAIAdapterFor: (LlmApiRequestType | "*")[] = ["*"];
 
+  protected supportsPrediction(model: string): boolean {
+    return true;
+  }
+
   getConfigurationStatus() {
     if (!this.apiKey) {
       return LLMConfigurationStatuses.MISSING_API_KEY;