Browse Source

fix diffview for search-and-replace tool and insert tool

sam hoang 11 months ago
parent
commit
003bb5cabc
1 changed files with 4 additions and 10 deletions
  1. 4 10
      src/core/Cline.ts

+ 4 - 10
src/core/Cline.ts

@@ -1573,11 +1573,7 @@ export class Cline {
 								await delay(200)
 								await delay(200)
 							}
 							}
 
 
-							const diff = formatResponse.createPrettyPatch(
-								relPath,
-								this.diffViewProvider.originalContent,
-								updatedContent,
-							)
+							const diff = formatResponse.createPrettyPatch(relPath, fileContent, updatedContent)
 
 
 							if (!diff) {
 							if (!diff) {
 								pushToolResult(`No changes needed for '${relPath}'`)
 								pushToolResult(`No changes needed for '${relPath}'`)
@@ -1707,6 +1703,8 @@ export class Cline {
 
 
 								// Read the original file content
 								// Read the original file content
 								const fileContent = await fs.readFile(absolutePath, "utf-8")
 								const fileContent = await fs.readFile(absolutePath, "utf-8")
+								this.diffViewProvider.editType = "modify"
+								this.diffViewProvider.originalContent = fileContent
 								let lines = fileContent.split("\n")
 								let lines = fileContent.split("\n")
 
 
 								for (const op of parsedOperations) {
 								for (const op of parsedOperations) {
@@ -1745,11 +1743,7 @@ export class Cline {
 								this.consecutiveMistakeCount = 0
 								this.consecutiveMistakeCount = 0
 
 
 								// Show diff preview
 								// Show diff preview
-								const diff = formatResponse.createPrettyPatch(
-									relPath,
-									this.diffViewProvider.originalContent,
-									newContent,
-								)
+								const diff = formatResponse.createPrettyPatch(relPath, fileContent, newContent)
 
 
 								if (!diff) {
 								if (!diff) {
 									pushToolResult(`No changes needed for '${relPath}'`)
 									pushToolResult(`No changes needed for '${relPath}'`)