Add line ending abstraction

editor.sh

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: MIT OR Apache-2.0
+
+RUST_LOG="cosmic_text=debug,editor=debug" cargo run --release --package editor -- "$@"

examples/editor/src/main.rs

@@ -4,7 +4,7 @@ use cosmic_text::{
     Action, Attrs, Buffer, Edit, Family, FontSystem, Metrics, Motion, SwashCache, SyntaxEditor,
     SyntaxSystem,
 };
-use std::{env, num::NonZeroU32, rc::Rc, slice};
+use std::{env, fs, num::NonZeroU32, rc::Rc, slice};
 use tiny_skia::{Paint, PixmapMut, Rect, Transform};
 use winit::{
     dpi::PhysicalPosition,
@@ -248,6 +248,17 @@ fn main() {
                                                         });
                                                     }
                                                 }
+                                                "s" => {
+                                                    let mut text = String::new();
+                                                    editor.with_buffer(|buffer| {
+                                                        for line in buffer.lines.iter() {
+                                                            text.push_str(line.text());
+                                                            text.push_str(line.ending().as_str());
+                                                        }
+                                                    });
+                                                    fs::write(&path, &text).unwrap();
+                                                    log::info!("saved {:?}", path);
+                                                }
                                                 _ => {}
                                             }
                                         } else {

sample/crlf.txt

@@ -0,0 +1,3 @@
+These are two lines
+in a CRLF file
+

sample/tabs.txt

@@ -0,0 +1,5 @@
+Tabs:
+	One	Two	Three	Four
+		Two	Three	Four
+			Three	Four
+				Four

src/buffer.rs

@@ -7,8 +7,8 @@
 
 use crate::{
     Affinity, Attrs, AttrsList, BidiParagraphs, BorrowedWithFontSystem, BufferLine, Color, Cursor,
-    FontSystem, LayoutCursor, LayoutGlyph, LayoutLine, Motion, Scroll, ShapeBuffer, ShapeLine,
-    Shaping, Wrap,
+    FontSystem, LayoutCursor, LayoutGlyph, LayoutLine, LineEnding, LineIter, Motion, Scroll,
+    ShapeBuffer, ShapeLine, Shaping, Wrap,
 };
 
 /// A line of visible text for rendering
@@ -35,7 +35,7 @@
     /// and `cursor_end` within this run, or None if the cursor range does not intersect this run.
     /// This may return widths of zero if `cursor_start == cursor_end`, if the run is empty, or if the
     /// region's left start boundary is the same as the cursor's end boundary or vice versa.
     pub fn highlight(&self, cursor_start: Cursor, cursor_end: Cursor) -> Option<(f32, f32)> {
         let mut x_start = None;
         let mut x_end = None;
         let rtl_factor = if self.rtl { 1. } else { 0. };
@@ -328,12 +328,12 @@
     }
 
     /// Shape lines until cursor, also scrolling to include cursor in view
     pub fn shape_until_cursor(
         &mut self,
         font_system: &mut FontSystem,
         cursor: Cursor,
         prune: bool,
     ) {
         let old_scroll = self.scroll;
 
         let layout_cursor = self
@@ -376,7 +376,7 @@
     }
 
     /// Shape lines until scroll
     pub fn shape_until_scroll(&mut self, font_system: &mut FontSystem, prune: bool) {
         let old_scroll = self.scroll;
 
         loop {
@@ -607,7 +607,17 @@
         attrs: Attrs,
         shaping: Shaping,
     ) {
-        self.set_rich_text(font_system, [(text, attrs)], attrs, shaping);
+        self.lines.clear();
+        for (range, ending) in LineIter::new(text) {
+            self.lines.push(BufferLine::new(
+                &text[range],
+                ending,
+                AttrsList::new(attrs),
+                shaping,
+            ));
+        }
+        self.scroll = Scroll::default();
+        self.shape_until_scroll(font_system, false);
     }
 
     /// Set text of buffer, using an iterator of styled spans (pairs of text and attributes)
@@ -661,12 +671,15 @@
             start..end
         });
         let mut maybe_line = lines_iter.next();
