JSDocTypeTag.typeExpression is not optional (microsoft#30452)

ajafff · RyanCavanaugh · commit 5bc8a8dddfa2 · 2019-04-30T09:46:32.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -18613,7 +18613,7 @@ namespace ts {
                 case SyntaxKind.ParenthesizedExpression: {
                     // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
                     const tag = isInJSFile(parent) ? getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression!.type) : getContextualType(<ParenthesizedExpression>parent, contextFlags);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(<ParenthesizedExpression>parent, contextFlags);
                 }
                 case SyntaxKind.JsxExpression:
                     return getContextualTypeForJsxExpression(<JsxExpression>parent);
@@ -24231,7 +24231,7 @@ namespace ts {
         function checkParenthesizedExpression(node: ParenthesizedExpression, checkMode?: CheckMode): Type {
             const tag = isInJSFile(node) ? getJSDocTypeTag(node) : undefined;
             if (tag) {
-                return checkAssertionWorker(tag, tag.typeExpression!.type, node.expression, checkMode);
+                return checkAssertionWorker(tag, tag.typeExpression.type, node.expression, checkMode);
             }
             return checkExpression(node.expression, checkMode);
         }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -2189,7 +2189,7 @@ namespace ts {
     }
 
     /* @internal */
-    export function createJSDocTypeTag(typeExpression?: JSDocTypeExpression, comment?: string): JSDocTypeTag {
+    export function createJSDocTypeTag(typeExpression: JSDocTypeExpression, comment?: string): JSDocTypeTag {
         const tag = createJSDocTag<JSDocTypeTag>(SyntaxKind.JSDocTypeTag, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -6855,7 +6855,7 @@ namespace ts {
                 }
 
                 function parseReturnTag(start: number, tagName: Identifier): JSDocReturnTag {
-                    if (forEach(tags, t => t.kind === SyntaxKind.JSDocReturnTag)) {
+                    if (some(tags, isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
 
@@ -6866,7 +6866,7 @@ namespace ts {
                 }
 
                 function parseTypeTag(start: number, tagName: Identifier): JSDocTypeTag {
-                    if (forEach(tags, t => t.kind === SyntaxKind.JSDocTypeTag)) {
+                    if (some(tags, isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2482,7 +2482,7 @@ namespace ts {
 
     export interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
-        typeExpression?: JSDocTypeExpression;
+        typeExpression: JSDocTypeExpression;
     }
 
     export interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
diff --git a/src/services/jsDoc.ts b/src/services/jsDoc.ts
@@ -134,7 +134,7 @@ namespace ts.JsDoc {
             case SyntaxKind.JSDocTemplateTag:
                 return withList((tag as JSDocTemplateTag).typeParameters);
             case SyntaxKind.JSDocTypeTag:
-                return withNode((tag as JSDocTypeTag).typeExpression!);
+                return withNode((tag as JSDocTypeTag).typeExpression);
             case SyntaxKind.JSDocTypedefTag:
             case SyntaxKind.JSDocCallbackTag:
             case SyntaxKind.JSDocPropertyTag:
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -1603,7 +1603,7 @@ declare namespace ts {
     }
     interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
-        typeExpression?: JSDocTypeExpression;
+        typeExpression: JSDocTypeExpression;
     }
     interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -1603,7 +1603,7 @@ declare namespace ts {
     }
     interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
-        typeExpression?: JSDocTypeExpression;
+        typeExpression: JSDocTypeExpression;
     }
     interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;

Original file line number	Diff line number	Diff line change
`@@ -18613,7 +18613,7 @@ namespace ts {`
`18613`	`18613`	`case SyntaxKind.ParenthesizedExpression: {`
`18614`	`18614`	// Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
`18615`	`18615`	`const tag = isInJSFile(parent) ? getJSDocTypeTag(parent) : undefined;`
`18616`		`- return tag ? getTypeFromTypeNode(tag.typeExpression!.type) : getContextualType(<ParenthesizedExpression>parent, contextFlags);`
	`18616`	`+ return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(<ParenthesizedExpression>parent, contextFlags);`
`18617`	`18617`	`}`
`18618`	`18618`	`case SyntaxKind.JsxExpression:`
`18619`	`18619`	`return getContextualTypeForJsxExpression(<JsxExpression>parent);`
`@@ -24231,7 +24231,7 @@ namespace ts {`
`24231`	`24231`	`function checkParenthesizedExpression(node: ParenthesizedExpression, checkMode?: CheckMode): Type {`
`24232`	`24232`	`const tag = isInJSFile(node) ? getJSDocTypeTag(node) : undefined;`
`24233`	`24233`	`if (tag) {`
`24234`		`- return checkAssertionWorker(tag, tag.typeExpression!.type, node.expression, checkMode);`
	`24234`	`+ return checkAssertionWorker(tag, tag.typeExpression.type, node.expression, checkMode);`
`24235`	`24235`	`}`
`24236`	`24236`	`return checkExpression(node.expression, checkMode);`
`24237`	`24237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2189,7 +2189,7 @@ namespace ts {`
`2189`	`2189`	`}`
`2190`	`2190`
`2191`	`2191`	`/* @internal */`
`2192`		`- export function createJSDocTypeTag(typeExpression?: JSDocTypeExpression, comment?: string): JSDocTypeTag {`
	`2192`	`+ export function createJSDocTypeTag(typeExpression: JSDocTypeExpression, comment?: string): JSDocTypeTag {`
`2193`	`2193`	`const tag = createJSDocTag<JSDocTypeTag>(SyntaxKind.JSDocTypeTag, "type");`
`2194`	`2194`	`tag.typeExpression = typeExpression;`
`2195`	`2195`	`tag.comment = comment;`
Original file line number	Diff line number	Diff line change
`@@ -6855,7 +6855,7 @@ namespace ts {`
`6855`	`6855`	`}`
`6856`	`6856`
`6857`	`6857`	`function parseReturnTag(start: number, tagName: Identifier): JSDocReturnTag {`
`6858`		`- if (forEach(tags, t => t.kind === SyntaxKind.JSDocReturnTag)) {`
	`6858`	`+ if (some(tags, isJSDocReturnTag)) {`
`6859`	`6859`	`parseErrorAt(tagName.pos, scanner.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);`
`6860`	`6860`	`}`
`6861`	`6861`
`@@ -6866,7 +6866,7 @@ namespace ts {`
`6866`	`6866`	`}`
`6867`	`6867`
`6868`	`6868`	`function parseTypeTag(start: number, tagName: Identifier): JSDocTypeTag {`
`6869`		`- if (forEach(tags, t => t.kind === SyntaxKind.JSDocTypeTag)) {`
	`6869`	`+ if (some(tags, isJSDocTypeTag)) {`
`6870`	`6870`	`parseErrorAt(tagName.pos, scanner.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);`
`6871`	`6871`	`}`
`6872`	`6872`
Original file line number	Diff line number	Diff line change
`@@ -2482,7 +2482,7 @@ namespace ts {`
`2482`	`2482`
`2483`	`2483`	`export interface JSDocTypeTag extends JSDocTag {`
`2484`	`2484`	`kind: SyntaxKind.JSDocTypeTag;`
`2485`		`- typeExpression?: JSDocTypeExpression;`
	`2485`	`+ typeExpression: JSDocTypeExpression;`
`2486`	`2486`	`}`
`2487`	`2487`
`2488`	`2488`	`export interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {`
Original file line number	Diff line number	Diff line change
`@@ -1603,7 +1603,7 @@ declare namespace ts {`
`1603`	`1603`	`}`
`1604`	`1604`	`interface JSDocTypeTag extends JSDocTag {`
`1605`	`1605`	`kind: SyntaxKind.JSDocTypeTag;`
`1606`		`- typeExpression?: JSDocTypeExpression;`
	`1606`	`+ typeExpression: JSDocTypeExpression;`
`1607`	`1607`	`}`
`1608`	`1608`	`interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {`
`1609`	`1609`	`parent: JSDoc;`