Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b71ea763
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,发现更多精彩内容 >>
提交
b71ea763
编写于
9月 07, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
:dancing_men: remove asWinJSPromise #56137
上级
cd873747
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
33 deletion
+5
-33
src/vs/base/common/async.ts
src/vs/base/common/async.ts
+0
-29
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
...vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+5
-4
未找到文件。
src/vs/base/common/async.ts
浏览文件 @
b71ea763
...
...
@@ -58,35 +58,6 @@ export function createCancelablePromise<T>(callback: (token: CancellationToken)
};
}
export
function
asWinJsPromise
<
T
>
(
callback
:
(
token
:
CancellationToken
)
=>
T
|
TPromise
<
T
>
|
Thenable
<
T
>
):
TPromise
<
T
>
{
let
source
=
new
CancellationTokenSource
();
return
new
TPromise
<
T
>
((
resolve
,
reject
)
=>
{
let
item
=
callback
(
source
.
token
);
if
(
item
instanceof
TPromise
)
{
item
.
then
(
result
=>
{
source
.
dispose
();
resolve
(
result
);
},
err
=>
{
source
.
dispose
();
reject
(
err
);
});
}
else
if
(
isThenable
<
T
>
(
item
))
{
item
.
then
(
result
=>
{
source
.
dispose
();
resolve
(
result
);
},
err
=>
{
source
.
dispose
();
reject
(
err
);
});
}
else
{
source
.
dispose
();
resolve
(
item
);
}
},
()
=>
{
source
.
cancel
();
});
}
export
function
asThenable
<
T
>
(
callback
:
()
=>
T
|
TPromise
<
T
>
|
Thenable
<
T
>
):
Thenable
<
T
>
{
return
new
TPromise
<
T
>
((
resolve
,
reject
)
=>
{
let
item
=
callback
();
...
...
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
浏览文件 @
b71ea763
...
...
@@ -26,7 +26,8 @@ import { overviewRulerRangeHighlight } from 'vs/editor/common/view/editorColorRe
import
{
GroupIdentifier
,
IEditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
IEditorService
,
SIDE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorGroup
}
from
'
vs/workbench/services/group/common/editorGroupsService
'
;
import
{
asWinJsPromise
}
from
'
vs/base/common/async
'
;
import
{
asThenable
}
from
'
vs/base/common/async
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
export
const
GOTO_SYMBOL_PREFIX
=
'
@
'
;
export
const
SCOPE_PREFIX
=
'
:
'
;
...
...
@@ -483,8 +484,8 @@ export class GotoSymbolHandler extends QuickOpenHandler {
if
(
this
.
outlineToModelCache
[
modelId
])
{
return
TPromise
.
as
(
this
.
outlineToModelCache
[
modelId
]);
}
return
asWinJsPromise
(
token
=>
getDocumentSymbols
(
<
ITextModel
>
model
,
token
)).
then
(
entries
=>
{
// TODO@Ben - QuickOpenHandler#getResult should support cancellation
return
TPromise
.
wrap
(
asThenable
(()
=>
getDocumentSymbols
(
<
ITextModel
>
model
,
CancellationToken
.
None
)).
then
(
entries
=>
{
const
model
=
new
OutlineModel
(
this
.
toQuickOpenEntries
(
entries
));
...
...
@@ -492,7 +493,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
this
.
outlineToModelCache
[
modelId
]
=
model
;
return
model
;
});
})
)
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录