Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
830d5c40
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
830d5c40
编写于
11月 21, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #34913: Wait for command activation event if command is unknown
上级
448eaa21
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
12 deletion
+32
-12
src/vs/platform/commands/common/commandService.ts
src/vs/platform/commands/common/commandService.ts
+8
-10
src/vs/platform/commands/test/commandService.test.ts
src/vs/platform/commands/test/commandService.test.ts
+24
-2
未找到文件。
src/vs/platform/commands/common/commandService.ts
浏览文件 @
830d5c40
...
...
@@ -6,7 +6,7 @@
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ICommandService
,
ICommand
,
ICommand
Event
,
CommandsRegistry
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ICommandService
,
ICommandEvent
,
CommandsRegistry
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IExtensionService
}
from
'
vs/platform/extensions/common/extensions
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
...
...
@@ -33,17 +33,19 @@ export class CommandService extends Disposable implements ICommandService {
executeCommand
<
T
>
(
id
:
string
,
...
args
:
any
[]):
TPromise
<
T
>
{
// we always send an activation event, but
// we don't wait for it when the extension
// host didn't yet start
// host didn't yet start
and the command is already registered
const
activation
=
this
.
_extensionService
.
activateByEvent
(
`onCommand:
${
id
}
`
);
return
this
.
_extensionHostIsReady
?
activation
.
then
(
_
=>
this
.
_tryExecuteCommand
(
id
,
args
))
:
this
.
_tryExecuteCommand
(
id
,
args
);
if
(
!
this
.
_extensionHostIsReady
&&
CommandsRegistry
.
getCommand
(
id
))
{
return
this
.
_tryExecuteCommand
(
id
,
args
);
}
else
{
return
activation
.
then
(
_
=>
this
.
_tryExecuteCommand
(
id
,
args
));
}
}
private
_tryExecuteCommand
(
id
:
string
,
args
:
any
[]):
TPromise
<
any
>
{
const
command
=
this
.
_
getCommand
(
id
);
const
command
=
CommandsRegistry
.
getCommand
(
id
);
if
(
!
command
)
{
return
TPromise
.
wrapError
(
new
Error
(
`command '
${
id
}
' not found`
));
}
...
...
@@ -61,8 +63,4 @@ export class CommandService extends Disposable implements ICommandService {
return
TPromise
.
wrapError
(
err
);
}
}
private
_getCommand
(
id
:
string
):
ICommand
{
return
CommandsRegistry
.
getCommand
(
id
);
}
}
src/vs/platform/commands/test/commandService.test.ts
浏览文件 @
830d5c40
...
...
@@ -101,10 +101,32 @@ suite('CommandService', function () {
}
},
new
ContextKeyService
(
new
SimpleConfigurationService
()));
return
service
.
executeCommand
(
'
bar
'
).
then
(()
=>
{
service
.
executeCommand
(
'
bar
'
);
assert
.
equal
(
callCounter
,
1
);
reg
.
dispose
();
});
test
(
'
issue #34913: !onReady, unknown command
'
,
function
()
{
let
callCounter
=
0
;
let
resolveFunc
:
Function
;
// let reg = CommandsRegistry.registerCommand('bar', () => callCounter += 1);
let
service
=
new
CommandService
(
new
InstantiationService
(),
new
class
extends
SimpleExtensionService
{
onReady
()
{
return
new
TPromise
<
boolean
>
(
_resolve
=>
{
resolveFunc
=
_resolve
;
});
}
},
new
ContextKeyService
(
new
SimpleConfigurationService
()));
let
r
=
service
.
executeCommand
(
'
bar
'
);
assert
.
equal
(
callCounter
,
0
);
let
reg
=
CommandsRegistry
.
registerCommand
(
'
bar
'
,
()
=>
callCounter
+=
1
);
resolveFunc
(
true
);
return
r
.
then
(()
=>
{
reg
.
dispose
();
assert
.
equal
(
callCounter
,
1
);
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录