Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c96f5d12
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,发现更多精彩内容 >>
提交
c96f5d12
编写于
3月 05, 2018
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Import and type windows-process-tree
Fixes #43287
上级
7d9ccca1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
35 addition
and
28 deletion
+35
-28
src/typings/windows-mutex.d.ts
src/typings/windows-mutex.d.ts
+1
-1
src/typings/windows-process-tree.d.ts
src/typings/windows-process-tree.d.ts
+3
-1
src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
...nch/parts/terminal/electron-browser/windowsShellHelper.ts
+31
-26
未找到文件。
src/typings/windows-mutex.d.ts
浏览文件 @
c96f5d12
...
...
@@ -11,4 +11,4 @@ declare module 'windows-mutex' {
}
export
function
isActive
(
name
:
string
):
boolean
;
}
\ No newline at end of file
}
src/typings/windows-process-tree.d.ts
浏览文件 @
c96f5d12
...
...
@@ -9,6 +9,8 @@ declare module 'windows-process-tree' {
name
:
string
,
children
:
ProcessTreeNode
[]
}
function
get
(
rootPid
:
number
,
callback
:
(
tree
:
ProcessTreeNode
)
=>
void
):
void
;
export
=
get
;
}
\ No newline at end of file
}
src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
浏览文件 @
c96f5d12
...
...
@@ -8,10 +8,11 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
{
Emitter
,
debounceEvent
}
from
'
vs/base/common/event
'
;
import
{
ITerminalInstance
}
from
'
vs/workbench/parts/terminal/common/terminal
'
;
import
{
Terminal
as
XTermTerminal
}
from
'
vscode-xterm
'
;
import
WindowsProcessTreeType
=
require
(
'
windows-process-tree
'
);
const
SHELL_EXECUTABLES
=
[
'
cmd.exe
'
,
'
powershell.exe
'
,
'
bash.exe
'
];
let
windowsProcessTree
;
let
windowsProcessTree
:
typeof
WindowsProcessTreeType
;
export
class
WindowsShellHelper
{
private
_onCheckShell
:
Emitter
<
TPromise
<
string
>>
;
...
...
@@ -28,34 +29,38 @@ export class WindowsShellHelper {
throw
new
Error
(
`WindowsShellHelper cannot be instantiated on
${
platform
.
platform
}
`
);
}
if
(
!
windowsProcessTree
)
{
windowsProcessTree
=
require
.
__$__nodeRequire
(
'
windows-process-tree
'
);
}
this
.
_isDisposed
=
false
;
this
.
_onCheckShell
=
new
Emitter
<
TPromise
<
string
>>
();
// The debounce is necessary to prevent multiple processes from spawning when
// the enter key or output is spammed
debounceEvent
(
this
.
_onCheckShell
.
event
,
(
l
,
e
)
=>
e
,
150
,
true
)(()
=>
{
setTimeout
(()
=>
{
this
.
checkShell
();
},
50
);
});
// We want to fire a new check for the shell on a linefeed, but only
// when parsing has finished which is indicated by the cursormove event.
// If this is done on every linefeed, parsing ends up taking
// significantly longer due to resetting timers. Note that this is
// private API.
this
.
_xterm
.
on
(
'
linefeed
'
,
()
=>
this
.
_newLineFeed
=
true
);
this
.
_xterm
.
on
(
'
cursormove
'
,
()
=>
{
if
(
this
.
_newLineFeed
)
{
this
.
_onCheckShell
.
fire
();
(
import
(
'
windows-process-tree
'
)).
then
(
mod
=>
{
if
(
this
.
_isDisposed
)
{
return
;
}
});
// Fire a new check for the shell when any key is pressed.
this
.
_xterm
.
on
(
'
keypress
'
,
()
=>
this
.
_onCheckShell
.
fire
());
windowsProcessTree
=
mod
;
this
.
_onCheckShell
=
new
Emitter
<
TPromise
<
string
>>
();
// The debounce is necessary to prevent multiple processes from spawning when
// the enter key or output is spammed
debounceEvent
(
this
.
_onCheckShell
.
event
,
(
l
,
e
)
=>
e
,
150
,
true
)(()
=>
{
setTimeout
(()
=>
{
this
.
checkShell
();
},
50
);
});
// We want to fire a new check for the shell on a linefeed, but only
// when parsing has finished which is indicated by the cursormove event.
// If this is done on every linefeed, parsing ends up taking
// significantly longer due to resetting timers. Note that this is
// private API.
this
.
_xterm
.
on
(
'
linefeed
'
,
()
=>
this
.
_newLineFeed
=
true
);
this
.
_xterm
.
on
(
'
cursormove
'
,
()
=>
{
if
(
this
.
_newLineFeed
)
{
this
.
_onCheckShell
.
fire
();
}
});
// Fire a new check for the shell when any key is pressed.
this
.
_xterm
.
on
(
'
keypress
'
,
()
=>
this
.
_onCheckShell
.
fire
());
});
}
private
checkShell
():
void
{
...
...
@@ -118,4 +123,4 @@ export class WindowsShellHelper {
});
return
this
.
_currentRequest
;
}
}
\ No newline at end of file
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录