Fixes microsoft#185942 (microsoft#185979)

hediet · web-flow · commit 2354a3321468 · 2023-06-23T13:42:32.000+02:00
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts
@@ -39,10 +39,10 @@ export class DiffEditorEditors extends Disposable {
 		this.modified = this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor || {});
 
 		this._register(autorunHandleChanges('update editor options', {
-			createEmptyChangeSummary: () => ({}),
+			createEmptyChangeSummary: () => ({} as IDiffEditorConstructionOptions),
 			handleChange: (ctx, changeSummary) => {
 				if (ctx.didChange(_options.editorOptions)) {
-					Object.assign(changeSummary, ctx.change);
+					Object.assign(changeSummary, ctx.change.changedOptions);
 				}
 				return true;
 			}

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,10 @@ export class DiffEditorEditors extends Disposable {`
`39`	`39`	`this.modified = this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor \|\| {});`
`40`	`40`
`41`	`41`	`this._register(autorunHandleChanges('update editor options', {`
`42`		`- createEmptyChangeSummary: () => ({}),`
	`42`	`+ createEmptyChangeSummary: () => ({} as IDiffEditorConstructionOptions),`
`43`	`43`	`handleChange: (ctx, changeSummary) => {`
`44`	`44`	`if (ctx.didChange(_options.editorOptions)) {`
`45`		`- Object.assign(changeSummary, ctx.change);`
	`45`	`+ Object.assign(changeSummary, ctx.change.changedOptions);`
`46`	`46`	`}`
`47`	`47`	`return true;`
`48`	`48`	`}`