Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
370b2e31
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,发现更多精彩内容 >>
提交
370b2e31
编写于
12月 10, 2015
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
marker handler rendering, first cut
上级
9f7b6b84
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
20 deletion
+19
-20
src/vs/platform/markers/common/markerService.ts
src/vs/platform/markers/common/markerService.ts
+1
-0
src/vs/workbench/parts/quickopen/browser/markersHandler.ts
src/vs/workbench/parts/quickopen/browser/markersHandler.ts
+18
-20
未找到文件。
src/vs/platform/markers/common/markerService.ts
浏览文件 @
370b2e31
...
...
@@ -210,6 +210,7 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec
resource
:
key
.
resource
,
code
:
data
.
code
,
message
:
data
.
message
,
source
:
data
.
source
,
severity
:
data
.
severity
,
startLineNumber
:
data
.
startLineNumber
,
startColumn
:
data
.
startColumn
,
...
...
src/vs/workbench/parts/quickopen/browser/markersHandler.ts
浏览文件 @
370b2e31
...
...
@@ -6,29 +6,23 @@
import
'
vs/css!./media/markerHandler
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
env
=
require
(
'
vs/base/common/platform
'
)
;
import
strings
=
require
(
'
vs/base/common/strings
'
)
;
import
network
=
require
(
'
vs/base/common/network
'
)
;
import
errors
=
require
(
'
vs/base/common/errors
'
)
;
import
paths
=
require
(
'
vs/base/common/paths
'
)
;
import
dom
=
require
(
'
vs/base/browser/dom
'
)
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
*
as
network
from
'
vs/base/common/network
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
PathLabelProvider
}
from
'
vs/base/common/labels
'
;
import
nls
=
require
(
'
vs/nls
'
);
import
{
ITree
,
IElementCallback
}
from
'
vs/base/parts/tree/common/tree
'
;
import
s
everity
from
'
vs/base/common/severity
'
;
import
{
QuickOpenHandler
Descriptor
,
IQuickOpenRegistry
,
Extensions
as
QuickOpenExtensions
,
QuickOpenHandler
}
from
'
vs/workbench/browser/quickopen
'
;
import
S
everity
from
'
vs/base/common/severity
'
;
import
{
QuickOpenHandler
}
from
'
vs/workbench/browser/quickopen
'
;
import
{
QuickOpenAction
}
from
'
vs/workbench/browser/actions/quickOpenAction
'
;
import
{
Mode
,
IContext
,
IAutoFocus
}
from
'
vs/base/parts/quickopen/browser/quickOpen
'
;
import
{
QuickOpenEntry
,
QuickOpenEntryItem
,
QuickOpenModel
}
from
'
vs/base/parts/quickopen/browser/quickOpenModel
'
;
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
SyncActionDescriptor
}
from
'
vs/platform/actions/common/actions
'
;
import
{
IWorkbenchActionRegistry
,
Extensions
as
ActionExtensions
}
from
'
vs/workbench/browser/actionRegistry
'
;
import
{
QuickOpenEntryItem
,
QuickOpenModel
}
from
'
vs/base/parts/quickopen/browser/quickOpenModel
'
;
import
{
IEditorService
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IMarkerService
,
IMarker
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IQuickOpenService
}
from
'
vs/workbench/services/quickopen/browser/quickOpenService
'
;
import
{
KeyMod
,
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
class
MarkerEntry
extends
QuickOpenEntryItem
{
...
...
@@ -50,16 +44,20 @@ class MarkerEntry extends QuickOpenEntryItem {
public
render
(
tree
:
ITree
,
container
:
HTMLElement
,
previousCleanupFn
:
IElementCallback
):
IElementCallback
{
dom
.
clearNode
(
container
);
let
elements
:
string
[]
=
[];
let
{
severity
,
message
,
source
,
resource
,
startLineNumber
,
startColumn
}
=
this
.
_marker
;
if
(
source
)
{
message
=
`
${
message
}
(
${
source
}
)`
;
}
elements
.
push
(
'
<div class="inline">
'
);
elements
.
push
(
strings
.
format
(
'
<div class="severity {0}"></div>
'
,
severity
.
toString
(
this
.
_marker
.
severity
).
toLowerCase
()));
elements
.
push
(
strings
.
format
(
'
<div class="severity {0}"></div>
'
,
Severity
.
toString
(
severity
).
toLowerCase
()));
elements
.
push
(
'
</div>
'
);
elements
.
push
(
'
<div class="inline entry">
'
);
elements
.
push
(
'
<div>
'
);
elements
.
push
(
strings
.
format
(
'
<span class="message">{0}</span>
'
,
this
.
_marker
.
message
));
elements
.
push
(
strings
.
format
(
'
<span class="message">{0}</span>
'
,
message
));
elements
.
push
(
'
</div>
'
);
elements
.
push
(
'
<div>
'
);
elements
.
push
(
strings
.
format
(
'
<span class="path"><span class="basename">{0} ({1},{2})</span><span class="dirname">{3}</span></span>
'
,
paths
.
basename
(
this
.
_marker
.
resource
.
fsPath
),
this
.
_marker
.
startLineNumber
,
this
.
_marker
.
startColumn
,
this
.
_lp
.
getLabel
(
paths
.
dirname
(
this
.
_marker
.
resource
.
fsPath
))
paths
.
basename
(
resource
.
fsPath
),
startLineNumber
,
startColumn
,
this
.
_lp
.
getLabel
(
paths
.
dirname
(
resource
.
fsPath
))
));
elements
.
push
(
'
</div>
'
);
elements
.
push
(
'
<div>
'
);
...
...
@@ -123,7 +121,7 @@ export class MarkersHandler extends QuickOpenHandler {
let
ret
:
number
;
// 1st: severity matters first
ret
=
s
everity
.
compare
(
a
.
severity
,
b
.
severity
);
ret
=
S
everity
.
compare
(
a
.
severity
,
b
.
severity
);
if
(
ret
!==
0
)
{
return
ret
;
}
...
...
@@ -160,7 +158,7 @@ export class MarkersHandler extends QuickOpenHandler {
inputs
=
[
marker
.
message
,
marker
.
resource
.
fsPath
,
s
everity
.
toString
(
marker
.
severity
),
S
everity
.
toString
(
marker
.
severity
),
String
(
marker
.
startLineNumber
),
String
(
marker
.
startColumn
),
String
(
marker
.
endLineNumber
),
String
(
marker
.
endColumn
)];
return
inputs
.
some
(
input
=>
regexp
.
test
(
input
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录