fixes microsoft#102816

joaomoreno · joaomoreno · commit 391c92f52c8b · 2020-08-05T12:13:30.000+02:00
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
@@ -465,6 +465,8 @@ export interface IView {
 
 	readonly id: string;
 
+	focus(): void;
+
 	isVisible(): boolean;
 
 	isBodyVisible(): boolean;
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -74,14 +74,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G },
 	linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G },
 	mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_G },
-	handler: accessor => {
+	handler: async accessor => {
 		const viewsService = accessor.get(IViewsService);
-
-		if (viewsService.isViewVisible(VIEW_PANE_ID)) {
-			viewsService.closeView(VIEW_PANE_ID);
-		} else {
-			viewsService.openView(VIEW_PANE_ID);
-		}
+		const view = await viewsService.openView(VIEW_PANE_ID);
+		view?.focus();
 	}
 });
 
