maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix semantic merge conflict (#20119)

Browse source
This commit is contained in:
Andy 2017-11-17 15:29:09 -08:00 committed by Wesley Wigham
parent a62e65328a
commit 82502ea086
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/compiler/core.ts
View file

@ -1160,10 +1160,6 @@ namespace ts {
return result;
}
export function toArray<T>(value: T | ReadonlyArray<T>): ReadonlyArray<T> {
return isArray(value) ? value : [value];
}
/**
* Calls `callback` for each entry in the map, returning the first truthy result.
* Use `map.forEach` instead for normal iteration.
@ -1366,6 +1362,8 @@ namespace ts {
return Array.isArray ? Array.isArray(value) : value instanceof Array;
}
export function toArray<T>(value: T | ReadonlyArray<T>): ReadonlyArray<T>;
export function toArray<T>(value: T | T[]): T[];
export function toArray<T>(value: T | T[]): T[] {
return isArray(value) ? value : [value];
}