Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
896dd922
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 搜索 >>
提交
896dd922
编写于
12月 08, 2016
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix remaining case where workspace paths are lower cased
Fixes #16829
上级
2b288227
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
13 deletion
+14
-13
src/vs/platform/backup/electron-main/backupMainService.ts
src/vs/platform/backup/electron-main/backupMainService.ts
+5
-5
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
...tform/backup/test/electron-main/backupMainService.test.ts
+9
-8
未找到文件。
src/vs/platform/backup/electron-main/backupMainService.ts
浏览文件 @
896dd922
...
...
@@ -117,16 +117,16 @@ export class BackupMainService implements IBackupMainService {
this
.
validateBackupWorkspaces
(
backups
);
}
protected
sanitiz
eFolderWorkspaces
(
backups
:
IBackupWorkspacesFormat
):
void
{
//
Merge duplicates for folder workspaces, don't worry about cleaning them up as they will
// be removed when there are no backups.
backups
.
folderWorkspaces
=
arrays
.
distinct
(
backups
.
folderWorkspaces
.
map
(
w
=>
this
.
sanitizePath
(
w
)
));
protected
dedup
eFolderWorkspaces
(
backups
:
IBackupWorkspacesFormat
):
void
{
//
De-duplicate folder workspaces, don't worry about cleaning them up any duplicates as
//
they will
be removed when there are no backups.
backups
.
folderWorkspaces
=
arrays
.
distinct
(
backups
.
folderWorkspaces
,
ws
=>
this
.
sanitizePath
(
ws
));
}
private
validateBackupWorkspaces
(
backups
:
IBackupWorkspacesFormat
):
void
{
const
staleBackupWorkspaces
:
{
workspaceIdentifier
:
string
;
backupPath
:
string
;
isEmptyWorkspace
:
boolean
}[]
=
[];
this
.
sanitiz
eFolderWorkspaces
(
backups
);
this
.
dedup
eFolderWorkspaces
(
backups
);
backups
.
folderWorkspaces
.
forEach
(
workspacePath
=>
{
const
backupPath
=
path
.
join
(
this
.
backupHome
,
this
.
getWorkspaceHash
(
workspacePath
));
...
...
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
浏览文件 @
896dd922
...
...
@@ -36,8 +36,8 @@ class TestBackupMainService extends BackupMainService {
super
.
loadSync
();
}
public
sanitiz
eFolderWorkspaces
(
backups
:
IBackupWorkspacesFormat
):
void
{
super
.
sanitiz
eFolderWorkspaces
(
backups
);
public
dedup
eFolderWorkspaces
(
backups
:
IBackupWorkspacesFormat
):
void
{
super
.
dedup
eFolderWorkspaces
(
backups
);
}
public
toBackupPath
(
workspacePath
:
string
):
string
{
...
...
@@ -209,24 +209,25 @@ suite('BackupMainService', () => {
});
});
suite
(
'
sanitiz
eFolderWorkspaces
'
,
()
=>
{
test
(
'
should
merge same cased path
s on Windows and Mac
'
,
()
=>
{
suite
(
'
dedup
eFolderWorkspaces
'
,
()
=>
{
test
(
'
should
ignore duplicate
s on Windows and Mac
'
,
()
=>
{
// Skip test on Linux
if
(
platform
.
isLinux
)
{
return
;
}
const
backups
:
IBackupWorkspacesFormat
=
{
folderWorkspaces
:
platform
.
isWindows
?
[
'
c:
\\
foo
'
,
'
C:
\\
FOO
'
,
'
c:
\\
FOO
'
]
:
[
'
/foo
'
,
'
/FOO
'
],
folderWorkspaces
:
platform
.
isWindows
?
[
'
c:
\\
FOO
'
,
'
C:
\\
FOO
'
,
'
c:
\\
foo
'
]
:
[
'
/FOO
'
,
'
/foo
'
],
emptyWorkspaces
:
[]
};
service
.
sanitiz
eFolderWorkspaces
(
backups
);
service
.
dedup
eFolderWorkspaces
(
backups
);
assert
.
equal
(
backups
.
folderWorkspaces
.
length
,
1
);
if
(
platform
.
isWindows
)
{
assert
.
deepEqual
(
backups
.
folderWorkspaces
,
[
'
c:
\\
foo
'
]
);
assert
.
deepEqual
(
backups
.
folderWorkspaces
,
[
'
c:
\\
FOO
'
],
'
should return the first duplicated entry
'
);
}
else
{
assert
.
deepEqual
(
backups
.
folderWorkspaces
,
[
'
/
foo
'
]
);
assert
.
deepEqual
(
backups
.
folderWorkspaces
,
[
'
/
FOO
'
],
'
should return the first duplicated entry
'
);
}
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录