Fixes microsoft#191892

Author: hediet

src/vs/editor/common/config/diffEditor.ts

@@ -5,7 +5,7 @@
 
 import { ValidDiffEditorBaseOptions } from 'vs/editor/common/config/editorOptions';
 
-export const diffEditorDefaultOptions: ValidDiffEditorBaseOptions = {
+export const diffEditorDefaultOptions = {
 	enableSplitViewResizing: true,
 	splitViewDefaultRatio: 0.5,
 	renderSideBySide: true,
@@ -34,4 +34,4 @@ export const diffEditorDefaultOptions: ValidDiffEditorBaseOptions = {
 	onlyShowAccessibleDiffViewer: false,
 	renderSideBySideInlineBreakpoint: 900,
 	useInlineViewWhenSpaceIsLimited: true,
-};
+} satisfies ValidDiffEditorBaseOptions;

src/vs/editor/common/config/editorConfigurationSchema.ts

@@ -151,53 +151,53 @@ const editorConfiguration: IConfigurationNode = {
 		},
 		'diffEditor.maxComputationTime': {
 			type: 'number',
-			default: 5000,
+			default: diffEditorDefaultOptions.maxComputationTime,
 			description: nls.localize('maxComputationTime', "Timeout in milliseconds after which diff computation is cancelled. Use 0 for no timeout.")
 		},
 		'diffEditor.maxFileSize': {
 			type: 'number',
-			default: 50,
+			default: diffEditorDefaultOptions.maxFileSize,
 			description: nls.localize('maxFileSize', "Maximum file size in MB for which to compute diffs. Use 0 for no limit.")
 		},
 		'diffEditor.renderSideBySide': {
 			type: 'boolean',
-			default: true,
+			default: diffEditorDefaultOptions.renderSideBySide,
 			description: nls.localize('sideBySide', "Controls whether the diff editor shows the diff side by side or inline.")
 		},
 		'diffEditor.renderSideBySideInlineBreakpoint': {
 			type: 'number',
-			default: true,
+			default: diffEditorDefaultOptions.renderSideBySideInlineBreakpoint,
 			description: nls.localize('renderSideBySideInlineBreakpoint', "If the diff editor width is smaller than this value, the inline view is used.")
 		},
 		'diffEditor.useInlineViewWhenSpaceIsLimited': {
 			type: 'boolean',
-			default: true,
+			default: diffEditorDefaultOptions.useInlineViewWhenSpaceIsLimited,
 			description: nls.localize('useInlineViewWhenSpaceIsLimited', "If enabled and the editor width is too small, the inline view is used.")
 		},
 		'diffEditor.renderMarginRevertIcon': {
 			type: 'boolean',
-			default: true,
+			default: diffEditorDefaultOptions.renderMarginRevertIcon,
 			description: nls.localize('renderMarginRevertIcon', "When enabled, the diff editor shows arrows in its glyph margin to revert changes.")
 		},
 		'diffEditor.ignoreTrimWhitespace': {
 			type: 'boolean',
-			default: true,
+			default: diffEditorDefaultOptions.ignoreTrimWhitespace,
 			description: nls.localize('ignoreTrimWhitespace', "When enabled, the diff editor ignores changes in leading or trailing whitespace.")
 		},
 		'diffEditor.renderIndicators': {
 			type: 'boolean',
-			default: true,
+			default: diffEditorDefaultOptions.renderIndicators,
 			description: nls.localize('renderIndicators', "Controls whether the diff editor shows +/- indicators for added/removed changes.")
 		},
 		'diffEditor.codeLens': {
 			type: 'boolean',
-			default: false,
+			default: diffEditorDefaultOptions.diffCodeLens,
 			description: nls.localize('codeLens', "Controls whether the editor shows CodeLens.")
 		},
 		'diffEditor.wordWrap': {
 			type: 'string',
 			enum: ['off', 'on', 'inherit'],
-			default: 'inherit',
+			default: diffEditorDefaultOptions.diffWordWrap,
 			markdownEnumDescriptions: [
 				nls.localize('wordWrap.off', "Lines will never wrap."),
 				nls.localize('wordWrap.on', "Lines will wrap at the viewport width."),
@@ -239,7 +239,7 @@ const editorConfiguration: IConfigurationNode = {
 		},
 		'diffEditor.experimental.showMoves': {
 			type: 'boolean',
-			default: false,
+			default: diffEditorDefaultOptions.experimental.showMoves,
 			markdownDescription: nls.localize('showMoves', "Controls whether the diff editor should show detected code moves. Only works when {0} is set.", '`#diffEditor.experimental.useVersion2#`')
 		},
 		'diffEditor.experimental.useVersion2': {
@@ -250,7 +250,7 @@ const editorConfiguration: IConfigurationNode = {
 		},
 		'diffEditor.experimental.showEmptyDecorations': {
 			type: 'boolean',
-			default: true,
+			default: diffEditorDefaultOptions.experimental.showEmptyDecorations,
 			description: nls.localize('showEmptyDecorations', "Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted."),
 		}
 	}