Remove common prefix from enum constant names

gilzoide · gilzoide · commit 7b4f5e113c25 · 2025-03-14T22:09:09.000-03:00
diff --git a/GDExtensionBindgen/LuaCoroutine.cs b/GDExtensionBindgen/LuaCoroutine.cs
@@ -48,13 +48,13 @@ protected LuaCoroutine([NotNull] RefCounted @object) : base(@object)
 
 	public enum LuaCoroutineStatusEnum : long
 	{
-		StatusOk = 0L,
-		StatusYield = 1L,
-		StatusErrrun = 2L,
-		StatusErrsyntax = 3L,
-		StatusErrmem = 4L,
-		StatusErrerr = 5L,
-		StatusDead = -1L,
+		Ok = 0L,
+		Yield = 1L,
+		Errrun = 2L,
+		Errsyntax = 3L,
+		Errmem = 4L,
+		Errerr = 5L,
+		Dead = -1L,
 	}
 
 	#endregion
diff --git a/GDExtensionBindgen/LuaError.cs b/GDExtensionBindgen/LuaError.cs
@@ -69,10 +69,10 @@ public enum StatusEnum : long
 
 	public enum ConnectFlags : long
 	{
-		ConnectDeferred = 1L,
-		ConnectPersist = 2L,
-		ConnectOneShot = 4L,
-		ConnectReferenceCounted = 8L,
+		Deferred = 1L,
+		Persist = 2L,
+		OneShot = 4L,
+		ReferenceCounted = 8L,
 	}
 
 	#endregion
diff --git a/GDExtensionBindgen/LuaObject.cs b/GDExtensionBindgen/LuaObject.cs
@@ -50,10 +50,10 @@ public class SignalName : RefCounted.SignalName
 
 	public enum ConnectFlags : long
 	{
-		ConnectDeferred = 1L,
-		ConnectPersist = 2L,
-		ConnectOneShot = 4L,
-		ConnectReferenceCounted = 8L,
+		Deferred = 1L,
+		Persist = 2L,
+		OneShot = 4L,
+		ReferenceCounted = 8L,
 	}
 
 	#endregion
diff --git a/GDExtensionBindgen/LuaScript.cs b/GDExtensionBindgen/LuaScript.cs
@@ -49,10 +49,10 @@ public class SignalName : ScriptExtension.SignalName
 
 	public enum ConnectFlags : long
 	{
-		ConnectDeferred = 1L,
-		ConnectPersist = 2L,
-		ConnectOneShot = 4L,
-		ConnectReferenceCounted = 8L,
+		Deferred = 1L,
+		Persist = 2L,
+		OneShot = 4L,
+		ReferenceCounted = 8L,
 	}
 
 	#endregion
