squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Use more descriptive names

Browse source
This commit is contained in:
Ruben Schmidmeister 2019-04-24 21:58:50 +02:00
parent 19bd1a44ce
commit 7556c420ab
No known key found for this signature in database
GPG key ID: 29387B5A7AAF863F
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/formatting/newline_style.rs
View file

@ -41,15 +41,17 @@ const LINE_FEED: char = '\n';
const CARRIAGE_RETURN: char = '\r'; const CARRIAGE_RETURN: char = '\r';
fn auto_detect_newline_style(raw_input_text: &str) -> EffectiveNewlineStyle { fn auto_detect_newline_style(raw_input_text: &str) -> EffectiveNewlineStyle {
if let Some(pos) = raw_input_text.chars().position(|ch| ch == LINE_FEED) { let first_line_feed_pos = raw_input_text.chars().position(|ch| ch == LINE_FEED);
let pos = pos.saturating_sub(1); match first_line_feed_pos {
if let Some(CARRIAGE_RETURN) = raw_input_text.chars().nth(pos) { Some(first_line_feed_pos) => {
EffectiveNewlineStyle::Windows let char_before_line_feed_pos = first_line_feed_pos.saturating_sub(1);
} else { let char_before_line_feed = raw_input_text.chars().nth(char_before_line_feed_pos);
EffectiveNewlineStyle::Unix match char_before_line_feed {
Some(CARRIAGE_RETURN) => EffectiveNewlineStyle::Windows,
_ => EffectiveNewlineStyle::Unix,
} }
} else { }
native_newline_style() None => native_newline_style(),
} }
} }