maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolve default profile in remote slc

Browse source
This commit is contained in:
Daniel Imms 2021-04-16 06:09:40 -07:00
parent a76a1efe04
commit 9e77384443
No known key found for this signature in database
GPG key ID: D12BE8272D6284CC
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
View file

@ -194,29 +194,24 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
this._processType = ProcessType.PsuedoTerminal;
newProcess = shellLaunchConfig.customPtyImplementation(this._instanceId, cols, rows);
} else {
const forceExtHostProcess = (this._configHelper.config as any).extHostProcess;
if (shellLaunchConfig.cwd && typeof shellLaunchConfig.cwd === 'object') {
this.remoteAuthority = getRemoteAuthority(shellLaunchConfig.cwd);
} else {
this.remoteAuthority = this._environmentService.remoteAuthority;
}
const hasRemoteAuthority = !!this.remoteAuthority;
let launchRemotely = hasRemoteAuthority || forceExtHostProcess;
// resolvedUserHome is needed here as remote resolvers can launch local terminals before
// they're connected to the remote.
this.userHome = this._pathService.resolvedUserHome?.fsPath;
this.os = platform.OS;
if (launchRemotely) {
if (hasRemoteAuthority) {
const userHomeUri = await this._pathService.userHome();
this.userHome = userHomeUri.path;
if (hasRemoteAuthority) {
this._remoteAgentService.getEnvironment().then(remoteEnv => {
if (remoteEnv) {
this.userHome = remoteEnv.userHome.path;
this.os = remoteEnv.os;
}
});
const remoteEnv = await this._remoteAgentService.getEnvironment();
if (remoteEnv) {
this.userHome = remoteEnv.userHome.path;
this.os = remoteEnv.os;
}
const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot();
@ -234,6 +229,9 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
return undefined;
}
} else {
await this._terminalProfileResolverService.resolveShellLaunchConfig(shellLaunchConfig, {
platform: this._osToPlatform(this.os)
});
newProcess = await this._remoteTerminalService.createProcess(shellLaunchConfig, activeWorkspaceRootUri, cols, rows, shouldPersist, this._configHelper);
}
if (!this._isDisposed) {
@ -370,8 +368,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
isScreenReaderModeEnabled: boolean
): Promise<ITerminalChildProcess> {
await this._terminalProfileResolverService.resolveShellLaunchConfig(shellLaunchConfig, {
platform: platform.platform,
allowAutomationShell: false
platform: platform.platform
});
const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(Schemas.file);
@ -547,6 +544,14 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
this.environmentVariableInfo = this._instantiationService.createInstance(EnvironmentVariableInfoStale, diff, this._instanceId);
this._onEnvironmentVariableInfoChange.fire(this.environmentVariableInfo);
}
private _osToPlatform(os: platform.OperatingSystem) {
switch (os) {
case platform.OperatingSystem.Linux: return platform.Platform.Linux;
case platform.OperatingSystem.Macintosh: return platform.Platform.Mac;
case platform.OperatingSystem.Windows: return platform.Platform.Windows;
}
}
}
class AckDataBufferer {

4
src/vs/workbench/contrib/terminal/common/terminal.ts
View file

@ -92,8 +92,10 @@ export interface ITerminalProfileResolverService {
}
export interface IShellLaunchConfigResolveOptions {
// TODO: Pass remote authority in so that local and remote terminals can be resolved correctly
// TODO: Consider converting to OperatingSystem such that it's not possible to pass Platform.web in
platform: Platform;
allowAutomationShell: boolean;
allowAutomationShell?: boolean;
}
export type FontWeight = 'normal' | 'bold' | number;