diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 25c275fe969..afa6e36a6de 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1842,7 +1842,8 @@ namespace ts {
                 node.originalKeywordKind! >= SyntaxKind.FirstFutureReservedWord &&
                 node.originalKeywordKind! <= SyntaxKind.LastFutureReservedWord &&
                 !isIdentifierName(node) &&
-                !(node.flags & NodeFlags.Ambient)) {
+                !(node.flags & NodeFlags.Ambient) &&
+                !(node.flags & NodeFlags.JSDoc)) {
 
                 // Report error only if there are no parse errors in file
                 if (!file.parseDiagnostics.length) {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 704260e7279..a81cf8e29ef 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -6434,7 +6434,7 @@ namespace ts {
             export function parseIsolatedJSDocComment(content: string, start: number | undefined, length: number | undefined): { jsDoc: JSDoc, diagnostics: Diagnostic[] } | undefined {
                 initializeState(content, ScriptTarget.Latest, /*_syntaxCursor:*/ undefined, ScriptKind.JS);
                 sourceFile = <SourceFile>{ languageVariant: LanguageVariant.Standard, text: content }; // tslint:disable-line no-object-literal-type-assertion
-                const jsDoc = parseJSDocCommentWorker(start, length);
+                const jsDoc = doInsideOfContext(NodeFlags.JSDoc, () => parseJSDocCommentWorker(start, length));
                 const diagnostics = parseDiagnostics;
                 clearState();
 
@@ -6446,7 +6446,7 @@ namespace ts {
                 const saveParseDiagnosticsLength = parseDiagnostics.length;
                 const saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
 
-                const comment = parseJSDocCommentWorker(start, length);
+                const comment = doInsideOfContext(NodeFlags.JSDoc, () => parseJSDocCommentWorker(start, length));
                 if (comment) {
                     comment.parent = parent;
                 }
@@ -6477,7 +6477,7 @@ namespace ts {
                 CallbackParameter = 1 << 2,
             }
 
-            export function parseJSDocCommentWorker(start = 0, length: number | undefined): JSDoc | undefined {
+            function parseJSDocCommentWorker(start = 0, length: number | undefined): JSDoc | undefined {
                 const content = sourceText;
                 const end = length === undefined ? content.length : start + length;
                 length = end - start;
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index eccce228d34..2ac31eb2e7b 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -2159,7 +2159,6 @@ namespace ts {
                         tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
                         return token = getIdentifierToken();
                     }
-                    error(Diagnostics.Invalid_character);
                     pos++;
                     return token = SyntaxKind.Unknown;
             }
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json
index 0cf9640d8b7..9817af1157f 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json	
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json	
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 127,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json
index 3eb18224068..05eb1275891 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json	
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json	
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 66,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json
index 04160cb1848..3a6ee3365dc 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 44,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json
index cd2e8dcc822..2fa5734c1a3 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 49,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json
index 94083d05508..2d4beb55b12 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 23,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "comment": "* @type {number}"
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json
index 54e06da0465..eff1b97e80a 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 112,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json
index 10cfd883c98..cf684f317f6 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 5,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
index ed9660cb05a..8f056c2da40 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json
index 642fde1b7da..e0a57b72e93 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json	
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json	
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 61,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
index ed9660cb05a..8f056c2da40 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
index a661ddc90c4..e0c0f1c9713 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 20,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
index b153b897d74..1b072194d84 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 34,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
index b77c09d380e..712ac49a36f 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 59,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
index f30f67c5394..3eebbc73ba9 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 61,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
index 6c8c57a5347..d864cbeafd2 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 66,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
index 24779f14f89..223d1e95105 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 34,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
index cf503702588..4c29e477e10 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 46,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
index ec4a36acc53..c2cb7a167db 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 23,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
index c50d3389a71..a2d66247e14 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 29,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
index 6576be9ef70..5fe9854187d 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 54,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
index 2170ab303bb..3d1722eedc2 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 30,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
index 6f63982375d..1e7cc39feb7 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 24,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
index 25d1916f4b4..0428568bdb4 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 26,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
index e8367c03624..e7e6a0f30d0 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
index e8367c03624..e7e6a0f30d0 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
index 7d1ecb252a6..1322ca477f2 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 28,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
index af38432f2e0..c3e885082a6 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 60,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json
index 6b26905e200..6e8ff913426 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 7,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "comment": "*"
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
index a9c8c5b4d3e..5532f8fd2d1 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 60,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
index 7e420be3441..3d7c904d305 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 56,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
index ed9660cb05a..8f056c2da40 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
index 85ab7e185c4..62307391798 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 102,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/jsdocInvalidTokens.symbols b/tests/baselines/reference/jsdocInvalidTokens.symbols
new file mode 100644
index 00000000000..82b4cc36a68
--- /dev/null
+++ b/tests/baselines/reference/jsdocInvalidTokens.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/scanner/jsdocInvalidTokens.js ===
+/**
+ *
+ * unicode-escape = "\u{abcdefghi}" -- should not have error for invalid unicode escape
+ * unicode-escape2 = "qq\u{abcdefghi}" -- no error here either
+ * quoted-pair = "\" -- should not have error for invalid quote sequence
+ * or for the tag below:
+ * @private
+ */
+var hi = 1
+>hi : Symbol(hi, Decl(jsdocInvalidTokens.js, 8, 3))
+
diff --git a/tests/baselines/reference/jsdocInvalidTokens.types b/tests/baselines/reference/jsdocInvalidTokens.types
new file mode 100644
index 00000000000..3e9638b7197
--- /dev/null
+++ b/tests/baselines/reference/jsdocInvalidTokens.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/scanner/jsdocInvalidTokens.js ===
+/**
+ *
+ * unicode-escape = "\u{abcdefghi}" -- should not have error for invalid unicode escape
+ * unicode-escape2 = "qq\u{abcdefghi}" -- no error here either
+ * quoted-pair = "\" -- should not have error for invalid quote sequence
+ * or for the tag below:
+ * @private
+ */
+var hi = 1
+>hi : number
+>1 : 1
+
diff --git a/tests/cases/conformance/scanner/jsdocInvalidTokens.ts b/tests/cases/conformance/scanner/jsdocInvalidTokens.ts
new file mode 100644
index 00000000000..6962b976725
--- /dev/null
+++ b/tests/cases/conformance/scanner/jsdocInvalidTokens.ts
@@ -0,0 +1,15 @@
+// @Filename: jsdocInvalidTokens.js
+// @strict: true
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+
+/**
+ *
+ * unicode-escape = "\u{abcdefghi}" -- should not have error for invalid unicode escape
+ * unicode-escape2 = "qq\u{abcdefghi}" -- no error here either
+ * quoted-pair = "\" -- should not have error for invalid quote sequence
+ * or for the tag below:
+ * @private
+ */
+var hi = 1