Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e6378c27
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,发现更多精彩内容 >>
提交
e6378c27
编写于
12月 21, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #65548
上级
79b30273
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
2 deletion
+32
-2
src/vs/workbench/parts/markers/electron-browser/markers.ts
src/vs/workbench/parts/markers/electron-browser/markers.ts
+32
-2
未找到文件。
src/vs/workbench/parts/markers/electron-browser/markers.ts
浏览文件 @
e6378c27
...
...
@@ -23,6 +23,7 @@ import { CodeAction } from 'vs/editor/common/modes';
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
getCodeActions
}
from
'
vs/editor/contrib/codeAction/codeAction
'
;
import
{
CodeActionKind
}
from
'
vs/editor/contrib/codeAction/codeActionTrigger
'
;
import
{
timeout
}
from
'
vs/base/common/async
'
;
export
const
IMarkersWorkbenchService
=
createDecorator
<
IMarkersWorkbenchService
>
(
'
markersWorkbenchService
'
);
...
...
@@ -44,6 +45,8 @@ export class MarkersWorkbenchService extends Disposable implements IMarkersWorkb
readonly
markersModel
:
MarkersModel
;
private
readonly
allFixesCache
:
Map
<
string
,
Promise
<
CodeAction
[]
>>
=
new
Map
<
string
,
Promise
<
CodeAction
[]
>>
();
private
readonly
codeActionsPromises
:
Map
<
string
,
Map
<
string
,
Promise
<
CodeAction
[]
>>>
=
new
Map
<
string
,
Map
<
string
,
Promise
<
CodeAction
[]
>>>
();
private
readonly
codeActions
:
Map
<
string
,
Map
<
string
,
CodeAction
[]
>>
=
new
Map
<
string
,
Map
<
string
,
CodeAction
[]
>>
();
constructor
(
@
IMarkerService
private
markerService
:
IMarkerService
,
...
...
@@ -66,6 +69,8 @@ export class MarkersWorkbenchService extends Disposable implements IMarkersWorkb
private
onMarkerChanged
(
resources
:
URI
[]):
void
{
for
(
const
resource
of
resources
)
{
this
.
allFixesCache
.
delete
(
resource
.
toString
());
this
.
codeActionsPromises
.
delete
(
resource
.
toString
());
this
.
codeActions
.
delete
(
resource
.
toString
());
this
.
markersModel
.
setResourceMarkers
(
resource
,
this
.
readMarkers
(
resource
));
}
}
...
...
@@ -74,8 +79,33 @@ export class MarkersWorkbenchService extends Disposable implements IMarkersWorkb
return
this
.
markerService
.
read
({
resource
,
severities
:
MarkerSeverity
.
Error
|
MarkerSeverity
.
Warning
|
MarkerSeverity
.
Info
});
}
async
getQuickFixActions
(
marker
:
Marker
):
Promise
<
IAction
[]
>
{
const
codeActions
=
await
this
.
getFixes
(
marker
);
getQuickFixActions
(
marker
:
Marker
):
Promise
<
IAction
[]
>
{
const
markerKey
=
IMarkerData
.
makeKey
(
marker
.
marker
);
let
codeActionsPerMarker
=
this
.
codeActions
.
get
(
marker
.
resource
.
toString
());
if
(
!
codeActionsPerMarker
)
{
codeActionsPerMarker
=
new
Map
<
string
,
CodeAction
[]
>
();
this
.
codeActions
.
set
(
marker
.
resource
.
toString
(),
codeActionsPerMarker
);
}
let
codeActions
=
codeActionsPerMarker
.
get
(
markerKey
);
if
(
codeActions
)
{
return
Promise
.
resolve
(
this
.
toActions
(
codeActions
,
marker
));
}
else
{
let
codeActionsPromisesPerMarker
=
this
.
codeActionsPromises
.
get
(
marker
.
resource
.
toString
());
if
(
!
codeActionsPromisesPerMarker
)
{
codeActionsPromisesPerMarker
=
new
Map
<
string
,
Promise
<
CodeAction
[]
>>
();
this
.
codeActionsPromises
.
set
(
marker
.
resource
.
toString
(),
codeActionsPromisesPerMarker
);
}
if
(
!
codeActionsPromisesPerMarker
.
has
(
markerKey
))
{
const
codeActionsPromise
=
this
.
getFixes
(
marker
);
codeActionsPromisesPerMarker
.
set
(
markerKey
,
codeActionsPromise
);
codeActionsPromise
.
then
(
codeActions
=>
codeActionsPerMarker
.
set
(
markerKey
,
codeActions
));
}
// Wait for 100ms for code actions fetching.
return
timeout
(
100
).
then
(()
=>
this
.
toActions
(
codeActionsPerMarker
.
get
(
markerKey
)
||
[],
marker
));
}
}
private
toActions
(
codeActions
:
CodeAction
[],
marker
:
Marker
):
IAction
[]
{
return
codeActions
.
map
(
codeAction
=>
new
Action
(
codeAction
.
command
?
codeAction
.
command
.
id
:
codeAction
.
title
,
codeAction
.
title
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录