Refactor: move enum MAX detection up into domain mapping

Author: Bromeon

godot-codegen/src/generator/enums.rs

@@ -141,7 +141,7 @@ pub fn make_enum_definition_with(
 ///
 /// Returns `None` if `enum_` isn't an indexable enum.
 fn make_enum_index_impl(enum_: &Enum) -> Option<TokenStream> {
-    let enum_max = enum_.find_index_enum_max()?;
+    let enum_max = enum_.max_index?; // Do nothing if enum isn't sequential with a MAX constant.
     let name = &enum_.name;
 
     Some(quote! {

godot-codegen/src/models/domain/enums.rs

@@ -22,6 +22,8 @@ pub struct Enum {
     pub is_private: bool,
     pub is_exhaustive: bool,
     pub enumerators: Vec<Enumerator>,
+    /// If the enum is sequential and has a `*_MAX` constant (Godot name), this is the index of it.
+    pub max_index: Option<usize>,
 }
 
 impl Enum {
@@ -73,15 +75,18 @@ impl Enum {
 
     /// Returns the maximum index of an indexable enum.
     ///
-    /// Return `None` if `self` isn't an indexable enum. Meaning it is either a bitfield, or it is an enum that can't be used as an index.
-    pub fn find_index_enum_max(&self) -> Option<usize> {
-        if self.is_bitfield {
+    /// Returns `None` if this is a bitfield, or an enum that isn't sequential with a `*_MAX` enumerator.
+    pub fn find_index_enum_max_impl(
+        is_bitfield: bool,
+        enumerators: &[Enumerator],
+    ) -> Option<usize> {
+        if is_bitfield {
             return None;
         }
 
         // Sort by ordinal value. Allocates for every enum in the JSON, but should be OK (most enums are indexable).
         let enumerators = {
-            let mut enumerators = self.enumerators.clone();
+            let mut enumerators = enumerators.to_vec();
             enumerators.sort_by_key(|v| v.value.to_i64());
             enumerators
         };

godot-codegen/src/models/domain_mapping.rs

@@ -662,7 +662,7 @@ impl Enum {
             conv::make_enumerator_names(godot_class_name, &rust_enum_name, godot_enumerator_names)
         };
 
-        let enumerators = json_enum
+        let enumerators: Vec<Enumerator> = json_enum
             .values
             .iter()
             .zip(rust_enumerator_names)
@@ -671,6 +671,8 @@ impl Enum {
             })
             .collect();
 
+        let max_index = Enum::find_index_enum_max_impl(is_bitfield, &enumerators);
+
         Self {
             name: ident(&rust_enum_name),
             godot_name: godot_name.clone(),
@@ -679,6 +681,7 @@ impl Enum {
             is_private,
             is_exhaustive,
             enumerators,
+            max_index,
         }
     }
 }