Seach for comment before Generics from the Trait beginning

Author: davidBar-On

src/formatting/items.rs

@@ -1136,9 +1136,8 @@ pub(crate) fn format_trait(
         );
         result.push_str(&header);
 
-        // FIXME: rustfmt fails to format when there are comments between `trait` and ident.
-        let trait_hi = context.snippet_provider.span_after(item.span, "trait");
-        if contains_comment(context.snippet(mk_sp(trait_hi, generics.span.lo()))) {
+        // FIXME: rustfmt fails to format when there are comments before the ident.
+        if contains_comment(context.snippet(mk_sp(item.span.lo(), generics.span.lo()))) {
             return None;
         }
 

tests/source/lhs-to-rhs-bewteen-comments/trait.rs

@@ -27,7 +27,10 @@ A + C
 pub trait Foo6:/* A and C */A + C    + B{}
 
 // Other cases
-trait Person {
+trait Person{
+fn name(&self) -> String;
+}
+/*comment1*/trait Person{
 fn name(&self) -> String;
 }
 trait Student:/* comment1 */Person/* comment2 */{

tests/target/lhs-to-rhs-bewteen-comments/trait.rs

@@ -24,6 +24,10 @@ pub trait Foo6: /* A and C */ A + C + B {}
 trait Person {
     fn name(&self) -> String;
 }
+/*comment1*/
+trait Person {
+    fn name(&self) -> String;
+}
 trait Student: /* comment1 */ Person /* comment2 */ {
     fn university(&self) -> String;
 }