Skip to content

Commit 21bf485

Browse files
committed
Always descend into loop, fix lint warnings
1 parent 74498bb commit 21bf485

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

src/compiler/checker.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4841,7 +4841,7 @@ namespace ts {
48414841
return t.flags & TypeFlags.StringLike ? globalStringType :
48424842
t.flags & TypeFlags.NumberLike ? globalNumberType :
48434843
t.flags & TypeFlags.BooleanLike ? globalBooleanType :
4844-
t.flags & TypeFlags.ESSymbol ? getGlobalESSymbolType(/*checked*/ languageVersion >= ScriptTarget.ES2015) :
4844+
t.flags & TypeFlags.ESSymbol ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= ScriptTarget.ES2015) :
48454845
t.flags & TypeFlags.NonPrimitive ? globalObjectType :
48464846
t;
48474847
}
@@ -5740,19 +5740,19 @@ namespace ts {
57405740
}
57415741

57425742
function createAsyncIterableType(iteratedType: Type): Type {
5743-
return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*checked*/ true), [iteratedType]);
5743+
return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*reportErrors*/ true), [iteratedType]);
57445744
}
57455745

57465746
function createAsyncIterableIteratorType(iteratedType: Type): Type {
5747-
return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*checked*/ true), [iteratedType]);
5747+
return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
57485748
}
57495749

57505750
function createIterableType(iteratedType: Type): Type {
5751-
return createTypeFromGenericGlobalType(getGlobalIterableType(/*checked*/ true), [iteratedType]);
5751+
return createTypeFromGenericGlobalType(getGlobalIterableType(/*reportErrors*/ true), [iteratedType]);
57525752
}
57535753

57545754
function createIterableIteratorType(iteratedType: Type): Type {
5755-
return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*checked*/ true), [iteratedType]);
5755+
return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
57565756
}
57575757

