@@ -462,52 +462,46 @@ namespace ts {
462
462
return visitNodes ( cbNode , cbNodes , ( < JSDoc > node ) . tags ) ;
463
463
case SyntaxKind . JSDocParameterTag :
464
464
case SyntaxKind . JSDocPropertyTag :
465
- if ( ( node as JSDocPropertyLikeTag ) . isNameFirst ) {
466
- return visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . name ) ||
467
- visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . typeExpression ) ;
468
- }
469
- else {
470
- return visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . typeExpression ) ||
471
- visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . name ) ;
472
- }
473
- case SyntaxKind . JSDocReturnTag :
474
- return visitNode ( cbNode , ( < JSDocReturnTag > node ) . typeExpression ) ;
475
- case SyntaxKind . JSDocTypeTag :
476
- return visitNode ( cbNode , ( < JSDocTypeTag > node ) . typeExpression ) ;
465
+ return visitNode ( cbNode , ( node as JSDocTag ) . tagName ) ||
466
+ ( ( node as JSDocPropertyLikeTag ) . isNameFirst
467
+ ? visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . name ) ||
468
+ visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . typeExpression )
469
+ : visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . typeExpression ) ||
470
+ visitNode ( cbNode , ( < JSDocPropertyLikeTag > node ) . name ) ) ;
477
471
case SyntaxKind . JSDocAugmentsTag :
478
- return visitNode ( cbNode , ( < JSDocAugmentsTag > node ) . class ) ;
472
+ return visitNode ( cbNode , ( node as JSDocTag ) . tagName ) ||
473
+ visitNode ( cbNode , ( < JSDocAugmentsTag > node ) . class ) ;
479
474
case SyntaxKind . JSDocTemplateTag :
480
- return visitNode ( cbNode , ( < JSDocTemplateTag > node ) . constraint ) || visitNodes ( cbNode , cbNodes , ( < JSDocTemplateTag > node ) . typeParameters ) ;
475
+ return visitNode ( cbNode , ( node as JSDocTag ) . tagName ) ||
476
+ visitNode ( cbNode , ( < JSDocTemplateTag > node ) . constraint ) ||
477
+ visitNodes ( cbNode , cbNodes , ( < JSDocTemplateTag > node ) . typeParameters ) ;
481
478
case SyntaxKind . JSDocTypedefTag :
482
- if ( ( node as JSDocTypedefTag ) . typeExpression &&
483
- ( node as JSDocTypedefTag ) . typeExpression ! . kind === SyntaxKind . JSDocTypeExpression ) {
484
- return visitNode ( cbNode , ( < JSDocTypedefTag > node ) . typeExpression ) ||
485
- visitNode ( cbNode , ( < JSDocTypedefTag > node ) . fullName ) ;
486
- }
487
- else {
488
- return visitNode ( cbNode , ( < JSDocTypedefTag > node ) . fullName ) ||
489
- visitNode ( cbNode , ( < JSDocTypedefTag > node ) . typeExpression ) ;
490
- }
479
+ return visitNode ( cbNode , ( node as JSDocTag ) . tagName ) ||
480
+ ( ( node as JSDocTypedefTag ) . typeExpression &&
481
+ ( node as JSDocTypedefTag ) . typeExpression ! . kind === SyntaxKind . JSDocTypeExpression
482
+ ? visitNode ( cbNode , ( < JSDocTypedefTag > node ) . typeExpression ) ||
483
+ visitNode ( cbNode , ( < JSDocTypedefTag > node ) . fullName )
484
+ : visitNode ( cbNode , ( < JSDocTypedefTag > node ) . fullName ) ||
485
+ visitNode ( cbNode , ( < JSDocTypedefTag > node ) . typeExpression ) ) ;
491
486
case SyntaxKind . JSDocCallbackTag :
492
- return visitNode ( cbNode , ( node as JSDocCallbackTag ) . fullName ) ||
487
+ return visitNode ( cbNode , ( node as JSDocTag ) . tagName ) ||
488
+ visitNode ( cbNode , ( node as JSDocCallbackTag ) . fullName ) ||
493
489
visitNode ( cbNode , ( node as JSDocCallbackTag ) . typeExpression ) ;
490
+ case SyntaxKind . JSDocReturnTag :
491
+ case SyntaxKind . JSDocTypeTag :
494
492
case SyntaxKind . JSDocThisTag :
495
- return visitNode ( cbNode , ( node as JSDocThisTag ) . typeExpression ) ;
496
493
case SyntaxKind . JSDocEnumTag :
497
- return visitNode ( cbNode , ( node as JSDocEnumTag ) . typeExpression ) ;
494
+ return visitNode ( cbNode , ( node as JSDocTag ) . tagName ) ||
495
+ visitNode ( cbNode , ( node as JSDocReturnTag | JSDocTypeTag | JSDocThisTag | JSDocEnumTag ) . typeExpression ) ;
498
496
case SyntaxKind . JSDocSignature :
499
- return visitNodes ( cbNode , cbNodes , node . decorators ) ||
500
- visitNodes ( cbNode , cbNodes , node . modifiers ) ||
501
- forEach ( ( < JSDocSignature > node ) . typeParameters , cbNode ) ||
497
+ return forEach ( ( < JSDocSignature > node ) . typeParameters , cbNode ) ||
502
498
forEach ( ( < JSDocSignature > node ) . parameters , cbNode ) ||
503
499
visitNode ( cbNode , ( < JSDocSignature > node ) . type ) ;
504
500
case SyntaxKind . JSDocTypeLiteral :
505
- if ( ( node as JSDocTypeLiteral ) . jsDocPropertyTags ) {
506
- for ( const tag of ( node as JSDocTypeLiteral ) . jsDocPropertyTags ! ) {
507
- visitNode ( cbNode , tag ) ;
508
- }
509
- }
510
- return ;
501
+ return forEach ( ( node as JSDocTypeLiteral ) . jsDocPropertyTags , cbNode ) ;
502
+ case SyntaxKind . JSDocTag :
503
+ case SyntaxKind . JSDocClassTag :
504
+ return visitNode ( cbNode , ( node as JSDocTag ) . tagName ) ;
511
505
case SyntaxKind . PartiallyEmittedExpression :
512
506
return visitNode ( cbNode , ( < PartiallyEmittedExpression > node ) . expression ) ;
513
507
}
0 commit comments