diff --git a/GDExtensionBindgen/LuaScriptLanguage.cs b/GDExtensionBindgen/LuaScriptLanguage.cs
@@ -49,57 +49,57 @@ public class SignalName : ScriptLanguageExtension.SignalName
 
 	public enum LookupResultTypeEnum : long
 	{
-		LookupResultScriptLocation = 0L,
-		LookupResultClass = 1L,
-		LookupResultClassConstant = 2L,
-		LookupResultClassProperty = 3L,
-		LookupResultClassMethod = 4L,
-		LookupResultClassSignal = 5L,
-		LookupResultClassEnum = 6L,
-		LookupResultClassTbdGlobalscope = 7L,
-		LookupResultClassAnnotation = 8L,
-		LookupResultLocalConstant = 9L,
-		LookupResultLocalVariable = 10L,
-		LookupResultMax = 11L,
+		ScriptLocation = 0L,
+		Class = 1L,
+		ClassConstant = 2L,
+		ClassProperty = 3L,
+		ClassMethod = 4L,
+		ClassSignal = 5L,
+		ClassEnum = 6L,
+		ClassTbdGlobalscope = 7L,
+		ClassAnnotation = 8L,
+		LocalConstant = 9L,
+		LocalVariable = 10L,
+		Max = 11L,
 	}
 
 	public enum CodeCompletionLocationEnum : long
 	{
-		LocationLocal = 0L,
-		LocationParentMask = 256L,
-		LocationOtherUserCode = 512L,
-		LocationOther = 1024L,
+		Local = 0L,
+		ParentMask = 256L,
+		OtherUserCode = 512L,
+		Other = 1024L,
 	}
 
 	public enum CodeCompletionKindEnum : long
 	{
-		CodeCompletionKindClass = 0L,
-		CodeCompletionKindFunction = 1L,
-		CodeCompletionKindSignal = 2L,
-		CodeCompletionKindVariable = 3L,
-		CodeCompletionKindMember = 4L,
-		CodeCompletionKindEnum = 5L,
-		CodeCompletionKindConstant = 6L,
-		CodeCompletionKindNodePath = 7L,
-		CodeCompletionKindFilePath = 8L,
-		CodeCompletionKindPlainText = 9L,
-		CodeCompletionKindMax = 10L,
+		Class = 0L,
+		Function = 1L,
+		Signal = 2L,
+		Variable = 3L,
+		Member = 4L,
+		Enum = 5L,
+		Constant = 6L,
+		NodePath = 7L,
+		FilePath = 8L,
+		PlainText = 9L,
+		Max = 10L,
 	}
 
 	public enum ScriptNameCasingEnum : long
 	{
-		ScriptNameCasingAuto = 0L,
-		ScriptNameCasingPascalCase = 1L,
-		ScriptNameCasingSnakeCase = 2L,
-		ScriptNameCasingKebabCase = 3L,
+		Auto = 0L,
+		PascalCase = 1L,
+		SnakeCase = 2L,
+		KebabCase = 3L,
 	}
 
 	public enum ConnectFlags : long
 	{
-		ConnectDeferred = 1L,
-		ConnectPersist = 2L,
-		ConnectOneShot = 4L,
-		ConnectReferenceCounted = 8L,
+		Deferred = 1L,
+		Persist = 2L,
+		OneShot = 4L,
+		ReferenceCounted = 8L,
 	}
 
 	#endregion
diff --git a/GDExtensionBindgen/LuaScriptResourceFormatLoader.cs b/GDExtensionBindgen/LuaScriptResourceFormatLoader.cs
@@ -49,19 +49,19 @@ public class SignalName : ResourceFormatLoader.SignalName
 
 	public enum CacheModeEnum : long
 	{
-		CacheModeIgnore = 0L,
-		CacheModeReuse = 1L,
-		CacheModeReplace = 2L,
-		CacheModeIgnoreDeep = 3L,
-		CacheModeReplaceDeep = 4L,
+		Ignore = 0L,
+		Reuse = 1L,
+		Replace = 2L,
+		IgnoreDeep = 3L,
+		ReplaceDeep = 4L,
 	}
 
 	public enum ConnectFlags : long
 	{
-		ConnectDeferred = 1L,
-		ConnectPersist = 2L,
-		ConnectOneShot = 4L,
-		ConnectReferenceCounted = 8L,
+		Deferred = 1L,
+		Persist = 2L,
+		OneShot = 4L,
+		ReferenceCounted = 8L,
 	}
 
 	#endregion
diff --git a/GDExtensionBindgen/LuaScriptResourceFormatSaver.cs b/GDExtensionBindgen/LuaScriptResourceFormatSaver.cs
@@ -49,10 +49,10 @@ public class SignalName : ResourceFormatSaver.SignalName
 
 	public enum ConnectFlags : long
 	{
-		ConnectDeferred = 1L,
-		ConnectPersist = 2L,
-		ConnectOneShot = 4L,
-		ConnectReferenceCounted = 8L,
+		Deferred = 1L,
+		Persist = 2L,
+		OneShot = 4L,
+		ReferenceCounted = 8L,
 	}
 
 	#endregion
diff --git a/GDExtensionBindgen/LuaState.cs b/GDExtensionBindgen/LuaState.cs
@@ -86,10 +86,10 @@ public enum LibraryEnum : long
 
 	public enum ConnectFlags : long
 	{
-		ConnectDeferred = 1L,
-		ConnectPersist = 2L,
-		ConnectOneShot = 4L,
-		ConnectReferenceCounted = 8L,
+		Deferred = 1L,
+		Persist = 2L,
+		OneShot = 4L,
+		ReferenceCounted = 8L,
 	}
 
 	#endregion
