Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3d0dbfb8
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,发现更多精彩内容 >>
提交
3d0dbfb8
编写于
2月 03, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
no conflicts for now...
上级
e49d3872
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
3 addition
and
14 deletion
+3
-14
src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts
...vs/workbench/services/bulkEdit/browser/bulkEditService.ts
+3
-14
未找到文件。
src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts
浏览文件 @
3d0dbfb8
...
...
@@ -21,11 +21,9 @@ import { ILogService } from 'vs/platform/log/common/log';
import
{
IProgress
,
IProgressStep
,
emptyProgress
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
ILabelService
}
from
'
vs/platform/label/common/label
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
EditorOption
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
IEditorWorkerService
}
from
'
vs/editor/common/services/editorWorkerService
'
;
import
{
ConflictDetector
}
from
'
vs/workbench/services/bulkEdit/browser/conflicts
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
@@ -239,7 +237,6 @@ class BulkEdit {
@
ILogService
private
readonly
_logService
:
ILogService
,
@
IFileService
private
readonly
_fileService
:
IFileService
,
@
ITextFileService
private
readonly
_textFileService
:
ITextFileService
,
@
ILabelService
private
readonly
_uriLabelServie
:
ILabelService
,
@
IConfigurationService
private
readonly
_configurationService
:
IConfigurationService
)
{
this
.
_editor
=
editor
;
...
...
@@ -288,7 +285,6 @@ class BulkEdit {
// for child operations
this
.
_progress
.
report
({
total
});
const
conflicts
=
this
.
_instaService
.
createInstance
(
ConflictDetector
,
{
edits
:
this
.
_edits
});
const
progress
:
IProgress
<
void
>
=
{
report
:
_
=>
this
.
_progress
.
report
({
increment
:
1
})
};
// do it.
...
...
@@ -296,7 +292,7 @@ class BulkEdit {
if
(
WorkspaceFileEdit
.
is
(
group
[
0
]))
{
await
this
.
_performFileEdits
(
<
WorkspaceFileEdit
[]
>
group
,
progress
);
}
else
{
await
this
.
_performTextEdits
(
<
WorkspaceTextEdit
[]
>
group
,
conflicts
,
progress
);
await
this
.
_performTextEdits
(
<
WorkspaceTextEdit
[]
>
group
,
progress
);
}
}
}
...
...
@@ -336,14 +332,14 @@ class BulkEdit {
}
}
private
async
_performTextEdits
(
edits
:
WorkspaceTextEdit
[],
conflicts
:
ConflictDetector
,
progress
:
IProgress
<
void
>
):
Promise
<
void
>
{
private
async
_performTextEdits
(
edits
:
WorkspaceTextEdit
[],
progress
:
IProgress
<
void
>
):
Promise
<
void
>
{
this
.
_logService
.
debug
(
'
_performTextEdits
'
,
JSON
.
stringify
(
edits
));
const
model
=
this
.
_instaService
.
createInstance
(
BulkEditModel
,
this
.
_editor
,
progress
,
edits
);
await
model
.
prepare
();
this
.
_throwIfConflicts
(
conflicts
);
//
this._throwIfConflicts(conflicts);
const
validationResult
=
model
.
validate
();
if
(
validationResult
.
canApply
===
false
)
{
model
.
dispose
();
...
...
@@ -353,13 +349,6 @@ class BulkEdit {
model
.
apply
();
model
.
dispose
();
}
private
_throwIfConflicts
(
conflicts
:
ConflictDetector
)
{
if
(
conflicts
.
hasConflicts
())
{
const
paths
=
conflicts
.
list
().
map
(
uri
=>
this
.
_uriLabelServie
.
getUriLabel
(
uri
,
{
relative
:
true
}));
throw
new
Error
(
localize
(
'
conflict
'
,
"
These files have changed in the meantime: {0}
"
,
paths
.
join
(
'
,
'
)));
}
}
}
export
class
BulkEditService
implements
IBulkEditService
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录