debt - move ISharedProcess

Benjamin Pasero · Benjamin Pasero · commit 7928b7fb0043 · 2019-09-30T11:30:07.000+02:00
diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts
@@ -7,7 +7,7 @@ import { assign } from 'vs/base/common/objects';
 import { memoize } from 'vs/base/common/decorators';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { BrowserWindow, ipcMain } from 'electron';
-import { ISharedProcess } from 'vs/platform/windows/electron-main/windows';
+import { ISharedProcess } from 'vs/platform/ipc/electron-main/sharedProcessMainService';
 import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
@@ -18,7 +18,7 @@ import { parseLineAndColumnAware } from 'vs/code/node/paths';
 import { ILifecycleMainService, UnloadReason, LifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IWindowSettings, OpenContext, IPath, IWindowConfiguration, IPathsToWaitFor, isFileToOpen, isWorkspaceToOpen, isFolderToOpen, IWindowOpenable, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
+import { IWindowSettings, OpenContext, IPath, IWindowConfiguration, IPathsToWaitFor, isFileToOpen, isWorkspaceToOpen, isFolderToOpen, IWindowOpenable, IOpenEmptyWindowOptions, IAddFoldersRequest } from 'vs/platform/windows/common/windows';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/node/dialogs';
 import { getLastActiveWindow, findBestWindowOrFolderForFile, findWindowOnWorkspace, findWindowOnExtensionDevelopmentPath, findWindowOnWorkspaceOrFolderUri } from 'vs/code/node/windowsFinder';
 import { Event as CommonEvent, Emitter } from 'vs/base/common/event';
@@ -776,7 +776,9 @@ export class WindowsManager extends Disposable implements IWindowsMainService {
 	private doAddFoldersToExistingWindow(window: ICodeWindow, foldersToAdd: URI[]): ICodeWindow {
 		window.focus(); // make sure window has focus
 
-		window.sendWhenReady('vscode:addFolders', { foldersToAdd });
+		const request: IAddFoldersRequest = { foldersToAdd };
+
+		window.sendWhenReady('vscode:addFolders', request);
 
 		return window;
 	}
@@ -1623,8 +1625,10 @@ export class WindowsManager extends Disposable implements IWindowsMainService {
 		if (cli && (cli.remote !== remote)) {
 			cli = { ...cli, remote };
 		}
+
 		const forceReuseWindow = options && options.reuse;
 		const forceNewWindow = !forceReuseWindow;
+
 		return this.open({ context, cli, forceEmpty: true, forceNewWindow, forceReuseWindow });
 	}
 
diff --git a/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts b/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ISharedProcess } from 'vs/platform/windows/electron-main/windows';
 
 export const ISharedProcessMainService = createDecorator<ISharedProcessMainService>('sharedProcessMainService');
 
@@ -15,6 +14,12 @@ export interface ISharedProcessMainService {
 	whenSharedProcessReady(): Promise<void>;
 	toggleSharedProcessWindow(): Promise<void>;
 }
+
+export interface ISharedProcess {
+	whenReady(): Promise<void>;
+	toggle(): void;
+}
+
 export class SharedProcessMainService implements ISharedProcessMainService {
 
 	_serviceBrand: undefined;
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
@@ -86,6 +86,7 @@ export interface IWindowsCountChangedEvent {
 }
 
 export interface IWindowsMainService {
+
 	_serviceBrand: undefined;
 
 	// events
@@ -139,8 +140,3 @@ export interface IOpenConfiguration {
 	readonly initialStartup?: boolean;
 	readonly noRecentEntry?: boolean;
 }
-
-export interface ISharedProcess {
-	whenReady(): Promise<void>;
-	toggle(): void;
-}

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ export interface IWindowsCountChangedEvent {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`export interface IWindowsMainService {`
	`89`	`+`
`89`	`90`	`_serviceBrand: undefined;`
`90`	`91`
`91`	`92`	`// events`
`@@ -139,8 +140,3 @@ export interface IOpenConfiguration {`
`139`	`140`	`readonly initialStartup?: boolean;`
`140`	`141`	`readonly noRecentEntry?: boolean;`
`141`	`142`	`}`
`142`		`-`
`143`		`-export interface ISharedProcess {`
`144`		`- whenReady(): Promise<void>;`
`145`		`- toggle(): void;`
`146`		`-}`