microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-09 11:56:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Delete removeNullableKind, use getTypeWithFacts instead

Browse Source
This commit is contained in:
Anders Hejlsberg 2016-03-29 20:17:20 -07:00
parent a38d863910
commit 3d0fa31a9d
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/compiler/checker.ts
View File

@ -2757,7 +2757,7 @@ namespace ts {
// In strict null checking mode, if a default value of a non-undefined type is specified, remove
// undefined from the final type.
if (strictNullChecks && declaration.initializer && !(getNullableKind(checkExpressionCached(declaration.initializer)) & TypeFlags.Undefined)) {
type = removeNullableKind(type, TypeFlags.Undefined);
type = getTypeWithFacts(type, TypeFacts.NEUndefined);
}
return type;
}
@ -6619,35 +6619,8 @@ namespace ts {
return type;
}
function removeNullableKind(type: Type, kind: TypeFlags) {
if (!(getNullableKind(type) & kind)) {
return type;
}
if (type.flags & TypeFlags.Union) {
let firstType: Type;
let types: Type[];
for (const t of (type as UnionType).types) {
if (!(t.flags & kind)) {
if (!firstType) {
firstType = t;
}
else {
if (!types) {
types = [firstType];
}
types.push(t);
}
}
}
if (firstType) {
return types ? getUnionType(types) : firstType;
}
}
return emptyUnionType;
}
function getNonNullableType(type: Type): Type {
return strictNullChecks ? removeNullableKind(type, TypeFlags.Nullable) : type;
return strictNullChecks ? getTypeWithFacts(type, TypeFacts.NEUndefinedOrNull) : type;
}
/**