mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
add error for multiple tags
This commit is contained in:
+10
-4
@@ -20009,14 +20009,20 @@ namespace ts {
|
||||
}
|
||||
|
||||
function checkJSDocAugmentsTag(node: JSDocAugmentsTag): void {
|
||||
const cls = getJSDocHost(node);
|
||||
if (!isClassDeclaration(cls) && !isClassExpression(cls)) {
|
||||
error(cls, Diagnostics.JSDoc_augments_is_not_attached_to_a_class_declaration);
|
||||
const classLike = getJSDocHost(node);
|
||||
if (!isClassDeclaration(classLike) && !isClassExpression(classLike)) {
|
||||
error(classLike, Diagnostics.JSDoc_augments_is_not_attached_to_a_class_declaration);
|
||||
return;
|
||||
}
|
||||
|
||||
const augmentsTags = getAllJSDocTagsOfKind(classLike, SyntaxKind.JSDocAugmentsTag);
|
||||
Debug.assert(augmentsTags.length > 0);
|
||||
if (augmentsTags.length > 1) {
|
||||
error(augmentsTags[1], Diagnostics.The_total_number_of_augments_and_extends_tags_allowed_for_a_single_class_declaration_is_at_most_1);
|
||||
}
|
||||
|
||||
const name = getIdentifierFromEntityNameExpression(node.class.expression);
|
||||
const extend = getClassExtendsHeritageClauseElement(cls);
|
||||
const extend = getClassExtendsHeritageClauseElement(classLike);
|
||||
if (extend) {
|
||||
const className = getIdentifierFromEntityNameExpression(extend.expression);
|
||||
if (className && name.escapedText !== className.escapedText) {
|
||||
|
||||
@@ -3527,6 +3527,10 @@
|
||||
"category": "Error",
|
||||
"code": 8024
|
||||
},
|
||||
"The total number of `@augments` and `@extends` tags allowed for a single class declaration is at most 1.": {
|
||||
"category": "Error",
|
||||
"code": 8025
|
||||
},
|
||||
"Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clause.": {
|
||||
"category": "Error",
|
||||
"code": 9002
|
||||
|
||||
@@ -4247,6 +4247,12 @@ namespace ts {
|
||||
return find(tags, doc => doc.kind === kind);
|
||||
}
|
||||
|
||||
/** Gets all JSDoc tags of a specified kind, or undefined if not present. */
|
||||
export function getAllJSDocTagsOfKind(node: Node, kind: SyntaxKind): ReadonlyArray<JSDocTag> | undefined {
|
||||
const tags = getJSDocTags(node);
|
||||
return filter(tags, doc => doc.kind === kind);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Simple node tests of the form `node.kind === SyntaxKind.Foo`.
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
///<reference path="fourslash.ts" />
|
||||
|
||||
// @allowJs: true
|
||||
// @checkJs: true
|
||||
// @Filename: dummy.js
|
||||
|
||||
//// /**
|
||||
//// * @augments {Thing<number>}
|
||||
//// * @extends {Thing<string>}
|
||||
//// */
|
||||
//// class MyStringThing extends Thing {
|
||||
//// constructor() {
|
||||
//// var x = this.mine;
|
||||
//// x/**/;
|
||||
//// }
|
||||
//// }
|
||||
|
||||
// @Filename: declarations.d.ts
|
||||
//// declare class Thing<T> {
|
||||
//// mine: T;
|
||||
//// }
|
||||
|
||||
// if more than one tag is present, report an error and take the type of the first entry.
|
||||
|
||||
goTo.marker();
|
||||
verify.quickInfoIs("(local var) x: number");
|
||||
verify.getSemanticDiagnostics(
|
||||
`[
|
||||
{
|
||||
"message": "The total number of \`@augments\` and \`@extends\` tags allowed for a single class declaration is at most 1.",
|
||||
"start": 36,
|
||||
"length": 24,
|
||||
"category": "error",
|
||||
"code": 8025
|
||||
},
|
||||
{
|
||||
"message": "Constructors for derived classes must contain a \'super\' call.",
|
||||
"start": 105,
|
||||
"length": 59,
|
||||
"category": "error",
|
||||
"code": 2377
|
||||
},
|
||||
{
|
||||
"message": "\'super\' must be called before accessing \'this\' in the constructor of a derived class.",
|
||||
"start": 137,
|
||||
"length": 4,
|
||||
"category": "error",
|
||||
"code": 17009
|
||||
}
|
||||
]`);
|
||||
Reference in New Issue
Block a user