From 85f95c939da1d0df129789f0222c742654bfd532 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 18 Oct 2016 10:48:37 +0200 Subject: [PATCH] less confusing editor picker --- .../workbench/browser/parts/editor/editorActions.ts | 2 +- .../workbench/browser/parts/editor/editorPicker.ts | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index 2db5ddf024f..1490daaa6b3 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -1024,7 +1024,7 @@ export class ShowEditorsInGroupAction extends Action { switch (stacks.positionOfGroup(context.group)) { case Position.TWO: - return this.quickOpenService.show((groupCount === 2) ? NAVIGATE_IN_GROUP_THREE_PREFIX : NAVIGATE_IN_GROUP_TWO_PREFIX); + return this.quickOpenService.show(NAVIGATE_IN_GROUP_TWO_PREFIX); case Position.THREE: return this.quickOpenService.show(NAVIGATE_IN_GROUP_THREE_PREFIX); } diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts index 99893411560..4cec36daa7f 100644 --- a/src/vs/workbench/browser/parts/editor/editorPicker.ts +++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts @@ -184,7 +184,7 @@ export abstract class EditorGroupPicker extends BaseEditorPicker { return nls.localize('noResultsFoundInGroup', "No matching opened editor found in group"); } - return nls.localize('noOpenedEditors', "List of opened editors is currently empty"); + return nls.localize('noOpenedEditors', "List of opened editors is currently empty in group"); } public getAutoFocus(searchValue: string, quickNavigateConfiguration: IQuickNavigateConfiguration): IAutoFocus { @@ -224,18 +224,14 @@ export class GroupOnePicker extends EditorGroupPicker { export class GroupTwoPicker extends EditorGroupPicker { protected getPosition(): Position { - const stacks = this.editorGroupService.getStacksModel(); - - return stacks.groups.length > 2 ? Position.TWO : -1; // with 2 groups open, the second one is not available + return Position.TWO; } } export class GroupThreePicker extends EditorGroupPicker { protected getPosition(): Position { - const stacks = this.editorGroupService.getStacksModel(); - - return stacks.groups.length > 2 ? Position.THREE : Position.TWO; + return Position.THREE; } } @@ -259,7 +255,7 @@ export class AllEditorsPicker extends BaseEditorPicker { return nls.localize('noResultsFound', "No matching opened editor found"); } - return nls.localize('noOpenedEditors', "List of opened editors is currently empty"); + return nls.localize('noOpenedEditorsAllGroups', "List of opened editors is currently empty"); } public getAutoFocus(searchValue: string): IAutoFocus { -- GitLab