microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-20 19:45:07 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove error on invalid jsdoc tokens (#32769)

Browse Source 
* Remove error on invalid jsdoc tokens

In JSDoc:

1. In the scanner, don't issue an error, even for invalid identifiers.
2. In the binder, don't issue an error for reserved (but otherwise valid)
identifiers.

/**
 * Example of 1: "\"
 * Example of 2: @private
 */

* Update baselines

* Add invalid unicode escape test for JSDoc

* Add quotes around invalid unicode escape

* Add another unicode escape JSDoc test
This commit is contained in:
Nathan Shively-Sanders 2019-08-09 12:53:15 -07:00 committed by GitHub
parent b24050aefd
commit 85b8d27ea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 77 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/binder.ts
View File

@ -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) {

6
src/compiler/parser.ts
View File

@ -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;

1
src/compiler/scanner.ts
View File

@ -2159,7 +2159,6 @@ namespace ts {
tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
return token = getIdentifierToken();
}
error(Diagnostics.Invalid_character);
pos++;
return token = SyntaxKind.Unknown;
}

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 127,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 66,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 44,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 49,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 23,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"comment": "* @type {number}"

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 112,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 5,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0
}

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 27,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 61,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 27,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 20,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 34,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 59,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 61,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 66,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 34,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 46,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 23,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 29,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 54,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 30,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 24,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 26,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 27,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 27,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 28,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 60,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 7,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"comment": "*"

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 60,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 56,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 27,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

1
tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
View File

@ -2,6 +2,7 @@
"kind": "JSDocComment",
"pos": 0,
"end": 102,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"tags": {

12
tests/baselines/reference/jsdocInvalidTokens.symbols Normal file
View File

@ -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))

13
tests/baselines/reference/jsdocInvalidTokens.types Normal file
View File

@ -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

15
tests/cases/conformance/scanner/jsdocInvalidTokens.ts Normal file
View File

@ -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