Merge #674

674: support no editor properties r=toasteater a=extrawurst

fixes #673 

Co-authored-by: Stephan Dilly <[email protected]>

Author: bors[bot]

gdnative-derive/src/native_script.rs

@@ -60,6 +60,12 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
                 None
             };
 
+            let with_usage = if config.no_editor {
+                Some(quote!(.with_usage(::gdnative::nativescript::init::property::Usage::NOEDITOR)))
+            } else {
+                None
+            };
+
             let before_get: Option<Stmt> = config
                 .before_get
                 .map(|path_expr| parse_quote!(#path_expr(this, _owner);));
@@ -81,6 +87,7 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
                 builder.add_property(#label)
                     #with_default
                     #with_hint
+                    #with_usage
                     .with_ref_getter(|this: &#name, _owner: ::gdnative::TRef<Self::Base>| {
                         #before_get
                         let res = &this.#ident;
@@ -202,6 +209,8 @@ fn parse_derive_input(input: &DeriveInput) -> Result<DeriveData, syn::Error> {
                         for arg in &nested {
                             if let NestedMeta::Meta(Meta::NameValue(ref pair)) = arg {
                                 attr_args_builder.add_pair(pair)?;
+                            } else if let NestedMeta::Meta(Meta::Path(ref path)) = arg {
+                                attr_args_builder.add_path(path)?;
                             } else {
                                 let msg = format!("Unexpected argument: {:?}", arg);
                                 return Err(syn::Error::new(arg.span(), msg));
@@ -292,4 +301,21 @@ mod tests {
 
         parse_derive_input(&input).unwrap();
     }
+
+    #[test]
+    fn derive_property_no_editor() {
+        let input: TokenStream2 = syn::parse_str(
+            r#"
+            #[inherit(Node)]
+            struct Foo {
+                #[property(no_editor)]
+                bar: String,
+            }"#,
+        )
+        .unwrap();
+
+        let input: DeriveInput = syn::parse2(input).unwrap();
+
+        parse_derive_input(&input).unwrap();
+    }
 }

gdnative-derive/src/native_script/property_args.rs

@@ -8,6 +8,7 @@ pub struct PropertyAttrArgs {
     pub after_get: Option<syn::Path>,
     pub before_set: Option<syn::Path>,
     pub after_set: Option<syn::Path>,
+    pub no_editor: bool,
 }
 
 #[derive(Default)]
@@ -19,6 +20,7 @@ pub struct PropertyAttrArgsBuilder {
     after_get: Option<syn::Path>,
     before_set: Option<syn::Path>,
     after_set: Option<syn::Path>,
+    no_editor: bool,
 }
 
 impl PropertyAttrArgsBuilder {
@@ -167,6 +169,19 @@ impl PropertyAttrArgsBuilder {
 
         Ok(())
     }
+
+    pub fn add_path(&mut self, path: &syn::Path) -> Result<(), syn::Error> {
+        if path.is_ident("no_editor") {
+            self.no_editor = true;
+        } else {
+            return Err(syn::Error::new(
+                path.span(),
+                format!("unexpected argument: {:?}", path.get_ident()),
+            ));
+        }
+
+        Ok(())
+    }
 }
 
 impl PropertyAttrArgsBuilder {
@@ -179,6 +194,7 @@ impl PropertyAttrArgsBuilder {
             after_get: self.after_get,
             before_set: self.before_set,
             after_set: self.after_set,
+            no_editor: self.no_editor,
         }
     }
 }