Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
eefc56f8
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,发现更多精彩内容 >>
提交
eefc56f8
编写于
2月 13, 2018
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set active instance in tab when instance focus changes
上级
6544ae5d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
2 deletion
+25
-2
src/vs/workbench/parts/terminal/common/terminal.ts
src/vs/workbench/parts/terminal/common/terminal.ts
+2
-0
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+4
-0
src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
.../workbench/parts/terminal/electron-browser/terminalTab.ts
+19
-2
未找到文件。
src/vs/workbench/parts/terminal/common/terminal.ts
浏览文件 @
eefc56f8
...
...
@@ -221,6 +221,8 @@ export interface ITerminalInstance {
*/
onDisposed
:
Event
<
ITerminalInstance
>
;
onFocused
:
Event
<
ITerminalInstance
>
;
onProcessIdReady
:
Event
<
ITerminalInstance
>
;
/**
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
eefc56f8
...
...
@@ -78,6 +78,7 @@ export class TerminalInstance implements ITerminalInstance {
private
_processReady
:
TPromise
<
void
>
;
private
_isDisposed
:
boolean
;
private
_onDisposed
:
Emitter
<
ITerminalInstance
>
;
private
_onFocused
:
Emitter
<
ITerminalInstance
>
;
private
_onProcessIdReady
:
Emitter
<
ITerminalInstance
>
;
private
_onTitleChanged
:
Emitter
<
string
>
;
private
_process
:
cp
.
ChildProcess
;
...
...
@@ -105,6 +106,7 @@ export class TerminalInstance implements ITerminalInstance {
public
get
id
():
number
{
return
this
.
_id
;
}
public
get
processId
():
number
{
return
this
.
_processId
;
}
public
get
onDisposed
():
Event
<
ITerminalInstance
>
{
return
this
.
_onDisposed
.
event
;
}
public
get
onFocused
():
Event
<
ITerminalInstance
>
{
return
this
.
_onFocused
.
event
;
}
public
get
onProcessIdReady
():
Event
<
ITerminalInstance
>
{
return
this
.
_onProcessIdReady
.
event
;
}
public
get
onTitleChanged
():
Event
<
string
>
{
return
this
.
_onTitleChanged
.
event
;
}
public
get
title
():
string
{
return
this
.
_title
;
}
...
...
@@ -142,6 +144,7 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_preLaunchInputQueue
=
''
;
this
.
_onDisposed
=
new
Emitter
<
TerminalInstance
>
();
this
.
_onFocused
=
new
Emitter
<
TerminalInstance
>
();
this
.
_onProcessIdReady
=
new
Emitter
<
TerminalInstance
>
();
this
.
_onTitleChanged
=
new
Emitter
<
string
>
();
...
...
@@ -407,6 +410,7 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_instanceDisposables
.
push
(
dom
.
addDisposableListener
(
this
.
_xterm
.
textarea
,
'
focus
'
,
(
event
:
KeyboardEvent
)
=>
{
this
.
_terminalFocusContextKey
.
set
(
true
);
this
.
_onFocused
.
fire
(
this
);
}));
this
.
_instanceDisposables
.
push
(
dom
.
addDisposableListener
(
this
.
_xterm
.
textarea
,
'
blur
'
,
(
event
:
KeyboardEvent
)
=>
{
this
.
_terminalFocusContextKey
.
reset
();
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
浏览文件 @
eefc56f8
...
...
@@ -208,6 +208,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
this
.
_terminalInstances
.
push
(
instance
);
this
.
_activeInstanceIndex
=
0
;
instance
.
addDisposable
(
instance
.
onDisposed
(
instance
=>
this
.
_onInstanceDisposed
(
instance
)));
instance
.
addDisposable
(
instance
.
onFocused
(
instance
=>
this
.
_setActiveInstance
(
instance
)));
this
.
_rootSplitPane
=
new
RootSplitPane
();
this
.
_rootSplitPane
.
instance
=
instance
;
...
...
@@ -218,8 +219,6 @@ export class TerminalTab extends Disposable implements ITerminalTab {
if
(
this
.
_container
)
{
this
.
attachToElement
(
this
.
_container
);
}
// TODO: Listen to instance focus and update activeInstanceIndex accordingly
}
public
dispose
():
void
{
...
...
@@ -275,6 +274,24 @@ export class TerminalTab extends Disposable implements ITerminalTab {
return
null
;
}
private
_setActiveInstance
(
instance
:
ITerminalInstance
):
void
{
this
.
setActiveInstanceByIndex
(
this
.
_getIndexFromId
(
instance
.
id
));
}
// TODO: This is duplicated in ITerminalService
private
_getIndexFromId
(
terminalId
:
number
):
number
{
let
terminalIndex
=
-
1
;
this
.
terminalInstances
.
forEach
((
terminalInstance
,
i
)
=>
{
if
(
terminalInstance
.
id
===
terminalId
)
{
terminalIndex
=
i
;
}
});
if
(
terminalIndex
===
-
1
)
{
throw
new
Error
(
`Terminal with ID
${
terminalId
}
does not exist (has it already been disposed?)`
);
}
return
terminalIndex
;
}
public
setActiveInstanceByIndex
(
index
:
number
):
boolean
{
// Check for invalid value
if
(
index
>=
this
.
_terminalInstances
.
length
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录