Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
43b5deb7
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,发现更多精彩内容 >>
提交
43b5deb7
编写于
5月 08, 2020
作者:
L
Leila Pearson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Address PR comments.
上级
3e0dcaef
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
25 deletion
+21
-25
src/vs/base/common/comparers.ts
src/vs/base/common/comparers.ts
+21
-25
未找到文件。
src/vs/base/common/comparers.ts
浏览文件 @
43b5deb7
...
...
@@ -58,27 +58,17 @@ export function compareFileNamesNumeric(one: string | null, other: string | null
let
result
;
// Check for name differences, comparing numbers numerically instead of alphabetically.
result
=
co
llatorNumeric
.
compare
(
oneName
,
otherName
);
result
=
co
mpareAndDisambiguateByLength
(
collatorNumeric
,
oneName
,
otherName
);
if
(
result
!==
0
)
{
return
result
;
}
// Using the numeric option in the collator will make compare(`foo1`, `foo01`) === 0. Sort the shorter name first.
if
(
oneName
.
length
!==
otherName
.
length
)
{
return
oneName
.
length
<
otherName
.
length
?
-
1
:
1
;
}
// Check for case insensitive extension differences, comparing numbers numerically instead of alphabetically.
result
=
co
llatorNumericCaseInsensitive
.
compare
(
oneExtension
,
otherExtension
);
result
=
co
mpareAndDisambiguateByLength
(
collatorNumericCaseInsensitive
,
oneExtension
,
otherExtension
);
if
(
result
!==
0
)
{
return
result
;
}
// If extensions are numerically equal but not equal in length, sort the shorter extension first.
if
(
oneExtension
.
length
!==
otherExtension
.
length
)
{
return
oneExtension
.
length
<
otherExtension
.
length
?
-
1
:
1
;
}
// Disambiguate the extension case if needed.
if
(
oneExtension
!==
otherExtension
)
{
return
collatorNumeric
.
compare
(
oneExtension
,
otherExtension
);
...
...
@@ -142,27 +132,17 @@ export function compareFileExtensionsNumeric(one: string | null, other: string |
let
result
;
// Check for extension differences, ignoring differences in case and comparing numbers numerically.
result
=
co
llatorNumericCaseInsensitive
.
compare
(
oneExtension
,
otherExtension
);
result
=
co
mpareAndDisambiguateByLength
(
collatorNumericCaseInsensitive
,
oneExtension
,
otherExtension
);
if
(
result
!==
0
)
{
return
result
;
}
// Disambiguate equivalent numbers in extensions.
if
(
oneExtension
.
length
!==
otherExtension
.
length
)
{
return
oneExtension
.
length
<
otherExtension
.
length
?
-
1
:
1
;
}
// Compare names.
result
=
co
llatorNumeric
.
compare
(
oneName
,
otherName
);
result
=
co
mpareAndDisambiguateByLength
(
collatorNumeric
,
oneName
,
otherName
);
if
(
result
!==
0
)
{
return
result
;
}
// Disambiguate equivalent numbers in names.
if
(
oneName
.
length
!==
otherName
.
length
)
{
return
oneName
.
length
<
otherName
.
length
?
-
1
:
1
;
}
// Disambiguate extension case if needed.
if
(
oneExtension
!==
otherExtension
)
{
return
collatorNumeric
.
compare
(
oneExtension
,
otherExtension
);
...
...
@@ -172,7 +152,7 @@ export function compareFileExtensionsNumeric(one: string | null, other: string |
}
/** Extracts the name and extension from a full filename, with optional special handling for dotfiles */
export
function
extractNameAndExtension
(
str
?:
string
|
null
,
dotfilesAsNames
=
false
):
[
string
,
string
]
{
function
extractNameAndExtension
(
str
?:
string
|
null
,
dotfilesAsNames
=
false
):
[
string
,
string
]
{
const
match
=
str
?
FileNameMatch
.
exec
(
str
)
as
Array
<
string
>
:
([]
as
Array
<
string
>
);
let
result
:
[
string
,
string
]
=
[(
match
&&
match
[
1
])
||
''
,
(
match
&&
match
[
3
])
||
''
];
...
...
@@ -186,6 +166,22 @@ export function extractNameAndExtension(str?: string | null, dotfilesAsNames = f
return
result
;
}
function
compareAndDisambiguateByLength
(
collator
:
Intl
.
Collator
,
one
:
string
,
other
:
string
)
{
// Check for differences
let
result
=
collator
.
compare
(
one
,
other
);
if
(
result
!==
0
)
{
return
result
;
}
// In a numeric comparison, `foo1` and `foo01` will compare as equivalent.
// Disambiguate by sorting the shorter string first.
if
(
one
.
length
!==
other
.
length
)
{
return
one
.
length
<
other
.
length
?
-
1
:
1
;
}
return
0
;
}
function
comparePathComponents
(
one
:
string
,
other
:
string
,
caseSensitive
=
false
):
number
{
if
(
!
caseSensitive
)
{
one
=
one
&&
one
.
toLowerCase
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录