Merge pull request #1947 from topecongiro/issue-1275

Use the last line's width for indent width in rewriting missed span to fix unindented comments

src/missed_spans.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use Shape;
+use {Indent, Shape};
 use comment::{rewrite_comment, CodeCharKind, CommentCodeSlices};
 use config::WriteMode;
 use syntax::codemap::{BytePos, Pos, Span};
@@ -169,11 +169,12 @@ fn replace_chars(string: &str) -> String {
                         self.config.comment_width(),
                         self.config.max_width() - self.block_indent.width(),
                     );
+                    let comment_indent = Indent::from_width(self.config, self.buffer.cur_offset());
 
                     self.buffer.push_str(&rewrite_comment(
                         subslice,
                         false,
-                        Shape::legacy(comment_width, self.block_indent),
+                        Shape::legacy(comment_width, comment_indent),
                         self.config,
                     ).unwrap());
 

src/visitor.rs

@@ -72,11 +72,7 @@ fn visit_stmt(&mut self, stmt: &ast::Stmt) {
             ast::StmtKind::Item(ref item) => {
                 self.visit_item(item);
             }
-            ast::StmtKind::Local(..) => {
+            ast::StmtKind::Local(..) | ast::StmtKind::Expr(..) | ast::StmtKind::Semi(..) => {
-                let rewrite = stmt.rewrite(&self.get_context(), self.shape());
-                self.push_rewrite(stmt.span(), rewrite);
-            }
-            ast::StmtKind::Expr(..) | ast::StmtKind::Semi(..) => {
                 let rewrite = stmt.rewrite(&self.get_context(), self.shape());
                 self.push_rewrite(stmt.span(), rewrite)
             }

tests/source/comment.rs

@@ -9,7 +9,6 @@ fn test() {
 // comment
         // comment2
 
-    // FIXME(1275)
     code(); /* leave this comment alone!
              * ok? */
 

tests/source/comment4.rs

@@ -5,7 +5,6 @@ fn test() {
 // comment
         // comment2
 
-    // FIXME(1275)
     code(); /* leave this comment alone!
              * ok? */
 

tests/target/comment.rs

@@ -9,9 +9,8 @@ fn test() {
     // comment
     // comment2
 
-    // FIXME(1275)
     code(); // leave this comment alone!
-    // ok?
+            // ok?
 
     // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a
     // diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam
@@ -33,7 +32,7 @@ fn test() {
     //                           .unwrap());
 
     funk(); // dontchangeme
-    // or me
+            // or me
 
     // #1388
     const EXCEPTION_PATHS: &'static [&'static str] = &[

tests/target/comment4.rs

@@ -5,9 +5,8 @@ fn test() {
     // comment
     // comment2
 
-    // FIXME(1275)
     code(); /* leave this comment alone!
-     * ok? */
+             * ok? */
 
     /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a
      * diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam
@@ -28,7 +27,7 @@ fn test() {
     //                           .unwrap());
 
     funk(); //dontchangeme
-    // or me
+            // or me
 }
 
 /// test123