diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index 01c748adc1cf01be68b475d3b1fd04a316362cdb..a7aeffe6e58ed215145d087717c280b2e3af2867 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -684,12 +684,12 @@ const editorConfiguration: IConfigurationNode = { default: EDITOR_DEFAULTS.contribInfo.suggest.showIcons, description: nls.localize('suggest.showIcons', "Controls whether to show or hide icons in suggestions.") }, - 'editor.suggest.maxSuggestionsToShow': { + 'editor.suggest.maxVisibileSuggestions': { type: 'number', - default: EDITOR_DEFAULTS.contribInfo.suggest.maxSuggestionsToShow, + default: EDITOR_DEFAULTS.contribInfo.suggest.maxVisibileSuggestions, minimum: 1, maximum: 12, - description: nls.localize('suggest.maxSuggestionsToShow', "Controls how many suggestions to show in suggestions.") + description: nls.localize('suggest.maxVisibileSuggestions', "Controls how many suggestions IntelliSense will show before showing a scrollbar.") }, 'editor.selectionHighlight': { 'type': 'boolean', diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index f29bfee1365d6a7fffb149dbd587165295ad4bb4..d123cbcd8d757a3407730e324743856e597be1be 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -926,7 +926,7 @@ export interface InternalSuggestOptions { readonly localityBonus: boolean; readonly shareSuggestSelections: boolean; readonly showIcons: boolean; - readonly maxSuggestionsToShow: number; + readonly maxVisibileSuggestions: number; } export interface InternalParameterHintOptions { @@ -1379,7 +1379,7 @@ export class InternalEditorOptions { && a.localityBonus === b.localityBonus && a.shareSuggestSelections === b.shareSuggestSelections && a.showIcons === b.showIcons - && a.maxSuggestionsToShow === b.maxSuggestionsToShow; + && a.maxVisibileSuggestions === b.maxVisibileSuggestions; } } @@ -1913,7 +1913,7 @@ export class EditorOptionsValidator { localityBonus: _boolean(suggestOpts.localityBonus, defaults.localityBonus), shareSuggestSelections: _boolean(suggestOpts.shareSuggestSelections, defaults.shareSuggestSelections), showIcons: _boolean(suggestOpts.showIcons, defaults.showIcons), - maxSuggestionsToShow: _clampedInt(suggestOpts.maxSuggestionsToShow, defaults.maxSuggestionsToShow, 1, 12) + maxVisibileSuggestions: _clampedInt(suggestOpts.maxSuggestionsToShow, defaults.maxVisibileSuggestions, 1, 12) }; } @@ -2672,7 +2672,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = { localityBonus: false, shareSuggestSelections: false, showIcons: true, - maxSuggestionsToShow: 12 + maxVisibileSuggestions: 12 }, selectionHighlight: true, occurrencesHighlight: true, diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts index c334bd799e26f6a33c7c4c1593afe368ae3562d9..c2d6e178e6ab9d639eb04fd44fd1114b5362c0f5 100644 --- a/src/vs/editor/contrib/suggest/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -1037,8 +1037,8 @@ export class SuggestWidget implements IContentWidget, IListVirtualDelegate