Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d84b5eb2
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,发现更多精彩内容 >>
提交
d84b5eb2
编写于
11月 20, 2020
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bulkFileEdits: do not use file trash flag
上级
6541e52b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
3 deletion
+4
-3
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+1
-0
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+1
-0
src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
+1
-1
src/vs/workbench/contrib/files/browser/fileActions.ts
src/vs/workbench/contrib/files/browser/fileActions.ts
+1
-2
未找到文件。
src/vs/editor/common/modes.ts
浏览文件 @
d84b5eb2
...
@@ -1387,6 +1387,7 @@ export interface WorkspaceFileEditOptions {
...
@@ -1387,6 +1387,7 @@ export interface WorkspaceFileEditOptions {
recursive
?:
boolean
;
recursive
?:
boolean
;
copy
?:
boolean
;
copy
?:
boolean
;
folder
?:
boolean
;
folder
?:
boolean
;
doNotUseTrash
?:
boolean
;
}
}
export
interface
WorkspaceFileEdit
{
export
interface
WorkspaceFileEdit
{
...
...
src/vs/monaco.d.ts
浏览文件 @
d84b5eb2
...
@@ -6262,6 +6262,7 @@ declare namespace monaco.languages {
...
@@ -6262,6 +6262,7 @@ declare namespace monaco.languages {
recursive
?:
boolean
;
recursive
?:
boolean
;
copy
?:
boolean
;
copy
?:
boolean
;
folder
?:
boolean
;
folder
?:
boolean
;
doNotUseTrash
?:
boolean
;
}
}
export
interface
WorkspaceFileEdit
{
export
interface
WorkspaceFileEdit
{
...
...
src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
浏览文件 @
d84b5eb2
...
@@ -172,7 +172,7 @@ class DeleteOperation implements IFileOperation {
...
@@ -172,7 +172,7 @@ class DeleteOperation implements IFileOperation {
}
}
}
}
const
useTrash
=
this
.
_fileService
.
hasCapability
(
this
.
oldUri
,
FileSystemProviderCapabilities
.
Trash
)
&&
this
.
_configurationService
.
getValue
<
boolean
>
(
'
files.enableTrash
'
);
const
useTrash
=
this
.
_fileService
.
hasCapability
(
this
.
oldUri
,
FileSystemProviderCapabilities
.
Trash
)
&&
this
.
_configurationService
.
getValue
<
boolean
>
(
'
files.enableTrash
'
)
&&
!
this
.
options
.
doNotUseTrash
;
await
this
.
_workingCopyFileService
.
delete
([
this
.
oldUri
],
{
useTrash
,
recursive
:
this
.
options
.
recursive
,
...
this
.
undoRedoInfo
});
await
this
.
_workingCopyFileService
.
delete
([
this
.
oldUri
],
{
useTrash
,
recursive
:
this
.
options
.
recursive
,
...
this
.
undoRedoInfo
});
return
this
.
_instaService
.
createInstance
(
CreateOperation
,
this
.
oldUri
,
this
.
options
,
{
isUndoing
:
true
},
contents
);
return
this
.
_instaService
.
createInstance
(
CreateOperation
,
this
.
oldUri
,
this
.
options
,
{
isUndoing
:
true
},
contents
);
}
}
...
...
src/vs/workbench/contrib/files/browser/fileActions.ts
浏览文件 @
d84b5eb2
...
@@ -226,8 +226,7 @@ async function deleteFiles(explorerService: IExplorerService, bulkEditService: I
...
@@ -226,8 +226,7 @@ async function deleteFiles(explorerService: IExplorerService, bulkEditService: I
// Call function
// Call function
try
{
try
{
const
resourceFileEdits
=
distinctElements
.
map
(
e
=>
new
ResourceFileEdit
(
e
.
resource
,
undefined
,
{
recursive
:
true
}));
const
resourceFileEdits
=
distinctElements
.
map
(
e
=>
new
ResourceFileEdit
(
e
.
resource
,
undefined
,
{
recursive
:
true
,
doNotUseTrash
:
!
useTrash
}));
// TODO@Isidor respect the useTrash parameter
await
bulkEditService
.
apply
(
resourceFileEdits
,
{
await
bulkEditService
.
apply
(
resourceFileEdits
,
{
undoRedoSource
:
explorerService
.
undoRedoSource
,
undoRedoSource
:
explorerService
.
undoRedoSource
,
label
:
distinctElements
.
length
>
1
?
nls
.
localize
(
'
deleteBulkEdit
'
,
"
Delete {0} files
"
,
distinctElements
.
length
)
:
nls
.
localize
(
'
deleteFileBulkEdit
'
,
"
Delete {0}
"
,
distinctElements
[
0
].
name
)
label
:
distinctElements
.
length
>
1
?
nls
.
localize
(
'
deleteBulkEdit
'
,
"
Delete {0} files
"
,
distinctElements
.
length
)
:
nls
.
localize
(
'
deleteFileBulkEdit
'
,
"
Delete {0}
"
,
distinctElements
[
0
].
name
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录