resolved conflict in rebase

pull/224/head
Jan Hrastnik 3 years ago
parent 17f69a03e0
commit 5eb6918392

@ -6,6 +6,7 @@ pub mod diagnostic;
pub mod graphemes; pub mod graphemes;
pub mod history; pub mod history;
pub mod indent; pub mod indent;
pub mod line_ending;
pub mod macros; pub mod macros;
pub mod match_brackets; pub mod match_brackets;
pub mod movement; pub mod movement;
@ -109,4 +110,5 @@ pub use syntax::Syntax;
pub use diagnostic::Diagnostic; pub use diagnostic::Diagnostic;
pub use state::State; pub use state::State;
pub use line_ending::{auto_detect_line_ending, default_line_ending, LineEnding};
pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction}; pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};

@ -0,0 +1,74 @@
use crate::{Rope, RopeGraphemes, RopeSlice};
/// Represents one of the valid Unicode line endings.
#[derive(PartialEq, Copy, Clone, Debug)]
pub enum LineEnding {
Crlf, // CarriageReturn followed by LineFeed
LF, // U+000A -- LineFeed
VT, // U+000B -- VerticalTab
FF, // U+000C -- FormFeed
CR, // U+000D -- CarriageReturn
Nel, // U+0085 -- NextLine
LS, // U+2028 -- Line Separator
PS, // U+2029 -- ParagraphSeparator
}
pub fn rope_slice_to_line_ending(g: &RopeSlice) -> Option<LineEnding> {
if let Some(text) = g.as_str() {
str_to_line_ending(text)
} else if g == "\u{000D}\u{000A}" {
Some(LineEnding::Crlf)
} else {
// Not a line ending
None
}
}
pub fn str_to_line_ending(g: &str) -> Option<LineEnding> {
match g {
"\u{000D}\u{000A}" => Some(LineEnding::Crlf),
"\u{000A}" => Some(LineEnding::LF),
"\u{000B}" => Some(LineEnding::VT),
"\u{000C}" => Some(LineEnding::FF),
"\u{000D}" => Some(LineEnding::CR),
"\u{0085}" => Some(LineEnding::Nel),
"\u{2028}" => Some(LineEnding::LS),
"\u{2029}" => Some(LineEnding::PS),
// Not a line ending
_ => None,
}
}
pub fn auto_detect_line_ending(doc: &Rope) -> Option<LineEnding> {
// based on https://github.com/cessen/led/blob/27572c8838a1c664ee378a19358604063881cc1d/src/editor/mod.rs#L88-L162
let mut ending = None;
for line in doc.lines().take(1) {
// check first line only - unsure how sound this is
ending = match line.len_chars() {
1 => {
let g = RopeGraphemes::new(line.slice((line.len_chars() - 1)..))
.last()
.unwrap();
rope_slice_to_line_ending(&g)
}
n if n > 1 => {
let g = RopeGraphemes::new(line.slice((line.len_chars() - 2)..))
.last()
.unwrap();
rope_slice_to_line_ending(&g)
}
_ => None,
}
}
ending
}
pub fn default_line_ending() -> Option<LineEnding> {
if cfg!(windows) {
Some(LineEnding::Crlf)
} else {
Some(LineEnding::LF)
}
}

