Fix generic component tags in html macro (yewstack#837)

llebout · Jan 20, 2020 · 02ffccd · 02ffccd
1 parent 793b21b
commit 02ffccd
Show file tree

Hide file tree

Showing 4 changed files with 214 additions and 212 deletions.
diff --git a/crates/macro/src/html_tree/html_component.rs b/crates/macro/src/html_tree/html_component.rs
@@ -11,7 +11,10 @@ use syn::parse;
 use syn::parse::{Parse, ParseStream, Result as ParseResult};
 use syn::punctuated::Punctuated;
 use syn::spanned::Spanned;
-use syn::{Expr, Ident, Index, Path, PathArguments, PathSegment, Token, Type, TypePath};
+use syn::{
+    AngleBracketedGenericArguments, Expr, GenericArgument, Ident, Index, Path, PathArguments,
+    PathSegment, Token, Type, TypePath,
+};
 
 pub struct HtmlComponent {
     ty: Type,
@@ -57,8 +60,8 @@ impl Parse for HtmlComponent {
                     "this open tag has no corresponding close tag",
                 ));
             }
-            if let Some(typ) = HtmlComponentClose::peek(input.cursor()) {
-                if open.ty == typ {
+            if let Some(ty) = HtmlComponentClose::peek(input.cursor()) {
+                if open.ty == ty {
                     break;
                 }
             }
@@ -199,6 +202,26 @@ impl HtmlComponent {
         Some(cursor)
     }
 
+    fn path_arguments(cursor: Cursor) -> Option<(PathArguments, Cursor)> {
+        let (punct, cursor) = cursor.punct()?;
+        (punct.as_char() == '<').as_option()?;
+
+        let (ty, cursor) = Self::peek_type(cursor)?;
+
+        let (punct, cursor) = cursor.punct()?;
+        (punct.as_char() == '>').as_option()?;
+
+        Some((
+            PathArguments::AngleBracketed(AngleBracketedGenericArguments {
+                colon2_token: None,
+                lt_token: Token![<](Span::call_site()),
+                args: vec![GenericArgument::Type(ty)].into_iter().collect(),
+                gt_token: Token![>](Span::call_site()),
+            }),
+            cursor,
+        ))
+    }
+
     fn peek_type(mut cursor: Cursor) -> Option<(Type, Cursor)> {
         let mut colons_optional = true;
         let mut last_ident = None;
@@ -219,10 +242,14 @@ impl HtmlComponent {
             if let Some((ident, c)) = post_colons_cursor.ident() {
                 cursor = c;
                 last_ident = Some(ident.clone());
-                segments.push(PathSegment {
-                    ident,
-                    arguments: PathArguments::None,
-                });
+                let arguments = if let Some((args, c)) = Self::path_arguments(cursor) {
+                    cursor = c;
+                    args
+                } else {
+                    PathArguments::None
+                };
+
+                segments.push(PathSegment { ident, arguments });
             } else {
                 break;
             }

diff --git a/tests/macro/html-component-fail.rs b/tests/macro/html-component-fail.rs
@@ -1,5 +1,6 @@
 #![recursion_limit = "128"]
 
+use std::marker::PhantomData;
 use yew::prelude::*;
 
 #[derive(Clone, Properties, PartialEq)]
@@ -14,21 +15,14 @@ impl Component for Child {
     type Message = ();
     type Properties = ChildProperties;
 
-    fn create(props: Self::Properties, _: ComponentLink<Self>) -> Self {
-        Child
-    }
-
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!()
-    }
-
-    fn view(&self) -> Html {
-        unimplemented!()
-    }
+    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self { unimplemented!() }
+    fn update(&mut self, _: Self::Message) -> ShouldRender { unimplemented!() }
+    fn view(&self) -> Html { unimplemented!() }
 }
 
 #[derive(Clone, Properties)]
 pub struct ChildContainerProperties {
+    #[props(required)]
     pub children: ChildrenWithProps<Child>,
 }
 
@@ -37,17 +31,22 @@ impl Component for ChildContainer {
     type Message = ();
     type Properties = ChildContainerProperties;
 
-    fn create(props: Self::Properties, _: ComponentLink<Self>) -> Self {
-        ChildContainer
-    }
+    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self { unimplemented!() }
+    fn update(&mut self, _: Self::Message) -> ShouldRender { unimplemented!() }
+    fn view(&self) -> Html { unimplemented!() }
+}
 
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!()
-    }
+pub struct Generic<G> {
+    marker: PhantomData<G>,
+}
 
-    fn view(&self) -> Html {
-        unimplemented!()
-    }
+impl Component for Generic<String> {
+    type Message = ();
+    type Properties = ();
+
+    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self { unimplemented!() }
+    fn update(&mut self, _: Self::Message) -> ShouldRender { unimplemented!() }
+    fn view(&self) -> Html { unimplemented!() }
 }
 
 fn compile_fail() {
@@ -75,11 +74,15 @@ fn compile_fail() {
     html! { <Child><Child></Child> };
     html! { <Child></Child><Child></Child> };
     html! { <Child>{ "Not allowed" }</Child> };
+
+    html! { <ChildContainer /> };
+    html! { <ChildContainer></ChildContainer> };
     html! { <ChildContainer>{ "Not allowed" }</ChildContainer> };
     html! { <ChildContainer><></></ChildContainer> };
-    html! { <ChildContainer><ChildContainer /></ChildContainer> };
-    html! { <ChildContainer><ChildContainer /></ChildContainer> };
     html! { <ChildContainer><Child int=1 /><other /></ChildContainer> };
+
+    html! { <Generic<String>></Generic> };
+    html! { <Generic<String>></Generic<Vec<String>>> };
 }
 
 fn main() {}