diff --git a/addons/csharp_gdextension_bindgen/csharp_gdextension_bindgen.gd b/addons/csharp_gdextension_bindgen/csharp_gdextension_bindgen.gd
@@ -262,10 +262,19 @@ func _run():
 
 
 static func _generate_enum(cls_name: StringName, enum_name: StringName) -> String:
+	var common_prefix = null
+	for constant_name in ClassDB.class_get_enum_constants(cls_name, enum_name, true):
+		if common_prefix == null:
+			common_prefix = constant_name
+		else:
+			common_prefix = _get_common_prefix(common_prefix, constant_name)
+	
 	var constants = PackedStringArray()
 	for constant_name in ClassDB.class_get_enum_constants(cls_name, enum_name, true):
-		var constant_value = ClassDB.class_get_integer_constant(cls_name, constant_name)
-		constants.append(constant_name.to_pascal_case() + " = " + str(constant_value) + "L,")
+		constants.append("{csharp_constant_name} = {constant_value}L,".format({
+			csharp_constant_name = constant_name.substr(common_prefix.length()).to_pascal_case(),
+			constant_value = ClassDB.class_get_integer_constant(cls_name, constant_name),
+		}))
 
 	return """
 		{flags}
@@ -630,3 +639,11 @@ static func _generate_strings_class(cls_name: StringName, string_name_type: Stri
 		parent_class = parent_class,
 		strings_class = StringNameTypeName[string_name_type],
 	}).strip_edges()
+
+
+static func _get_common_prefix(s1: String, s2: String) -> String:
+	var common_length = min(s1.length(), s2.length())
+	for i in range(common_length):
+		if s1[i] != s2[i]:
+			return s1.substr(0, i)
+	return s1.substr(0, common_length)

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,10 @@ public enum StatusEnum : long`
`69`	`69`
`70`	`70`	`public enum ConnectFlags : long`
`71`	`71`	`{`
`72`		`- ConnectDeferred = 1L,`
`73`		`- ConnectPersist = 2L,`
`74`		`- ConnectOneShot = 4L,`
`75`		`- ConnectReferenceCounted = 8L,`
	`72`	`+ Deferred = 1L,`
	`73`	`+ Persist = 2L,`
	`74`	`+ OneShot = 4L,`
	`75`	`+ ReferenceCounted = 8L,`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ public class SignalName : RefCounted.SignalName`
`50`	`50`
`51`	`51`	`public enum ConnectFlags : long`
`52`	`52`	`{`
`53`		`- ConnectDeferred = 1L,`
`54`		`- ConnectPersist = 2L,`
`55`		`- ConnectOneShot = 4L,`
`56`		`- ConnectReferenceCounted = 8L,`
	`53`	`+ Deferred = 1L,`
	`54`	`+ Persist = 2L,`
	`55`	`+ OneShot = 4L,`
	`56`	`+ ReferenceCounted = 8L,`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ public class SignalName : ScriptExtension.SignalName`
`49`	`49`
`50`	`50`	`public enum ConnectFlags : long`
`51`	`51`	`{`
`52`		`- ConnectDeferred = 1L,`
`53`		`- ConnectPersist = 2L,`
`54`		`- ConnectOneShot = 4L,`
`55`		`- ConnectReferenceCounted = 8L,`
	`52`	`+ Deferred = 1L,`
	`53`	`+ Persist = 2L,`
	`54`	`+ OneShot = 4L,`
	`55`	`+ ReferenceCounted = 8L,`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,10 @@ public enum LibraryEnum : long`
`86`	`86`
`87`	`87`	`public enum ConnectFlags : long`
`88`	`88`	`{`
`89`		`- ConnectDeferred = 1L,`
`90`		`- ConnectPersist = 2L,`
`91`		`- ConnectOneShot = 4L,`
`92`		`- ConnectReferenceCounted = 8L,`
	`89`	`+ Deferred = 1L,`
	`90`	`+ Persist = 2L,`
	`91`	`+ OneShot = 4L,`
	`92`	`+ ReferenceCounted = 8L,`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`#endregion`