Merge #599

599: Allow placeholder parameters in trait function definitions r=matklad a=regiontog

fixes #597 

Co-authored-by: Erlend Tobiassen <[email protected]>

1 files changed, 6 insertions, 1 deletions

diff --git a/crates/ra_syntax/src/grammar/params.rs b/crates/ra_syntax/src/grammar/params.rs
index 658fc5820..13158429a 100644
--- a/crates/ra_syntax/src/grammar/params.rs
+++ b/crates/ra_syntax/src/grammar/params.rs
@@ -79,7 +79,12 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) {
             let la1 = p.nth(1);
             let la2 = p.nth(2);
             let la3 = p.nth(3);
-            if la0 == IDENT && la1 == COLON
+
+            // test trait_fn_placeholder_parameter
+            // trait Foo {
+            //     fn bar(_: u64);
+            // }
+            if (la0 == IDENT || la0 == UNDERSCORE) && la1 == COLON
                 || la0 == AMP && la1 == IDENT && la2 == COLON
                 || la0 == AMP && la1 == MUT_KW && la2 == IDENT && la3 == COLON
             {