Unify file/dir export functions

Author: Bromeon

godot-core/src/registry/property.rs

@@ -410,58 +410,32 @@ pub mod export_info_functions {
         }
     }
 
-    /// Equivalent to `@export_file` in Godot.
-    ///
-    /// Pass an empty string to have no filter.
-    pub fn export_file<T: Export>(filter: impl AsRef<str>) -> PropertyHintInfo {
-        //T::var_hint()
-        export_file_inner::<T>(false, filter)
-    }
-
-    /// Equivalent to `@export_dir` in Godot.
-    ///
-    /// Pass an empty string to have no filter.
-    pub fn export_dir<T: Export>() -> PropertyHintInfo {
-        PropertyHintInfo {
-            hint: PropertyHint::DIR,
-            hint_string: GString::new(),
-        }
-    }
-
-    /// Equivalent to `@export_global_dir` in Godot.
-    ///
-    /// Pass an empty string to have no filter.
-    pub fn export_global_dir<T: Export>() -> PropertyHintInfo {
-        PropertyHintInfo {
-            hint: PropertyHint::GLOBAL_DIR,
-            hint_string: GString::new(),
-        }
-    }
-
-    /// Equivalent to `@export_global_file` in Godot.
-    ///
-    /// Pass an empty string to have no filter.
-    pub fn export_global_file<T: Export>(filter: impl AsRef<str>) -> PropertyHintInfo {
-        export_file_inner::<T>(true, filter)
-    }
-
-    pub fn export_file_inner<T: Export>(global: bool, filter: impl AsRef<str>) -> PropertyHintInfo {
-        let hint = if global {
-            PropertyHint::GLOBAL_FILE
-        } else {
-            PropertyHint::FILE
+    /// Handles `@export_file`, `@export_global_file`, `@export_dir` and `@export_global_dir`.
+    pub fn export_file_or_dir<T: Export>(
+        is_file: bool,
+        is_global: bool,
+        filter: impl AsRef<str>,
+    ) -> PropertyHintInfo {
+        let filter = filter.as_ref();
+        debug_assert!(is_file || filter.is_empty()); // Dir never has filter.
+
+        let hint = match (is_file, is_global) {
+            (true, true) => PropertyHint::GLOBAL_FILE,
+            (true, false) => PropertyHint::FILE,
+            (false, true) => PropertyHint::GLOBAL_DIR,
+            (false, false) => PropertyHint::DIR,
         };
 
         PropertyHintInfo {
             hint,
-            hint_string: filter.as_ref().into(),
+            hint_string: GString::from(filter),
         }
     }
 
     pub fn export_placeholder<S: AsRef<str>>(placeholder: S) -> PropertyHintInfo {
         PropertyHintInfo {
             hint: PropertyHint::PLACEHOLDER_TEXT,
-            hint_string: placeholder.as_ref().into(),
+            hint_string: GString::from(placeholder.as_ref()),
         }
     }
 

godot-macros/src/class/data_models/field_export.rs

@@ -495,29 +495,27 @@ impl ExportType {
             } => quote_export_func! { export_flags_3d_navigation() },
 
             Self::File {
-                global: false,
-                kind: FileKind::Dir,
-            } => quote_export_func! { export_dir<T>() },
-
-            Self::File {
-                global: true,
+                global,
                 kind: FileKind::Dir,
-            } => quote_export_func! { export_global_dir<T>() },
+            } => {
+                let filter = quote! { "" };
+                quote_export_func! { export_file_or_dir<T>(false, #global, #filter) }
+            }
 
             Self::File {
                 global,
                 kind: FileKind::File { filter },
             } => {
                 let filter = filter.clone().unwrap_or(quote! { "" });
-
-                quote_export_func! { export_file_inner<T>(#global, #filter) }
+                quote_export_func! { export_file_or_dir<T>(true, #global, #filter) }
             }
 
             Self::Multiline => quote_export_func! { export_multiline() },
 
             Self::PlaceholderText { placeholder } => quote_export_func! {
                 export_placeholder(#placeholder)
             },
+
             Self::ColorNoAlpha => quote_export_func! { export_color_no_alpha() },
         }
     }

itest/rust/src/object_tests/property_template_test.rs

@@ -102,7 +102,12 @@ fn property_template_test(ctx: &TestContext) {
         "not all properties were matched, missing: {properties:?}"
     );
 
-    assert!(errors.is_empty(), "{}", errors.join("\n"));
+    assert!(
+        errors.is_empty(),
+        "Encountered {} mismatches between GDScript and Rust:\n{}",
+        errors.len(),
+        errors.join("\n")
+    );
 
     rust_properties.free();
 }