From ae7330eea4100566f9f3826221cb3d694cfde5cc Mon Sep 17 00:00:00 2001
From: rchaser53 <tayoshizawa29@gmail.com>
Date: Sun, 24 Feb 2019 15:18:46 +0900
Subject: [PATCH 1/2] leave pre comment for self

---
 src/items.rs               | 16 +++++++++++++--
 tests/source/issue-3198.rs | 40 ++++++++++++++++++++++++++++++++++++++
 tests/target/issue-3198.rs | 19 ++++++++++++++++++
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 tests/source/issue-3198.rs
 create mode 100644 tests/target/issue-3198.rs

diff --git a/src/items.rs b/src/items.rs
index c2568735ad8..d0b29b03ff3 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -20,7 +20,8 @@ use crate::expr::{
     ExprType, RhsTactics,
 };
 use crate::lists::{
-    definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator,
+    definitive_tactic, extract_pre_comment, itemize_list, write_list, ListFormatting, ListItem,
+    Separator,
 };
 use crate::macros::{rewrite_macro, MacroPosition};
 use crate::overflow;
@@ -2291,9 +2292,15 @@ fn rewrite_args(
     // Account for sugary self.
     // FIXME: the comment for the self argument is dropped. This is blocked
     // on rust issue #27522.
+    let mut comment_str = "";
     let min_args = explicit_self
         .and_then(|explicit_self| rewrite_explicit_self(explicit_self, args, context))
         .map_or(1, |self_str| {
+            let comment_span = mk_sp(span.lo(), args[0].pat.span.lo());
+            comment_str = context
+                .snippet_provider
+                .span_to_snippet(comment_span)
+                .unwrap();
             arg_item_strs[0] = self_str;
             2
         });
@@ -2368,7 +2375,12 @@ fn rewrite_args(
         && (arg_items.is_empty()
             || arg_items.len() == 1 && arg_item_strs[0].len() <= one_line_budget);
 
-    for (item, arg) in arg_items.iter_mut().zip(arg_item_strs) {
+    for (index, (item, arg)) in arg_items.iter_mut().zip(arg_item_strs).enumerate() {
+        if index == 0 && explicit_self.is_some() {
+            let (pre_comment, pre_comment_style) = extract_pre_comment(comment_str);
+            item.pre_comment = pre_comment;
+            item.pre_comment_style = pre_comment_style;
+        }
         item.item = Some(arg);
     }
 
diff --git a/tests/source/issue-3198.rs b/tests/source/issue-3198.rs
new file mode 100644
index 00000000000..517533ae562
--- /dev/null
+++ b/tests/source/issue-3198.rs
@@ -0,0 +1,40 @@
+impl TestTrait {
+    fn foo_one(/* Important comment1 */
+    self) {
+    }
+
+    fn foo(
+        /* Important comment1 */
+        self,
+        /* Important comment2 */
+        a: i32,
+    ) {
+    }
+
+    fn bar(
+            /* Important comment1 */
+    &mut self,
+        /* Important comment2 */
+            a: i32,
+    ) {
+    }
+
+    fn baz(
+    /* Important comment1 */
+            self: X< 'a ,  'b >,
+            /* Important comment2 */
+    a: i32,
+    ) {
+    }
+
+    fn baz_tree(
+    /* Important comment1 */
+
+            self: X< 'a ,  'b >,
+        /* Important comment2 */
+        a: i32,
+        /* Important comment3 */
+        b: i32,
+    ) {
+    }
+}
diff --git a/tests/target/issue-3198.rs b/tests/target/issue-3198.rs
new file mode 100644
index 00000000000..de307fed6b1
--- /dev/null
+++ b/tests/target/issue-3198.rs
@@ -0,0 +1,19 @@
+impl TestTrait {
+    fn foo_one(/* Important comment1 */ self) {}
+
+    fn foo(/* Important comment1 */ self, /* Important comment2 */ a: i32) {}
+
+    fn bar(/* Important comment1 */ &mut self, /* Important comment2 */ a: i32) {}
+
+    fn baz(/* Important comment1 */ self: X<'a, 'b>, /* Important comment2 */ a: i32) {}
+
+    fn baz_tree(
+        /* Important comment1 */
+        self: X<'a, 'b>,
+        /* Important comment2 */
+        a: i32,
+        /* Important comment3 */
+        b: i32,
+    ) {
+    }
+}

From dec390207685351dd67dcc0185a861771363d4d1 Mon Sep 17 00:00:00 2001
From: rchaser53 <tayoshizawa29@gmail.com>
Date: Sun, 24 Feb 2019 23:04:47 +0900
Subject: [PATCH 2/2] leave post comment for self

---
 src/items.rs               | 71 ++++++++++++++++++++++----------------
 src/lists.rs               |  2 +-
 tests/source/issue-3198.rs | 71 ++++++++++++++++++++++++++++++++++----
 tests/target/issue-3198.rs | 58 ++++++++++++++++++++++++++++---
 4 files changed, 160 insertions(+), 42 deletions(-)

diff --git a/src/items.rs b/src/items.rs
index d0b29b03ff3..5f751035f3e 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -20,8 +20,8 @@ use crate::expr::{
     ExprType, RhsTactics,
 };
 use crate::lists::{
-    definitive_tactic, extract_pre_comment, itemize_list, write_list, ListFormatting, ListItem,
-    Separator,
+    definitive_tactic, extract_post_comment, extract_pre_comment, get_comment_end,
+    has_extra_newline, itemize_list, write_list, ListFormatting, ListItem, Separator,
 };
 use crate::macros::{rewrite_macro, MacroPosition};
 use crate::overflow;
@@ -2281,6 +2281,10 @@ fn rewrite_args(
     variadic: bool,
     generics_str_contains_newline: bool,
 ) -> Option<String> {
+    let terminator = ")";
+    let separator = ",";
+    let next_span_start = span.hi();
+
     let mut arg_item_strs = args
         .iter()
         .map(|arg| {
@@ -2290,17 +2294,20 @@ fn rewrite_args(
         .collect::<Vec<_>>();
 
     // Account for sugary self.
-    // FIXME: the comment for the self argument is dropped. This is blocked
-    // on rust issue #27522.
-    let mut comment_str = "";
+    let mut pre_comment_str = "";
+    let mut post_comment_str = "";
     let min_args = explicit_self
         .and_then(|explicit_self| rewrite_explicit_self(explicit_self, args, context))
         .map_or(1, |self_str| {
-            let comment_span = mk_sp(span.lo(), args[0].pat.span.lo());
-            comment_str = context
-                .snippet_provider
-                .span_to_snippet(comment_span)
-                .unwrap();
+            pre_comment_str = context.snippet(mk_sp(span.lo(), args[0].pat.span.lo()));
+
+            let next_start = if args.len() > 1 {
+                args[1].pat.span().lo()
+            } else {
+                span.hi()
+            };
+            post_comment_str = context.snippet(mk_sp(args[0].ty.span.hi(), next_start));
+
             arg_item_strs[0] = self_str;
             2
         });
@@ -2317,14 +2324,18 @@ fn rewrite_args(
     // it is explicit.
     if args.len() >= min_args || variadic {
         let comment_span_start = if min_args == 2 {
-            let second_arg_start = if arg_has_pattern(&args[1]) {
-                args[1].pat.span.lo()
+            let remove_comma_byte_pos = context
+                .snippet_provider
+                .span_after(mk_sp(args[0].ty.span.hi(), args[1].pat.span.lo()), ",");
+            let first_post_and_second_pre_span =
+                mk_sp(remove_comma_byte_pos, args[1].pat.span.lo());
+            if count_newlines(context.snippet(first_post_and_second_pre_span)) > 0 {
+                context
+                    .snippet_provider
+                    .span_after(first_post_and_second_pre_span, "\n")
             } else {
-                args[1].ty.span.lo()
-            };
-            let reduced_span = mk_sp(span.lo(), second_arg_start);
-
-            context.snippet_provider.span_after_last(reduced_span, ",")
+                remove_comma_byte_pos
+            }
         } else {
             span.lo()
         };
@@ -2349,8 +2360,8 @@ fn rewrite_args(
                 .iter()
                 .map(ArgumentKind::Regular)
                 .chain(variadic_arg),
-            ")",
-            ",",
+            terminator,
+            separator,
             |arg| match *arg {
                 ArgumentKind::Regular(arg) => span_lo_for_arg(arg),
                 ArgumentKind::Variadic(start) => start,
@@ -2364,22 +2375,30 @@ fn rewrite_args(
                 ArgumentKind::Variadic(..) => Some("...".to_owned()),
             },
             comment_span_start,
-            span.hi(),
+            next_span_start,
             false,
         );
 
         arg_items.extend(more_items);
     }
 
+    let arg_items_len = arg_items.len();
     let fits_in_one_line = !generics_str_contains_newline
         && (arg_items.is_empty()
-            || arg_items.len() == 1 && arg_item_strs[0].len() <= one_line_budget);
+            || arg_items_len == 1 && arg_item_strs[0].len() <= one_line_budget);
 
     for (index, (item, arg)) in arg_items.iter_mut().zip(arg_item_strs).enumerate() {
+        // add pre comment and post comment for first arg(self)
         if index == 0 && explicit_self.is_some() {
-            let (pre_comment, pre_comment_style) = extract_pre_comment(comment_str);
+            let (pre_comment, pre_comment_style) = extract_pre_comment(pre_comment_str);
             item.pre_comment = pre_comment;
             item.pre_comment_style = pre_comment_style;
+
+            let comment_end =
+                get_comment_end(post_comment_str, separator, terminator, arg_items_len == 1);
+
+            item.new_lines = has_extra_newline(post_comment_str, comment_end);
+            item.post_comment = extract_post_comment(post_comment_str, comment_end, separator);
         }
         item.item = Some(arg);
     }
@@ -2430,14 +2449,6 @@ fn rewrite_args(
     write_list(&arg_items, &fmt)
 }
 
-fn arg_has_pattern(arg: &ast::Arg) -> bool {
-    if let ast::PatKind::Ident(_, ident, _) = arg.pat.node {
-        ident != symbol::keywords::Invalid.ident()
-    } else {
-        true
-    }
-}
-
 fn compute_budgets_for_args(
     context: &RewriteContext<'_>,
     result: &str,
diff --git a/src/lists.rs b/src/lists.rs
index cbf5d35c49c..cb404123af0 100644
--- a/src/lists.rs
+++ b/src/lists.rs
@@ -683,7 +683,7 @@ pub fn get_comment_end(
 
 // Account for extra whitespace between items. This is fiddly
 // because of the way we divide pre- and post- comments.
-fn has_extra_newline(post_snippet: &str, comment_end: usize) -> bool {
+pub fn has_extra_newline(post_snippet: &str, comment_end: usize) -> bool {
     if post_snippet.is_empty() || comment_end == 0 {
         return false;
     }
diff --git a/tests/source/issue-3198.rs b/tests/source/issue-3198.rs
index 517533ae562..48cb24a0025 100644
--- a/tests/source/issue-3198.rs
+++ b/tests/source/issue-3198.rs
@@ -1,9 +1,13 @@
 impl TestTrait {
-    fn foo_one(/* Important comment1 */
+    fn foo_one_pre(/* Important comment1 */
     self) {
     }
 
-    fn foo(
+    fn foo_one_post(self
+    /* Important comment1 */) {
+    }
+
+    fn foo_pre(
         /* Important comment1 */
         self,
         /* Important comment2 */
@@ -11,7 +15,15 @@ impl TestTrait {
     ) {
     }
 
-    fn bar(
+    fn foo_post(
+        self
+        /* Important comment1 */,
+        a: i32
+        /* Important comment2 */,
+    ) {
+    }
+
+    fn bar_pre(
             /* Important comment1 */
     &mut self,
         /* Important comment2 */
@@ -19,7 +31,15 @@ impl TestTrait {
     ) {
     }
 
-    fn baz(
+    fn bar_post(
+    &mut self
+            /* Important comment1 */,
+            a: i32
+        /* Important comment2 */,
+    ) {
+    }
+
+    fn baz_pre(
     /* Important comment1 */
             self: X< 'a ,  'b >,
             /* Important comment2 */
@@ -27,9 +47,16 @@ impl TestTrait {
     ) {
     }
 
-    fn baz_tree(
-    /* Important comment1 */
+    fn baz_post(
+            self: X< 'a ,  'b >
+    /* Important comment1 */,
+    a: i32
+            /* Important comment2 */,
+    ) {
+    }
 
+    fn baz_tree_pre(
+    /* Important comment1 */
             self: X< 'a ,  'b >,
         /* Important comment2 */
         a: i32,
@@ -37,4 +64,36 @@ impl TestTrait {
         b: i32,
     ) {
     }
+
+    fn baz_tree_post(
+            self: X< 'a ,  'b >
+    /* Important comment1 */,
+        a: i32
+        /* Important comment2 */,
+        b: i32
+        /* Important comment3 */,){
+    }
+
+    fn multi_line(
+        self: X<'a, 'b>, /* Important comment1-1 */
+  /* Important comment1-2 */
+        a: i32, /* Important comment2 */
+        b: i32, /* Important comment3 */
+    ) {
+    }
+
+    fn two_line_comment(
+        self: X<'a, 'b>, /* Important comment1-1
+      Important comment1-2 */
+        a: i32, /* Important comment2 */
+        b: i32, /* Important comment3 */
+    ) {
+    }
+
+    fn no_first_line_comment(
+        self: X<'a, 'b>,
+        /* Important comment2 */a: i32,
+        /* Important comment3 */b: i32,
+    ) {
+    }
 }
diff --git a/tests/target/issue-3198.rs b/tests/target/issue-3198.rs
index de307fed6b1..9291f181d03 100644
--- a/tests/target/issue-3198.rs
+++ b/tests/target/issue-3198.rs
@@ -1,13 +1,31 @@
 impl TestTrait {
-    fn foo_one(/* Important comment1 */ self) {}
+    fn foo_one_pre(/* Important comment1 */ self) {}
 
-    fn foo(/* Important comment1 */ self, /* Important comment2 */ a: i32) {}
+    fn foo_one_post(self /* Important comment1 */) {}
 
-    fn bar(/* Important comment1 */ &mut self, /* Important comment2 */ a: i32) {}
+    fn foo_pre(/* Important comment1 */ self, /* Important comment2 */ a: i32) {}
 
-    fn baz(/* Important comment1 */ self: X<'a, 'b>, /* Important comment2 */ a: i32) {}
+    fn foo_post(self /* Important comment1 */, a: i32 /* Important comment2 */) {}
 
-    fn baz_tree(
+    fn bar_pre(/* Important comment1 */ &mut self, /* Important comment2 */ a: i32) {}
+
+    fn bar_post(&mut self /* Important comment1 */, a: i32 /* Important comment2 */) {}
+
+    fn baz_pre(
+        /* Important comment1 */
+        self: X<'a, 'b>,
+        /* Important comment2 */
+        a: i32,
+    ) {
+    }
+
+    fn baz_post(
+        self: X<'a, 'b>, /* Important comment1 */
+        a: i32,          /* Important comment2 */
+    ) {
+    }
+
+    fn baz_tree_pre(
         /* Important comment1 */
         self: X<'a, 'b>,
         /* Important comment2 */
@@ -16,4 +34,34 @@ impl TestTrait {
         b: i32,
     ) {
     }
+
+    fn baz_tree_post(
+        self: X<'a, 'b>, /* Important comment1 */
+        a: i32,          /* Important comment2 */
+        b: i32,          /* Important comment3 */
+    ) {
+    }
+
+    fn multi_line(
+        self: X<'a, 'b>, /* Important comment1-1 */
+        /* Important comment1-2 */
+        a: i32, /* Important comment2 */
+        b: i32, /* Important comment3 */
+    ) {
+    }
+
+    fn two_line_comment(
+        self: X<'a, 'b>, /* Important comment1-1
+                         Important comment1-2 */
+        a: i32, /* Important comment2 */
+        b: i32, /* Important comment3 */
+    ) {
+    }
+
+    fn no_first_line_comment(
+        self: X<'a, 'b>,
+        /* Important comment2 */ a: i32,
+        /* Important comment3 */ b: i32,
+    ) {
+    }
 }