Fix regression in ExcerptBuilder.ts

octogonz · octogonz · commit 6bb00df559ff · 2019-10-21T16:09:59.000-07:00
diff --git a/apps/api-extractor-model/src/model/ApiConstructSignature.ts b/apps/api-extractor-model/src/model/ApiConstructSignature.ts
@@ -74,7 +74,6 @@ export class ApiConstructSignature extends ApiTypeParameterListMixin(ApiParamete
     return `|${ApiItemKind.ConstructSignature}|${overloadIndex}`;
   }
 
-
   /** @override */
   public get kind(): ApiItemKind {
     return ApiItemKind.ConstructSignature;
diff --git a/apps/api-extractor/src/generators/ExcerptBuilder.ts b/apps/api-extractor/src/generators/ExcerptBuilder.ts
@@ -121,7 +121,7 @@ export class ExcerptBuilder {
 
       if (span.kind === ts.SyntaxKind.Identifier) {
         const name: ts.Identifier = span.node as ts.Identifier;
-        if (!ExcerptBuilder._isDeclaration(name)) {
+        if (!ExcerptBuilder._isDeclarationName(name)) {
           canonicalReference = state.referenceGenerator.getDeclarationReferenceForIdentifier(name);
         }
       }
@@ -214,6 +214,10 @@ export class ExcerptBuilder {
     state.disableMergingForNextToken = false;
   }
 
+  private static _isDeclarationName(name: ts.Identifier): boolean {
+    return ExcerptBuilder._isDeclaration(name.parent) && name.parent.name === name;
+  }
+
   private static _isDeclaration(node: ts.Node): node is ts.NamedDeclaration {
     switch (node.kind) {
       case ts.SyntaxKind.FunctionDeclaration:

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ export class ApiConstructSignature extends ApiTypeParameterListMixin(ApiParamete`
`74`	`74`	return `\|${ApiItemKind.ConstructSignature}\|${overloadIndex}`;
`75`	`75`	`}`
`76`	`76`
`77`		`-`
`78`	`77`	`/** @override */`
`79`	`78`	`public get kind(): ApiItemKind {`
`80`	`79`	`return ApiItemKind.ConstructSignature;`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ export class ExcerptBuilder {`
`121`	`121`
`122`	`122`	`if (span.kind === ts.SyntaxKind.Identifier) {`
`123`	`123`	`const name: ts.Identifier = span.node as ts.Identifier;`
`124`		`- if (!ExcerptBuilder._isDeclaration(name)) {`
	`124`	`+ if (!ExcerptBuilder._isDeclarationName(name)) {`
`125`	`125`	`canonicalReference = state.referenceGenerator.getDeclarationReferenceForIdentifier(name);`
`126`	`126`	`}`
`127`	`127`	`}`
`@@ -214,6 +214,10 @@ export class ExcerptBuilder {`
`214`	`214`	`state.disableMergingForNextToken = false;`
`215`	`215`	`}`
`216`	`216`
	`217`	`+ private static _isDeclarationName(name: ts.Identifier): boolean {`
	`218`	`+ return ExcerptBuilder._isDeclaration(name.parent) && name.parent.name === name;`
	`219`	`+ }`
	`220`	`+`
`217`	`221`	`private static _isDeclaration(node: ts.Node): node is ts.NamedDeclaration {`
`218`	`222`	`switch (node.kind) {`
`219`	`223`	`case ts.SyntaxKind.FunctionDeclaration:`