Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4e3fc0f7
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,发现更多精彩内容 >>
提交
4e3fc0f7
编写于
5月 27, 2016
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
implementation
上级
e6e6658e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
95 addition
and
19 deletion
+95
-19
src/vs/workbench/parts/markers/browser/MarkersPanel.ts
src/vs/workbench/parts/markers/browser/MarkersPanel.ts
+16
-5
src/vs/workbench/parts/markers/browser/MarkersTreeController.ts
.../workbench/parts/markers/browser/MarkersTreeController.ts
+1
-7
src/vs/workbench/parts/markers/common/MarkersModel.ts
src/vs/workbench/parts/markers/common/MarkersModel.ts
+78
-7
未找到文件。
src/vs/workbench/parts/markers/browser/MarkersPanel.ts
浏览文件 @
4e3fc0f7
...
...
@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
'
vs/css!./media/markers
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
dom
=
require
(
'
vs/base/browser/dom
'
);
import
lifecycle
=
require
(
'
vs/base/common/lifecycle
'
);
...
...
@@ -24,6 +25,7 @@ import Messages from 'vs/workbench/parts/markers/common/Messages';
export
class
MarkersPanel
extends
Panel
{
private
markersModel
:
MarkersModel
;
private
tree
:
Tree
.
ITree
;
private
_toDispose
:
lifecycle
.
IDisposable
[];
...
...
@@ -34,6 +36,7 @@ export class MarkersPanel extends Panel {
@
ITelemetryService
telemetryService
:
ITelemetryService
)
{
super
(
Constants
.
MARKERS_PANEL_ID
,
telemetryService
);
this
.
markersModel
=
new
MarkersModel
();
this
.
_toDispose
=
[];
}
...
...
@@ -43,7 +46,7 @@ export class MarkersPanel extends Panel {
var
actionProvider
=
this
.
instantiationService
.
createInstance
(
ActionProvider
);
var
renderer
=
this
.
instantiationService
.
createInstance
(
Viewer
.
Renderer
,
this
.
getActionRunner
(),
actionProvider
);
var
controller
=
this
.
instantiationService
.
createInstance
(
Controller
,
actionProvider
);
var
controller
=
this
.
instantiationService
.
createInstance
(
Controller
);
this
.
tree
=
new
TreeImpl
.
Tree
(
parent
.
getHTMLElement
(),
{
dataSource
:
new
Viewer
.
DataSource
(),
renderer
:
renderer
,
...
...
@@ -54,7 +57,9 @@ export class MarkersPanel extends Panel {
});
this
.
_toDispose
.
push
(
this
.
markerService
.
onMarkerChanged
((
changedResources
)
=>
{
this
.
render
();
this
.
updateTitleArea
();
this
.
updateResources
(
changedResources
);
this
.
tree
.
refresh
();
}));
this
.
render
();
return
TPromise
.
as
(
null
);
...
...
@@ -89,11 +94,17 @@ export class MarkersPanel extends Panel {
this
.
tree
.
layout
(
dimension
.
height
);
}
private
updateResources
(
resources
:
URI
[])
{
resources
.
forEach
((
resource
)
=>
{
let
markers
=
this
.
markerService
.
read
({
resource
:
resource
}).
slice
(
0
)
this
.
markersModel
.
updateResource
(
resource
,
markers
);
})
}
private
render
():
void
{
this
.
updateTitleArea
();
let
allMarkers
=
this
.
markerService
.
read
().
slice
(
0
);
let
model
=
new
MarkersModel
(
allMarkers
);
this
.
tree
.
setInput
(
m
odel
);
this
.
markersModel
.
updateMarkers
(
allMarkers
);
this
.
tree
.
setInput
(
this
.
markersM
odel
);
}
public
dispose
():
void
{
...
...
src/vs/workbench/parts/markers/browser/MarkersTreeController.ts
浏览文件 @
4e3fc0f7
...
...
@@ -21,14 +21,8 @@ export class Controller extends treedefaults.DefaultController {
private
contextMenuService
:
IContextMenuService
;
private
actionProvider
:
actionsrenderer
.
IActionProvider
;
constructor
(
actionProvider
:
actionsrenderer
.
IActionProvider
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
)
{
constructor
(@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
)
{
super
({
clickBehavior
:
treedefaults
.
ClickBehavior
.
ON_MOUSE_UP
});
this
.
actionProvider
=
actionProvider
;
this
.
contextMenuService
=
contextMenuService
;
this
.
downKeyBindingDispatcher
.
set
(
CommonKeybindings
.
SHIFT_UP_ARROW
,
this
.
onUp
.
bind
(
this
));
this
.
downKeyBindingDispatcher
.
set
(
CommonKeybindings
.
SHIFT_DOWN_ARROW
,
this
.
onDown
.
bind
(
this
));
this
.
downKeyBindingDispatcher
.
set
(
CommonKeybindings
.
SHIFT_PAGE_UP
,
this
.
onPageUp
.
bind
(
this
));
...
...
src/vs/workbench/parts/markers/common/MarkersModel.ts
浏览文件 @
4e3fc0f7
...
...
@@ -5,11 +5,12 @@
'
use strict
'
;
import
*
as
Map
from
'
vs/base/common/map
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IMarker
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IMarker
,
MarkerStatistics
}
from
'
vs/platform/markers/common/markers
'
;
export
class
Resource
{
constructor
(
public
uri
:
URI
,
public
markers
:
Marker
[]){};
constructor
(
public
uri
:
URI
,
public
markers
:
Marker
[]
,
public
statistics
:
MarkerStatistics
){};
}
export
class
Marker
{
...
...
@@ -20,18 +21,33 @@ export class MarkersModel {
private
markersByResource
:
Map
.
SimpleMap
<
URI
,
IMarker
[]
>
;
constructor
(
private
markers
:
IMarker
[]
=
[])
{
constructor
(
markers
:
IMarker
[]
=
[])
{
this
.
markersByResource
=
new
Map
.
SimpleMap
<
URI
,
IMarker
[]
>
();
this
.
proces
s
(
markers
);
this
.
updateMarker
s
(
markers
);
}
public
getResources
():
Resource
[]
{
return
this
.
markersByResource
.
entries
().
map
((
entry
)
=>
{
return
new
Resource
(
entry
.
key
,
entry
.
value
.
map
(
this
.
toMarker
));
var
resources
=
<
Resource
[]
>
this
.
markersByResource
.
entries
().
map
(
this
.
toResource
.
bind
(
this
));
resources
.
sort
((
a
:
Resource
,
b
:
Resource
)
=>
{
let
compare
=
this
.
compare
(
a
.
statistics
,
b
.
statistics
);
if
(
compare
!==
0
)
{
return
compare
;
}
return
a
.
uri
.
toString
().
localeCompare
(
b
.
uri
.
toString
());
});
return
resources
;
}
public
updateResource
(
resourceUri
:
URI
,
markers
:
IMarker
[])
{
if
(
this
.
markersByResource
.
has
(
resourceUri
))
{
this
.
markersByResource
.
delete
(
resourceUri
);
}
if
(
markers
.
length
>
0
)
{
this
.
markersByResource
.
set
(
resourceUri
,
markers
);
}
}
p
rivate
proces
s
(
markers
:
IMarker
[])
{
p
ublic
updateMarker
s
(
markers
:
IMarker
[])
{
markers
.
forEach
((
marker
:
IMarker
)
=>
{
let
uri
:
URI
=
marker
.
resource
;
let
markers
:
IMarker
[]
=
this
.
markersByResource
.
get
(
uri
);
...
...
@@ -43,7 +59,62 @@ export class MarkersModel {
});
}
private
toResource
(
entry
:
Map
.
Entry
<
URI
,
IMarker
[]
>
)
{
let
markers
=
entry
.
value
.
map
(
this
.
toMarker
);
let
resource
=
new
Resource
(
entry
.
key
,
markers
,
this
.
getStatistics
(
entry
.
value
));
return
resource
;
}
private
toMarker
(
marker
:
IMarker
,
index
:
number
):
Marker
{
return
new
Marker
(
marker
.
resource
.
toString
()
+
index
,
marker
);
}
private
compare
(
stat1
:
MarkerStatistics
,
stat2
:
MarkerStatistics
):
number
{
if
(
stat1
.
errors
>
stat2
.
errors
)
{
return
-
1
;
}
if
(
stat2
.
errors
>
stat1
.
errors
)
{
return
1
;
}
if
(
stat1
.
warnings
>
stat2
.
warnings
)
{
return
-
1
;
}
if
(
stat2
.
warnings
>
stat1
.
warnings
)
{
return
1
;
}
if
(
stat1
.
infos
>
stat2
.
infos
)
{
return
-
1
;
}
if
(
stat2
.
infos
>
stat1
.
infos
)
{
return
1
;
}
if
(
stat1
.
unknwons
>
stat2
.
unknwons
)
{
return
-
1
;
}
if
(
stat2
.
unknwons
>
stat1
.
unknwons
)
{
return
1
;
}
return
0
;
}
private
getStatistics
(
markers
:
IMarker
[]):
MarkerStatistics
{
let
errors
=
0
,
warnings
=
0
,
infos
=
0
,
unknowns
=
0
;
markers
.
forEach
((
marker
)
=>
{
switch
(
marker
.
severity
)
{
case
Severity
.
Error
:
errors
++
;
return
;
case
Severity
.
Warning
:
warnings
++
;
return
;
case
Severity
.
Info
:
infos
++
;
return
;
default
:
unknowns
++
;
return
;
}
});
return
{
errors
:
errors
,
warnings
:
warnings
,
infos
:
infos
,
unknwons
:
unknowns
};
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录