Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8046b730
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,发现更多精彩内容 >>
提交
8046b730
编写于
4月 06, 2020
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use IRemotePathService.userHome over IEnvironmentService
Part of #94506
上级
d5a55ef7
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
10 deletion
+12
-10
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
...kbench/contrib/terminal/browser/terminalProcessManager.ts
+12
-10
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
浏览文件 @
8046b730
...
...
@@ -24,6 +24,7 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
withNullAsUndefined
}
from
'
vs/base/common/types
'
;
import
{
IEnvironmentVariableService
,
IMergedEnvironmentVariableCollection
}
from
'
vs/workbench/contrib/terminal/common/environmentVariable
'
;
import
{
IRemotePathService
}
from
'
vs/workbench/services/path/common/remotePathService
'
;
/** The amount of time to consider terminal errors to be related to the launch */
const
LAUNCHING_DURATION
=
500
;
...
...
@@ -90,6 +91,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
@
IProductService
private
readonly
_productService
:
IProductService
,
@
ITerminalInstanceService
private
readonly
_terminalInstanceService
:
ITerminalInstanceService
,
@
IRemoteAgentService
private
readonly
_remoteAgentService
:
IRemoteAgentService
,
@
IRemotePathService
private
readonly
_remotePathService
:
IRemotePathService
,
@
IEnvironmentVariableService
private
readonly
_environmentVariableService
:
IEnvironmentVariableService
)
{
super
();
...
...
@@ -133,23 +135,22 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
const
hasRemoteAuthority
=
!!
this
.
remoteAuthority
;
let
launchRemotely
=
hasRemoteAuthority
||
forceExtHostProcess
;
this
.
userHome
=
this
.
_environmentService
.
userHome
?.
fsPath
;
const
userHomeUri
=
await
this
.
_remotePathService
.
userHome
;
this
.
os
=
platform
.
OS
;
if
(
launchRemotely
)
{
this
.
userHome
=
userHomeUri
.
path
;
if
(
hasRemoteAuthority
)
{
this
.
_remoteAgentService
.
getEnvironment
().
then
(
env
=>
{
if
(
!
env
)
{
return
;
}
this
.
userHome
=
env
.
userHome
.
path
;
this
.
os
=
env
.
os
;
});
const
remoteEnv
=
await
this
.
_remoteAgentService
.
getEnvironment
();
if
(
remoteEnv
)
{
this
.
os
=
remoteEnv
.
os
;
}
}
const
activeWorkspaceRootUri
=
this
.
_historyService
.
getLastActiveWorkspaceRoot
();
this
.
_process
=
this
.
_instantiationService
.
createInstance
(
TerminalProcessExtHostProxy
,
this
.
_terminalId
,
shellLaunchConfig
,
activeWorkspaceRootUri
,
cols
,
rows
,
this
.
_configHelper
);
}
else
{
this
.
_process
=
await
this
.
_launchProcess
(
shellLaunchConfig
,
cols
,
rows
,
isScreenReaderModeEnabled
);
this
.
userHome
=
userHomeUri
.
fsPath
;
this
.
_process
=
await
this
.
_launchProcess
(
shellLaunchConfig
,
cols
,
rows
,
this
.
userHome
,
isScreenReaderModeEnabled
);
}
}
this
.
processState
=
ProcessState
.
LAUNCHING
;
...
...
@@ -194,6 +195,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
shellLaunchConfig
:
IShellLaunchConfig
,
cols
:
number
,
rows
:
number
,
userHome
:
string
,
isScreenReaderModeEnabled
:
boolean
):
Promise
<
ITerminalChildProcess
>
{
const
activeWorkspaceRootUri
=
this
.
_historyService
.
getLastActiveWorkspaceRoot
(
Schemas
.
file
);
...
...
@@ -220,7 +222,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
const
initialCwd
=
terminalEnvironment
.
getCwd
(
shellLaunchConfig
,
this
.
_environmentService
.
userHome
?.
fsPath
!
,
userHome
,
lastActiveWorkspace
,
this
.
_configurationResolverService
,
activeWorkspaceRootUri
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录