diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index cd1fbcc379b..b5d1cf5bcc6 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -18461,7 +18461,7 @@ namespace ts { function checkTypeReferenceNode(node: TypeReferenceNode | ExpressionWithTypeArguments) { checkGrammarTypeArguments(node, node.typeArguments); if (node.kind === SyntaxKind.TypeReference && node.typeName.jsdocDot && !isInJavaScriptFile(node) && !findAncestor(node, n => n.kind === SyntaxKind.JSDocTypeExpression)) { - grammarErrorOnNode(node, Diagnostics.JSDoc_types_can_only_used_inside_documentation_comments); + grammarErrorOnNode(node, Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments); } const type = getTypeFromTypeReference(node); if (type !== unknownType) { @@ -22060,7 +22060,7 @@ namespace ts { case SyntaxKind.JSDocAllType: case SyntaxKind.JSDocUnknownType: if (!isInJavaScriptFile(node) && !findAncestor(node, n => n.kind === SyntaxKind.JSDocTypeExpression)) { - grammarErrorOnNode(node, Diagnostics.JSDoc_types_can_only_used_inside_documentation_comments); + grammarErrorOnNode(node, Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments); } return; case SyntaxKind.JSDocTypeExpression: diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index cee632634a9..9881d32d775 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -3475,7 +3475,7 @@ "category": "Message", "code": 8019 }, - "JSDoc types can only used inside documentation comments.": { + "JSDoc types can only be used inside documentation comments.": { "category": "Error", "code": 8020 }, diff --git a/tests/baselines/reference/jsdocInTypescript.errors.txt b/tests/baselines/reference/jsdocInTypescript.errors.txt index 3e5e0ca027f..d1d6f404e15 100644 --- a/tests/baselines/reference/jsdocInTypescript.errors.txt +++ b/tests/baselines/reference/jsdocInTypescript.errors.txt @@ -1,85 +1,85 @@ -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(2,10): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(4,15): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(4,27): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(7,20): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(7,32): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(10,18): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(10,31): error TS8020: JSDoc types can only used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(2,10): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(4,15): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(4,27): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(7,20): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(7,32): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(10,18): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(10,31): error TS8020: JSDoc types can only be used inside documentation comments. tests/cases/conformance/jsdoc/jsdocInTypescript.ts(11,12): error TS2554: Expected 1 arguments, but got 2. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(13,14): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(14,11): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(15,8): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(16,15): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(17,11): error TS8020: JSDoc types can only used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(13,14): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(14,11): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(15,8): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(16,15): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(17,11): error TS8020: JSDoc types can only be used inside documentation comments. tests/cases/conformance/jsdoc/jsdocInTypescript.ts(18,5): error TS2322: Type '{}' is not assignable to type 'string'. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(18,16): error TS8020: JSDoc types can only used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(18,16): error TS8020: JSDoc types can only be used inside documentation comments. tests/cases/conformance/jsdoc/jsdocInTypescript.ts(19,5): error TS2322: Type '{}' is not assignable to type 'string'. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(19,17): error TS8020: JSDoc types can only used inside documentation comments. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(20,17): error TS8020: JSDoc types can only used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(19,17): error TS8020: JSDoc types can only be used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(20,17): error TS8020: JSDoc types can only be used inside documentation comments. tests/cases/conformance/jsdoc/jsdocInTypescript.ts(21,5): error TS2322: Type 'undefined' is not assignable to type 'number | null'. -tests/cases/conformance/jsdoc/jsdocInTypescript.ts(21,17): error TS8020: JSDoc types can only used inside documentation comments. +tests/cases/conformance/jsdoc/jsdocInTypescript.ts(21,17): error TS8020: JSDoc types can only be used inside documentation comments. ==== tests/cases/conformance/jsdoc/jsdocInTypescript.ts (20 errors) ==== // grammar error from checker var ara: Array. = [1,2,3]; ~~~~~~~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. function f(x: ?number, y: Array.) { ~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. ~~~~~~~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. return x ? x + y[1] : y[0]; } function hof(ctor: function(new: number, string)) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. ~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. return new ctor('hi'); } function hof2(f: function(this: number, string): string) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. ~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. return f(12, 'hullo'); ~~~~~~~~~~~~~~ !!! error TS2554: Expected 1 arguments, but got 2. } var whatevs: * = 1001; ~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var ques: ? = 'what'; ~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var g: function(number, number): number = (n,m) => n + m; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var variadic: ...boolean = [true, false, true]; ~~~~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var most: !string = 'definite'; ~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var weird1: new:string = {}; ~~~~~~ !!! error TS2322: Type '{}' is not assignable to type 'string'. ~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var weird2: this:string = {}; ~~~~~~ !!! error TS2322: Type '{}' is not assignable to type 'string'. ~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var postfixdef: number! = 101; ~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. var postfixopt: number? = undefined; ~~~~~~~~~~ !!! error TS2322: Type 'undefined' is not assignable to type 'number | null'. ~~~~~~~ -!!! error TS8020: JSDoc types can only used inside documentation comments. +!!! error TS8020: JSDoc types can only be used inside documentation comments. \ No newline at end of file