Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5658b326
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,发现更多精彩内容 >>
提交
5658b326
编写于
11月 30, 2016
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Backup related tests on Mac
上级
aa099fe8
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
src/vs/platform/backup/electron-main/backupMainService.ts
src/vs/platform/backup/electron-main/backupMainService.ts
+1
-1
src/vs/workbench/services/backup/test/backupFileService.test.ts
.../workbench/services/backup/test/backupFileService.test.ts
+5
-5
未找到文件。
src/vs/platform/backup/electron-main/backupMainService.ts
浏览文件 @
5658b326
...
@@ -135,7 +135,7 @@ export class BackupMainService implements IBackupMainService {
...
@@ -135,7 +135,7 @@ export class BackupMainService implements IBackupMainService {
}
}
protected
toBackupPath
(
workspacePath
:
string
):
string
{
protected
toBackupPath
(
workspacePath
:
string
):
string
{
const
workspaceHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
workspacePath
).
digest
(
'
hex
'
);
const
workspaceHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
workspacePath
.
toLowerCase
()
).
digest
(
'
hex
'
);
return
path
.
join
(
this
.
backupHome
,
workspaceHash
);
return
path
.
join
(
this
.
backupHome
,
workspaceHash
);
}
}
...
...
src/vs/workbench/services/backup/test/backupFileService.test.ts
浏览文件 @
5658b326
...
@@ -56,7 +56,7 @@ const barFile = Uri.file(platform.isWindows ? 'c:\\bar' : '/bar');
...
@@ -56,7 +56,7 @@ const barFile = Uri.file(platform.isWindows ? 'c:\\bar' : '/bar');
const
untitledFile
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
untitledFile
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
fooBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
fooFile
.
fsPath
).
digest
(
'
hex
'
));
const
fooBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
fooFile
.
fsPath
).
digest
(
'
hex
'
));
const
barBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
barFile
.
fsPath
).
digest
(
'
hex
'
));
const
barBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
file
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
barFile
.
fsPath
).
digest
(
'
hex
'
));
const
untitledBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
untitled
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
untitledFile
.
fsPath
).
digest
(
'
hex
'
));
const
untitledBackupPath
=
path
.
join
(
workspaceBackupPath
,
'
untitled
'
,
crypto
.
createHash
(
'
md5
'
).
update
(
untitledFile
.
fsPath
.
toLowerCase
()
).
digest
(
'
hex
'
));
suite
(
'
BackupFileService
'
,
()
=>
{
suite
(
'
BackupFileService
'
,
()
=>
{
let
service
:
TestBackupFileService
;
let
service
:
TestBackupFileService
;
...
@@ -90,8 +90,8 @@ suite('BackupFileService', () => {
...
@@ -90,8 +90,8 @@ suite('BackupFileService', () => {
test
(
'
getBackupResource should get the correct backup path for untitled files
'
,
()
=>
{
test
(
'
getBackupResource should get the correct backup path for untitled files
'
,
()
=>
{
// Format should be: <backupHome>/<workspaceHash>/<scheme>/<filePath>
// Format should be: <backupHome>/<workspaceHash>/<scheme>/<filePath>
const
backupResource
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
backupResource
=
Uri
.
from
({
scheme
:
'
untitled
'
,
path
:
'
Untitled-1
'
});
const
workspaceHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
workspaceResource
.
fsPath
).
digest
(
'
hex
'
);
const
workspaceHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
workspaceResource
.
fsPath
.
toLowerCase
()
).
digest
(
'
hex
'
);
const
filePathHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
backupResource
.
fsPath
).
digest
(
'
hex
'
);
const
filePathHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
backupResource
.
fsPath
.
toLowerCase
()
).
digest
(
'
hex
'
);
const
expectedPath
=
Uri
.
file
(
path
.
join
(
backupHome
,
workspaceHash
,
'
untitled
'
,
filePathHash
)).
fsPath
;
const
expectedPath
=
Uri
.
file
(
path
.
join
(
backupHome
,
workspaceHash
,
'
untitled
'
,
filePathHash
)).
fsPath
;
assert
.
equal
(
service
.
getBackupResource
(
backupResource
).
fsPath
,
expectedPath
);
assert
.
equal
(
service
.
getBackupResource
(
backupResource
).
fsPath
,
expectedPath
);
});
});
...
@@ -103,11 +103,11 @@ suite('BackupFileService', () => {
...
@@ -103,11 +103,11 @@ suite('BackupFileService', () => {
}
}
if
(
platform
.
isMacintosh
)
{
if
(
platform
.
isMacintosh
)
{
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
/foo
'
))
,
service
.
getBackupResource
(
Uri
.
file
(
'
/FOO
'
))
);
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
/foo
'
))
.
fsPath
,
service
.
getBackupResource
(
Uri
.
file
(
'
/FOO
'
)).
fsPath
);
}
}
if
(
platform
.
isWindows
)
{
if
(
platform
.
isWindows
)
{
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
c:
\\
foo
'
))
,
service
.
getBackupResource
(
Uri
.
file
(
'
C:
\\
FOO
'
))
);
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
c:
\\
foo
'
))
.
fsPath
,
service
.
getBackupResource
(
Uri
.
file
(
'
C:
\\
FOO
'
)).
fsPath
);
}
}
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录