Don't add "Enum" suffix to enums with name that end in "Flags"

gilzoide · gilzoide · commit 926499c87018 · 2025-03-14T22:00:04.000-03:00
diff --git a/GDExtensionBindgen/LuaError.cs b/GDExtensionBindgen/LuaError.cs
@@ -67,7 +67,7 @@ public enum StatusEnum : long
 
 	#region Inherited Enums
 
-	public enum ConnectFlagsEnum : long
+	public enum ConnectFlags : long
 	{
 		ConnectDeferred = 1L,
 		ConnectPersist = 2L,
diff --git a/GDExtensionBindgen/LuaObject.cs b/GDExtensionBindgen/LuaObject.cs
@@ -48,7 +48,7 @@ public class SignalName : RefCounted.SignalName
 
 	#region Inherited Enums
 
-	public enum ConnectFlagsEnum : long
+	public enum ConnectFlags : long
 	{
 		ConnectDeferred = 1L,
 		ConnectPersist = 2L,
diff --git a/GDExtensionBindgen/LuaScript.cs b/GDExtensionBindgen/LuaScript.cs
@@ -47,7 +47,7 @@ public class SignalName : ScriptExtension.SignalName
 
 	#region Inherited Enums
 
-	public enum ConnectFlagsEnum : long
+	public enum ConnectFlags : long
 	{
 		ConnectDeferred = 1L,
 		ConnectPersist = 2L,
diff --git a/GDExtensionBindgen/LuaScriptLanguage.cs b/GDExtensionBindgen/LuaScriptLanguage.cs
@@ -94,7 +94,7 @@ public enum ScriptNameCasingEnum : long
 		ScriptNameCasingKebabCase = 3L,
 	}
 
-	public enum ConnectFlagsEnum : long
+	public enum ConnectFlags : long
 	{
 		ConnectDeferred = 1L,
 		ConnectPersist = 2L,
diff --git a/GDExtensionBindgen/LuaScriptResourceFormatLoader.cs b/GDExtensionBindgen/LuaScriptResourceFormatLoader.cs
@@ -56,7 +56,7 @@ public enum CacheModeEnum : long
 		CacheModeReplaceDeep = 4L,
 	}
 
-	public enum ConnectFlagsEnum : long
+	public enum ConnectFlags : long
 	{
 		ConnectDeferred = 1L,
 		ConnectPersist = 2L,
diff --git a/GDExtensionBindgen/LuaScriptResourceFormatSaver.cs b/GDExtensionBindgen/LuaScriptResourceFormatSaver.cs
@@ -47,7 +47,7 @@ public class SignalName : ResourceFormatSaver.SignalName
 
 	#region Inherited Enums
 
-	public enum ConnectFlagsEnum : long
+	public enum ConnectFlags : long
 	{
 		ConnectDeferred = 1L,
 		ConnectPersist = 2L,
diff --git a/GDExtensionBindgen/LuaState.cs b/GDExtensionBindgen/LuaState.cs
@@ -84,7 +84,7 @@ public enum LibraryEnum : long
 
 	#region Inherited Enums
 
-	public enum ConnectFlagsEnum : long
+	public enum ConnectFlags : long
 	{
 		ConnectDeferred = 1L,
 		ConnectPersist = 2L,
diff --git a/addons/csharp_gdextension_bindgen/csharp_gdextension_bindgen.gd b/addons/csharp_gdextension_bindgen/csharp_gdextension_bindgen.gd
@@ -269,14 +269,15 @@ static func _generate_enum(cls_name: StringName, enum_name: StringName) -> Strin
 
 	return """
 		{flags}
-		public enum {enum_name}Enum : long
+		public enum {enum_name}{maybe_enum_suffix} : long
 		{
 		{constants}
 		}
 	""".dedent().format({
 		flags = "[Flags]" if ClassDB.is_class_enum_bitfield(cls_name, enum_name) else "",
 		enum_name = enum_name,
 		constants = "\n".join(constants).indent("\t"),
+		maybe_enum_suffix = "" if enum_name.ends_with("Flags") else "Enum",
 	}).strip_edges()
 
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public enum StatusEnum : long`
`67`	`67`
`68`	`68`	`#region Inherited Enums`
`69`	`69`
`70`		`- public enum ConnectFlagsEnum : long`
	`70`	`+ public enum ConnectFlags : long`
`71`	`71`	`{`
`72`	`72`	`ConnectDeferred = 1L,`
`73`	`73`	`ConnectPersist = 2L,`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public class SignalName : RefCounted.SignalName`
`48`	`48`
`49`	`49`	`#region Inherited Enums`
`50`	`50`
`51`		`- public enum ConnectFlagsEnum : long`
	`51`	`+ public enum ConnectFlags : long`
`52`	`52`	`{`
`53`	`53`	`ConnectDeferred = 1L,`
`54`	`54`	`ConnectPersist = 2L,`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public class SignalName : ScriptExtension.SignalName`
`47`	`47`
`48`	`48`	`#region Inherited Enums`
`49`	`49`
`50`		`- public enum ConnectFlagsEnum : long`
	`50`	`+ public enum ConnectFlags : long`
`51`	`51`	`{`
`52`	`52`	`ConnectDeferred = 1L,`
`53`	`53`	`ConnectPersist = 2L,`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public enum ScriptNameCasingEnum : long`
`94`	`94`	`ScriptNameCasingKebabCase = 3L,`
`95`	`95`	`}`
`96`	`96`
`97`		`- public enum ConnectFlagsEnum : long`
	`97`	`+ public enum ConnectFlags : long`
`98`	`98`	`{`
`99`	`99`	`ConnectDeferred = 1L,`
`100`	`100`	`ConnectPersist = 2L,`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public enum CacheModeEnum : long`
`56`	`56`	`CacheModeReplaceDeep = 4L,`
`57`	`57`	`}`
`58`	`58`
`59`		`- public enum ConnectFlagsEnum : long`
	`59`	`+ public enum ConnectFlags : long`
`60`	`60`	`{`
`61`	`61`	`ConnectDeferred = 1L,`
`62`	`62`	`ConnectPersist = 2L,`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public enum LibraryEnum : long`
`84`	`84`
`85`	`85`	`#region Inherited Enums`
`86`	`86`
`87`		`- public enum ConnectFlagsEnum : long`
	`87`	`+ public enum ConnectFlags : long`
`88`	`88`	`{`
`89`	`89`	`ConnectDeferred = 1L,`
`90`	`90`	`ConnectPersist = 2L,`
Original file line number	Diff line number	Diff line change
`@@ -269,14 +269,15 @@ static func _generate_enum(cls_name: StringName, enum_name: StringName) -> Strin`
`269`	`269`
`270`	`270`	`return """`
`271`	`271`	`{flags}`
`272`		`- public enum {enum_name}Enum : long`
	`272`	`+ public enum {enum_name}{maybe_enum_suffix} : long`
`273`	`273`	`{`
`274`	`274`	`{constants}`
`275`	`275`	`}`
`276`	`276`	`""".dedent().format({`
`277`	`277`	`flags = "[Flags]" if ClassDB.is_class_enum_bitfield(cls_name, enum_name) else "",`
`278`	`278`	`enum_name = enum_name,`
`279`	`279`	`constants = "\n".join(constants).indent("\t"),`
	`280`	`+ maybe_enum_suffix = "" if enum_name.ends_with("Flags") else "Enum",`
`280`	`281`	`}).strip_edges()`
`281`	`282`
`282`	`283`