Skip to content

Commit e0bf73f

Browse files
committed
Remove old add-undefined code in getTypeOfParameter
1 parent 3b1309d commit e0bf73f

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

src/compiler/checker.ts

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6964,8 +6964,8 @@ namespace ts {
69646964
const sourceParams = source.parameters;
69656965
const targetParams = target.parameters;
69666966
for (let i = 0; i < checkCount; i++) {
6967-
const s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
6968-
const t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
6967+
const s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source);
6968+
const t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target);
69696969
const related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors);
69706970
if (!related) {
69716971
if (reportErrors) {
@@ -8163,8 +8163,8 @@ namespace ts {
81638163

81648164
const targetLen = target.parameters.length;
81658165
for (let i = 0; i < targetLen; i++) {
8166-
const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]);
8167-
const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]);
8166+
const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
8167+
const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
81688168
const related = compareTypes(s, t);
81698169
if (!related) {
81708170
return Ternary.False;
@@ -13863,21 +13863,10 @@ namespace ts {
1386313863
return getNonNullableType(checkExpression(node.expression));
1386413864
}
1386513865

13866-
function getTypeOfParameter(symbol: Symbol) {
13867-
const type = getTypeOfSymbol(symbol);
13868-
if (strictNullChecks) {
13869-
const declaration = symbol.valueDeclaration;
13870-
if (declaration && (<VariableLikeDeclaration>declaration).initializer) {
13871-
return includeFalsyTypes(type, TypeFlags.Undefined);
13872-
}
13873-
}
13874-
return type;
13875-
}
13876-
1387713866
function getTypeAtPosition(signature: Signature, pos: number): Type {
1387813867
return signature.hasRestParameter ?
13879-
pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
13880-
pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType;
13868+
pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
13869+
pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
1388113870
}
1388213871

1388313872
function assignContextualParameterTypes(signature: Signature, context: Signature, mapper: TypeMapper) {

0 commit comments

Comments
 (0)