Fix #[godot_api] impl godot::engine::ITrait not working with full path

Author: Bromeon

godot-macros/src/class/godot_api.rs

@@ -452,7 +452,7 @@ fn convert_to_match_expression_or_none(tokens: Option<TokenStream>) -> TokenStre
 
 /// Codegen for `#[godot_api] impl GodotExt for MyType`
 fn transform_trait_impl(original_impl: Impl) -> Result<TokenStream, Error> {
-    let (class_name, trait_name) = util::validate_trait_impl_virtual(&original_impl, "godot_api")?;
+    let (class_name, trait_path) = util::validate_trait_impl_virtual(&original_impl, "godot_api")?;
     let class_name_obj = util::class_name_obj(&class_name);
 
     let mut godot_init_impl = TokenStream::new();
@@ -505,7 +505,7 @@ fn transform_trait_impl(original_impl: Impl) -> Result<TokenStream, Error> {
                     #(#cfg_attrs)*
                     impl ::godot::obj::cap::GodotRegisterClass for #class_name {
                         fn __godot_register_class(builder: &mut ::godot::builder::GodotBuilder<Self>) {
-                            <Self as #trait_name>::register_class(builder)
+                            <Self as #trait_path>::register_class(builder)
                         }
                     }
                 };
@@ -534,7 +534,7 @@ fn transform_trait_impl(original_impl: Impl) -> Result<TokenStream, Error> {
                     #(#cfg_attrs)*
                     impl ::godot::obj::cap::GodotDefault for #class_name {
                         fn __godot_user_init(base: ::godot::obj::Base<Self::Base>) -> Self {
-                            <Self as #trait_name>::init(base)
+                            <Self as #trait_path>::init(base)
                         }
                     }
                 };
@@ -559,7 +559,7 @@ fn transform_trait_impl(original_impl: Impl) -> Result<TokenStream, Error> {
                     #(#cfg_attrs)*
                     impl ::godot::obj::cap::GodotToString for #class_name {
                         fn __godot_to_string(&self) -> ::godot::builtin::GString {
-                            <Self as #trait_name>::to_string(self)
+                            <Self as #trait_path>::to_string(self)
                         }
                     }
                 };
@@ -583,7 +583,7 @@ fn transform_trait_impl(original_impl: Impl) -> Result<TokenStream, Error> {
                                 return;
                             }
 
-                            <Self as #trait_name>::on_notification(self, what.into())
+                            <Self as #trait_path>::on_notification(self, what.into())
                         }
                     }
                 };
@@ -605,7 +605,7 @@ fn transform_trait_impl(original_impl: Impl) -> Result<TokenStream, Error> {
                                 return None;
                             }
 
-                            <Self as #trait_name>::get_property(self, property)
+                            <Self as #trait_path>::get_property(self, property)
                         }
                     }
                 };
@@ -626,7 +626,7 @@ fn transform_trait_impl(original_impl: Impl) -> Result<TokenStream, Error> {
                                 return false;
                             }
 
-                            <Self as #trait_name>::set_property(self, property, value)
+                            <Self as #trait_path>::set_property(self, property, value)
                         }
                     }
                 };

godot-macros/src/util/mod.rs

@@ -11,7 +11,7 @@ use crate::ParseResult;
 use proc_macro2::{Delimiter, Group, Ident, Literal, TokenStream, TokenTree};
 use quote::spanned::Spanned;
 use quote::{format_ident, quote, ToTokens, TokenStreamExt};
-use venial::{Error, Function, GenericParamList, Impl, WhereClause};
+use venial::{Error, Function, GenericParamList, Impl, TyExpr, WhereClause};
 
 mod kv_parser;
 mod list_parser;
@@ -162,12 +162,12 @@ pub(crate) fn validate_impl(
     validate_self(original_impl, attr)
 }
 
-/// Validates that the declaration is the of the form `impl Trait for
-/// SomeType`, where the name of `Trait` ends in `Virtual`.
-pub(crate) fn validate_trait_impl_virtual(
-    original_impl: &Impl,
+/// Validates that the declaration is the of the form `impl Trait for SomeType`, where the name
+/// of `Trait` begins with `I`.
+pub(crate) fn validate_trait_impl_virtual<'a>(
+    original_impl: &'a Impl,
     attr: &str,
-) -> ParseResult<(Ident, Ident)> {
+) -> ParseResult<(Ident, &'a TyExpr)> {
     let trait_name = original_impl.trait_ty.as_ref().unwrap(); // unwrap: already checked outside
     let typename = extract_typename(trait_name);
 
@@ -184,8 +184,8 @@ pub(crate) fn validate_trait_impl_virtual(
 
     // Validate self
     validate_self(original_impl, attr).map(|class_name| {
-        let trait_name = typename.unwrap(); // unwrap: already checked in 'Validate trait'
-        (class_name, trait_name.ident)
+        // let trait_name = typename.unwrap(); // unwrap: already checked in 'Validate trait'
+        (class_name, trait_name)
     })
 }
 
@@ -207,7 +207,7 @@ fn validate_self(original_impl: &Impl, attr: &str) -> ParseResult<Ident> {
     }
 }
 
-/// Gets the right-most type name in the path
+/// Gets the right-most type name in the path.
 fn extract_typename(ty: &venial::TyExpr) -> Option<venial::PathSegment> {
     match ty.as_path() {
         Some(mut path) => path.segments.pop(),