Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f957bf8a
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,发现更多精彩内容 >>
提交
f957bf8a
编写于
6月 16, 2018
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get onData working for renderers
上级
56d8e4f7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
14 deletion
+10
-14
src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
...rkbench/api/electron-browser/mainThreadTerminalService.ts
+2
-6
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+8
-8
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
浏览文件 @
f957bf8a
...
...
@@ -16,8 +16,6 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
private
_proxy
:
ExtHostTerminalServiceShape
;
private
_toDispose
:
IDisposable
[]
=
[];
private
_terminalProcesses
:
{
[
id
:
number
]:
ITerminalProcessExtHostProxy
}
=
{};
private
_dataListeners
:
{
[
id
:
number
]:
IDisposable
}
=
{};
private
_rendererInputListeners
:
{
[
id
:
number
]:
IDisposable
}
=
{};
constructor
(
extHostContext
:
IExtHostContext
,
...
...
@@ -112,8 +110,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
public
$terminalRendererRegisterOnInputListener
(
terminalId
:
number
):
void
{
const
terminalInstance
=
this
.
terminalService
.
getInstanceFromId
(
terminalId
);
if
(
terminalInstance
)
{
this
.
_rendererInputListeners
[
terminalId
]
=
terminalInstance
.
onRendererInput
(
data
=>
this
.
_onTerminalRendererInput
(
terminalId
,
data
));
terminalInstance
.
onDisposed
(()
=>
delete
this
.
_rendererInputListeners
[
terminalId
]);
terminalInstance
.
addDisposable
(
terminalInstance
.
onRendererInput
(
data
=>
this
.
_onTerminalRendererInput
(
terminalId
,
data
)));
}
}
...
...
@@ -127,8 +124,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
public
$registerOnDataListener
(
terminalId
:
number
):
void
{
const
terminalInstance
=
this
.
terminalService
.
getInstanceFromId
(
terminalId
);
if
(
terminalInstance
)
{
this
.
_dataListeners
[
terminalId
]
=
terminalInstance
.
onData
(
data
=>
this
.
_onTerminalData
(
terminalId
,
data
));
terminalInstance
.
onDisposed
(()
=>
delete
this
.
_dataListeners
[
terminalId
]);
terminalInstance
.
addDisposable
(
terminalInstance
.
onData
(
data
=>
this
.
_onTerminalData
(
terminalId
,
data
)));
}
}
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
f957bf8a
...
...
@@ -99,6 +99,8 @@ export class TerminalInstance implements ITerminalInstance {
public
get
onProcessIdReady
():
Event
<
ITerminalInstance
>
{
return
this
.
_onProcessIdReady
.
event
;
}
private
readonly
_onTitleChanged
:
Emitter
<
string
>
=
new
Emitter
<
string
>
();
public
get
onTitleChanged
():
Event
<
string
>
{
return
this
.
_onTitleChanged
.
event
;
}
private
readonly
_onData
:
Emitter
<
string
>
=
new
Emitter
<
string
>
();
public
get
onData
():
Event
<
string
>
{
return
this
.
_onData
.
event
;
}
private
readonly
_onRequestExtHostProcess
:
Emitter
<
ITerminalInstance
>
=
new
Emitter
<
ITerminalInstance
>
();
public
get
onRequestExtHostProcess
():
Event
<
ITerminalInstance
>
{
return
this
.
_onRequestExtHostProcess
.
event
;
}
private
readonly
_onDimensionsChanged
:
Emitter
<
void
>
=
new
Emitter
<
void
>
();
...
...
@@ -607,6 +609,10 @@ export class TerminalInstance implements ITerminalInstance {
return
;
}
this
.
_xterm
.
write
(
text
);
if
(
this
.
_shellLaunchConfig
.
isRendererOnly
)
{
// Fire onData API in the extension host
this
.
_onData
.
fire
(
text
);
}
});
}
...
...
@@ -695,6 +701,8 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_processManager
.
onProcessExit
(
exitCode
=>
this
.
_onProcessExit
(
exitCode
));
this
.
_processManager
.
createProcess
(
this
.
_shellLaunchConfig
,
this
.
_cols
,
this
.
_rows
);
this
.
_processManager
.
onProcessData
(
data
=>
this
.
_onData
.
fire
(
data
));
if
(
this
.
_shellLaunchConfig
.
name
)
{
this
.
setTitle
(
this
.
_shellLaunchConfig
.
name
,
false
);
}
else
{
...
...
@@ -826,14 +834,6 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_shellLaunchConfig
=
shell
;
}
public
onData
(
listener
:
(
data
:
string
)
=>
void
):
lifecycle
.
IDisposable
{
// TODO: This should still work for renderers
if
(
!
this
.
_processManager
)
{
return
null
;
}
return
this
.
_processManager
.
onProcessData
(
data
=>
listener
(
data
));
}
public
onRendererInput
(
listener
:
(
data
:
string
)
=>
void
):
lifecycle
.
IDisposable
{
this
.
_onRendererInputListeners
.
push
(
listener
);
return
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录