Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gzupanda
code-server
提交
0f18d1fd
C
code-server
项目概览
gzupanda
/
code-server
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
code-server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
0f18d1fd
编写于
2月 25, 2021
作者:
J
Joe Previte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: update import in channel.ts getSystemShell
上级
b71c5061
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
3 deletion
+4
-3
lib/vscode/src/vs/server/node/channel.ts
lib/vscode/src/vs/server/node/channel.ts
+4
-3
未找到文件。
lib/vscode/src/vs/server/node/channel.ts
浏览文件 @
0f18d1fd
...
...
@@ -30,7 +30,7 @@ import * as terminal from 'vs/workbench/contrib/terminal/common/remoteTerminalCh
import
{
IShellLaunchConfig
,
ITerminalEnvironment
,
ITerminalLaunchError
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
TerminalDataBufferer
}
from
'
vs/workbench/contrib/terminal/common/terminalDataBuffering
'
;
import
*
as
terminalEnvironment
from
'
vs/workbench/contrib/terminal/common/terminalEnvironment
'
;
import
{
getSystemShell
}
from
'
vs/
workbench/contrib/terminal/node/termina
l
'
;
import
{
getSystemShell
}
from
'
vs/
base/node/shel
l
'
;
import
{
getMainProcessParentEnv
}
from
'
vs/workbench/contrib/terminal/node/terminalEnvironment
'
;
import
{
TerminalProcess
}
from
'
vs/workbench/contrib/terminal/node/terminalProcess
'
;
import
{
AbstractVariableResolverService
}
from
'
vs/workbench/services/configurationResolver/common/variableResolver
'
;
...
...
@@ -263,6 +263,7 @@ export class ExtensionEnvironmentChannel implements IServerChannel {
workspaceStorageHome
:
this
.
environment
.
workspaceStorageHome
,
userHome
:
this
.
environment
.
userHome
,
os
:
platform
.
OS
,
marks
:
[]
};
}
...
...
@@ -681,7 +682,7 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
const
resolverService
=
new
VariableResolverService
(
remoteAuthority
,
args
,
process
.
env
as
platform
.
IProcessEnvironment
);
const
resolver
=
terminalEnvironment
.
createVariableResolver
(
activeWorkspace
,
resolverService
);
const
getDefaultShellAndArgs
=
():
{
executable
:
string
;
args
:
string
[]
|
string
}
=>
{
const
getDefaultShellAndArgs
=
async
():
Promise
<
{
executable
:
string
;
args
:
string
[]
|
string
}
>
=>
{
if
(
shellLaunchConfig
.
executable
)
{
const
executable
=
resolverService
.
resolve
(
activeWorkspace
,
shellLaunchConfig
.
executable
);
let
resolvedArgs
:
string
[]
|
string
=
[];
...
...
@@ -698,7 +699,7 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
const
executable
=
terminalEnvironment
.
getDefaultShell
(
(
key
)
=>
args
.
configuration
[
key
],
args
.
isWorkspaceShellAllowed
,
getSystemShell
(
platform
.
platform
),
await
getSystemShell
(
platform
.
platform
),
process
.
env
.
hasOwnProperty
(
'
PROCESSOR_ARCHITEW6432
'
),
process
.
env
.
windir
,
resolver
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录