Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
74f7a2b2
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,发现更多精彩内容 >>
提交
74f7a2b2
编写于
12月 21, 2015
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - remove obsolete use of EventSource
上级
9c13fee7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
34 deletion
+3
-34
src/vs/workbench/browser/actionRegistry.ts
src/vs/workbench/browser/actionRegistry.ts
+0
-31
src/vs/workbench/parts/search/test/common/searchModel.test.ts
...vs/workbench/parts/search/test/common/searchModel.test.ts
+3
-3
未找到文件。
src/vs/workbench/browser/actionRegistry.ts
浏览文件 @
74f7a2b2
...
...
@@ -10,7 +10,6 @@ import collections = require('vs/base/common/collections');
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
EventProvider
}
from
'
vs/base/common/eventProvider
'
;
import
{
EventSource
}
from
'
vs/base/common/eventSource
'
;
import
{
KeybindingsRegistry
,
ICommandDescriptor
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
KeybindingsUtils
}
from
'
vs/platform/keybinding/common/keybindingsUtils
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
...
...
@@ -57,41 +56,21 @@ export interface IWorkbenchActionRegistry {
* Returns the category for the given action or null iff none.
*/
getCategory
(
actionId
:
string
):
string
;
/**
* Eventing for workbench actions.
*/
onRegisterWorkbenchAction
:
EventProvider
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
;
onUnregisterWorkbenchAction
:
EventProvider
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
;
}
class
WorkbenchActionRegistry
implements
IWorkbenchActionRegistry
{
private
workbenchActions
:
collections
.
IStringDictionary
<
SyncActionDescriptor
>
;
private
onActionUnregister
:
EventSource
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
;
private
onActionRegister
:
EventSource
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
;
private
mapActionIdToCategory
:
{
[
id
:
string
]:
string
;
};
constructor
()
{
this
.
workbenchActions
=
Object
.
create
(
null
);
this
.
mapActionIdToCategory
=
Object
.
create
(
null
);
this
.
onActionRegister
=
new
EventSource
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
();
this
.
onActionUnregister
=
new
EventSource
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
();
}
private
fireActionRegister
(
descriptor
:
SyncActionDescriptor
):
void
{
this
.
onActionRegister
.
fire
(
descriptor
);
}
private
fireActionUnregister
(
descriptor
:
SyncActionDescriptor
):
void
{
this
.
onActionUnregister
.
fire
(
descriptor
);
}
public
registerWorkbenchAction
(
descriptor
:
SyncActionDescriptor
,
category
?:
string
):
void
{
if
(
!
this
.
workbenchActions
[
descriptor
.
id
])
{
this
.
workbenchActions
[
descriptor
.
id
]
=
descriptor
;
registerWorkbenchCommandFromAction
(
descriptor
);
this
.
fireActionRegister
(
descriptor
);
if
(
category
)
{
this
.
mapActionIdToCategory
[
descriptor
.
id
]
=
category
;
...
...
@@ -108,8 +87,6 @@ class WorkbenchActionRegistry implements IWorkbenchActionRegistry {
delete
this
.
workbenchActions
[
id
];
delete
this
.
mapActionIdToCategory
[
id
];
this
.
fireActionUnregister
(
descriptor
);
return
true
;
}
...
...
@@ -131,14 +108,6 @@ class WorkbenchActionRegistry implements IWorkbenchActionRegistry {
actions
.
forEach
(
action
=>
this
.
registerWorkbenchAction
(
action
),
this
);
}
public
get
onRegisterWorkbenchAction
():
EventProvider
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
{
return
this
.
onActionRegister
.
value
;
}
public
get
onUnregisterWorkbenchAction
():
EventProvider
<
(
descriptor
:
SyncActionDescriptor
)
=>
void
>
{
return
this
.
onActionUnregister
.
value
;
}
}
Registry
.
add
(
Extensions
.
WorkbenchActions
,
new
WorkbenchActionRegistry
());
...
...
src/vs/workbench/parts/search/test/common/searchModel.test.ts
浏览文件 @
74f7a2b2
...
...
@@ -7,7 +7,7 @@
import
*
as
assert
from
'
assert
'
;
import
{
Match
,
FileMatch
,
SearchResult
}
from
'
vs/workbench/parts/search/common/searchModel
'
;
import
model
=
require
(
'
vs/editor/common/model/model
'
);
import
{
E
ventSource
}
from
'
vs/base/common/eventSource
'
;
import
{
E
mitter
}
from
'
vs/base/common/event
'
;
import
{
IModel
}
from
'
vs/editor/common/editorCommon
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
create
}
from
'
vs/platform/instantiation/common/instantiationService
'
;
...
...
@@ -24,13 +24,13 @@ suite('Search - Model', () => {
let
oneModel
:
IModel
;
setup
(()
=>
{
let
e
vent
=
new
EventSource
<
any
>
();
let
e
mitter
=
new
Emitter
<
any
>
();
oneModel
=
new
model
.
Model
(
'
line1
\n
line2
\n
line3
'
,
null
,
URI
.
parse
(
'
file:///folder/file.txt
'
));
instantiation
=
create
({
modelService
:
{
getModel
:
()
=>
oneModel
,
onModelAdded
:
e
vent
.
value
onModelAdded
:
e
mitter
.
event
},
requestService
:
{
getRequestUrl
:
()
=>
'
file:///folder/file.txt
'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录