Skip to content

Commit 36688c6

Browse files
committed
Check computed enum initializers when checking the member
Computing the values of an enum's members type-checked each computed initializer to report one that is not a number. The initializer may refer to the enum itself, whose type then reads member values that are still being computed, so the enum's type depended on whether its values were first computed by checking it or by asking for its type. The values do not depend on the initializer's type, so the check now happens when the member is checked, as for any other error in an initializer.
1 parent 2b858a8 commit 36688c6

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎tsc/internal/checker/checker.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5273,8 +5273,11 @@ func (c *Checker) checkEnumMember(node *ast.Node) {
52735273
if ast.IsComputedPropertyName(node.Name()) {
52745274
c.checkExpression(node.Name().Expression())
52755275
}
5276-
if node.Initializer() != nil {
5277-
c.checkExpression(node.Initializer())
5276+
if initializer := node.Initializer(); initializer != nil {
5277+
initializerType := c.checkExpression(initializer)
5278+
if c.getEnumMemberValue(node).Value == nil && !ast.IsEnumConst(node.Parent) && node.Parent.Flags&ast.NodeFlagsAmbient == 0 {
5279+
c.checkTypeAssignableTo(initializerType, c.numberType, initializer, diagnostics.Type_0_is_not_assignable_to_type_1_as_required_for_computed_enum_member_values)
5280+
}
52785281
}
52795282
}
52805283

@@ -25170,8 +25173,6 @@ func (c *Checker) computeConstantEnumMemberValue(member *ast.Node) evaluator.Res
2517025173
c.error(initializer, diagnostics.X_const_enum_member_initializers_must_be_constant_expressions)
2517125174
case member.Parent.Flags&ast.NodeFlagsAmbient != 0:
2517225175
c.error(initializer, diagnostics.In_ambient_enum_declarations_member_initializer_must_be_constant_expression)
25173-
default:
25174-
c.checkTypeAssignableTo(c.checkExpression(initializer), c.numberType, initializer, diagnostics.Type_0_is_not_assignable_to_type_1_as_required_for_computed_enum_member_values)
2517525176
}
2517625177
return result
2517725178
}

‎tsc/testdata/baselines/reference/compiler/checkOrderEnumComputedMember(checkorder=isolated).types‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ enum E {
2323
}
2424

2525
const member: Extract<E, 1> = E.C;
26-
>member : never
26+
>member : E.C
2727
>E.C : E.C
2828
>E : typeof E
2929
>C : E.C

0 commit comments

Comments
 (0)