Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1ed36784
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,发现更多精彩内容 >>
提交
1ed36784
编写于
9月 21, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - in suggest use cancellation token instead of cancelable promise
上级
63ca867a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
14 deletion
+22
-14
src/vs/editor/contrib/suggest/suggest.ts
src/vs/editor/contrib/suggest/suggest.ts
+10
-2
src/vs/editor/contrib/suggest/suggestModel.ts
src/vs/editor/contrib/suggest/suggestModel.ts
+12
-12
未找到文件。
src/vs/editor/contrib/suggest/suggest.ts
浏览文件 @
1ed36784
...
...
@@ -7,7 +7,7 @@ import { first2 } from 'vs/base/common/async';
import
{
isFalsyOrEmpty
}
from
'
vs/base/common/arrays
'
;
import
{
compareIgnoreCase
}
from
'
vs/base/common/strings
'
;
import
{
assign
}
from
'
vs/base/common/objects
'
;
import
{
onUnexpectedExternalError
}
from
'
vs/base/common/errors
'
;
import
{
onUnexpectedExternalError
,
canceled
}
from
'
vs/base/common/errors
'
;
import
{
IEditorContribution
}
from
'
vs/editor/common/editorCommon
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
registerDefaultLanguageCommand
}
from
'
vs/editor/browser/editorExtensions
'
;
...
...
@@ -111,7 +111,15 @@ export function provideSuggestionItems(
}));
});
const
result
=
first2
(
factory
,
()
=>
hasResult
).
then
(()
=>
allSuggestions
.
sort
(
getSuggestionComparator
(
snippetConfig
)));
const
result
=
first2
(
factory
,
()
=>
{
// stop on result or cancellation
return
hasResult
||
token
.
isCancellationRequested
;
}).
then
(()
=>
{
if
(
token
.
isCancellationRequested
)
{
return
Promise
.
reject
(
canceled
());
}
return
allSuggestions
.
sort
(
getSuggestionComparator
(
snippetConfig
));
});
// result.then(items => {
// console.log(model.getWordUntilPosition(position), items.map(item => `${item.suggestion.label}, type=${item.suggestion.type}, incomplete?${item.container.incomplete}, overwriteBefore=${item.suggestion.overwriteBefore}`));
...
...
src/vs/editor/contrib/suggest/suggestModel.ts
浏览文件 @
1ed36784
...
...
@@ -5,7 +5,7 @@
'
use strict
'
;
import
{
isFalsyOrEmpty
}
from
'
vs/base/common/arrays
'
;
import
{
TimeoutTimer
,
CancelablePromise
,
createCancelablePromise
}
from
'
vs/base/common/async
'
;
import
{
TimeoutTimer
}
from
'
vs/base/common/async
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
...
...
@@ -19,6 +19,7 @@ import { ISuggestSupport, StandardTokenType, SuggestContext, SuggestRegistry, Su
import
{
CompletionModel
}
from
'
./completionModel
'
;
import
{
ISuggestionItem
,
getSuggestionComparator
,
provideSuggestionItems
,
getSnippetSuggestSupport
}
from
'
./suggest
'
;
import
{
SnippetController2
}
from
'
vs/editor/contrib/snippet/snippetController2
'
;
import
{
CancellationTokenSource
}
from
'
vs/base/common/cancellation
'
;
export
interface
ICancelEvent
{
readonly
retrigger
:
boolean
;
...
...
@@ -98,7 +99,7 @@ export class SuggestModel implements IDisposable {
private
readonly
_triggerRefilter
=
new
TimeoutTimer
();
private
_state
:
State
;
private
_request
Promise
:
CancelablePromise
<
ISuggestionItem
[]
>
;
private
_request
Token
:
CancellationTokenSource
;
private
_context
:
LineContext
;
private
_currentSelection
:
Selection
;
...
...
@@ -114,7 +115,6 @@ export class SuggestModel implements IDisposable {
constructor
(
editor
:
ICodeEditor
)
{
this
.
_editor
=
editor
;
this
.
_state
=
State
.
Idle
;
this
.
_requestPromise
=
null
;
this
.
_completionModel
=
null
;
this
.
_context
=
null
;
this
.
_currentSelection
=
this
.
_editor
.
getSelection
()
||
new
Selection
(
1
,
1
,
1
,
1
);
...
...
@@ -230,12 +230,10 @@ export class SuggestModel implements IDisposable {
if
(
this
.
_triggerQuickSuggest
)
{
this
.
_triggerQuickSuggest
.
cancel
();
}
if
(
this
.
_requestPromise
)
{
this
.
_requestPromise
.
cancel
();
this
.
_requestPromise
=
null
;
if
(
this
.
_requestToken
)
{
this
.
_requestToken
.
cancel
();
}
this
.
_state
=
State
.
Idle
;
...
...
@@ -385,18 +383,20 @@ export class SuggestModel implements IDisposable {
suggestCtx
=
{
triggerKind
:
SuggestTriggerKind
.
Invoke
};
}
this
.
_requestPromise
=
createCancelablePromise
(
token
=>
provideSuggestionItems
(
this
.
_requestToken
=
new
CancellationTokenSource
();
provideSuggestionItems
(
model
,
this
.
_editor
.
getPosition
(),
this
.
_editor
.
getConfiguration
().
contribInfo
.
suggest
.
snippets
,
onlyFrom
,
suggestCtx
,
token
));
this
.
_requestToken
.
token
).
then
(
items
=>
{
this
.
_requestPromise
.
then
(
items
=>
{
this
.
_requestToken
.
dispose
();
this
.
_requestPromise
=
null
;
if
(
this
.
_state
===
State
.
Idle
)
{
return
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录