Fix a branch regression where setter-with-docs was not being reported

octogonz · octogonz · commit ad170651fb8c · 2020-01-13T20:06:23.000-05:00
diff --git a/apps/api-extractor/src/collector/Collector.ts b/apps/api-extractor/src/collector/Collector.ts
@@ -680,6 +680,16 @@ export class Collector {
   private _calculateApiItemMetadata(astDeclaration: AstDeclaration): void {
     const declarationMetadata: InternalDeclarationMetadata = astDeclaration.declarationMetadata as InternalDeclarationMetadata;
     if (declarationMetadata.isAncillary) {
+
+      if (astDeclaration.declaration.kind === ts.SyntaxKind.SetAccessor) {
+        if (declarationMetadata.tsdocParserContext) {
+          this.messageRouter.addAnalyzerIssue(ExtractorMessageId.SetterWithDocs,
+            `The doc comment for the property "${astDeclaration.astSymbol.localName}"`
+            + ` must appear on the getter, not the setter.`,
+            astDeclaration);
+        }
+      }
+
       // We never calculate ApiItemMetadata for an ancillary declaration; instead, it is assigned when
       // the main declaration is processed.
       return;
diff --git a/apps/api-extractor/src/enhancers/DocCommentEnhancer.ts b/apps/api-extractor/src/enhancers/DocCommentEnhancer.ts
@@ -30,14 +30,14 @@ export class DocCommentEnhancer {
       if (entity.astEntity instanceof AstSymbol) {
         if (entity.exported) {
           entity.astEntity.forEachDeclarationRecursive((astDeclaration: AstDeclaration) => {
-            this._analyzeDeclaration(astDeclaration);
+            this._analyzeApiItem(astDeclaration);
           });
         }
       }
     }
   }
 
-  private _analyzeDeclaration(astDeclaration: AstDeclaration): void {
+  private _analyzeApiItem(astDeclaration: AstDeclaration): void {
     const metadata: ApiItemMetadata = this._collector.fetchApiItemMetadata(astDeclaration);
     if (metadata.docCommentEnhancerVisitorState === VisitorState.Visited) {
       return;
@@ -130,16 +130,6 @@ export class DocCommentEnhancer {
       return;
     }
 
-    if (astDeclaration.declaration.kind === ts.SyntaxKind.SetAccessor) {
-      if (metadata.tsdocComment) {
-        this._collector.messageRouter.addAnalyzerIssue(ExtractorMessageId.SetterWithDocs,
-          `The doc comment for the property "${astDeclaration.astSymbol.localName}"`
-          + ` must appear on the getter, not the setter.`,
-          astDeclaration);
-      }
-      return;
-    }
-
     if (metadata.tsdocComment) {
       // Require the summary to contain at least 10 non-spacing characters
       metadata.needsDocumentation = !tsdoc.PlainTextEmitter.hasAnyTextContent(
@@ -215,7 +205,7 @@ export class DocCommentEnhancer {
       return;
     }
 
-    this._analyzeDeclaration(referencedAstDeclaration);
+    this._analyzeApiItem(referencedAstDeclaration);
 
     const referencedMetadata: ApiItemMetadata = this._collector.fetchApiItemMetadata(referencedAstDeclaration);
 
