From aea2ee5726659166284e2ab275508676278ae25c Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 30 Oct 2017 15:00:34 -0700 Subject: [PATCH] Fix the order of JSDocTag kinds JSDocTypeLiteral should not be grouped with the JSDocTag kinds, so move it just before they start, instead of just after. This updates the LastJSDocNode and LastJSDocTagNode. --- src/compiler/types.ts | 6 ++--- .../reference/api/tsserverlibrary.d.ts | 22 +++++++++---------- tests/baselines/reference/api/typescript.d.ts | 22 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index e1830274c93..b6228dd2a77 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -362,6 +362,7 @@ namespace ts { JSDocFunctionType, JSDocVariadicType, JSDocComment, + JSDocTypeLiteral, JSDocTag, JSDocAugmentsTag, JSDocClassTag, @@ -371,7 +372,6 @@ namespace ts { JSDocTemplateTag, JSDocTypedefTag, JSDocPropertyTag, - JSDocTypeLiteral, // Synthesized list SyntaxList, @@ -413,9 +413,9 @@ namespace ts { LastBinaryOperator = CaretEqualsToken, FirstNode = QualifiedName, FirstJSDocNode = JSDocTypeExpression, - LastJSDocNode = JSDocTypeLiteral, + LastJSDocNode = JSDocPropertyTag, FirstJSDocTagNode = JSDocTag, - LastJSDocTagNode = JSDocTypeLiteral + LastJSDocTagNode = JSDocPropertyTag } export const enum NodeFlags { diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 26c03954b45..0b9b1e745e7 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -336,16 +336,16 @@ declare namespace ts { JSDocFunctionType = 273, JSDocVariadicType = 274, JSDocComment = 275, - JSDocTag = 276, - JSDocAugmentsTag = 277, - JSDocClassTag = 278, - JSDocParameterTag = 279, - JSDocReturnTag = 280, - JSDocTypeTag = 281, - JSDocTemplateTag = 282, - JSDocTypedefTag = 283, - JSDocPropertyTag = 284, - JSDocTypeLiteral = 285, + JSDocTypeLiteral = 276, + JSDocTag = 277, + JSDocAugmentsTag = 278, + JSDocClassTag = 279, + JSDocParameterTag = 280, + JSDocReturnTag = 281, + JSDocTypeTag = 282, + JSDocTemplateTag = 283, + JSDocTypedefTag = 284, + JSDocPropertyTag = 285, SyntaxList = 286, NotEmittedStatement = 287, PartiallyEmittedExpression = 288, @@ -380,7 +380,7 @@ declare namespace ts { FirstNode = 143, FirstJSDocNode = 267, LastJSDocNode = 285, - FirstJSDocTagNode = 276, + FirstJSDocTagNode = 277, LastJSDocTagNode = 285, } enum NodeFlags { diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 6abf9d0cb6e..e8f0779910e 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -336,16 +336,16 @@ declare namespace ts { JSDocFunctionType = 273, JSDocVariadicType = 274, JSDocComment = 275, - JSDocTag = 276, - JSDocAugmentsTag = 277, - JSDocClassTag = 278, - JSDocParameterTag = 279, - JSDocReturnTag = 280, - JSDocTypeTag = 281, - JSDocTemplateTag = 282, - JSDocTypedefTag = 283, - JSDocPropertyTag = 284, - JSDocTypeLiteral = 285, + JSDocTypeLiteral = 276, + JSDocTag = 277, + JSDocAugmentsTag = 278, + JSDocClassTag = 279, + JSDocParameterTag = 280, + JSDocReturnTag = 281, + JSDocTypeTag = 282, + JSDocTemplateTag = 283, + JSDocTypedefTag = 284, + JSDocPropertyTag = 285, SyntaxList = 286, NotEmittedStatement = 287, PartiallyEmittedExpression = 288, @@ -380,7 +380,7 @@ declare namespace ts { FirstNode = 143, FirstJSDocNode = 267, LastJSDocNode = 285, - FirstJSDocTagNode = 276, + FirstJSDocTagNode = 277, LastJSDocTagNode = 285, } enum NodeFlags {