Merge pull request #634 from Marwes/block_comment_crlf

Avoid adding an extra newline after block comments

src/missed_spans.rs

@@ -145,11 +145,12 @@ impl<'a> FmtVisitor<'a> {
                     line_start = offset + subslice.len();
 
                     if let Some('/') = subslice.chars().skip(1).next() {
+                        // Add a newline after line comments
                         self.buffer.push_str("\n");
                     } else if line_start < snippet.len() {
-                        let x = (&snippet[line_start..]).chars().next().unwrap() != '\n';
-
-                        if x {
+                        // For other comments add a newline if there isn't one at the end already
+                        let c = snippet[line_start..].chars().next().unwrap();
+                        if c != '\n' && c != '\r' {
                             self.buffer.push_str("\n");
                         }
                     }

tests/source/comment_crlf_newline.rs

@@ -0,0 +1,3 @@
+/* Block comments followed by CRLF newlines should not an extra newline at the end */
+
+/* Something else */

tests/target/comment_crlf_newline.rs

@@ -0,0 +1,3 @@
+// Block comments followed by CRLF newlines should not an extra newline at the end
+
+// Something else