From 18d80c1b7255b201da5b9ff63123e9a4f09a32b7 Mon Sep 17 00:00:00 2001 From: 12Acorns <86685238+12Acorns@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:21:12 +0100 Subject: [PATCH 1/2] Fixed giving null assembly name when assembly is present. See [this](https://github.com/SolidAlloy/GenericUnityObjects/issues/39#issuecomment-2403300541) for explanation. --- Editor/Extensions/MonoScriptExtensions.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Editor/Extensions/MonoScriptExtensions.cs b/Editor/Extensions/MonoScriptExtensions.cs index 4b33aac..ccfefe8 100644 --- a/Editor/Extensions/MonoScriptExtensions.cs +++ b/Editor/Extensions/MonoScriptExtensions.cs @@ -89,9 +89,13 @@ private static string GetProperClassName(string rawClassName) /// [PublicAPI, NotNull] public static string GetAssemblyName(this MonoScript script) { - string assemblyName = script.Internal_GetAssemblyName(); + string assemblyName = script.Internal_GetAssemblyName(); int lastDotIndex = assemblyName.LastIndexOf('.'); - return lastDotIndex == -1 ? string.Empty : assemblyName.Substring(0, lastDotIndex); + if(assemblyName == null || assemblyName == string.Empty) + { + return string.Empty; + } + return lastDotIndex == -1 ? assemblyName : assemblyName.Substring(0, lastDotIndex); } private static string GetNamespaceName(this MonoScript asset) @@ -101,4 +105,4 @@ private static string GetNamespaceName(this MonoScript asset) return match.Success ? match.Value : string.Empty; } } -} \ No newline at end of file +} From 1b36b8ce4368b60d72de12c7669f72ed08427812 Mon Sep 17 00:00:00 2001 From: 12Acorns <86685238+12Acorns@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:30:14 +0100 Subject: [PATCH 2/2] Fixed alignment --- Editor/Extensions/MonoScriptExtensions.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Editor/Extensions/MonoScriptExtensions.cs b/Editor/Extensions/MonoScriptExtensions.cs index ccfefe8..a2ed598 100644 --- a/Editor/Extensions/MonoScriptExtensions.cs +++ b/Editor/Extensions/MonoScriptExtensions.cs @@ -89,13 +89,13 @@ private static string GetProperClassName(string rawClassName) /// [PublicAPI, NotNull] public static string GetAssemblyName(this MonoScript script) { - string assemblyName = script.Internal_GetAssemblyName(); + string assemblyName = script.Internal_GetAssemblyName(); int lastDotIndex = assemblyName.LastIndexOf('.'); - if(assemblyName == null || assemblyName == string.Empty) - { - return string.Empty; - } - return lastDotIndex == -1 ? assemblyName : assemblyName.Substring(0, lastDotIndex); + if(assemblyName == null || assemblyName == string.Empty) + { + return string.Empty; + } + return lastDotIndex == -1 ? assemblyName : assemblyName.Substring(0, lastDotIndex); } private static string GetNamespaceName(this MonoScript asset)