Merge pull request #35 from Cysharp/hadashiA/fix-tostring

Fix ToString() implementations
Cysharp · Sep 28, 2023 · 897b873 · 897b873
2 parents 4e1d81d + bf48a80
commit 897b873
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/src/UnitGenerator/SourceGenerator.cs b/src/UnitGenerator/SourceGenerator.cs
@@ -391,25 +391,39 @@ public override int GetHashCode()
         }
 
 """);
-            if (prop.ToStringFormat is { } format)
+            if (prop.IsString())
             {
-                sb.AppendLine($$"""
-        public override string ToString()
-        {
-            return string.Format({{format}}, value);
-        }
+                if (prop.ToStringFormat is { } format)
+                {
+                    sb.AppendLine($$"""
+        public override string ToString() => value == null ? "null" : string.Format("{{format}}", value);
+
+""");
+                }
+                else
+                {
+                    sb.AppendLine("""
+        public override string ToString() => value == null ? "null" : value.ToString(); 
 
 """);
+                }
             }
             else
             {
-                sb.AppendLine("""
-        public override string ToString()
-        {
-            return value.ToString();
-        }
+                if (prop.ToStringFormat is { } format)
+                {
+                    sb.AppendLine($$"""
+        public override string ToString() => string.Format("{{format}}", value);
+
+""");
+                }
+                else
+                {
+                    sb.AppendLine("""
+        public override string ToString() => value.ToString();
 
 """);
+                }
             }
 
             if (prop.IsGuid())