Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bcba7a5d
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,体验更适合开发者的 AI 搜索 >>
提交
bcba7a5d
编写于
2月 06, 2019
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix test
上级
f9165783
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
14 deletion
+9
-14
src/vs/platform/backup/electron-main/backupMainService.ts
src/vs/platform/backup/electron-main/backupMainService.ts
+3
-0
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
...tform/backup/test/electron-main/backupMainService.test.ts
+6
-14
未找到文件。
src/vs/platform/backup/electron-main/backupMainService.ts
浏览文件 @
bcba7a5d
...
@@ -252,6 +252,7 @@ export class BackupMainService implements IBackupMainService {
...
@@ -252,6 +252,7 @@ export class BackupMainService implements IBackupMainService {
// Validate Workspaces
// Validate Workspaces
for
(
let
workspace
of
rootWorkspaces
)
{
for
(
let
workspace
of
rootWorkspaces
)
{
if
(
!
isWorkspaceIdentifier
(
workspace
))
{
if
(
!
isWorkspaceIdentifier
(
workspace
))
{
console
.
log
(
'
not a workspace identifer
'
);
return
[];
// wrong format, skip all entries
return
[];
// wrong format, skip all entries
}
}
...
@@ -266,10 +267,12 @@ export class BackupMainService implements IBackupMainService {
...
@@ -266,10 +267,12 @@ export class BackupMainService implements IBackupMainService {
if
(
workspace
.
configPath
.
scheme
!==
Schemas
.
file
||
await
exists
(
workspace
.
configPath
.
fsPath
))
{
if
(
workspace
.
configPath
.
scheme
!==
Schemas
.
file
||
await
exists
(
workspace
.
configPath
.
fsPath
))
{
result
.
push
(
workspace
);
result
.
push
(
workspace
);
}
else
{
}
else
{
console
.
log
(
'
target workspace missing
'
);
// If the workspace has backups, but the target workspace is missing, convert backups to empty ones
// If the workspace has backups, but the target workspace is missing, convert backups to empty ones
await
this
.
convertToEmptyWindowBackup
(
backupPath
);
await
this
.
convertToEmptyWindowBackup
(
backupPath
);
}
}
}
else
{
}
else
{
console
.
log
(
'
no backups
'
);
await
this
.
deleteStaleBackup
(
backupPath
);
await
this
.
deleteStaleBackup
(
backupPath
);
}
}
}
}
...
...
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
浏览文件 @
bcba7a5d
...
@@ -296,23 +296,13 @@ suite('BackupMainService', () => {
...
@@ -296,23 +296,13 @@ suite('BackupMainService', () => {
test
(
'
migrate storage file
'
,
async
()
=>
{
test
(
'
migrate storage file
'
,
async
()
=>
{
let
folderPath
=
path
.
join
(
parentDir
,
'
f1
'
);
let
folderPath
=
path
.
join
(
parentDir
,
'
f1
'
);
ensureFolderExists
(
URI
.
file
(
folderPath
));
const
backupFolderPath
=
service
.
toLegacyBackupPath
(
folderPath
);
const
backupFolderPath
=
service
.
toLegacyBackupPath
(
folderPath
);
if
(
!
fs
.
existsSync
(
backupFolderPath
))
{
await
createBackupFolder
(
backupFolderPath
);
fs
.
mkdirSync
(
backupFolderPath
);
fs
.
mkdirSync
(
path
.
join
(
backupFolderPath
,
Schemas
.
file
));
await
pfs
.
writeFile
(
path
.
join
(
backupFolderPath
,
Schemas
.
file
,
'
unsaved1.txt
'
),
'
Legacy
'
);
}
let
workspacePath
=
path
.
join
(
parentDir
,
'
f2.code-workspace
'
);
let
workspacePath
=
path
.
join
(
parentDir
,
'
f2.code-workspace
'
);
const
workspace
=
toWorkspace
(
workspacePath
);
const
workspace
=
toWorkspace
(
workspacePath
);
await
ensureWorkspaceExists
(
workspace
);
const
backupWorkspacePath
=
service
.
toBackupPath
(
workspace
.
id
);
if
(
!
fs
.
existsSync
(
backupWorkspacePath
))
{
fs
.
mkdirSync
(
backupWorkspacePath
);
fs
.
mkdirSync
(
path
.
join
(
backupWorkspacePath
,
Schemas
.
file
));
await
pfs
.
writeFile
(
path
.
join
(
backupWorkspacePath
,
Schemas
.
file
,
'
unsaved2.txt
'
),
'
Legacy
'
);
}
const
workspacesJson
=
{
rootWorkspaces
:
[{
id
:
workspace
.
id
,
configPath
:
workspacePath
}],
folderWorkspaces
:
[
folderPath
],
emptyWorkspaces
:
[]
};
const
workspacesJson
=
{
rootWorkspaces
:
[{
id
:
workspace
.
id
,
configPath
:
workspacePath
}],
folderWorkspaces
:
[
folderPath
],
emptyWorkspaces
:
[]
};
await
pfs
.
writeFile
(
backupWorkspacesPath
,
JSON
.
stringify
(
workspacesJson
));
await
pfs
.
writeFile
(
backupWorkspacesPath
,
JSON
.
stringify
(
workspacesJson
));
...
@@ -320,7 +310,9 @@ suite('BackupMainService', () => {
...
@@ -320,7 +310,9 @@ suite('BackupMainService', () => {
const
content
=
await
pfs
.
readFile
(
backupWorkspacesPath
,
'
utf-8
'
);
const
content
=
await
pfs
.
readFile
(
backupWorkspacesPath
,
'
utf-8
'
);
const
json
=
(
<
IBackupWorkspacesFormat
>
JSON
.
parse
(
content
));
const
json
=
(
<
IBackupWorkspacesFormat
>
JSON
.
parse
(
content
));
assert
.
deepEqual
(
json
.
folderURIWorkspaces
,
[
URI
.
file
(
folderPath
).
toString
()]);
assert
.
deepEqual
(
json
.
folderURIWorkspaces
,
[
URI
.
file
(
folderPath
).
toString
()]);
assert
.
deepEqual
(
json
.
rootURIWorkspaces
,
[{
id
:
workspace
.
id
,
configPath
:
URI
.
file
(
workspacePath
).
toString
()
}]);
assert
.
deepEqual
(
json
.
rootURIWorkspaces
,
[{
id
:
workspace
.
id
,
configURIPath
:
URI
.
file
(
workspacePath
).
toString
()
}]);
assertEqualUris
(
service
.
getWorkspaceBackups
().
map
(
w
=>
w
.
configPath
),
[
workspace
.
configPath
]);
});
});
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录