Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b17e5587
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,发现更多精彩内容 >>
提交
b17e5587
编写于
9月 10, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Surface errors for commands that are part of a code action
Fixes #79967
上级
a7704164
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
8 deletion
+31
-8
src/vs/editor/contrib/codeAction/codeActionCommands.ts
src/vs/editor/contrib/codeAction/codeActionCommands.ts
+27
-5
src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
+3
-2
src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
...vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+1
-1
未找到文件。
src/vs/editor/contrib/codeAction/codeActionCommands.ts
浏览文件 @
b17e5587
...
...
@@ -3,30 +3,32 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
IAnchor
}
from
'
vs/base/browser/ui/contextview/contextview
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
escapeRegExpCharacters
}
from
'
vs/base/common/strings
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
EditorAction
,
EditorCommand
,
ServicesAccessor
}
from
'
vs/editor/browser/editorExtensions
'
;
import
{
IBulkEditService
}
from
'
vs/editor/browser/services/bulkEditService
'
;
import
{
IPosition
}
from
'
vs/editor/common/core/position
'
;
import
{
IEditorContribution
}
from
'
vs/editor/common/editorCommon
'
;
import
{
EditorContextKeys
}
from
'
vs/editor/common/editorContextKeys
'
;
import
{
CodeAction
}
from
'
vs/editor/common/modes
'
;
import
{
CodeActionSet
}
from
'
vs/editor/contrib/codeAction/codeAction
'
;
import
{
CodeActionUi
}
from
'
vs/editor/contrib/codeAction/codeActionUi
'
;
import
{
MessageController
}
from
'
vs/editor/contrib/message/messageController
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ContextKeyExpr
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
KeybindingWeight
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IEditorProgressService
}
from
'
vs/platform/progress/common/progress
'
;
import
{
CodeActionModel
,
CodeActionsState
,
SUPPORTED_CODE_ACTIONS
}
from
'
./codeActionModel
'
;
import
{
CodeActionAutoApply
,
CodeActionFilter
,
CodeActionKind
,
CodeActionTrigger
}
from
'
./codeActionTrigger
'
;
import
{
CodeActionSet
}
from
'
vs/editor/contrib/codeAction/codeAction
'
;
import
{
IAnchor
}
from
'
vs/base/browser/ui/contextview/contextview
'
;
import
{
IPosition
}
from
'
vs/editor/common/core/position
'
;
function
contextKeyForSupportedActions
(
kind
:
CodeActionKind
)
{
return
ContextKeyExpr
.
regex
(
...
...
@@ -56,6 +58,7 @@ export class QuickFixController extends Disposable implements IEditorContributio
@
IKeybindingService
keybindingService
:
IKeybindingService
,
@
ICommandService
private
readonly
_commandService
:
ICommandService
,
@
IBulkEditService
private
readonly
_bulkEditService
:
IBulkEditService
,
@
IInstantiationService
private
readonly
_instantiationService
:
IInstantiationService
,
)
{
super
();
...
...
@@ -107,21 +110,40 @@ export class QuickFixController extends Disposable implements IEditorContributio
}
private
_applyCodeAction
(
action
:
CodeAction
):
Promise
<
void
>
{
return
applyCodeAction
(
action
,
this
.
_bulkEditService
,
this
.
_commandService
,
this
.
_editor
);
return
this
.
_instantiationService
.
invokeFunction
(
applyCodeAction
,
action
,
this
.
_bulkEditService
,
this
.
_commandService
,
this
.
_editor
);
}
}
export
async
function
applyCodeAction
(
accessor
:
ServicesAccessor
,
action
:
CodeAction
,
bulkEditService
:
IBulkEditService
,
commandService
:
ICommandService
,
editor
?:
ICodeEditor
,
):
Promise
<
void
>
{
const
notificationService
=
accessor
.
get
(
INotificationService
);
if
(
action
.
edit
)
{
await
bulkEditService
.
apply
(
action
.
edit
,
{
editor
});
}
if
(
action
.
command
)
{
await
commandService
.
executeCommand
(
action
.
command
.
id
,
...(
action
.
command
.
arguments
||
[]));
try
{
await
commandService
.
executeCommand
(
action
.
command
.
id
,
...(
action
.
command
.
arguments
||
[]));
}
catch
(
err
)
{
const
message
=
asMessage
(
err
);
if
(
typeof
message
===
'
string
'
)
{
notificationService
.
error
(
message
);
}
}
}
}
function
asMessage
(
err
:
any
):
string
|
undefined
{
if
(
typeof
err
===
'
string
'
)
{
return
err
;
}
else
if
(
err
instanceof
Error
&&
typeof
err
.
message
===
'
string
'
)
{
return
err
.
message
;
}
else
{
return
undefined
;
}
}
...
...
src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
浏览文件 @
b17e5587
...
...
@@ -246,7 +246,8 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
constructor
(
@
IBulkEditService
private
readonly
_bulkEditService
:
IBulkEditService
,
@
ICommandService
private
readonly
_commandService
:
ICommandService
,
@
IConfigurationService
private
readonly
_configurationService
:
IConfigurationService
@
IConfigurationService
private
readonly
_configurationService
:
IConfigurationService
,
@
IInstantiationService
private
readonly
_instantiationService
:
IInstantiationService
,
)
{
}
async
participate
(
editorModel
:
IResolvedTextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
Promise
<
void
>
{
...
...
@@ -312,7 +313,7 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
private
async
applyCodeActions
(
actionsToRun
:
readonly
CodeAction
[])
{
for
(
const
action
of
actionsToRun
)
{
await
applyCodeAction
(
action
,
this
.
_bulkEditService
,
this
.
_commandService
);
await
this
.
_instantiationService
.
invokeFunction
(
applyCodeAction
,
action
,
this
.
_bulkEditService
,
this
.
_commandService
);
}
}
...
...
src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
浏览文件 @
b17e5587
...
...
@@ -565,7 +565,7 @@ export class MarkerViewModel extends Disposable {
true
,
()
=>
{
return
this
.
openFileAtMarker
(
this
.
marker
)
.
then
(()
=>
applyCodeAction
(
codeAction
,
this
.
bulkEditService
,
this
.
commandService
));
.
then
(()
=>
this
.
instantiationService
.
invokeFunction
(
applyCodeAction
,
codeAction
,
this
.
bulkEditService
,
this
.
commandService
));
}));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录