user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extract conversion to windows newlines into fn

Browse source
This commit is contained in:
Ruben Schmidmeister 2019-04-24 19:54:37 +02:00
parent 58d7b2cc66
commit 764cdf60fa
No known key found for this signature in database
GPG key ID: 29387B5A7AAF863F
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/formatting/newline_style.rs
View file

@ -11,27 +11,14 @@ pub(crate) fn apply_newline_style(
formatted_text: &mut String,
raw_input_text: &str,
) {
const WINDOWS_NEWLINE: &str = "\r\n";
match effective_newline_style(newline_style, raw_input_text) {
EffectiveNewlineStyle::Windows => {
let mut transformed = String::with_capacity(2 * formatted_text.capacity());
for c in formatted_text.chars() {
match c {
LINE_FEED => transformed.push_str(WINDOWS_NEWLINE),
CARRIAGE_RETURN => continue,
c => transformed.push(c),
}
}
*formatted_text = transformed;
*formatted_text = convert_to_windows_newlines(formatted_text);
}
EffectiveNewlineStyle::Unix => {}
}
}
const LINE_FEED: char = '\n';
const CARRIAGE_RETURN: char = '\r';
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
enum EffectiveNewlineStyle {
Windows,
@ -50,6 +37,9 @@ fn effective_newline_style(
}
}
const LINE_FEED: char = '\n';
const CARRIAGE_RETURN: char = '\r';
fn auto_detect_newline_style(raw_input_text: &str) -> EffectiveNewlineStyle {
if let Some(pos) = raw_input_text.find(LINE_FEED) {
let pos = pos.saturating_sub(1);
@ -71,6 +61,19 @@ fn native_newline_style() -> EffectiveNewlineStyle {
}
}
fn convert_to_windows_newlines(formatted_text: &String) -> String {
let mut transformed = String::with_capacity(2 * formatted_text.capacity());
for c in formatted_text.chars() {
const WINDOWS_NEWLINE: &str = "\r\n";
match c {
LINE_FEED => transformed.push_str(WINDOWS_NEWLINE),
CARRIAGE_RETURN => continue,
c => transformed.push(c),
}
}
transformed
}
#[cfg(test)]
mod tests {
use super::*;