Renames and diagnostic changes

Author: Andy Hanson

src/compiler/checker.ts

@@ -19790,25 +19790,27 @@ namespace ts {
         }
 
         function checkJSDocAugmentsTag(node: JSDocAugmentsTag): void {
-            const cls = getNodeCommentedByJSDocTag(node);
+            const cls = getJSDocHost(node);
             if (!isClassDeclaration(cls) && !isClassExpression(cls)) {
-                error(cls, Diagnostics.JSDoc_augments_tag_will_be_ignored_if_not_attached_to_a_class_declaration);
+                error(cls, Diagnostics.JSDoc_augments_is_not_attached_to_a_class_declaration);
                 return;
             }
 
-            const name = node.class.expression.kind === SyntaxKind.PropertyAccessExpression ? node.class.expression.name : node.class.expression;
+            const name = getIdentifierFromEntityNameExpression(node.class.expression);
             const extend = getClassExtendsHeritageClauseElement(cls);
             if (extend) {
-                const className = getClassName(extend.expression);
+                const className = getIdentifierFromEntityNameExpression(extend.expression);
                 if (className && name.escapedText !== className.escapedText) {
-                    error(name, Diagnostics.JSDoc_augments_tag_declares_to_extend_0_but_actual_class_augments_1,
+                    error(name, Diagnostics.JSDoc_augments_0_does_not_match_the_extends_1_clause,
                         unescapeLeadingUnderscores(name.escapedText),
                         unescapeLeadingUnderscores(className.escapedText));
                 }
             }
         }
 
-        function getClassName(node: Expression): Identifier | undefined {
+        function getIdentifierFromEntityNameExpression(node: Identifier | PropertyAccessExpression): Identifier;
+        function getIdentifierFromEntityNameExpression(node: Expression): Identifier | undefined;
+        function getIdentifierFromEntityNameExpression(node: Expression): Identifier | undefined {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
                     return node as Identifier;

src/compiler/diagnosticMessages.json

@@ -3511,11 +3511,11 @@
         "category": "Error",
         "code": 8021
     },
-    "JSDoc '@augments' tag will be ignored if not attached to a class declaration.": {
+    "JSDoc '@augments' is not attached to a class declaration.": {
         "category": "Error",
         "code": 8022
     },
-    "JSDoc '@augments' tag declares to extend '{0}', but actual class augments '{1}'.": {
+    "JSDoc '@augments {0}' does not match the 'extends {1}' clause.": {
         "category": "Error",
         "code": 8023
     },

src/compiler/utilities.ts

@@ -1581,7 +1581,7 @@ namespace ts {
             return undefined;
         }
         const name = node.name.escapedText;
-        const func = getNodeCommentedByJSDocTag(node);
+        const func = getJSDocHost(node);
         if (!isFunctionLike(func)) {
             return undefined;
         }
@@ -1590,7 +1590,7 @@ namespace ts {
         return parameter && parameter.symbol;
     }
 
-    export function getNodeCommentedByJSDocTag(node: JSDocTag): Node {
+    export function getJSDocHost(node: JSDocTag): Node {
         Debug.assert(node.parent!.kind === SyntaxKind.JSDocComment);
         return node.parent!.parent!;
     }

tests/baselines/reference/jsdocAugmentsMissingType.errors.txt

@@ -1,5 +1,5 @@
 /a.js(2,14): error TS1003: Identifier expected.
-/a.js(2,14): error TS8023: JSDoc '@augments' tag declares to extend '', but actual class augments 'A'.
+/a.js(2,14): error TS8023: JSDoc '@augments ' does not match the 'extends A' clause.
 /a.js(5,14): error TS2339: Property 'x' does not exist on type 'B'.
 
 
@@ -9,7 +9,7 @@
 
 !!! error TS1003: Identifier expected.
 
-!!! error TS8023: JSDoc '@augments' tag declares to extend '', but actual class augments 'A'.
+!!! error TS8023: JSDoc '@augments ' does not match the 'extends A' clause.
     class B extends A {
         m() {
             this.x

tests/baselines/reference/jsdocAugments_nameMismatch.errors.txt

@@ -1,4 +1,4 @@
-/b.js(4,15): error TS8023: JSDoc '@augments' tag declares to extend 'A', but actual class augments 'B'.
+/b.js(4,15): error TS8023: JSDoc '@augments A' does not match the 'extends B' clause.
 
 
 ==== /b.js (1 errors) ====
@@ -7,6 +7,6 @@
 
     /** @augments A */
                   ~
-!!! error TS8023: JSDoc '@augments' tag declares to extend 'A', but actual class augments 'B'.
+!!! error TS8023: JSDoc '@augments A' does not match the 'extends B' clause.
     class C extends B {}
 

tests/baselines/reference/jsdocAugments_notAClass.errors.txt

@@ -1,10 +1,10 @@
-/b.js(3,10): error TS8022: JSDoc '@augments' tag will be ignored if not attached to a class declaration.
+/b.js(3,10): error TS8022: JSDoc '@augments' is not attached to a class declaration.
 
 
 ==== /b.js (1 errors) ====
     class A {}
     /** @augments A */
     function b() {}
              ~
-!!! error TS8022: JSDoc '@augments' tag will be ignored if not attached to a class declaration.
+!!! error TS8022: JSDoc '@augments' is not attached to a class declaration.