Merge pull request microsoft#17994 from Microsoft/allow-question-token-as-start-of-type

sandersn · web-flow · commit 356f54af3d70 · 2017-08-23T15:40:25.000-07:00
Allow question token as start of type
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -2721,6 +2721,7 @@ namespace ts {
                 case SyntaxKind.FalseKeyword:
                 case SyntaxKind.ObjectKeyword:
                 case SyntaxKind.AsteriskToken:
+                case SyntaxKind.QuestionToken:
                     return true;
                 case SyntaxKind.MinusToken:
                     return lookAhead(nextTokenIsNumericLiteral);
diff --git a/tests/baselines/reference/checkJsdocTypeTag3.errors.txt b/tests/baselines/reference/checkJsdocTypeTag3.errors.txt
diff --git a/tests/baselines/reference/checkJsdocTypeTag3.js b/tests/baselines/reference/checkJsdocTypeTag3.js
diff --git a/tests/baselines/reference/checkJsdocTypeTag3.symbols b/tests/baselines/reference/checkJsdocTypeTag3.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/jsdoc/test.js ===
+/** @type {Array<?number>} */
+var nns;
+>nns : Symbol(nns, Decl(test.js, 1, 3))
+
diff --git a/tests/baselines/reference/checkJsdocTypeTag3.types b/tests/baselines/reference/checkJsdocTypeTag3.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/jsdoc/test.js ===
+/** @type {Array<?number>} */
+var nns;
+>nns : number[]
+
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -84,7 +84,6 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(169,20): e
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(169,23): error TS1003: Identifier expected.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(169,27): error TS1005: ',' expected.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(170,23): error TS1005: ',' expected.
-tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(170,24): error TS1138: Parameter declaration expected.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(171,28): error TS1003: Identifier expected.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(171,32): error TS1005: ',' expected.
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(172,30): error TS1005: ',' expected.
@@ -94,7 +93,7 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(175,32): e
 tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(175,35): error TS2304: Cannot find name 'm'.
 
 
-==== tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts (60 errors) ====
+==== tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts (59 errors) ====
     class C {
         n: number;
         explicitThis(this: this, m: number): number {
@@ -403,8 +402,6 @@ tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(175,35): e
     function optional(this?: C): number { return this.n; }
                           ~
 !!! error TS1005: ',' expected.
-                           ~
-!!! error TS1138: Parameter declaration expected.
     function decorated(@deco() this: C): number { return this.n; }
                                ~~~~
 !!! error TS1003: Identifier expected.
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.js b/tests/baselines/reference/thisTypeInFunctionsNegative.js
@@ -345,7 +345,7 @@ function modifiers(, C) {
     return this.n;
 }
 function restParam(C) { return this.n; }
-function optional(C) { return this.n; }
+function optional() { return this.n; }
 function decorated(, C) {
     if ( === void 0) {  = this; }
     return this.n;
diff --git a/tests/cases/conformance/jsdoc/checkJsdocTypeTag3.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag3.ts
@@ -0,0 +1,6 @@
+// @Filename:test.js
+// @checkJs: true
+// @allowJs: true
+// @noEmit: true
+/** @type {Array<?number>} */
+var nns;

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ function modifiers(, C) {`
`345`	`345`	`return this.n;`
`346`	`346`	`}`
`347`	`347`	`function restParam(C) { return this.n; }`
`348`		`-function optional(C) { return this.n; }`
	`348`	`+function optional() { return this.n; }`
`349`	`349`	`function decorated(, C) {`
`350`	`350`	`if ( === void 0) { = this; }`
`351`	`351`	`return this.n;`