Skip to content

Commit 4629c56

Browse files
weinandweinand
committed
cleanup for microsoft#81060 
1 parent 3782d65 commit 4629c56

3 files changed

Lines changed: 7 additions & 30 deletions

File tree

‎src/vs/platform/electron/electron-main/electronMainService.ts‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ import { INativeOpenWindowOptions } from 'vs/platform/windows/node/window';
1010
import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
1111
import { IOpenedWindow, OpenContext, IWindowOpenable, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
1212
import { INativeOpenDialogOptions } from 'vs/platform/dialogs/node/dialogs';
13-
import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
13+
import { isMacintosh } from 'vs/base/common/platform';
1414
import { IElectronService } from 'vs/platform/electron/node/electron';
1515
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1616
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1717
import { AddFirstParameterToFunctions } from 'vs/base/common/types';
1818
import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
1919
import { dirExists } from 'vs/base/node/pfs';
2020
import { URI } from 'vs/base/common/uri';
21-
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
2221
import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2322
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
2423

@@ -407,24 +406,6 @@ export class ElectronMainService implements IElectronMainService {
407406

408407
//#endregion
409408

410-
//#region Debug
411-
412-
// TODO@Isidor move into debug IPC channel (https://github.com/microsoft/vscode/issues/81060)
413-
414-
async openExtensionDevelopmentHostWindow(windowId: number, args: string[], env: IProcessEnvironment): Promise<void> {
415-
const pargs = parseArgs(args, OPTIONS);
416-
const extDevPaths = pargs.extensionDevelopmentPath;
417-
if (extDevPaths) {
418-
this.windowsMainService.openExtensionDevelopmentHostWindow(extDevPaths, {
419-
context: OpenContext.API,
420-
cli: pargs,
421-
userEnv: Object.keys(env).length > 0 ? env : undefined
422-
});
423-
}
424-
}
425-
426-
//#endregion
427-
428409
private windowById(windowId: number | undefined): ICodeWindow | undefined {
429410
if (typeof windowId !== 'number') {
430411
return undefined;

‎src/vs/workbench/contrib/debug/browser/extensionHostDebugService.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { URI } from 'vs/base/common/uri';
1616
import { mapToSerializable } from 'vs/base/common/map';
1717
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
1818
import { IWorkspaceProvider, IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
19+
import { IProcessEnvironment } from 'vs/base/common/platform';
1920

2021
class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient implements IExtensionHostDebugService {
2122

@@ -44,11 +45,6 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
4445
console.warn('Extension Host Debugging not available due to missing workspace provider.');
4546
}
4647

47-
this.registerListeners(environmentService);
48-
}
49-
50-
private registerListeners(environmentService: IWorkbenchEnvironmentService): void {
51-
5248
// Reload window on reload request
5349
this._register(this.onReload(event => {
5450
if (environmentService.isExtensionDevelopment && environmentService.debugExtensionHost.debugId === event.sessionId) {
@@ -64,7 +60,8 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
6460
}));
6561
}
6662

67-
async openExtensionDevelopmentHostWindow(args: string[]): Promise<void> {
63+
openExtensionDevelopmentHostWindow(args: string[], env: IProcessEnvironment): Promise<void> {
64+
6865
if (!this.workspaceProvider.payload) {
6966
// TODO@Ben remove me once environment is adopted
7067
return this.openExtensionDevelopmentHostWindowLegacy(args);
@@ -101,13 +98,13 @@ class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient i
10198
}
10299

103100
// Open debug window as new window. Pass ParsedArgs over.
104-
this.workspaceProvider.open(debugWorkspace, {
101+
return this.workspaceProvider.open(debugWorkspace, {
105102
reuse: false, // debugging always requires a new window
106103
payload: mapToSerializable(environment) // mandatory properties to enable debugging
107104
});
108105
}
109106

110-
private async openExtensionDevelopmentHostWindowLegacy(args: string[]): Promise<void> {
107+
private openExtensionDevelopmentHostWindowLegacy(args: string[]): Promise<void> {
111108
// we pass the "args" as query parameters of the URL
112109

113110
let newAddress = `${document.location.origin}${document.location.pathname}?`;

‎src/vs/workbench/test/workbenchTestServices.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
7070
import { ViewletDescriptor, Viewlet } from 'vs/workbench/browser/viewlet';
7171
import { IViewlet } from 'vs/workbench/common/viewlet';
7272
import { IStorageService, InMemoryStorageService } from 'vs/platform/storage/common/storage';
73-
import { isLinux, isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
73+
import { isLinux, isMacintosh } from 'vs/base/common/platform';
7474
import { LabelService } from 'vs/workbench/services/label/common/labelService';
7575
import { IDimension } from 'vs/platform/layout/browser/layoutService';
7676
import { Part } from 'vs/workbench/browser/part';
@@ -1379,7 +1379,6 @@ export class TestElectronService implements IElectronService {
13791379
async toggleDevTools(): Promise<void> { }
13801380
async startCrashReporter(options: Electron.CrashReporterStartOptions): Promise<void> { }
13811381
async resolveProxy(url: string): Promise<string | undefined> { return undefined; }
1382-
async openExtensionDevelopmentHostWindow(args: string[], env: IProcessEnvironment): Promise<void> { }
13831382
}
13841383

13851384
export class TestBackupMainService implements IBackupMainService {

0 commit comments

Comments
 (0)