diff options
| -rw-r--r-- | helix-core/src/line_ending.rs | 14 | ||||
| -rw-r--r-- | helix-term/src/commands.rs | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/helix-core/src/line_ending.rs b/helix-core/src/line_ending.rs index 19de2231..dfc74551 100644 --- a/helix-core/src/line_ending.rs +++ b/helix-core/src/line_ending.rs @@ -132,19 +132,19 @@ pub fn get_line_ending(line: &RopeSlice) -> Option<LineEnding> { pub fn get_line_ending_of_str(line: &str) -> Option<LineEnding> { if line.ends_with("\u{000D}\u{000A}") { Some(LineEnding::Crlf) - } else if line.ends_with("\u{000A}") { + } else if line.ends_with('\u{000A}') { Some(LineEnding::LF) - } else if line.ends_with("\u{000B}") { + } else if line.ends_with('\u{000B}') { Some(LineEnding::VT) - } else if line.ends_with("\u{000C}") { + } else if line.ends_with('\u{000C}') { Some(LineEnding::FF) - } else if line.ends_with("\u{000D}") { + } else if line.ends_with('\u{000D}') { Some(LineEnding::CR) - } else if line.ends_with("\u{0085}") { + } else if line.ends_with('\u{0085}') { Some(LineEnding::Nel) - } else if line.ends_with("\u{2028}") { + } else if line.ends_with('\u{2028}') { Some(LineEnding::LS) - } else if line.ends_with("\u{2029}") { + } else if line.ends_with('\u{2029}') { Some(LineEnding::PS) } else { None diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 6ccbaaff..5cb30da6 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1304,7 +1304,10 @@ mod cmd { fn yank_joined_to_clipboard(editor: &mut Editor, args: &[&str], _: PromptEvent) { let (_, doc) = current!(editor); - let separator = args.first().copied().unwrap_or(doc.line_ending.as_str()); + let separator = args + .first() + .copied() + .unwrap_or_else(|| doc.line_ending.as_str()); yank_joined_to_clipboard_impl(editor, separator); } |