From a6991c3a8c8c34ea92d24ae685011badf211cc55 Mon Sep 17 00:00:00 2001
From: Emi <95967983+EmiOnGit@users.noreply.github.com>
Date: Sat, 26 Aug 2023 16:50:12 +0200
Subject: [PATCH] change 'collapse_type_name' to retain enum types (#9587)

# Objective

Fixes #9509

## Solution
We use the assumption, that enum types are uppercase in contrast to
module names.
[`collapse_type_name`](crates/bevy_util/src/short_names) is now
retaining the second last segment, if it starts with a uppercase
character.

---------

Co-authored-by: Emi <emanuel.boehm@gmail.com>
Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
---
 crates/bevy_utils/src/short_names.rs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_utils/src/short_names.rs b/crates/bevy_utils/src/short_names.rs
index d8abbdcf1e635..60a7b70d405be 100644
--- a/crates/bevy_utils/src/short_names.rs
+++ b/crates/bevy_utils/src/short_names.rs
@@ -59,7 +59,20 @@ pub fn get_short_name(full_name: &str) -> String {
 
 #[inline(always)]
 fn collapse_type_name(string: &str) -> &str {
-    string.split("::").last().unwrap()
+    // Enums types are retained.
+    // As heuristic, we assume the enum type to be uppercase.
+    let mut segments = string.rsplit("::");
+    let (last, second_last): (&str, Option<&str>) = (segments.next().unwrap(), segments.next());
+    let Some(second_last) = second_last else {
+        return last;
+    };
+
+    if second_last.starts_with(char::is_uppercase) {
+        let index = string.len() - last.len() - second_last.len() - 2;
+        &string[index..]
+    } else {
+        last
+    }
 }
 
 #[cfg(test)]
@@ -102,6 +115,19 @@ mod name_formatting_tests {
         assert_eq!(get_short_name("a<B, C>"), "a<B, C>".to_string());
     }
 
+    #[test]
+    fn enums() {
+        assert_eq!(get_short_name("Option::None"), "Option::None".to_string());
+        assert_eq!(
+            get_short_name("Option::Some(2)"),
+            "Option::Some(2)".to_string()
+        );
+        assert_eq!(
+            get_short_name("bevy_render::RenderSet::Prepare"),
+            "RenderSet::Prepare".to_string()
+        );
+    }
+
     #[test]
     fn generics() {
         assert_eq!(