Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e6a2c02a
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,发现更多精彩内容 >>
提交
e6a2c02a
编写于
5月 28, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Double check token and also dispose from main side, #74446
上级
4eb7879a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
3 deletion
+16
-3
src/vs/editor/contrib/links/getLinks.ts
src/vs/editor/contrib/links/getLinks.ts
+8
-1
src/vs/editor/contrib/suggest/suggest.ts
src/vs/editor/contrib/suggest/suggest.ts
+8
-2
未找到文件。
src/vs/editor/contrib/links/getLinks.ts
浏览文件 @
e6a2c02a
...
...
@@ -148,7 +148,14 @@ export function getLinks(model: ITextModel, token: CancellationToken): Promise<L
},
onUnexpectedExternalError
);
});
return
Promise
.
all
(
promises
).
then
(()
=>
new
LinksList
(
coalesce
(
lists
)));
return
Promise
.
all
(
promises
).
then
(()
=>
{
const
result
=
new
LinksList
(
coalesce
(
lists
));
if
(
!
token
.
isCancellationRequested
)
{
return
result
;
}
result
.
dispose
();
return
new
LinksList
([]);
});
}
...
...
src/vs/editor/contrib/suggest/suggest.ts
浏览文件 @
e6a2c02a
...
...
@@ -122,7 +122,6 @@ export function provideSuggestionItems(
token
:
CancellationToken
=
CancellationToken
.
None
):
Promise
<
CompletionItem
[]
>
{
const
allSuggestions
:
CompletionItem
[]
=
[];
const
wordUntil
=
model
.
getWordUntilPosition
(
position
);
const
defaultRange
=
new
Range
(
position
.
lineNumber
,
wordUntil
.
startColumn
,
position
.
lineNumber
,
wordUntil
.
endColumn
);
...
...
@@ -136,9 +135,12 @@ export function provideSuggestionItems(
supports
.
unshift
([
_snippetSuggestSupport
]);
}
const
allSuggestions
:
CompletionItem
[]
=
[];
const
disposables
=
new
DisposableStore
();
let
hasResult
=
false
;
// add suggestions from contributed providers - providers are ordered in groups of
// equal score and once a group produces a result the process stops
let
hasResult
=
false
;
const
factory
=
supports
.
map
(
supports
=>
()
=>
{
// for each support in the group ask for suggestions
return
Promise
.
all
(
supports
.
map
(
provider
=>
{
...
...
@@ -163,6 +165,9 @@ export function provideSuggestionItems(
allSuggestions
.
push
(
new
CompletionItem
(
position
,
suggestion
,
container
,
provider
,
model
));
}
}
if
(
isDisposable
(
container
))
{
disposables
.
add
(
container
);
}
}
if
(
len
!==
allSuggestions
.
length
&&
provider
!==
_snippetSuggestSupport
)
{
...
...
@@ -178,6 +183,7 @@ export function provideSuggestionItems(
return
hasResult
||
token
.
isCancellationRequested
;
}).
then
(()
=>
{
if
(
token
.
isCancellationRequested
)
{
disposables
.
dispose
();
return
Promise
.
reject
<
any
>
(
canceled
());
}
return
allSuggestions
.
sort
(
getSuggestionComparator
(
options
.
snippetSortOrder
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录