Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
efc702c7
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,发现更多精彩内容 >>
提交
efc702c7
编写于
9月 20, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement #49215
上级
2f421308
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
20 addition
and
5 deletion
+20
-5
src/vs/workbench/api/node/extHostTypeConverters.ts
src/vs/workbench/api/node/extHostTypeConverters.ts
+2
-1
src/vs/workbench/parts/markers/electron-browser/markersModel.ts
.../workbench/parts/markers/electron-browser/markersModel.ts
+5
-0
src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
...bench/parts/markers/electron-browser/markersTreeViewer.ts
+5
-0
src/vs/workbench/parts/markers/electron-browser/media/markers.css
...orkbench/parts/markers/electron-browser/media/markers.css
+8
-4
未找到文件。
src/vs/workbench/api/node/extHostTypeConverters.ts
浏览文件 @
efc702c7
...
...
@@ -24,6 +24,7 @@ import { WorkspaceEditDto, ResourceTextEditDto, ResourceFileEditDto } from 'vs/w
import
{
MarkerSeverity
,
IRelatedInformation
,
IMarkerData
,
MarkerTag
}
from
'
vs/platform/markers/common/markers
'
;
import
{
ACTIVE_GROUP
,
SIDE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ExtHostDocumentsAndEditors
}
from
'
vs/workbench/api/node/extHostDocumentsAndEditors
'
;
import
{
isString
,
isNumber
}
from
'
vs/base/common/types
'
;
export
interface
PositionLike
{
line
:
number
;
...
...
@@ -107,7 +108,7 @@ export namespace Diagnostic {
...
Range
.
from
(
value
.
range
),
message
:
value
.
message
,
source
:
value
.
source
,
code
:
String
(
value
.
code
)
,
code
:
isString
(
value
.
code
)
||
isNumber
(
value
.
code
)
?
String
(
value
.
code
)
:
void
0
,
severity
:
DiagnosticSeverity
.
from
(
value
.
severity
),
relatedInformation
:
value
.
relatedInformation
&&
value
.
relatedInformation
.
map
(
DiagnosticRelatedInformation
.
from
),
tags
:
Array
.
isArray
(
value
.
tags
)
?
value
.
tags
.
map
(
DiagnosticTag
.
from
)
:
undefined
,
...
...
src/vs/workbench/parts/markers/electron-browser/markersModel.ts
浏览文件 @
efc702c7
...
...
@@ -119,6 +119,7 @@ export class Marker extends NodeWithId {
isSelected
:
boolean
=
false
;
messageMatches
:
IMatch
[]
=
[];
sourceMatches
:
IMatch
[]
=
[];
codeMatches
:
IMatch
[]
=
[];
resourceRelatedInformation
:
RelatedInformation
[]
=
[];
constructor
(
...
...
@@ -352,6 +353,7 @@ export class MarkersModel {
private
updateMarker
(
marker
:
Marker
,
resource
:
ResourceMarkers
):
void
{
marker
.
messageMatches
=
!
resource
.
isExcluded
&&
this
.
_filterOptions
.
textFilter
?
FilterOptions
.
_fuzzyFilter
(
this
.
_filterOptions
.
textFilter
,
marker
.
raw
.
message
)
:
[];
marker
.
sourceMatches
=
!
resource
.
isExcluded
&&
marker
.
raw
.
source
&&
this
.
_filterOptions
.
textFilter
?
FilterOptions
.
_filter
(
this
.
_filterOptions
.
textFilter
,
marker
.
raw
.
source
)
:
[];
marker
.
codeMatches
=
!
resource
.
isExcluded
&&
marker
.
raw
.
code
&&
this
.
_filterOptions
.
textFilter
?
FilterOptions
.
_filter
(
this
.
_filterOptions
.
textFilter
,
marker
.
raw
.
code
)
:
[];
marker
.
resourceRelatedInformation
.
forEach
(
r
=>
{
r
.
uriMatches
=
!
resource
.
isExcluded
&&
this
.
_filterOptions
.
textFilter
?
FilterOptions
.
_filter
(
this
.
_filterOptions
.
textFilter
,
paths
.
basename
(
r
.
raw
.
resource
.
fsPath
))
:
[];
r
.
messageMatches
=
!
resource
.
isExcluded
&&
this
.
_filterOptions
.
textFilter
?
FilterOptions
.
_fuzzyFilter
(
this
.
_filterOptions
.
textFilter
,
r
.
raw
.
message
)
:
[];
...
...
@@ -404,6 +406,9 @@ export class MarkersModel {
if
(
!!
marker
.
source
&&
!!
FilterOptions
.
_filter
(
this
.
_filterOptions
.
textFilter
,
marker
.
source
))
{
return
true
;
}
if
(
!!
marker
.
code
&&
!!
FilterOptions
.
_filter
(
this
.
_filterOptions
.
textFilter
,
marker
.
code
))
{
return
true
;
}
if
(
!!
marker
.
relatedInformation
&&
marker
.
relatedInformation
.
some
(
r
=>
!!
FilterOptions
.
_filter
(
this
.
_filterOptions
.
textFilter
,
paths
.
basename
(
r
.
resource
.
fsPath
))
||
!
!
FilterOptions
.
_filter
(
this
.
_filterOptions
.
textFilter
,
r
.
message
)))
{
...
...
src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
浏览文件 @
efc702c7
...
...
@@ -36,6 +36,7 @@ interface IMarkerTemplateData {
source
:
HighlightedLabel
;
description
:
HighlightedLabel
;
lnCol
:
HTMLElement
;
code
:
HighlightedLabel
;
}
interface
IRelatedInformationTemplateData
{
...
...
@@ -205,6 +206,7 @@ export class Renderer implements IRenderer {
data
.
icon
=
dom
.
append
(
container
,
dom
.
$
(
'
.icon
'
));
data
.
source
=
new
HighlightedLabel
(
dom
.
append
(
container
,
dom
.
$
(
''
)));
data
.
description
=
new
HighlightedLabel
(
dom
.
append
(
container
,
dom
.
$
(
'
.marker-description
'
)));
data
.
code
=
new
HighlightedLabel
(
dom
.
append
(
container
,
dom
.
$
(
''
)));
data
.
lnCol
=
dom
.
append
(
container
,
dom
.
$
(
'
span.marker-line
'
));
return
data
;
}
...
...
@@ -245,6 +247,9 @@ export class Renderer implements IRenderer {
templateData
.
description
.
set
(
marker
.
message
,
element
.
messageMatches
);
templateData
.
description
.
element
.
title
=
marker
.
message
;
dom
.
toggleClass
(
templateData
.
code
.
element
,
'
marker-code
'
,
!!
marker
.
code
);
templateData
.
code
.
set
(
marker
.
code
||
''
,
element
.
codeMatches
);
templateData
.
lnCol
.
textContent
=
Messages
.
MARKERS_PANEL_AT_LINE_COL_NUMBER
(
marker
.
startLineNumber
,
marker
.
startColumn
);
}
...
...
src/vs/workbench/parts/markers/electron-browser/media/markers.css
浏览文件 @
efc702c7
...
...
@@ -114,22 +114,26 @@
overflow
:
hidden
;
}
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-source
{
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-source
,
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-code
{
margin-right
:
5px
;
}
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-source
:before
{
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-source
:before
,
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-code
:before
{
content
:
'['
;
}
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-source
:after
{
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-source
:after
,
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-code
:after
{
content
:
']'
;
}
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-source
,
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.related-info-resource
,
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.related-info-resource-separator
,
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-line
{
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-line
,
.markers-panel
.markers-panel-container
.tree-container
.markers-panel-tree-entry
.marker-code
{
opacity
:
0.7
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录