Revert "Revert - remove getActiveWindowId change"

Benjamin Pasero · Benjamin Pasero · commit 722dd9ac1587 · 2019-09-26T07:32:53.000+02:00
This reverts commit 4a44dd5.
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
@@ -42,7 +42,6 @@ export interface IWindowsService {
 	clearRecentlyOpened(): Promise<void>;
 	getRecentlyOpened(windowId: number): Promise<IRecentlyOpened>;
 	isFocused(windowId: number): Promise<boolean>;
-	getActiveWindowId(): Promise<number | undefined>;
 }
 
 export const IWindowService = createDecorator<IWindowService>('windowService');
diff --git a/src/vs/platform/windows/common/windowsIpc.ts b/src/vs/platform/windows/common/windowsIpc.ts
@@ -58,7 +58,6 @@ export class WindowsChannel implements IServerChannel {
 			case 'getRecentlyOpened': return this.service.getRecentlyOpened(arg);
 			case 'isFocused': return this.service.isFocused(arg);
 			case 'openExtensionDevelopmentHostWindow': return (this.service as any).openExtensionDevelopmentHostWindow(arg[0], arg[1]); // TODO@Isidor move
-			case 'getActiveWindowId': return this.service.getActiveWindowId();
 		}
 
 		throw new Error(`Call not found: ${command}`);
diff --git a/src/vs/platform/windows/electron-browser/windowsService.ts b/src/vs/platform/windows/electron-browser/windowsService.ts
@@ -57,8 +57,4 @@ export class WindowsService implements IWindowsService {
 	openExtensionDevelopmentHostWindow(args: ParsedArgs, env: IProcessEnvironment): Promise<void> {
 		return this.channel.call('openExtensionDevelopmentHostWindow', [args, env]);
 	}
-
-	getActiveWindowId(): Promise<number | undefined> {
-		return this.channel.call('getActiveWindowId');
-	}
 }
diff --git a/src/vs/platform/windows/electron-main/legacyWindowsMainService.ts b/src/vs/platform/windows/electron-main/legacyWindowsMainService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { assign } from 'vs/base/common/objects';
 import { URI } from 'vs/base/common/uri';
 import { IWindowsService, OpenContext } from 'vs/platform/windows/common/windows';
@@ -23,10 +23,6 @@ export class LegacyWindowsMainService extends Disposable implements IWindowsServ
 
 	_serviceBrand: undefined;
 
-	private readonly disposables = this._register(new DisposableStore());
-
-	private _activeWindowId: number | undefined;
-
 	readonly onWindowOpen: Event<number> = Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-created', (_, w: BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
 	readonly onWindowBlur: Event<number> = Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-blur', (_, w: BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
 	readonly onWindowMaximize: Event<number> = Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-maximize', (_, w: BrowserWindow) => w.id), id => !!this.windowsMainService.getWindowById(id));
@@ -48,10 +44,6 @@ export class LegacyWindowsMainService extends Disposable implements IWindowsServ
 		super();
 
 		urlService.registerHandler(this);
-
-		// remember last active window id
-		Event.latch(Event.any(this.onWindowOpen, this.onWindowFocus))
-			(id => this._activeWindowId = id, null, this.disposables);
 	}
 
 	async addRecentlyOpened(recents: IRecent[]): Promise<void> {
@@ -96,10 +88,6 @@ export class LegacyWindowsMainService extends Disposable implements IWindowsServ
 		}
 	}
 
