Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
137bda62
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,发现更多精彩内容 >>
提交
137bda62
编写于
11月 28, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
textFileService.copy
#43768
上级
791f1934
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
4 deletion
+27
-4
src/vs/workbench/services/textfile/browser/textFileService.ts
...vs/workbench/services/textfile/browser/textFileService.ts
+16
-4
src/vs/workbench/services/textfile/common/textfiles.ts
src/vs/workbench/services/textfile/common/textfiles.ts
+5
-0
src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
...bench/test/electron-browser/api/mainThreadEditors.test.ts
+6
-0
未找到文件。
src/vs/workbench/services/textfile/browser/textFileService.ts
浏览文件 @
137bda62
...
...
@@ -387,9 +387,17 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
}
async
move
(
source
:
URI
,
target
:
URI
,
overwrite
?:
boolean
):
Promise
<
IFileStatWithMetadata
>
{
return
this
.
moveOrCopy
(
source
,
target
,
true
,
overwrite
);
}
async
copy
(
source
:
URI
,
target
:
URI
,
overwrite
?:
boolean
):
Promise
<
IFileStatWithMetadata
>
{
return
this
.
moveOrCopy
(
source
,
target
,
false
,
overwrite
);
}
private
async
moveOrCopy
(
source
:
URI
,
target
:
URI
,
move
:
boolean
,
overwrite
?:
boolean
):
Promise
<
IFileStatWithMetadata
>
{
// before event
await
this
.
_onWillRunOperation
.
fireAsync
({
operation
:
FileOperation
.
MOVE
,
target
,
source
},
CancellationToken
.
None
);
await
this
.
_onWillRunOperation
.
fireAsync
({
operation
:
move
?
FileOperation
.
MOVE
:
FileOperation
.
COPY
,
target
,
source
},
CancellationToken
.
None
);
// find all models that related to either source or target (can be many if resource is a folder)
const
sourceModels
:
ITextFileEditorModel
[]
=
[];
...
...
@@ -433,7 +441,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
modelsToRestore
.
push
(
modelToRestore
);
}
// in order to move, we need to soft revert all dirty models,
// in order to move
and copy
, we need to soft revert all dirty models,
// both from the source as well as the target if any
const
dirtyModels
=
[...
sourceModels
,
...
conflictingModels
].
filter
(
model
=>
model
.
isDirty
());
await
this
.
revertAll
(
dirtyModels
.
map
(
dirtyModel
=>
dirtyModel
.
resource
),
{
soft
:
true
});
...
...
@@ -441,7 +449,11 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
// now we can rename the source to target via file operation
let
stat
:
IFileStatWithMetadata
;
try
{
stat
=
await
this
.
fileService
.
move
(
source
,
target
,
overwrite
);
if
(
move
)
{
stat
=
await
this
.
fileService
.
move
(
source
,
target
,
overwrite
);
}
else
{
stat
=
await
this
.
fileService
.
copy
(
source
,
target
,
overwrite
);
}
}
catch
(
error
)
{
// in case of any error, ensure to set dirty flag back
...
...
@@ -469,7 +481,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
}));
// after event
this
.
_onDidRunOperation
.
fire
(
new
FileOperationDidRunEvent
(
FileOperation
.
MOVE
,
target
,
source
));
this
.
_onDidRunOperation
.
fire
(
new
FileOperationDidRunEvent
(
move
?
FileOperation
.
MOVE
:
FileOperation
.
COPY
,
target
,
source
));
return
stat
;
}
...
...
src/vs/workbench/services/textfile/common/textfiles.ts
浏览文件 @
137bda62
...
...
@@ -129,6 +129,11 @@ export interface ITextFileService extends IDisposable {
* Move a file. If the file is dirty, its contents will be preserved and restored.
*/
move
(
source
:
URI
,
target
:
URI
,
overwrite
?:
boolean
):
Promise
<
IFileStatWithMetadata
>
;
/**
* Copy a file. If the file is dirty, its contents will be preserved and restored.
*/
copy
(
source
:
URI
,
target
:
URI
,
overwrite
?:
boolean
):
Promise
<
IFileStatWithMetadata
>
;
}
export
interface
FileOperationWillRunEvent
extends
IWaitUntil
{
...
...
src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
浏览文件 @
137bda62
...
...
@@ -37,6 +37,7 @@ suite('MainThreadEditors', () => {
let
editors
:
MainThreadTextEditors
;
const
movedResources
=
new
Map
<
URI
,
URI
>
();
const
copiedResources
=
new
Map
<
URI
,
URI
>
();
const
createdResources
=
new
Set
<
URI
>
();
const
deletedResources
=
new
Set
<
URI
>
();
...
...
@@ -46,6 +47,7 @@ suite('MainThreadEditors', () => {
const
codeEditorService
=
new
TestCodeEditorService
();
movedResources
.
clear
();
copiedResources
.
clear
();
createdResources
.
clear
();
deletedResources
.
clear
();
...
...
@@ -65,6 +67,10 @@ suite('MainThreadEditors', () => {
movedResources
.
set
(
source
,
target
);
return
Promise
.
resolve
(
Object
.
create
(
null
));
}
copy
(
source
:
URI
,
target
:
URI
)
{
copiedResources
.
set
(
source
,
target
);
return
Promise
.
resolve
(
Object
.
create
(
null
));
}
models
=
<
any
>
{
onModelSaved
:
Event
.
None
,
onModelReverted
:
Event
.
None
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录