Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a0ff6d63
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,发现更多精彩内容 >>
提交
a0ff6d63
编写于
4月 19, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix terminal service compilation errors
上级
25f57581
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
30 addition
and
38 deletion
+30
-38
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
...bench/parts/execution/electron-browser/terminalService.ts
+30
-38
未找到文件。
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
浏览文件 @
a0ff6d63
...
...
@@ -14,6 +14,15 @@ import {DEFAULT_WINDOWS_TERM, DEFAULT_LINUX_TERM} from 'vs/workbench/parts/execu
import
cp
=
require
(
'
child_process
'
);
import
processes
=
require
(
'
vs/base/node/processes
'
);
interface
ITerminalConfiguration
{
terminal
:
{
external
:
{
windowsExec
:
string
;
linuxExec
:
string
;
};
};
}
export
class
WinTerminalService
implements
ITerminalService
{
public
serviceId
=
ITerminalService
;
...
...
@@ -23,31 +32,22 @@ export class WinTerminalService implements ITerminalService {
}
public
openTerminal
(
path
:
string
):
void
{
this
.
_configurationService
.
loadConfiguration
().
done
(
configuration
=>
{
return
new
Promise
((
success
,
failed
)
=>
{
this
.
spawnTerminal
(
cp
,
configuration
,
processes
.
getWindowsShell
(),
path
,
success
,
err
=>
{
errors
.
onUnexpectedError
(
err
);
failed
(
err
);
}
);
});
},
errors
.
onUnexpectedError
);
const
configuration
=
this
.
_configurationService
.
getConfiguration
<
ITerminalConfiguration
>
();
this
.
spawnTerminal
(
cp
,
configuration
,
processes
.
getWindowsShell
(),
path
)
.
done
(
null
,
errors
.
onUnexpectedError
);
}
private
spawnTerminal
(
spawner
,
configuration
,
command
:
string
,
path
:
string
,
onExit
,
onError
)
{
private
spawnTerminal
(
spawner
,
configuration
:
ITerminalConfiguration
,
command
:
string
,
path
:
string
):
TPromise
<
void
>
{
let
terminalConfig
=
configuration
.
terminal
.
external
;
let
exec
=
terminalConfig
.
windowsExec
||
DEFAULT_WINDOWS_TERM
;
let
cmdArgs
=
[
'
/c
'
,
'
start
'
,
'
/wait
'
,
exec
];
let
child
=
spawner
.
spawn
(
command
,
cmdArgs
,
{
cwd
:
path
});
child
.
on
(
'
error
'
,
onError
);
child
.
on
(
'
exit
'
,
onExit
);
return
new
TPromise
<
void
>
((
c
,
e
)
=>
{
let
child
=
spawner
.
spawn
(
command
,
cmdArgs
,
{
cwd
:
path
});
child
.
on
(
'
error
'
,
e
);
child
.
on
(
'
exit
'
,
()
=>
c
(
null
));
});
}
}
...
...
@@ -103,28 +103,20 @@ export class LinuxTerminalService implements ITerminalService {
public
openTerminal
(
path
:
string
):
void
{
this
.
_configurationService
.
loadConfiguration
().
done
(
configuration
=>
{
return
new
Promise
((
success
,
failed
)
=>
{
this
.
spawnTerminal
(
cp
,
configuration
,
path
,
success
,
err
=>
{
errors
.
onUnexpectedError
(
err
);
failed
(
err
);
}
);
});
},
errors
.
onUnexpectedError
);
const
configuration
=
this
.
_configurationService
.
getConfiguration
<
ITerminalConfiguration
>
();
this
.
spawnTerminal
(
cp
,
configuration
,
path
)
.
done
(
null
,
errors
.
onUnexpectedError
);
}
private
spawnTerminal
(
spawner
,
configuration
,
path
:
string
,
onExit
,
onError
)
{
private
spawnTerminal
(
spawner
,
configuration
:
ITerminalConfiguration
,
path
:
string
):
TPromise
<
void
>
{
let
terminalConfig
=
configuration
.
terminal
.
external
;
let
exec
=
terminalConfig
.
linuxExec
||
DEFAULT_LINUX_TERM
;
const
child
=
spawner
.
spawn
(
exec
,
[],
{
cwd
:
path
});
child
.
on
(
'
error
'
,
onError
);
child
.
on
(
'
exit
'
,
onExit
);
}
return
new
TPromise
<
void
>
((
c
,
e
)
=>
{
const
child
=
spawner
.
spawn
(
exec
,
[],
{
cwd
:
path
});
child
.
on
(
'
error
'
,
e
);
child
.
on
(
'
exit
'
,
()
=>
c
(
null
));
});
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录