Skip to content

Commit 69b2e7c

Browse files
committed
Fixed rebase errors
1 parent 24f2945 commit 69b2e7c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/compiler/checker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7971,9 +7971,9 @@ namespace ts {
79717971

79727972
function createFakeInferenceMapper(): TypeMapper {
79737973
const fakeSignature = <Signature>{
7974-
typeParameters: []
7974+
typeParameters: []
79757975
};
7976-
return getInferenceMapper(createInferenceContext(fakeSignature, /*inferUnionTypes*/ false, /*useAnyForNoInferences*/ false));
7976+
return createInferenceContext(fakeSignature, 0);
79777977
}
79787978

79797979
function combineTypeMappers(mapper1: TypeMapper, mapper2: TypeMapper): TypeMapper {
@@ -14899,7 +14899,7 @@ namespace ts {
1489914899
// If inference has failed, use the first constituent type. During checking, the other
1490014900
// constituents will fail to match, resulting in a nice error message pointing it out.
1490114901
if (inferred[i] === unknownType) {
14902-
inferred[i] = getInferenceCandidates(context, i)[0] || inferred[i];
14902+
inferred[i] = context.inferences[i].candidates[0] || inferred[i];
1490314903
}
1490414904
}
1490514905
return getSignatureInstantiation(signature, inferred);

0 commit comments

Comments
 (0)