Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
20ce9836
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,发现更多精彩内容 >>
提交
20ce9836
编写于
10月 11, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
markers: messages
上级
99f78e83
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
68 addition
and
77 deletion
+68
-77
src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
.../workbench/parts/markers/electron-browser/markersPanel.ts
+68
-77
未找到文件。
src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
浏览文件 @
20ce9836
...
...
@@ -41,6 +41,8 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
import
{
Separator
,
ActionItem
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
IMenuService
,
MenuId
}
from
'
vs/platform/actions/common/actions
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
IKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
type
TreeElement
=
ResourceMarkers
|
Marker
|
RelatedInformation
;
...
...
@@ -151,18 +153,6 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
}
this
.
tree
.
getHTMLElement
().
focus
();
// TODO@joao
// if (this.markersWorkbenchService.markersModel.hasFilteredResources()) {
// this.tree.domFocus();
// if (this.tree.getSelection().length === 0) {
// this.tree.focusFirst();
// }
// this.highlightCurrentSelectedMarkerRange();
// this.autoReveal(true);
// } else {
// this.messageBoxContainer.focus();
// }
}
public
focusFilter
():
void
{
...
...
@@ -218,14 +208,14 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
return
false
;
}
// TODO@joao
private
refreshPanel
():
TPromise
<
any
>
{
if
(
this
.
isVisible
())
{
this
.
cachedFilterStats
=
undefined
;
this
.
collapseAllAction
.
enabled
=
true
/* this.markersWorkbenchService.markersModel.hasFilteredResources() */
;
dom
.
toggleClass
(
this
.
treeContainer
,
'
hidden
'
,
false
/* !this.markersWorkbenchService.markersModel.hasFilteredResources() */
);
this
.
renderMessage
();
this
.
tree
.
setChildren
(
null
,
createModelIterator
(
this
.
markersWorkbenchService
.
markersModel
));
const
{
total
,
filtered
}
=
this
.
getFilterStats
();
dom
.
toggleClass
(
this
.
treeContainer
,
'
hidden
'
,
total
>
0
&&
filtered
===
0
);
this
.
renderMessage
();
this
.
_onDidFilter
.
fire
();
}
return
TPromise
.
as
(
null
);
...
...
@@ -237,6 +227,7 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
this
.
filter
.
options
=
new
FilterOptions
(
this
.
filterAction
.
filterText
,
excludeExpression
);
this
.
tree
.
refilter
();
this
.
_onDidFilter
.
fire
();
this
.
renderMessage
();
}
private
getExcludeExpression
(
useFilesExclude
:
boolean
):
IExpression
{
...
...
@@ -404,77 +395,77 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
}
}
// TODO@joao
private
render
():
void
{
dom
.
toggleClass
(
this
.
treeContainer
,
'
hidden
'
,
false
/* !this.markersWorkbenchService.markersModel.hasFilteredResources() */
);
this
.
tree
.
setChildren
(
null
,
createModelIterator
(
this
.
markersWorkbenchService
.
markersModel
));
const
{
total
,
filtered
}
=
this
.
getFilterStats
();
dom
.
toggleClass
(
this
.
treeContainer
,
'
hidden
'
,
total
>
0
&&
filtered
===
0
);
this
.
renderMessage
();
}
// TODO@joao
private
renderMessage
():
void
{
dom
.
clearNode
(
this
.
messageBoxContainer
);
// if (markersModel.hasFilteredResources()) {
this
.
messageBoxContainer
.
style
.
display
=
'
none
'
;
const
{
total
,
filtered
}
=
this
.
getFilterStats
();
if
(
filtered
===
total
)
{
this
.
ariaLabelElement
.
setAttribute
(
'
aria-label
'
,
localize
(
'
No problems filtered
'
,
"
Showing {0} problems
"
,
total
));
if
(
filtered
===
0
)
{
this
.
messageBoxContainer
.
style
.
display
=
'
block
'
;
this
.
messageBoxContainer
.
setAttribute
(
'
tabIndex
'
,
'
0
'
);
if
(
total
>
0
)
{
if
(
this
.
filter
.
options
.
filter
)
{
this
.
renderFilteredByFilterMessage
(
this
.
messageBoxContainer
);
}
else
{
this
.
renderFilteredByFilesExcludeMessage
(
this
.
messageBoxContainer
);
}
}
else
{
this
.
renderNoProblemsMessage
(
this
.
messageBoxContainer
);
}
}
else
{
this
.
ariaLabelElement
.
setAttribute
(
'
aria-label
'
,
localize
(
'
problems filtered
'
,
"
Showing {0} of {1} problems
"
,
filtered
,
total
));
this
.
messageBoxContainer
.
style
.
display
=
'
none
'
;
if
(
filtered
===
total
)
{
this
.
ariaLabelElement
.
setAttribute
(
'
aria-label
'
,
localize
(
'
No problems filtered
'
,
"
Showing {0} problems
"
,
total
));
}
else
{
this
.
ariaLabelElement
.
setAttribute
(
'
aria-label
'
,
localize
(
'
problems filtered
'
,
"
Showing {0} of {1} problems
"
,
filtered
,
total
));
}
this
.
messageBoxContainer
.
removeAttribute
(
'
tabIndex
'
);
}
this
.
messageBoxContainer
.
removeAttribute
(
'
tabIndex
'
);
// } else {
// this.messageBoxContainer.style.display = 'block';
// this.messageBoxContainer.setAttribute('tabIndex', '0');
// if (markersModel.hasResources()) {
// if (markersModel.filterOptions.filter) {
// this.renderFilteredByFilterMessage(this.messageBoxContainer);
// } else {
// this.renderFilteredByFilesExcludeMessage(this.messageBoxContainer);
// }
// } else {
// this.renderNoProblemsMessage(this.messageBoxContainer);
// }
// }
}
// private renderFilteredByFilesExcludeMessage(container: HTMLElement) {
// const span1 = dom.append(container, dom.$('span'));
// span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILE_EXCLUSIONS_FILTER;
// const link = dom.append(container, dom.$('a.messageAction'));
// link.textContent = localize('disableFilesExclude', "Disable Files Exclude Filter.");
// link.setAttribute('tabIndex', '0');
// dom.addStandardDisposableListener(link, dom.EventType.CLICK, () => this.filterAction.useFilesExclude = false);
// dom.addStandardDisposableListener(link, dom.EventType.KEY_DOWN, (e: IKeyboardEvent) => {
// if (e.equals(KeyCode.Enter) || e.equals(KeyCode.Space)) {
// this.filterAction.useFilesExclude = false;
// e.stopPropagation();
// }
// });
// this.ariaLabelElement.setAttribute('aria-label', Messages.MARKERS_PANEL_NO_PROBLEMS_FILE_EXCLUSIONS_FILTER);
// }
// private renderFilteredByFilterMessage(container: HTMLElement) {
// const span1 = dom.append(container, dom.$('span'));
// span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
// const link = dom.append(container, dom.$('a.messageAction'));
// link.textContent = localize('clearFilter', "Clear Filter.");
// link.setAttribute('tabIndex', '0');
// dom.addStandardDisposableListener(link, dom.EventType.CLICK, () => this.filterAction.filterText = '');
// dom.addStandardDisposableListener(link, dom.EventType.KEY_DOWN, (e: IKeyboardEvent) => {
// if (e.equals(KeyCode.Enter) || e.equals(KeyCode.Space)) {
// this.filterAction.filterText = '';
// e.stopPropagation();
// }
// });
// this.ariaLabelElement.setAttribute('aria-label', Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS);
// }
// private renderNoProblemsMessage(container: HTMLElement) {
// const span = dom.append(container, dom.$('span'));
// span.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT;
// this.ariaLabelElement.setAttribute('aria-label', Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT);
// }
}
private
renderFilteredByFilesExcludeMessage
(
container
:
HTMLElement
)
{
const
span1
=
dom
.
append
(
container
,
dom
.
$
(
'
span
'
));
span1
.
textContent
=
Messages
.
MARKERS_PANEL_NO_PROBLEMS_FILE_EXCLUSIONS_FILTER
;
const
link
=
dom
.
append
(
container
,
dom
.
$
(
'
a.messageAction
'
));
link
.
textContent
=
localize
(
'
disableFilesExclude
'
,
"
Disable Files Exclude Filter.
"
);
link
.
setAttribute
(
'
tabIndex
'
,
'
0
'
);
dom
.
addStandardDisposableListener
(
link
,
dom
.
EventType
.
CLICK
,
()
=>
this
.
filterAction
.
useFilesExclude
=
false
);
dom
.
addStandardDisposableListener
(
link
,
dom
.
EventType
.
KEY_DOWN
,
(
e
:
IKeyboardEvent
)
=>
{
if
(
e
.
equals
(
KeyCode
.
Enter
)
||
e
.
equals
(
KeyCode
.
Space
))
{
this
.
filterAction
.
useFilesExclude
=
false
;
e
.
stopPropagation
();
}
});
this
.
ariaLabelElement
.
setAttribute
(
'
aria-label
'
,
Messages
.
MARKERS_PANEL_NO_PROBLEMS_FILE_EXCLUSIONS_FILTER
);
}
private
renderFilteredByFilterMessage
(
container
:
HTMLElement
)
{
const
span1
=
dom
.
append
(
container
,
dom
.
$
(
'
span
'
));
span1
.
textContent
=
Messages
.
MARKERS_PANEL_NO_PROBLEMS_FILTERS
;
const
link
=
dom
.
append
(
container
,
dom
.
$
(
'
a.messageAction
'
));
link
.
textContent
=
localize
(
'
clearFilter
'
,
"
Clear Filter.
"
);
link
.
setAttribute
(
'
tabIndex
'
,
'
0
'
);
dom
.
addStandardDisposableListener
(
link
,
dom
.
EventType
.
CLICK
,
()
=>
this
.
filterAction
.
filterText
=
''
);
dom
.
addStandardDisposableListener
(
link
,
dom
.
EventType
.
KEY_DOWN
,
(
e
:
IKeyboardEvent
)
=>
{
if
(
e
.
equals
(
KeyCode
.
Enter
)
||
e
.
equals
(
KeyCode
.
Space
))
{
this
.
filterAction
.
filterText
=
''
;
e
.
stopPropagation
();
}
});
this
.
ariaLabelElement
.
setAttribute
(
'
aria-label
'
,
Messages
.
MARKERS_PANEL_NO_PROBLEMS_FILTERS
);
}
private
renderNoProblemsMessage
(
container
:
HTMLElement
)
{
const
span
=
dom
.
append
(
container
,
dom
.
$
(
'
span
'
));
span
.
textContent
=
Messages
.
MARKERS_PANEL_NO_PROBLEMS_BUILT
;
this
.
ariaLabelElement
.
setAttribute
(
'
aria-label
'
,
Messages
.
MARKERS_PANEL_NO_PROBLEMS_BUILT
);
}
private
autoReveal
(
focus
:
boolean
=
false
):
void
{
let
autoReveal
=
this
.
configurationService
.
getValue
<
boolean
>
(
'
problems.autoReveal
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录