Skip to content

Commit 6d3217a

Browse files
committed
Don't repeat isInJSFile() condition
1 parent 66680f9 commit 6d3217a

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/compiler/checker.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8873,10 +8873,8 @@ namespace ts {
88738873
return getReturnTypeOfSignature(getterSignature);
88748874
}
88758875
}
8876-
if (isInJSFile(declaration)) {
8877-
const type = getParameterTypeOfTypeTag(func, declaration);
8878-
if (type) return type;
8879-
}
8876+
const parameterTypeOfTypeTag = getParameterTypeOfTypeTag(func, declaration);
8877+
if (parameterTypeOfTypeTag) return parameterTypeOfTypeTag;
88808878
// Use contextual parameter type if one is available
88818879
const type = declaration.symbol.escapedName === InternalSymbolName.This ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
88828880
if (type) {
@@ -12762,10 +12760,8 @@ namespace ts {
1276212760
}
1276312761

1276412762
function getSignatureFromDeclaration(declaration: SignatureDeclaration | JSDocSignature): Signature {
12765-
if (isInJSFile(declaration)) {
12766-
const signature = getSignatureOfTypeTag(declaration);
12767-
if (signature) return signature;
12768-
}
12763+
const signature = getSignatureOfTypeTag(declaration);
12764+
if (signature) return signature;
1276912765
const links = getNodeLinks(declaration);
1277012766
if (!links.resolvedSignature) {
1277112767
const parameters: Symbol[] = [];
@@ -12980,7 +12976,7 @@ namespace ts {
1298012976
else {
1298112977
const type = signature.declaration && getEffectiveReturnTypeNode(signature.declaration);
1298212978
let jsdocPredicate: TypePredicate | undefined;
12983-
if (!type && isInJSFile(signature.declaration)) {
12979+
if (!type) {
1298412980
const jsdocSignature = getSignatureOfTypeTag(signature.declaration!);
1298512981
if (jsdocSignature && signature !== jsdocSignature) {
1298612982
jsdocPredicate = getTypePredicateOfSignature(jsdocSignature);

0 commit comments

Comments
 (0)