Skip to content

Commit 5ea6c28

Browse files
author
andy-ms
committed
Simplify remaining use
1 parent e5e4888 commit 5ea6c28

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/compiler/checker.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4167,16 +4167,9 @@ namespace ts {
41674167
return getTypeForBindingElement(<BindingElement>declaration);
41684168
}
41694169

4170-
let isOptional = false;
4171-
if (includeOptionality) {
4172-
if (isInJavaScriptFile(declaration) && isParameter(declaration)) {
4173-
const parameterTags = getJSDocParameterTags(declaration);
4174-
isOptional = !!(parameterTags && parameterTags.length > 0 && find(parameterTags, tag => tag.isBracketed));
4175-
}
4176-
if (!isBindingElement(declaration) && !isVariableDeclaration(declaration) && !!declaration.questionToken) {
4177-
isOptional = true;
4178-
}
4179-
}
4170+
const isOptional = includeOptionality && (
4171+
isInJavaScriptFile(declaration) && isParameter(declaration) && getJSDocParameterTags(declaration).some(tag => tag.isBracketed)
4172+
|| !isBindingElement(declaration) && !isVariableDeclaration(declaration) && !!declaration.questionToken);
41804173

41814174
// Use type from type annotation if one is present
41824175
const declaredType = tryGetTypeFromEffectiveTypeNode(declaration);

0 commit comments

Comments
 (0)