Merge pull request #51022 from raulsntos/csharp-interpolated-strings

Use C# interpolated strings

modules/mono/glue/GodotSharp/GodotSharp/Core/AABB.cs

@@ -670,20 +670,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_position}, {_size}";
-                {
-                    _position.ToString(),
-                    _size.ToString()
-                });
         }
 
         public string ToString(string format)
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_position.ToString(format)}, {_size.ToString(format)}";
-                {
-                    _position.ToString(format),
-                    _size.ToString(format)
-                });
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs

@@ -863,16 +863,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return "[X: " + x.ToString() +
+            return $"[X: {x}, Y: {y}, Z: {z}]";
-                    ", Y: " + y.ToString() +
-                    ", Z: " + z.ToString() + "]";
         }
 
         public string ToString(string format)
         {
-            return "[X: " + x.ToString(format) +
+            return $"[X: {x.ToString(format)}, Y: {y.ToString(format)}, Z: {z.ToString(format)}]";
-                    ", Y: " + y.ToString(format) +
-                    ", Z: " + z.ToString(format) + "]";
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs

@@ -1010,12 +1010,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("({0}, {1}, {2}, {3})", r.ToString(), g.ToString(), b.ToString(), a.ToString());
+            return $"({r}, {g}, {b}, {a})";
         }
 
         public string ToString(string format)
         {
-            return String.Format("({0}, {1}, {2}, {3})", r.ToString(format), g.ToString(format), b.ToString(format), a.ToString(format));
+            return $"({r.ToString(format)}, {g.ToString(format)}, {b.ToString(format)}, {a.ToString(format)})";
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs

@@ -355,20 +355,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_normal}, {D}";
-            {
-                _normal.ToString(),
-                D.ToString()
-            });
         }
 
         public string ToString(string format)
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_normal.ToString(format)}, {D.ToString(format)}";
-            {
-                _normal.ToString(format),
-                D.ToString(format)
-            });
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Quaternion.cs

@@ -547,12 +547,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("({0}, {1}, {2}, {3})", x.ToString(), y.ToString(), z.ToString(), w.ToString());
+            return $"({x}, {y}, {z}, {w})";
         }
 
         public string ToString(string format)
         {
-            return String.Format("({0}, {1}, {2}, {3})", x.ToString(format), y.ToString(format), z.ToString(format), w.ToString(format));
+            return $"({x.ToString(format)}, {y.ToString(format)}, {z.ToString(format)}, {w.ToString(format)})";
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs

@@ -405,20 +405,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_position}, {_size}";
-            {
-                _position.ToString(),
-                _size.ToString()
-            });
         }
 
         public string ToString(string format)
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_position.ToString(format)}, {_size.ToString(format)}";
-            {
-                _position.ToString(format),
-                _size.ToString(format)
-            });
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2i.cs

@@ -383,20 +383,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_position}, {_size}";
-            {
-                _position.ToString(),
-                _size.ToString()
-            });
         }
 
         public string ToString(string format)
         {
-            return String.Format("{0}, {1}", new object[]
+            return $"{_position.ToString(format)}, {_size.ToString(format)}";
-            {
-                _position.ToString(format),
-                _size.ToString(format)
-            });
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs

@@ -492,16 +492,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return "[X: " + x.ToString() +
+            return $"[X: {x}, Y: {y}, O: {origin}]";
-                    ", Y: " + y.ToString() +
-                    ", O: " + origin.ToString() + "]";
         }
 
         public string ToString(string format)
         {
-            return "[X: " + x.ToString(format) +
+            return $"[X: {x.ToString(format)}, Y: {y.ToString(format)}, O: {origin.ToString(format)}]";
-                    ", Y: " + y.ToString(format) +
-                    ", O: " + origin.ToString(format) + "]";
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs

@@ -393,18 +393,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return "[X: " + basis.x.ToString() +
+            return $"[X: {basis.x}, Y: {basis.y}, Z: {basis.z}, O: {origin}]";
-                    ", Y: " + basis.y.ToString() +
-                    ", Z: " + basis.z.ToString() +
-                    ", O: " + origin.ToString() + "]";
         }
 
         public string ToString(string format)
         {
-            return "[X: " + basis.x.ToString(format) +
+            return $"[X: {basis.x.ToString(format)}, Y: {basis.y.ToString(format)}, Z: {basis.z.ToString(format)}, O: {origin.ToString(format)}]";
-                    ", Y: " + basis.y.ToString(format) +
-                    ", Z: " + basis.z.ToString(format) +
-                    ", O: " + origin.ToString(format) + "]";
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs

@@ -751,20 +751,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("({0}, {1})", new object[]
+            return $"({x}, {y})";
-            {
-                x.ToString(),
-                y.ToString()
-            });
         }
 
         public string ToString(string format)
         {
-            return String.Format("({0}, {1})", new object[]
+            return $"({x.ToString(format)}, {y.ToString(format)})";
-            {
-                x.ToString(format),
-                y.ToString(format)
-            });
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2i.cs

@@ -508,20 +508,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("({0}, {1})", new object[]
+            return $"({x}, {y})";
-            {
-                this.x.ToString(),
-                this.y.ToString()
-            });
         }
 
         public string ToString(string format)
         {
-            return String.Format("({0}, {1})", new object[]
+            return $"({x.ToString(format)}, {y.ToString(format)})";
-            {
-                this.x.ToString(format),
-                this.y.ToString(format)
-            });
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs

@@ -845,22 +845,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("({0}, {1}, {2})", new object[]
+            return $"({x}, {y}, {z})";
-            {
-                x.ToString(),
-                y.ToString(),
-                z.ToString()
-            });
         }
 
         public string ToString(string format)
         {
-            return String.Format("({0}, {1}, {2})", new object[]
+            return $"({x.ToString(format)}, {y.ToString(format)}, {z.ToString(format)})";
-            {
-                x.ToString(format),
-                y.ToString(format),
-                z.ToString(format)
-            });
         }
     }
 }

modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3i.cs

@@ -511,22 +511,12 @@ namespace Godot
 
         public override string ToString()
         {
-            return String.Format("({0}, {1}, {2})", new object[]
+            return $"({x}, {y}, {z})";
-            {
-                this.x.ToString(),
-                this.y.ToString(),
-                this.z.ToString()
-            });
         }
 
         public string ToString(string format)
         {
-            return String.Format("({0}, {1}, {2})", new object[]
+            return $"({x.ToString(format)}, {y.ToString(format)}, {z.ToString(format)})";
-            {
-                this.x.ToString(format),
-                this.y.ToString(format),
-                this.z.ToString(format)
-            });
         }
     }
 }