microsoft · sandersn · Apr 8, 2019 · Apr 5, 2019 · Apr 5, 2019
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -27431,6 +27431,11 @@ namespace ts {
                 if (languageVersion < ScriptTarget.ES2015) {
                     checkExternalEmitHelpers(baseTypeNode.parent, ExternalEmitHelpers.Extends);
                 }
+                // check both @extends and extends if both are specified.
+                const extendsNode = getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
 
                 const baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
@@ -27439,10 +27444,6 @@ namespace ts {
                     const staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    const extendsNode = getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (some(baseTypeNode.typeArguments)) {
                         forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (const constructor of getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode)) {

diff --git a/tests/baselines/reference/extendsTagEmit.errors.txt b/tests/baselines/reference/extendsTagEmit.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/jsdoc/main.js(2,15): error TS2304: Cannot find name 'Mismatch'.
+tests/cases/conformance/jsdoc/main.js(2,15): error TS8023: JSDoc '@extends Mismatch' does not match the 'extends B' clause.
+
+
+==== tests/cases/conformance/jsdoc/super.js (0 errors) ====
+    export class B { }
+
+==== tests/cases/conformance/jsdoc/main.js (2 errors) ====
+    import { B } from './super'
+    /** @extends {Mismatch} */
+                  ~~~~~~~~
+!!! error TS2304: Cannot find name 'Mismatch'.
+                  ~~~~~~~~
+!!! error TS8023: JSDoc '@extends Mismatch' does not match the 'extends B' clause.
+    class C extends B { }
+
+
diff --git a/tests/baselines/reference/extendsTagEmit.js b/tests/baselines/reference/extendsTagEmit.js
@@ -0,0 +1,20 @@
+//// [tests/cases/conformance/jsdoc/extendsTagEmit.ts] ////
+
+//// [super.js]
+export class B { }
+
+//// [main.js]
+import { B } from './super'
+/** @extends {Mismatch} */
+class C extends B { }
+
+
+
+//// [super.js]
+export class B {
+}
+//// [main.js]
+import { B } from './super';
+/** @extends {Mismatch} */
+class C extends B {
+}
diff --git a/tests/baselines/reference/extendsTagEmit.symbols b/tests/baselines/reference/extendsTagEmit.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/jsdoc/super.js ===
+export class B { }
+>B : Symbol(B, Decl(super.js, 0, 0))
+
+=== tests/cases/conformance/jsdoc/main.js ===
+import { B } from './super'
+>B : Symbol(B, Decl(main.js, 0, 8))
+
+/** @extends {Mismatch} */
+class C extends B { }
+>C : Symbol(C, Decl(main.js, 0, 27))
+>B : Symbol(B, Decl(main.js, 0, 8))
+
+
diff --git a/tests/baselines/reference/extendsTagEmit.types b/tests/baselines/reference/extendsTagEmit.types
@@ -0,0 +1,14 @@
+=== tests/cases/conformance/jsdoc/super.js ===
+export class B { }
+>B : B
+
+=== tests/cases/conformance/jsdoc/main.js ===
+import { B } from './super'
+>B : typeof B
+
+/** @extends {Mismatch} */
+class C extends B { }
+>C : C
+>B : typeof B
+
+
diff --git a/tests/cases/conformance/jsdoc/extendsTagEmit.ts b/tests/cases/conformance/jsdoc/extendsTagEmit.ts
@@ -0,0 +1,12 @@
+// @allowJs: true
+// @checkJs: true
+// @target: esnext
+// @outDir: out
+// @Filename: super.js
+export class B { }
+
+// @Filename: main.js
+import { B } from './super'
+/** @extends {Mismatch} */
+class C extends B { }
+