}
}
-pub fn rewrite_string<'a>(orig: &str, fmt: &StringFormat<'a>) -> Option<String> {
+pub fn rewrite_string<'a>(
+ orig: &str,
+ fmt: &StringFormat<'a>,
+ newline_max_chars: usize,
+) -> Option<String> {
let max_chars_with_indent = fmt.max_chars_with_indent()?;
let max_chars_without_indent = fmt.max_chars_without_indent()?;
let indent_with_newline = fmt.shape.indent.to_string_with_newline(fmt.config);
result.push_str(fmt.line_end);
result.push_str(&indent_with_newline);
result.push_str(fmt.line_start);
- cur_max_chars = max_chars_with_indent;
+ cur_max_chars = newline_max_chars;
cur_start += len;
}
SnippetState::EndWithLineFeed(line, len) => {
if s.len() < start + 8 {
return None;
}
- let prefix = s[start..start + 8].join("");
+ let prefix = s[start..start + 8].concat();
if prefix.starts_with("https://")
|| prefix.starts_with("http://")
|| prefix.starts_with("ftp://")
for (i, grapheme) in input[0..=index].iter().enumerate() {
if is_line_feed(grapheme) {
if i <= index_minus_ws {
- let mut line = input[0..i].join("");
+ let mut line = &input[0..i].concat()[..];
if trim_end {
- line = line.trim_right().to_string();
+ line = line.trim_right();
}
return SnippetState::EndWithLineFeed(format!("{}\n", line), i + 1);
}
for (i, grapheme) in input[index + 1..].iter().enumerate() {
if !trim_end && is_line_feed(grapheme) {
return SnippetState::EndWithLineFeed(
- input[0..=index + 1 + i].join("").to_string(),
+ input[0..=index + 1 + i].concat(),
index + 2 + i,
);
} else if not_whitespace_except_line_feed(grapheme) {
}
if trim_end {
- SnippetState::LineEnd(
- input[0..=index_minus_ws].join("").to_string(),
- index_plus_ws + 1,
- )
+ SnippetState::LineEnd(input[0..=index_minus_ws].concat(), index_plus_ws + 1)
} else {
- SnippetState::LineEnd(
- input[0..=index_plus_ws].join("").to_string(),
- index_plus_ws + 1,
- )
+ SnippetState::LineEnd(input[0..=index_plus_ws].concat(), index_plus_ws + 1)
}
};
.position(|grapheme| not_whitespace_except_line_feed(grapheme))
.unwrap_or(0);
return if trim_end {
- SnippetState::LineEnd(
- input[..=url_index_end].join("").to_string(),
- index_plus_ws + 1,
- )
+ SnippetState::LineEnd(input[..=url_index_end].concat(), index_plus_ws + 1)
} else {
- return SnippetState::LineEnd(
- input[..=index_plus_ws].join("").to_string(),
- index_plus_ws + 1,
- );
+ return SnippetState::LineEnd(input[..=index_plus_ws].concat(), index_plus_ws + 1);
};
}
match input[0..max_chars]
// A boundary was found after the line limit
Some(index) => break_at(max_chars + index),
// No boundary to the right, the input cannot be broken
- None => SnippetState::EndOfInput(input.join("").to_string()),
+ None => SnippetState::EndOfInput(input.concat()),
},
},
}
fn issue343() {
let config = Default::default();
let fmt = StringFormat::new(Shape::legacy(2, Indent::empty()), &config);
- rewrite_string("eq_", &fmt);
+ rewrite_string("eq_", &fmt, 2);
}
#[test]
let mut config: Config = Default::default();
config.set().max_width(27);
let fmt = StringFormat::new(Shape::legacy(25, Indent::empty()), &config);
- let rewritten_string = rewrite_string(string, &fmt);
+ let rewritten_string = rewrite_string(string, &fmt, 27);
assert_eq!(
rewritten_string,
Some("\"Nulla\nconsequat erat at massa. \\\n Vivamus id mi.\"".to_string())
let mut fmt = StringFormat::new(Shape::legacy(25, Indent::empty()), &config);
fmt.trim_end = true;
- let rewritten_string = rewrite_string(string, &fmt);
+ let rewritten_string = rewrite_string(string, &fmt, 25);
assert_eq!(rewritten_string, Some("\"Vivamus id mi.\"".to_string()));
fmt.trim_end = false; // default value of trim_end
- let rewritten_string = rewrite_string(string, &fmt);
+ let rewritten_string = rewrite_string(string, &fmt, 25);
assert_eq!(rewritten_string, Some("\"Vivamus id mi. \"".to_string()));
}
config: &config,
};
- let rewritten_string = rewrite_string(string, &fmt);
+ let rewritten_string = rewrite_string(string, &fmt, 100);
assert_eq!(
rewritten_string,
Some("Vivamus id mi.\n // Vivamus id mi.".to_string())
};
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 30),
Some(
"Aenean metus.\n // Vestibulum ac lacus. Vivamus\n // porttitor"
.to_string()
};
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 30),
Some(
"Aenean metus.\n // Vestibulum ac lacus. Vivamus@\n // porttitor"
.to_string()
let comment = "Aenean metus. Vestibulum\n\nac lacus. Vivamus porttitor";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 30),
Some(
"Aenean metus. Vestibulum\n //\n // ac lacus. Vivamus porttitor".to_string()
)
fmt.shape = Shape::legacy(15, Indent::from_width(&config, 4));
let comment = "Aenean\n\nmetus. Vestibulum ac lacus. Vivamus porttitor";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 15),
Some(
r#"Aenean
//
let comment = "Aenean\n\nmetus. Vestibulum ac lacus.\n\n";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 20),
Some(
"Aenean\n //\n // metus. Vestibulum ac\n // lacus.\n //\n".to_string()
)
let comment = "Aenean\n\nmetus. Vestibulum ac lacus.\n";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 20),
Some("Aenean\n //\n // metus. Vestibulum ac\n // lacus.\n".to_string())
);
let comment = "Aenean\n \nmetus. Vestibulum ac lacus.";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 20),
Some("Aenean\n //\n // metus. Vestibulum ac\n // lacus.".to_string())
);
}
let comment = "Aenean metus. Vestibulum ac lacus.";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 13),
Some("Aenean metus.\n // Vestibulum ac\n // lacus.".to_string())
);
fmt.trim_end = false;
let comment = "Vestibulum ac lacus.";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 13),
Some("Vestibulum \n // ac lacus.".to_string())
);
fmt.line_end = "\\";
let comment = "Vestibulum ac lacus.";
assert_eq!(
- rewrite_string(comment, &fmt),
+ rewrite_string(comment, &fmt, 13),
Some("Vestibulum\\\n // ac lacus.".to_string())
);
}