-	async getActiveWindowId(): Promise<number | undefined> {
-		return this._activeWindowId;
-	}
-
 	async handleURL(uri: URI): Promise<boolean> {
 
 		// Catch file URLs
diff --git a/src/vs/platform/windows/node/windows.ts b/src/vs/platform/windows/node/windows.ts
@@ -14,14 +14,18 @@ export class ActiveWindowManager extends Disposable {
 	private firstActiveWindowIdPromise: CancelablePromise<number | undefined> | undefined;
 
 	private activeWindowId: number | undefined;
+	private _activeWindowId: number | undefined;
 
 	constructor(@IWindowsService windowsService: IWindowsService) {
 		super();
 
+		// remember last active window id
+		Event.latch(Event.any(windowsService.onWindowOpen, windowsService.onWindowFocus))(id => this._activeWindowId = id, null, this.disposables);
+
 		const onActiveWindowChange = Event.latch(Event.any(windowsService.onWindowOpen, windowsService.onWindowFocus));
 		onActiveWindowChange(this.setActiveWindow, this, this.disposables);
 
-		this.firstActiveWindowIdPromise = createCancelablePromise(_ => windowsService.getActiveWindowId());
+		this.firstActiveWindowIdPromise = createCancelablePromise(_ => this.getActiveWindowId());
 		this.firstActiveWindowIdPromise
 			.then(id => this.activeWindowId = typeof this.activeWindowId === 'number' ? this.activeWindowId : id)
 			.finally(this.firstActiveWindowIdPromise = undefined);
@@ -42,4 +46,7 @@ export class ActiveWindowManager extends Disposable {
 		return `window:${id}`;
 	}
 
+	private async getActiveWindowId(): Promise<number | undefined> {
+		return this._activeWindowId;
+	}
 }
diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
@@ -165,10 +165,6 @@ export class SimpleWindowsService implements IWindowsService {
 			files: []
 		});
 	}
-
-	getActiveWindowId(): Promise<number | undefined> {
-		return Promise.resolve(0);
-	}
 }
 
 registerSingleton(IWindowsService, SimpleWindowsService);
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
@@ -1280,10 +1280,6 @@ export class TestWindowsService implements IWindowsService {
 			files: []
 		});
 	}
-
-	getActiveWindowId(): Promise<number | undefined> {
-		return Promise.resolve(undefined);
-	}
 }
 
 export class TestTextResourceConfigurationService implements ITextResourceConfigurationService {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ export interface IWindowsService {`
`42`	`42`	`clearRecentlyOpened(): Promise<void>;`
`43`	`43`	`getRecentlyOpened(windowId: number): Promise<IRecentlyOpened>;`
`44`	`44`	`isFocused(windowId: number): Promise<boolean>;`
`45`		`- getActiveWindowId(): Promise<number \| undefined>;`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`export const IWindowService = createDecorator<IWindowService>('windowService');`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ export class WindowsChannel implements IServerChannel {`
`58`	`58`	`case 'getRecentlyOpened': return this.service.getRecentlyOpened(arg);`
`59`	`59`	`case 'isFocused': return this.service.isFocused(arg);`
`60`	`60`	`case 'openExtensionDevelopmentHostWindow': return (this.service as any).openExtensionDevelopmentHostWindow(arg[0], arg[1]); // TODO@Isidor move`
`61`		`- case 'getActiveWindowId': return this.service.getActiveWindowId();`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	throw new Error(`Call not found: ${command}`);
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,4 @@ export class WindowsService implements IWindowsService {`
`57`	`57`	`openExtensionDevelopmentHostWindow(args: ParsedArgs, env: IProcessEnvironment): Promise<void> {`
`58`	`58`	`return this.channel.call('openExtensionDevelopmentHostWindow', [args, env]);`
`59`	`59`	`}`
`60`		`-`
`61`		`- getActiveWindowId(): Promise<number \| undefined> {`
`62`		`- return this.channel.call('getActiveWindowId');`
`63`		`- }`
`64`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,10 +165,6 @@ export class SimpleWindowsService implements IWindowsService {`
`165`	`165`	`files: []`
`166`	`166`	`});`
`167`	`167`	`}`
`168`		`-`
`169`		`- getActiveWindowId(): Promise<number \| undefined> {`
`170`		`- return Promise.resolve(0);`
`171`		`- }`
`172`	`168`	`}`
`173`	`169`
`174`	`170`	`registerSingleton(IWindowsService, SimpleWindowsService);`
Original file line number	Diff line number	Diff line change
`@@ -1280,10 +1280,6 @@ export class TestWindowsService implements IWindowsService {`
`1280`	`1280`	`files: []`
`1281`	`1281`	`});`
`1282`	`1282`	`}`
`1283`		`-`
`1284`		`- getActiveWindowId(): Promise<number \| undefined> {`
`1285`		`- return Promise.resolve(undefined);`
`1286`		`- }`
`1287`	`1283`	`}`
`1288`	`1284`
`1289`	`1285`	`export class TestTextResourceConfigurationService implements ITextResourceConfigurationService {`