Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1a5e5e43
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,发现更多精彩内容 >>
提交
1a5e5e43
编写于
8月 17, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
renames
上级
08eeba43
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
13 deletion
+12
-13
src/vs/editor/contrib/suggest/common/suggestModel.ts
src/vs/editor/contrib/suggest/common/suggestModel.ts
+12
-13
未找到文件。
src/vs/editor/contrib/suggest/common/suggestModel.ts
浏览文件 @
1a5e5e43
...
@@ -156,7 +156,7 @@ export class SuggestModel implements IDisposable {
...
@@ -156,7 +156,7 @@ export class SuggestModel implements IDisposable {
private
requestPromise
:
TPromise
<
void
>
;
private
requestPromise
:
TPromise
<
void
>
;
private
context
:
Context
;
private
context
:
Context
;
private
raw
:
ISuggestionItem
[];
private
suggestionItems
:
ISuggestionItem
[];
private
completionModel
:
CompletionModel
;
private
completionModel
:
CompletionModel
;
private
incomplete
:
boolean
;
private
incomplete
:
boolean
;
...
@@ -176,7 +176,7 @@ export class SuggestModel implements IDisposable {
...
@@ -176,7 +176,7 @@ export class SuggestModel implements IDisposable {
this
.
state
=
State
.
Idle
;
this
.
state
=
State
.
Idle
;
this
.
triggerAutoSuggestPromise
=
null
;
this
.
triggerAutoSuggestPromise
=
null
;
this
.
requestPromise
=
null
;
this
.
requestPromise
=
null
;
this
.
raw
=
null
;
this
.
suggestionItems
=
null
;
this
.
completionModel
=
null
;
this
.
completionModel
=
null
;
this
.
incomplete
=
false
;
this
.
incomplete
=
false
;
this
.
context
=
null
;
this
.
context
=
null
;
...
@@ -204,7 +204,7 @@ export class SuggestModel implements IDisposable {
...
@@ -204,7 +204,7 @@ export class SuggestModel implements IDisposable {
}
}
this
.
state
=
State
.
Idle
;
this
.
state
=
State
.
Idle
;
this
.
raw
=
null
;
this
.
suggestionItems
=
null
;
this
.
completionModel
=
null
;
this
.
completionModel
=
null
;
this
.
incomplete
=
false
;
this
.
incomplete
=
false
;
this
.
context
=
null
;
this
.
context
=
null
;
...
@@ -258,7 +258,7 @@ export class SuggestModel implements IDisposable {
...
@@ -258,7 +258,7 @@ export class SuggestModel implements IDisposable {
});
});
}
}
}
else
if
(
this
.
raw
&&
this
.
incomplete
)
{
}
else
if
(
this
.
suggestionItems
&&
this
.
incomplete
)
{
this
.
trigger
(
this
.
state
===
State
.
Auto
,
true
);
this
.
trigger
(
this
.
state
===
State
.
Auto
,
true
);
}
else
{
}
else
{
this
.
onNewContext
(
ctx
);
this
.
onNewContext
(
ctx
);
...
@@ -301,7 +301,7 @@ export class SuggestModel implements IDisposable {
...
@@ -301,7 +301,7 @@ export class SuggestModel implements IDisposable {
this
.
context
=
ctx
;
this
.
context
=
ctx
;
this
.
requestPromise
=
provideSuggestionItems
(
model
,
this
.
editor
.
getPosition
(),
this
.
requestPromise
=
provideSuggestionItems
(
model
,
this
.
editor
.
getPosition
(),
this
.
editor
.
getConfiguration
().
contribInfo
.
snippetSuggestions
,
onlyFrom
).
then
(
all
=>
{
this
.
editor
.
getConfiguration
().
contribInfo
.
snippetSuggestions
,
onlyFrom
).
then
(
items
=>
{
this
.
requestPromise
=
null
;
this
.
requestPromise
=
null
;
...
@@ -309,16 +309,15 @@ export class SuggestModel implements IDisposable {
...
@@ -309,16 +309,15 @@ export class SuggestModel implements IDisposable {
return
;
return
;
}
}
this
.
raw
=
all
;
this
.
incomplete
=
all
.
some
(
result
=>
result
.
container
.
incomplete
);
const
model
=
this
.
editor
.
getModel
();
const
model
=
this
.
editor
.
getModel
();
if
(
!
model
)
{
if
(
!
model
)
{
return
;
return
;
}
}
this
.
suggestionItems
=
items
;
this
.
incomplete
=
items
.
some
(
result
=>
result
.
container
.
incomplete
);
this
.
onNewContext
(
new
Context
(
model
,
this
.
editor
.
getPosition
(),
auto
));
this
.
onNewContext
(
new
Context
(
model
,
this
.
editor
.
getPosition
(),
auto
));
}).
then
(
null
,
onUnexpectedError
);
}).
then
(
null
,
onUnexpectedError
);
}
}
...
@@ -333,11 +332,11 @@ export class SuggestModel implements IDisposable {
...
@@ -333,11 +332,11 @@ export class SuggestModel implements IDisposable {
return
;
return
;
}
}
if
(
this
.
raw
)
{
if
(
this
.
suggestionItems
)
{
let
auto
=
this
.
isAutoSuggest
();
let
auto
=
this
.
isAutoSuggest
();
let
isFrozen
=
false
;
let
isFrozen
=
false
;
if
(
this
.
completionModel
&&
this
.
completionModel
.
raw
===
this
.
raw
)
{
if
(
this
.
completionModel
&&
this
.
completionModel
.
raw
===
this
.
suggestionItems
)
{
const
oldLineContext
=
this
.
completionModel
.
lineContext
;
const
oldLineContext
=
this
.
completionModel
.
lineContext
;
this
.
completionModel
.
lineContext
=
{
this
.
completionModel
.
lineContext
=
{
leadingLineContent
:
ctx
.
lineContentBefore
,
leadingLineContent
:
ctx
.
lineContentBefore
,
...
@@ -351,7 +350,7 @@ export class SuggestModel implements IDisposable {
...
@@ -351,7 +350,7 @@ export class SuggestModel implements IDisposable {
isFrozen
=
true
;
isFrozen
=
true
;
}
}
}
else
{
}
else
{
this
.
completionModel
=
new
CompletionModel
(
this
.
raw
,
ctx
.
lineContentBefore
);
this
.
completionModel
=
new
CompletionModel
(
this
.
suggestionItems
,
ctx
.
lineContentBefore
);
}
}
this
.
_onDidSuggest
.
fire
({
this
.
_onDidSuggest
.
fire
({
...
@@ -363,7 +362,7 @@ export class SuggestModel implements IDisposable {
...
@@ -363,7 +362,7 @@ export class SuggestModel implements IDisposable {
}
}
accept
(
suggestion
:
ISuggestion
,
overwriteBefore
:
number
,
overwriteAfter
:
number
):
boolean
{
accept
(
suggestion
:
ISuggestion
,
overwriteBefore
:
number
,
overwriteAfter
:
number
):
boolean
{
if
(
this
.
raw
===
null
)
{
if
(
this
.
suggestionItems
===
null
)
{
return
false
;
return
false
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录