Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
95f24e58
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
95f24e58
编写于
9月 21, 2016
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #12353
上级
5e6580aa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
12 deletion
+12
-12
src/vs/workbench/parts/markers/browser/markersPanel.ts
src/vs/workbench/parts/markers/browser/markersPanel.ts
+3
-2
src/vs/workbench/parts/markers/browser/markersTreeController.ts
.../workbench/parts/markers/browser/markersTreeController.ts
+4
-10
src/vs/workbench/parts/markers/common/markersModel.ts
src/vs/workbench/parts/markers/common/markersModel.ts
+5
-0
未找到文件。
src/vs/workbench/parts/markers/browser/markersPanel.ts
浏览文件 @
95f24e58
...
@@ -34,7 +34,7 @@ import { ActionProvider } from 'vs/workbench/parts/markers/browser/markersAction
...
@@ -34,7 +34,7 @@ import { ActionProvider } from 'vs/workbench/parts/markers/browser/markersAction
import
{
CollapseAllAction
,
FilterAction
,
FilterInputBoxActionItem
}
from
'
vs/workbench/parts/markers/browser/markersPanelActions
'
;
import
{
CollapseAllAction
,
FilterAction
,
FilterInputBoxActionItem
}
from
'
vs/workbench/parts/markers/browser/markersPanelActions
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
Messages
from
'
vs/workbench/parts/markers/common/messages
'
;
import
Messages
from
'
vs/workbench/parts/markers/common/messages
'
;
import
{
RangeHighlightDecorations
,
IRangeHighlightDecoration
}
from
'
vs/workbench/common/editor/rangeDecorations
'
;
import
{
RangeHighlightDecorations
}
from
'
vs/workbench/common/editor/rangeDecorations
'
;
export
class
MarkersPanel
extends
Panel
{
export
class
MarkersPanel
extends
Panel
{
...
@@ -327,7 +327,8 @@ export class MarkersPanel extends Panel {
...
@@ -327,7 +327,8 @@ export class MarkersPanel extends Panel {
private
highlightCurrentSelectedMarkerRange
()
{
private
highlightCurrentSelectedMarkerRange
()
{
let
selections
=
this
.
tree
.
getSelection
();
let
selections
=
this
.
tree
.
getSelection
();
if
(
selections
&&
selections
.
length
===
1
&&
selections
[
0
]
instanceof
Marker
)
{
if
(
selections
&&
selections
.
length
===
1
&&
selections
[
0
]
instanceof
Marker
)
{
this
.
rangeHighlightDecorations
.
highlightRange
(
<
IRangeHighlightDecoration
>
selections
[
0
]);
const
marker
:
Marker
=
selections
[
0
];
this
.
rangeHighlightDecorations
.
highlightRange
(
marker
);
}
}
}
}
...
...
src/vs/workbench/parts/markers/browser/markersTreeController.ts
浏览文件 @
95f24e58
...
@@ -12,7 +12,6 @@ import treedefaults = require('vs/base/parts/tree/browser/treeDefaults');
...
@@ -12,7 +12,6 @@ import treedefaults = require('vs/base/parts/tree/browser/treeDefaults');
import
{
MarkersModel
,
Marker
}
from
'
vs/workbench/parts/markers/common/markersModel
'
;
import
{
MarkersModel
,
Marker
}
from
'
vs/workbench/parts/markers/common/markersModel
'
;
import
{
RangeHighlightDecorations
}
from
'
vs/workbench/common/editor/rangeDecorations
'
;
import
{
RangeHighlightDecorations
}
from
'
vs/workbench/common/editor/rangeDecorations
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IMarker
}
from
'
vs/platform/markers/common/markers
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
export
class
Controller
extends
treedefaults
.
DefaultController
{
export
class
Controller
extends
treedefaults
.
DefaultController
{
...
@@ -60,24 +59,19 @@ export class Controller extends treedefaults.DefaultController {
...
@@ -60,24 +59,19 @@ export class Controller extends treedefaults.DefaultController {
private
openFileAtElement
(
element
:
any
,
preserveFocus
:
boolean
,
sideByside
:
boolean
,
pinned
:
boolean
):
boolean
{
private
openFileAtElement
(
element
:
any
,
preserveFocus
:
boolean
,
sideByside
:
boolean
,
pinned
:
boolean
):
boolean
{
if
(
element
instanceof
Marker
)
{
if
(
element
instanceof
Marker
)
{
this
.
telemetryService
.
publicLog
(
'
problems.marker.opened
'
,
{
source
:
element
.
source
})
;
const
marker
:
Marker
=
element
;
let
marker
=
<
IMarker
>
element
.
marker
;
this
.
telemetryService
.
publicLog
(
'
problems.marker.opened
'
,
{
source
:
marker
.
marker
.
source
})
;
this
.
editorService
.
openEditor
({
this
.
editorService
.
openEditor
({
resource
:
marker
.
resource
,
resource
:
marker
.
resource
,
options
:
{
options
:
{
selection
:
{
selection
:
marker
.
range
,
startLineNumber
:
marker
.
startLineNumber
,
startColumn
:
marker
.
startColumn
,
endLineNumber
:
marker
.
endLineNumber
,
endColumn
:
marker
.
endColumn
},
preserveFocus
,
preserveFocus
,
pinned
,
pinned
,
revealIfVisible
:
true
revealIfVisible
:
true
},
},
},
sideByside
).
done
((
editor
)
=>
{
},
sideByside
).
done
((
editor
)
=>
{
if
(
preserveFocus
)
{
if
(
preserveFocus
)
{
this
.
rangeHighlightDecorations
.
highlightRange
(
element
,
editor
);
this
.
rangeHighlightDecorations
.
highlightRange
(
marker
,
editor
);
}
else
{
}
else
{
this
.
rangeHighlightDecorations
.
removeHighlightRange
();
this
.
rangeHighlightDecorations
.
removeHighlightRange
();
}
}
...
...
src/vs/workbench/parts/markers/common/markersModel.ts
浏览文件 @
95f24e58
...
@@ -9,6 +9,7 @@ import * as types from 'vs/base/common/types';
...
@@ -9,6 +9,7 @@ import * as types from 'vs/base/common/types';
import
*
as
Map
from
'
vs/base/common/map
'
;
import
*
as
Map
from
'
vs/base/common/map
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IRange
}
from
'
vs/editor/common/editorCommon
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
IMarker
,
MarkerStatistics
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IMarker
,
MarkerStatistics
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IFilter
,
IMatch
,
or
,
matchesContiguousSubString
,
matchesPrefix
,
matchesFuzzy
}
from
'
vs/base/common/filters
'
;
import
{
IFilter
,
IMatch
,
or
,
matchesContiguousSubString
,
matchesPrefix
,
matchesFuzzy
}
from
'
vs/base/common/filters
'
;
...
@@ -52,6 +53,10 @@ export class Marker {
...
@@ -52,6 +53,10 @@ export class Marker {
public
get
resource
():
URI
{
public
get
resource
():
URI
{
return
this
.
marker
.
resource
;
return
this
.
marker
.
resource
;
}
}
public
get
range
():
IRange
{
return
this
.
marker
;
}
}
}
export
class
FilterOptions
{
export
class
FilterOptions
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录