Return expressions always need to be type checked

JsonFreeman · JsonFreeman · commit 46da6678ad08 · 2015-06-03T13:36:49.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7454,6 +7454,10 @@ module ts {
             }
 
             if (node.body) {
+                if (!node.type) {
+                    getReturnTypeOfSignature(getSignatureFromDeclaration(node));
+                }
+
                 if (node.body.kind === SyntaxKind.Block) {
                     checkSourceElement(node.body);
                 }
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.errors.txt
@@ -1,12 +1,15 @@
 tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(1,1): error TS1108: A 'return' statement can only be used within a function body.
+tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(1,18): error TS2304: Cannot find name 'role'.
 tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(2,18): error TS2304: Cannot find name 'Role'.
 tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts(4,26): error TS2503: Cannot find namespace 'ng'.
 
 
-==== tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts (3 errors) ====
+==== tests/cases/compiler/multiLinePropertyAccessAndArrowFunctionIndent1.ts (4 errors) ====
     return this.edit(role)
     ~~~~~~
 !!! error TS1108: A 'return' statement can only be used within a function body.
+                     ~~~~
+!!! error TS2304: Cannot find name 'role'.
         .then((role: Role) =>
                      ~~~~
 !!! error TS2304: Cannot find name 'Role'.
diff --git a/tests/baselines/reference/typeCheckReturnExpression.errors.txt b/tests/baselines/reference/typeCheckReturnExpression.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/compiler/typeCheckReturnExpression.ts(1,11): error TS7011: Function expression, which lacks return-type annotation, implicitly has an 'any' return type.
+
+
+==== tests/cases/compiler/typeCheckReturnExpression.ts (1 errors) ====
+    var foo = () => undefined;
+              ~~~~~~~~~~~~~~~
+!!! error TS7011: Function expression, which lacks return-type annotation, implicitly has an 'any' return type.
diff --git a/tests/baselines/reference/typeCheckReturnExpression.js b/tests/baselines/reference/typeCheckReturnExpression.js
@@ -0,0 +1,5 @@
+//// [typeCheckReturnExpression.ts]
+var foo = () => undefined;
+
+//// [typeCheckReturnExpression.js]
+var foo = function () { return undefined; };
diff --git a/tests/cases/compiler/typeCheckReturnExpression.ts b/tests/cases/compiler/typeCheckReturnExpression.ts
@@ -0,0 +1,2 @@
+//@noImplicitAny: true
+var foo = () => undefined;

Original file line number	Diff line number	Diff line change
`@@ -7454,6 +7454,10 @@ module ts {`
`7454`	`7454`	`}`
`7455`	`7455`
`7456`	`7456`	`if (node.body) {`
	`7457`	`+ if (!node.type) {`
	`7458`	`+ getReturnTypeOfSignature(getSignatureFromDeclaration(node));`
	`7459`	`+ }`
	`7460`	`+`
`7457`	`7461`	`if (node.body.kind === SyntaxKind.Block) {`
`7458`	`7462`	`checkSourceElement(node.body);`
`7459`	`7463`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+//@noImplicitAny: true`
	`2`	`+var foo = () => undefined;`