Fix handling BOM when user Rejects apply_diff (#3960)

avtc · web-flow · commit ad2ff932fa6e · 2025-05-25T09:14:54.000-04:00
Related issue is #1483, related pull request is #1500 - but it looks like it missed the revert of proposed diff case
diff --git a/src/integrations/editor/DiffViewProvider.ts b/src/integrations/editor/DiffViewProvider.ts
@@ -278,7 +278,7 @@ export class DiffViewProvider {
 				updatedDocument.positionAt(updatedDocument.getText().length),
 			)
 
-			edit.replace(updatedDocument.uri, fullRange, this.originalContent ?? "")
+			edit.replace(updatedDocument.uri, fullRange, this.stripAllBOMs(this.originalContent ?? ""))
 
 			// Apply the edit and save, since contents shouldnt have changed
 			// this won't show in local history unless of course the user made

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ export class DiffViewProvider {`
`278`	`278`	`updatedDocument.positionAt(updatedDocument.getText().length),`
`279`	`279`	`)`
`280`	`280`
`281`		`- edit.replace(updatedDocument.uri, fullRange, this.originalContent ?? "")`
	`281`	`+ edit.replace(updatedDocument.uri, fullRange, this.stripAllBOMs(this.originalContent ?? ""))`
`282`	`282`
`283`	`283`	`// Apply the edit and save, since contents shouldnt have changed`
`284`	`284`	`// this won't show in local history unless of course the user made`