Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
244d7113
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,发现更多精彩内容 >>
提交
244d7113
编写于
11月 14, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - fix sync-then-behaviour in polyfill-promise
上级
913e891c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
6 deletion
+51
-6
src/vs/base/common/winjs.polyfill.promise.ts
src/vs/base/common/winjs.polyfill.promise.ts
+24
-6
src/vs/base/test/common/winjs.polyfill.promise.test.ts
src/vs/base/test/common/winjs.polyfill.promise.test.ts
+27
-0
未找到文件。
src/vs/base/common/winjs.polyfill.promise.ts
浏览文件 @
244d7113
...
...
@@ -42,14 +42,14 @@ export class PolyfillPromise<T = any> implements Promise<T> {
constructor
(
winjsPromise
:
WinJSPromise
);
constructor
(
callback
:
(
resolve
:
(
value
?:
T
)
=>
void
,
reject
:
(
err
?:
any
)
=>
void
)
=>
any
);
constructor
(
callback
:
WinJSPromise
|
((
resolve
:
(
value
?:
T
)
=>
void
,
reject
:
(
err
?:
any
)
=>
void
)
=>
any
))
{
constructor
(
initOrPromise
:
WinJSPromise
|
((
resolve
:
(
value
?:
T
)
=>
void
,
reject
:
(
err
?:
any
)
=>
void
)
=>
any
))
{
if
(
WinJSPromise
.
is
(
callback
))
{
this
.
_winjsPromise
=
callback
;
if
(
WinJSPromise
.
is
(
initOrPromise
))
{
this
.
_winjsPromise
=
initOrPromise
;
}
else
{
this
.
_winjsPromise
=
new
WinJSPromise
((
resolve
,
reject
)
=>
{
let
initializing
=
true
;
callback
(
function
(
value
)
{
initOrPromise
(
function
(
value
)
{
if
(
!
initializing
)
{
resolve
(
value
);
}
else
{
...
...
@@ -68,10 +68,28 @@ export class PolyfillPromise<T = any> implements Promise<T> {
}
then
(
onFulfilled
?:
any
,
onRejected
?:
any
):
PolyfillPromise
{
return
new
PolyfillPromise
(
this
.
_winjsPromise
.
then
(
onFulfilled
,
onRejected
));
let
sync
=
true
;
let
promise
=
new
PolyfillPromise
(
this
.
_winjsPromise
.
then
(
onFulfilled
&&
function
(
value
)
{
if
(
!
sync
)
{
onFulfilled
(
value
);
}
else
{
setImmediate
(
onFulfilled
,
value
);
}
},
onRejected
&&
function
(
err
)
{
if
(
!
sync
)
{
onFulfilled
(
err
);
}
else
{
setImmediate
(
onFulfilled
,
err
);
}
}
));
sync
=
false
;
return
promise
;
}
catch
(
onRejected
?:
any
):
PolyfillPromise
{
return
new
PolyfillPromise
(
this
.
_winjsPromise
.
then
(
null
,
onRejected
)
);
return
this
.
then
(
null
,
onRejected
);
}
}
src/vs/base/test/common/winjs.polyfill.promise.test.ts
浏览文件 @
244d7113
...
...
@@ -51,6 +51,33 @@ suite('Polyfill Promise', function () {
});
});
test
(
'
sync-then, NativePromise
'
,
function
()
{
const
actual
:
string
[]
=
[];
const
promise
=
Promise
.
resolve
(
123
).
then
(()
=>
actual
.
push
(
'
inThen
'
));
actual
.
push
(
'
afterThen
'
);
return
promise
.
then
(()
=>
{
assert
.
deepEqual
(
actual
,
[
'
afterThen
'
,
'
inThen
'
]);
});
});
test
(
'
sync-then, WinJSPromise
'
,
function
()
{
const
actual
:
string
[]
=
[];
const
promise
=
WinJSPromise
.
as
(
123
).
then
(()
=>
actual
.
push
(
'
inThen
'
));
actual
.
push
(
'
afterThen
'
);
return
promise
.
then
(()
=>
{
assert
.
deepEqual
(
actual
,
[
'
inThen
'
,
'
afterThen
'
]);
});
});
test
(
'
sync-then, PolyfillPromise
'
,
function
()
{
const
actual
:
string
[]
=
[];
const
promise
=
PolyfillPromise
.
resolve
(
123
).
then
(()
=>
actual
.
push
(
'
inThen
'
));
actual
.
push
(
'
afterThen
'
);
return
promise
.
then
(()
=>
{
assert
.
deepEqual
(
actual
,
[
'
afterThen
'
,
'
inThen
'
]);
});
});
test
(
'
PolyfillPromise, executor has two params
'
,
function
()
{
return
new
PolyfillPromise
(
function
()
{
assert
.
equal
(
arguments
.
length
,
2
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录