Skip to content

Commit 18e7240

Browse files
author
Kanchalai Tanglertsampan
committed
Fix error from merging
1 parent b5f4c07 commit 18e7240

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/compiler/core.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ namespace ts {
203203
* Filters an array by a predicate function. Returns the same array instance if the predicate is
204204
* true for all elements, otherwise returns a new array instance containing the filtered subset.
205205
*/
206+
export function filter<T, U extends T>(array: T[], f: (x: T) => x is U): U[];
207+
export function filter<T>(array: T[], f: (x: T) => boolean): T[]
206208
export function filter<T>(array: T[], f: (x: T) => boolean): T[] {
207209
if (array) {
208210
const len = array.length;

src/compiler/transformers/ts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,7 @@ namespace ts {
10341034
* @param isStatic A value indicating whether to get properties from the static or instance side of the class.
10351035
*/
10361036
function getInitializedProperties(node: ClassExpression | ClassDeclaration, isStatic: boolean): PropertyDeclaration[] {
1037-
return filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
1037+
return filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
10381038
}
10391039

10401040
/**

0 commit comments

Comments
 (0)