Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
ea6831e4
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,发现更多精彩内容 >>
提交
ea6831e4
编写于
8月 19, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
suggest oracle should only know view model, not underlying items, #2508
上级
340e27d4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
39 deletion
+23
-39
src/vs/editor/contrib/suggest/common/completionModel.ts
src/vs/editor/contrib/suggest/common/completionModel.ts
+2
-5
src/vs/editor/contrib/suggest/common/suggestModel.ts
src/vs/editor/contrib/suggest/common/suggestModel.ts
+21
-34
未找到文件。
src/vs/editor/contrib/suggest/common/completionModel.ts
浏览文件 @
ea6831e4
...
...
@@ -41,8 +41,6 @@ export class LineContext {
export
class
CompletionModel
{
public
raw
:
ISuggestionItem
[];
private
_lineContext
:
LineContext
;
private
_items
:
CompletionItem
[]
=
[];
private
_incomplete
:
ISuggestSupport
[]
=
[];
...
...
@@ -51,10 +49,9 @@ export class CompletionModel {
private
_topScoreIdx
:
number
;
private
_stats
:
CompletionStats
;
constructor
(
raw
:
ISuggestionItem
[],
lineContext
:
LineContext
)
{
this
.
raw
=
raw
;
constructor
(
items
:
ISuggestionItem
[],
lineContext
:
LineContext
)
{
this
.
_lineContext
=
lineContext
;
for
(
const
item
of
raw
)
{
for
(
const
item
of
items
)
{
this
.
_items
.
push
(
new
CompletionItem
(
item
));
if
(
item
.
container
.
incomplete
...
...
src/vs/editor/contrib/suggest/common/suggestModel.ts
浏览文件 @
ea6831e4
...
...
@@ -13,8 +13,8 @@ import {startsWith} from 'vs/base/common/strings';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ICommonCodeEditor
,
ICursorSelectionChangedEvent
,
CursorChangeReason
,
IModel
,
IPosition
}
from
'
vs/editor/common/editorCommon
'
;
import
{
ISuggestSupport
,
SuggestRegistry
}
from
'
vs/editor/common/modes
'
;
import
{
ISuggestionItem
,
provideSuggestionItems
}
from
'
./suggest
'
;
import
{
CompletionModel
,
LineContext
}
from
'
./completionModel
'
;
import
{
provideSuggestionItems
}
from
'
./suggest
'
;
import
{
CompletionModel
}
from
'
./completionModel
'
;
export
interface
ICancelEvent
{
retrigger
:
boolean
;
...
...
@@ -152,9 +152,7 @@ export class SuggestModel implements IDisposable {
private
requestPromise
:
TPromise
<
void
>
;
private
context
:
Context
;
private
suggestionItems
:
ISuggestionItem
[];
private
completionModel
:
CompletionModel
;
private
incomplete
:
boolean
;
private
_onDidCancel
:
Emitter
<
ICancelEvent
>
=
new
Emitter
();
get
onDidCancel
():
Event
<
ICancelEvent
>
{
return
this
.
_onDidCancel
.
event
;
}
...
...
@@ -169,9 +167,7 @@ export class SuggestModel implements IDisposable {
this
.
state
=
State
.
Idle
;
this
.
triggerAutoSuggestPromise
=
null
;
this
.
requestPromise
=
null
;
this
.
suggestionItems
=
null
;
this
.
completionModel
=
null
;
this
.
incomplete
=
false
;
this
.
context
=
null
;
// wire up various listeners
...
...
@@ -264,9 +260,7 @@ export class SuggestModel implements IDisposable {
}
this
.
state
=
State
.
Idle
;
this
.
suggestionItems
=
null
;
this
.
completionModel
=
null
;
this
.
incomplete
=
false
;
this
.
context
=
null
;
this
.
_onDidCancel
.
fire
({
retrigger
});
...
...
@@ -323,7 +317,7 @@ export class SuggestModel implements IDisposable {
});
}
}
else
if
(
this
.
suggestionItems
&&
this
.
incomplete
)
{
}
else
if
(
this
.
completionModel
&&
this
.
completionModel
.
incomplete
.
length
>
0
)
{
this
.
trigger
(
this
.
state
===
State
.
Auto
,
true
);
}
else
{
this
.
onNewContext
(
ctx
);
...
...
@@ -347,7 +341,7 @@ export class SuggestModel implements IDisposable {
// Cancel previous requests, change state & update UI
this
.
cancel
(
retrigger
);
this
.
state
=
auto
?
State
.
Auto
:
State
.
Manual
;
this
.
_onDidTrigger
.
fire
({
auto
:
this
.
isAutoSuggest
()
});
this
.
_onDidTrigger
.
fire
({
auto
});
// Capture context when request was sent
this
.
context
=
ctx
;
...
...
@@ -366,17 +360,16 @@ export class SuggestModel implements IDisposable {
return
;
}
this
.
suggestionItems
=
items
;
this
.
incomplete
=
items
.
some
(
result
=>
result
.
container
.
incomplete
);
this
.
completionModel
=
new
CompletionModel
(
items
,
{
leadingLineContent
:
ctx
.
lineContentBefore
,
characterCountDelta
:
this
.
context
?
ctx
.
column
-
this
.
context
.
column
:
0
});
this
.
onNewContext
(
new
Context
(
model
,
this
.
editor
.
getPosition
(),
auto
));
}).
then
(
null
,
onUnexpectedError
);
}
private
isAutoSuggest
():
boolean
{
return
this
.
state
===
State
.
Auto
;
}
public
getTriggerPosition
():
IPosition
{
const
{
lineNumber
,
column
}
=
this
.
context
;
return
{
lineNumber
,
column
};
...
...
@@ -390,34 +383,28 @@ export class SuggestModel implements IDisposable {
this
.
cancel
();
}
return
;
}
}
else
if
(
this
.
completionModel
)
{
if
(
this
.
suggestionItems
)
{
const
auto
=
this
.
isAutoSuggest
();
const
auto
=
this
.
state
===
State
.
Auto
;
const
oldLineContext
=
this
.
completionModel
.
lineContext
;
let
isFrozen
=
false
;
const
lineContext
:
L
ineContext
=
{
this
.
completionModel
.
l
ineContext
=
{
leadingLineContent
:
ctx
.
lineContentBefore
,
characterCountDelta
:
this
.
context
?
ctx
.
column
-
this
.
context
.
column
:
0
};
let
isFrozen
=
false
;
if
(
this
.
completionModel
&&
this
.
completionModel
.
raw
===
this
.
suggestionItems
)
{
const
oldLineContext
=
this
.
completionModel
.
lineContext
;
this
.
completionModel
.
lineContext
=
lineContext
;
if
(
!
auto
&&
this
.
completionModel
.
items
.
length
===
0
)
{
this
.
completionModel
.
lineContext
=
oldLineContext
;
isFrozen
=
true
;
}
}
else
{
this
.
completionModel
=
new
CompletionModel
(
this
.
suggestionItems
,
lineContext
);
// when explicitly request when the next context goes
// from 'results' to 'no results' freeze
if
(
!
auto
&&
this
.
completionModel
.
items
.
length
===
0
)
{
this
.
completionModel
.
lineContext
=
oldLineContext
;
isFrozen
=
this
.
completionModel
.
items
.
length
>
0
;
}
this
.
_onDidSuggest
.
fire
({
completionModel
:
this
.
completionModel
,
isFrozen
:
isFrozen
,
auto
:
this
.
isAutoSuggest
()
isFrozen
,
auto
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录