57585758
function createArrayType(elementType: Type): ObjectType {
@@ -7350,7 +7350,7 @@ namespace ts {
73507350
if ((globalStringType === source && stringType === target) ||
73517351
(globalNumberType === source && numberType === target) ||
73527352
(globalBooleanType === source && booleanType === target) ||
7353-
(getGlobalESSymbolType(/*checked*/ false) === source && esSymbolType === target)) {
7353+
(getGlobalESSymbolType(/*reportErrors*/ false) === source && esSymbolType === target)) {
73547354
reportError(Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
73557355
}
73567356
}
@@ -12624,7 +12624,7 @@ namespace ts {
1262412624
return false;
1262512625
}
1262612626

12627-
const globalESSymbol = getGlobalESSymbolConstructorSymbol(/*checked*/ true);
12627+
const globalESSymbol = getGlobalESSymbolConstructorSymbol(/*reportErrors*/ true);
1262812628
if (!globalESSymbol) {
1262912629
// Already errored when we tried to look up the symbol
1263012630
return false;
@@ -14100,7 +14100,7 @@ namespace ts {
1410014100

1410114101
function createPromiseType(promisedType: Type): Type {
1410214102
// creates a `Promise<T>` type where `T` is the promisedType argument
14103-
const globalPromiseType = getGlobalPromiseType(/*checked*/ true);
14103+
const globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
1410414104
if (globalPromiseType !== emptyGenericType) {
1410514105
// if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
1410614106
promisedType = getAwaitedType(promisedType) || emptyObjectType;
@@ -16527,7 +16527,7 @@ namespace ts {
1652716527
return typeAsPromise.promisedTypeOfPromise;
1652816528
}
1652916529

16530-
if (isReferenceToType(promise, getGlobalPromiseType(/*checked*/ false))) {
16530+
if (isReferenceToType(promise, getGlobalPromiseType(/*reportErrors*/ false))) {
1653116531
return typeAsPromise.promisedTypeOfPromise = (<GenericType>promise).typeArguments[0];
1653216532
}
1653316533

@@ -16717,7 +16717,7 @@ namespace ts {
1671716717
if (returnType === unknownType) {
1671816718
return unknownType;
1671916719
}
16720-
const globalPromiseType = getGlobalPromiseType(/*checked*/ true);
16720+
const globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
1672116721
if (globalPromiseType !== emptyGenericType && !isReferenceToType(returnType, globalPromiseType)) {
1672216722
// The promise type was not a valid type reference to the global promise type, so we
1672316723
// report an error and return the unknown type.
@@ -16746,7 +16746,7 @@ namespace ts {
1674616746
return unknownType;
1674716747
}
1674816748

16749-
const globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType(/*checked*/ true);
16749+
const globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType(/*reportErrors*/ true);
1675016750
if (globalPromiseConstructorLikeType === emptyObjectType) {
1675116751
// If we couldn't resolve the global PromiseConstructorLike type we cannot verify
1675216752
// compatibility with __awaiter.
@@ -17862,14 +17862,14 @@ namespace ts {
1786217862
// As an optimization, if the type is instantiated directly using the
1786317863
// globalAsyncIterableType (AsyncIterable<T>) or globalAsyncIterableIteratorType
1786417864
// (AsyncIterableIterator<T>), then just grab its type argument.
17865-
if (isReferenceToType(type, getGlobalAsyncIterableType(/*checked*/ false)) ||
17866-
isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*checked*/ false))) {
17865+
if (isReferenceToType(type, getGlobalAsyncIterableType(/*reportErrors*/ false)) ||
17866+
isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*reportErrors*/ false))) {
1786717867
return typeAsAsyncIterable.iteratedTypeOfAsyncIterable = (<GenericType>type).typeArguments[0];
1786817868
}
1786917869

1787017870
if (allowIterables) {
17871-
if (isReferenceToType(type, getGlobalIterableType(/*checked*/ false)) ||
17872-
isReferenceToType(type, getGlobalIterableIteratorType(/*checked*/ false))) {
17871+
if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
17872+
isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
1787317873
return typeAsAsyncIterable.iteratedTypeOfAsyncIterable = (<GenericType>type).typeArguments[0];
1787417874
}
1787517875
}
@@ -17922,7 +17922,7 @@ namespace ts {
1792217922

1792317923
// As an optimization, if the type is instantiated directly using the
1792417924
// globalAsyncIteratorType (AsyncIterator<number>), then just grab its type argument.
17925-
if (isReferenceToType(type, getGlobalAsyncIteratorType(/*checked*/ false))) {
17925+
if (isReferenceToType(type, getGlobalAsyncIteratorType(/*reportErrors*/ false))) {
1792617926
return typeAsAsyncIterator.iteratedTypeOfAsyncIterator = (<GenericType>type).typeArguments[0];
1792717927
}
1792817928

@@ -18002,8 +18002,8 @@ namespace ts {
1800218002
// As an optimization, if the type is instantiated directly using the
1800318003
// globalIterableType (Iterable<T>) or globalIterableIteratorType (IterableIterator<T>),
1800418004
// then just grab its type argument.
18005-
if (isReferenceToType(type, getGlobalIterableType(/*checked*/ false)) ||
18006-
isReferenceToType(type, getGlobalIterableIteratorType(/*checked*/ false))) {
18005+
if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
18006+
isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
1800718007
return typeAsIterable.iteratedTypeOfIterable = (<GenericType>type).typeArguments[0];
1800818008
}
1800918009

@@ -18049,7 +18049,7 @@ namespace ts {
1804918049

1805018050
// As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
1805118051
// then just grab its type argument.
18052-
if (isReferenceToType(type, getGlobalIteratorType(/*checked*/ false))) {
18052+
if (isReferenceToType(type, getGlobalIteratorType(/*reportErrors*/ false))) {
1805318053
return typeAsIterator.iteratedTypeOfIterator = (<GenericType>type).typeArguments[0];
1805418054
}
1805518055

@@ -20781,7 +20781,7 @@ namespace ts {
2078120781
function getTypeReferenceSerializationKind(typeName: EntityName, location?: Node): TypeReferenceSerializationKind {
2078220782
// Resolve the symbol as a value to ensure the type can be reached at runtime during emit.
2078320783
const valueSymbol = resolveEntityName(typeName, SymbolFlags.Value, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location);
20784-
const globalPromiseSymbol = getGlobalPromiseConstructorSymbol(/*checked*/ false);
20784+
const globalPromiseSymbol = getGlobalPromiseConstructorSymbol(/*reportErrors*/ false);
2078520785
if (globalPromiseSymbol && valueSymbol === globalPromiseSymbol) {
2078620786
return TypeReferenceSerializationKind.Promise;
2078720787
}

src/compiler/transformers/es2015.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2156,7 +2156,7 @@ namespace ts {
21562156
convertedLoopState.labels = createMap<string>();
21572157
}
21582158
const statement = unwrapInnermostStatmentOfLabel(node, convertedLoopState && recordLabel);
2159-
return isIterationStatement(statement, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatementBody(statement)
2159+
return isIterationStatement(statement, /*lookInLabeledStatements*/ false)
21602160
? visitIterationStatement(statement, /*outermostLabeledStatement*/ node)
21612161
: restoreEnclosingLabel(visitNode(statement, visitor, isStatement), node, convertedLoopState && resetLabel);
21622162
}

0 commit comments

Comments
 (0)