debt - remove strings.localeCompare for native localeCompare
This commit is contained in:
parent
b82d730c20
commit
54e0329611
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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[] {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue