Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a6280584
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,发现更多精彩内容 >>
提交
a6280584
编写于
1月 13, 2020
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Expose IExtHostTerminalService.getDefaultShellArgs internally
Fixes #88280
上级
76c72ffc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
3 deletion
+9
-3
src/vs/workbench/api/common/extHostTerminalService.ts
src/vs/workbench/api/common/extHostTerminalService.ts
+6
-0
src/vs/workbench/api/node/extHostTerminalService.ts
src/vs/workbench/api/node/extHostTerminalService.ts
+3
-3
未找到文件。
src/vs/workbench/api/common/extHostTerminalService.ts
浏览文件 @
a6280584
...
...
@@ -32,6 +32,7 @@ export interface IExtHostTerminalService extends ExtHostTerminalServiceShape {
createExtensionTerminal
(
options
:
vscode
.
ExtensionTerminalOptions
):
vscode
.
Terminal
;
attachPtyToTerminal
(
id
:
number
,
pty
:
vscode
.
Pseudoterminal
):
void
;
getDefaultShell
(
useAutomationShell
:
boolean
,
configProvider
:
ExtHostConfigProvider
):
string
;
getDefaultShellArgs
(
useAutomationShell
:
boolean
,
configProvider
:
ExtHostConfigProvider
):
string
[]
|
string
;
}
export
const
IExtHostTerminalService
=
createDecorator
<
IExtHostTerminalService
>
(
'
IExtHostTerminalService
'
);
...
...
@@ -321,6 +322,7 @@ export abstract class BaseExtHostTerminalService implements IExtHostTerminalServ
public
abstract
createTerminal
(
name
?:
string
,
shellPath
?:
string
,
shellArgs
?:
string
[]
|
string
):
vscode
.
Terminal
;
public
abstract
createTerminalFromOptions
(
options
:
vscode
.
TerminalOptions
):
vscode
.
Terminal
;
public
abstract
getDefaultShell
(
useAutomationShell
:
boolean
,
configProvider
:
ExtHostConfigProvider
):
string
;
public
abstract
getDefaultShellArgs
(
useAutomationShell
:
boolean
,
configProvider
:
ExtHostConfigProvider
):
string
[]
|
string
;
public
abstract
$spawnExtHostProcess
(
id
:
number
,
shellLaunchConfigDto
:
IShellLaunchConfigDto
,
activeWorkspaceRootUriComponents
:
UriComponents
,
cols
:
number
,
rows
:
number
,
isWorkspaceShellAllowed
:
boolean
):
Promise
<
void
>
;
public
abstract
$requestAvailableShells
():
Promise
<
IShellDefinitionDto
[]
>
;
public
abstract
$requestDefaultShellAndArgs
(
useAutomationShell
:
boolean
):
Promise
<
IShellAndArgsDto
>
;
...
...
@@ -595,6 +597,10 @@ export class WorkerExtHostTerminalService extends BaseExtHostTerminalService {
throw
new
Error
(
'
Not implemented
'
);
}
public
getDefaultShellArgs
(
useAutomationShell
:
boolean
,
configProvider
:
ExtHostConfigProvider
):
string
[]
|
string
{
throw
new
Error
(
'
Not implemented
'
);
}
public
$spawnExtHostProcess
(
id
:
number
,
shellLaunchConfigDto
:
IShellLaunchConfigDto
,
activeWorkspaceRootUriComponents
:
UriComponents
,
cols
:
number
,
rows
:
number
,
isWorkspaceShellAllowed
:
boolean
):
Promise
<
void
>
{
throw
new
Error
(
'
Not implemented
'
);
}
...
...
src/vs/workbench/api/node/extHostTerminalService.ts
浏览文件 @
a6280584
...
...
@@ -78,7 +78,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
);
}
p
rivate
_
getDefaultShellArgs
(
useAutomationShell
:
boolean
,
configProvider
:
ExtHostConfigProvider
):
string
[]
|
string
{
p
ublic
getDefaultShellArgs
(
useAutomationShell
:
boolean
,
configProvider
:
ExtHostConfigProvider
):
string
[]
|
string
{
const
fetchSetting
=
(
key
:
string
):
{
userValue
:
string
|
string
[]
|
undefined
,
value
:
string
|
string
[]
|
undefined
,
defaultValue
:
string
|
string
[]
|
undefined
}
=>
{
const
setting
=
configProvider
.
getConfiguration
(
key
.
substr
(
0
,
key
.
lastIndexOf
(
'
.
'
)))
...
...
@@ -137,7 +137,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
const
configProvider
=
await
this
.
_extHostConfiguration
.
getConfigProvider
();
if
(
!
shellLaunchConfig
.
executable
)
{
shellLaunchConfig
.
executable
=
this
.
getDefaultShell
(
false
,
configProvider
);
shellLaunchConfig
.
args
=
this
.
_
getDefaultShellArgs
(
false
,
configProvider
);
shellLaunchConfig
.
args
=
this
.
getDefaultShellArgs
(
false
,
configProvider
);
}
else
{
if
(
this
.
_variableResolver
)
{
shellLaunchConfig
.
executable
=
this
.
_variableResolver
.
resolve
(
this
.
_lastActiveWorkspace
,
shellLaunchConfig
.
executable
);
...
...
@@ -208,7 +208,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
const
configProvider
=
await
this
.
_extHostConfiguration
.
getConfigProvider
();
return
Promise
.
resolve
({
shell
:
this
.
getDefaultShell
(
useAutomationShell
,
configProvider
),
args
:
this
.
_
getDefaultShellArgs
(
useAutomationShell
,
configProvider
)
args
:
this
.
getDefaultShellArgs
(
useAutomationShell
,
configProvider
)
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录