development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct multi-root terminal cwd on Windows

Browse source
This commit is contained in:
Daniel Imms 2019-04-24 07:59:58 -07:00
parent 00599b2d60
commit 5fe900dd7b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View file

@ -339,7 +339,7 @@ export class CreateNewTerminalAction extends Action {
// Don't create the instance if the workspace picker was canceled // Don't create the instance if the workspace picker was canceled
return null; return null;
} }
return this.terminalService.createTerminal({ cwd: workspace.uri.fsPath }, true); return this.terminalService.createTerminal({ cwd: workspace.uri }, true);
}); });
} }

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

@ -15,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver'; import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
import { Schemas } from 'vs/base/common/network'; import { Schemas } from 'vs/base/common/network';
import { REMOTE_HOST_SCHEME, getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts'; import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { IProductService } from 'vs/platform/product/common/product'; import { IProductService } from 'vs/platform/product/common/product';
import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal'; import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
@ -131,7 +131,7 @@ export class TerminalProcessManager implements ITerminalProcessManager {
}); });
} }
const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(hasRemoteAuthority ? REMOTE_HOST_SCHEME : undefined); const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot();
this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._terminalId, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, this._configHelper); this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._terminalId, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, this._configHelper);
} else { } else {
this._process = this._launchProcess(shellLaunchConfig, cols, rows); this._process = this._launchProcess(shellLaunchConfig, cols, rows);