@@ -349,7 +349,7 @@ namespace ts {
349349 // The presence of a particular fact means that the given test is true for some (and possibly all) values
350350 // of that kind of type.
351351 BaseStringStrictFacts = TypeofEQString | TypeofNENumber | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
352- BaseStringFacts = BaseStringStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
352+ BaseStringFacts = BaseStringStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
353353 StringStrictFacts = BaseStringStrictFacts | Truthy | Falsy,
354354 StringFacts = BaseStringFacts | Truthy,
355355 EmptyStringStrictFacts = BaseStringStrictFacts | Falsy,
@@ -1618,7 +1618,7 @@ namespace ts {
16181618 }
16191619 }
16201620
1621- // May be an untyped module. If so, ignore resolutionDiagnostic.
1621+ // May be an untyped module. If so, ignore resolutionDiagnostic.
16221622 if (!isRelative && resolvedModule && !extensionIsTypeScript(resolvedModule.extension)) {
16231623 if (isForAugmentation) {
16241624 const diag = Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
@@ -3973,7 +3973,7 @@ namespace ts {
39733973 type;
39743974 }
39753975
3976- function getTypeForDeclarationFromJSDocComment(declaration: Node ) {
3976+ function getTypeForDeclarationFromJSDocComment(declaration: Node) {
39773977 const jsdocType = getJSDocType(declaration);
39783978 if (jsdocType) {
39793979 return getTypeFromTypeNode(jsdocType);
@@ -5640,7 +5640,7 @@ namespace ts {
56405640 function getConstraintOfType(type: TypeVariable | UnionOrIntersectionType): Type {
56415641 return type.flags & TypeFlags.TypeParameter ? getConstraintOfTypeParameter(<TypeParameter>type) :
56425642 type.flags & TypeFlags.IndexedAccess ? getConstraintOfIndexedAccess(<IndexedAccessType>type) :
5643- getBaseConstraintOfType(type);
5643+ getBaseConstraintOfType(type);
56445644 }
56455645
56465646 function getConstraintOfTypeParameter(typeParameter: TypeParameter): Type {
@@ -5713,7 +5713,7 @@ namespace ts {
57135713 }
57145714 return t.flags & TypeFlags.Union && baseTypes.length === types.length ? getUnionType(baseTypes) :
57155715 t.flags & TypeFlags.Intersection && baseTypes.length ? getIntersectionType(baseTypes) :
5716- undefined;
5716+ undefined;
57175717 }
57185718 if (t.flags & TypeFlags.Index) {
57195719 return stringType;
@@ -5764,11 +5764,11 @@ namespace ts {
57645764 const t = type.flags & TypeFlags.TypeVariable ? getBaseConstraintOfType(type) || emptyObjectType : type;
57655765 return t.flags & TypeFlags.Intersection ? getApparentTypeOfIntersectionType(<IntersectionType>t) :
57665766 t.flags & TypeFlags.StringLike ? globalStringType :
5767- t.flags & TypeFlags.NumberLike ? globalNumberType :
5768- t.flags & TypeFlags.BooleanLike ? globalBooleanType :
5769- t.flags & TypeFlags.ESSymbol ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= ScriptTarget.ES2015) :
5770- t.flags & TypeFlags.NonPrimitive ? emptyObjectType :
5771- t;
5767+ t.flags & TypeFlags.NumberLike ? globalNumberType :
5768+ t.flags & TypeFlags.BooleanLike ? globalBooleanType :
5769+ t.flags & TypeFlags.ESSymbol ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= ScriptTarget.ES2015) :
5770+ t.flags & TypeFlags.NonPrimitive ? emptyObjectType :
5771+ t;
57725772 }
57735773
57745774 function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol {
@@ -7212,8 +7212,8 @@ namespace ts {
72127212 function getIndexType(type: Type): Type {
72137213 return maybeTypeOfKind(type, TypeFlags.TypeVariable) ? getIndexTypeForGenericType(<TypeVariable | UnionOrIntersectionType>type) :
72147214 getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
7215- type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringType :
7216- getLiteralTypeFromPropertyNames(type);
7215+ type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringType :
7216+ getLiteralTypeFromPropertyNames(type);
72177217 }
72187218
72197219 function getIndexTypeOrString(type: Type): Type {
@@ -7409,7 +7409,7 @@ namespace ts {
74097409 * this function should be called in a left folding style, with left = previous result of getSpreadType
74107410 * and right = the new element to be spread.
74117411 */
7412- function getSpreadType(left: Type, right: Type): Type {
7412+ function getSpreadType(left: Type, right: Type): Type {
74137413 if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
74147414 return anyType;
74157415 }
@@ -7698,7 +7698,7 @@ namespace ts {
76987698 function createTypeMapper(sources: Type[], targets: Type[]): TypeMapper {
76997699 const mapper: TypeMapper = sources.length === 1 ? makeUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
77007700 sources.length === 2 ? makeBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
7701- makeArrayTypeMapper(sources, targets);
7701+ makeArrayTypeMapper(sources, targets);
77027702 mapper.mappedTypes = sources;
77037703 return mapper;
77047704 }
@@ -8502,7 +8502,7 @@ namespace ts {
85028502 (globalNumberType === source && numberType === target) ||
85038503 (globalBooleanType === source && booleanType === target) ||
85048504 (getGlobalESSymbolType(/*reportErrors*/ false) === source && esSymbolType === target)) {
8505- reportError(Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
8505+ reportError(Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
85068506 }
85078507 }
85088508
@@ -9631,25 +9631,25 @@ namespace ts {
96319631 function isLiteralType(type: Type): boolean {
96329632 return type.flags & TypeFlags.Boolean ? true :
96339633 type.flags & TypeFlags.Union ? type.flags & TypeFlags.Enum ? true : !forEach((<UnionType>type).types, t => !isUnitType(t)) :
9634- isUnitType(type);
9634+ isUnitType(type);
96359635 }
96369636
96379637 function getBaseTypeOfLiteralType(type: Type): Type {
96389638 return type.flags & TypeFlags.StringLiteral ? stringType :
96399639 type.flags & TypeFlags.NumberLiteral ? numberType :
9640- type.flags & TypeFlags.BooleanLiteral ? booleanType :
9641- type.flags & TypeFlags.EnumLiteral ? (<EnumLiteralType>type).baseType :
9642- type.flags & TypeFlags.Union && !(type.flags & TypeFlags.Enum) ? getUnionType(sameMap((<UnionType>type).types, getBaseTypeOfLiteralType)) :
9643- type;
9640+ type.flags & TypeFlags.BooleanLiteral ? booleanType :
9641+ type.flags & TypeFlags.EnumLiteral ? (<EnumLiteralType>type).baseType :
9642+ type.flags & TypeFlags.Union && !(type.flags & TypeFlags.Enum) ? getUnionType(sameMap((<UnionType>type).types, getBaseTypeOfLiteralType)) :
9643+ type;
96449644 }
96459645
96469646 function getWidenedLiteralType(type: Type): Type {
96479647 return type.flags & TypeFlags.StringLiteral && type.flags & TypeFlags.FreshLiteral ? stringType :
96489648 type.flags & TypeFlags.NumberLiteral && type.flags & TypeFlags.FreshLiteral ? numberType :
9649- type.flags & TypeFlags.BooleanLiteral ? booleanType :
9650- type.flags & TypeFlags.EnumLiteral ? (<EnumLiteralType>type).baseType :
9651- type.flags & TypeFlags.Union && !(type.flags & TypeFlags.Enum) ? getUnionType(sameMap((<UnionType>type).types, getWidenedLiteralType)) :
9652- type;
9649+ type.flags & TypeFlags.BooleanLiteral ? booleanType :
9650+ type.flags & TypeFlags.EnumLiteral ? (<EnumLiteralType>type).baseType :
9651+ type.flags & TypeFlags.Union && !(type.flags & TypeFlags.Enum) ? getUnionType(sameMap((<UnionType>type).types, getWidenedLiteralType)) :
9652+ type;
96539653 }
96549654
96559655 /**
@@ -9674,9 +9674,9 @@ namespace ts {
96749674 function getFalsyFlags(type: Type): TypeFlags {
96759675 return type.flags & TypeFlags.Union ? getFalsyFlagsOfTypes((<UnionType>type).types) :
96769676 type.flags & TypeFlags.StringLiteral ? (<LiteralType>type).text === "" ? TypeFlags.StringLiteral : 0 :
9677- type.flags & TypeFlags.NumberLiteral ? (<LiteralType>type).text === "0" ? TypeFlags.NumberLiteral : 0 :
9678- type.flags & TypeFlags.BooleanLiteral ? type === falseType ? TypeFlags.BooleanLiteral : 0 :
9679- type.flags & TypeFlags.PossiblyFalsy;
9677+ type.flags & TypeFlags.NumberLiteral ? (<LiteralType>type).text === "0" ? TypeFlags.NumberLiteral : 0 :
9678+ type.flags & TypeFlags.BooleanLiteral ? type === falseType ? TypeFlags.BooleanLiteral : 0 :
9679+ type.flags & TypeFlags.PossiblyFalsy;
96809680 }
96819681
96829682 function includeFalsyTypes(type: Type, flags: TypeFlags) {
@@ -10862,8 +10862,8 @@ namespace ts {
1086210862 isTypeSubsetOf(numberType, typeWithPrimitives) && maybeTypeOfKind(typeWithLiterals, TypeFlags.NumberLiteral)) {
1086310863 return mapType(typeWithPrimitives, t =>
1086410864 t.flags & TypeFlags.String ? extractTypesOfKind(typeWithLiterals, TypeFlags.String | TypeFlags.StringLiteral) :
10865- t.flags & TypeFlags.Number ? extractTypesOfKind(typeWithLiterals, TypeFlags.Number | TypeFlags.NumberLiteral) :
10866- t);
10865+ t.flags & TypeFlags.Number ? extractTypesOfKind(typeWithLiterals, TypeFlags.Number | TypeFlags.NumberLiteral) :
10866+ t);
1086710867 }
1086810868 return typeWithPrimitives;
1086910869 }
@@ -11439,7 +11439,7 @@ namespace ts {
1143911439 const discriminantType = getUnionType(clauseTypes);
1144011440 const caseType =
1144111441 discriminantType.flags & TypeFlags.Never ? neverType :
11442- replacePrimitivesWithLiterals(filterType(type, t => isTypeComparableTo(discriminantType, t)), discriminantType);
11442+ replacePrimitivesWithLiterals(filterType(type, t => isTypeComparableTo(discriminantType, t)), discriminantType);
1144311443 if (!hasDefaultClause) {
1144411444 return caseType;
1144511445 }
@@ -11519,8 +11519,8 @@ namespace ts {
1151911519 // two types.
1152011520 return isTypeSubtypeOf(candidate, type) ? candidate :
1152111521 isTypeAssignableTo(type, candidate) ? type :
11522- isTypeAssignableTo(candidate, type) ? candidate :
11523- getIntersectionType([type, candidate]);
11522+ isTypeAssignableTo(candidate, type) ? candidate :
11523+ getIntersectionType([type, candidate]);
1152411524 }
1152511525
1152611526 function narrowTypeByTypePredicate(type: Type, callExpression: CallExpression, assumeTrue: boolean): Type {
@@ -11797,7 +11797,7 @@ namespace ts {
1179711797 isInAmbientContext(declaration);
1179811798 const initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, getRootDeclaration(declaration) as VariableLikeDeclaration) : type) :
1179911799 type === autoType || type === autoArrayType ? undefinedType :
11800- includeFalsyTypes(type, TypeFlags.Undefined);
11800+ includeFalsyTypes(type, TypeFlags.Undefined);
1180111801 const flowType = getFlowTypeOfReference(node, type, initialType, flowContainer, !assumeInitialized);
1180211802 // A variable is considered uninitialized when it is possible to analyze the entire control flow graph
1180311803 // from declaration to use, and when the variable's declared type doesn't include undefined but the
@@ -12304,7 +12304,7 @@ namespace ts {
1230412304 func.kind === SyntaxKind.GetAccessor ||
1230512305 func.kind === SyntaxKind.SetAccessor) && func.parent.kind === SyntaxKind.ObjectLiteralExpression ? <ObjectLiteralExpression>func.parent :
1230612306 func.kind === SyntaxKind.FunctionExpression && func.parent.kind === SyntaxKind.PropertyAssignment ? <ObjectLiteralExpression>func.parent.parent :
12307- undefined;
12307+ undefined;
1230812308 }
1230912309
1231012310 function getThisTypeArgument(type: Type): Type {
0 commit comments