actually fix #134030
This commit is contained in:
parent
12167d7ce8
commit
350bd769d9
|
@ -19,7 +19,7 @@ import { IMainProcessInfo, IWindowInfo } from 'vs/platform/launch/common/launch'
|
|||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { IURLService } from 'vs/platform/url/common/url';
|
||||
import { IWindowSettings } from 'vs/platform/windows/common/windows';
|
||||
import { ICodeWindow, IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
|
||||
import { ICodeWindow, IOpenConfiguration, IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
|
||||
import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
|
||||
import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
|
||||
|
||||
|
@ -121,15 +121,17 @@ export class LaunchMainService implements ILaunchMainService {
|
|||
const waitMarkerFileURI = args.wait && args.waitMarkerFilePath ? URI.file(args.waitMarkerFilePath) : undefined;
|
||||
const remoteAuthority = args.remote || undefined;
|
||||
|
||||
// Special case extension development
|
||||
if (!!args.extensionDevelopmentPath) {
|
||||
this.windowsMainService.openExtensionDevelopmentHostWindow(args.extensionDevelopmentPath, {
|
||||
const baseConfig: IOpenConfiguration = {
|
||||
context,
|
||||
cli: args,
|
||||
userEnv,
|
||||
waitMarkerFileURI,
|
||||
remoteAuthority
|
||||
});
|
||||
};
|
||||
|
||||
// Special case extension development
|
||||
if (!!args.extensionDevelopmentPath) {
|
||||
this.windowsMainService.openExtensionDevelopmentHostWindow(args.extensionDevelopmentPath, baseConfig);
|
||||
}
|
||||
|
||||
// Start without file/folder arguments
|
||||
|
@ -165,13 +167,9 @@ export class LaunchMainService implements ILaunchMainService {
|
|||
// Open new Window
|
||||
if (openNewWindow) {
|
||||
usedWindows = this.windowsMainService.open({
|
||||
context,
|
||||
cli: args,
|
||||
userEnv,
|
||||
...baseConfig,
|
||||
forceNewWindow: true,
|
||||
forceEmpty: true,
|
||||
waitMarkerFileURI,
|
||||
remoteAuthority
|
||||
forceEmpty: true
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -179,21 +177,13 @@ export class LaunchMainService implements ILaunchMainService {
|
|||
else {
|
||||
const lastActive = this.windowsMainService.getLastActiveWindow();
|
||||
if (lastActive) {
|
||||
this.windowsMainService.openExistingWindow(lastActive, {
|
||||
context,
|
||||
cli: args,
|
||||
userEnv,
|
||||
remoteAuthority
|
||||
});
|
||||
this.windowsMainService.openExistingWindow(lastActive, baseConfig);
|
||||
|
||||
usedWindows = [lastActive];
|
||||
} else {
|
||||
usedWindows = this.windowsMainService.open({
|
||||
context,
|
||||
cli: args,
|
||||
userEnv,
|
||||
forceEmpty: true,
|
||||
remoteAuthority
|
||||
...baseConfig,
|
||||
forceEmpty: true
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -202,18 +192,14 @@ export class LaunchMainService implements ILaunchMainService {
|
|||
// Start with file/folder arguments
|
||||
else {
|
||||
usedWindows = this.windowsMainService.open({
|
||||
context,
|
||||
cli: args,
|
||||
userEnv,
|
||||
...baseConfig,
|
||||
forceNewWindow: args['new-window'],
|
||||
preferNewWindow: !args['reuse-window'] && !args.wait,
|
||||
forceReuseWindow: args['reuse-window'],
|
||||
diffMode: args.diff,
|
||||
addMode: args.add,
|
||||
noRecentEntry: !!args['skip-add-to-recently-opened'],
|
||||
waitMarkerFileURI,
|
||||
gotoLineMode: args.goto,
|
||||
remoteAuthority
|
||||
gotoLineMode: args.goto
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue