Accept changes from new tests

Author: ahejlsberg

tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt

@@ -1,15 +1,19 @@
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(1,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(99,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(107,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(112,16): error TS2378: A 'get' accessor must return a value.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(134,15): error TS18050: The value 'undefined' cannot be used here.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(135,5): error TS1003: Identifier expected.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(1,16): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(99,17): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(107,17): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(120,7): error TS2322: Type '() => void' is not assignable to type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(124,7): error TS2322: Type '() => void' is not assignable to type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(130,16): error TS2378: A 'get' accessor must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(152,15): error TS18050: The value 'undefined' cannot be used here.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(153,5): error TS1003: Identifier expected.
 
 
-==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (6 errors) ====
+==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (8 errors) ====
     function f1(): string {
                    ~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
         // errors because there are no return statements
     }
 
@@ -109,7 +113,7 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(135,5): e
 
     function f21(): number | string {
                     ~~~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
         // Not okay; union does not contain void or any
     }
 
@@ -119,10 +123,34 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(135,5): e
 
     function f23(): undefined | number {
                     ~~~~~~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
         // Error; because `undefined | number` becomes `number` without strictNullChecks.
     }
 
+    const f30: () => undefined = () => {
+        // Ok, contextual type for implicit return is `undefined`
+    }
+    
+    const f31: () => undefined = () => {
+        // Ok, contextual type for expression-less return is `undefined`
+        return;
+    }
+    
+    const f32: () => undefined | number = () => {
+          ~~~
+!!! error TS2322: Type '() => void' is not assignable to type '() => number'.
+!!! error TS2322:   Type 'void' is not assignable to type 'number'.
+        // Error, contextual type for implicit return isn't just `undefined`
+    }
+    
+    const f33: () => undefined | number = () => {
+          ~~~
+!!! error TS2322: Type '() => void' is not assignable to type '() => number'.
+!!! error TS2322:   Type 'void' is not assignable to type 'number'.
+        // Error, contextual type for expression-less return isn't just `undefined`
+        return;
+    }
+    
     class C {
         public get m1() {
                    ~~

tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js

@@ -109,6 +109,24 @@ function f23(): undefined | number {
     // Error; because `undefined | number` becomes `number` without strictNullChecks.
 }
 
+const f30: () => undefined = () => {
+    // Ok, contextual type for implicit return is `undefined`
+}
+
+const f31: () => undefined = () => {
+    // Ok, contextual type for expression-less return is `undefined`
+    return;
+}
+
+const f32: () => undefined | number = () => {
+    // Error, contextual type for implicit return isn't just `undefined`
+}
+
+const f33: () => undefined | number = () => {
+    // Error, contextual type for expression-less return isn't just `undefined`
+    return;
+}
+
 class C {
     public get m1() {
         // Errors; get accessors must return a value.
@@ -224,6 +242,20 @@ function f22() {
 function f23() {
     // Error; because `undefined | number` becomes `number` without strictNullChecks.
 }
+var f30 = function () {
+    // Ok, contextual type for implicit return is `undefined`
+};
+var f31 = function () {
+    // Ok, contextual type for expression-less return is `undefined`
+    return;
+};
+var f32 = function () {
+    // Error, contextual type for implicit return isn't just `undefined`
+};
+var f33 = function () {
+    // Error, contextual type for expression-less return isn't just `undefined`
+    return;
+};
 var C = /** @class */ (function () {
     function C() {
     }

tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.symbols

@@ -164,37 +164,63 @@ function f23(): undefined | number {
     // Error; because `undefined | number` becomes `number` without strictNullChecks.
 }
 
+const f30: () => undefined = () => {
+>f30 : Symbol(f30, Decl(functionsMissingReturnStatementsAndExpressions.ts, 110, 5))
+
+    // Ok, contextual type for implicit return is `undefined`
+}
+
+const f31: () => undefined = () => {
+>f31 : Symbol(f31, Decl(functionsMissingReturnStatementsAndExpressions.ts, 114, 5))
+
+    // Ok, contextual type for expression-less return is `undefined`
+    return;
+}
+
+const f32: () => undefined | number = () => {
+>f32 : Symbol(f32, Decl(functionsMissingReturnStatementsAndExpressions.ts, 119, 5))
+
+    // Error, contextual type for implicit return isn't just `undefined`
+}
+
+const f33: () => undefined | number = () => {
+>f33 : Symbol(f33, Decl(functionsMissingReturnStatementsAndExpressions.ts, 123, 5))
+
+    // Error, contextual type for expression-less return isn't just `undefined`
+    return;
+}
+
 class C {
->C : Symbol(C, Decl(functionsMissingReturnStatementsAndExpressions.ts, 108, 1))
+>C : Symbol(C, Decl(functionsMissingReturnStatementsAndExpressions.ts, 126, 1))
 
     public get m1() {
->m1 : Symbol(C.m1, Decl(functionsMissingReturnStatementsAndExpressions.ts, 110, 9))
+>m1 : Symbol(C.m1, Decl(functionsMissingReturnStatementsAndExpressions.ts, 128, 9))
 
         // Errors; get accessors must return a value.
     }
 
     public get m2() {
->m2 : Symbol(C.m2, Decl(functionsMissingReturnStatementsAndExpressions.ts, 113, 5))
+>m2 : Symbol(C.m2, Decl(functionsMissingReturnStatementsAndExpressions.ts, 131, 5))
 
         // Permissible; returns undefined.
         return;
     }
 
     public get m3() {
->m3 : Symbol(C.m3, Decl(functionsMissingReturnStatementsAndExpressions.ts, 118, 5))
+>m3 : Symbol(C.m3, Decl(functionsMissingReturnStatementsAndExpressions.ts, 136, 5))
 
         return "Okay, because this is a return expression.";
     }
 
     public get m4() {
->m4 : Symbol(C.m4, Decl(functionsMissingReturnStatementsAndExpressions.ts, 122, 5))
+>m4 : Symbol(C.m4, Decl(functionsMissingReturnStatementsAndExpressions.ts, 140, 5))
 
         // Fine since this consists of a single throw statement.
         throw null;
     }
 
     public get m5() {
->m5 : Symbol(C.m5, Decl(functionsMissingReturnStatementsAndExpressions.ts, 127, 5))
+>m5 : Symbol(C.m5, Decl(functionsMissingReturnStatementsAndExpressions.ts, 145, 5))
 
         // Not fine, since we can *only* consist of a single throw statement
         // if no return statements are present but we are a get accessor.

tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.types

@@ -166,6 +166,36 @@ function f23(): undefined | number {
     // Error; because `undefined | number` becomes `number` without strictNullChecks.
 }
 
+const f30: () => undefined = () => {
+>f30 : () => undefined
+>() => {    // Ok, contextual type for implicit return is `undefined`} : () => undefined
+
+    // Ok, contextual type for implicit return is `undefined`
+}
+
+const f31: () => undefined = () => {
+>f31 : () => undefined
+>() => {    // Ok, contextual type for expression-less return is `undefined`    return;} : () => undefined
+
+    // Ok, contextual type for expression-less return is `undefined`
+    return;
+}
+
+const f32: () => undefined | number = () => {
+>f32 : () => undefined | number
+>() => {    // Error, contextual type for implicit return isn't just `undefined`} : () => void
+
+    // Error, contextual type for implicit return isn't just `undefined`
+}
+
+const f33: () => undefined | number = () => {
+>f33 : () => undefined | number
+>() => {    // Error, contextual type for expression-less return isn't just `undefined`    return;} : () => void
+
+    // Error, contextual type for expression-less return isn't just `undefined`
+    return;
+}
+
 class C {
 >C : C
 

tests/baselines/reference/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.errors.txt

@@ -1,25 +1,88 @@
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(5,16): error TS2847: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
-tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(13,22): error TS2847: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(5,17): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(9,17): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(17,7): error TS2322: Type '() => void' is not assignable to type '() => number | undefined'.
+  Type 'void' is not assignable to type 'number | undefined'.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(21,7): error TS2322: Type '() => void' is not assignable to type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(29,23): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(33,23): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts(52,3): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => undefined'.
+  Type 'void' is not assignable to type 'undefined'.
 
 
-==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts (2 errors) ====
-    function f1(): undefined | number {
-        // Okay; return type allows implicit return of undefined
+==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressionsStrictNullChecks.ts (7 errors) ====
+    function f10(): undefined {
+        // Ok, return type allows implicit return of undefined
     }
 
-    function f2(): number {
-                   ~~~~~~
-!!! error TS2847: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
-        // Error; return type does not include undefined
+    function f11(): undefined | number {
+                    ~~~~~~~~~~~~~~~~~~
+!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+        // Error, return type isn't just undefined
     }
 
-    async function f3(): Promise<undefined | number> {
-        // Okay; return type allows implicit return of undefined
+    function f12(): number {
+                    ~~~~~~
+!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+        // Error, return type doesn't include undefined
     }
 
-    async function f4(): Promise<number> {
-                         ~~~~~~~~~~~~~~~
-!!! error TS2847: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
-        // Error; return type does not include undefined
+    const f20: () => undefined = () => {
+        // Ok, contextual type for implicit return is undefined
     }
+    
+    const f21: () => undefined | number = () => {
+          ~~~
+!!! error TS2322: Type '() => void' is not assignable to type '() => number | undefined'.
+!!! error TS2322:   Type 'void' is not assignable to type 'number | undefined'.
+        // Regular void function because contextual type for implicit return isn't just undefined
+    }
+    
+    const f22: () => number = () => {
+          ~~~
+!!! error TS2322: Type '() => void' is not assignable to type '() => number'.
+!!! error TS2322:   Type 'void' is not assignable to type 'number'.
+        // Regular void function because contextual type for implicit return isn't just undefined
+    }
+    
+    async function f30(): Promise<undefined> {
+        // Ok, return type allows implicit return of undefined
+    }
+    
+    async function f31(): Promise<undefined | number> {
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+        // Error, return type isn't just undefined
+    }
+    
+    async function f32(): Promise<number> {
+                          ~~~~~~~~~~~~~~~
+!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
+        // Error, return type doesn't include undefined
+    }
+    
+    // Examples from #36288
+    
+    declare function f(a: () => undefined): void;
+    
+    f(() => { });
+    
+    f((): undefined => { });
+    
+    const g1: () => undefined = () => { };
+    
+    const g2 = (): undefined => { };
+    
+    function h1() {
+    }
+    
+    f(h1);  // Error
+      ~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => undefined'.
+!!! error TS2345:   Type 'void' is not assignable to type 'undefined'.
+    
+    function h2(): undefined {
+    }
+    
+    f(h2);