diff options
| author | Jan Hrastnik | 2021-06-16 15:22:55 +0000 |
|---|---|---|
| committer | Jan Hrastnik | 2021-06-16 15:22:55 +0000 |
| commit | 9c3eadb2e4fd297abcc8ceb02b3088ab3b9b1ceb (patch) | |
| tree | 7003028a66d30cadf14c997bf7c6fa9986f10044 /helix-view/src | |
| parent | 7cf0fa05a4ca6bf62d38836f3aa99a1ac585a261 (diff) | |
fixed some problems from rebasing
Diffstat (limited to 'helix-view/src')
| -rw-r--r-- | helix-view/src/document.rs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs index c15a42ab..bf26d8a0 100644 --- a/helix-view/src/document.rs +++ b/helix-view/src/document.rs @@ -5,7 +5,9 @@ use std::path::{Component, Path, PathBuf}; use std::sync::Arc; use helix_core::{ + auto_detect_line_ending, chars::{char_is_linebreak, char_is_whitespace}, + history::History, syntax::{LanguageConfiguration, LOADER}, ChangeSet, Diagnostic, LineEnding, Rope, Selection, State, Syntax, Transaction, DEFAULT_LINE_ENDING, @@ -28,21 +30,6 @@ pub enum IndentStyle { 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 { // rope + selection pub(crate) id: DocumentId, |