diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8fd13d3d7b8..eea83dcc9e9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1831,7 +1831,7 @@ namespace ts { // - parameters are only in the scope of function body // This restriction does not apply to JSDoc comment types because they are parented // at a higher level than type parameters would normally be - if (meaning & result.flags & SymbolFlags.Type && lastLocation.kind !== SyntaxKind.JSDocComment) { + if (meaning & result.flags & SymbolFlags.Type && lastLocation.kind !== SyntaxKind.JSDoc) { useResult = result.flags & SymbolFlags.TypeParameter // type parameters are visible in parameter list, return type and type parameter list ? lastLocation === (location as FunctionLikeDeclaration).type || @@ -9963,7 +9963,7 @@ namespace ts { node = paramSymbol.valueDeclaration!; } break; - case SyntaxKind.JSDocComment: { + case SyntaxKind.JSDoc: { const outerTypeParameters = getOuterTypeParameters(node, includeThisTypes); return (node as JSDoc).tags ? appendTypeParameters(outerTypeParameters, flatMap((node as JSDoc).tags, t => isJSDocTemplateTag(t) ? t.typeParameters : undefined)) @@ -13660,7 +13660,7 @@ namespace ts { function getConditionalFlowTypeOfType(type: Type, node: Node) { let constraints: Type[] | undefined; let covariant = true; - while (node && !isStatement(node) && node.kind !== SyntaxKind.JSDocComment) { + while (node && !isStatement(node) && node.kind !== SyntaxKind.JSDoc) { const parent = node.parent; // only consider variance flipped by parameter locations - `keyof` types would usually be considered variance inverting, but // often get used in indexed accesses where they behave sortof invariantly, but our checking is lax diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 318cada64e5..512ebab209f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1596,7 +1596,7 @@ namespace ts { return emitRestOrJSDocVariadicType(node as RestTypeNode | JSDocVariadicType); case SyntaxKind.JSDocNamepathType: return; - case SyntaxKind.JSDocComment: + case SyntaxKind.JSDoc: return emitJSDoc(node as JSDoc); case SyntaxKind.JSDocTypeLiteral: return emitJSDocTypeLiteral(node as JSDocTypeLiteral); diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts index f2dc63f8af9..633b4c2c5cd 100644 --- a/src/compiler/factory/nodeFactory.ts +++ b/src/compiler/factory/nodeFactory.ts @@ -4740,7 +4740,7 @@ namespace ts { // @api function createJSDocComment(comment?: string | NodeArray | undefined, tags?: readonly JSDocTag[] | undefined) { - const node = createBaseNode(SyntaxKind.JSDocComment); + const node = createBaseNode(SyntaxKind.JSDoc); node.comment = comment; node.tags = asNodeArray(tags); return node; diff --git a/src/compiler/factory/nodeTests.ts b/src/compiler/factory/nodeTests.ts index 274ade1886d..cf473caf65b 100644 --- a/src/compiler/factory/nodeTests.ts +++ b/src/compiler/factory/nodeTests.ts @@ -836,7 +836,7 @@ namespace ts { } export function isJSDoc(node: Node): node is JSDoc { - return node.kind === SyntaxKind.JSDocComment; + return node.kind === SyntaxKind.JSDoc; } export function isJSDocTypeLiteral(node: Node): node is JSDocTypeLiteral { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index f8ce2f7047d..8266db7f40c 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -495,7 +495,7 @@ namespace ts { case SyntaxKind.JSDocFunctionType: return visitNodes(cbNode, cbNodes, (node as JSDocFunctionType).parameters) || visitNode(cbNode, (node as JSDocFunctionType).type); - case SyntaxKind.JSDocComment: + case SyntaxKind.JSDoc: return (typeof (node as JSDoc).comment === "string" ? undefined : visitNodes(cbNode, cbNodes, (node as JSDoc).comment as NodeArray | undefined)) || visitNodes(cbNode, cbNodes, (node as JSDoc).tags); case SyntaxKind.JSDocSeeTag: diff --git a/src/compiler/types.ts b/src/compiler/types.ts index dc31b5c79cf..5ce2842fa89 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -378,6 +378,7 @@ namespace ts { JSDocFunctionType, JSDocVariadicType, JSDocNamepathType, // https://jsdoc.app/about-namepaths.html + /** @deprecated Use SyntaxKind.JSDoc */ JSDocComment, JSDocText, JSDocTypeLiteral, @@ -455,6 +456,7 @@ namespace ts { LastJSDocTagNode = JSDocPropertyTag, /* @internal */ FirstContextualKeyword = AbstractKeyword, /* @internal */ LastContextualKeyword = OfKeyword, + JSDoc = JSDocComment, } export type TriviaSyntaxKind = @@ -3256,7 +3258,7 @@ namespace ts { ; export interface JSDoc extends Node { - readonly kind: SyntaxKind.JSDocComment; + readonly kind: SyntaxKind.JSDoc; readonly parent: HasJSDoc; readonly tags?: NodeArray; readonly comment?: string | NodeArray; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 0c438527d80..cd0ab1c658e 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -4610,7 +4610,7 @@ namespace ts { /** template tags are only available when a typedef isn't already using them */ function isNonTypeAliasTemplate(tag: JSDocTag): tag is JSDocTemplateTag { - return isJSDocTemplateTag(tag) && !(tag.parent.kind === SyntaxKind.JSDocComment && tag.parent.tags!.some(isJSDocTypeAlias)); + return isJSDocTemplateTag(tag) && !(tag.parent.kind === SyntaxKind.JSDoc && tag.parent.tags!.some(isJSDocTypeAlias)); } /** diff --git a/src/compiler/utilitiesPublic.ts b/src/compiler/utilitiesPublic.ts index 4e1ff57f08b..e3571024cc1 100644 --- a/src/compiler/utilitiesPublic.ts +++ b/src/compiler/utilitiesPublic.ts @@ -926,7 +926,7 @@ namespace ts { return emptyArray; } if (isJSDocTypeAlias(node)) { - Debug.assert(node.parent.kind === SyntaxKind.JSDocComment); + Debug.assert(node.parent.kind === SyntaxKind.JSDoc); return flatMap(node.parent.tags, tag => isJSDocTemplateTag(tag) ? tag.typeParameters : undefined); } if (node.typeParameters) { @@ -1912,7 +1912,7 @@ namespace ts { /** True if node is of a kind that may contain comment text. */ export function isJSDocCommentContainingNode(node: Node): boolean { - return node.kind === SyntaxKind.JSDocComment + return node.kind === SyntaxKind.JSDoc || node.kind === SyntaxKind.JSDocNamepathType || node.kind === SyntaxKind.JSDocText || isJSDocLinkLike(node) diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@@ does not start a new tag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@@ does not start a new tag.json index 8da37b34c35..dca1bc102db 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@@ does not start a new tag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@@ does not start a new tag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 54, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json index d031b6e2577..4710d7b53c9 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 674, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Chained tags, no leading whitespace.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Chained tags, no leading whitespace.json index 1a848db2bb8..9071bbe9d1a 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Chained tags, no leading whitespace.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Chained tags, no leading whitespace.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 15, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial email address is not a tag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial email address is not a tag.json index a2ad2693915..de101a9765c 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial email address is not a tag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial email address is not a tag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 21, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star is not a tag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star is not a tag.json index 14d6d34b842..46750c7368b 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star is not a tag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star is not a tag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 8, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star space is not a tag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star space is not a tag.json index 6a0af3e105d..ddd1e157e1c 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star space is not a tag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Initial star space is not a tag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 9, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json index 2c42878ec26..39dfd5bb9ce 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 66, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json index beadc1f572e..325eb9d10bc 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 44, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json index 5ecb6ad0694..947d5dfe8e8 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 49, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json index 2d4beb55b12..b6b539fc47c 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 23, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json index c1f9f90589d..92772eb12d1 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 739, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.consecutive newline tokens.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.consecutive newline tokens.json index 19eb9bd3e4e..ebc0cbe69b3 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.consecutive newline tokens.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.consecutive newline tokens.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 55, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json index cf684f317f6..4749058d0c2 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 5, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json index 27a284ebe7b..8d57b3d79ab 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 27, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json index 25c634c52ca..2112acfb91c 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 61, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.no space before @ is not a new tag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.no space before @ is not a new tag.json index fa1dfa412ae..64de20d9bef 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.no space before @ is not a new tag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.no space before @ is not a new tag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 91, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json index 27a284ebe7b..8d57b3d79ab 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 27, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json index 052aa1c5aa6..ad2eea3f2d5 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 20, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json index be64961dc77..cf333fe962a 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 34, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json index f45eb771178..87a7257d932 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 59, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json index 0db3f02520e..78e4224ea83 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 61, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json index 71cb84f5ed7..e2fb8a207a2 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 66, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json index 97a9e69010c..02e2fe9f146 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 34, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json index a1bed4eb49b..4abe5fbe0a0 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 46, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json index 1143002ee91..f273ca6e439 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 23, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json index e5d3ee7b614..00e574a12c4 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 29, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json index b7b5fe25482..7fb31fbd96d 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 54, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json index 230dd415415..12b1a7ffbac 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 30, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json index 50c772455d0..46d293346c3 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 24, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json index 1b4c8e89769..47a2e48d7b4 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 26, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json index 15bab6344a3..e2d1488825d 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 27, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json index 15bab6344a3..e2d1488825d 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 27, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json index e3f4dceb82b..b05a2188fe1 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 28, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json index 29ee205ac48..fd6f6cfa399 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 60, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json index 6e8ff913426..dc02383e421 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 7, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json index 8797eee4fef..9b74cfdcf18 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 60, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json index 937fc3836d7..6ad815ea17f 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 56, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json index 27a284ebe7b..8d57b3d79ab 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 27, "flags": "JSDoc", diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json index 228d54b2e1c..616f1afa7c4 100644 --- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json +++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json @@ -1,5 +1,5 @@ { - "kind": "JSDocComment", + "kind": "JSDoc", "pos": 0, "end": 102, "flags": "JSDoc", diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 2cc99e632b4..9bddee3a017 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -424,6 +424,7 @@ declare namespace ts { JSDocFunctionType = 316, JSDocVariadicType = 317, JSDocNamepathType = 318, + /** @deprecated Use SyntaxKind.JSDoc */ JSDocComment = 319, JSDocText = 320, JSDocTypeLiteral = 321, @@ -491,6 +492,7 @@ declare namespace ts { LastJSDocNode = 346, FirstJSDocTagNode = 326, LastJSDocTagNode = 346, + JSDoc = 319 } export type TriviaSyntaxKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia; export type LiteralSyntaxKind = SyntaxKind.NumericLiteral | SyntaxKind.BigIntLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral; @@ -1820,7 +1822,7 @@ declare namespace ts { } export type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType; export interface JSDoc extends Node { - readonly kind: SyntaxKind.JSDocComment; + readonly kind: SyntaxKind.JSDoc; readonly parent: HasJSDoc; readonly tags?: NodeArray; readonly comment?: string | NodeArray; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 588f4a2d550..0f71e03eef9 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -424,6 +424,7 @@ declare namespace ts { JSDocFunctionType = 316, JSDocVariadicType = 317, JSDocNamepathType = 318, + /** @deprecated Use SyntaxKind.JSDoc */ JSDocComment = 319, JSDocText = 320, JSDocTypeLiteral = 321, @@ -491,6 +492,7 @@ declare namespace ts { LastJSDocNode = 346, FirstJSDocTagNode = 326, LastJSDocTagNode = 346, + JSDoc = 319 } export type TriviaSyntaxKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia; export type LiteralSyntaxKind = SyntaxKind.NumericLiteral | SyntaxKind.BigIntLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral; @@ -1820,7 +1822,7 @@ declare namespace ts { } export type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType; export interface JSDoc extends Node { - readonly kind: SyntaxKind.JSDocComment; + readonly kind: SyntaxKind.JSDoc; readonly parent: HasJSDoc; readonly tags?: NodeArray; readonly comment?: string | NodeArray;