提交 54e03296 编写于 作者: J Johannes Rieken

debt - remove strings.localeCompare for native localeCompare

上级 b82d730c
...@@ -49,7 +49,7 @@ export function compareAnything(one: string, other: string, lookFor: string): nu ...@@ -49,7 +49,7 @@ export function compareAnything(one: string, other: string, lookFor: string): nu
} }
// Compare by name // Compare by name
return strings.localeCompare(elementAName, elementBName); return elementAName.localeCompare(elementBName);
} }
export function compareByPrefix(one: string, other: string, lookFor: string): number { export function compareByPrefix(one: string, other: string, lookFor: string): number {
......
...@@ -294,10 +294,6 @@ export function compare(a: string, b: string): number { ...@@ -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 { function isAsciiChar(code: number): boolean {
return (code >= 97 && code <= 122) || (code >= 65 && code <= 90); return (code >= 97 && code <= 122) || (code >= 65 && code <= 90);
} }
......
...@@ -135,15 +135,6 @@ suite('Strings', () => { ...@@ -135,15 +135,6 @@ suite('Strings', () => {
assert.strictEqual(' '.trim(), ''); 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 () { test('appendWithLimit', function () {
assert.strictEqual(strings.appendWithLimit('ab', 'cd', 100), 'abcd'); assert.strictEqual(strings.appendWithLimit('ab', 'cd', 100), 'abcd');
assert.strictEqual(strings.appendWithLimit('ab', 'cd', 2), '...cd'); assert.strictEqual(strings.appendWithLimit('ab', 'cd', 2), '...cd');
......
...@@ -8,7 +8,6 @@ import * as nls from 'vs/nls'; ...@@ -8,7 +8,6 @@ import * as nls from 'vs/nls';
import {IAction} from 'vs/base/common/actions'; import {IAction} from 'vs/base/common/actions';
import {onUnexpectedError} from 'vs/base/common/errors'; import {onUnexpectedError} from 'vs/base/common/errors';
import {matchesFuzzy} from 'vs/base/common/filters'; import {matchesFuzzy} from 'vs/base/common/filters';
import * as strings from 'vs/base/common/strings';
import {TPromise} from 'vs/base/common/winjs.base'; import {TPromise} from 'vs/base/common/winjs.base';
import {IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {IAutoFocus, Mode} from 'vs/base/parts/quickopen/common/quickOpen'; import {IAutoFocus, Mode} from 'vs/base/parts/quickopen/common/quickOpen';
...@@ -88,7 +87,7 @@ export class QuickCommandAction extends BaseEditorQuickOpenAction { ...@@ -88,7 +87,7 @@ export class QuickCommandAction extends BaseEditorQuickOpenAction {
let elementAName = elementA.getLabel().toLowerCase(); let elementAName = elementA.getLabel().toLowerCase();
let elementBName = elementB.getLabel().toLowerCase(); let elementBName = elementB.getLabel().toLowerCase();
return strings.localeCompare(elementAName, elementBName); return elementAName.localeCompare(elementBName);
} }
_editorActionsToEntries(actions: IAction[], searchValue: string): EditorActionCommandEntry[] { _editorActionsToEntries(actions: IAction[], searchValue: string): EditorActionCommandEntry[] {
......
...@@ -268,7 +268,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction { ...@@ -268,7 +268,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
let elementBName = elementB.getLabel().toLowerCase(); let elementBName = elementB.getLabel().toLowerCase();
// Compare by name // Compare by name
let r = strings.localeCompare(elementAName, elementBName); let r = elementAName.localeCompare(elementBName);
if (r !== 0) { if (r !== 0) {
return r; return r;
} }
...@@ -287,7 +287,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction { ...@@ -287,7 +287,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
// Sort by type first if scoped search // Sort by type first if scoped search
let elementAType = elementA.getType(); let elementAType = elementA.getType();
let elementBType = elementB.getType(); let elementBType = elementB.getType();
let r = strings.localeCompare(elementAType, elementBType); let r = elementAType.localeCompare(elementBType);
if (r !== 0) { if (r !== 0) {
return r; return r;
} }
...@@ -298,7 +298,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction { ...@@ -298,7 +298,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
let elementBName = elementB.getLabel().toLowerCase(); let elementBName = elementB.getLabel().toLowerCase();
// Compare by name // Compare by name
let r = strings.localeCompare(elementAName, elementBName); let r = elementAName.localeCompare(elementBName);
if (r !== 0) { if (r !== 0) {
return r; return r;
} }
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
import * as strings from 'vs/base/common/strings';
import * as paths from 'vs/base/common/paths'; import * as paths from 'vs/base/common/paths';
import * as types from 'vs/base/common/types'; import * as types from 'vs/base/common/types';
import * as Map from 'vs/base/common/map'; import * as Map from 'vs/base/common/map';
...@@ -159,7 +158,7 @@ export class MarkersModel { ...@@ -159,7 +158,7 @@ export class MarkersModel {
if (b.statistics.errors === 0 && a.statistics.errors > 0) { if (b.statistics.errors === 0 && a.statistics.errors > 0) {
return -1; 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);
}); });
} }
......
...@@ -11,7 +11,6 @@ import nls = require('vs/nls'); ...@@ -11,7 +11,6 @@ import nls = require('vs/nls');
import arrays = require('vs/base/common/arrays'); import arrays = require('vs/base/common/arrays');
import types = require('vs/base/common/types'); import types = require('vs/base/common/types');
import {language, LANGUAGE_DEFAULT} from 'vs/base/common/platform'; 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 {IAction, Action} from 'vs/base/common/actions';
import {toErrorMessage} from 'vs/base/common/errors'; import {toErrorMessage} from 'vs/base/common/errors';
import {Mode, IEntryRunContext, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen'; import {Mode, IEntryRunContext, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen';
...@@ -277,7 +276,7 @@ export class CommandsHandler extends QuickOpenHandler { ...@@ -277,7 +276,7 @@ export class CommandsHandler extends QuickOpenHandler {
entries = arrays.distinct(entries, (entry) => entry.getLabel() + entry.getGroupLabel()); entries = arrays.distinct(entries, (entry) => entry.getLabel() + entry.getGroupLabel());
// Sort by name // 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)); return TPromise.as(new QuickOpenModel(entries));
} }
......
...@@ -149,7 +149,7 @@ class OutlineModel extends QuickOpenModel { ...@@ -149,7 +149,7 @@ class OutlineModel extends QuickOpenModel {
let elementBName = elementB.getLabel().toLowerCase(); let elementBName = elementB.getLabel().toLowerCase();
// Compare by name // Compare by name
let r = strings.localeCompare(elementAName, elementBName); let r = elementAName.localeCompare(elementBName);
if (r !== 0) { if (r !== 0) {
return r; return r;
} }
...@@ -178,7 +178,7 @@ class OutlineModel extends QuickOpenModel { ...@@ -178,7 +178,7 @@ class OutlineModel extends QuickOpenModel {
// Sort by type first if scoped search // Sort by type first if scoped search
let elementAType = elementA.getType(); let elementAType = elementA.getType();
let elementBType = elementB.getType(); let elementBType = elementB.getType();
let r = strings.localeCompare(elementAType, elementBType); let r = elementAType.localeCompare(elementBType);
if (r !== 0) { if (r !== 0) {
return r; return r;
} }
...@@ -189,7 +189,7 @@ class OutlineModel extends QuickOpenModel { ...@@ -189,7 +189,7 @@ class OutlineModel extends QuickOpenModel {
let elementBName = elementB.getLabel().toLowerCase(); let elementBName = elementB.getLabel().toLowerCase();
// Compare by name // Compare by name
r = strings.localeCompare(elementAName, elementBName); r = elementAName.localeCompare(elementBName);
if (r !== 0) { if (r !== 0) {
return r; return r;
} }
......
...@@ -75,7 +75,7 @@ export class SearchSorter implements ISorter { ...@@ -75,7 +75,7 @@ export class SearchSorter implements ISorter {
public compare(tree: ITree, elementA: FileMatchOrMatch, elementB: FileMatchOrMatch): number { public compare(tree: ITree, elementA: FileMatchOrMatch, elementB: FileMatchOrMatch): number {
if (elementA instanceof FileMatch && elementB instanceof FileMatch) { 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) { if (elementA instanceof Match && elementB instanceof Match) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册