Fix error from merging

This commit is contained in:
Kanchalai Tanglertsampan
2016-09-01 16:21:56 -07:00
parent b5f4c074d6
commit 18e7240788
2 changed files with 3 additions and 1 deletions

View File

@@ -203,6 +203,8 @@ namespace ts {
* Filters an array by a predicate function. Returns the same array instance if the predicate is
* true for all elements, otherwise returns a new array instance containing the filtered subset.
*/
export function filter<T, U extends T>(array: T[], f: (x: T) => x is U): U[];
export function filter<T>(array: T[], f: (x: T) => boolean): T[]
export function filter<T>(array: T[], f: (x: T) => boolean): T[] {
if (array) {
const len = array.length;

View File

@@ -1034,7 +1034,7 @@ namespace ts {
* @param isStatic A value indicating whether to get properties from the static or instance side of the class.
*/
function getInitializedProperties(node: ClassExpression | ClassDeclaration, isStatic: boolean): PropertyDeclaration[] {
return filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
return filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
}
/**