From bf86f521186d9954b7d9c520743f441222e95f0b Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 19 Mar 2020 11:33:09 +0100 Subject: [PATCH] quick access - reduce constant config lookup --- .../quickaccess/gotoLineQuickAccess.ts | 16 +++++------ .../quickaccess/gotoSymbolQuickAccess.ts | 18 ++++++------ .../search/browser/anythingQuickAccess.ts | 28 +++++++++---------- .../search/browser/symbolsQuickAccess.ts | 24 ++++++++-------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts index 0e8c8f29aa5..4d801b49ac2 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts @@ -18,6 +18,14 @@ export class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProv protected readonly onDidActiveTextEditorControlChange = this.editorService.onDidActiveEditorChange; + private readonly configuration = (() => { + const editorConfig = this.configurationService.getValue().workbench.editor; + + return { + openEditorPinned: !editorConfig.enablePreviewFromQuickOpen + }; + })(); + constructor( @IEditorService private readonly editorService: IEditorService, @IConfigurationService private readonly configurationService: IConfigurationService @@ -25,14 +33,6 @@ export class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProv super(); } - private get configuration() { - const editorConfig = this.configurationService.getValue().workbench.editor; - - return { - openEditorPinned: !editorConfig.enablePreviewFromQuickOpen, - }; - } - protected get activeTextEditorControl() { return this.editorService.activeTextEditorControl; } diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts index e3a213f9084..099fcd763b3 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts @@ -18,6 +18,15 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess protected readonly onDidActiveTextEditorControlChange = this.editorService.onDidActiveEditorChange; + private readonly configuration = (() => { + const editorConfig = this.configurationService.getValue().workbench.editor; + + return { + openEditorPinned: !editorConfig.enablePreviewFromQuickOpen, + openSideBySideDirection: editorConfig.openSideBySideDirection + }; + })(); + constructor( @IEditorService private readonly editorService: IEditorService, @IConfigurationService private readonly configurationService: IConfigurationService @@ -27,15 +36,6 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess }); } - private get configuration() { - const editorConfig = this.configurationService.getValue().workbench.editor; - - return { - openEditorPinned: !editorConfig.enablePreviewFromQuickOpen, - openSideBySideDirection: editorConfig.openSideBySideDirection - }; - } - protected get activeTextEditorControl() { return this.editorService.activeTextEditorControl; } diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts index 618a2f26687..c48c0441a0f 100644 --- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts +++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts @@ -75,6 +75,20 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider { + const editorConfig = this.configurationService.getValue().workbench.editor; + const searchConfig = this.configurationService.getValue(); + + return { + openEditorPinned: !editorConfig.enablePreviewFromQuickOpen, + openSideBySideDirection: editorConfig.openSideBySideDirection, + includeSymbols: searchConfig.search.quickOpen.includeSymbols, + workspaceSymbolsFilter: searchConfig.search.quickOpen.workspaceSymbolsFilter, + includeHistory: searchConfig.search.quickOpen.includeHistory, + shortAutoSaveDelay: this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY + }; + })(); + constructor( @IInstantiationService private readonly instantiationService: IInstantiationService, @ISearchService private readonly searchService: ISearchService, @@ -94,20 +108,6 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider().workbench.editor; - const searchConfig = this.configurationService.getValue(); - - return { - openEditorPinned: !editorConfig.enablePreviewFromQuickOpen, - openSideBySideDirection: editorConfig.openSideBySideDirection, - includeSymbols: searchConfig.search.quickOpen.includeSymbols, - workspaceSymbolsFilter: searchConfig.search.quickOpen.workspaceSymbolsFilter, - includeHistory: searchConfig.search.quickOpen.includeHistory, - shortAutoSaveDelay: this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY - }; - } - provide(picker: IQuickPick, token: CancellationToken): IDisposable { // Reset the pick state for this run diff --git a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts index 74a9fa14c5e..0560cc5df2b 100644 --- a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts +++ b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts @@ -47,7 +47,18 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider(SymbolsQuickAccessProvider.TYPING_SEARCH_DELAY)); + private readonly configuration = (() => { + const editorConfig = this.configurationService.getValue().workbench.editor; + const searchConfig = this.configurationService.getValue(); + + return { + openEditorPinned: !editorConfig.enablePreviewFromQuickOpen, + openSideBySideDirection: editorConfig.openSideBySideDirection, + workspaceSymbolsFilter: searchConfig.search.quickOpen.workspaceSymbolsFilter + }; + })(); + + private readonly delayer = this._register(new ThrottledDelayer(SymbolsQuickAccessProvider.TYPING_SEARCH_DELAY)); private readonly resourceExcludeMatcher = this._register(createResourceExcludeMatcher(this.instantiationService, this.configurationService)); @@ -61,17 +72,6 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider().workbench.editor; - const searchConfig = this.configurationService.getValue(); - - return { - openEditorPinned: !editorConfig.enablePreviewFromQuickOpen, - openSideBySideDirection: editorConfig.openSideBySideDirection, - workspaceSymbolsFilter: searchConfig.search.quickOpen.workspaceSymbolsFilter - }; - } - protected getPicks(filter: string, disposables: DisposableStore, token: CancellationToken): Promise> { return this.getSymbolPicks(filter, { skipLocal: this.configuration.workspaceSymbolsFilter === 'reduced' }, token); } -- GitLab