Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ec9ff754
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,发现更多精彩内容 >>
提交
ec9ff754
编写于
8月 17, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sugest widegt only knows about view model, not data model
上级
1b51bc62
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
26 deletion
+18
-26
src/vs/editor/contrib/suggest/browser/suggestController.ts
src/vs/editor/contrib/suggest/browser/suggestController.ts
+4
-5
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+14
-21
未找到文件。
src/vs/editor/contrib/suggest/browser/suggestController.ts
浏览文件 @
ec9ff754
...
...
@@ -28,7 +28,6 @@ export class SuggestController implements IEditorContribution {
private
model
:
SuggestModel
;
private
widget
:
SuggestWidget
;
private
toDispose
:
IDisposable
[]
=
[];
constructor
(
...
...
@@ -36,9 +35,9 @@ export class SuggestController implements IEditorContribution {
@
IInstantiationService
instantiationService
:
IInstantiationService
)
{
this
.
model
=
new
SuggestModel
(
this
.
editor
);
this
.
toDispose
.
push
(
this
.
model
.
onDidTrigger
(
e
=>
this
.
widget
.
showTriggered
(
e
)));
this
.
toDispose
.
push
(
this
.
model
.
onDidSuggest
(
e
=>
this
.
widget
.
showSuggestions
(
e
)));
this
.
toDispose
.
push
(
this
.
model
.
onDidCancel
(
e
=>
this
.
widget
.
showDidCancel
(
e
)));
this
.
toDispose
.
push
(
this
.
model
.
onDidTrigger
(
e
=>
this
.
widget
.
showTriggered
(
e
.
auto
)));
this
.
toDispose
.
push
(
this
.
model
.
onDidSuggest
(
e
=>
this
.
widget
.
showSuggestions
(
e
.
completionModel
,
e
.
isFrozen
,
e
.
auto
)));
this
.
toDispose
.
push
(
this
.
model
.
onDidCancel
(
e
=>
!
e
.
retrigger
&&
this
.
widget
.
hideWidget
(
)));
this
.
widget
=
instantiationService
.
createInstance
(
SuggestWidget
,
this
.
editor
);
this
.
toDispose
.
push
(
this
.
widget
.
onDidSelect
(
this
.
onDidSelectItem
,
this
));
...
...
@@ -87,7 +86,7 @@ export class SuggestController implements IEditorContribution {
cancelSuggestWidget
():
void
{
if
(
this
.
widget
)
{
this
.
widget
.
cancel
();
this
.
widget
.
hideDetailsOrHideWidget
();
}
}
...
...
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
浏览文件 @
ec9ff754
...
...
@@ -24,7 +24,6 @@ import { IConfigurationChangedEvent } from 'vs/editor/common/editorCommon';
import
{
ContentWidgetPositionPreference
,
ICodeEditor
,
IContentWidget
,
IContentWidgetPosition
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
Context
as
SuggestContext
}
from
'
../common/suggest
'
;
import
{
CompletionItem
,
CompletionModel
}
from
'
../common/completionModel
'
;
import
{
ICancelEvent
,
ISuggestEvent
,
ITriggerEvent
}
from
'
../common/suggestModel
'
;
import
{
alert
}
from
'
vs/base/browser/ui/aria/aria
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
...
@@ -532,12 +531,12 @@ export class SuggestWidget implements IContentWidget, IDisposable {
return
this
.
onDidSelectEmitter
.
event
;
}
showTriggered
(
e
:
ITriggerEvent
)
{
showTriggered
(
auto
:
boolean
)
{
if
(
this
.
state
!==
State
.
Hidden
)
{
return
;
}
this
.
isAuto
=
!!
e
.
auto
;
this
.
isAuto
=
!!
auto
;
if
(
!
this
.
isAuto
)
{
this
.
loadingTimeout
=
setTimeout
(()
=>
{
...
...
@@ -547,15 +546,15 @@ export class SuggestWidget implements IContentWidget, IDisposable {
}
}
showSuggestions
(
e
:
ISuggestEvent
):
void
{
showSuggestions
(
completionModel
:
CompletionModel
,
isFrozen
:
boolean
,
isAuto
:
boolean
):
void
{
if
(
this
.
loadingTimeout
)
{
clearTimeout
(
this
.
loadingTimeout
);
this
.
loadingTimeout
=
null
;
}
this
.
completionModel
=
e
.
completionModel
;
this
.
completionModel
=
completionModel
;
if
(
e
.
isFrozen
&&
this
.
state
!==
State
.
Empty
)
{
if
(
isFrozen
&&
this
.
state
!==
State
.
Empty
)
{
this
.
setState
(
State
.
Frozen
);
return
;
}
...
...
@@ -566,7 +565,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
this
.
suggestWidgetMultipleSuggestions
.
set
(
visibleCount
>
1
);
if
(
isEmpty
)
{
if
(
e
.
a
uto
)
{
if
(
isA
uto
)
{
this
.
setState
(
State
.
Hidden
);
}
else
{
this
.
setState
(
State
.
Empty
);
...
...
@@ -595,22 +594,11 @@ export class SuggestWidget implements IContentWidget, IDisposable {
suggestionCount
:
visibleCount
,
snippetCount
,
textCount
,
wasAutomaticallyTriggered
:
!!
e
.
a
uto
wasAutomaticallyTriggered
:
!!
isA
uto
});
}
}
showDidCancel
(
e
:
ICancelEvent
)
{
if
(
this
.
loadingTimeout
)
{
clearTimeout
(
this
.
loadingTimeout
);
this
.
loadingTimeout
=
null
;
}
if
(
!
e
.
retrigger
)
{
this
.
setState
(
State
.
Hidden
);
}
}
selectNextPage
():
boolean
{
switch
(
this
.
state
)
{
case
State
.
Hidden
:
...
...
@@ -715,11 +703,16 @@ export class SuggestWidget implements IContentWidget, IDisposable {
removeClass
(
this
.
element
,
'
visible
'
);
}
cancel
():
void
{
hideWidget
():
void
{
clearTimeout
(
this
.
loadingTimeout
);
this
.
setState
(
State
.
Hidden
);
}
hideDetailsOrHideWidget
():
void
{
if
(
this
.
state
===
State
.
Details
)
{
this
.
toggleDetails
();
}
else
{
this
.
showDidCancel
({
retrigger
:
false
}
);
this
.
hideWidget
(
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录