Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4af1965f
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,发现更多精彩内容 >>
提交
4af1965f
编写于
6月 29, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use message service to show errors, fixes #8505
上级
5891645f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
10 addition
and
5 deletion
+10
-5
src/vs/platform/actions/browser/menuItemActionItem.ts
src/vs/platform/actions/browser/menuItemActionItem.ts
+9
-4
src/vs/workbench/browser/parts/editor/titleControl.ts
src/vs/workbench/browser/parts/editor/titleControl.ts
+1
-1
未找到文件。
src/vs/platform/actions/browser/menuItemActionItem.ts
浏览文件 @
4af1965f
...
@@ -8,6 +8,8 @@
...
@@ -8,6 +8,8 @@
import
{
localize
}
from
'
vs/nls
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybindingService
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybindingService
'
;
import
{
IMenu
,
MenuItemAction
}
from
'
vs/platform/actions/common/actions
'
;
import
{
IMenu
,
MenuItemAction
}
from
'
vs/platform/actions/common/actions
'
;
import
{
IMessageService
}
from
'
vs/platform/message/common/message
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
ActionItem
,
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
ActionItem
,
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
...
@@ -40,9 +42,9 @@ export function fillInActions(menu: IMenu, target: IAction[] | { primary: IActio
...
@@ -40,9 +42,9 @@ export function fillInActions(menu: IMenu, target: IAction[] | { primary: IActio
}
}
export
function
createActionItem
(
action
:
IAction
,
keybindingService
:
IKeybindingService
):
ActionItem
{
export
function
createActionItem
(
action
:
IAction
,
keybindingService
:
IKeybindingService
,
messageService
:
IMessageService
):
ActionItem
{
if
(
action
instanceof
MenuItemAction
)
{
if
(
action
instanceof
MenuItemAction
)
{
return
new
MenuItemActionItem
(
action
,
keybindingService
);
return
new
MenuItemActionItem
(
action
,
keybindingService
,
messageService
);
}
}
}
}
...
@@ -74,7 +76,8 @@ class MenuItemActionItem extends ActionItem {
...
@@ -74,7 +76,8 @@ class MenuItemActionItem extends ActionItem {
constructor
(
constructor
(
action
:
MenuItemAction
,
action
:
MenuItemAction
,
@
IKeybindingService
private
_keybindingService
:
IKeybindingService
@
IKeybindingService
private
_keybindingService
:
IKeybindingService
,
@
IMessageService
private
_messageService
:
IMessageService
)
{
)
{
super
(
undefined
,
action
,
{
icon
:
!!
action
.
command
.
iconClass
,
label
:
!
action
.
command
.
iconClass
});
super
(
undefined
,
action
,
{
icon
:
!!
action
.
command
.
iconClass
,
label
:
!
action
.
command
.
iconClass
});
}
}
...
@@ -88,7 +91,9 @@ class MenuItemActionItem extends ActionItem {
...
@@ -88,7 +91,9 @@ class MenuItemActionItem extends ActionItem {
event
.
preventDefault
();
event
.
preventDefault
();
event
.
stopPropagation
();
event
.
stopPropagation
();
(
<
MenuItemAction
>
this
.
_action
).
run
(
this
.
_altKeyDown
).
done
(
undefined
,
console
.
error
);
(
<
MenuItemAction
>
this
.
_action
).
run
(
this
.
_altKeyDown
).
done
(
undefined
,
err
=>
{
this
.
_messageService
.
show
(
Severity
.
Error
,
err
);
});
}
}
render
(
container
:
HTMLElement
):
void
{
render
(
container
:
HTMLElement
):
void
{
...
...
src/vs/workbench/browser/parts/editor/titleControl.ts
浏览文件 @
4af1965f
...
@@ -268,7 +268,7 @@ export abstract class TitleControl implements ITitleAreaControl {
...
@@ -268,7 +268,7 @@ export abstract class TitleControl implements ITitleAreaControl {
// Check extensions
// Check extensions
if
(
!
actionItem
)
{
if
(
!
actionItem
)
{
actionItem
=
createActionItem
(
action
,
this
.
keybindingService
);
actionItem
=
createActionItem
(
action
,
this
.
keybindingService
,
this
.
messageService
);
}
}
return
actionItem
;
return
actionItem
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录