Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6dbb27e6
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,发现更多精彩内容 >>
提交
6dbb27e6
编写于
10月 01, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - make actions return a Thenable
上级
01c138cd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
20 deletion
+13
-20
src/vs/base/browser/ui/actionbar/actionbar.ts
src/vs/base/browser/ui/actionbar/actionbar.ts
+2
-3
src/vs/base/common/actions.ts
src/vs/base/common/actions.ts
+11
-17
未找到文件。
src/vs/base/browser/ui/actionbar/actionbar.ts
浏览文件 @
6dbb27e6
...
...
@@ -9,7 +9,6 @@ import 'vs/css!./actionbar';
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
Disposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
SelectBox
,
ISelectBoxOptions
}
from
'
vs/base/browser/ui/selectBox/selectBox
'
;
import
{
IAction
,
IActionRunner
,
Action
,
IActionChangeEvent
,
ActionRunner
,
IRunEvent
}
from
'
vs/base/common/actions
'
;
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
...
...
@@ -737,7 +736,7 @@ export class ActionBar extends Disposable implements IActionRunner {
this
.
_onDidCancel
.
fire
();
}
run
(
action
:
IAction
,
context
?:
any
):
T
Promis
e
<
void
>
{
run
(
action
:
IAction
,
context
?:
any
):
T
henabl
e
<
void
>
{
return
this
.
_actionRunner
.
run
(
action
,
context
);
}
...
...
@@ -798,4 +797,4 @@ export class SelectActionItem extends BaseActionItem {
render
(
container
:
HTMLElement
):
void
{
this
.
selectBox
.
render
(
container
);
}
}
\ No newline at end of file
}
src/vs/base/common/actions.ts
浏览文件 @
6dbb27e6
...
...
@@ -4,10 +4,9 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IDisposable
,
combinedDisposable
,
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
isThenable
}
from
'
vs/base/common/async
'
;
export
interface
ITelemetryData
{
from
?:
string
;
...
...
@@ -23,11 +22,11 @@ export interface IAction extends IDisposable {
enabled
:
boolean
;
checked
:
boolean
;
radio
:
boolean
;
run
(
event
?:
any
):
T
Promis
e
<
any
>
;
run
(
event
?:
any
):
T
henabl
e
<
any
>
;
}
export
interface
IActionRunner
extends
IDisposable
{
run
(
action
:
IAction
,
context
?:
any
):
T
Promis
e
<
any
>
;
run
(
action
:
IAction
,
context
?:
any
):
T
henabl
e
<
any
>
;
onDidRun
:
Event
<
IRunEvent
>
;
onDidBeforeRun
:
Event
<
IRunEvent
>
;
}
...
...
@@ -63,9 +62,9 @@ export class Action implements IAction {
protected
_enabled
:
boolean
;
protected
_checked
:
boolean
;
protected
_radio
:
boolean
;
protected
_actionCallback
:
(
event
?:
any
)
=>
T
Promis
e
<
any
>
;
protected
_actionCallback
:
(
event
?:
any
)
=>
T
henabl
e
<
any
>
;
constructor
(
id
:
string
,
label
:
string
=
''
,
cssClass
:
string
=
''
,
enabled
:
boolean
=
true
,
actionCallback
?:
(
event
?:
any
)
=>
T
Promis
e
<
any
>
)
{
constructor
(
id
:
string
,
label
:
string
=
''
,
cssClass
:
string
=
''
,
enabled
:
boolean
=
true
,
actionCallback
?:
(
event
?:
any
)
=>
T
henabl
e
<
any
>
)
{
this
.
_id
=
id
;
this
.
_label
=
label
;
this
.
_cssClass
=
cssClass
;
...
...
@@ -167,12 +166,12 @@ export class Action implements IAction {
}
}
run
(
event
?:
any
,
data
?:
ITelemetryData
):
T
Promis
e
<
any
>
{
run
(
event
?:
any
,
data
?:
ITelemetryData
):
T
henabl
e
<
any
>
{
if
(
this
.
_actionCallback
!==
void
0
)
{
return
this
.
_actionCallback
(
event
);
}
return
TPromise
.
as
(
true
);
return
Promise
.
resolve
(
true
);
}
dispose
()
{
...
...
@@ -194,9 +193,9 @@ export class ActionRunner extends Disposable implements IActionRunner {
private
_onDidRun
=
this
.
_register
(
new
Emitter
<
IRunEvent
>
());
get
onDidRun
():
Event
<
IRunEvent
>
{
return
this
.
_onDidRun
.
event
;
}
run
(
action
:
IAction
,
context
?:
any
):
T
Promis
e
<
any
>
{
run
(
action
:
IAction
,
context
?:
any
):
T
henabl
e
<
any
>
{
if
(
!
action
.
enabled
)
{
return
TPromise
.
as
(
null
);
return
Promise
.
resolve
(
null
);
}
this
.
_onDidBeforeRun
.
fire
({
action
:
action
});
...
...
@@ -208,14 +207,9 @@ export class ActionRunner extends Disposable implements IActionRunner {
});
}
protected
runAction
(
action
:
IAction
,
context
?:
any
):
T
Promis
e
<
any
>
{
protected
runAction
(
action
:
IAction
,
context
?:
any
):
T
henabl
e
<
any
>
{
const
res
=
context
?
action
.
run
(
context
)
:
action
.
run
();
if
(
isThenable
(
res
))
{
return
res
;
}
return
TPromise
.
wrap
(
res
);
return
Promise
.
resolve
(
res
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录