Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
787603c5
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,发现更多精彩内容 >>
提交
787603c5
编写于
3月 11, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move code action sorting into CodeActionSet
上级
0e580b6e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
20 addition
and
18 deletion
+20
-18
src/vs/editor/contrib/codeAction/codeAction.ts
src/vs/editor/contrib/codeAction/codeAction.ts
+20
-18
未找到文件。
src/vs/editor/contrib/codeAction/codeAction.ts
浏览文件 @
787603c5
...
@@ -16,9 +16,26 @@ import { IModelService } from 'vs/editor/common/services/modelService';
...
@@ -16,9 +16,26 @@ import { IModelService } from 'vs/editor/common/services/modelService';
import
{
CodeActionKind
,
CodeActionTrigger
,
filtersAction
,
mayIncludeActionsOfKind
,
CodeActionFilter
}
from
'
./codeActionTrigger
'
;
import
{
CodeActionKind
,
CodeActionTrigger
,
filtersAction
,
mayIncludeActionsOfKind
,
CodeActionFilter
}
from
'
./codeActionTrigger
'
;
export
class
CodeActionSet
{
export
class
CodeActionSet
{
public
constructor
(
public
readonly
actions
:
ReadonlyArray
<
CodeAction
>
private
static
codeActionsComparator
(
a
:
CodeAction
,
b
:
CodeAction
):
number
{
)
{
}
if
(
isNonEmptyArray
(
a
.
diagnostics
))
{
if
(
isNonEmptyArray
(
b
.
diagnostics
))
{
return
a
.
diagnostics
[
0
].
message
.
localeCompare
(
b
.
diagnostics
[
0
].
message
);
}
else
{
return
-
1
;
}
}
else
if
(
isNonEmptyArray
(
b
.
diagnostics
))
{
return
1
;
}
else
{
return
0
;
// both have no diagnostics
}
}
public
readonly
actions
:
ReadonlyArray
<
CodeAction
>
;
public
constructor
(
actions
:
CodeAction
[])
{
this
.
actions
=
mergeSort
(
actions
,
CodeActionSet
.
codeActionsComparator
);
}
public
get
hasAutoFix
()
{
public
get
hasAutoFix
()
{
return
this
.
actions
.
some
(
fix
=>
!!
fix
.
kind
&&
CodeActionKind
.
QuickFix
.
contains
(
new
CodeActionKind
(
fix
.
kind
))
&&
!!
fix
.
isPreferred
);
return
this
.
actions
.
some
(
fix
=>
!!
fix
.
kind
&&
CodeActionKind
.
QuickFix
.
contains
(
new
CodeActionKind
(
fix
.
kind
))
&&
!!
fix
.
isPreferred
);
...
@@ -56,7 +73,6 @@ export function getCodeActions(
...
@@ -56,7 +73,6 @@ export function getCodeActions(
return
Promise
.
all
(
promises
)
return
Promise
.
all
(
promises
)
.
then
(
flatten
)
.
then
(
flatten
)
.
then
(
allCodeActions
=>
mergeSort
(
allCodeActions
,
codeActionsComparator
))
.
then
(
actions
=>
new
CodeActionSet
(
actions
));
.
then
(
actions
=>
new
CodeActionSet
(
actions
));
}
}
...
@@ -75,20 +91,6 @@ function getCodeActionProviders(
...
@@ -75,20 +91,6 @@ function getCodeActionProviders(
});
});
}
}
function
codeActionsComparator
(
a
:
CodeAction
,
b
:
CodeAction
):
number
{
if
(
isNonEmptyArray
(
a
.
diagnostics
))
{
if
(
isNonEmptyArray
(
b
.
diagnostics
))
{
return
a
.
diagnostics
[
0
].
message
.
localeCompare
(
b
.
diagnostics
[
0
].
message
);
}
else
{
return
-
1
;
}
}
else
if
(
isNonEmptyArray
(
b
.
diagnostics
))
{
return
1
;
}
else
{
return
0
;
// both have no diagnostics
}
}
registerLanguageCommand
(
'
_executeCodeActionProvider
'
,
function
(
accessor
,
args
):
Promise
<
ReadonlyArray
<
CodeAction
>>
{
registerLanguageCommand
(
'
_executeCodeActionProvider
'
,
function
(
accessor
,
args
):
Promise
<
ReadonlyArray
<
CodeAction
>>
{
const
{
resource
,
range
,
kind
}
=
args
;
const
{
resource
,
range
,
kind
}
=
args
;
if
(
!
(
resource
instanceof
URI
)
||
!
Range
.
isIRange
(
range
))
{
if
(
!
(
resource
instanceof
URI
)
||
!
Range
.
isIRange
(
range
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录