diff options
| -rw-r--r-- | helix-term/src/commands.rs | 8 | ||||
| -rw-r--r-- | helix-view/src/document.rs | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 28c4fe3a..70441fcf 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1009,7 +1009,7 @@ fn append_mode(cx: &mut Context) { if selection.iter().any(|range| range.head == end) { let transaction = Transaction::change( doc.text(), - std::array::IntoIter::new([(end, end, Some(doc.line_ending().as_str().into()))]), + std::array::IntoIter::new([(end, end, Some(doc.line_ending.as_str().into()))]), ); doc.apply(&transaction, view.id); } @@ -2349,7 +2349,7 @@ pub mod insert { ); let indent = doc.indent_unit().repeat(indent_level); let mut text = String::with_capacity(1 + indent.len()); - text.push_str(doc.line_ending().as_str()); + text.push_str(doc.line_ending.as_str()); text.push_str(&indent); let head = pos + offs + text.chars().count(); @@ -2370,7 +2370,7 @@ pub mod insert { if helix_core::auto_pairs::PAIRS.contains(&(prev, curr)) { // another newline, indent the end bracket one level less let indent = doc.indent_unit().repeat(indent_level.saturating_sub(1)); - text.push_str(doc.line_ending().as_str()); + text.push_str(doc.line_ending.as_str()); text.push_str(&indent); } @@ -2537,7 +2537,7 @@ fn paste_impl( // if any of values ends \n it's linewise paste let linewise = values .iter() - .any(|value| value.ends_with(doc.line_ending().as_str())); + .any(|value| value.ends_with(doc.line_ending.as_str())); let mut values = values.iter().cloned().map(Tendril::from).chain(repeat); diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs index 9326fb79..945271ea 100644 --- a/helix-view/src/document.rs +++ b/helix-view/src/document.rs @@ -268,7 +268,7 @@ impl Document { // set the path and try detecting the language doc.set_path(&path)?; doc.detect_indent_style(); - doc.set_line_ending(line_ending); + doc.line_ending = line_ending; if let Some(loader) = config_loader { doc.detect_language(theme, loader); @@ -531,10 +531,6 @@ impl Document { self.selections.insert(view_id, selection); } - pub fn set_line_ending(&mut self, line_ending: LineEnding) { - self.line_ending = line_ending; - } - fn _apply(&mut self, transaction: &Transaction, view_id: ViewId) -> bool { let old_doc = self.text().clone(); @@ -805,10 +801,6 @@ impl Document { pub fn set_diagnostics(&mut self, diagnostics: Vec<Diagnostic>) { self.diagnostics = diagnostics; } - - pub fn line_ending(&self) -> LineEnding { - self.line_ending - } } #[cfg(test)] |