microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-10 21:07:52 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Simplify 'bestMatchKind' (#23073)

Browse Source
This commit is contained in:
Andy
2018-04-02 11:57:19 -07:00
committed by GitHub
parent 0d063d6161
commit 8cdd1aecca
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/services/navigateTo.ts
View File

@@ -56,7 +56,7 @@ namespace ts.NavigateTo {
}
}
const matchKind = bestMatchKind(containerMatches);
const matchKind = Math.min(...matches.map(m => m.kind));
const isCaseSensitive = allMatchesAreCaseSensitive(containerMatches);
rawItems.push({ name, fileName, matchKind, isCaseSensitive, declaration });
}
@@ -125,16 +125,14 @@ namespace ts.NavigateTo {
return false;
}
function getContainers(declaration: Declaration): string[] {
function getContainers(declaration: Declaration): string[] | undefined {
const containers: string[] = [];
// First, if we started with a computed property name, then add all but the last
// portion into the container array.
const name = getNameOfDeclaration(declaration);
if (name.kind === SyntaxKind.ComputedPropertyName) {
if (!tryAddComputedPropertyName(name.expression, containers, /*includeLastPortion*/ false)) {
return undefined;
}
if (name.kind === SyntaxKind.ComputedPropertyName && !tryAddComputedPropertyName(name.expression, containers, /*includeLastPortion*/ false)) {
return undefined;
}
// Now, walk up our containers, adding all their names to the container array.
@@ -151,20 +149,6 @@ namespace ts.NavigateTo {
return containers;
}
function bestMatchKind(matches: ReadonlyArray<PatternMatch>): PatternMatchKind {
Debug.assert(matches.length > 0);
let bestMatchKind = PatternMatchKind.camelCase;
for (const match of matches) {
const kind = match.kind;
if (kind < bestMatchKind) {
bestMatchKind = kind;
}
}
return bestMatchKind;
}
function compareNavigateToItems(i1: RawNavigateToItem, i2: RawNavigateToItem) {
// TODO(cyrusn): get the gamut of comparisons that VS already uses here.
return compareValues(i1.matchKind, i2.matchKind)