getFirstToken returns jsdoc as single comment

sandersn · sandersn · commit 1183129bda17 · 2017-01-20T10:17:11.000-08:00
This is a bit odd, but it's the way that 2.0 and earlier behaved. 2.1
broke it.
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -421,7 +421,7 @@
         LastBinaryOperator = CaretEqualsToken,
         FirstNode = QualifiedName,
         FirstJSDocNode = JSDocTypeExpression,
-        LastJSDocNode = JSDocLiteralType,
+        LastJSDocNode = JSDocNeverKeyword,
         FirstJSDocTagNode = JSDocComment,
         LastJSDocTagNode = JSDocNeverKeyword
     }
diff --git a/src/harness/unittests/jsDocParsing.ts b/src/harness/unittests/jsDocParsing.ts
@@ -288,5 +288,19 @@ namespace ts {
   */`);
             });
         });
+        describe("getFirstToken", () => {
+            it("gets jsdoc", () => {
+                const first = ts.createSourceFile("foo.ts", "/** comment */var a = true;", ts.ScriptTarget.ES5, /*setParentNodes*/ true);
+                assert.isDefined(first);
+                assert.equal(first.kind, 263);
+            });
+        });
+        describe("getLastToken", () => {
+            it("gets jsdoc", () => {
+                const last = ts.createSourceFile("foo.ts", "var a = true;/** comment */", ts.ScriptTarget.ES5, /*setParentNodes*/ true);
+                assert.isDefined(last);
+                assert.equal(last.kind, 263);
+            });
+        });
     });
 }
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -194,8 +194,9 @@ namespace ts {
             }
 
             const child = children[0];
-
-            return child.kind < SyntaxKind.FirstNode ? child : child.getFirstToken(sourceFile);
+            return child.kind < SyntaxKind.FirstNode || SyntaxKind.FirstJSDocNode <= child.kind && child.kind <= SyntaxKind.LastJSDocNode ?
+                child :
+                child.getFirstToken(sourceFile);
         }
 
         public getLastToken(sourceFile?: SourceFile): Node {
@@ -206,7 +207,9 @@ namespace ts {
                 return undefined;
             }
 
-            return child.kind < SyntaxKind.FirstNode ? child : child.getLastToken(sourceFile);
+            return child.kind < SyntaxKind.FirstNode || SyntaxKind.FirstJSDocNode <= child.kind && child.kind <= SyntaxKind.LastJSDocNode ?
+                child :
+                child.getLastToken(sourceFile);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@`
`421`	`421`	`LastBinaryOperator = CaretEqualsToken,`
`422`	`422`	`FirstNode = QualifiedName,`
`423`	`423`	`FirstJSDocNode = JSDocTypeExpression,`
`424`		`- LastJSDocNode = JSDocLiteralType,`
	`424`	`+ LastJSDocNode = JSDocNeverKeyword,`
`425`	`425`	`FirstJSDocTagNode = JSDocComment,`
`426`	`426`	`LastJSDocTagNode = JSDocNeverKeyword`
`427`	`427`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,9 @@ namespace ts {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`const child = children[0];`
`197`		`-`
`198`		`- return child.kind < SyntaxKind.FirstNode ? child : child.getFirstToken(sourceFile);`
	`197`	`+ return child.kind < SyntaxKind.FirstNode \|\| SyntaxKind.FirstJSDocNode <= child.kind && child.kind <= SyntaxKind.LastJSDocNode ?`
	`198`	`+ child :`
	`199`	`+ child.getFirstToken(sourceFile);`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`public getLastToken(sourceFile?: SourceFile): Node {`
`@@ -206,7 +207,9 @@ namespace ts {`
`206`	`207`	`return undefined;`
`207`	`208`	`}`
`208`	`209`
`209`		`- return child.kind < SyntaxKind.FirstNode ? child : child.getLastToken(sourceFile);`
	`210`	`+ return child.kind < SyntaxKind.FirstNode \|\| SyntaxKind.FirstJSDocNode <= child.kind && child.kind <= SyntaxKind.LastJSDocNode ?`
	`211`	`+ child :`
	`212`	`+ child.getLastToken(sourceFile);`
`210`	`213`	`}`
`211`	`214`	`}`
`212`	`215`