From 9c19fe9406f2487b60b8b280b7e447b54a475b6e Mon Sep 17 00:00:00 2001 From: Zach Bloomquist Date: Tue, 7 Aug 2018 04:42:23 -0400 Subject: [PATCH] Default 'Quick Switch Window' selection to be next window, closes #55166 (#55535) --- src/vs/workbench/electron-browser/actions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 79b40283093..161acfd709d 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -616,9 +616,11 @@ export abstract class BaseSwitchWindow extends Action { action: (!this.isQuickNavigate() && currentWindowId !== win.id) ? this.closeWindowAction : void 0 } as IFilePickOpenEntry)); + const autoFocusIndex = (picks.indexOf(picks.filter(pick => pick.payload === currentWindowId)[0]) + 1) % picks.length; + this.quickOpenService.pick(picks, { contextKey: 'inWindowsPicker', - autoFocus: { autoFocusFirstEntry: true }, + autoFocus: { autoFocusIndex }, placeHolder, quickNavigateConfiguration: this.isQuickNavigate() ? { keybindings: this.keybindingService.lookupKeybindings(this.id) } : void 0 });