Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
705e1ba5
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,发现更多精彩内容 >>
提交
705e1ba5
编写于
6月 01, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
working copy files - use URI identity service and optimize move/copy to same URI
上级
75bfdbe7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
5 deletion
+22
-5
src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
...ch/services/textfile/common/textFileEditorModelManager.ts
+5
-1
src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
...nch/services/workingCopy/common/workingCopyFileService.ts
+17
-4
未找到文件。
src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
浏览文件 @
705e1ba5
...
...
@@ -191,8 +191,12 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
this
.
mapCorrelationIdToModelsToRestore
.
delete
(
e
.
correlationId
);
modelsToRestore
.
forEach
(
model
=>
{
// snapshot presence means this model used to be dirty and so we restore that
// flag. we do NOT have to restore the content because the model was only soft
// reverted and did not loose its original dirty contents.
if
(
model
.
snapshot
)
{
this
.
get
(
model
.
source
)?.
setDirty
(
true
);
// snapshot presence means this model used to be dirty
this
.
get
(
model
.
source
)?.
setDirty
(
true
);
}
});
}
...
...
src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
浏览文件 @
705e1ba5
...
...
@@ -12,7 +12,7 @@ import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle'
import
{
IFileService
,
FileOperation
,
IFileStatWithMetadata
}
from
'
vs/platform/files/common/files
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
IWorkingCopyService
,
IWorkingCopy
}
from
'
vs/workbench/services/workingCopy/common/workingCopyService
'
;
import
{
isEqualOrParent
,
isEqual
}
from
'
vs/base/common/resources
'
;
import
{
IUriIdentityService
}
from
'
vs/workbench/services/uriIdentity/common/uriIdentity
'
;
import
{
IProgress
,
IProgressStep
}
from
'
vs/platform/progress/common/progress
'
;
import
{
WorkingCopyFileOperationParticipant
}
from
'
vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant
'
;
...
...
@@ -189,7 +189,8 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
constructor
(
@
IFileService
private
readonly
fileService
:
IFileService
,
@
IWorkingCopyService
private
readonly
workingCopyService
:
IWorkingCopyService
,
@
IInstantiationService
private
readonly
instantiationService
:
IInstantiationService
@
IInstantiationService
private
readonly
instantiationService
:
IInstantiationService
,
@
IUriIdentityService
private
readonly
uriIdentityService
:
IUriIdentityService
)
{
super
();
...
...
@@ -200,10 +201,10 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
// only check for parents if the resource can be handled
// by the file system where we then assume a folder like
// path structure
return
isEqualOrParent
(
workingCopy
.
resource
,
resource
);
return
this
.
uriIdentityService
.
extUri
.
isEqualOrParent
(
workingCopy
.
resource
,
resource
);
}
return
isEqual
(
workingCopy
.
resource
,
resource
);
return
this
.
uriIdentityService
.
extUri
.
isEqual
(
workingCopy
.
resource
,
resource
);
});
});
}
...
...
@@ -227,6 +228,18 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
// file operation participant
await
this
.
runFileOperationParticipants
(
target
,
source
,
move
?
FileOperation
.
MOVE
:
FileOperation
.
COPY
);
// Before doing the heave operations, check first if source and target
// are either identical or are considered to be identical for the file
// system. In that case we want the model to stay as is and only do the
// raw file operation.
if
(
this
.
uriIdentityService
.
extUri
.
isEqual
(
source
,
target
))
{
if
(
move
)
{
return
this
.
fileService
.
move
(
source
,
target
,
overwrite
);
}
else
{
return
this
.
fileService
.
copy
(
source
,
target
,
overwrite
);
}
}
// before event
const
event
=
{
correlationId
:
this
.
correlationIds
++
,
operation
:
move
?
FileOperation
.
MOVE
:
FileOperation
.
COPY
,
target
,
source
};
await
this
.
_onWillRunWorkingCopyFileOperation
.
fireAsync
(
event
,
CancellationToken
.
None
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录