https-githubsup-com
diff --git a/‎src/vs/editor/common/config/editorOptions.ts‎
Lines changed: 13 additions & 7 deletions b/‎src/vs/editor/common/config/editorOptions.ts‎
Lines changed: 13 additions & 7 deletions
@@ -1490,7 +1490,7 @@ class EditorFontSize extends SimpleEditorOption<EditorOption.fontSize, number> {
 //#region fontWeight
 
 class EditorFontWeight extends BaseEditorOption<EditorOption.fontWeight, string> {
-	private static ENUM_VALUES = ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'];
+	private static SUGGESTION_VALUES = ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'];
 	private static MINIMUM_VALUE = 1;
 	private static MAXIMUM_VALUE = 1000;
 
@@ -1502,23 +1502,29 @@ class EditorFontWeight extends BaseEditorOption<EditorOption.fontWeight, string>
 					{
 						type: 'number',
 						minimum: EditorFontWeight.MINIMUM_VALUE,
-						maximum: EditorFontWeight.MAXIMUM_VALUE
+						maximum: EditorFontWeight.MAXIMUM_VALUE,
+						errorMessage: nls.localize('fontWeightErrorMessage', "Only \"normal\" and \"bold\" keywords or numbers between 1 and 1000 are allowed.")
 					},
 					{
-						enum: EditorFontWeight.ENUM_VALUES
+						type: 'string',
+						pattern: '^(normal|bold|1000|[1-9][0-9]{0,2})$'
+					},
+					{
+						enum: EditorFontWeight.SUGGESTION_VALUES
 					}
 				],
 				default: EDITOR_FONT_DEFAULTS.fontWeight,
-				description: nls.localize('fontWeight', "Controls the font weight.")
+				description: nls.localize('fontWeight', "Controls the font weight. Accepts \"normal\" and \"bold\" keywords or numbers between 1 and 1000.")
 			}
 		);
 	}
 
 	public validate(input: any): string {
-		if (typeof input === 'number') {
-			return EditorFontWeight.MINIMUM_VALUE <= input && input <= EditorFontWeight.MAXIMUM_VALUE ? String(input) : EDITOR_FONT_DEFAULTS.fontWeight;
+		if (input === 'normal' || input === 'bold') {
+			return input;
 		}
-		return EditorStringEnumOption.stringSet<string>(input, EDITOR_FONT_DEFAULTS.fontWeight, EditorFontWeight.ENUM_VALUES);
+		const numericValue = Number(input);
+		return EditorFontWeight.MINIMUM_VALUE <= numericValue && numericValue <= EditorFontWeight.MAXIMUM_VALUE ? String(numericValue) : EDITOR_FONT_DEFAULTS.fontWeight;
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -1490,7 +1490,7 @@ class EditorFontSize extends SimpleEditorOption<EditorOption.fontSize, number> {`
`1490`	`1490`	`//#region fontWeight`
`1491`	`1491`
`1492`	`1492`	`class EditorFontWeight extends BaseEditorOption<EditorOption.fontWeight, string> {`
`1493`		`- private static ENUM_VALUES = ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'];`
	`1493`	`+ private static SUGGESTION_VALUES = ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'];`
`1494`	`1494`	`private static MINIMUM_VALUE = 1;`
`1495`	`1495`	`private static MAXIMUM_VALUE = 1000;`
`1496`	`1496`
`@@ -1502,23 +1502,29 @@ class EditorFontWeight extends BaseEditorOption<EditorOption.fontWeight, string>`
`1502`	`1502`	`{`
`1503`	`1503`	`type: 'number',`
`1504`	`1504`	`minimum: EditorFontWeight.MINIMUM_VALUE,`
`1505`		`- maximum: EditorFontWeight.MAXIMUM_VALUE`
	`1505`	`+ maximum: EditorFontWeight.MAXIMUM_VALUE,`
	`1506`	`+ errorMessage: nls.localize('fontWeightErrorMessage', "Only \"normal\" and \"bold\" keywords or numbers between 1 and 1000 are allowed.")`
`1506`	`1507`	`},`
`1507`	`1508`	`{`
`1508`		`- enum: EditorFontWeight.ENUM_VALUES`
	`1509`	`+ type: 'string',`
	`1510`	`+ pattern: '^(normal\|bold\|1000\|[1-9][0-9]{0,2})$'`
	`1511`	`+ },`
	`1512`	`+ {`
	`1513`	`+ enum: EditorFontWeight.SUGGESTION_VALUES`
`1509`	`1514`	`}`
`1510`	`1515`	`],`
`1511`	`1516`	`default: EDITOR_FONT_DEFAULTS.fontWeight,`
`1512`		`- description: nls.localize('fontWeight', "Controls the font weight.")`
	`1517`	`+ description: nls.localize('fontWeight', "Controls the font weight. Accepts \"normal\" and \"bold\" keywords or numbers between 1 and 1000.")`
`1513`	`1518`	`}`
`1514`	`1519`	`);`
`1515`	`1520`	`}`
`1516`	`1521`
`1517`	`1522`	`public validate(input: any): string {`
`1518`		`- if (typeof input === 'number') {`
`1519`		`- return EditorFontWeight.MINIMUM_VALUE <= input && input <= EditorFontWeight.MAXIMUM_VALUE ? String(input) : EDITOR_FONT_DEFAULTS.fontWeight;`
	`1523`	`+ if (input === 'normal' \|\| input === 'bold') {`
	`1524`	`+ return input;`
`1520`	`1525`	`}`
`1521`		`- return EditorStringEnumOption.stringSet<string>(input, EDITOR_FONT_DEFAULTS.fontWeight, EditorFontWeight.ENUM_VALUES);`
	`1526`	`+ const numericValue = Number(input);`
	`1527`	`+ return EditorFontWeight.MINIMUM_VALUE <= numericValue && numericValue <= EditorFontWeight.MAXIMUM_VALUE ? String(numericValue) : EDITOR_FONT_DEFAULTS.fontWeight;`
`1522`	`1528`	`}`
`1523`	`1529`	`}`
`1524`	`1530`