microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-06 04:35:21 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #13930 from Microsoft/no-subtype-reduction-in-includeFalsyTypes

Browse Source 
No subtype reduction in includeFalsyTypes
This commit is contained in:
Nathan Shively-Sanders
2017-02-13 13:09:07 -08:00
committed by GitHub
parent bc1058e50a e03509affa
commit 06522989b9
5 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/checker.ts
View File

@@ -8592,7 +8592,7 @@ namespace ts {
if (flags & TypeFlags.Void) types.push(voidType);
if (flags & TypeFlags.Undefined) types.push(undefinedType);
if (flags & TypeFlags.Null) types.push(nullType);
return getUnionType(types, /*subtypeReduction*/ true);
return getUnionType(types);
}
function removeDefinitelyFalsyTypes(type: Type): Type {

14
tests/baselines/reference/optionalParameterRetainsNull.js Normal file
View File

@@ -0,0 +1,14 @@
//// [optionalParameterRetainsNull.ts]
interface Bar { bar: number; foo: object | null; }
let a = {
test<K extends keyof Bar> (a: K, b?: Bar[K] | null) { }
};
a.test("bar", null); // ok, null is assignable to number | null | undefined
//// [optionalParameterRetainsNull.js]
var a = {
test: function (a, b) { }
};
a.test("bar", null); // ok, null is assignable to number | null | undefined

25
tests/baselines/reference/optionalParameterRetainsNull.symbols Normal file
View File

@@ -0,0 +1,25 @@
=== tests/cases/compiler/optionalParameterRetainsNull.ts ===
interface Bar { bar: number; foo: object | null; }
>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
>bar : Symbol(Bar.bar, Decl(optionalParameterRetainsNull.ts, 0, 15))
>foo : Symbol(Bar.foo, Decl(optionalParameterRetainsNull.ts, 0, 29))
let a = {
>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3))
test<K extends keyof Bar> (a: K, b?: Bar[K] | null) { }
>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 3, 29))
>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
>b : Symbol(b, Decl(optionalParameterRetainsNull.ts, 3, 34))
>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0))
>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7))
};
a.test("bar", null); // ok, null is assignable to number | null | undefined
>a.test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))
>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3))
>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9))

31
tests/baselines/reference/optionalParameterRetainsNull.types Normal file
View File

@@ -0,0 +1,31 @@
=== tests/cases/compiler/optionalParameterRetainsNull.ts ===
interface Bar { bar: number; foo: object | null; }
>Bar : Bar
>bar : number
>foo : object | null
>null : null
let a = {
>a : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
>{ test<K extends keyof Bar> (a: K, b?: Bar[K] | null) { }} : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
test<K extends keyof Bar> (a: K, b?: Bar[K] | null) { }
>test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
>K : K
>Bar : Bar
>a : K
>K : K
>b : Bar[K] | null | undefined
>Bar : Bar
>K : K
>null : null
};
a.test("bar", null); // ok, null is assignable to number | null | undefined
>a.test("bar", null) : void
>a.test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
>a : { test<K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined): void; }
>test : <K extends "bar" | "foo">(a: K, b?: Bar[K] | null | undefined) => void
>"bar" : "bar"
>null : null

7
tests/cases/compiler/optionalParameterRetainsNull.ts Normal file
View File

@@ -0,0 +1,7 @@
// @strictNullChecks: true
interface Bar { bar: number; foo: object | null; }
let a = {
test<K extends keyof Bar> (a: K, b?: Bar[K] | null) { }
};
a.test("bar", null); // ok, null is assignable to number | null | undefined