Merge pull request #1117 from PierceLBrooks/plb/gstring-concatenation

Implement GString concatenation operator

Author: Bromeon

godot-core/src/global/mod.rs

@@ -42,7 +42,9 @@
 
 mod print;
 
-pub use crate::{godot_error, godot_print, godot_print_rich, godot_script_error, godot_warn};
+pub use crate::{
+    godot_error, godot_print, godot_print_rich, godot_script_error, godot_str, godot_warn,
+};
 
 // Some enums are directly re-exported from crate::builtin.
 pub use crate::gen::central::global_enums::*;

godot-core/src/global/print.rs

@@ -105,3 +105,15 @@ macro_rules! godot_print_rich {
         ])
     };
 }
+
+/// Concatenates format-style into a `GString`.
+#[macro_export]
+macro_rules! godot_str {
+    ($fmt:literal $(, $args:expr)* $(,)?) => {
+        $crate::global::str(&[
+            $crate::builtin::Variant::from(
+                format!($fmt $(, $args)*)
+            )
+        ])
+    };
+}

itest/rust/src/engine_tests/utilities_test.rs

@@ -31,17 +31,22 @@ fn utilities_sign() {
 
 #[itest]
 fn utilities_str() {
+    let a = 12;
+    let b = " is a ";
+    let c = true;
+    let d = " number";
     let concat = str(&[
-        Variant::from(12),
-        Variant::from(" is a "),
-        Variant::from(true),
-        Variant::from(" number"),
+        Variant::from(a),
+        Variant::from(b),
+        Variant::from(c),
+        Variant::from(d),
     ]);
 
     let empty = str(&[]);
 
     // TODO: implement GString==&str operator. Then look for "...".into() patterns and replace them.
     assert_eq!(concat, "12 is a true number".into());
+    assert_eq!(concat, godot_str!("{a}{b}{c}{d}"));
     assert_eq!(empty, GString::new());
 }