Diff Editor v2: Fixes sync update bug

hediet · hediet · commit b05c8e9f9ba4 · 2023-06-19T14:17:44.000+02:00
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffModel.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffModel.ts
@@ -74,7 +74,7 @@ export class DiffModel extends Disposable implements IDiffEditorViewModel {
 			}
 
 			const textEdits = TextEditInfo.fromModelContentChanges(e.changes);
-			const result = applyModifiedEdits(this._lastDiff!, textEdits, model.original, model.modified);
+			const result = applyOriginalEdits(this._lastDiff!, textEdits, model.original, model.modified);
 			if (result) {
 				this._lastDiff = result;
 				this._diff.set(DiffState.fromDiffResult(this._lastDiff), undefined);

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ export class DiffModel extends Disposable implements IDiffEditorViewModel {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`const textEdits = TextEditInfo.fromModelContentChanges(e.changes);`
`77`		`- const result = applyModifiedEdits(this._lastDiff!, textEdits, model.original, model.modified);`
	`77`	`+ const result = applyOriginalEdits(this._lastDiff!, textEdits, model.original, model.modified);`
`78`	`78`	`if (result) {`
`79`	`79`	`this._lastDiff = result;`
`80`	`80`	`this._diff.set(DiffState.fromDiffResult(this._lastDiff), undefined);`