Skip to content
This repository has been archived by the owner on Oct 10, 2018. It is now read-only.

Commit

Permalink
style(tests): extract needlessly-inner function
Browse files Browse the repository at this point in the history
This refactoring (which totally makes sense) was requested in
#336 (review)
  • Loading branch information
tdd committed Nov 3, 2017
1 parent 7dc239b commit 78ec1bc
Showing 1 changed file with 26 additions and 17 deletions.
43 changes: 26 additions & 17 deletions src/extension/utilities/utilityFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,37 @@ export function importSortByFirstSpecifier(i1: Import, i2: Import, order: 'asc'
const strB = getImportFirstSpecifier(i2);

return localeStringSort(strA, strB, order);
}

function getImportFirstSpecifier(imp: Import): string {
if (imp instanceof NamespaceImport || imp instanceof ExternalModuleImport) {
return imp.alias;
}
/**
* Computes the first specifier/alias of an import, falling back ot its
* module path (for StringImports, basically). Does not re-sort specifiers
* internally: assumes they were sorted AOT (which happens in
* `ImportManager#organizeImports`, indeed).
*
* @param {Import} imp
* @returns {String}
*/
function getImportFirstSpecifier(imp: Import): string {
if (imp instanceof NamespaceImport || imp instanceof ExternalModuleImport) {
return imp.alias;
}

if (imp instanceof StringImport) {
return basename(imp.libraryName);
}
if (imp instanceof StringImport) {
return basename(imp.libraryName);
}

if (imp instanceof NamedImport) {
const namedSpecifiers = (imp as NamedImport).specifiers
.map(s => s.alias || s.specifier)
.filter(Boolean);
const marker = namedSpecifiers[0] || imp.defaultAlias;
if (marker) {
return marker;
}
if (imp instanceof NamedImport) {
const namedSpecifiers = (imp as NamedImport).specifiers
.map(s => s.alias || s.specifier)
.filter(Boolean);
const marker = namedSpecifiers[0] || imp.defaultAlias;
if (marker) {
return marker;
}

return basename(imp.libraryName);
}

return basename(imp.libraryName);
}

/**
Expand Down

0 comments on commit 78ec1bc

Please sign in to comment.