Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f542cd1f
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,发现更多精彩内容 >>
提交
f542cd1f
编写于
8月 13, 2020
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Queue initial term data events for ext host delayed init
Fixes #103697
上级
1a4999bb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
4 deletion
+33
-4
src/vs/workbench/api/browser/mainThreadTerminalService.ts
src/vs/workbench/api/browser/mainThreadTerminalService.ts
+4
-0
src/vs/workbench/contrib/terminal/browser/terminal.ts
src/vs/workbench/contrib/terminal/browser/terminal.ts
+8
-0
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
...vs/workbench/contrib/terminal/browser/terminalInstance.ts
+21
-4
未找到文件。
src/vs/workbench/api/browser/mainThreadTerminalService.ts
浏览文件 @
f542cd1f
...
...
@@ -154,6 +154,10 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
this
.
_dataEventTracker
=
this
.
_instantiationService
.
createInstance
(
TerminalDataEventTracker
,
(
id
,
data
)
=>
{
this
.
_onTerminalData
(
id
,
data
);
});
// Send initial events if they exist
this
.
_terminalService
.
terminalInstances
.
forEach
(
t
=>
{
t
.
initialDataEvents
?.
forEach
(
d
=>
this
.
_onTerminalData
(
t
.
id
,
d
));
});
}
}
...
...
src/vs/workbench/contrib/terminal/browser/terminal.ts
浏览文件 @
f542cd1f
...
...
@@ -287,6 +287,14 @@ export interface ITerminalInstance {
readonly
areLinksReady
:
boolean
;
/**
* Returns an array of data events that have fired within the first 10 seconds. If this is
* called 10 seconds after the terminal has existed the result will be undefined. This is useful
* when objects that depend on the data events have delayed initialization, like extension
* hosts.
*/
readonly
initialDataEvents
:
string
[]
|
undefined
;
/** A promise that resolves when the terminal's pty/process have been created. */
processReady
:
Promise
<
void
>
;
...
...
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
浏览文件 @
f542cd1f
...
...
@@ -98,6 +98,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private
_titleReadyPromise
:
Promise
<
string
>
;
private
_titleReadyComplete
:
((
title
:
string
)
=>
any
)
|
undefined
;
private
_areLinksReady
:
boolean
=
false
;
private
_initialDataEvents
:
string
[]
|
undefined
=
[];
private
_messageTitleDisposable
:
IDisposable
|
undefined
;
...
...
@@ -131,6 +132,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
// TODO: Should this be an event as it can fire twice?
public
get
processReady
():
Promise
<
void
>
{
return
this
.
_processManager
.
ptyProcessReady
;
}
public
get
areLinksReady
():
boolean
{
return
this
.
_areLinksReady
;
}
public
get
initialDataEvents
():
string
[]
|
undefined
{
return
this
.
_initialDataEvents
;
}
public
get
exitCode
():
number
|
undefined
{
return
this
.
_exitCode
;
}
public
get
title
():
string
{
return
this
.
_title
;
}
public
get
hadFocusOnExit
():
boolean
{
return
this
.
_hadFocusOnExit
;
}
...
...
@@ -231,6 +233,20 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this
.
updateAccessibilitySupport
();
}
}));
// Clear out initial data events after 10 seconds, hopefully extension hosts are up and
// running at that point.
let
initialDataEventsTimeout
:
NodeJS
.
Timeout
|
undefined
=
setTimeout
(()
=>
{
initialDataEventsTimeout
=
undefined
;
this
.
_initialDataEvents
=
undefined
;
},
10000
);
this
.
_register
({
dispose
:
()
=>
{
if
(
initialDataEventsTimeout
)
{
clearTimeout
(
initialDataEventsTimeout
);
}
}
});
}
public
addDisposable
(
disposable
:
IDisposable
):
void
{
...
...
@@ -862,11 +878,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
protected
_createProcessManager
():
void
{
this
.
_processManager
=
this
.
_instantiationService
.
createInstance
(
TerminalProcessManager
,
this
.
_id
,
this
.
_configHelper
);
this
.
_processManager
.
onProcessReady
(()
=>
{
this
.
_onProcessIdReady
.
fire
(
this
);
});
this
.
_processManager
.
onProcessReady
(()
=>
this
.
_onProcessIdReady
.
fire
(
this
));
this
.
_processManager
.
onProcessExit
(
exitCode
=>
this
.
_onProcessExit
(
exitCode
));
this
.
_processManager
.
onProcessData
(
data
=>
this
.
_onData
.
fire
(
data
));
this
.
_processManager
.
onProcessData
(
data
=>
{
this
.
_initialDataEvents
?.
push
(
data
);
this
.
_onData
.
fire
(
data
);
});
this
.
_processManager
.
onProcessOverrideDimensions
(
e
=>
this
.
setDimensions
(
e
));
this
.
_processManager
.
onProcessResolvedShellLaunchConfig
(
e
=>
this
.
_setResolvedShellLaunchConfig
(
e
));
this
.
_processManager
.
onEnvironmentVariableInfoChanged
(
e
=>
this
.
_onEnvironmentVariableInfoChanged
(
e
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录