From cd93deacea35ebc09ea9620ca7aea31328c6e8c6 Mon Sep 17 00:00:00 2001
From: Lionel Henry <lionel.hry@gmail.com>
Date: Wed, 22 May 2024 15:42:23 +0200
Subject: [PATCH] Fixes for restoration of minimised panels (#3193)

* Only restore panel when opening the panel

* Don't call `restorePanel()` from actions

It's called if needed from `openView()`

* Restore minimised and focused panel when opening a view
---
 src/vs/workbench/browser/parts/paneCompositePart.ts  |  4 ++--
 .../browser/positronConsoleActions.ts                |  4 ----
 .../browser/positronConsoleService.ts                |  7 ++-----
 .../workbench/services/views/browser/viewsService.ts | 12 ++++++++++++
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/browser/parts/paneCompositePart.ts b/src/vs/workbench/browser/parts/paneCompositePart.ts
index 5776e9ca12a..9a671a65521 100644
--- a/src/vs/workbench/browser/parts/paneCompositePart.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePart.ts
@@ -481,8 +481,8 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 		}
 
 		// --- Start Positron ---
-		// If the panel is minimized, restore it.
-		if (this.layoutService.isPanelMinimized()) {
+		// If we're opening a view in the panel and it is minimized, restore it.
+		if (this.partId === Parts.PANEL_PART && this.layoutService.isPanelMinimized()) {
 			this.layoutService.restorePanel();
 		}
 		// --- End Positron ---
diff --git a/src/vs/workbench/contrib/positronConsole/browser/positronConsoleActions.ts b/src/vs/workbench/contrib/positronConsole/browser/positronConsoleActions.ts
index f4e119a0450..38ff517d28b 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/positronConsoleActions.ts
+++ b/src/vs/workbench/contrib/positronConsole/browser/positronConsoleActions.ts
@@ -23,7 +23,6 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IExecutionHistoryService } from 'vs/workbench/contrib/executionHistory/common/executionHistoryService';
@@ -143,13 +142,10 @@ export function registerPositronConsoleActions() {
 		 * @param accessor The services accessor.
 		 */
 		async run(accessor: ServicesAccessor) {
-
-			const layoutService = accessor.get(IWorkbenchLayoutService);
 			const viewsService = accessor.get(IViewsService);
 
 			// Ensure that the panel and console are visible. This is essentially
 			// equivalent to what `workbench.panel.positronConsole.focus` does.
-			layoutService.restorePanel();
 			await viewsService.openView(POSITRON_CONSOLE_VIEW_ID, true);
 		}
 	});
diff --git a/src/vs/workbench/services/positronConsole/browser/positronConsoleService.ts b/src/vs/workbench/services/positronConsole/browser/positronConsoleService.ts
index 57da2a67a32..9d291e98517 100644
--- a/src/vs/workbench/services/positronConsole/browser/positronConsoleService.ts
+++ b/src/vs/workbench/services/positronConsole/browser/positronConsoleService.ts
@@ -12,7 +12,6 @@ import { ISettableObservable, observableValue } from 'vs/base/common/observableI
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { RuntimeItem } from 'vs/workbench/services/positronConsole/browser/classes/runtimeItem';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
@@ -187,7 +186,6 @@ class PositronConsoleService extends Disposable implements IPositronConsoleServi
 		@IRuntimeSessionService private readonly _runtimeSessionService: IRuntimeSessionService,
 		@ILogService private readonly _logService: ILogService,
 		@IViewsService private readonly _viewsService: IViewsService,
-		@IWorkbenchLayoutService private readonly _layoutService: IWorkbenchLayoutService
 	) {
 		// Call the disposable constrcutor.
 		super();
@@ -367,9 +365,8 @@ class PositronConsoleService extends Disposable implements IPositronConsoleServi
 	 * @returns A value which indicates whether the code could be executed.
 	 */
 	async executeCode(languageId: string, code: string, focus: boolean, allowIncomplete?: boolean) {
-		// When code is executed in the console service, ensure that the panel is restored, if it
-		// needs to be, and open the console view.
-		this._layoutService.restorePanel();
+		// When code is executed in the console service, open the console view. This opens
+		// the relevant pane composite if needed.
 		await this._viewsService.openView(POSITRON_CONSOLE_VIEW_ID, false);
 
 		// Get the running runtimes for the language.
diff --git a/src/vs/workbench/services/views/browser/viewsService.ts b/src/vs/workbench/services/views/browser/viewsService.ts
index def4ee3a0e1..488f960b4ac 100644
--- a/src/vs/workbench/services/views/browser/viewsService.ts
+++ b/src/vs/workbench/services/views/browser/viewsService.ts
@@ -480,6 +480,18 @@ export class ViewsService extends Disposable implements IViewsService {
 					if (focusedViewId === viewDescriptor.id) {
 
 						const viewLocation = viewDescriptorService.getViewLocationById(viewDescriptor.id);
+						// --- Start Positron ---
+						// This deals with an edge case. If we're opening a view
+						// in the panel, and it is minimized, and it is focused
+						// (unlikely but possible, e.g. after clicking the
+						// minimize button), restore it.
+						if (viewLocation === ViewContainerLocation.Panel && layoutService.isPanelMinimized()) {
+							layoutService.restorePanel();
+							// Returning early instead of chaining with `else` to avoid formatter
+							// indenting the other branches
+							return;
+						}
+						// --- End Positron ---
 						if (viewDescriptorService.getViewLocationById(viewDescriptor.id) === ViewContainerLocation.Sidebar) {
 							// focus the editor if the view is focused and in the side bar
 							editorGroupService.activeGroup.focus();