Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e8d5a793
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,体验更适合开发者的 AI 搜索 >>
提交
e8d5a793
编写于
3月 09, 2016
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
output: introduce onActiveOutputChannel
fixes #3892
上级
d292e6b0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
12 deletion
+16
-12
src/vs/base/browser/ui/actionbar/actionbar.ts
src/vs/base/browser/ui/actionbar/actionbar.ts
+1
-1
src/vs/workbench/parts/output/browser/outputActions.ts
src/vs/workbench/parts/output/browser/outputActions.ts
+3
-11
src/vs/workbench/parts/output/common/output.ts
src/vs/workbench/parts/output/common/output.ts
+5
-0
src/vs/workbench/parts/output/common/outputServices.ts
src/vs/workbench/parts/output/common/outputServices.ts
+7
-0
未找到文件。
src/vs/base/browser/ui/actionbar/actionbar.ts
浏览文件 @
e8d5a793
...
...
@@ -724,7 +724,7 @@ export class SelectActionItem extends BaseActionItem {
private
select
:
HTMLSelectElement
;
private
options
:
string
[];
private
selected
:
number
;
pr
ivate
toDispose
:
lifecycle
.
IDisposable
[];
pr
otected
toDispose
:
lifecycle
.
IDisposable
[];
constructor
(
ctx
:
any
,
action
:
IAction
,
options
:
string
[],
selected
:
number
)
{
super
(
ctx
,
action
);
...
...
src/vs/workbench/parts/output/browser/outputActions.ts
浏览文件 @
e8d5a793
...
...
@@ -8,7 +8,6 @@ import {TPromise} from 'vs/base/common/winjs.base';
import
nls
=
require
(
'
vs/nls
'
);
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
arrays
=
require
(
'
vs/base/common/arrays
'
);
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IAction
,
Action
}
from
'
vs/base/common/actions
'
;
import
{
EditorAction
}
from
'
vs/editor/common/editorAction
'
;
import
{
Behaviour
}
from
'
vs/editor/common/editorActionEnablement
'
;
...
...
@@ -108,15 +107,14 @@ export class SwitchOutputAction extends Action {
export
class
SwitchOutputActionItem
extends
SelectActionItem
{
private
input
:
OutputEditorInput
;
private
outputListenerDispose
:
IDisposable
;
constructor
(
action
:
IAction
,
@
IOutputService
private
outputService
:
IOutputService
)
{
super
(
null
,
action
,
SwitchOutputActionItem
.
getChannels
(
outputService
),
Math
.
max
(
0
,
SwitchOutputActionItem
.
getChannels
(
outputService
).
indexOf
(
outputService
.
getActiveChannel
())));
this
.
outputListenerDispose
=
this
.
outputService
.
onOutputChannel
(
this
.
onOutputChannel
,
this
);
this
.
toDispose
.
push
(
this
.
outputService
.
onOutputChannel
(
this
.
onOutputChannel
,
this
));
this
.
toDispose
.
push
(
this
.
outputService
.
onActiveOutputChannel
(
this
.
onOutputChannel
,
this
)
);
}
private
onOutputChannel
():
void
{
...
...
@@ -135,12 +133,6 @@ export class SwitchOutputActionItem extends SelectActionItem {
public
dispose
():
void
{
super
.
dispose
();
if
(
this
.
outputListenerDispose
)
{
this
.
outputListenerDispose
.
dispose
();
delete
this
.
outputListenerDispose
;
}
delete
this
.
input
;
}
}
\ No newline at end of file
}
src/vs/workbench/parts/output/common/output.ts
浏览文件 @
e8d5a793
...
...
@@ -99,6 +99,11 @@ export interface IOutputService {
* Allows to register on a new Output channel getting filled with output
*/
onOutputChannel
:
Event
<
string
>
;
/**
* Allows to register on active output channel change
*/
onActiveOutputChannel
:
Event
<
string
>
;
}
export
interface
IOutputChannelRegistry
{
...
...
src/vs/workbench/parts/output/common/outputServices.ts
浏览文件 @
e8d5a793
...
...
@@ -30,6 +30,7 @@ export class OutputService implements IOutputService {
private
_onOutput
:
Emitter
<
IOutputEvent
>
;
private
_onOutputChannel
:
Emitter
<
string
>
;
private
_onActiveOutputChannel
:
Emitter
<
string
>
;
constructor
(
@
IStorageService
private
storageService
:
IStorageService
,
...
...
@@ -40,6 +41,7 @@ export class OutputService implements IOutputService {
)
{
this
.
_onOutput
=
new
Emitter
<
IOutputEvent
>
();
this
.
_onOutputChannel
=
new
Emitter
<
string
>
();
this
.
_onActiveOutputChannel
=
new
Emitter
<
string
>
();
this
.
receivedOutput
=
Object
.
create
(
null
);
...
...
@@ -55,6 +57,10 @@ export class OutputService implements IOutputService {
return
this
.
_onOutputChannel
.
event
;
}
public
get
onActiveOutputChannel
():
Event
<
string
>
{
return
this
.
_onActiveOutputChannel
.
event
;
}
public
append
(
channel
:
string
,
output
:
string
):
void
{
// Initialize
...
...
@@ -114,6 +120,7 @@ export class OutputService implements IOutputService {
public
showOutput
(
channel
:
string
,
preserveFocus
?:
boolean
):
TPromise
<
IEditor
>
{
this
.
activeChannel
=
channel
;
this
.
storageService
.
store
(
OUTPUT_ACTIVE_CHANNEL_KEY
,
this
.
activeChannel
,
StorageScope
.
WORKSPACE
);
this
.
_onActiveOutputChannel
.
fire
(
channel
);
// emit event that we a new channel is active
return
this
.
panelService
.
openPanel
(
OUTPUT_PANEL_ID
,
!
preserveFocus
).
then
((
outputPanel
:
OutputPanel
)
=>
{
return
outputPanel
&&
outputPanel
.
setInput
(
OutputEditorInput
.
getInstance
(
this
.
instantiationService
,
channel
),
EditorOptions
.
create
({
preserveFocus
:
preserveFocus
})).
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录