Skip to content

Commit 2ae1432

Browse files
committed
Merge branch 'master' into getDefinition
2 parents a48ec09 + 7fc1b8c commit 2ae1432

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/compiler/checker.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4118,16 +4118,12 @@ module ts {
41184118
for (var i = 0; i < len; i++) {
41194119
var parameter = signature.parameters[i];
41204120
var links = getSymbolLinks(parameter);
4121-
if (!links.type) {
4122-
links.type = instantiateType(getTypeAtPosition(context, i), mapper);
4123-
}
4121+
links.type = instantiateType(getTypeAtPosition(context, i), mapper);
41244122
}
41254123
if (signature.hasRestParameter && context.hasRestParameter && signature.parameters.length >= context.parameters.length) {
41264124
var parameter = signature.parameters[signature.parameters.length - 1];
41274125
var links = getSymbolLinks(parameter);
4128-
if (!links.type) {
4129-
links.type = instantiateType(getTypeOfSymbol(context.parameters[context.parameters.length - 1]), mapper);
4130-
}
4126+
links.type = instantiateType(getTypeOfSymbol(context.parameters[context.parameters.length - 1]), mapper);
41314127
}
41324128
}
41334129

0 commit comments

Comments
 (0)