From 54e0329611608623d694e77b2cf4cdcb6ea31b4e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 25 Jul 2016 16:25:18 +0200 Subject: [PATCH] debt - remove strings.localeCompare for native localeCompare --- src/vs/base/common/comparers.ts | 2 +- src/vs/base/common/strings.ts | 4 ---- src/vs/base/test/common/strings.test.ts | 9 --------- src/vs/editor/contrib/quickOpen/browser/quickCommand.ts | 3 +-- src/vs/editor/contrib/quickOpen/browser/quickOutline.ts | 6 +++--- src/vs/workbench/parts/markers/common/markersModel.ts | 3 +-- .../workbench/parts/quickopen/browser/commandsHandler.ts | 3 +-- .../parts/quickopen/browser/gotoSymbolHandler.ts | 6 +++--- .../workbench/parts/search/browser/searchResultsView.ts | 2 +- 9 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts index 2ad22ee4ca0..702add75f27 100644 --- a/src/vs/base/common/comparers.ts +++ b/src/vs/base/common/comparers.ts @@ -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 { diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts index 405e764bb81..69e8a96e8b8 100644 --- a/src/vs/base/common/strings.ts +++ b/src/vs/base/common/strings.ts @@ -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); } diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts index cbe7c027b1f..b51a1a43560 100644 --- a/src/vs/base/test/common/strings.test.ts +++ b/src/vs/base/test/common/strings.test.ts @@ -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'); diff --git a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts index 565bdc2fb75..df06663e687 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts @@ -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[] { diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts index 4569e44efd5..bbecd8e9047 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts @@ -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; } diff --git a/src/vs/workbench/parts/markers/common/markersModel.ts b/src/vs/workbench/parts/markers/common/markersModel.ts index 779321963e5..979057ba0fc 100644 --- a/src/vs/workbench/parts/markers/common/markersModel.ts +++ b/src/vs/workbench/parts/markers/common/markersModel.ts @@ -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); }); } diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 5411bb6815a..ca00f951e88 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -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)); } diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index c6637e717e9..7b610c49e16 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -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; } diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts index 6c10a3b8d13..8db9d4fffa9 100644 --- a/src/vs/workbench/parts/search/browser/searchResultsView.ts +++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts @@ -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) { -- GitLab