Managing control flow

navya9singh · navya9singh · commit cd312d3076c0 · 2022-08-31T13:13:29.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -15589,12 +15589,13 @@ m2: ${(this.mapper2 as unknown as DebugTypeMapper).__debugToString().split("\n")
                         return accessFlags & AccessFlags.IncludeUndefined ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
                     }
                     errorIfWritingToReadonlyIndex(indexInfo);
-                    if (accessFlags & AccessFlags.IncludeUndefined && objectType.symbol && objectType.symbol.flags & (SymbolFlags.RegularEnum | SymbolFlags.ConstEnum)) {
-                        if (indexType.symbol && indexType.flags & TypeFlags.EnumLiteral && getParentOfSymbol(indexType.symbol) === objectType.symbol) {
+                    if (accessFlags & AccessFlags.IncludeUndefined) {
+                        if (objectType.symbol && objectType.symbol.flags & (SymbolFlags.RegularEnum | SymbolFlags.ConstEnum) && (indexType.symbol && indexType.flags & TypeFlags.EnumLiteral && getParentOfSymbol(indexType.symbol) === objectType.symbol)) {
                             return indexInfo.type;
                         }
+                        return getUnionType([indexInfo.type, undefinedType]);
                     }
-                    return accessFlags & AccessFlags.IncludeUndefined ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
+                    return indexInfo.type;
                 }
                 if (indexType.flags & TypeFlags.Never) {
                     return neverType;

Original file line number	Diff line number	Diff line change
`@@ -15589,12 +15589,13 @@ m2: ${(this.mapper2 as unknown as DebugTypeMapper).__debugToString().split("\n")`
`15589`	`15589`	`return accessFlags & AccessFlags.IncludeUndefined ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;`
`15590`	`15590`	`}`
`15591`	`15591`	`errorIfWritingToReadonlyIndex(indexInfo);`
`15592`		`- if (accessFlags & AccessFlags.IncludeUndefined && objectType.symbol && objectType.symbol.flags & (SymbolFlags.RegularEnum \| SymbolFlags.ConstEnum)) {`
`15593`		`- if (indexType.symbol && indexType.flags & TypeFlags.EnumLiteral && getParentOfSymbol(indexType.symbol) === objectType.symbol) {`
	`15592`	`+ if (accessFlags & AccessFlags.IncludeUndefined) {`
	`15593`	`+ if (objectType.symbol && objectType.symbol.flags & (SymbolFlags.RegularEnum \| SymbolFlags.ConstEnum) && (indexType.symbol && indexType.flags & TypeFlags.EnumLiteral && getParentOfSymbol(indexType.symbol) === objectType.symbol)) {`
`15594`	`15594`	`return indexInfo.type;`
`15595`	`15595`	`}`
	`15596`	`+ return getUnionType([indexInfo.type, undefinedType]);`
`15596`	`15597`	`}`
`15597`		`- return accessFlags & AccessFlags.IncludeUndefined ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;`
	`15598`	`+ return indexInfo.type;`
`15598`	`15599`	`}`
`15599`	`15600`	`if (indexType.flags & TypeFlags.Never) {`
`15600`	`15601`	`return neverType;`