Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
754875a9
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,发现更多精彩内容 >>
提交
754875a9
编写于
2月 19, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
explorer - no need to revert before using working copy file service
上级
157abd2a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
13 deletion
+2
-13
src/vs/workbench/contrib/files/browser/fileActions.ts
src/vs/workbench/contrib/files/browser/fileActions.ts
+0
-1
src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
...s/workbench/contrib/files/browser/views/explorerViewer.ts
+2
-12
未找到文件。
src/vs/workbench/contrib/files/browser/fileActions.ts
浏览文件 @
754875a9
...
...
@@ -183,7 +183,6 @@ async function deleteFiles(workingCopyService: IWorkingCopyService, workingCopyF
confirmed
=
false
;
}
else
{
skipConfirm
=
true
;
await
Promise
.
all
(
dirtyWorkingCopies
.
map
(
dirty
=>
dirty
.
revert
()));
}
}
...
...
src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
浏览文件 @
754875a9
...
...
@@ -55,7 +55,6 @@ import { ILabelService } from 'vs/platform/label/common/label';
import
{
isNumber
}
from
'
vs/base/common/types
'
;
import
{
domEvent
}
from
'
vs/base/browser/event
'
;
import
{
IEditableData
}
from
'
vs/workbench/common/views
'
;
import
{
IWorkingCopyService
}
from
'
vs/workbench/services/workingCopy/common/workingCopyService
'
;
export
class
ExplorerDelegate
implements
IListVirtualDelegate
<
ExplorerItem
>
{
...
...
@@ -643,8 +642,7 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IWorkingCopyFileService
private
workingCopyFileService
:
IWorkingCopyFileService
,
@
IHostService
private
hostService
:
IHostService
,
@
IWorkspaceEditingService
private
workspaceEditingService
:
IWorkspaceEditingService
,
@
IWorkingCopyService
private
workingCopyService
:
IWorkingCopyService
@
IWorkspaceEditingService
private
workspaceEditingService
:
IWorkspaceEditingService
)
{
this
.
toDispose
=
[];
...
...
@@ -945,15 +943,7 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
const
sourceFile
=
resource
;
const
targetFile
=
joinPath
(
target
.
resource
,
basename
(
sourceFile
));
// if the target exists and is dirty, make sure to revert it. otherwise the dirty contents
// of the target file would replace the contents of the added file. since we already
// confirmed the overwrite before, this is OK.
if
(
this
.
workingCopyService
.
isDirty
(
targetFile
))
{
await
Promise
.
all
(
this
.
workingCopyService
.
getWorkingCopies
(
targetFile
).
map
(
workingCopy
=>
workingCopy
.
revert
({
soft
:
true
})));
}
const
copyTarget
=
joinPath
(
target
.
resource
,
basename
(
sourceFile
));
const
stat
=
await
this
.
workingCopyFileService
.
copy
(
sourceFile
,
copyTarget
,
true
);
const
stat
=
await
this
.
workingCopyFileService
.
copy
(
sourceFile
,
targetFile
,
true
);
// if we only add one file, just open it directly
if
(
resources
.
length
===
1
&&
!
stat
.
isDirectory
)
{
this
.
editorService
.
openEditor
({
resource
:
stat
.
resource
,
options
:
{
pinned
:
true
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录