Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2af13d9f
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2af13d9f
编写于
4月 10, 2020
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move to userHomeSync in terminal
Part of #94506
上级
b8ac2129
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
4 deletion
+7
-4
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
...kbench/contrib/terminal/browser/terminalProcessManager.ts
+5
-2
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
.../workbench/contrib/terminal/common/terminalEnvironment.ts
+2
-2
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
浏览文件 @
2af13d9f
...
...
@@ -135,6 +135,9 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
const
hasRemoteAuthority
=
!!
this
.
remoteAuthority
;
let
launchRemotely
=
hasRemoteAuthority
||
forceExtHostProcess
;
// userHomeSync is needed here as remote resolvers can launch local terminals before
// they're connected to the remote.
this
.
userHome
=
this
.
_remotePathService
.
userHomeSync
?.
fsPath
;
const
userHomeUri
=
await
this
.
_remotePathService
.
userHome
;
this
.
os
=
platform
.
OS
;
if
(
launchRemotely
)
{
...
...
@@ -142,6 +145,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
if
(
hasRemoteAuthority
)
{
const
remoteEnv
=
await
this
.
_remoteAgentService
.
getEnvironment
();
if
(
remoteEnv
)
{
this
.
userHome
=
remoteEnv
.
userHome
.
path
;
this
.
os
=
remoteEnv
.
os
;
}
}
...
...
@@ -149,7 +153,6 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
const
activeWorkspaceRootUri
=
this
.
_historyService
.
getLastActiveWorkspaceRoot
();
this
.
_process
=
this
.
_instantiationService
.
createInstance
(
TerminalProcessExtHostProxy
,
this
.
_terminalId
,
shellLaunchConfig
,
activeWorkspaceRootUri
,
cols
,
rows
,
this
.
_configHelper
);
}
else
{
this
.
userHome
=
userHomeUri
.
fsPath
;
this
.
_process
=
await
this
.
_launchProcess
(
shellLaunchConfig
,
cols
,
rows
,
this
.
userHome
,
isScreenReaderModeEnabled
);
}
}
...
...
@@ -195,7 +198,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
shellLaunchConfig
:
IShellLaunchConfig
,
cols
:
number
,
rows
:
number
,
userHome
:
string
,
userHome
:
string
|
undefined
,
isScreenReaderModeEnabled
:
boolean
):
Promise
<
ITerminalChildProcess
>
{
const
activeWorkspaceRootUri
=
this
.
_historyService
.
getLastActiveWorkspaceRoot
(
Schemas
.
file
);
...
...
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
浏览文件 @
2af13d9f
...
...
@@ -176,7 +176,7 @@ export function getLangEnvVariable(locale?: string): string {
export
function
getCwd
(
shell
:
IShellLaunchConfig
,
userHome
:
string
,
userHome
:
string
|
undefined
,
lastActiveWorkspace
:
IWorkspaceFolder
|
undefined
,
configurationResolverService
:
IConfigurationResolverService
|
undefined
,
root
:
Uri
|
undefined
,
...
...
@@ -206,7 +206,7 @@ export function getCwd(
// If there was no custom cwd or it was relative with no workspace
if
(
!
cwd
)
{
cwd
=
root
?
root
.
fsPath
:
userHome
;
cwd
=
root
?
root
.
fsPath
:
userHome
||
''
;
}
return
_sanitizeCwd
(
cwd
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录