Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4968e0a7
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,发现更多精彩内容 >>
提交
4968e0a7
编写于
8月 07, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #77419
上级
88e570c5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
11 deletion
+26
-11
src/vs/workbench/services/backup/common/backupFileService.ts
src/vs/workbench/services/backup/common/backupFileService.ts
+21
-10
src/vs/workbench/services/workspace/electron-browser/workspaceEditingService.ts
...ces/workspace/electron-browser/workspaceEditingService.ts
+5
-1
未找到文件。
src/vs/workbench/services/backup/common/backupFileService.ts
浏览文件 @
4968e0a7
...
...
@@ -111,15 +111,10 @@ export class BackupFileService implements IBackupFileService {
private
impl
:
IBackupFileService
;
constructor
(
@
IWorkbenchEnvironmentService
environmentService
:
IWorkbenchEnvironmentService
,
@
IFileService
fileService
:
IFileService
@
IWorkbenchEnvironmentService
private
environmentService
:
IWorkbenchEnvironmentService
,
@
IFileService
protected
fileService
:
IFileService
)
{
const
backupWorkspaceResource
=
environmentService
.
configuration
.
backupWorkspaceResource
;
if
(
backupWorkspaceResource
)
{
this
.
impl
=
new
BackupFileServiceImpl
(
backupWorkspaceResource
,
this
.
hashPath
,
fileService
);
}
else
{
this
.
impl
=
new
InMemoryBackupFileService
(
this
.
hashPath
);
}
this
.
initialize
();
}
protected
hashPath
(
resource
:
URI
):
string
{
...
...
@@ -128,9 +123,25 @@ export class BackupFileService implements IBackupFileService {
return
hash
(
str
).
toString
(
16
);
}
initialize
(
backupWorkspaceResource
:
URI
):
void
{
private
initialize
():
void
{
const
backupWorkspaceResource
=
this
.
environmentService
.
configuration
.
backupWorkspaceResource
;
if
(
backupWorkspaceResource
)
{
this
.
impl
=
new
BackupFileServiceImpl
(
backupWorkspaceResource
,
this
.
hashPath
,
this
.
fileService
);
}
else
{
this
.
impl
=
new
InMemoryBackupFileService
(
this
.
hashPath
);
}
}
reinitialize
():
void
{
// Re-init implementation (unless we are running in-memory)
if
(
this
.
impl
instanceof
BackupFileServiceImpl
)
{
this
.
impl
.
initialize
(
backupWorkspaceResource
);
const
backupWorkspaceResource
=
this
.
environmentService
.
configuration
.
backupWorkspaceResource
;
if
(
backupWorkspaceResource
)
{
this
.
impl
.
initialize
(
backupWorkspaceResource
);
}
else
{
this
.
impl
=
new
InMemoryBackupFileService
(
this
.
hashPath
);
}
}
}
...
...
src/vs/workbench/services/workspace/electron-browser/workspaceEditingService.ts
浏览文件 @
4968e0a7
...
...
@@ -397,11 +397,15 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
const
result
=
await
this
.
windowService
.
enterWorkspace
(
path
);
if
(
result
)
{
// Migrate storage to new workspace
await
this
.
migrateStorage
(
result
.
workspace
);
// Reinitialize backup service
this
.
environmentService
.
configuration
.
backupPath
=
result
.
backupPath
;
this
.
environmentService
.
configuration
.
backupWorkspaceResource
=
result
.
backupPath
?
toBackupWorkspaceResource
(
result
.
backupPath
,
this
.
environmentService
)
:
undefined
;
if
(
this
.
backupFileService
instanceof
BackupFileService
)
{
this
.
backupFileService
.
initialize
(
toBackupWorkspaceResource
(
result
.
backupPath
!
,
this
.
environmentService
)
);
this
.
backupFileService
.
reinitialize
(
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录