fixed some problems from rebasing

pull/224/head
Jan Hrastnik 3 years ago
parent 7cf0fa05a4
commit 9c3eadb2e4

@ -4,14 +4,9 @@ use helix_core::{
movement::{self, Direction}, movement::{self, Direction},
object, pos_at_coords, object, pos_at_coords,
regex::{self, Regex}, regex::{self, Regex},
<<<<<<< HEAD
register::{self, Register, Registers}, register::{self, Register, Registers},
search, selection, Change, ChangeSet, Position, Range, Rope, RopeSlice, Selection, SmallVec, search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeSlice, Selection,
Tendril, Transaction, SmallVec, Tendril, Transaction,
=======
register, search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeSlice,
Selection, SmallVec, Tendril, Transaction,
>>>>>>> 856fd95 (trying out line ending helper functions in commands.rs)
}; };
use helix_view::{ use helix_view::{
@ -2285,15 +2280,10 @@ fn paste_impl(
.unwrap(), .unwrap(),
); );
<<<<<<< HEAD
// if any of values ends \n it's linewise paste
let linewise = values.iter().any(|value| value.ends_with('\n'));
=======
// if any of values ends \n it's linewise paste // if any of values ends \n it's linewise paste
let linewise = values let linewise = values
.iter() .iter()
.any(|value| value.ends_with(doc.line_ending())); .any(|value| value.ends_with(doc.line_ending()));
>>>>>>> 856fd95 (trying out line ending helper functions in commands.rs)
let mut values = values.iter().cloned().map(Tendril::from).chain(repeat); let mut values = values.iter().cloned().map(Tendril::from).chain(repeat);

@ -5,7 +5,9 @@ use std::path::{Component, Path, PathBuf};
use std::sync::Arc; use std::sync::Arc;
use helix_core::{ use helix_core::{
auto_detect_line_ending,
chars::{char_is_linebreak, char_is_whitespace}, chars::{char_is_linebreak, char_is_whitespace},
history::History,
syntax::{LanguageConfiguration, LOADER}, syntax::{LanguageConfiguration, LOADER},
ChangeSet, Diagnostic, LineEnding, Rope, Selection, State, Syntax, Transaction, ChangeSet, Diagnostic, LineEnding, Rope, Selection, State, Syntax, Transaction,
DEFAULT_LINE_ENDING, DEFAULT_LINE_ENDING,
@ -28,21 +30,6 @@ pub enum IndentStyle {
Spaces(u8), Spaces(u8),
} }
/// Represents one of the valid Unicode line endings.
/// Also acts as an index into `LINE_ENDINGS`.
#[derive(PartialEq, Copy, Clone, Debug)]
pub enum LineEnding {
None = 0, // No line ending
Crlf = 1, // CarriageReturn followed by LineFeed
LF = 2, // U+000A -- LineFeed
VT = 3, // U+000B -- VerticalTab
FF = 4, // U+000C -- FormFeed
CR = 5, // U+000D -- CarriageReturn
Nel = 6, // U+0085 -- NextLine
LS = 7, // U+2028 -- Line Separator
PS = 8, // U+2029 -- ParagraphSeparator
}
pub struct Document { pub struct Document {
// rope + selection // rope + selection
pub(crate) id: DocumentId, pub(crate) id: DocumentId,

Loading…
Cancel
Save