microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-09 12:15:34 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove unnecessary *OrUndefined calls (#18889)

Browse Source 
* Remove unnecessary *OrUndefined calls

* Add 'first'
This commit is contained in:
Andy 2017-10-03 10:24:39 -07:00 committed by GitHub
parent b21d8a4742
commit b111493276
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/core.ts
View File

@ -866,6 +866,11 @@ namespace ts {
return elementAt(array, 0);
}
export function first<T>(array: ReadonlyArray<T>): T {
Debug.assert(array.length !== 0);
return array[0];
}
/**
* Returns the last element of an array if non-empty, `undefined` otherwise.
*/
@ -873,6 +878,11 @@ namespace ts {
return elementAt(array, -1);
}
export function last<T>(array: ReadonlyArray<T>): T {
Debug.assert(array.length !== 0);
return array[array.length - 1];
}
/**
* Returns the only element of an array if it contains only one element, `undefined` otherwise.
*/

12
src/services/refactors/extractSymbol.ts
View File

@ -469,7 +469,7 @@ namespace ts.refactor.extractSymbol {
* depending on what's in the extracted body.
*/
function collectEnclosingScopes(range: TargetRange): Scope[] | undefined {
let current: Node = isReadonlyArray(range.range) ? firstOrUndefined(range.range) : range.range;
let current: Node = isReadonlyArray(range.range) ? first(range.range) : range.range;
if (range.facts & RangeFacts.UsesThis) {
// if range uses this as keyword or as type inside the class then it can only be extracted to a method of the containing class
const containingClass = getContainingClass(current);
@ -746,7 +746,7 @@ namespace ts.refactor.extractSymbol {
}
const changeTracker = textChanges.ChangeTracker.fromContext(context);
const minInsertionPos = (isReadonlyArray(range.range) ? lastOrUndefined(range.range) : range.range).end;
const minInsertionPos = (isReadonlyArray(range.range) ? last(range.range) : range.range).end;
const nodeToInsertBefore = getNodeToInsertFunctionBefore(minInsertionPos, scope);
if (nodeToInsertBefore) {
changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newFunction, { suffix: context.newLineCharacter + context.newLineCharacter });
@ -830,7 +830,7 @@ namespace ts.refactor.extractSymbol {
}
const edits = changeTracker.getChanges();
const renameRange = isReadonlyArray(range.range) ? range.range[0] : range.range;
const renameRange = isReadonlyArray(range.range) ? first(range.range) : range.range;
const renameFilename = renameRange.getSourceFile().fileName;
const renameLocation = getRenameLocation(edits, renameFilename, functionNameText, /*isDeclaredBeforeUse*/ false);
@ -1226,7 +1226,7 @@ namespace ts.refactor.extractSymbol {
*/
function getEnclosingTextRange(targetRange: TargetRange, sourceFile: SourceFile): TextRange {
return isReadonlyArray(targetRange.range)
? { pos: targetRange.range[0].getStart(sourceFile), end: targetRange.range[targetRange.range.length - 1].getEnd() }
? { pos: first(targetRange.range).getStart(sourceFile), end: last(targetRange.range).getEnd() }
: targetRange.range;
}
@ -1272,7 +1272,7 @@ namespace ts.refactor.extractSymbol {
const expressionDiagnostic =
isReadonlyArray(targetRange.range) && !(targetRange.range.length === 1 && isExpressionStatement(targetRange.range[0]))
? ((start, end) => createFileDiagnostic(sourceFile, start, end - start, Messages.ExpressionExpected))(firstOrUndefined(targetRange.range).getStart(), lastOrUndefined(targetRange.range).end)
? ((start, end) => createFileDiagnostic(sourceFile, start, end - start, Messages.ExpressionExpected))(first(targetRange.range).getStart(), last(targetRange.range).end)
: undefined;
// initialize results
@ -1299,7 +1299,7 @@ namespace ts.refactor.extractSymbol {
const target = isReadonlyArray(targetRange.range) ? createBlock(<Statement[]>targetRange.range) : targetRange.range;
const containingLexicalScopeOfExtraction = isBlockScope(scopes[0], scopes[0].parent) ? scopes[0] : getEnclosingBlockScopeContainer(scopes[0]);
const unmodifiedNode = isReadonlyArray(targetRange.range) ? targetRange.range[0] : targetRange.range;
const unmodifiedNode = isReadonlyArray(targetRange.range) ? first(targetRange.range) : targetRange.range;
const inGenericContext = isInGenericContext(unmodifiedNode);
collectUsages(target);