Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
d33f082f
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,发现更多精彩内容 >>
提交
d33f082f
编写于
9月 04, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #49186
上级
1a69d054
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
11 deletion
+14
-11
src/vs/base/browser/ui/actionbar/actionbar.ts
src/vs/base/browser/ui/actionbar/actionbar.ts
+2
-2
src/vs/workbench/parts/output/browser/outputActions.ts
src/vs/workbench/parts/output/browser/outputActions.ts
+12
-9
未找到文件。
src/vs/base/browser/ui/actionbar/actionbar.ts
浏览文件 @
d33f082f
...
...
@@ -775,11 +775,11 @@ export class SelectActionItem extends BaseActionItem {
private
registerListeners
():
void
{
this
.
_register
(
this
.
selectBox
.
onDidSelect
(
e
=>
{
this
.
actionRunner
.
run
(
this
.
_action
,
this
.
getActionContext
(
e
.
selected
));
this
.
actionRunner
.
run
(
this
.
_action
,
this
.
getActionContext
(
e
.
selected
,
e
.
index
));
}));
}
protected
getActionContext
(
option
:
string
)
{
protected
getActionContext
(
option
:
string
,
index
:
number
)
{
return
option
;
}
...
...
src/vs/workbench/parts/output/browser/outputActions.ts
浏览文件 @
d33f082f
...
...
@@ -112,6 +112,9 @@ export class SwitchOutputActionItem extends SelectActionItem {
private
static
readonly
SEPARATOR
=
'
─────────
'
;
private
normalChannels
:
IOutputChannelIdentifier
[];
private
fileChannels
:
IOutputChannelIdentifier
[];
constructor
(
action
:
IAction
,
@
IOutputService
private
outputService
:
IOutputService
,
...
...
@@ -129,8 +132,8 @@ export class SwitchOutputActionItem extends SelectActionItem {
this
.
updateOtions
(
this
.
outputService
.
getActiveChannel
().
id
);
}
protected
getActionContext
(
option
:
string
):
string
{
const
channel
=
this
.
outputService
.
getChannels
().
filter
(
channelData
=>
channelData
.
label
===
option
).
pop
()
;
protected
getActionContext
(
option
:
string
,
index
:
number
):
string
{
const
channel
=
index
<
this
.
normalChannels
.
length
?
this
.
normalChannels
[
index
]
:
this
.
fileChannels
[
index
-
this
.
normalChannels
.
length
-
1
]
;
return
channel
?
channel
.
id
:
option
;
}
...
...
@@ -144,16 +147,16 @@ export class SwitchOutputActionItem extends SelectActionItem {
}
return
0
;
});
const
c
hannels
=
groups
[
0
]
||
[];
const
fileChannels
=
groups
[
1
]
||
[];
const
showSeparator
=
channels
.
length
&&
fileChannels
.
length
;
const
separatorIndex
=
showSeparator
?
c
hannels
.
length
:
-
1
;
const
options
:
string
[]
=
[...
channels
.
map
(
c
=>
c
.
label
),
...(
showSeparator
?
[
SwitchOutputActionItem
.
SEPARATOR
]
:
[]),
..
.
fileChannels
.
map
(
c
=>
c
.
label
)];
this
.
normalC
hannels
=
groups
[
0
]
||
[];
this
.
fileChannels
=
groups
[
1
]
||
[];
const
showSeparator
=
this
.
normalChannels
.
length
&&
this
.
fileChannels
.
length
;
const
separatorIndex
=
showSeparator
?
this
.
normalC
hannels
.
length
:
-
1
;
const
options
:
string
[]
=
[...
this
.
normalChannels
.
map
(
c
=>
c
.
label
),
...(
showSeparator
?
[
SwitchOutputActionItem
.
SEPARATOR
]
:
[]),
...
this
.
fileChannels
.
map
(
c
=>
c
.
label
)];
let
selected
=
0
;
if
(
selectedChannel
)
{
selected
=
c
hannels
.
map
(
c
=>
c
.
id
).
indexOf
(
selectedChannel
);
selected
=
this
.
normalC
hannels
.
map
(
c
=>
c
.
id
).
indexOf
(
selectedChannel
);
if
(
selected
===
-
1
)
{
selected
=
separatorIndex
+
1
+
fileChannels
.
map
(
c
=>
c
.
id
).
indexOf
(
selectedChannel
);
selected
=
separatorIndex
+
1
+
this
.
fileChannels
.
map
(
c
=>
c
.
id
).
indexOf
(
selectedChannel
);
}
}
this
.
setOptions
(
options
,
Math
.
max
(
0
,
selected
),
separatorIndex
!==
-
1
?
separatorIndex
:
void
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录