@ -5,11 +5,14 @@ use std::path::{Component, Path, PathBuf};
use std::sync::Arc; use std::sync::Arc;
use helix_core::{ use helix_core::{
<<<<<<< HEAD
chars::{char_is_linebreak, char_is_whitespace}, chars::{char_is_linebreak, char_is_whitespace},
history::History, history::History,
=======
auto_detect_line_ending, default_line_ending,
>>>>>>> 491a8b3 (resolved conflict in rebase)
syntax::{LanguageConfiguration, LOADER}, syntax::{LanguageConfiguration, LOADER},
ChangeSet, Diagnostic, History, Rope, RopeGraphemes, RopeSlice, Selection, State, Syntax, ChangeSet, Diagnostic, History, LineEnding, Rope, Selection, State, Syntax, Transaction,
Transaction,
}; };
use crate::{DocumentId, ViewId}; use crate::{DocumentId, ViewId};
@ -23,6 +26,7 @@ pub enum Mode {
Insert, Insert,
} }
<<<<<<< HEAD
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub enum IndentStyle { pub enum IndentStyle {
@ -45,6 +49,8 @@ pub enum LineEnding {
PS = 8, // U+2029 -- ParagraphSeparator PS = 8, // U+2029 -- ParagraphSeparator
} }
=======
>>>>>>> 491a8b3 (resolved conflict in rebase)
pub struct Document { pub struct Document {
// rope + selection // rope + selection
pub(crate) id: DocumentId, pub(crate) id: DocumentId,
@ -78,7 +84,7 @@ pub struct Document {
diagnostics: Vec<Diagnostic>, diagnostics: Vec<Diagnostic>,
language_server: Option<Arc<helix_lsp::Client>>, language_server: Option<Arc<helix_lsp::Client>>,
_line_ending: LineEnding, line_ending: Option<LineEnding>,
} }
use std::fmt; use std::fmt;
@ -164,61 +170,14 @@ pub fn canonicalize_path(path: &Path) -> std::io::Result<PathBuf> {
std::env::current_dir().map(|current_dir| normalize_path(&current_dir.join(path))) std::env::current_dir().map(|current_dir| normalize_path(&current_dir.join(path)))
} }
pub fn auto_detect_line_ending(doc: &Rope) -> LineEnding {
// based on https://github.com/cessen/led/blob/27572c8838a1c664ee378a19358604063881cc1d/src/editor/mod.rs#L88-L162
let mut ending = LineEnding::None;
for line in doc.lines().take(1) { // check first line only - unsure how sound this is
ending = match line.len_chars() {
1 => { let g = RopeGraphemes::new(line.slice((line.len_chars() - 1)..))
.last()
.unwrap();
rope_slice_to_line_ending(&g)}
n if n > 1 => { let g = RopeGraphemes::new(line.slice((line.len_chars() - 2)..))
.last()
.unwrap();
rope_slice_to_line_ending(&g) }
_ => LineEnding::None
}
}
ending
}
pub fn rope_slice_to_line_ending(g: &RopeSlice) -> LineEnding {
if let Some(text) = g.as_str() {
str_to_line_ending(text)
} else if g == "\u{000D}\u{000A}" {
LineEnding::Crlf
} else {
// Not a line ending
LineEnding::None
}
}
pub fn str_to_line_ending(g: &str) -> LineEnding {
match g {
"\u{000D}\u{000A}" => LineEnding::Crlf,
"\u{000A}" => LineEnding::LF,
"\u{000B}" => LineEnding::VT,
"\u{000C}" => LineEnding::FF,
"\u{000D}" => LineEnding::CR,
"\u{0085}" => LineEnding::Nel,
"\u{2028}" => LineEnding::LS,
"\u{2029}" => LineEnding::PS,
// Not a line ending
_ => LineEnding::None,
}
}
use helix_lsp::lsp; use helix_lsp::lsp;
use url::Url; use url::Url;
impl Document { impl Document {
pub fn new(text: Rope, _line_ending: LineEnding) -> Self { pub fn new(text: Rope) -> Self {
let changes = ChangeSet::new(&text); let changes = ChangeSet::new(&text);
let old_state = None; let old_state = None;
let line_ending = default_line_ending();
Self { Self {
id: DocumentId::default(), id: DocumentId::default(),
@ -237,7 +196,7 @@ impl Document {
history: Cell::new(History::default()), history: Cell::new(History::default()),
last_saved_revision: 0, last_saved_revision: 0,
language_server: None, language_server: None,
_line_ending line_ending,
} }
} }
@ -260,10 +219,14 @@ impl Document {
// search for line endings // search for line endings
let line_ending = auto_detect_line_ending(&doc); let line_ending = auto_detect_line_ending(&doc);
let mut doc = Self::new(doc, line_ending); let mut doc = Self::new(doc);
// set the path and try detecting the language // set the path and try detecting the language
doc.set_path(&path)?; doc.set_path(&path)?;
<<<<<<< HEAD
doc.detect_indent_style(); doc.detect_indent_style();
=======
doc.set_line_ending(line_ending);
>>>>>>> 491a8b3 (resolved conflict in rebase)
Ok(doc) Ok(doc)
} }
@ -522,6 +485,10 @@ impl Document {
self.selections.insert(view_id, selection); self.selections.insert(view_id, selection);
} }
pub fn set_line_ending(&mut self, line_ending: Option<LineEnding>) {
self.line_ending = line_ending;
}
fn _apply(&mut self, transaction: &Transaction, view_id: ViewId) -> bool { fn _apply(&mut self, transaction: &Transaction, view_id: ViewId) -> bool {
let old_doc = self.text().clone(); let old_doc = self.text().clone();

@ -1,6 +1,4 @@
use crate::{ use crate::{theme::Theme, tree::Tree, Document, DocumentId, RegisterSelection, View, ViewId};
theme::Theme, tree::Tree, Document, DocumentId, LineEnding, RegisterSelection, View, ViewId,
};
use tui::layout::Rect; use tui::layout::Rect;
use tui::terminal::CursorKind; use tui::terminal::CursorKind;
@ -10,9 +8,13 @@ use slotmap::SlotMap;
use anyhow::Error; use anyhow::Error;
<<<<<<< HEAD
pub use helix_core::diagnostic::Severity; pub use helix_core::diagnostic::Severity;
pub use helix_core::register::Registers; pub use helix_core::register::Registers;
use helix_core::Position; use helix_core::Position;
=======
pub use helix_core::{diagnostic::Severity, LineEnding};
>>>>>>> 491a8b3 (resolved conflict in rebase)
#[derive(Debug)] #[derive(Debug)]
pub struct Editor { pub struct Editor {
@ -150,7 +152,7 @@ impl Editor {
pub fn new_file(&mut self, action: Action) -> DocumentId { pub fn new_file(&mut self, action: Action) -> DocumentId {
use helix_core::Rope; use helix_core::Rope;
let doc = Document::new(Rope::from("\n"), LineEnding::LF); let doc = Document::new(Rope::from("\n"));
let id = self.documents.insert(doc); let id = self.documents.insert(doc);
self.documents[id].id = id; self.documents[id].id = id;
self.switch(id, action); self.switch(id, action);

@ -10,7 +10,6 @@ new_key_type! { pub struct DocumentId; }
new_key_type! { pub struct ViewId; } new_key_type! { pub struct ViewId; }
pub use document::Document; pub use document::Document;
pub use document::LineEnding;
pub use editor::Editor; pub use editor::Editor;
pub use register_selection::RegisterSelection; pub use register_selection::RegisterSelection;
pub use theme::Theme; pub use theme::Theme;

Loading…
Cancel
Save