Adresses #211878 (#212677)

microsoft · May 14, 2024 · b2e6cd0 · b2e6cd0
1 parent 5dd248f
commit b2e6cd0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts b/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
@@ -487,7 +487,7 @@ async function mergeEditorCompare(viewModel: MergeEditorViewModel, editorService
 			},
 			revealIfOpened: true,
 			revealIfVisible: true,
-		} as ITextEditorOptions
+		} satisfies ITextEditorOptions
 	});
 }
 

diff --git a/src/vs/workbench/contrib/mergeEditor/browser/utils.ts b/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
@@ -103,7 +103,7 @@ export function setFields<T extends {}>(obj: T, fields: Partial<T>): T {
 }
 
 export function deepMerge<T extends {}>(source1: T, source2: Partial<T>): T {
-	const result = {} as T;
+	const result = {} as any as T;
 	for (const key in source1) {
 		result[key] = source1[key];
 	}