Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
54e03296
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,发现更多精彩内容 >>
提交
54e03296
编写于
7月 25, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - remove strings.localeCompare for native localeCompare
上级
b82d730c
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
11 addition
and
27 deletion
+11
-27
src/vs/base/common/comparers.ts
src/vs/base/common/comparers.ts
+1
-1
src/vs/base/common/strings.ts
src/vs/base/common/strings.ts
+0
-4
src/vs/base/test/common/strings.test.ts
src/vs/base/test/common/strings.test.ts
+0
-9
src/vs/editor/contrib/quickOpen/browser/quickCommand.ts
src/vs/editor/contrib/quickOpen/browser/quickCommand.ts
+1
-2
src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
+3
-3
src/vs/workbench/parts/markers/common/markersModel.ts
src/vs/workbench/parts/markers/common/markersModel.ts
+1
-2
src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
+1
-2
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
...vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+3
-3
src/vs/workbench/parts/search/browser/searchResultsView.ts
src/vs/workbench/parts/search/browser/searchResultsView.ts
+1
-1
未找到文件。
src/vs/base/common/comparers.ts
浏览文件 @
54e03296
...
...
@@ -49,7 +49,7 @@ export function compareAnything(one: string, other: string, lookFor: string): nu
}
// Compare by name
return
strings
.
localeCompare
(
elementAName
,
elementBName
);
return
elementAName
.
localeCompare
(
elementBName
);
}
export
function
compareByPrefix
(
one
:
string
,
other
:
string
,
lookFor
:
string
):
number
{
...
...
src/vs/base/common/strings.ts
浏览文件 @
54e03296
...
...
@@ -294,10 +294,6 @@ export function compare(a: string, b: string): number {
}
}
export
function
localeCompare
(
strA
:
string
,
strB
:
string
):
number
{
return
strA
.
localeCompare
(
strB
);
}
function
isAsciiChar
(
code
:
number
):
boolean
{
return
(
code
>=
97
&&
code
<=
122
)
||
(
code
>=
65
&&
code
<=
90
);
}
...
...
src/vs/base/test/common/strings.test.ts
浏览文件 @
54e03296
...
...
@@ -135,15 +135,6 @@ suite('Strings', () => {
assert
.
strictEqual
(
'
'
.
trim
(),
''
);
});
test
(
'
localeCompare
'
,
function
()
{
assert
.
strictEqual
(
strings
.
localeCompare
(
'
a
'
,
'
a
'
),
'
a
'
.
localeCompare
(
'
a
'
));
assert
.
strictEqual
(
strings
.
localeCompare
(
'
A
'
,
'
A
'
),
'
A
'
.
localeCompare
(
'
A
'
));
assert
.
strictEqual
(
strings
.
localeCompare
(
'
All
'
,
'
A
'
),
'
All
'
.
localeCompare
(
'
A
'
));
assert
.
strictEqual
(
strings
.
localeCompare
(
'
A
'
,
'
All
'
),
'
A
'
.
localeCompare
(
'
All
'
));
assert
.
strictEqual
(
strings
.
localeCompare
(
'
A
'
,
'
a
'
),
'
A
'
.
localeCompare
(
'
a
'
));
assert
.
strictEqual
(
strings
.
localeCompare
(
'
a
'
,
'
A
'
),
'
a
'
.
localeCompare
(
'
A
'
));
});
test
(
'
appendWithLimit
'
,
function
()
{
assert
.
strictEqual
(
strings
.
appendWithLimit
(
'
ab
'
,
'
cd
'
,
100
),
'
abcd
'
);
assert
.
strictEqual
(
strings
.
appendWithLimit
(
'
ab
'
,
'
cd
'
,
2
),
'
...cd
'
);
...
...
src/vs/editor/contrib/quickOpen/browser/quickCommand.ts
浏览文件 @
54e03296
...
...
@@ -8,7 +8,6 @@ import * as nls from 'vs/nls';
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
matchesFuzzy
}
from
'
vs/base/common/filters
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IContext
,
IHighlight
,
QuickOpenEntryGroup
,
QuickOpenModel
}
from
'
vs/base/parts/quickopen/browser/quickOpenModel
'
;
import
{
IAutoFocus
,
Mode
}
from
'
vs/base/parts/quickopen/common/quickOpen
'
;
...
...
@@ -88,7 +87,7 @@ export class QuickCommandAction extends BaseEditorQuickOpenAction {
let
elementAName
=
elementA
.
getLabel
().
toLowerCase
();
let
elementBName
=
elementB
.
getLabel
().
toLowerCase
();
return
strings
.
localeCompare
(
elementAName
,
elementBName
);
return
elementAName
.
localeCompare
(
elementBName
);
}
_editorActionsToEntries
(
actions
:
IAction
[],
searchValue
:
string
):
EditorActionCommandEntry
[]
{
...
...
src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
浏览文件 @
54e03296
...
...
@@ -268,7 +268,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
let
elementBName
=
elementB
.
getLabel
().
toLowerCase
();
// Compare by name
let
r
=
strings
.
localeCompare
(
elementAName
,
elementBName
);
let
r
=
elementAName
.
localeCompare
(
elementBName
);
if
(
r
!==
0
)
{
return
r
;
}
...
...
@@ -287,7 +287,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
// Sort by type first if scoped search
let
elementAType
=
elementA
.
getType
();
let
elementBType
=
elementB
.
getType
();
let
r
=
strings
.
localeCompare
(
elementAType
,
elementBType
);
let
r
=
elementAType
.
localeCompare
(
elementBType
);
if
(
r
!==
0
)
{
return
r
;
}
...
...
@@ -298,7 +298,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
let
elementBName
=
elementB
.
getLabel
().
toLowerCase
();
// Compare by name
let
r
=
strings
.
localeCompare
(
elementAName
,
elementBName
);
let
r
=
elementAName
.
localeCompare
(
elementBName
);
if
(
r
!==
0
)
{
return
r
;
}
...
...
src/vs/workbench/parts/markers/common/markersModel.ts
浏览文件 @
54e03296
...
...
@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
types
from
'
vs/base/common/types
'
;
import
*
as
Map
from
'
vs/base/common/map
'
;
...
...
@@ -159,7 +158,7 @@ export class MarkersModel {
if
(
b
.
statistics
.
errors
===
0
&&
a
.
statistics
.
errors
>
0
)
{
return
-
1
;
}
return
strings
.
localeCompare
(
a
.
path
,
b
.
path
)
||
strings
.
localeCompare
(
a
.
name
,
b
.
name
);
return
a
.
path
.
localeCompare
(
b
.
path
)
||
a
.
name
.
localeCompare
(
b
.
name
);
});
}
...
...
src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
浏览文件 @
54e03296
...
...
@@ -11,7 +11,6 @@ import nls = require('vs/nls');
import
arrays
=
require
(
'
vs/base/common/arrays
'
);
import
types
=
require
(
'
vs/base/common/types
'
);
import
{
language
,
LANGUAGE_DEFAULT
}
from
'
vs/base/common/platform
'
;
import
strings
=
require
(
'
vs/base/common/strings
'
);
import
{
IAction
,
Action
}
from
'
vs/base/common/actions
'
;
import
{
toErrorMessage
}
from
'
vs/base/common/errors
'
;
import
{
Mode
,
IEntryRunContext
,
IAutoFocus
}
from
'
vs/base/parts/quickopen/common/quickOpen
'
;
...
...
@@ -277,7 +276,7 @@ export class CommandsHandler extends QuickOpenHandler {
entries
=
arrays
.
distinct
(
entries
,
(
entry
)
=>
entry
.
getLabel
()
+
entry
.
getGroupLabel
());
// Sort by name
entries
=
entries
.
sort
((
elementA
,
elementB
)
=>
strings
.
localeCompare
(
elementA
.
getLabel
().
toLowerCase
(),
elementB
.
getLabel
().
toLowerCase
()));
entries
=
entries
.
sort
((
elementA
,
elementB
)
=>
elementA
.
getLabel
().
toLowerCase
().
localeCompare
(
elementB
.
getLabel
().
toLowerCase
()));
return
TPromise
.
as
(
new
QuickOpenModel
(
entries
));
}
...
...
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
浏览文件 @
54e03296
...
...
@@ -149,7 +149,7 @@ class OutlineModel extends QuickOpenModel {
let
elementBName
=
elementB
.
getLabel
().
toLowerCase
();
// Compare by name
let
r
=
strings
.
localeCompare
(
elementAName
,
elementBName
);
let
r
=
elementAName
.
localeCompare
(
elementBName
);
if
(
r
!==
0
)
{
return
r
;
}
...
...
@@ -178,7 +178,7 @@ class OutlineModel extends QuickOpenModel {
// Sort by type first if scoped search
let
elementAType
=
elementA
.
getType
();
let
elementBType
=
elementB
.
getType
();
let
r
=
strings
.
localeCompare
(
elementAType
,
elementBType
);
let
r
=
elementAType
.
localeCompare
(
elementBType
);
if
(
r
!==
0
)
{
return
r
;
}
...
...
@@ -189,7 +189,7 @@ class OutlineModel extends QuickOpenModel {
let
elementBName
=
elementB
.
getLabel
().
toLowerCase
();
// Compare by name
r
=
strings
.
localeCompare
(
elementAName
,
elementBName
);
r
=
elementAName
.
localeCompare
(
elementBName
);
if
(
r
!==
0
)
{
return
r
;
}
...
...
src/vs/workbench/parts/search/browser/searchResultsView.ts
浏览文件 @
54e03296
...
...
@@ -75,7 +75,7 @@ export class SearchSorter implements ISorter {
public
compare
(
tree
:
ITree
,
elementA
:
FileMatchOrMatch
,
elementB
:
FileMatchOrMatch
):
number
{
if
(
elementA
instanceof
FileMatch
&&
elementB
instanceof
FileMatch
)
{
return
strings
.
localeCompare
(
elementA
.
resource
().
fsPath
,
elementB
.
resource
().
fsPath
)
||
strings
.
localeCompare
(
elementA
.
name
(),
elementB
.
name
());
return
elementA
.
resource
().
fsPath
.
localeCompare
(
elementB
.
resource
().
fsPath
)
||
elementA
.
name
().
localeCompare
(
elementB
.
name
());
}
if
(
elementA
instanceof
Match
&&
elementB
instanceof
Match
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录