diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index a3f8c950c36..ce50eeac19d 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -6614,7 +6614,7 @@ namespace ts {
                     let tag: JSDocTag | undefined;
                     switch (tagName.escapedText) {
                         case "author":
-                            tag = parseAuthorTag(start, tagName, indent);
+                            tag = parseAuthorTag(start, tagName, margin);
                             break;
                         case "augments":
                         case "extends":
@@ -6934,7 +6934,7 @@ namespace ts {
                                 break loop;
                         }
 
-                        token = nextJSDocToken();
+                        token = nextTokenJSDoc();
                     }
 
                     if (seenLessThan && seenGreaterThan) {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 0d55487a4a7..b557509f8ce 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -379,23 +379,24 @@ declare namespace ts {
         JSDocSignature = 299,
         JSDocTag = 300,
         JSDocAugmentsTag = 301,
-        JSDocClassTag = 302,
-        JSDocCallbackTag = 303,
-        JSDocEnumTag = 304,
-        JSDocParameterTag = 305,
-        JSDocReturnTag = 306,
-        JSDocThisTag = 307,
-        JSDocTypeTag = 308,
-        JSDocTemplateTag = 309,
-        JSDocTypedefTag = 310,
-        JSDocPropertyTag = 311,
-        SyntaxList = 312,
-        NotEmittedStatement = 313,
-        PartiallyEmittedExpression = 314,
-        CommaListExpression = 315,
-        MergeDeclarationMarker = 316,
-        EndOfDeclarationMarker = 317,
-        Count = 318,
+        JSDocAuthorTag = 302,
+        JSDocClassTag = 303,
+        JSDocCallbackTag = 304,
+        JSDocEnumTag = 305,
+        JSDocParameterTag = 306,
+        JSDocReturnTag = 307,
+        JSDocThisTag = 308,
+        JSDocTypeTag = 309,
+        JSDocTemplateTag = 310,
+        JSDocTypedefTag = 311,
+        JSDocPropertyTag = 312,
+        SyntaxList = 313,
+        NotEmittedStatement = 314,
+        PartiallyEmittedExpression = 315,
+        CommaListExpression = 316,
+        MergeDeclarationMarker = 317,
+        EndOfDeclarationMarker = 318,
+        Count = 319,
         FirstAssignment = 60,
         LastAssignment = 72,
         FirstCompoundAssignment = 61,
@@ -422,9 +423,9 @@ declare namespace ts {
         LastBinaryOperator = 72,
         FirstNode = 149,
         FirstJSDocNode = 289,
-        LastJSDocNode = 311,
+        LastJSDocNode = 312,
         FirstJSDocTagNode = 300,
-        LastJSDocTagNode = 311,
+        LastJSDocTagNode = 312,
     }
     enum NodeFlags {
         None = 0,
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 579b3276185..de6b2b187c2 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -379,23 +379,24 @@ declare namespace ts {
         JSDocSignature = 299,
         JSDocTag = 300,
         JSDocAugmentsTag = 301,
-        JSDocClassTag = 302,
-        JSDocCallbackTag = 303,
-        JSDocEnumTag = 304,
-        JSDocParameterTag = 305,
-        JSDocReturnTag = 306,
-        JSDocThisTag = 307,
-        JSDocTypeTag = 308,
-        JSDocTemplateTag = 309,
-        JSDocTypedefTag = 310,
-        JSDocPropertyTag = 311,
-        SyntaxList = 312,
-        NotEmittedStatement = 313,
-        PartiallyEmittedExpression = 314,
-        CommaListExpression = 315,
-        MergeDeclarationMarker = 316,
-        EndOfDeclarationMarker = 317,
-        Count = 318,
+        JSDocAuthorTag = 302,
+        JSDocClassTag = 303,
+        JSDocCallbackTag = 304,
+        JSDocEnumTag = 305,
+        JSDocParameterTag = 306,
+        JSDocReturnTag = 307,
+        JSDocThisTag = 308,
+        JSDocTypeTag = 309,
+        JSDocTemplateTag = 310,
+        JSDocTypedefTag = 311,
+        JSDocPropertyTag = 312,
+        SyntaxList = 313,
+        NotEmittedStatement = 314,
+        PartiallyEmittedExpression = 315,
+        CommaListExpression = 316,
+        MergeDeclarationMarker = 317,
+        EndOfDeclarationMarker = 318,
+        Count = 319,
         FirstAssignment = 60,
         LastAssignment = 72,
         FirstCompoundAssignment = 61,
@@ -422,9 +423,9 @@ declare namespace ts {
         LastBinaryOperator = 72,
         FirstNode = 149,
         FirstJSDocNode = 289,
-        LastJSDocNode = 311,
+        LastJSDocNode = 312,
         FirstJSDocTagNode = 300,
-        LastJSDocTagNode = 311,
+        LastJSDocTagNode = 312,
     }
     enum NodeFlags {
         None = 0,