Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address feedback in #101467 #105880

Merged
merged 2 commits into from
Sep 2, 2020
Merged

Address feedback in #101467 #105880

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da460dc
Allow 1-1000 as strings. Improve description and error.
IllusionMH Sep 1, 2020
1250b08
small tweaks
alexdima Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions src/vs/editor/common/config/editorOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,15 +852,13 @@ class EditorBooleanOption<K1 extends EditorOption> extends SimpleEditorOption<K1

class EditorIntOption<K1 extends EditorOption> extends SimpleEditorOption<K1, number> {

public static clampedInt(value: any, defaultValue: number, minimum: number, maximum: number): number {
let r: number;
public static clampedInt<T>(value: any, defaultValue: T, minimum: number, maximum: number): number | T {
if (typeof value === 'undefined') {
r = defaultValue;
} else {
r = parseInt(value, 10);
if (isNaN(r)) {
r = defaultValue;
}
return defaultValue;
}
let r = parseInt(value, 10);
if (isNaN(r)) {
return defaultValue;
}
r = Math.max(minimum, r);
r = Math.min(maximum, r);
Expand Down Expand Up @@ -1490,7 +1488,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;

Expand All @@ -1502,23 +1500,28 @@ 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);
return String(EditorIntOption.clampedInt(input, EDITOR_FONT_DEFAULTS.fontWeight, EditorFontWeight.MINIMUM_VALUE, EditorFontWeight.MAXIMUM_VALUE));
}
}

Expand Down