Avoid adding an extra newline after block comments

When block comments were rewritten to line comments they check if a new line needs to be added and adds one if needed. It only checked for '\n' however which would cause a newline to be added even if the comment was ended by "\r\n"
This commit is contained in:
Markus Westerlind 2015-11-20 23:31:05 +01:00
parent 3533f72c45
commit ad7dc420cd
3 changed files with 10 additions and 3 deletions

View File

@ -143,11 +143,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");
}
}

View File

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

View File

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