From 1c37752e06c4a0718d72bc454ec3df57d53248c4 Mon Sep 17 00:00:00 2001 From: "Babak K. Shandiz" Date: Wed, 16 Nov 2022 13:37:51 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=94=A8=20Change=20localized=20text=20?= =?UTF-8?q?ID=20for=20`breadcrumbs.focusAndSelect`=20command?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Babak K. Shandiz --- src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index 92542a8d03f..799fa3218ce 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -549,8 +549,8 @@ registerAction2(class FocusAndSelectBreadcrumbs extends Action2 { super({ id: 'breadcrumbs.focusAndSelect', title: { - value: localize('cmd.focus', "Focus Breadcrumbs"), - original: 'Focus Breadcrumbs' + value: localize('cmd.focusAndSelect', "Focus and Select Breadcrumbs"), + original: 'Focus and Select Breadcrumbs' }, precondition: BreadcrumbsControl.CK_BreadcrumbsVisible, keybinding: { From 6283ef38062356c3e2f2b620d5004a44c4a73a99 Mon Sep 17 00:00:00 2001 From: "Babak K. Shandiz" Date: Wed, 16 Nov 2022 13:39:26 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=A8=20Register=20`breadcrumbs.focu?= =?UTF-8?q?s`=20command=20via=20`registerAction2`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Babak K. Shandiz --- .../parts/editor/breadcrumbsControl.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index 799fa3218ce..5079596afe5 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -573,6 +573,27 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ handler: accessor => focusAndSelectHandler(accessor, false) }); +registerAction2(class FocusBreadcrumbs extends Action2 { + constructor() { + super({ + id: 'breadcrumbs.focus', + title: { + value: localize('cmd.focus', "Focus Breadcrumbs"), + original: 'Focus Breadcrumbs' + }, + precondition: BreadcrumbsControl.CK_BreadcrumbsVisible, + keybinding: { + weight: KeybindingWeight.WorkbenchContrib, + primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Semicolon, + when: BreadcrumbsControl.CK_BreadcrumbsPossible, + } + }); + } + run(accessor: ServicesAccessor, ...args: any[]): void { + focusAndSelectHandler(accessor, false); + } +}); + // this commands is only enabled when breadcrumbs are // disabled which it then enables and focuses KeybindingsRegistry.registerCommandAndKeybindingRule({ From aa96ef760a56282fb7534f81f9278704f937604f Mon Sep 17 00:00:00 2001 From: "Babak K. Shandiz" Date: Wed, 16 Nov 2022 13:40:31 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=96=BC=20Display=20`breadcrumbs.focus?= =?UTF-8?q?`=20command=20on=20the=20palette?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Babak K. Shandiz --- src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index 5079596afe5..99565340c5b 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -586,7 +586,8 @@ registerAction2(class FocusBreadcrumbs extends Action2 { weight: KeybindingWeight.WorkbenchContrib, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Semicolon, when: BreadcrumbsControl.CK_BreadcrumbsPossible, - } + }, + f1: true }); } run(accessor: ServicesAccessor, ...args: any[]): void { From 4bfa86cdbfd0fe07bc7436d7cc99a6ab0bf17e76 Mon Sep 17 00:00:00 2001 From: "Babak K. Shandiz" Date: Thu, 17 Nov 2022 09:51:43 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E2=9D=8C=20Remove=20unnecessary=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Babak K. Shandiz --- .../workbench/browser/parts/editor/breadcrumbsControl.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index 99565340c5b..3dcc28fbd14 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -565,14 +565,6 @@ registerAction2(class FocusAndSelectBreadcrumbs extends Action2 { } }); -KeybindingsRegistry.registerCommandAndKeybindingRule({ - id: 'breadcrumbs.focus', - weight: KeybindingWeight.WorkbenchContrib, - primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Semicolon, - when: BreadcrumbsControl.CK_BreadcrumbsPossible, - handler: accessor => focusAndSelectHandler(accessor, false) -}); - registerAction2(class FocusBreadcrumbs extends Action2 { constructor() { super({ From f6c8436c21bd83166fc798e6fb8eb222b5b6686f Mon Sep 17 00:00:00 2001 From: "Babak K. Shandiz" Date: Thu, 17 Nov 2022 09:53:13 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=92=84=20Include=20`breadcrumbs.focus?= =?UTF-8?q?AndSelect`=20in=20command=20palette?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Babak K. Shandiz --- src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index 3dcc28fbd14..68c3d487a41 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -557,7 +557,8 @@ registerAction2(class FocusAndSelectBreadcrumbs extends Action2 { weight: KeybindingWeight.WorkbenchContrib, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Period, when: BreadcrumbsControl.CK_BreadcrumbsPossible, - } + }, + f1: true }); } run(accessor: ServicesAccessor, ...args: any[]): void {