Merge pull request microsoft#6709 from RyanCavanaugh/fix6662

RyanCavanaugh · RyanCavanaugh · commit bd3e9f262ad8 · 2016-02-02T13:40:13.000-08:00
Don't crash when return type jsdoc tag is malformed
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -10380,9 +10380,11 @@ namespace ts {
 
         function getReturnTypeFromJSDocComment(func: SignatureDeclaration | FunctionDeclaration): Type {
             const returnTag = getJSDocReturnTag(func);
-            if (returnTag) {
+            if (returnTag && returnTag.typeExpression) {
                 return getTypeFromTypeNode(returnTag.typeExpression.type);
             }
+
+            return undefined;
         }
 
         function createPromiseType(promisedType: Type): Type {
diff --git a/tests/cases/fourslash/getJavaScriptQuickInfo7.ts b/tests/cases/fourslash/getJavaScriptQuickInfo7.ts
@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: file.js
+//// /**
+////  * This is a very cool function that is very nice.
+////  * @returns something
+////  * @param p anotherthing
+////  */
+//// function a1(p) {
+//// 	try {
+//// 		throw new Error('x');
+//// 	} catch (x) { x--; }
+//// 	return 23;
+//// }
+//// 
+//// x - /**/a1()
+
+goTo.marker();
+verify.quickInfoExists();

Original file line number	Diff line number	Diff line change
`@@ -10380,9 +10380,11 @@ namespace ts {`
`10380`	`10380`
`10381`	`10381`	`function getReturnTypeFromJSDocComment(func: SignatureDeclaration \| FunctionDeclaration): Type {`
`10382`	`10382`	`const returnTag = getJSDocReturnTag(func);`
`10383`		`- if (returnTag) {`
	`10383`	`+ if (returnTag && returnTag.typeExpression) {`
`10384`	`10384`	`return getTypeFromTypeNode(returnTag.typeExpression.type);`
`10385`	`10385`	`}`
	`10386`	`+`
	`10387`	`+ return undefined;`
`10386`	`10388`	`}`
`10387`	`10389`
`10388`	`10390`	`function createPromiseType(promisedType: Type): Type {`