fix changes missed in merge

sandersn · sandersn · commit c91de88104de · 2023-03-07T14:32:32.000-08:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -8606,10 +8606,6 @@ namespace Parser {
                 }
                 loop: while (true) {
                     switch (token()) {
-                        case SyntaxKind.JSDocCommentTextToken:
-                            state = JSDocState.SavingComments;
-                            pushComment(scanner.getTokenValue());
-                            break;
                         case SyntaxKind.AtToken:
                             removeTrailingWhitespace(comments);
                             if (!commentsPos) commentsPos = getNodePos();
@@ -8650,6 +8646,10 @@ namespace Parser {
                             break;
                         case SyntaxKind.EndOfFileToken:
                             break loop;
+                        case SyntaxKind.JSDocCommentTextToken:
+                            state = JSDocState.SavingComments;
+                            pushComment(scanner.getTokenValue());
+                            break;
                         case SyntaxKind.OpenBraceToken:
                             state = JSDocState.SavingComments;
                             const commentEnd = scanner.getTokenFullStart();
@@ -8882,20 +8882,13 @@ namespace Parser {
                 let tok = token() as JSDocSyntaxKind | SyntaxKind.JSDocCommentTextToken;
                 loop: while (true) {
                     switch (tok) {
-                        case SyntaxKind.JSDocCommentTextToken:
-                            if (state !== JSDocState.SavingBackticks) {
-                                state = JSDocState.SavingComments; // leading identifiers start recording as well
-                            }
-                            pushComment(scanner.getTokenValue());
-                            break;
                         case SyntaxKind.NewLineTrivia:
                             state = JSDocState.BeginningOfLine;
                             // don't use pushComment here because we want to keep the margin unchanged
                             comments.push(scanner.getTokenText());
                             indent = 0;
                             break;
                         case SyntaxKind.AtToken:
-                            scanner.setTextPos(scanner.getTextPos() - 1);
                             scanner.resetTokenState(scanner.getTokenEnd() - 1);
                             break loop;
                         case SyntaxKind.EndOfFileToken:
@@ -8935,6 +8928,12 @@ namespace Parser {
                             }
                             pushComment(scanner.getTokenText());
                             break;
+                        case SyntaxKind.JSDocCommentTextToken:
+                            if (state !== JSDocState.SavingBackticks) {
+                                state = JSDocState.SavingComments; // leading identifiers start recording as well
+                            }
+                            pushComment(scanner.getTokenValue());
+                            break;
                         case SyntaxKind.AsteriskToken:
                             if (state === JSDocState.BeginningOfLine) {
                                 // leading asterisks start recording on the *next* (non-whitespace) token
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -2471,7 +2471,7 @@ export function createScanner(languageVersion: ScriptTarget,
     }
 
     function scanJSDocCommentTextToken(inBackticks: boolean): JSDocSyntaxKind | SyntaxKind.JSDocCommentTextToken {
-        startPos = tokenPos = pos;
+        fullStartPos = tokenStart = pos;
         tokenFlags = TokenFlags.None;
         if (pos >= end) {
             return token = SyntaxKind.EndOfFileToken;
@@ -2491,10 +2491,10 @@ export function createScanner(languageVersion: ScriptTarget,
                 }
             }
         }
-        if (pos === tokenPos) {
+        if (pos === tokenStart) {
             return scanJsDocToken();
         }
-        tokenValue = text.substring(tokenPos, pos);
+        tokenValue = text.substring(tokenStart, pos);
         return token = SyntaxKind.JSDocCommentTextToken;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2471,7 +2471,7 @@ export function createScanner(languageVersion: ScriptTarget,`
`2471`	`2471`	`}`
`2472`	`2472`
`2473`	`2473`	`function scanJSDocCommentTextToken(inBackticks: boolean): JSDocSyntaxKind \| SyntaxKind.JSDocCommentTextToken {`
`2474`		`- startPos = tokenPos = pos;`
	`2474`	`+ fullStartPos = tokenStart = pos;`
`2475`	`2475`	`tokenFlags = TokenFlags.None;`
`2476`	`2476`	`if (pos >= end) {`
`2477`	`2477`	`return token = SyntaxKind.EndOfFileToken;`
`@@ -2491,10 +2491,10 @@ export function createScanner(languageVersion: ScriptTarget,`
`2491`	`2491`	`}`
`2492`	`2492`	`}`
`2493`	`2493`	`}`
`2494`		`- if (pos === tokenPos) {`
	`2494`	`+ if (pos === tokenStart) {`
`2495`	`2495`	`return scanJsDocToken();`
`2496`	`2496`	`}`
`2497`		`- tokenValue = text.substring(tokenPos, pos);`
	`2497`	`+ tokenValue = text.substring(tokenStart, pos);`
`2498`	`2498`	`return token = SyntaxKind.JSDocCommentTextToken;`
`2499`	`2499`	`}`
`2500`	`2500`