From e7bf44e820584b52be6c1c198780acc7388d7dee Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 21 Jul 2017 17:20:56 -0700
Subject: [PATCH] Fix for loop which retains jsdoc behaviors

---
 src/compiler/parser.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 0be7734968f..7b294467d7c 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1881,6 +1881,11 @@ namespace ts {
                     if (considerSemicolonAsDelimiter && token() === SyntaxKind.SemicolonToken && !scanner.hasPrecedingLineBreak()) {
                         nextToken();
                     }
+                    else if (isJSDocParameterStart() && parsingContext & (1 << ParsingContext.Parameters)) {
+                        // If the token was a jsdoc parameter start and we're parsing parameter lists,
+                        // we need to consume the (mostly erroneous) parameter token
+                        nextToken();
+                    }
                     continue;
                 }
 
@@ -2202,7 +2207,11 @@ namespace ts {
             return token() === SyntaxKind.DotDotDotToken ||
                 isIdentifierOrPattern() ||
                 isModifierKind(token()) ||
-                token() === SyntaxKind.AtToken || token() === SyntaxKind.ThisKeyword || token() === SyntaxKind.NewKeyword ||
+                token() === SyntaxKind.AtToken || token() === SyntaxKind.ThisKeyword || isJSDocParameterStart();
+        }
+
+        function isJSDocParameterStart(): boolean {
+            return token() === SyntaxKind.NewKeyword ||
                 token() === SyntaxKind.StringLiteral || token() === SyntaxKind.NumericLiteral;
         }