Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b228ffc4
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,发现更多精彩内容 >>
提交
b228ffc4
编写于
5月 15, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Show progress while computing code actions
Fixes #49939
上级
4c57171e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
7 deletion
+15
-7
src/vs/editor/contrib/codeAction/codeActionCommands.ts
src/vs/editor/contrib/codeAction/codeActionCommands.ts
+5
-3
src/vs/editor/contrib/codeAction/codeActionModel.ts
src/vs/editor/contrib/codeAction/codeActionModel.ts
+10
-4
未找到文件。
src/vs/editor/contrib/codeAction/codeActionCommands.ts
浏览文件 @
b228ffc4
...
...
@@ -24,6 +24,7 @@ import { CodeActionContextMenu } from './codeActionWidget';
import
{
LightBulbWidget
}
from
'
./lightBulbWidget
'
;
import
{
escapeRegExpCharacters
}
from
'
vs/base/common/strings
'
;
import
{
IBulkEditService
}
from
'
vs/editor/browser/services/bulkEditService
'
;
import
{
IProgressService
}
from
'
vs/platform/progress/common/progress
'
;
function
contextKeyForSupportedActions
(
kind
:
CodeActionKind
)
{
return
ContextKeyExpr
.
regex
(
...
...
@@ -48,13 +49,14 @@ export class QuickFixController implements IEditorContribution {
constructor
(
editor
:
ICodeEditor
,
@
IMarkerService
markerService
:
IMarkerService
,
@
IContextKeyService
contextKeyService
:
IContextKeyService
,
@
I
CommandService
private
readonly
_commandService
:
ICommand
Service
,
@
I
ProgressService
progressService
:
IProgress
Service
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
ICommandService
private
readonly
_commandService
:
ICommandService
,
@
IKeybindingService
private
readonly
_keybindingService
:
IKeybindingService
,
@
IBulkEditService
private
readonly
_bulkEditService
:
IBulkEditService
@
IBulkEditService
private
readonly
_bulkEditService
:
IBulkEditService
,
)
{
this
.
_editor
=
editor
;
this
.
_model
=
new
CodeActionModel
(
this
.
_editor
,
markerService
,
contextKeyService
);
this
.
_model
=
new
CodeActionModel
(
this
.
_editor
,
markerService
,
contextKeyService
,
progressService
);
this
.
_codeActionContextMenu
=
new
CodeActionContextMenu
(
editor
,
contextMenuService
,
action
=>
this
.
_onApplyCodeAction
(
action
));
this
.
_lightBulbWidget
=
new
LightBulbWidget
(
editor
);
...
...
src/vs/editor/contrib/codeAction/codeActionModel.ts
浏览文件 @
b228ffc4
...
...
@@ -16,6 +16,7 @@ import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/cont
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
getCodeActions
}
from
'
./codeAction
'
;
import
{
CodeActionTrigger
}
from
'
./codeActionTrigger
'
;
import
{
IProgressService
}
from
'
vs/platform/progress/common/progress
'
;
export
const
SUPPORTED_CODE_ACTIONS
=
new
RawContextKey
<
string
>
(
'
supportedCodeAction
'
,
''
);
...
...
@@ -25,9 +26,10 @@ export class CodeActionOracle {
constructor
(
private
_editor
:
ICodeEditor
,
private
_markerService
:
IMarkerService
,
private
readonly
_markerService
:
IMarkerService
,
private
_signalChange
:
(
e
:
CodeActionsComputeEvent
)
=>
any
,
delay
:
number
=
250
delay
:
number
=
250
,
private
readonly
_progressService
?:
IProgressService
,
)
{
this
.
_disposables
.
push
(
debounceEvent
(
this
.
_markerService
.
onMarkerChanged
,
(
last
,
cur
)
=>
last
?
last
.
concat
(
cur
)
:
cur
,
delay
/
2
)(
e
=>
this
.
_onMarkerChanges
(
e
)),
...
...
@@ -113,6 +115,10 @@ export class CodeActionOracle {
const
position
=
markerRange
?
markerRange
.
getStartPosition
()
:
selection
.
getStartPosition
();
const
actions
=
getCodeActions
(
model
,
selection
,
trigger
&&
trigger
.
filter
);
if
(
this
.
_progressService
)
{
this
.
_progressService
.
showWhile
(
actions
,
250
);
}
this
.
_signalChange
({
trigger
,
rangeOrSelection
:
selection
,
...
...
@@ -140,7 +146,7 @@ export class CodeActionModel {
private
_disposables
:
IDisposable
[]
=
[];
private
readonly
_supportedCodeActions
:
IContextKey
<
string
>
;
constructor
(
editor
:
ICodeEditor
,
markerService
:
IMarkerService
,
contextKeyService
:
IContextKeyService
)
{
constructor
(
editor
:
ICodeEditor
,
markerService
:
IMarkerService
,
contextKeyService
:
IContextKeyService
,
private
readonly
_progressService
:
IProgressService
)
{
this
.
_editor
=
editor
;
this
.
_markerService
=
markerService
;
...
...
@@ -183,7 +189,7 @@ export class CodeActionModel {
this
.
_supportedCodeActions
.
set
(
supportedActions
.
join
(
'
'
));
this
.
_codeActionOracle
=
new
CodeActionOracle
(
this
.
_editor
,
this
.
_markerService
,
p
=>
this
.
_onDidChangeFixes
.
fire
(
p
));
this
.
_codeActionOracle
=
new
CodeActionOracle
(
this
.
_editor
,
this
.
_markerService
,
p
=>
this
.
_onDidChangeFixes
.
fire
(
p
)
,
undefined
,
this
.
_progressService
);
this
.
_codeActionOracle
.
trigger
({
type
:
'
auto
'
});
}
else
{
this
.
_supportedCodeActions
.
reset
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录