Merge pull request microsoft#185421 from weartist/terminal_localEchoStyle_adjust

Tyriar · web-flow · commit 101b2880127a · 2023-07-28T16:18:53.000-07:00
Fix microsoft#185343
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -503,16 +503,13 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.LocalEchoStyle]: {
 			description: localize('terminal.integrated.localEchoStyle', "Terminal style of locally echoed text; either a font style or an RGB color."),
 			default: 'dim',
-			oneOf: [
+			anyOf: [
 				{
-					type: 'string',
-					default: 'dim',
-					enum: ['bold', 'dim', 'italic', 'underlined', 'inverted'],
+					enum: ['bold', 'dim', 'italic', 'underlined', 'inverted', '#ff0000'],
 				},
 				{
 					type: 'string',
 					format: 'color-hex',
-					default: '#ff0000',
 				}
 			]
 		},

Original file line number	Diff line number	Diff line change
`@@ -503,16 +503,13 @@ const terminalConfiguration: IConfigurationNode = {`
`503`	`503`	`[TerminalSettingId.LocalEchoStyle]: {`
`504`	`504`	`description: localize('terminal.integrated.localEchoStyle', "Terminal style of locally echoed text; either a font style or an RGB color."),`
`505`	`505`	`default: 'dim',`
`506`		`- oneOf: [`
	`506`	`+ anyOf: [`
`507`	`507`	`{`
`508`		`- type: 'string',`
`509`		`- default: 'dim',`
`510`		`- enum: ['bold', 'dim', 'italic', 'underlined', 'inverted'],`
	`508`	`+ enum: ['bold', 'dim', 'italic', 'underlined', 'inverted', '#ff0000'],`
`511`	`509`	`},`
`512`	`510`	`{`
`513`	`511`	`type: 'string',`
`514`	`512`	`format: 'color-hex',`
`515`		`- default: '#ff0000',`
`516`	`513`	`}`
`517`	`514`	`]`
`518`	`515`	`},`