fix: make toggleFullScreen hookable instead of patching it

Author: gaspar-chefdeville

src/service-override/host.ts

@@ -1,13 +1,75 @@
+import { mainWindow } from 'vs/base/browser/window'
 import type { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service'
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs.service'
+import { IFileService } from 'vs/platform/files/common/files.service'
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
-import { IHostService } from 'vs/workbench/services/host/browser/host.service'
-import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService.service'
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'
+import { ILabelService } from 'vs/platform/label/common/label.service'
+import { ILayoutService } from 'vs/platform/layout/browser/layoutService.service'
+import { ILogService } from 'vs/platform/log/common/log.service'
+import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service'
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service'
+import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService.service'
 import { BrowserHostService } from 'vs/workbench/services/host/browser/browserHostService'
+import { IHostService } from 'vs/workbench/services/host/browser/host.service'
+import type { BrowserLifecycleService } from 'vs/workbench/services/lifecycle/browser/lifecycleService'
+import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service'
 import { BrowserHostColorSchemeService } from 'vs/workbench/services/themes/browser/browserHostColorSchemeService'
+import { IHostColorSchemeService } from 'vs/workbench/services/themes/common/hostColorSchemeService.service'
+
+class CustomBrowserHostService extends BrowserHostService {
+  constructor(
+    private _toggleFullScreen: () => Promise<void> | undefined,
+    @ILayoutService layoutService: ILayoutService,
+    @IConfigurationService configurationService: IConfigurationService,
+    @IFileService fileService: IFileService,
+    @ILabelService labelService: ILabelService,
+    @IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
+    @IInstantiationService instantiationService: IInstantiationService,
+    @ILifecycleService lifecycleService: BrowserLifecycleService,
+    @ILogService logService: ILogService,
+    @IDialogService dialogService: IDialogService,
+    @IWorkspaceContextService contextService: IWorkspaceContextService,
+    @IUserDataProfilesService userDataProfilesService: IUserDataProfilesService
+  ) {
+    super(
+      layoutService,
+      configurationService,
+      fileService,
+      labelService,
+      environmentService,
+      instantiationService,
+      lifecycleService,
+      logService,
+      dialogService,
+      contextService,
+      userDataProfilesService
+    )
+  }
 
-export default function getServiceOverride(): IEditorOverrideServices {
+  override async toggleFullScreen(targetWindow: Window): Promise<void> {
+    if (this._toggleFullScreen != null && targetWindow === mainWindow) {
+      await this._toggleFullScreen()
+    } else {
+      await super.toggleFullScreen(targetWindow)
+    }
+  }
+}
+
+interface BrowserHostServiceOverrideParams {
+  toggleFullScreen?: (targetWindow: Window) => Promise<void>
+}
+
+export default function getServiceOverride({
+  toggleFullScreen
+}: BrowserHostServiceOverrideParams = {}): IEditorOverrideServices {
   return {
-    [IHostService.toString()]: new SyncDescriptor(BrowserHostService, [], true),
+    [IHostService.toString()]: new SyncDescriptor(
+      CustomBrowserHostService,
+      [toggleFullScreen],
+      true
+    ),
     [IHostColorSchemeService.toString()]: new SyncDescriptor(
       BrowserHostColorSchemeService,
       [],

vscode-patches/0071-feat-prevent-IDE-from-entering-fullscreen-if-not-occ.patch

@@ -7,8 +7,8 @@ Subject: [PATCH] feat: prevent IDE from entering fullscreen if not occupying
 ---
  src/vs/base/browser/dom.ts                           | 12 ++++++++----
  src/vs/workbench/browser/web.main.ts                 |  2 +-
- .../services/host/browser/browserHostService.ts      |  4 ++--
- 3 files changed, 11 insertions(+), 7 deletions(-)
+ .../services/host/browser/browserHostService.ts      |  4 +-
+ 3 files changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
 index 49549236908..af89a7f1e46 100644
@@ -74,13 +74,3 @@ index 6f62f49b906..6e41a554052 100644
 +				const fullScreen = detectFullscreen(window, this.layoutService.getContainer(window));
  				return fullScreen !== null && !fullScreen.guess;
  			};
- 
-@@ -523,7 +523,7 @@ export class BrowserHostService extends Disposable implements IHostService {
- 	}
- 
- 	async toggleFullScreen(targetWindow: Window): Promise<void> {
--		const target = this.layoutService.getContainer(targetWindow);
-+		const target = targetWindow === mainWindow ? targetWindow.document.body : this.layoutService.getContainer(targetWindow);
- 
- 		// Chromium
- 		if (targetWindow.document.fullscreen !== undefined) {