Skip to content

Add showIcons and maxSuggestionsToShow settings #69942

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

Merged
Johannes Rieken (jrieken) merged 10 commits into from
Mar 7, 2019
Merged

Add showIcons and maxSuggestionsToShow settings #69942

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
91411b0
Add showIcons and maxSuggestionsToShow to monaco typings
svipas Mar 7, 2019
04c9c8c
Add showIcons and maxSuggestionsToShow in commonEditorConfig
svipas Mar 7, 2019
5a62ab1
Add showIcons and maxSuggestionsToShow in editorOptions
svipas Mar 7, 2019
67d2fe6
Use showIcons and maxSuggestionsToShow in suggestWidget
svipas Mar 7, 2019
a3b5a8f
Fix completionModel tests by adding missing properties
svipas Mar 7, 2019
5384995
Replace iconsInSuggestions with showIcons in suggestEnabledInput
svipas Mar 7, 2019
73a83d3
Replace much with many in commonEditorConfig for maxSuggestionsToShow
svipas Mar 7, 2019
ea9d2fe
Use onDidChangeConfiguration for showIcons in suggestWidget
svipas Mar 7, 2019
cecd82a
Remove unused showIcons var from suggestWidget
svipas Mar 7, 2019
2a6b0de
simplify icon style logic
jrieken Mar 7, 2019
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
Prev Previous commit
Next Next commit
Add showIcons and maxSuggestionsToShow in editorOptions
  • Loading branch information
@svipas
svipas committed Mar 7, 2019
commit 5a62ab1b97ac32cd00b2c2feb64048d8baa7c14d
33 changes: 19 additions & 14 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 @@ -199,11 +199,18 @@ export interface ISuggestOptions {
* Favours words that appear close to the cursor.
*/
localityBonus?: boolean;

/**
* Enable using global storage for remembering suggestions.
*/
shareSuggestSelections?: boolean;
/**
* Enable or disable icons in suggestions. Defaults to true.
*/
showIcons?: boolean;
/**
* Max suggestions to show in suggestions. Defaults to 12.
*/
Comment thread
svipas marked this conversation as resolved.
maxSuggestionsToShow?: boolean;
}

/**
Expand Down Expand Up @@ -506,11 +513,6 @@ export interface IEditorOptions {
* Parameter hint options.
*/
parameterHints?: IEditorParameterHintOptions;
/**
* Render icons in suggestions box.
* Defaults to true.
*/
iconsInSuggestions?: boolean;
/**
* Options for auto closing brackets.
* Defaults to language defined behavior.
Expand Down Expand Up @@ -923,6 +925,8 @@ export interface InternalSuggestOptions {
readonly snippetsPreventQuickSuggestions: boolean;
readonly localityBonus: boolean;
readonly shareSuggestSelections: boolean;
readonly showIcons: boolean;
readonly maxSuggestionsToShow: number;
}

export interface InternalParameterHintOptions {
Expand Down Expand Up @@ -993,7 +997,6 @@ export interface EditorContribOptions {
readonly quickSuggestions: boolean | { other: boolean, comments: boolean, strings: boolean };
readonly quickSuggestionsDelay: number;
readonly parameterHints: InternalParameterHintOptions;
readonly iconsInSuggestions: boolean;
readonly formatOnType: boolean;
readonly formatOnPaste: boolean;
readonly suggestOnTriggerCharacters: boolean;
Expand Down Expand Up @@ -1374,7 +1377,9 @@ export class InternalEditorOptions {
&& a.snippets === b.snippets
&& a.snippetsPreventQuickSuggestions === b.snippetsPreventQuickSuggestions
&& a.localityBonus === b.localityBonus
&& a.shareSuggestSelections === b.shareSuggestSelections;
&& a.shareSuggestSelections === b.shareSuggestSelections
&& a.showIcons === b.showIcons
&& a.maxSuggestionsToShow === b.maxSuggestionsToShow;
}
}

Expand Down Expand Up @@ -1407,7 +1412,6 @@ export class InternalEditorOptions {
&& InternalEditorOptions._equalsQuickSuggestions(a.quickSuggestions, b.quickSuggestions)
&& a.quickSuggestionsDelay === b.quickSuggestionsDelay
&& this._equalsParameterHintOptions(a.parameterHints, b.parameterHints)
&& a.iconsInSuggestions === b.iconsInSuggestions
&& a.formatOnType === b.formatOnType
&& a.formatOnPaste === b.formatOnPaste
&& a.suggestOnTriggerCharacters === b.suggestOnTriggerCharacters
Expand Down Expand Up @@ -1907,7 +1911,9 @@ export class EditorOptionsValidator {
snippets: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippets, ['top', 'bottom', 'inline', 'none']),
snippetsPreventQuickSuggestions: _boolean(suggestOpts.snippetsPreventQuickSuggestions, defaults.filterGraceful),
localityBonus: _boolean(suggestOpts.localityBonus, defaults.localityBonus),
shareSuggestSelections: _boolean(suggestOpts.shareSuggestSelections, defaults.shareSuggestSelections)
shareSuggestSelections: _boolean(suggestOpts.shareSuggestSelections, defaults.shareSuggestSelections),
showIcons: _boolean(suggestOpts.showIcons, defaults.showIcons),
maxSuggestionsToShow: _clampedInt(suggestOpts.maxSuggestionsToShow, defaults.maxSuggestionsToShow, 1, 12)
};
}

Expand Down Expand Up @@ -2052,7 +2058,6 @@ export class EditorOptionsValidator {
quickSuggestions: quickSuggestions,
quickSuggestionsDelay: _clampedInt(opts.quickSuggestionsDelay, defaults.quickSuggestionsDelay, Constants.MIN_SAFE_SMALL_INTEGER, Constants.MAX_SAFE_SMALL_INTEGER),
parameterHints: this._sanitizeParameterHintOpts(opts.parameterHints, defaults.parameterHints),
iconsInSuggestions: _boolean(opts.iconsInSuggestions, defaults.iconsInSuggestions),
formatOnType: _boolean(opts.formatOnType, defaults.formatOnType),
formatOnPaste: _boolean(opts.formatOnPaste, defaults.formatOnPaste),
suggestOnTriggerCharacters: _boolean(opts.suggestOnTriggerCharacters, defaults.suggestOnTriggerCharacters),
Expand Down Expand Up @@ -2166,7 +2171,6 @@ export class InternalEditorOptionsFactory {
quickSuggestions: opts.contribInfo.quickSuggestions,
quickSuggestionsDelay: opts.contribInfo.quickSuggestionsDelay,
parameterHints: opts.contribInfo.parameterHints,
iconsInSuggestions: opts.contribInfo.iconsInSuggestions,
formatOnType: opts.contribInfo.formatOnType,
formatOnPaste: opts.contribInfo.formatOnPaste,
suggestOnTriggerCharacters: opts.contribInfo.suggestOnTriggerCharacters,
Expand Down Expand Up @@ -2651,7 +2655,6 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
enabled: true,
cycle: false
},
iconsInSuggestions: true,
formatOnType: false,
formatOnPaste: false,
suggestOnTriggerCharacters: true,
Expand All @@ -2667,7 +2670,9 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
snippets: 'inline',
snippetsPreventQuickSuggestions: true,
localityBonus: false,
shareSuggestSelections: false
shareSuggestSelections: false,
showIcons: true,
maxSuggestionsToShow: 12
},
selectionHighlight: true,
occurrencesHighlight: true,
Expand Down