Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9dea00d9
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,发现更多精彩内容 >>
提交
9dea00d9
编写于
11月 30, 2016
作者:
D
Daniel Imms
提交者:
GitHub
11月 30, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15910 from Microsoft/tyriar/hot_exit/15862
Ensure backup paths ignore case on windows and mac
上级
424d032a
dc298f06
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
5 deletion
+39
-5
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
...tform/backup/test/electron-main/backupMainService.test.ts
+15
-0
src/vs/workbench/services/backup/node/backupFileService.ts
src/vs/workbench/services/backup/node/backupFileService.ts
+9
-5
src/vs/workbench/services/backup/test/backupFileService.test.ts
.../workbench/services/backup/test/backupFileService.test.ts
+15
-0
未找到文件。
src/vs/platform/backup/test/electron-main/backupMainService.test.ts
浏览文件 @
9dea00d9
...
...
@@ -160,4 +160,19 @@ suite('BackupMainService', () => {
done
();
});
test
(
'
toBackupPath ignores case on Windows and Mac
'
,
()
=>
{
// Skip test on Linux
if
(
platform
.
isLinux
)
{
return
;
}
if
(
platform
.
isMacintosh
)
{
assert
.
equal
(
service
.
toBackupPath
(
'
/foo
'
),
service
.
toBackupPath
(
'
/FOO
'
));
}
if
(
platform
.
isWindows
)
{
assert
.
equal
(
service
.
toBackupPath
(
'
c:
\\
foo
'
),
service
.
toBackupPath
(
'
C:
\\
FOO
'
));
}
});
});
\ No newline at end of file
src/vs/workbench/services/backup/node/backupFileService.ts
浏览文件 @
9dea00d9
...
...
@@ -8,6 +8,7 @@
import
*
as
path
from
'
path
'
;
import
*
as
crypto
from
'
crypto
'
;
import
pfs
=
require
(
'
vs/base/node/pfs
'
);
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
Uri
from
'
vs/base/common/uri
'
;
import
{
IBackupFileService
,
BACKUP_FILE_UPDATE_OPTIONS
}
from
'
vs/workbench/services/backup/common/backup
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
...
...
@@ -100,8 +101,7 @@ export class BackupFileService implements IBackupFileService {
this
.
workspacesJsonPath
=
environmentService
.
backupWorkspacesPath
;
if
(
this
.
currentWorkspace
)
{
const
workspaceHash
=
crypto
.
createHash
(
'
md5
'
).
update
(
this
.
currentWorkspace
.
fsPath
).
digest
(
'
hex
'
);
this
.
backupWorkspacePath
=
path
.
join
(
this
.
backupHome
,
workspaceHash
);
this
.
backupWorkspacePath
=
path
.
join
(
this
.
backupHome
,
this
.
hashPath
(
this
.
currentWorkspace
));
}
this
.
ready
=
this
.
init
();
...
...
@@ -212,9 +212,13 @@ export class BackupFileService implements IBackupFileService {
return
null
;
}
const
backupName
=
crypto
.
createHash
(
'
md5
'
).
update
(
resource
.
fsPath
).
digest
(
'
hex
'
);
const
backupPath
=
path
.
join
(
this
.
backupWorkspacePath
,
resource
.
scheme
,
backupName
);
return
Uri
.
file
(
path
.
join
(
this
.
backupWorkspacePath
,
resource
.
scheme
,
this
.
hashPath
(
resource
)));
}
private
hashPath
(
resource
:
Uri
):
string
{
// Windows and Mac paths are case insensitive, we want backups to be too
const
caseAwarePath
=
platform
.
isWindows
||
platform
.
isMacintosh
?
resource
.
fsPath
.
toLowerCase
()
:
resource
.
fsPath
;
return
Uri
.
file
(
backupPath
);
return
crypto
.
createHash
(
'
md5
'
).
update
(
caseAwarePath
).
digest
(
'
hex
'
);
}
}
\ No newline at end of file
src/vs/workbench/services/backup/test/backupFileService.test.ts
浏览文件 @
9dea00d9
...
...
@@ -96,6 +96,21 @@ suite('BackupFileService', () => {
assert
.
equal
(
service
.
getBackupResource
(
backupResource
).
fsPath
,
expectedPath
);
});
test
(
'
getBackupResource should ignore case on Windows and Mac
'
,
()
=>
{
// Skip test on Linux
if
(
platform
.
isLinux
)
{
return
;
}
if
(
platform
.
isMacintosh
)
{
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
/foo
'
)),
service
.
getBackupResource
(
Uri
.
file
(
'
/FOO
'
)));
}
if
(
platform
.
isWindows
)
{
assert
.
equal
(
service
.
getBackupResource
(
Uri
.
file
(
'
c:
\\
foo
'
)),
service
.
getBackupResource
(
Uri
.
file
(
'
C:
\\
FOO
'
)));
}
});
test
(
'
doesTextFileHaveBackup should return whether a backup resource exists
'
,
done
=>
{
pfs
.
mkdirp
(
path
.
dirname
(
fooBackupPath
)).
then
(()
=>
{
fs
.
writeFileSync
(
fooBackupPath
,
'
foo
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录