Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c4631ef4
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,发现更多精彩内容 >>
提交
c4631ef4
编写于
12月 09, 2015
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
suggest: bring back frozen
上级
de638fa4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
7 deletion
+27
-7
src/vs/editor/contrib/suggest/browser/suggest.css
src/vs/editor/contrib/suggest/browser/suggest.css
+3
-3
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+24
-4
未找到文件。
src/vs/editor/contrib/suggest/browser/suggest.css
浏览文件 @
c4631ef4
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
opacity
:
1
;
opacity
:
1
;
}
}
.monaco-editor
.suggest-widget
.monaco-tree
.monaco-tree-row
>
.content
.monaco-highlighted-label
.highlight
{
.monaco-editor
.suggest-widget
:not
(
.frozen
)
.monaco-tree
.monaco-tree-row
>
.content
.monaco-highlighted-label
.highlight
{
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#186B9E
;
color
:
#186B9E
;
}
}
...
@@ -136,7 +136,7 @@
...
@@ -136,7 +136,7 @@
border
:
1px
solid
rgb
(
69
,
69
,
69
);
border
:
1px
solid
rgb
(
69
,
69
,
69
);
}
}
.monaco-editor.vs-dark
.suggest-widget
.monaco-tree
.monaco-tree-row
>
.content
.monaco-highlighted-label
.highlight
{
.monaco-editor.vs-dark
.suggest-widget
:not
(
.frozen
)
.monaco-tree
.monaco-tree-row
>
.content
.monaco-highlighted-label
.highlight
{
color
:
#219AE4
;
color
:
#219AE4
;
}
}
...
@@ -177,7 +177,7 @@
...
@@ -177,7 +177,7 @@
border
:
2px
solid
#6FC3DF
;
border
:
2px
solid
#6FC3DF
;
}
}
.monaco-editor.hc-black
.suggest-widget
.monaco-tree
.monaco-tree-row
>
.content
.monaco-highlighted-label
.highlight
{
.monaco-editor.hc-black
.suggest-widget
:not
(
.frozen
)
.monaco-tree
.monaco-tree-row
>
.content
.monaco-highlighted-label
.highlight
{
color
:
#219AE4
;
color
:
#219AE4
;
}
}
...
...
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
浏览文件 @
c4631ef4
...
@@ -368,7 +368,8 @@ enum State {
...
@@ -368,7 +368,8 @@ enum State {
Triggered
,
Triggered
,
Loading
,
Loading
,
Empty
,
Empty
,
Open
Open
,
Frozen
}
}
export
class
SuggestWidget
implements
EditorBrowser
.
IContentWidget
,
IDisposable
{
export
class
SuggestWidget
implements
EditorBrowser
.
IContentWidget
,
IDisposable
{
...
@@ -569,15 +570,23 @@ export class SuggestWidget implements EditorBrowser.IContentWidget, IDisposable
...
@@ -569,15 +570,23 @@ export class SuggestWidget implements EditorBrowser.IContentWidget, IDisposable
this
.
messageElement
.
innerText
=
SuggestWidget
.
LOADING_MESSAGE
;
this
.
messageElement
.
innerText
=
SuggestWidget
.
LOADING_MESSAGE
;
this
.
messageElement
.
style
.
display
=
'
block
'
;
this
.
messageElement
.
style
.
display
=
'
block
'
;
this
.
treeElement
.
style
.
display
=
'
none
'
;
this
.
treeElement
.
style
.
display
=
'
none
'
;
removeClass
(
this
.
element
,
'
frozen
'
);
break
;
break
;
case
State
.
Empty
:
case
State
.
Empty
:
this
.
messageElement
.
innerText
=
SuggestWidget
.
NO_SUGGESTIONS_MESSAGE
;
this
.
messageElement
.
innerText
=
SuggestWidget
.
NO_SUGGESTIONS_MESSAGE
;
this
.
messageElement
.
style
.
display
=
'
block
'
;
this
.
messageElement
.
style
.
display
=
'
block
'
;
this
.
treeElement
.
style
.
display
=
'
none
'
;
this
.
treeElement
.
style
.
display
=
'
none
'
;
removeClass
(
this
.
element
,
'
frozen
'
);
break
;
break
;
case
State
.
Open
:
case
State
.
Open
:
this
.
messageElement
.
style
.
display
=
'
none
'
;
this
.
messageElement
.
style
.
display
=
'
none
'
;
this
.
treeElement
.
style
.
display
=
'
block
'
;
this
.
treeElement
.
style
.
display
=
'
block
'
;
removeClass
(
this
.
element
,
'
frozen
'
);
break
;
case
State
.
Frozen
:
this
.
messageElement
.
style
.
display
=
'
none
'
;
this
.
treeElement
.
style
.
display
=
'
block
'
;
addClass
(
this
.
element
,
'
frozen
'
);
break
;
break
;
}
}
...
@@ -611,17 +620,28 @@ export class SuggestWidget implements EditorBrowser.IContentWidget, IDisposable
...
@@ -611,17 +620,28 @@ export class SuggestWidget implements EditorBrowser.IContentWidget, IDisposable
clearTimeout
(
this
.
loadingTimeout
);
clearTimeout
(
this
.
loadingTimeout
);
let
model
:
CompletionModel
=
this
.
tree
.
getInput
();
let
model
:
CompletionModel
=
this
.
tree
.
getInput
();
let
promise
:
TPromise
<
void
>
;
let
promise
=
TPromise
.
as
(
null
);
let
visibleCount
:
number
;
if
(
model
&&
model
.
raw
===
e
.
suggestions
)
{
if
(
model
&&
model
.
raw
===
e
.
suggestions
)
{
const
oldCurrentWord
=
model
.
currentWord
;
model
.
currentWord
=
e
.
currentWord
;
model
.
currentWord
=
e
.
currentWord
;
promise
=
this
.
tree
.
refresh
();
visibleCount
=
model
.
visibleCount
;
if
(
!
e
.
auto
&&
visibleCount
===
0
)
{
model
.
currentWord
=
oldCurrentWord
;
this
.
setState
(
State
.
Frozen
);
return
;
}
else
{
promise
=
this
.
tree
.
refresh
();
}
}
else
{
}
else
{
model
=
new
CompletionModel
(
e
.
suggestions
,
e
.
currentWord
);
model
=
new
CompletionModel
(
e
.
suggestions
,
e
.
currentWord
);
visibleCount
=
model
.
visibleCount
;
promise
=
this
.
tree
.
setInput
(
model
);
promise
=
this
.
tree
.
setInput
(
model
);
}
}
if
(
model
.
visibleCount
===
0
)
{
if
(
visibleCount
===
0
)
{
if
(
e
.
auto
)
{
if
(
e
.
auto
)
{
this
.
setState
(
State
.
Hidden
);
this
.
setState
(
State
.
Hidden
);
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录