Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
ebeff100
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,发现更多精彩内容 >>
提交
ebeff100
编写于
10月 16, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
eng - less TPromise usage
上级
f9d93e88
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
29 deletion
+22
-29
src/vs/workbench/api/node/extHostDecorations.ts
src/vs/workbench/api/node/extHostDecorations.ts
+1
-2
src/vs/workbench/api/node/extHostTask.ts
src/vs/workbench/api/node/extHostTask.ts
+1
-2
src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
...ench/test/electron-browser/api/extHostApiCommands.test.ts
+19
-23
src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
...ench/test/electron-browser/api/extHostTextEditors.test.ts
+1
-2
未找到文件。
src/vs/workbench/api/node/extHostDecorations.ts
浏览文件 @
ebeff100
...
...
@@ -6,7 +6,6 @@
import
*
as
vscode
from
'
vscode
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
MainContext
,
IMainContext
,
ExtHostDecorationsShape
,
MainThreadDecorationsShape
,
DecorationData
,
DecorationRequest
,
DecorationReply
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Disposable
}
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
...
...
@@ -44,7 +43,7 @@ export class ExtHostDecorations implements ExtHostDecorationsShape {
$provideDecorations
(
requests
:
DecorationRequest
[],
token
:
CancellationToken
):
Thenable
<
DecorationReply
>
{
const
result
:
DecorationReply
=
Object
.
create
(
null
);
return
TPromise
.
join
(
requests
.
map
(
request
=>
{
return
Promise
.
all
(
requests
.
map
(
request
=>
{
const
{
handle
,
uri
,
id
}
=
request
;
if
(
!
this
.
_provider
.
has
(
handle
))
{
// might have been unregistered in the meantime
...
...
src/vs/workbench/api/node/extHostTask.ts
浏览文件 @
ebeff100
...
...
@@ -5,7 +5,6 @@
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
Objects
from
'
vs/base/common/objects
'
;
import
{
asThenable
}
from
'
vs/base/common/async
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
...
...
@@ -863,7 +862,7 @@ export class ExtHostTask implements ExtHostTaskShape {
public
$provideTasks
(
handle
:
number
,
validTypes
:
{
[
key
:
string
]:
boolean
;
}):
Thenable
<
tasks
.
TaskSet
>
{
let
handler
=
this
.
_handlers
.
get
(
handle
);
if
(
!
handler
)
{
return
TPromise
.
wrapError
<
tasks
.
TaskSet
>
(
new
Error
(
'
no handler found
'
));
return
Promise
.
reject
(
new
Error
(
'
no handler found
'
));
}
return
asThenable
(()
=>
handler
.
provider
.
provideTasks
(
CancellationToken
.
None
)).
then
(
value
=>
{
let
sanitized
:
vscode
.
Task
[]
=
[];
...
...
src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
浏览文件 @
ebeff100
...
...
@@ -7,7 +7,6 @@ import * as assert from 'assert';
import
{
setUnexpectedErrorHandler
,
errorHandler
}
from
'
vs/base/common/errors
'
;
import
{
TestInstantiationService
}
from
'
vs/platform/instantiation/test/common/instantiationServiceMock
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
types
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
TextModel
as
EditorModel
}
from
'
vs/editor/common/model/textModel
'
;
import
{
TestRPCProtocol
}
from
'
./testRPCProtocol
'
;
...
...
@@ -50,6 +49,10 @@ let commands: ExtHostCommands;
let
disposables
:
vscode
.
Disposable
[]
=
[];
let
originalErrorHandler
:
(
e
:
any
)
=>
any
;
function
assertRejects
(
fn
:
()
=>
Thenable
<
any
>
,
message
:
string
=
'
Expected rejection
'
)
{
return
fn
().
then
(()
=>
assert
.
ok
(
false
,
message
),
_err
=>
assert
.
ok
(
true
));
}
suite
(
'
ExtHostLanguageFeatureCommands
'
,
function
()
{
suiteSetup
(()
=>
{
...
...
@@ -145,15 +148,12 @@ suite('ExtHostLanguageFeatureCommands', function () {
test
(
'
WorkspaceSymbols, invalid arguments
'
,
function
()
{
let
promises
=
[
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
),
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
null
),
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
undefined
),
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
true
)
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
null
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
undefined
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeWorkspaceSymbolProvider
'
,
true
)
)
];
return
TPromise
.
join
(
<
any
[]
>
promises
).
then
(
undefined
,
(
err
:
any
[])
=>
{
assert
.
equal
(
err
.
length
,
4
);
});
return
Promise
.
all
(
promises
);
});
test
(
'
WorkspaceSymbols, back and forth
'
,
function
()
{
...
...
@@ -209,15 +209,13 @@ suite('ExtHostLanguageFeatureCommands', function () {
test
(
'
Definition, invalid arguments
'
,
function
()
{
let
promises
=
[
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
),
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
null
),
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
undefined
),
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
true
,
false
)
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
null
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
undefined
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeDefinitionProvider
'
,
true
,
false
)
)
];
return
TPromise
.
join
(
<
any
[]
>
promises
).
then
(
undefined
,
(
err
:
any
[])
=>
{
assert
.
equal
(
err
.
length
,
4
);
});
return
Promise
.
all
(
promises
);
});
test
(
'
Definition, back and forth
'
,
function
()
{
...
...
@@ -252,15 +250,13 @@ suite('ExtHostLanguageFeatureCommands', function () {
test
(
'
Type Definition, invalid arguments
'
,
function
()
{
const
promises
=
[
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
),
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
,
null
),
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
,
undefined
),
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
,
true
,
false
)
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
,
null
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
,
undefined
)
),
assertRejects
(()
=>
commands
.
executeCommand
(
'
vscode.executeTypeDefinitionProvider
'
,
true
,
false
)
)
];
return
TPromise
.
join
(
<
any
[]
>
promises
).
then
(
undefined
,
(
err
:
any
[])
=>
{
assert
.
equal
(
err
.
length
,
4
);
});
return
Promise
.
all
(
promises
);
});
test
(
'
Type Definition, back and forth
'
,
function
()
{
...
...
src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
浏览文件 @
ebeff100
...
...
@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
assert
from
'
assert
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
extHostTypes
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
MainContext
,
MainThreadTextEditorsShape
,
WorkspaceEditDto
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
...
...
@@ -24,7 +23,7 @@ suite('ExtHostTextEditors.applyWorkspaceEdit', () => {
let
rpcProtocol
=
new
TestRPCProtocol
();
rpcProtocol
.
set
(
MainContext
.
MainThreadTextEditors
,
new
class
extends
mock
<
MainThreadTextEditorsShape
>
()
{
$tryApplyWorkspaceEdit
(
_workspaceResourceEdits
:
WorkspaceEditDto
):
T
Promise
<
boolean
>
{
$tryApplyWorkspaceEdit
(
_workspaceResourceEdits
:
WorkspaceEditDto
):
Promise
<
boolean
>
{
workspaceResourceEdits
=
_workspaceResourceEdits
;
return
Promise
.
resolve
(
true
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录