From 46da6678ad082b53de4698740fa751bba7c8c29a Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Tue, 2 Jun 2015 17:33:57 -0700
Subject: [PATCH] Return expressions always need to be type checked

---
 src/compiler/checker.ts                                    | 4 ++++
 ...ltiLinePropertyAccessAndArrowFunctionIndent1.errors.txt | 5 ++++-
 .../reference/typeCheckReturnExpression.errors.txt         | 7 +++++++
 tests/baselines/reference/typeCheckReturnExpression.js     | 5 +++++
 tests/cases/compiler/typeCheckReturnExpression.ts          | 2 ++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/typeCheckReturnExpression.errors.txt
 create mode 100644 tests/baselines/reference/typeCheckReturnExpression.js
 create mode 100644 tests/cases/compiler/typeCheckReturnExpression.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index ab5d8e4207f..aa3b69d9b34 100644
--- 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
index 14b7769d22f..abf11dc9dba 100644
--- 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
new file mode 100644
index 00000000000..c648c57799d
--- /dev/null
+++ 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.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeCheckReturnExpression.js b/tests/baselines/reference/typeCheckReturnExpression.js
new file mode 100644
index 00000000000..ba71780b48d
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..00f75912bd1
--- /dev/null
+++ b/tests/cases/compiler/typeCheckReturnExpression.ts
@@ -0,0 +1,2 @@
+//@noImplicitAny: true
+var foo = () => undefined;
\ No newline at end of file