Updates 3wm color ids.

Author: hediet

src/vs/workbench/contrib/mergeEditor/browser/view/colors.ts

@@ -7,114 +7,50 @@ import { localize } from 'vs/nls';
 import { registerColor } from 'vs/platform/theme/common/colorRegistry';
 
 export const diff = registerColor(
-	'mergeEditor.diff',
-	{
-		dark: '#9bb95533',
-		light: '#9bb95533',
-		hcDark: '#9bb95533',
-		hcLight: '#9bb95533',
-	},
-	localize(
-		'mergeEditor.diff',
-		'The foreground color for changes.'
-	)
+	'mergeEditor.change.background',
+	{ dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533', },
+	localize('mergeEditor.change.background', 'The background color for changes.')
 );
 
 export const diffWord = registerColor(
-	'mergeEditor.diff.word',
-	{
-		dark: '#9bb9551e',
-		light: '#9bb9551e',
-		hcDark: '#9bb9551e',
-		hcLight: '#9bb9551e',
-	},
-	localize(
-		'mergeEditor.diff.word',
-		'The foreground color for word changes.'
-	)
+	'mergeEditor.change.word.background',
+	{ dark: '#9bb9551e', light: '#9bb9551e', hcDark: '#9bb9551e', hcLight: '#9bb9551e', },
+	localize('mergeEditor.change.word.background', 'The background color for word changes.')
 );
 
 export const conflictBorderUnhandledUnfocused = registerColor(
-	'mergeEditor.conflictBorder.unhandledUnfocused',
-	{
-		dark: '#ffa6007a',
-		light: '#ffa6007a',
-		hcDark: '#ffa6007a',
-		hcLight: '#ffa6007a',
-	},
-	localize(
-		'mergeEditor.conflictBorder.unhandledUnfocused',
-		'The border color of unhandled unfocused conflicts.'
-	)
+	'mergeEditor.conflict.unhandledUnfocused.border',
+	{ dark: '#ffa6007a', light: '#ffa6007a', hcDark: '#ffa6007a', hcLight: '#ffa6007a', },
+	localize('mergeEditor.conflict.unhandledUnfocused.border', 'The border color of unhandled unfocused conflicts.')
 );
 
 export const conflictBorderUnhandledFocused = registerColor(
-	'mergeEditor.conflictBorder.unhandledFocused',
-	{
-		dark: '#ffa600',
-		light: '#ffa600',
-		hcDark: '#ffa600',
-		hcLight: '#ffa600',
-	},
-	localize(
-		'mergeEditor.conflictBorder.unhandledFocused',
-		'The border color of unhandled focused conflicts.'
-	)
+	'mergeEditor.conflict.unhandledFocused.border',
+	{ dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', },
+	localize('mergeEditor.conflict.unhandledFocused.border', 'The border color of unhandled focused conflicts.')
 );
 
 export const conflictBorderHandledUnfocused = registerColor(
-	'mergeEditor.conflictBorder.handledUnfocused',
-	{
-		dark: '#86868649',
-		light: '#86868649',
-		hcDark: '#86868649',
-		hcLight: '#86868649',
-	},
-	localize(
-		'mergeEditor.conflictBorder.handledUnfocused',
-		'The border color of handled unfocused conflicts.'
-	)
+	'mergeEditor.conflict.handledUnfocused.border',
+	{ dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649', },
+	localize('mergeEditor.conflict.handledUnfocused.border', 'The border color of handled unfocused conflicts.')
 );
 
 export const conflictBorderHandledFocused = registerColor(
-	'mergeEditor.conflictBorder.handledFocused',
-	{
-		dark: '#c1c1c1cc',
-		light: '#c1c1c1cc',
-		hcDark: '#c1c1c1cc',
-		hcLight: '#c1c1c1cc',
-	},
-	localize(
-		'mergeEditor.conflictBorder.handledFocused',
-		'The border color of handled focused conflicts.'
-	)
+	'mergeEditor.conflict.handledFocused.border',
+	{ dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc', },
+	localize('mergeEditor.conflict.handledFocused.border', 'The border color of handled focused conflicts.')
 );
 
 
 export const handledConflictMinimapOverViewRulerColor = registerColor(
-	'mergeEditor.conflict-handled.minimapOverViewRuler',
-	{
-		dark: '#adaca8ee',
-		light: '#adaca8ee',
-		hcDark: '#adaca8ee',
-		hcLight: '#adaca8ee',
-	},
-	localize(
-		'mergeEditor.conflict-unhandled.minimapOverViewRuler',
-		'The foreground color for changes in input 1.'
-	)
+	'mergeEditor.conflict.handled.minimapOverViewRuler',
+	{ dark: '#adaca8ee', light: '#adaca8ee', hcDark: '#adaca8ee', hcLight: '#adaca8ee', },
+	localize('mergeEditor.conflict.handled.minimapOverViewRuler', 'The foreground color for changes in input 1.')
 );
 
 export const unhandledConflictMinimapOverViewRulerColor = registerColor(
-	'mergeEditor.conflict-unhandled.minimapOverViewRuler',
-	{
-		dark: '#fcba03FF',
-		light: '#fcba03FF',
-		hcDark: '#fcba03FF',
-		hcLight: '#fcba03FF',
-	},
-	localize(
-		'mergeEditor.conflict-unhandled.minimapOverViewRuler',
-		'The foreground color for changes in input 1.'
-	)
+	'mergeEditor.conflict.unhandled.minimapOverViewRuler',
+	{ dark: '#fcba03FF', light: '#fcba03FF', hcDark: '#fcba03FF', hcLight: '#fcba03FF', },
+	localize('mergeEditor.conflict.unhandled.minimapOverViewRuler', 'The foreground color for changes in input 1.')
 );

src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css

@@ -30,28 +30,28 @@
 }
 
 .merge-editor-diff {
-	background-color: var(--vscode-mergeEditor-diff);
+	background-color: var(--vscode-mergeEditor-change-background);
 }
 
 .merge-editor-diff-word {
-	background-color: var(--vscode-mergeEditor-diff-word);
+	background-color: var(--vscode-mergeEditor-change-word-background);
 }
 
 .merge-editor-block {
-	border: 2px solid var(--vscode-mergeEditor-conflictBorder-unhandledUnfocused);
+	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
 }
 
 .merge-editor-block.focused {
-	border: 2px solid var(--vscode-mergeEditor-conflictBorder-unhandledFocused);
+	border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
 }
 
 .merge-editor-block.handled {
-	border: 2px solid var(--vscode-mergeEditor-conflictBorder-handledUnfocused);
+	border: 2px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border);
 
 }
 
 .merge-editor-block.handled.focused {
-	border: 2px solid var(--vscode-mergeEditor-conflictBorder-handledFocused);
+	border: 2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
 }
 
 .gutter-item {