Merge pull request microsoft#26150 from Kingwl/CheckReturnUnknow

RyanCavanaugh · web-flow · commit bad002cfb7d2 · 2018-08-06T13:52:14.000-07:00
add check for function return unknow type
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -20681,7 +20681,7 @@ namespace ts {
             }
 
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && maybeTypeOfKind(returnType, TypeFlags.AnyOrUnknown | TypeFlags.Void)) {
+            if (returnType && maybeTypeOfKind(returnType, TypeFlags.Any | TypeFlags.Void)) {
                 return;
             }
 
diff --git a/tests/baselines/reference/unknownType1.errors.txt b/tests/baselines/reference/unknownType1.errors.txt
@@ -18,11 +18,12 @@ tests/cases/conformance/types/unknown/unknownType1.ts(114,9): error TS2322: Type
   Type 'unknown' is not assignable to type '{}'.
 tests/cases/conformance/types/unknown/unknownType1.ts(120,9): error TS2322: Type 'T' is not assignable to type 'object'.
 tests/cases/conformance/types/unknown/unknownType1.ts(129,5): error TS2322: Type '123' is not assignable to type '{ [x: string]: unknown; }'.
+tests/cases/conformance/types/unknown/unknownType1.ts(149,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/types/unknown/unknownType1.ts(155,14): error TS2700: Rest types may only be created from object types.
 tests/cases/conformance/types/unknown/unknownType1.ts(161,5): error TS2564: Property 'a' has no initializer and is not definitely assigned in the constructor.
 
 
-==== tests/cases/conformance/types/unknown/unknownType1.ts (21 errors) ====
+==== tests/cases/conformance/types/unknown/unknownType1.ts (22 errors) ====
     // In an intersection everything absorbs unknown
     
     type T00 = unknown & null;  // null
@@ -211,6 +212,8 @@ tests/cases/conformance/types/unknown/unknownType1.ts(161,5): error TS2564: Prop
     // Functions with unknown return type don't need return expressions
     
     function f27(): unknown {
+                    ~~~~~~~
+!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     }
     
     // Rest type cannot be created from unknown

Original file line number	Diff line number	Diff line change
`@@ -20681,7 +20681,7 @@ namespace ts {`
`20681`	`20681`	`}`
`20682`	`20682`
`20683`	`20683`	`// Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.`
`20684`		`- if (returnType && maybeTypeOfKind(returnType, TypeFlags.AnyOrUnknown \| TypeFlags.Void)) {`
	`20684`	`+ if (returnType && maybeTypeOfKind(returnType, TypeFlags.Any \| TypeFlags.Void)) {`
`20685`	`20685`	`return;`
`20686`	`20686`	`}`
`20687`	`20687`