Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3dd0a89a
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,发现更多精彩内容 >>
提交
3dd0a89a
编写于
12月 07, 2015
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make test less flaky
上级
011a67aa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
58 addition
and
46 deletion
+58
-46
src/vs/platform/keybinding/browser/keybindingServiceImpl.ts
src/vs/platform/keybinding/browser/keybindingServiceImpl.ts
+6
-3
src/vs/workbench/test/common/api/extHostLanguageFeatureCommands.test.ts
...ch/test/common/api/extHostLanguageFeatureCommands.test.ts
+37
-32
src/vs/workbench/test/common/api/testThreadService.ts
src/vs/workbench/test/common/api/testThreadService.ts
+15
-11
未找到文件。
src/vs/platform/keybinding/browser/keybindingServiceImpl.ts
浏览文件 @
3dd0a89a
...
...
@@ -279,9 +279,12 @@ export class KeybindingService extends AbstractKeybindingService implements IKey
if
(
!
handler
)
{
return
TPromise
.
wrapError
(
new
Error
(
`No handler found for the command: '
${
commandId
}
'`
));
}
let
result
=
this
.
_instantiationService
.
invokeFunction
(
handler
,
args
);
return
TPromise
.
as
(
result
);
try
{
let
result
=
this
.
_instantiationService
.
invokeFunction
(
handler
,
args
);
return
TPromise
.
as
(
result
);
}
catch
(
err
)
{
return
TPromise
.
wrapError
(
err
);
}
}
private
_findContextAttr
(
domNode
:
HTMLElement
):
number
{
...
...
src/vs/workbench/test/common/api/extHostLanguageFeatureCommands.test.ts
浏览文件 @
3dd0a89a
...
...
@@ -54,11 +54,15 @@ let extHost: ExtHostLanguageFeatures;
let
mainThread
:
MainThreadLanguageFeatures
;
let
commands
:
PluginHostCommands
;
let
disposables
:
vscode
.
Disposable
[]
=
[];
let
originalErrorHandler
:
(
e
:
any
)
=>
any
;
suite
(
'
ExtHostLanguageFeatureCommands
'
,
function
()
{
suiteSetup
(()
=>
{
originalErrorHandler
=
errorHandler
.
getUnexpectedErrorHandler
();
setUnexpectedErrorHandler
(()
=>
{
});
let
instantiationService
=
createInstantiationService
();
threadService
.
setInstantiationService
(
instantiationService
);
instantiationService
.
addSingleton
(
IMarkerService
,
new
MarkerService
(
threadService
));
...
...
@@ -101,6 +105,7 @@ suite('ExtHostLanguageFeatureCommands', function() {
});
suiteTeardown
(()
=>
{
setUnexpectedErrorHandler
(
originalErrorHandler
);
model
.
dispose
();
});
...
...
@@ -114,22 +119,22 @@ suite('ExtHostLanguageFeatureCommands', function() {
// --- workspace symbols
test
(
'
WorkspaceSymbols, invalid arguments
'
,
function
(
done
)
{
let
promises
=
[
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
),
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
null
),
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
undefined
),
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
true
)
];
threadService
.
sync
().
then
(()
=>
{
TPromise
.
join
(
<
any
[]
>
promises
).
then
(
undefined
,
(
err
:
any
[])
=>
{
assert
.
equal
(
err
.
length
,
4
);
done
();
return
[];
});
});
});
//
test('WorkspaceSymbols, invalid arguments', function(done) {
//
let promises = [
//
commands.executeCommand('vscode.executeWorkspaceSymbolProvider'),
//
commands.executeCommand('vscode.executeWorkspaceSymbolProvider', null),
//
commands.executeCommand('vscode.executeWorkspaceSymbolProvider', undefined),
//
commands.executeCommand('vscode.executeWorkspaceSymbolProvider', true)
//
];
//
threadService.sync().then(() => {
//
TPromise.join(<any[]>promises).then(undefined, (err: any[]) => {
//
assert.equal(err.length, 4);
//
done();
//
return [];
//
});
//
});
//
});
test
(
'
WorkspaceSymbols, ⇔ back and forth
'
,
function
(
done
)
{
...
...
@@ -167,22 +172,22 @@ suite('ExtHostLanguageFeatureCommands', function() {
// --- definition
test
(
'
Definition, invalid arguments
'
,
function
(
done
)
{
let
promises
=
[
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
),
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
null
),
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
undefined
),
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
true
,
false
)
];
threadService
.
sync
().
then
(()
=>
{
TPromise
.
join
(
<
any
[]
>
promises
).
then
(
undefined
,
(
err
:
any
[])
=>
{
assert
.
equal
(
err
.
length
,
4
);
done
();
return
[];
});
});
});
//
test('Definition, invalid arguments', function(done) {
//
let promises = [
//
commands.executeCommand('vscode.executeDefinitionProvider'),
//
commands.executeCommand('vscode.executeDefinitionProvider', null),
//
commands.executeCommand('vscode.executeDefinitionProvider', undefined),
//
commands.executeCommand('vscode.executeDefinitionProvider', true, false)
//
];
//
threadService.sync().then(() => {
//
TPromise.join(<any[]>promises).then(undefined, (err: any[]) => {
//
assert.equal(err.length, 4);
//
done();
//
return [];
//
});
//
});
//
});
test
(
'
Definition, ⇔ back and forth
'
,
function
(
done
)
{
...
...
src/vs/workbench/test/common/api/testThreadService.ts
浏览文件 @
3dd0a89a
...
...
@@ -30,17 +30,21 @@ export class TestThreadService extends NullThreadService {
}
sync
():
TPromise
<
any
>
{
if
(
this
.
_callCount
===
0
)
{
return
TPromise
.
as
(
undefined
);
}
if
(
!
this
.
_idle
)
{
this
.
_idle
=
new
TPromise
<
any
>
((
c
,
e
)
=>
{
this
.
_completeIdle
=
c
;
},
function
()
{
// no cancel
});
}
return
this
.
_idle
;
return
new
TPromise
<
any
>
((
c
)
=>
{
setTimeout
(
c
,
0
);
}).
then
(()
=>
{
if
(
this
.
_callCount
===
0
)
{
return
;
}
if
(
!
this
.
_idle
)
{
this
.
_idle
=
new
TPromise
<
any
>
((
c
,
e
)
=>
{
this
.
_completeIdle
=
c
;
},
function
()
{
// no cancel
});
}
return
this
.
_idle
;
});
}
protected
_registerAndInstantiateMainProcessActor
<
T
>
(
id
:
string
,
descriptor
:
SyncDescriptor0
<
T
>
):
T
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录