Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
e41a9f25
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e41a9f25
编写于
3月 24, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Copying a file from Windows explorer into same directory in VS Code removes all code (fixes #4531)
上级
70a533c0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
6 deletion
+21
-6
src/vs/workbench/parts/files/browser/fileActions.ts
src/vs/workbench/parts/files/browser/fileActions.ts
+6
-4
src/vs/workbench/services/files/node/fileService.ts
src/vs/workbench/services/files/node/fileService.ts
+5
-1
src/vs/workbench/services/files/test/node/fileService.test.ts
...vs/workbench/services/files/test/node/fileService.test.ts
+10
-1
未找到文件。
src/vs/workbench/parts/files/browser/fileActions.ts
浏览文件 @
e41a9f25
...
...
@@ -893,11 +893,13 @@ export class ImportFileAction extends BaseFileAction {
multiFileProgressTracker
=
this
.
progressService
.
show
(
filesArray
.
length
);
}
// Run import in sequence
to not consume too many connections
// Run import in sequence
let
importPromisesFactory
:
ITask
<
TPromise
<
void
>>
[]
=
[];
filesArray
.
forEach
((
file
)
=>
{
importPromisesFactory
.
push
(()
=>
{
return
this
.
fileService
.
importFile
(
URI
.
file
((
<
any
>
file
).
path
),
targetElement
.
resource
).
then
((
result
:
IImportResult
)
=>
{
let
sourceFile
=
URI
.
file
((
<
any
>
file
).
path
);
return
this
.
fileService
.
importFile
(
sourceFile
,
targetElement
.
resource
).
then
((
result
:
IImportResult
)
=>
{
// Progress
if
(
multiFileProgressTracker
)
{
...
...
@@ -906,9 +908,9 @@ export class ImportFileAction extends BaseFileAction {
if
(
result
.
stat
)
{
// Emit Deleted Event if file gets replaced
// Emit Deleted Event if file gets replaced
unless it is the same file
let
oldFile
=
targetNames
[
isLinux
?
file
.
name
:
file
.
name
.
toLowerCase
()];
if
(
oldFile
)
{
if
(
oldFile
&&
oldFile
.
resource
.
fsPath
!==
result
.
stat
.
resource
.
fsPath
)
{
this
.
eventService
.
emit
(
'
files.internal:fileChanged
'
,
new
Files
.
LocalFileChangeEvent
(
oldFile
,
null
));
}
...
...
src/vs/workbench/services/files/node/fileService.ts
浏览文件 @
e41a9f25
...
...
@@ -328,6 +328,7 @@ export class FileService implements files.IFileService {
// 1.) check if target exists
return
pfs
.
exists
(
targetPath
).
then
((
exists
)
=>
{
let
isCaseRename
=
sourcePath
.
toLowerCase
()
===
targetPath
.
toLowerCase
();
let
isSameFile
=
sourcePath
===
targetPath
;
// Return early with conflict if target exists and we are not told to overwrite
if
(
exists
&&
!
isCaseRename
&&
!
overwrite
)
{
...
...
@@ -350,8 +351,11 @@ export class FileService implements files.IFileService {
// 3.) make sure parents exists
return
pfs
.
mkdirp
(
paths
.
dirname
(
targetPath
)).
then
(()
=>
{
// 4.) copy/move
if
(
keepCopy
)
{
if
(
isSameFile
)
{
return
TPromise
.
as
(
null
);
}
else
if
(
keepCopy
)
{
return
nfcall
(
extfs
.
copy
,
sourcePath
,
targetPath
);
}
else
{
return
nfcall
(
extfs
.
mv
,
sourcePath
,
targetPath
);
...
...
src/vs/workbench/services/files/test/node/fileService.test.ts
浏览文件 @
e41a9f25
...
...
@@ -181,7 +181,6 @@ suite('FileService', () => {
});
});
test
(
'
importFile
'
,
function
(
done
:
()
=>
void
)
{
service
.
resolveFile
(
uri
.
file
(
path
.
join
(
testDir
,
'
deep
'
))).
done
(
target
=>
{
return
service
.
importFile
(
uri
.
file
(
require
.
toUrl
(
'
./fixtures/service/index.html
'
)),
target
.
resource
).
then
(
res
=>
{
...
...
@@ -225,6 +224,16 @@ suite('FileService', () => {
});
});
test
(
'
importFile - same file
'
,
function
(
done
:
()
=>
void
)
{
service
.
resolveFile
(
uri
.
file
(
path
.
join
(
testDir
,
'
index.html
'
))).
done
(
source
=>
{
return
service
.
importFile
(
source
.
resource
,
uri
.
file
(
path
.
dirname
(
source
.
resource
.
fsPath
))).
then
(
imported
=>
{
assert
.
equal
(
imported
.
stat
.
size
,
source
.
size
);
done
();
});
});
});
test
(
'
deleteFile
'
,
function
(
done
:
()
=>
void
)
{
service
.
resolveFile
(
uri
.
file
(
path
.
join
(
testDir
,
'
deep
'
,
'
conway.js
'
))).
done
(
source
=>
{
return
service
.
del
(
source
.
resource
).
then
(()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录