Merge #851

851: Enable parsing attributes for generic lifetimes and type parameters r=matklad a=vipentti



Co-authored-by: Ville Penttinen <[email protected]>

3 files changed, 22 insertions, 9 deletions

diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index c7aaccc95..47107a58b 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
@@ -1716,6 +1716,7 @@ impl ToOwned for LifetimeParam {
 }
 
 
+impl ast::AttrsOwner for LifetimeParam {}
 impl LifetimeParam {
     pub fn lifetime(&self) -> Option<&Lifetime> {
         super::child_opt(self)
@@ -4076,6 +4077,7 @@ impl ToOwned for TypeParam {
 
 
 impl ast::NameOwner for TypeParam {}
+impl ast::AttrsOwner for TypeParam {}
 impl TypeParam {}
 
 // TypeParamList
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 193b563aa..b1775d0f8 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -559,8 +559,11 @@ Grammar(
                 ["lifetime_params", "LifetimeParam" ],
             ]
         ),
-        "TypeParam": ( traits: ["NameOwner"] ),
-        "LifetimeParam": ( options: [ "Lifetime" ] ),
+        "TypeParam": ( traits: ["NameOwner", "AttrsOwner"] ),
+        "LifetimeParam": (
+            options: [ "Lifetime"],
+            traits: ["AttrsOwner"],
+        ),
         "Lifetime": ( traits: ["AstToken"] ),
         "WhereClause": (),
         "ExprStmt": (
diff --git a/crates/ra_syntax/src/grammar/type_params.rs b/crates/ra_syntax/src/grammar/type_params.rs
index 1ec813b3e..40f998682 100644
--- a/crates/ra_syntax/src/grammar/type_params.rs
+++ b/crates/ra_syntax/src/grammar/type_params.rs
@@ -13,10 +13,20 @@ fn type_param_list(p: &mut Parser) {
     p.bump();
 
     while !p.at(EOF) && !p.at(R_ANGLE) {
+        let m = p.start();
+
+        // test generic_lifetime_type_attribute
+        // fn foo<#[derive(Lifetime)] 'a, #[derive(Type)] T>(_: &'a T) {
+        // }
+        attributes::outer_attributes(p);
+
         match p.current() {
-            LIFETIME => lifetime_param(p),
-            IDENT => type_param(p),
-            _ => p.err_and_bump("expected type parameter"),
+            LIFETIME => lifetime_param(p, m),
+            IDENT => type_param(p, m),
+            _ => {
+                m.abandon(p);
+                p.err_and_bump("expected type parameter")
+            }
         }
         if !p.at(R_ANGLE) && !p.expect(COMMA) {
             break;
@@ -26,9 +36,8 @@ fn type_param_list(p: &mut Parser) {
     m.complete(p, TYPE_PARAM_LIST);
 }
 
-fn lifetime_param(p: &mut Parser) {
+fn lifetime_param(p: &mut Parser, m: Marker) {
     assert!(p.at(LIFETIME));
-    let m = p.start();
     p.bump();
     if p.at(COLON) {
         lifetime_bounds(p);
@@ -36,9 +45,8 @@ fn lifetime_param(p: &mut Parser) {
     m.complete(p, LIFETIME_PARAM);
 }
 
-fn type_param(p: &mut Parser) {
+fn type_param(p: &mut Parser, m: Marker) {
     assert!(p.at(IDENT));
-    let m = p.start();
     name(p);
     if p.at(COLON) {
         bounds(p);