Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
729a6d43
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,发现更多精彩内容 >>
提交
729a6d43
编写于
2月 21, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #44001
上级
d7f719b1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
7 deletion
+13
-7
src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
...ench/parts/files/electron-browser/views/explorerViewer.ts
+13
-7
未找到文件。
src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
浏览文件 @
729a6d43
...
...
@@ -799,11 +799,15 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
// In-Explorer DND
else
{
const
sources
:
FileStat
[]
=
data
.
getData
();
if
(
target
instanceof
Model
)
{
if
(
sources
.
length
===
1
&&
sources
[
0
].
isRoot
)
{
return
DRAG_OVER_ACCEPT_BUBBLE_DOWN
(
false
);
}
return
DRAG_OVER_REJECT
;
}
const
sources
:
FileStat
[]
=
data
.
getData
();
if
(
!
Array
.
isArray
(
sources
))
{
return
DRAG_OVER_REJECT
;
}
...
...
@@ -864,9 +868,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
// In-Explorer DND (Move/Copy file)
else
{
if
(
target
instanceof
FileStat
)
{
promise
=
this
.
handleExplorerDrop
(
tree
,
data
,
target
,
originalEvent
);
}
promise
=
this
.
handleExplorerDrop
(
tree
,
data
,
target
,
originalEvent
);
}
promise
.
done
(
null
,
errors
.
onUnexpectedError
);
...
...
@@ -915,7 +917,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
});
}
private
handleExplorerDrop
(
tree
:
ITree
,
data
:
IDragAndDropData
,
target
:
FileStat
,
originalEvent
:
DragMouseEvent
):
TPromise
<
void
>
{
private
handleExplorerDrop
(
tree
:
ITree
,
data
:
IDragAndDropData
,
target
:
FileStat
|
Model
,
originalEvent
:
DragMouseEvent
):
TPromise
<
void
>
{
const
sources
:
FileStat
[]
=
distinctParents
(
data
.
getData
(),
s
=>
s
.
resource
);
const
isCopy
=
(
originalEvent
.
ctrlKey
&&
!
isMacintosh
)
||
(
originalEvent
.
altKey
&&
isMacintosh
);
...
...
@@ -955,19 +957,20 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
});
}
private
doHandleExplorerDrop
(
tree
:
ITree
,
source
:
FileStat
,
target
:
FileStat
,
isCopy
:
boolean
):
TPromise
<
void
>
{
private
doHandleExplorerDrop
(
tree
:
ITree
,
source
:
FileStat
,
target
:
FileStat
|
Model
,
isCopy
:
boolean
):
TPromise
<
void
>
{
return
tree
.
expand
(
target
).
then
(()
=>
{
if
(
source
.
isRoot
)
{
const
folders
=
this
.
contextService
.
getWorkspace
().
folders
;
let
sourceIndex
:
number
;
let
targetIndex
:
number
;
const
workspaceCreationData
:
IWorkspaceFolderCreationData
[]
=
[];
const
targetUri
=
target
instanceof
FileStat
?
target
.
resource
:
folders
[
folders
.
length
-
1
].
uri
;
for
(
let
index
=
0
;
index
<
folders
.
length
;
index
++
)
{
if
(
folders
[
index
].
uri
.
toString
()
===
source
.
resource
.
toString
())
{
sourceIndex
=
index
;
}
if
(
folders
[
index
].
uri
.
toString
()
===
target
.
resource
.
toString
())
{
if
(
folders
[
index
].
uri
.
toString
()
===
target
Uri
.
toString
())
{
targetIndex
=
index
;
}
workspaceCreationData
.
push
({
...
...
@@ -1004,6 +1007,9 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
return
TPromise
.
join
(
dirtyMoved
.
map
(
d
=>
this
.
backupFileService
.
discardResourceBackup
(
d
)));
};
if
(
!
(
target
instanceof
FileStat
))
{
return
TPromise
.
as
(
void
0
);
}
// 1. check for dirty files that are being moved and backup to new target
const
dirty
=
this
.
textFileService
.
getDirty
().
filter
(
d
=>
resources
.
isEqualOrParent
(
d
,
source
.
resource
,
!
isLinux
/* ignorecase */
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录