Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4cb90f3b
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,体验更适合开发者的 AI 搜索 >>
提交
4cb90f3b
编写于
1月 28, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'krizzdewizz-master'
上级
685baff9
6232afb8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
6 deletion
+14
-6
src/vs/base/node/processes.ts
src/vs/base/node/processes.ts
+6
-2
src/vs/workbench/parts/execution/electron-browser/executionService.ts
...ench/parts/execution/electron-browser/executionService.ts
+6
-3
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
...bench/parts/execution/electron-browser/terminalService.ts
+2
-1
未找到文件。
src/vs/base/node/processes.ts
浏览文件 @
4cb90f3b
...
...
@@ -75,6 +75,10 @@ export function terminateProcess(process: ChildProcess, cwd?: string): Terminate
return
{
success
:
true
};
}
export
function
getWindowsShell
():
string
{
return
process
.
env
[
'
comspec
'
]
||
'
cmd.exe
'
;
}
export
abstract
class
AbstractProcess
<
TProgressData
>
{
private
cmd
:
string
;
private
module
:
string
;
...
...
@@ -233,7 +237,7 @@ export abstract class AbstractProcess<TProgressData> {
}
else
{
args
.
push
(
commandLine
.
join
(
'
'
));
}
childProcess
=
spawn
(
'
cmd.exe
'
,
args
,
options
);
childProcess
=
spawn
(
getWindowsShell
()
,
args
,
options
);
}
else
{
if
(
this
.
cmd
)
{
childProcess
=
spawn
(
this
.
cmd
,
this
.
args
,
this
.
options
);
...
...
@@ -321,7 +325,7 @@ export abstract class AbstractProcess<TProgressData> {
if
(
!
this
.
shell
||
!
Platform
.
isWindows
)
{
c
(
false
);
}
let
cmdShell
=
spawn
(
'
cmd.exe
'
,
[
'
/s
'
,
'
/c
'
]);
let
cmdShell
=
spawn
(
getWindowsShell
()
,
[
'
/s
'
,
'
/c
'
]);
cmdShell
.
on
(
'
error
'
,
(
error
:
Error
)
=>
{
c
(
true
);
});
...
...
src/vs/workbench/parts/execution/electron-browser/executionService.ts
浏览文件 @
4cb90f3b
...
...
@@ -15,6 +15,7 @@ import exec = require('vs/workbench/parts/execution/common/execution');
import
uri
from
'
vs/base/common/uri
'
;
import
cp
=
require
(
'
child_process
'
);
import
processes
=
require
(
'
vs/base/node/processes
'
);
export
class
AbstractExecutionService
implements
exec
.
IExecutionService
{
public
serviceId
=
exec
.
IExecutionService
;
...
...
@@ -66,12 +67,14 @@ export class WinExecutionService extends AbstractExecutionService {
return
new
TPromise
<
any
>
((
c
,
e
,
p
)
=>
{
// we use `start` to get another cmd.exe where `& pause` can be handled
const
shell
=
processes
.
getWindowsShell
();
// we use `start` to get another shell where `& pause` can be handled
args
=
[
'
/c
'
,
'
start
'
,
'
/wait
'
,
'
cmd.exe
'
,
shell
,
'
/c
'
,
strings
.
format
(
'
"{0} {1} & pause"
'
,
file
,
args
.
join
(
'
'
))
];
...
...
@@ -79,7 +82,7 @@ export class WinExecutionService extends AbstractExecutionService {
options
=
options
||
<
any
>
{};
(
<
any
>
options
).
windowsVerbatimArguments
=
true
;
childProcess
=
cp
.
spawn
(
'
cmd.exe
'
,
args
,
options
);
childProcess
=
cp
.
spawn
(
shell
,
args
,
options
);
childProcess
.
on
(
'
exit
'
,
c
);
childProcess
.
on
(
'
error
'
,
e
);
...
...
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
浏览文件 @
4cb90f3b
...
...
@@ -13,6 +13,7 @@ import {IConfigurationService} from 'vs/platform/configuration/common/configurat
import
{
IMessageService
}
from
'
vs/platform/message/common/message
'
;
import
cp
=
require
(
'
child_process
'
);
import
processes
=
require
(
'
vs/base/node/processes
'
);
export
class
WinTerminalService
implements
ITerminalService
{
public
serviceId
=
ITerminalService
;
...
...
@@ -24,7 +25,7 @@ export class WinTerminalService implements ITerminalService {
}
public
openTerminal
(
path
:
string
):
void
{
cp
.
spawn
(
'
cmd.exe
'
,
[
'
/c
'
,
'
start
'
,
'
/wait
'
],
{
cwd
:
path
});
cp
.
spawn
(
processes
.
getWindowsShell
()
,
[
'
/c
'
,
'
start
'
,
'
/wait
'
],
{
cwd
:
path
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录