+        //TODO: set this based on information from spans
+        let line_ending = LineEnding::default();
 
         loop {
             let (Some(line_range), Some((attrs, span_range))) = (&maybe_line, &maybe_span) else {
                 // this is reached only if this text is empty
                 self.lines.push(BufferLine::new(
                     String::new(),
+                    line_ending,
                     AttrsList::new(default_attrs),
                     shaping,
                 ));
@@ -701,11 +714,13 @@
                     let prev_attrs_list =
                         core::mem::replace(&mut attrs_list, AttrsList::new(default_attrs));
                     let prev_line_string = core::mem::take(&mut line_string);
-                    let buffer_line = BufferLine::new(prev_line_string, prev_attrs_list, shaping);
+                    let buffer_line =
+                        BufferLine::new(prev_line_string, line_ending, prev_attrs_list, shaping);
                     self.lines.push(buffer_line);
                 } else {
                     // finalize the final line
-                    let buffer_line = BufferLine::new(line_string, attrs_list, shaping);
+                    let buffer_line =
+                        BufferLine::new(line_string, line_ending, attrs_list, shaping);
                     self.lines.push(buffer_line);
                     break;
                 }

src/buffer_line.rs

@@ -1,13 +1,15 @@
 #[cfg(not(feature = "std"))]
 use alloc::{string::String, vec::Vec};
 
-use crate::{Align, AttrsList, FontSystem, LayoutLine, ShapeBuffer, ShapeLine, Shaping, Wrap};
+use crate::{
+    Align, AttrsList, FontSystem, LayoutLine, LineEnding, ShapeBuffer, ShapeLine, Shaping, Wrap,
+};
 
 /// A line (or paragraph) of text that is shaped and laid out
 #[derive(Clone, Debug)]
 pub struct BufferLine {
-    //TODO: make this not pub(crate)
     text: String,
+    ending: LineEnding,
     attrs_list: AttrsList,
     align: Option<Align>,
     shape_opt: Option<ShapeLine>,
@@ -20,9 +22,15 @@
     /// Create a new line with the given text and attributes list
     /// Cached shaping and layout can be done using the [`Self::shape`] and
     /// [`Self::layout`] functions
-    pub fn new<T: Into<String>>(text: T, attrs_list: AttrsList, shaping: Shaping) -> Self {
+    pub fn new<T: Into<String>>(
+        text: T,
+        ending: LineEnding,
+        attrs_list: AttrsList,
+        shaping: Shaping,
+    ) -> Self {
         Self {
             text: text.into(),
+            ending,
             attrs_list,
             align: None,
             shape_opt: None,
@@ -41,11 +49,17 @@
     ///
     /// Will reset shape and layout if it differs from current text and attributes list.
     /// Returns true if the line was reset
-    pub fn set_text<T: AsRef<str>>(&mut self, text: T, attrs_list: AttrsList) -> bool {
+    pub fn set_text<T: AsRef<str>>(
+        &mut self,
+        text: T,
+        ending: LineEnding,
+        attrs_list: AttrsList,
+    ) -> bool {
         let text = text.as_ref();
-        if text != self.text || attrs_list != self.attrs_list {
+        if text != self.text || ending != self.ending || attrs_list != self.attrs_list {
             self.text.clear();
             self.text.push_str(text);
+            self.ending = ending;
             self.attrs_list = attrs_list;
             self.reset();
             true
@@ -59,6 +73,25 @@
         self.text
     }
 
+    /// Get line ending
+    pub fn ending(&self) -> LineEnding {
+        self.ending
+    }
+
+    /// Set line ending
+    ///
+    /// Will reset shape and layout if it differs from current line ending.
+    /// Returns true if the line was reset
+    pub fn set_ending(&mut self, ending: LineEnding) -> bool {
+        if ending != self.ending {
+            self.ending = ending;
+            self.reset_shaping();
+            true
+        } else {
+            false
+        }
+    }
+
     /// Get attributes list
     pub fn attrs_list(&self) -> &AttrsList {
         &self.attrs_list
@@ -126,7 +159,7 @@
         let attrs_list = self.attrs_list.split_off(index);
         self.reset();
 
-        let mut new = Self::new(text, attrs_list, self.shaping);
+        let mut new = Self::new(text, self.ending, attrs_list, self.shaping);
         new.align = self.align;
         new
     }
@@ -154,11 +187,11 @@
     }
 
     /// Shape a line using a pre-existing shape buffer, will cache results
     pub fn shape_in_buffer(
         &mut self,
         scratch: &mut ShapeBuffer,
         font_system: &mut FontSystem,
     ) -> &ShapeLine {
         if self.shape_opt.is_none() {
             self.shape_opt = Some(ShapeLine::new_in_buffer(
                 scratch,
@@ -197,15 +230,15 @@
     }
 
     /// Layout a line using a pre-existing shape buffer, will cache results
     pub fn layout_in_buffer(
         &mut self,
         scratch: &mut ShapeBuffer,
         font_system: &mut FontSystem,
         font_size: f32,
         width: f32,
         wrap: Wrap,
         match_mono_width: Option<f32>,
     ) -> &[LayoutLine] {
         if self.layout_opt.is_none() {
             let align = self.align;
             let shape = self.shape_in_buffer(scratch, font_system);

src/edit/editor.rs

@@ -362,8 +362,14 @@
 
             // Ensure there are enough lines in the buffer to handle this cursor
             while cursor.line >= buffer.lines.len() {
+                let ending = buffer
+                    .lines
+                    .last()
+                    .map(|line| line.ending())
+                    .unwrap_or_default();
                 let line = BufferLine::new(
                     String::new(),
+                    ending,
                     AttrsList::new(attrs_list.as_ref().map_or_else(
                         || {
                             buffer
@@ -380,6 +386,7 @@
 
             let line: &mut BufferLine = &mut buffer.lines[cursor.line];
             let insert_line = cursor.line + 1;
+            let ending = line.ending();
 
             // Collect text after insertion as a line
             let after: BufferLine = line.split_off(cursor.index);
@@ -392,6 +399,7 @@
 
             // Append the inserted text, line by line
             // we want to see a blank entry if the string ends with a newline
+            //TODO: adjust this to get line ending from data?
             let addendum = once("").filter(|_| data.ends_with('\n'));
             let mut lines_iter = data.split_inclusive('\n').chain(addendum);
             if let Some(data_line) = lines_iter.next() {
@@ -402,6 +410,7 @@
                     data_line
                         .strip_suffix(char::is_control)
                         .unwrap_or(data_line),
+                    ending,
                     these_attrs,
                     Shaping::Advanced,
                 ));
@@ -414,6 +423,7 @@
                     data_line
                         .strip_suffix(char::is_control)
                         .unwrap_or(data_line),
+                    ending,
                     final_attrs.split_off(remaining_split_len),
                     Shaping::Advanced,
                 );
@@ -429,6 +439,7 @@
                     data_line
                         .strip_suffix(char::is_control)
                         .unwrap_or(data_line),
+                    ending,
                     final_attrs.split_off(remaining_split_len),
                     Shaping::Advanced,
                 );
@@ -507,17 +518,17 @@
 
     fn apply_change(&mut self, change: &Change) -> bool {
         // Cannot apply changes if there is a pending change
         match self.change.take() {
             Some(pending) => {
                 if !pending.items.is_empty() {
                     //TODO: is this a good idea?
                     log::warn!("pending change caused apply_change to be ignored!");
                     self.change = Some(pending);
                     return false;
                 }
             }
             None => {}
         }
 
         for item in change.items.iter() {
             //TODO: edit cursor if needed?

src/lib.rs

@@ -123,6 +123,9 @@ mod font;
 pub use self::layout::*;
 mod layout;
 
+pub use self::line_ending::*;
+mod line_ending;
+
 pub use self::shape::*;
 mod shape;
 

src/line_ending.rs

@@ -0,0 +1,98 @@
+use core::ops::Range;
+
+/// Line ending
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
+pub enum LineEnding {
+    /// Use `\n` for line ending (POSIX-style)
+    #[default]
+    Lf,
+    /// Use `\r\n` for line ending (Windows-style)
+    CrLf,
+    /// Use `\r` for line ending (many legacy systems)
+    Cr,
+    /// Use `\n\r` for line ending (some legacy systems)
+    LfCr,
+    /// No line ending
+    None,
+}
+
+impl LineEnding {
+    /// Get the line ending as a str
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Self::Lf => "\n",
+            Self::CrLf => "\r\n",
+            Self::Cr => "\r",
+            Self::LfCr => "\n\r",
+            Self::None => "",
+        }
+    }
+}
+
+/// Iterator over lines terminated by [`LineEnding`]
+#[derive(Debug)]
+pub struct LineIter<'a> {
+    string: &'a str,
+    start: usize,
+    end: usize,
+}
+
+impl<'a> LineIter<'a> {
+    /// Create an iterator of lines in a string slice
+    pub fn new(string: &'a str) -> Self {
+        Self {
+            string,
+            start: 0,
+            end: string.len(),
+        }
+    }
+}
+
+impl<'a> Iterator for LineIter<'a> {
+    type Item = (Range<usize>, LineEnding);
+    fn next(&mut self) -> Option<Self::Item> {
+        let start = self.start;
+        match self.string[start..self.end].find(&['\r', '\n']) {
+            Some(i) => {
+                let end = start + i;
+                self.start = end;
+                let after = &self.string[end..];
+                let ending = if after.starts_with("\r\n") {
+                    LineEnding::CrLf
+                } else if after.starts_with("\n\r") {
+                    LineEnding::LfCr
+                } else if after.starts_with("\n") {
+                    LineEnding::Lf
+                } else if after.starts_with("\r") {
+                    LineEnding::Cr
+                } else {
+                    //TODO: this should not be possible
+                    LineEnding::None
+                };
+                self.start += ending.as_str().len();
+                Some((start..end, ending))
+            }
+            None => {
+                if self.start < self.end {
+                    self.start = self.end;
+                    Some((start..self.end, LineEnding::None))
+                } else {
+                    None
+                }
+            }
+        }
+    }
+}
+
+//TODO: DoubleEndedIterator
+
+#[test]
+fn test_line_iter() {
+    let string = "LF\nCRLF\r\nCR\rLFCR\n\rNONE";
+    let mut iter = LineIter::new(string);
+    assert_eq!(iter.next(), Some((0..2, LineEnding::Lf)));
+    assert_eq!(iter.next(), Some((3..7, LineEnding::CrLf)));
+    assert_eq!(iter.next(), Some((9..11, LineEnding::Cr)));
+    assert_eq!(iter.next(), Some((12..16, LineEnding::LfCr)));
+    assert_eq!(iter.next(), Some((18..22, LineEnding::None)));
+}