Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
555727f1
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,发现更多精彩内容 >>
未验证
提交
555727f1
编写于
2月 01, 2019
作者:
I
Isidor Nikolic
提交者:
GitHub
2月 01, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #67738 from Microsoft/fix-67734
files - let copy/move of same file path be a no-op
上级
201d0255
6b552b4f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
8 deletion
+9
-8
src/vs/workbench/services/files/electron-browser/fileService.ts
.../workbench/services/files/electron-browser/fileService.ts
+9
-8
未找到文件。
src/vs/workbench/services/files/electron-browser/fileService.ts
浏览文件 @
555727f1
...
@@ -856,25 +856,28 @@ export class FileService extends Disposable implements IFileService {
...
@@ -856,25 +856,28 @@ export class FileService extends Disposable implements IFileService {
// 2.) resolve
// 2.) resolve
return
this
.
resolve
(
target
).
then
(
result
=>
{
return
this
.
resolve
(
target
).
then
(
result
=>
{
// Events
// Events (unless it was a no-op because paths are identical)
this
.
_onAfterOperation
.
fire
(
new
FileOperationEvent
(
source
,
keepCopy
?
FileOperation
.
COPY
:
FileOperation
.
MOVE
,
result
));
if
(
sourcePath
!==
targetPath
)
{
this
.
_onAfterOperation
.
fire
(
new
FileOperationEvent
(
source
,
keepCopy
?
FileOperation
.
COPY
:
FileOperation
.
MOVE
,
result
));
}
return
result
;
return
result
;
});
});
});
});
}
}
private
doMoveOrCopyFile
(
sourcePath
:
string
,
targetPath
:
string
,
keepCopy
:
boolean
,
overwrite
:
boolean
):
Promise
<
boolean
/* exists */
>
{
private
doMoveOrCopyFile
(
sourcePath
:
string
,
targetPath
:
string
,
keepCopy
:
boolean
,
overwrite
:
boolean
):
Promise
<
void
>
{
// 1.) validate operation
// 1.) validate operation
if
(
isParent
(
targetPath
,
sourcePath
,
!
isLinux
))
{
if
(
isParent
(
targetPath
,
sourcePath
,
!
isLinux
))
{
return
Promise
.
reject
(
new
Error
(
'
Unable to move/copy when source path is parent of target path
'
));
return
Promise
.
reject
(
new
Error
(
'
Unable to move/copy when source path is parent of target path
'
));
}
else
if
(
sourcePath
===
targetPath
)
{
return
Promise
.
resolve
();
// no-op but not an error
}
}
// 2.) check if target exists
// 2.) check if target exists
return
pfs
.
exists
(
targetPath
).
then
(
exists
=>
{
return
pfs
.
exists
(
targetPath
).
then
(
exists
=>
{
const
isCaseRename
=
sourcePath
.
toLowerCase
()
===
targetPath
.
toLowerCase
();
const
isCaseRename
=
sourcePath
.
toLowerCase
()
===
targetPath
.
toLowerCase
();
const
isSameFile
=
sourcePath
===
targetPath
;
// Return early with conflict if target exists and we are not told to overwrite
// Return early with conflict if target exists and we are not told to overwrite
if
(
exists
&&
!
isCaseRename
&&
!
overwrite
)
{
if
(
exists
&&
!
isCaseRename
&&
!
overwrite
)
{
...
@@ -897,14 +900,12 @@ export class FileService extends Disposable implements IFileService {
...
@@ -897,14 +900,12 @@ export class FileService extends Disposable implements IFileService {
return
pfs
.
mkdirp
(
paths
.
dirname
(
targetPath
)).
then
(()
=>
{
return
pfs
.
mkdirp
(
paths
.
dirname
(
targetPath
)).
then
(()
=>
{
// 4.) copy/move
// 4.) copy/move
if
(
isSameFile
)
{
if
(
keepCopy
)
{
return
null
;
}
else
if
(
keepCopy
)
{
return
nfcall
(
extfs
.
copy
,
sourcePath
,
targetPath
);
return
nfcall
(
extfs
.
copy
,
sourcePath
,
targetPath
);
}
else
{
}
else
{
return
nfcall
(
extfs
.
mv
,
sourcePath
,
targetPath
);
return
nfcall
(
extfs
.
mv
,
sourcePath
,
targetPath
);
}
}
})
.
then
(()
=>
exists
)
;
});
});
});
});
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录