Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
0f977175
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,发现更多精彩内容 >>
提交
0f977175
编写于
5月 19, 2017
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix seizure when filtered suggest list is above cursor
上级
42a38fb1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
23 deletion
+36
-23
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+36
-23
未找到文件。
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
浏览文件 @
0f977175
...
...
@@ -352,7 +352,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
private
readonly
maxWidgetWidth
=
660
;
private
readonly
listWidth
=
330
;
private
readonly
minWidgetWidth
=
430
;
private
storageService
:
IStorageService
;
private
detailsFocusBorderColor
:
string
;
private
detailsBorderColor
:
string
;
...
...
@@ -548,7 +547,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
this
.
ignoreFocusEvents
=
false
;
}
this
.
update
Widge
tHeight
();
this
.
update
Lis
tHeight
();
this
.
list
.
reveal
(
index
);
this
.
currentSuggestionDetails
=
item
.
resolve
()
...
...
@@ -562,7 +561,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
if
(
this
.
storageService
.
getBoolean
(
'
expandSuggestionDocs
'
,
StorageScope
.
GLOBAL
,
false
))
{
this
.
showDetails
();
this
.
adjustDocsPosition
();
this
.
_ariaAlert
(
this
.
details
.
getAriaLabel
());
}
else
{
removeClass
(
this
.
element
,
'
docs-side
'
);
...
...
@@ -827,15 +826,23 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
}
show
(
this
.
details
.
element
);
this
.
renderDetails
();
// With docs showing up, list might need adjustments to keep it close to the cursor
this
.
adjustListPosition
();
// with docs showing up widget width/height may change, so reposition the widget
this
.
editor
.
layoutContentWidget
(
this
);
this
.
adjustDocsPosition
();
this
.
show
();
this
.
editor
.
focus
();
}
private
show
():
void
{
this
.
update
Widge
tHeight
();
this
.
update
Lis
tHeight
();
this
.
suggestWidgetVisible
.
set
(
true
);
this
.
renderDetails
();
this
.
showTimeout
=
TPromise
.
timeout
(
100
).
then
(()
=>
{
addClass
(
this
.
element
,
'
visible
'
);
this
.
onDidShowEmitter
.
fire
(
this
);
...
...
@@ -873,12 +880,9 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
return
SuggestWidget
.
ID
;
}
private
update
Widge
tHeight
():
number
{
private
update
Lis
tHeight
():
number
{
let
height
=
0
;
let
maxSuggestionsToShow
=
11
;
if
(
hasClass
(
this
.
element
,
'
small
'
))
{
maxSuggestionsToShow
=
5
;
}
if
(
this
.
state
===
State
.
Empty
||
this
.
state
===
State
.
Loading
)
{
height
=
this
.
unfocusedHeight
;
...
...
@@ -895,7 +899,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
this
.
listElement
.
style
.
height
=
`
${
height
}
px`
;
this
.
list
.
layout
(
height
);
this
.
listElement
.
style
.
marginTop
=
'
0px
'
;
this
.
editor
.
layoutContentWidget
(
this
);
return
height
;
...
...
@@ -909,23 +912,22 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
const
widgetX
=
this
.
element
.
offsetLeft
;
const
widgetY
=
this
.
element
.
offsetTop
;
removeClass
(
this
.
element
,
'
list-right
'
);
if
(
this
.
element
.
clientWidth
<
this
.
maxWidgetWidth
&&
this
.
listElement
.
clientWidth
!==
this
.
minWidgetWidth
)
{
// Not enough space to show side by side, so show docs below the list
addClass
(
this
.
element
,
'
docs-below
'
);
removeClass
(
this
.
element
,
'
docs-side
'
);
return
;
}
if
(
widgetX
<
cursorX
-
this
.
listWidth
)
{
// Widget is too far to the left of cursor, swap list and docs
addClass
(
this
.
element
,
'
list-right
'
);
}
else
{
removeClass
(
this
.
element
,
'
list-right
'
);
}
if
(
cursorY
>
widgetY
&&
this
.
details
.
element
.
clientHeight
>
this
.
listElement
.
clientHeight
)
{
// Docs is bigger than list and widget is above cursor, apply margin-top so that list appears right above cursor
this
.
listElement
.
style
.
marginTop
=
`
${
this
.
details
.
element
.
clientHeight
-
this
.
listElement
.
clientHeight
}
px`
;
if
(
cursorY
>
widgetY
)
{
if
(
!
hasClass
(
this
.
element
,
'
widget-above
'
))
{
addClass
(
this
.
element
,
'
widget-above
'
);
// Since the widget was previously not above the cursor,
// the list needs to be adjusted to keep it close to the cursor
this
.
adjustListPosition
();
}
}
else
{
removeClass
(
this
.
element
,
'
widget-above
'
);
}
}
...
...
@@ -940,6 +942,17 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
}
}
private
adjustListPosition
():
void
{
if
(
hasClass
(
this
.
element
,
'
widget-above
'
)
&&
hasClass
(
this
.
element
,
'
docs-side
'
)
&&
this
.
details
.
element
.
offsetHeight
>
this
.
listElement
.
offsetHeight
)
{
// Docs is bigger than list and widget is above cursor, apply margin-top so that list appears right above cursor
this
.
listElement
.
style
.
marginTop
=
`
${
this
.
details
.
element
.
offsetHeight
-
this
.
listElement
.
offsetHeight
}
px`
;
}
else
{
this
.
listElement
.
style
.
marginTop
=
'
0px
'
;
}
}
private
renderDetails
():
void
{
if
(
this
.
state
===
State
.
Details
||
this
.
state
===
State
.
Open
)
{
this
.
details
.
render
(
this
.
list
.
getFocusedElements
()[
0
]);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录