Merge pull request microsoft#196482 from microsoft/benibenj/fixFocusMaximize

Fix focus issue when unmaximizing a group in EditorPart

Author: benibenj

src/vs/workbench/browser/parts/editor/editorPart.ts

@@ -377,7 +377,7 @@ export class EditorPart extends Part implements IEditorPart {
 					return; // need at least 2 groups to be maximized
 				}
 				this.gridWidget.maximizeView(target);
-				this.doSetGroupActive(target);
+				target.focus();
 				break;
 			case GroupsArrangement.EXPAND:
 				this.gridWidget.expandView(target);
@@ -403,6 +403,8 @@ export class EditorPart extends Part implements IEditorPart {
 
 	private unmaximizeGroup(): void {
 		this.gridWidget.exitMaximizedView();
+		// When making views visible the focus can be affected, so restore it
+		this._activeGroup.focus();
 	}
 
 	private hasMaximizedGroup(): boolean {