From 540a08d322c8b9d40b35f69125e1fdb7faa3acae Mon Sep 17 00:00:00 2001
From: Alexis Kalabura <alexisslobodzian2@gmail.com>
Date: Tue, 19 Jul 2022 18:56:56 -0400
Subject: [PATCH 1/4] add statusline element to display file line endings

---
 book/src/configuration.md       |  3 ++-
 helix-term/src/ui/statusline.rs | 14 ++++++++++++++
 helix-view/src/editor.rs        |  5 ++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index c209dc3de249..fc7288af2d60 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -62,7 +62,7 @@ Statusline elements can be defined as follows:
 [editor.statusline]
 left = ["mode", "spinner"]
 center = ["file-name"]
-right = ["diagnostics", "selections", "position", "file-encoding", "file-type"]
+right = ["diagnostics", "selections", "position", "file-encoding", "file-line-endings", "file-type"]
 ```
 
 The following elements can be configured:
@@ -73,6 +73,7 @@ The following elements can be configured:
 | `spinner` | A progress spinner indicating LSP activity |
 | `file-name` | The path/name of the opened file |
 | `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
+| `file-line-endings` | The file line endings (CRLF or LF) |
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
 | `selections` | The number of active selections |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 895043cd1154..caea2f37df35 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -138,6 +138,7 @@ where
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
+        helix_view::editor::StatusLineElement::FileLineEndings => render_file_line_endings,
         helix_view::editor::StatusLineElement::FileType => render_file_type,
         helix_view::editor::StatusLineElement::Diagnostics => render_diagnostics,
         helix_view::editor::StatusLineElement::Selections => render_selections,
@@ -280,6 +281,19 @@ where
     }
 }
 
+fn render_file_line_endings<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    use helix_core::LineEnding::*;
+    let line_ending = match context.doc.line_ending {
+        Crlf => "CRLF",
+        LF => "LF",
+    };
+
+    write(context, format!(" {} ", line_ending), None);
+}
+
 fn render_file_type<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 0178d399e923..d9c07b13902d 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -231,7 +231,10 @@ pub enum StatusLineElement {
 
     /// The file encoding
     FileEncoding,
-
+    
+    /// The file line endings (CRLF or LF)
+    FileLineEndings,
+    
     /// The file type (language ID or "text")
     FileType,
 

From 13c9cda53eb99077b8975d97bea97155c376419c Mon Sep 17 00:00:00 2001
From: Alexis Kalabura <alexisslobodzian2@gmail.com>
Date: Tue, 19 Jul 2022 19:09:30 -0400
Subject: [PATCH 2/4] run cargo fmt --all

---
 helix-view/src/editor.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index d9c07b13902d..4ec689df22f2 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -231,10 +231,10 @@ pub enum StatusLineElement {
 
     /// The file encoding
     FileEncoding,
-    
+
     /// The file line endings (CRLF or LF)
     FileLineEndings,
-    
+
     /// The file type (language ID or "text")
     FileType,
 

From aa654101bc3ceb9394e760f5c9c918bfea6c9f1d Mon Sep 17 00:00:00 2001
From: Alexis Kalabura <alexisslobodzian2@gmail.com>
Date: Wed, 20 Jul 2022 09:26:52 -0400
Subject: [PATCH 3/4] change the word *ending* from plural to singular

---
 book/src/configuration.md       | 4 ++--
 helix-term/src/ui/statusline.rs | 4 ++--
 helix-view/src/editor.rs        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index fc7288af2d60..4eab4a48aa78 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -62,7 +62,7 @@ Statusline elements can be defined as follows:
 [editor.statusline]
 left = ["mode", "spinner"]
 center = ["file-name"]
-right = ["diagnostics", "selections", "position", "file-encoding", "file-line-endings", "file-type"]
+right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]
 ```
 
 The following elements can be configured:
@@ -73,7 +73,7 @@ The following elements can be configured:
 | `spinner` | A progress spinner indicating LSP activity |
 | `file-name` | The path/name of the opened file |
 | `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
-| `file-line-endings` | The file line endings (CRLF or LF) |
+| `file-line-ending` | The file line endings (CRLF or LF) |
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
 | `selections` | The number of active selections |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index caea2f37df35..bb7de470b457 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -138,7 +138,7 @@ where
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
-        helix_view::editor::StatusLineElement::FileLineEndings => render_file_line_endings,
+        helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
         helix_view::editor::StatusLineElement::FileType => render_file_type,
         helix_view::editor::StatusLineElement::Diagnostics => render_diagnostics,
         helix_view::editor::StatusLineElement::Selections => render_selections,
@@ -281,7 +281,7 @@ where
     }
 }
 
-fn render_file_line_endings<F>(context: &mut RenderContext, write: F)
+fn render_file_line_ending<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 4ec689df22f2..7ac52f505dc9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -233,7 +233,7 @@ pub enum StatusLineElement {
     FileEncoding,
 
     /// The file line endings (CRLF or LF)
-    FileLineEndings,
+    FileLineEnding,
 
     /// The file type (language ID or "text")
     FileType,

From 5c2b851a510b5ce690c82db876526f809e368f83 Mon Sep 17 00:00:00 2001
From: Alexis Kalabura <alexisslobodzian2@gmail.com>
Date: Wed, 20 Jul 2022 15:38:57 -0400
Subject: [PATCH 4/4] support for the unicode-lines feature flag

---
 helix-term/src/commands/typed.rs |  5 ++---
 helix-term/src/ui/statusline.rs  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index fb03af44c9b9..d6db117e67e4 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -413,12 +413,11 @@ fn set_line_ending(
 
     // Attempt to parse argument as a line ending.
     let line_ending = match arg {
-        // We check for CR first because it shares a common prefix with CRLF.
-        #[cfg(feature = "unicode-lines")]
-        arg if arg.starts_with("cr") => CR,
         arg if arg.starts_with("crlf") => Crlf,
         arg if arg.starts_with("lf") => LF,
         #[cfg(feature = "unicode-lines")]
+        arg if arg.starts_with("cr") => CR,
+        #[cfg(feature = "unicode-lines")]
         arg if arg.starts_with("ff") => FF,
         #[cfg(feature = "unicode-lines")]
         arg if arg.starts_with("nel") => Nel,
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index bb7de470b457..85992c602164 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -289,6 +289,18 @@ where
     let line_ending = match context.doc.line_ending {
         Crlf => "CRLF",
         LF => "LF",
+        #[cfg(feature = "unicode-lines")]
+        VT => "VT", // U+000B -- VerticalTab
+        #[cfg(feature = "unicode-lines")]
+        FF => "FF", // U+000C -- FormFeed
+        #[cfg(feature = "unicode-lines")]
+        CR => "CR", // U+000D -- CarriageReturn
+        #[cfg(feature = "unicode-lines")]
+        Nel => "NEL", // U+0085 -- NextLine
+        #[cfg(feature = "unicode-lines")]
+        LS => "LS", // U+2028 -- Line Separator
+        #[cfg(feature = "unicode-lines")]
+        PS => "PS", // U+2029 -- ParagraphSeparator
     };
 
     write(context, format!(" {} ", line_ending), None);