Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
cbe00248
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cbe00248
编写于
3月 13, 2017
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support terminal shell args as string
Fixes #19078
上级
693e91fd
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
19 addition
and
8 deletion
+19
-8
src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
...kbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+1
-1
src/vs/workbench/parts/terminal/common/terminal.ts
src/vs/workbench/parts/terminal/common/terminal.ts
+5
-2
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+8
-4
src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
...kbench/parts/terminal/electron-browser/terminalProcess.js
+5
-1
未找到文件。
src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
浏览文件 @
cbe00248
...
...
@@ -391,7 +391,7 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem {
}
else
{
(
this
.
terminalService
.
configHelper
as
TerminalConfigHelper
).
mergeDefaultShellPathAndArgs
(
shellLaunchConfig
);
}
let
shellArgs
=
shellLaunchConfig
.
args
.
slice
(
0
);
let
shellArgs
=
<
string
[]
>
shellLaunchConfig
.
args
.
slice
(
0
);
let
toAdd
:
string
[]
=
[];
let
commandLine
=
args
&&
args
.
length
>
0
?
`
${
command
}
${
args
.
join
(
'
'
)}
`
:
`
${
command
}
`
;
if
(
Platform
.
isWindows
)
{
...
...
src/vs/workbench/parts/terminal/common/terminal.ts
浏览文件 @
cbe00248
...
...
@@ -79,8 +79,11 @@ export interface IShellLaunchConfig {
name
?:
string
;
/** The shell executable (bash, cmd, etc.). */
executable
?:
string
;
/** The CLI arguments to use with executable. */
args
?:
string
[];
/**
* The CLI arguments to use with executable, a string[] is in argv format and will be escaped,
* a string is in "CommandLine" pre-escaped format and will be used as is.
*/
args
?:
string
[]
|
string
;
/**
* The current working directory of the terminal, this overrides the `terminal.integrated.cwd`
* settings key.
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
cbe00248
...
...
@@ -522,7 +522,9 @@ export class TerminalInstance implements ITerminalInstance {
if
(
exitCode
)
{
if
(
this
.
_isLaunching
)
{
let
args
=
''
;
if
(
this
.
_shellLaunchConfig
.
args
&&
this
.
_shellLaunchConfig
.
args
.
length
)
{
if
(
typeof
this
.
_shellLaunchConfig
.
args
===
'
string
'
)
{
args
=
this
.
_shellLaunchConfig
.
args
;
}
else
if
(
this
.
_shellLaunchConfig
.
args
&&
this
.
_shellLaunchConfig
.
args
.
length
)
{
args
=
'
'
+
this
.
_shellLaunchConfig
.
args
.
map
(
a
=>
{
if
(
a
.
indexOf
(
'
'
)
!==
-
1
)
{
return
`'
${
a
}
'`
;
...
...
@@ -578,9 +580,11 @@ export class TerminalInstance implements ITerminalInstance {
env
[
'
PTYPID
'
]
=
process
.
pid
.
toString
();
env
[
'
PTYSHELL
'
]
=
shell
.
executable
;
if
(
shell
.
args
)
{
shell
.
args
.
forEach
((
arg
,
i
)
=>
{
env
[
`PTYSHELLARG
${
i
}
`
]
=
arg
;
});
if
(
typeof
shell
.
args
===
'
string
'
)
{
env
[
`PTYSHELLCMDLINE`
]
=
shell
.
args
;
}
else
{
shell
.
args
.
forEach
((
arg
,
i
)
=>
env
[
`PTYSHELLARG
${
i
}
`
]
=
arg
);
}
}
env
[
'
PTYCWD
'
]
=
cwd
;
env
[
'
LANG
'
]
=
TerminalInstance
.
_getLangEnvVariable
(
locale
);
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
浏览文件 @
cbe00248
...
...
@@ -63,6 +63,9 @@ sendProcessId();
setupTitlePolling
();
function
getArgs
()
{
if
(
process
.
env
[
'
PTYSHELLCMDLINE
'
])
{
return
process
.
env
[
'
PTYSHELLCMDLINE
'
];
}
var
args
=
[];
var
i
=
0
;
while
(
process
.
env
[
'
PTYSHELLARG
'
+
i
])
{
...
...
@@ -79,7 +82,8 @@ function cleanEnv() {
'
PTYPID
'
,
'
PTYSHELL
'
,
'
PTYCOLS
'
,
'
PTYROWS
'
'
PTYROWS
'
,
'
PTYSHELLCMDLINE
'
];
keys
.
forEach
(
function
(
key
)
{
if
(
process
.
env
[
key
])
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录