Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
bd55fd8d
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,发现更多精彩内容 >>
提交
bd55fd8d
编写于
9月 06, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove cancelableThen, overload timeout
上级
e34efce3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
28 addition
and
32 deletion
+28
-32
src/vs/base/common/async.ts
src/vs/base/common/async.ts
+12
-17
src/vs/base/common/cache.ts
src/vs/base/common/cache.ts
+9
-5
src/vs/base/test/common/cache.test.ts
src/vs/base/test/common/cache.test.ts
+6
-6
src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
...ench/parts/extensions/electron-browser/extensionEditor.ts
+1
-1
src/vs/workbench/services/search/node/rawSearchService.ts
src/vs/workbench/services/search/node/rawSearchService.ts
+0
-3
未找到文件。
src/vs/base/common/async.ts
浏览文件 @
bd55fd8d
...
...
@@ -26,8 +26,6 @@ export function toThenable<T>(arg: T | Thenable<T>): Thenable<T> {
export
interface
CancelablePromise
<
T
>
extends
Promise
<
T
>
{
cancel
():
void
;
cancelableThen
<
U
>
(
onFulfilled
?:
(
value
:
T
)
=>
U
|
Thenable
<
U
>
,
onRejected
?:
(
error
:
any
)
=>
U
|
Thenable
<
U
>
):
CancelablePromise
<
U
>
;
cancelableThen
<
U
>
(
onFulfilled
?:
(
value
:
T
)
=>
U
|
Thenable
<
U
>
,
onRejected
?:
(
error
:
any
)
=>
void
):
CancelablePromise
<
U
>
;
}
export
function
createCancelablePromise
<
T
>
(
callback
:
(
token
:
CancellationToken
)
=>
Thenable
<
T
>
):
CancelablePromise
<
T
>
{
...
...
@@ -57,13 +55,6 @@ export function createCancelablePromise<T>(callback: (token: CancellationToken)
catch
<
TResult
=
never
>
(
reject
?:
((
reason
:
any
)
=>
TResult
|
Thenable
<
TResult
>
)
|
undefined
|
null
):
Promise
<
T
|
TResult
>
{
return
this
.
then
(
undefined
,
reject
);
}
cancelableThen
<
TResult1
=
T
,
TResult2
=
never
>
(
resolve
?:
((
value
:
T
)
=>
TResult1
|
Thenable
<
TResult1
>
)
|
undefined
|
null
,
reject
?:
((
reason
:
any
)
=>
TResult2
|
Thenable
<
TResult2
>
)
|
undefined
|
null
):
CancelablePromise
<
TResult1
|
TResult2
>
{
return
createCancelablePromise
<
TResult1
|
TResult2
>
(
token
=>
{
const
listener
=
token
.
onCancellationRequested
(
_
=>
this
.
cancel
());
always
(
promise
,
()
=>
listener
.
dispose
());
return
this
.
then
(
resolve
,
reject
);
});
}
};
}
...
...
@@ -383,14 +374,18 @@ export class ShallowCancelThenPromise<T> extends TPromise<T> {
/**
* Replacement for `WinJS.TPromise.timeout`.
*/
export
function
timeout
(
n
:
number
):
CancelablePromise
<
void
>
{
return
createCancelablePromise
(
token
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
const
handle
=
setTimeout
(
resolve
,
n
);
token
.
onCancellationRequested
(
_
=>
{
clearTimeout
(
handle
);
reject
(
errors
.
canceled
());
});
export
function
timeout
(
millis
:
number
):
CancelablePromise
<
void
>
;
export
function
timeout
(
millis
:
number
,
token
:
CancellationToken
):
Thenable
<
void
>
;
export
function
timeout
(
millis
:
number
,
token
?:
CancellationToken
):
CancelablePromise
<
void
>
|
Thenable
<
void
>
{
if
(
!
token
)
{
return
createCancelablePromise
(
token
=>
timeout
(
millis
,
token
));
}
return
new
Promise
((
resolve
,
reject
)
=>
{
const
handle
=
setTimeout
(
resolve
,
millis
);
token
.
onCancellationRequested
(()
=>
{
clearTimeout
(
handle
);
reject
(
errors
.
canceled
());
});
});
}
...
...
src/vs/base/common/cache.ts
浏览文件 @
bd55fd8d
...
...
@@ -5,30 +5,34 @@
'
use strict
'
;
import
{
CancelablePromise
}
from
'
vs/base/common/async
'
;
import
{
CancellationToken
,
CancellationTokenSource
}
from
'
vs/base/common/cancellation
'
;
import
{
always
}
from
'
vs/base/common/async
'
;
export
interface
CacheResult
<
T
>
{
promise
:
Thenable
<
T
>
;
dispose
():
void
;
}
export
default
class
Cache
<
T
>
{
export
class
Cache
<
T
>
{
private
result
:
CacheResult
<
T
>
=
null
;
constructor
(
private
task
:
(
)
=>
CancelablePromis
e
<
T
>
)
{
}
constructor
(
private
task
:
(
ct
:
CancellationToken
)
=>
Thenabl
e
<
T
>
)
{
}
get
():
CacheResult
<
T
>
{
if
(
this
.
result
)
{
return
this
.
result
;
}
const
promise
=
this
.
task
();
const
cts
=
new
CancellationTokenSource
();
const
promise
=
this
.
task
(
cts
.
token
);
always
(
promise
,
()
=>
cts
.
dispose
());
this
.
result
=
{
promise
,
dispose
:
()
=>
{
this
.
result
=
null
;
promise
.
cancel
();
cts
.
cancel
();
cts
.
dispose
();
}
};
...
...
src/vs/base/test/common/cache.test.ts
浏览文件 @
bd55fd8d
...
...
@@ -6,15 +6,15 @@
'
use strict
'
;
import
*
as
assert
from
'
assert
'
;
import
Cache
from
'
vs/base/common/cache
'
;
import
{
Cache
}
from
'
vs/base/common/cache
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
createCancelablePromise
,
timeout
}
from
'
vs/base/common/async
'
;
import
{
timeout
}
from
'
vs/base/common/async
'
;
suite
(
'
Cache
'
,
()
=>
{
test
(
'
simple value
'
,
()
=>
{
let
counter
=
0
;
const
cache
=
new
Cache
(
()
=>
createCancelablePromise
(
_
=>
TPromise
.
as
(
counter
++
)
));
const
cache
=
new
Cache
(
_
=>
TPromise
.
as
(
counter
++
));
return
cache
.
get
().
promise
.
then
(
c
=>
assert
.
equal
(
c
,
0
),
()
=>
assert
.
fail
(
'
Unexpected assertion error
'
))
...
...
@@ -24,7 +24,7 @@ suite('Cache', () => {
test
(
'
simple error
'
,
()
=>
{
let
counter
=
0
;
const
cache
=
new
Cache
(
()
=>
createCancelablePromise
(
_
=>
TPromise
.
wrapError
(
new
Error
(
String
(
counter
++
)
))));
const
cache
=
new
Cache
(
_
=>
TPromise
.
wrapError
(
new
Error
(
String
(
counter
++
))));
return
cache
.
get
().
promise
.
then
(()
=>
assert
.
fail
(
'
Unexpected assertion error
'
),
err
=>
assert
.
equal
(
err
.
message
,
0
))
...
...
@@ -35,9 +35,9 @@ suite('Cache', () => {
test
(
'
should retry cancellations
'
,
()
=>
{
let
counter1
=
0
,
counter2
=
0
;
const
cache
=
new
Cache
(
()
=>
{
const
cache
=
new
Cache
(
token
=>
{
counter1
++
;
return
timeout
(
2
).
cancelableT
hen
(()
=>
counter2
++
);
return
timeout
(
2
,
token
).
t
hen
(()
=>
counter2
++
);
});
assert
.
equal
(
counter1
,
0
);
...
...
src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
浏览文件 @
bd55fd8d
...
...
@@ -13,7 +13,7 @@ import { createCancelablePromise, wireCancellationToken } from 'vs/base/common/a
import
*
as
arrays
from
'
vs/base/common/arrays
'
;
import
{
OS
}
from
'
vs/base/common/platform
'
;
import
{
Event
,
Emitter
,
once
,
chain
}
from
'
vs/base/common/event
'
;
import
Cache
,
{
CacheResult
}
from
'
vs/base/common/cache
'
;
import
{
Cache
,
CacheResult
}
from
'
vs/base/common/cache
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
{
isPromiseCanceledError
}
from
'
vs/base/common/errors
'
;
import
{
IDisposable
,
dispose
,
toDisposable
}
from
'
vs/base/common/lifecycle
'
;
...
...
src/vs/workbench/services/search/node/rawSearchService.ts
浏览文件 @
bd55fd8d
...
...
@@ -456,9 +456,6 @@ export class SearchService implements IRawSearchService {
catch
(
reject
?)
{
return
this
.
then
(
undefined
,
reject
);
}
cancelableThen
(
resolve
,
reject
)
{
return
createCancelablePromise
(
_
=>
this
.
then
(
resolve
,
reject
));
}
};
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录