Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
4c25b4c3
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,发现更多精彩内容 >>
提交
4c25b4c3
编写于
3月 10, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #3859: announce that suggestion has details, announce suggestion details when opening them
上级
76591595
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
7 deletion
+41
-7
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+41
-7
未找到文件。
src/vs/editor/contrib/suggest/browser/suggestWidget.ts
浏览文件 @
4c25b4c3
...
...
@@ -7,6 +7,7 @@
import
'
vs/css!./suggest
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
isPromiseCanceledError
,
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
IDisposable
,
disposeAll
}
from
'
vs/base/common/lifecycle
'
;
...
...
@@ -76,7 +77,12 @@ class Renderer implements IRenderer<CompletionItem, ISuggestionTemplateData> {
const
data
=
<
ISuggestionTemplateData
>
templateData
;
const
suggestion
=
(
<
CompletionItem
>
element
).
suggestion
;
data
.
root
.
setAttribute
(
'
aria-label
'
,
nls
.
localize
(
'
suggestionAriaLabel
'
,
"
{0}, suggestion
"
,
suggestion
.
label
));
if
(
suggestion
.
documentationLabel
)
{
data
.
root
.
setAttribute
(
'
aria-label
'
,
nls
.
localize
(
'
suggestionWithDetailsAriaLabel
'
,
"
{0}, suggestion, has details
"
,
suggestion
.
label
));
}
else
{
data
.
root
.
setAttribute
(
'
aria-label
'
,
nls
.
localize
(
'
suggestionAriaLabel
'
,
"
{0}, suggestion
"
,
suggestion
.
label
));
}
if
(
suggestion
.
type
&&
suggestion
.
type
.
charAt
(
0
)
===
'
#
'
)
{
data
.
icon
.
className
=
'
icon customcolor
'
;
data
.
colorspan
.
style
.
backgroundColor
=
suggestion
.
type
.
substring
(
1
);
...
...
@@ -178,6 +184,7 @@ class SuggestionDetails {
private
body
:
HTMLElement
;
private
type
:
HTMLElement
;
private
docs
:
HTMLElement
;
private
ariaLabel
:
string
;
constructor
(
container
:
HTMLElement
,
private
widget
:
SuggestWidget
)
{
this
.
el
=
append
(
container
,
$
(
'
.details
'
));
...
...
@@ -190,6 +197,8 @@ class SuggestionDetails {
append
(
this
.
el
,
this
.
scrollable
.
getDomNode
());
this
.
type
=
append
(
this
.
body
,
$
(
'
p.type
'
));
this
.
docs
=
append
(
this
.
body
,
$
(
'
p.docs
'
));
this
.
ariaLabel
=
null
;
}
get
element
()
{
...
...
@@ -201,6 +210,7 @@ class SuggestionDetails {
this
.
title
.
textContent
=
''
;
this
.
type
.
textContent
=
''
;
this
.
docs
.
textContent
=
''
;
this
.
ariaLabel
=
null
;
return
;
}
...
...
@@ -219,6 +229,12 @@ class SuggestionDetails {
this
.
scrollable
.
onElementDimensions
();
this
.
scrollable
.
onElementInternalDimensions
();
this
.
ariaLabel
=
strings
.
format
(
'
{0}
\n
{1}
\n
{2}
'
,
item
.
suggestion
.
label
,
item
.
suggestion
.
typeLabel
,
item
.
suggestion
.
documentationLabel
);
}
getAriaLabel
():
string
{
return
this
.
ariaLabel
;
}
scrollDown
(
much
=
8
):
void
{
...
...
@@ -384,7 +400,25 @@ export class SuggestWidget implements IContentWidget, IDisposable {
},
0
);
}
private
_lastSuggestionLabel
:
string
;
private
_getSuggestionAriaAlertLabel
(
item
:
CompletionItem
):
string
{
if
(
item
.
suggestion
.
documentationLabel
)
{
return
nls
.
localize
(
'
ariaCurrentSuggestionWithDetails
'
,
"
{0}, suggestion, has details
"
,
item
.
suggestion
.
label
);
}
else
{
return
nls
.
localize
(
'
ariaCurrentSuggestion
'
,
"
{0}, suggestion
"
,
item
.
suggestion
.
label
);
}
}
private
_lastAriaAlertLabel
:
string
;
private
_ariaAlert
(
newAriaAlertLabel
:
string
):
void
{
if
(
this
.
_lastAriaAlertLabel
===
newAriaAlertLabel
)
{
return
;
}
this
.
_lastAriaAlertLabel
=
newAriaAlertLabel
;
if
(
this
.
_lastAriaAlertLabel
)
{
alert
(
this
.
_lastAriaAlertLabel
);
}
}
private
onListFocus
(
e
:
IFocusChangeEvent
<
CompletionItem
>
):
void
{
if
(
this
.
currentSuggestionDetails
)
{
this
.
currentSuggestionDetails
.
cancel
();
...
...
@@ -392,7 +426,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
}
if
(
!
e
.
elements
.
length
)
{
this
.
_
lastSuggestionLabel
=
null
;
this
.
_
ariaAlert
(
null
)
;
// TODO@Alex: Chromium bug
// this.editor.setAriaActiveDescendant(null);
...
...
@@ -401,10 +435,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
}
const
item
=
e
.
elements
[
0
];
if
(
item
.
suggestion
.
label
!==
this
.
_lastSuggestionLabel
)
{
this
.
_lastSuggestionLabel
=
item
.
suggestion
.
label
;
alert
(
nls
.
localize
(
'
ariaCurrentSuggestion
'
,
"
{0}, suggestion
"
,
this
.
_lastSuggestionLabel
));
}
this
.
_ariaAlert
(
this
.
_getSuggestionAriaAlertLabel
(
item
));
// TODO@Alex: Chromium bug
// // TODO@Alex: the list is not done rendering...
...
...
@@ -433,6 +464,8 @@ export class SuggestWidget implements IContentWidget, IDisposable {
this
.
list
.
setFocus
(
index
);
this
.
updateWidgetHeight
();
this
.
list
.
reveal
(
index
);
this
.
_ariaAlert
(
this
.
_getSuggestionAriaAlertLabel
(
item
));
})
.
then
(
null
,
err
=>
!
isPromiseCanceledError
(
err
)
&&
onUnexpectedError
(
err
))
.
then
(()
=>
this
.
currentSuggestionDetails
=
null
);
...
...
@@ -485,6 +518,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
hide
(
this
.
messageElement
,
this
.
listElement
);
show
(
this
.
details
.
element
);
this
.
show
();
this
.
_ariaAlert
(
this
.
details
.
getAriaLabel
());
break
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录