Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f0c9a475
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,发现更多精彩内容 >>
提交
f0c9a475
编写于
12月 14, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow using arguments in keybindings for `editor.action.refactor` and `editor.action.sourceAction`
Fixes #64824
上级
580c7966
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
29 addition
and
23 deletion
+29
-23
src/vs/editor/contrib/codeAction/codeActionCommands.ts
src/vs/editor/contrib/codeAction/codeActionCommands.ts
+29
-23
未找到文件。
src/vs/editor/contrib/codeAction/codeActionCommands.ts
浏览文件 @
f0c9a475
...
...
@@ -206,33 +206,28 @@ export class QuickFixAction extends EditorAction {
class
CodeActionCommandArgs
{
public
static
fromUser
(
arg
:
any
):
CodeActionCommandArgs
{
public
static
fromUser
(
arg
:
any
,
defaults
:
{
kind
:
CodeActionKind
,
apply
:
CodeActionAutoApply
}
):
CodeActionCommandArgs
{
if
(
!
arg
||
typeof
arg
!==
'
object
'
)
{
return
new
CodeActionCommandArgs
(
CodeActionKind
.
Empty
,
CodeActionAutoApply
.
IfSingle
);
return
new
CodeActionCommandArgs
(
defaults
.
kind
,
defaults
.
apply
);
}
return
new
CodeActionCommandArgs
(
CodeActionCommandArgs
.
getKindFromUser
(
arg
),
CodeActionCommandArgs
.
getApplyFromUser
(
arg
));
CodeActionCommandArgs
.
getKindFromUser
(
arg
,
defaults
.
kind
),
CodeActionCommandArgs
.
getApplyFromUser
(
arg
,
defaults
.
apply
));
}
private
static
getApplyFromUser
(
arg
:
any
)
{
private
static
getApplyFromUser
(
arg
:
any
,
defaultAutoApply
:
CodeActionAutoApply
)
{
switch
(
typeof
arg
.
apply
===
'
string
'
?
arg
.
apply
.
toLowerCase
()
:
''
)
{
case
'
first
'
:
return
CodeActionAutoApply
.
First
;
case
'
never
'
:
return
CodeActionAutoApply
.
Never
;
case
'
ifsingle
'
:
default
:
return
CodeActionAutoApply
.
IfSingle
;
case
'
first
'
:
return
CodeActionAutoApply
.
First
;
case
'
never
'
:
return
CodeActionAutoApply
.
Never
;
case
'
ifsingle
'
:
return
CodeActionAutoApply
.
IfSingle
;
default
:
return
defaultAutoApply
;
}
}
private
static
getKindFromUser
(
arg
:
any
)
{
private
static
getKindFromUser
(
arg
:
any
,
defaultKind
:
CodeActionKind
)
{
return
typeof
arg
.
kind
===
'
string
'
?
new
CodeActionKind
(
arg
.
kind
)
:
CodeActionKind
.
Empty
;
:
defaultKind
;
}
private
constructor
(
...
...
@@ -253,7 +248,10 @@ export class CodeActionCommand extends EditorCommand {
}
public
runEditorCommand
(
_accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
,
userArg
:
any
)
{
const
args
=
CodeActionCommandArgs
.
fromUser
(
userArg
);
const
args
=
CodeActionCommandArgs
.
fromUser
(
userArg
,
{
kind
:
CodeActionKind
.
Empty
,
apply
:
CodeActionAutoApply
.
IfSingle
,
});
return
showCodeActionsForEditorSelection
(
editor
,
nls
.
localize
(
'
editor.action.quickFix.noneMessage
'
,
"
No code actions available
"
),
{
kind
:
args
.
kind
,
includeSourceActions
:
true
},
args
.
apply
);
}
}
...
...
@@ -287,11 +285,15 @@ export class RefactorAction extends EditorAction {
});
}
public
run
(
_accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
):
void
{
public
run
(
_accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
,
userArg
:
any
):
void
{
const
args
=
CodeActionCommandArgs
.
fromUser
(
userArg
,
{
kind
:
CodeActionKind
.
Refactor
,
apply
:
CodeActionAutoApply
.
Never
});
return
showCodeActionsForEditorSelection
(
editor
,
nls
.
localize
(
'
editor.action.refactor.noneMessage
'
,
"
No refactorings available
"
),
{
kind
:
CodeActionKind
.
Refactor
},
CodeActionAutoApply
.
Never
);
{
kind
:
CodeActionKind
.
Refactor
.
contains
(
args
.
kind
.
value
)
?
args
.
kind
:
CodeActionKind
.
Empty
},
args
.
apply
);
}
}
...
...
@@ -316,11 +318,15 @@ export class SourceAction extends EditorAction {
});
}
public
run
(
_accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
):
void
{
public
run
(
_accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
,
userArg
:
any
):
void
{
const
args
=
CodeActionCommandArgs
.
fromUser
(
userArg
,
{
kind
:
CodeActionKind
.
Source
,
apply
:
CodeActionAutoApply
.
Never
});
return
showCodeActionsForEditorSelection
(
editor
,
nls
.
localize
(
'
editor.action.source.noneMessage
'
,
"
No source actions available
"
),
{
kind
:
CodeActionKind
.
Source
,
includeSourceActions
:
true
},
CodeActionAutoApply
.
Never
);
{
kind
:
CodeActionKind
.
Source
.
contains
(
args
.
kind
.
value
)
?
args
.
kind
:
CodeActionKind
.
Empty
,
includeSourceActions
:
true
},
args
.
apply
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录