Skip to content

Commit aa580ca

Browse files
author
Benjamin Pasero
committed
💄
1 parent 379b320 commit aa580ca

1 file changed

Lines changed: 14 additions & 25 deletions

File tree

‎src/vs/platform/list/browser/listService.ts‎

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { attachListStyler, defaultListStyles, computeStyles } from 'vs/platform/
1616
import { IThemeService } from 'vs/platform/theme/common/themeService';
1717
import { InputFocusedContextKey } from 'vs/platform/workbench/common/contextkeys';
1818
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
19-
import { mixin } from 'vs/base/common/objects';
2019
import { localize } from 'vs/nls';
2120
import { Registry } from 'vs/platform/registry/common/platform';
2221
import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
@@ -215,19 +214,14 @@ export class WorkbenchList<T> extends List<T> {
215214
@IThemeService themeService: IThemeService,
216215
@IConfigurationService private configurationService: IConfigurationService
217216
) {
218-
super(
219-
container,
220-
delegate,
221-
renderers,
222-
// mixin magic:
223-
// - install list controllers accordingly
224-
// - define some custom list options common for all workbench lists
225-
// - mixin theme colors from default list styles right on creation
226-
mixin(handleListControllers(options, configurationService), mixin({
217+
super(container, delegate, renderers,
218+
{
227219
keyboardSupport: false,
228220
selectOnMouseDown: true,
229-
styleController: new DefaultStyleController(getSharedListStyleSheet())
230-
} as IListOptions<T>, computeStyles(themeService.getTheme(), defaultListStyles), false), false)
221+
styleController: new DefaultStyleController(getSharedListStyleSheet()),
222+
...computeStyles(themeService.getTheme(), defaultListStyles),
223+
...handleListControllers(options, configurationService)
224+
} as IListOptions<T>
231225
);
232226

233227
this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
@@ -281,19 +275,14 @@ export class WorkbenchPagedList<T> extends PagedList<T> {
281275
@IThemeService themeService: IThemeService,
282276
@IConfigurationService private configurationService: IConfigurationService
283277
) {
284-
super(
285-
container,
286-
delegate,
287-
renderers,
288-
// mixin magic:
289-
// - install list controllers accordingly
290-
// - define some custom list options common for all workbench lists
291-
// - mixin theme colors from default list styles right on creation
292-
mixin(handleListControllers(options, configurationService), mixin({
278+
super(container, delegate, renderers,
279+
{
293280
keyboardSupport: false,
294281
selectOnMouseDown: true,
295-
styleController: new DefaultStyleController(getSharedListStyleSheet())
296-
} as IListOptions<T>, computeStyles(themeService.getTheme(), defaultListStyles), false), false)
282+
styleController: new DefaultStyleController(getSharedListStyleSheet()),
283+
...computeStyles(themeService.getTheme(), defaultListStyles),
284+
...handleListControllers(options, configurationService)
285+
} as IListOptions<T>
297286
);
298287

299288
this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
@@ -544,7 +533,7 @@ configurationRegistry.registerConfiguration({
544533
'title': localize('workbenchConfigurationTitle', "Workbench"),
545534
'type': 'object',
546535
'properties': {
547-
'workbench.list.multiSelectModifier': {
536+
[multiSelectModifierSettingKey]: {
548537
'type': 'string',
549538
'enum': ['ctrlCmd', 'alt'],
550539
'enumDescriptions': [
@@ -560,7 +549,7 @@ configurationRegistry.registerConfiguration({
560549
]
561550
}, "The modifier to be used to add an item in trees and lists to a multi-selection with the mouse (for example in the explorer, open editors and scm view). `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier.")
562551
},
563-
'workbench.list.openMode': {
552+
[openModeSettingKey]: {
564553
'type': 'string',
565554
'enum': ['singleClick', 'doubleClick'],
566555
'enumDescriptions': [

0 commit comments

Comments
 (0)