From 67ea926742c172061fbbb2678faa9ab076e23780 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Tue, 2 Aug 2022 19:21:52 -0400
Subject: [PATCH 01/14] Added 'long-mode' statusline element

---
 helix-term/src/ui/statusline.rs | 34 +++++++++++++++++++++++++++++++++
 helix-view/src/editor.rs        |  5 ++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 75e5dbd7bb43..046e04fac8d8 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -135,6 +135,7 @@ where
 {
     match element_id {
         helix_view::editor::StatusLineElement::Mode => render_mode,
+        helix_view::editor::StatusLineElement::LongMode => render_long_mode,
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
@@ -182,6 +183,39 @@ where
     );
 }
 
+fn render_long_mode<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let visible = context.focused;
+
+    write(
+        context,
+        format!(
+            " {} ",
+            if visible {
+                match context.doc.mode() {
+                    Mode::Insert => "INSERT",
+                    Mode::Select => "SELECT",
+                    Mode::Normal => "NORMAL",
+                }
+            } else {
+                // If not focused, explicitly leave an empty space instead of returning None.
+                "   "
+            }
+        ),
+        if visible && context.editor.config().color_modes {
+            match context.doc.mode() {
+                Mode::Insert => Some(context.editor.theme.get("ui.statusline.insert")),
+                Mode::Select => Some(context.editor.theme.get("ui.statusline.select")),
+                Mode::Normal => Some(context.editor.theme.get("ui.statusline.normal")),
+            }
+        } else {
+            None
+        },
+    );
+}
+
 fn render_lsp_spinner<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 501c3069ad19..529d63015394 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -222,9 +222,12 @@ impl Default for StatusLineConfig {
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum StatusLineElement {
-    /// The editor mode (Normal, Insert, Visual/Selection)
+    /// The editor mode (NOR, INS, SEL)
     Mode,
 
+    /// The editor mode (NORMAL, INSERT, SELECT)
+    LongMode,
+
     /// The LSP activity spinner
     Spinner,
 

From 3290ad182ba0de97a40530a842ad63efc1837adc Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Tue, 2 Aug 2022 21:09:44 -0400
Subject: [PATCH 02/14] Added customizable statusline mode names

---
 helix-term/src/ui/statusline.rs | 47 +++++++--------------------------
 helix-view/src/editor.rs        | 11 +++++---
 2 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 046e04fac8d8..1d9c5c623a6d 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -135,7 +135,6 @@ where
 {
     match element_id {
         helix_view::editor::StatusLineElement::Mode => render_mode,
-        helix_view::editor::StatusLineElement::LongMode => render_long_mode,
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
@@ -161,47 +160,19 @@ where
         format!(
             " {} ",
             if visible {
+                let (iname, nname, sname) = (
+                    context.editor.config().statusline.insert_mode_name.clone(),
+                    context.editor.config().statusline.normal_mode_name.clone(),
+                    context.editor.config().statusline.select_mode_name.clone(),
+                );
                 match context.doc.mode() {
-                    Mode::Insert => "INS",
-                    Mode::Select => "SEL",
-                    Mode::Normal => "NOR",
+                    Mode::Insert => iname,
+                    Mode::Select => sname,
+                    Mode::Normal => nname,
                 }
             } else {
                 // If not focused, explicitly leave an empty space instead of returning None.
-                "   "
-            }
-        ),
-        if visible && context.editor.config().color_modes {
-            match context.doc.mode() {
-                Mode::Insert => Some(context.editor.theme.get("ui.statusline.insert")),
-                Mode::Select => Some(context.editor.theme.get("ui.statusline.select")),
-                Mode::Normal => Some(context.editor.theme.get("ui.statusline.normal")),
-            }
-        } else {
-            None
-        },
-    );
-}
-
-fn render_long_mode<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
-    let visible = context.focused;
-
-    write(
-        context,
-        format!(
-            " {} ",
-            if visible {
-                match context.doc.mode() {
-                    Mode::Insert => "INSERT",
-                    Mode::Select => "SELECT",
-                    Mode::Normal => "NORMAL",
-                }
-            } else {
-                // If not focused, explicitly leave an empty space instead of returning None.
-                "   "
+                "   ".to_string()
             }
         ),
         if visible && context.editor.config().color_modes {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 529d63015394..ac421cf4ccee 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -204,6 +204,9 @@ pub struct StatusLineConfig {
     pub center: Vec<StatusLineElement>,
     pub right: Vec<StatusLineElement>,
     pub separator: String,
+    pub normal_mode_name: String,
+    pub insert_mode_name: String,
+    pub select_mode_name: String,
 }
 
 impl Default for StatusLineConfig {
@@ -215,6 +218,9 @@ impl Default for StatusLineConfig {
             center: vec![],
             right: vec![E::Diagnostics, E::Selections, E::Position, E::FileEncoding],
             separator: String::from("│"),
+            normal_mode_name: String::from("NOR"),
+            insert_mode_name: String::from("INS"),
+            select_mode_name: String::from("SEL"),
         }
     }
 }
@@ -222,12 +228,9 @@ impl Default for StatusLineConfig {
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum StatusLineElement {
-    /// The editor mode (NOR, INS, SEL)
+    /// The editor mode (Normal, Insert, Visual/Selection)
     Mode,
 
-    /// The editor mode (NORMAL, INSERT, SELECT)
-    LongMode,
-
     /// The LSP activity spinner
     Spinner,
 

From 1aeec48d4f19027fc3eddb2fd4656e48374ac5e0 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Wed, 3 Aug 2022 00:27:24 -0400
Subject: [PATCH 03/14] Removed a string clone

---
 helix-term/src/ui/statusline.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 1d9c5c623a6d..a846157a1012 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -154,17 +154,17 @@ where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
     let visible = context.focused;
+    let (iname, nname, sname) = (
+        &context.editor.config().statusline.insert_mode_name,
+        &context.editor.config().statusline.normal_mode_name,
+        &context.editor.config().statusline.select_mode_name,
+    );
 
     write(
         context,
         format!(
             " {} ",
             if visible {
-                let (iname, nname, sname) = (
-                    context.editor.config().statusline.insert_mode_name.clone(),
-                    context.editor.config().statusline.normal_mode_name.clone(),
-                    context.editor.config().statusline.select_mode_name.clone(),
-                );
                 match context.doc.mode() {
                     Mode::Insert => iname,
                     Mode::Select => sname,
@@ -172,7 +172,7 @@ where
                 }
             } else {
                 // If not focused, explicitly leave an empty space instead of returning None.
-                "   ".to_string()
+                "   "
             }
         ),
         if visible && context.editor.config().color_modes {

From 4849657f02394f44e6ac311cfd603f1262a847d9 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Wed, 3 Aug 2022 13:42:11 -0400
Subject: [PATCH 04/14] Added documentation

---
 book/src/configuration.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 5eb94c4e942b..4206e43861cd 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -64,13 +64,19 @@ left = ["mode", "spinner"]
 center = ["file-name"]
 right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]
 separator = "│"
+normal-mode-name = "NORMAL"
+insert-mode-name = "INSERT"
+select-mode-name = "SELECT"
 ```
 
 The following elements can be configured:
 
 | Key    | Description |
 | ------ | ----------- |
-| `mode` | The current editor mode (`NOR`/`INS`/`SEL`) |
+| `mode` | The current editor mode (`normal-mode-name`/`insert-mode-name`/`select-mode-name`) |
+| `normal-mode-name` | The text displayed by the `mode` element while in normal mode (defaults to `"NOR"`) |
+| `insert-mode-name` | The text displayed by the `mode` element while in insert mode (defaults to `"INS"`) |
+| `select-mode-name` | The text displayed by the `mode` element while in select mode (defaults to `"SEL"`) |
 | `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 |

From 3678b207063e769e9de1dd206ac20cd06f70c2fd Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Thu, 4 Aug 2022 19:10:52 -0400
Subject: [PATCH 05/14] Updated documentation, moved modenames to a seperate
 section

---
 book/src/configuration.md       | 12 ++++++------
 helix-term/src/ui/statusline.rs | 13 ++++---------
 helix-view/src/editor.rs        | 26 ++++++++++++++++++++------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index f368cf0b760d..ace00bb7a6cc 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -67,9 +67,9 @@ left = ["mode", "spinner"]
 center = ["file-name"]
 right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]
 separator = "│"
-normal-mode-name = "NORMAL"
-insert-mode-name = "INSERT"
-select-mode-name = "SELECT"
+mode.normal= "NORMAL"
+mode.insert= "INSERT"
+mode.select= "SELECT"
 ```
 
 The following elements can be configured:
@@ -77,9 +77,9 @@ The following elements can be configured:
 | Key    | Description |
 | ------ | ----------- |
 | `mode` | The current editor mode (`normal-mode-name`/`insert-mode-name`/`select-mode-name`) |
-| `normal-mode-name` | The text displayed by the `mode` element while in normal mode (defaults to `"NOR"`) |
-| `insert-mode-name` | The text displayed by the `mode` element while in insert mode (defaults to `"INS"`) |
-| `select-mode-name` | The text displayed by the `mode` element while in select mode (defaults to `"SEL"`) |
+| `mode.normal` | The text displayed by the `mode` element while in normal mode (defaults to `"NOR"`) |
+| `mode.insert` | The text displayed by the `mode` element while in insert mode (defaults to `"INS"`) |
+| `mode.select` | The text displayed by the `mode` element while in select mode (defaults to `"SEL"`) |
 | `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 |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index a846157a1012..abf3e9871f7b 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -154,21 +154,16 @@ where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
     let visible = context.focused;
-    let (iname, nname, sname) = (
-        &context.editor.config().statusline.insert_mode_name,
-        &context.editor.config().statusline.normal_mode_name,
-        &context.editor.config().statusline.select_mode_name,
-    );
-
+    let modenames = &context.editor.config().statusline.mode;
     write(
         context,
         format!(
             " {} ",
             if visible {
                 match context.doc.mode() {
-                    Mode::Insert => iname,
-                    Mode::Select => sname,
-                    Mode::Normal => nname,
+                    Mode::Insert => &modenames.insert,
+                    Mode::Select => &modenames.select,
+                    Mode::Normal => &modenames.normal,
                 }
             } else {
                 // If not focused, explicitly leave an empty space instead of returning None.
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 9d2cd44b072d..3a79e8f616e6 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -204,9 +204,7 @@ pub struct StatusLineConfig {
     pub center: Vec<StatusLineElement>,
     pub right: Vec<StatusLineElement>,
     pub separator: String,
-    pub normal_mode_name: String,
-    pub insert_mode_name: String,
-    pub select_mode_name: String,
+    pub mode: ModeConfig,
 }
 
 impl Default for StatusLineConfig {
@@ -218,9 +216,25 @@ impl Default for StatusLineConfig {
             center: vec![],
             right: vec![E::Diagnostics, E::Selections, E::Position, E::FileEncoding],
             separator: String::from("│"),
-            normal_mode_name: String::from("NOR"),
-            insert_mode_name: String::from("INS"),
-            select_mode_name: String::from("SEL"),
+            mode: ModeConfig::default(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
+pub struct ModeConfig {
+    pub normal: String,
+    pub insert: String,
+    pub select: String,
+}
+
+impl Default for ModeConfig {
+    fn default() -> Self {
+        Self {
+            normal: String::from("NOR"),
+            insert: String::from("INS"),
+            select: String::from("SEL"),
         }
     }
 }

From 34637c4c2286daf05f732f03b4ac9eb7c9a1a694 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Thu, 4 Aug 2022 19:23:26 -0400
Subject: [PATCH 06/14] Update configuration.md

---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index ace00bb7a6cc..8e8fc1599f60 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -76,7 +76,7 @@ The following elements can be configured:
 
 | Key    | Description |
 | ------ | ----------- |
-| `mode` | The current editor mode (`normal-mode-name`/`insert-mode-name`/`select-mode-name`) |
+| `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |
 | `mode.normal` | The text displayed by the `mode` element while in normal mode (defaults to `"NOR"`) |
 | `mode.insert` | The text displayed by the `mode` element while in insert mode (defaults to `"INS"`) |
 | `mode.select` | The text displayed by the `mode` element while in select mode (defaults to `"SEL"`) |

From df1ae8cd7f070a7cda415d7ba40c71a25e1593db Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Fri, 5 Aug 2022 00:17:28 -0400
Subject: [PATCH 07/14] Documentation update

---
 book/src/configuration.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 8e8fc1599f60..c6e079513cce 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -72,14 +72,11 @@ mode.insert= "INSERT"
 mode.select= "SELECT"
 ```
 
-The following elements can be configured:
+The following statusline elements can be configured:
 
 | Key    | Description |
 | ------ | ----------- |
 | `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |
-| `mode.normal` | The text displayed by the `mode` element while in normal mode (defaults to `"NOR"`) |
-| `mode.insert` | The text displayed by the `mode` element while in insert mode (defaults to `"INS"`) |
-| `mode.select` | The text displayed by the `mode` element while in select mode (defaults to `"SEL"`) |
 | `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 |
@@ -92,6 +89,13 @@ The following elements can be configured:
 | `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |
 | `spacer` | Inserts a space between elements (multiple/contiguous spacers may be specified) |
 
+The statusline elements can be customized using the options below:
+| Key    | Description |
+| ------ | ----------- |
+| `mode.normal` | The text displayed by the `mode` element while in normal mode (defaults to `"NOR"`) |
+| `mode.insert` | The text displayed by the `mode` element while in insert mode (defaults to `"INS"`) |
+| `mode.select` | The text displayed by the `mode` element while in select mode (defaults to `"SEL"`) |
+
 ### `[editor.lsp]` Section
 
 | Key                   | Description                                                 | Default |

From 0d0201cb56d082035168666e640a28d8709e9ae6 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Fri, 5 Aug 2022 23:38:47 -0400
Subject: [PATCH 08/14] Documentation update

---
 book/src/configuration.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index c6e079513cce..8ae3f98319d4 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -71,8 +71,19 @@ mode.normal= "NORMAL"
 mode.insert= "INSERT"
 mode.select= "SELECT"
 ```
+The `[editor.statusline]` key takes the following sub-keys
 
-The following statusline elements can be configured:
+| Key           | Description | Default |
+| ---           | ---         | ---     |
+| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
+| `center`      | A list of elements aligned to the middle of the statusline | `[]` |
+| `right`       | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
+| `separator`   | The character used to separate elements in the statusline | `"|"` |
+| `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
+| `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
+| `mode.select` | The text shown in the `mode` element for select mode | `"SEL"` |
+
+The following statusline elements can be configured as follows:The following statusline elements can be configured:
 
 | Key    | Description |
 | ------ | ----------- |
@@ -86,16 +97,8 @@ The following statusline elements can be configured:
 | `selections` | The number of active selections |
 | `position` | The cursor position |
 | `position-percentage` | The cursor position as a percentage of the total number of lines |
-| `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |
 | `spacer` | Inserts a space between elements (multiple/contiguous spacers may be specified) |
 
-The statusline elements can be customized using the options below:
-| Key    | Description |
-| ------ | ----------- |
-| `mode.normal` | The text displayed by the `mode` element while in normal mode (defaults to `"NOR"`) |
-| `mode.insert` | The text displayed by the `mode` element while in insert mode (defaults to `"INS"`) |
-| `mode.select` | The text displayed by the `mode` element while in select mode (defaults to `"SEL"`) |
-
 ### `[editor.lsp]` Section
 
 | Key                   | Description                                                 | Default |

From 6711359c19fe7a6815ac000b45bacccbf25f2d05 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Fri, 5 Aug 2022 23:40:44 -0400
Subject: [PATCH 09/14] Documentation update

---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 8ae3f98319d4..11a31351ee0e 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -83,7 +83,7 @@ The `[editor.statusline]` key takes the following sub-keys
 | `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
 | `mode.select` | The text shown in the `mode` element for select mode | `"SEL"` |
 
-The following statusline elements can be configured as follows:The following statusline elements can be configured:
+The following statusline elements can be configured as follows:
 
 | Key    | Description |
 | ------ | ----------- |

From 40bea4aa48cdb6bb39905f0eb2fb246b58e231d3 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Sat, 6 Aug 2022 21:59:58 -0400
Subject: [PATCH 10/14] Update configuration.md

---
 book/src/configuration.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 11a31351ee0e..2a3af61176d7 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -67,9 +67,9 @@ left = ["mode", "spinner"]
 center = ["file-name"]
 right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]
 separator = "│"
-mode.normal= "NORMAL"
-mode.insert= "INSERT"
-mode.select= "SELECT"
+mode.normal = "NORMAL"
+mode.insert = "INSERT"
+mode.select = "SELECT"
 ```
 The `[editor.statusline]` key takes the following sub-keys
 

From 9dcd4d9f68d4617774931594b7317e90b998a269 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Sat, 13 Aug 2022 15:15:31 -0400
Subject: [PATCH 11/14] Update configuration.md

---
 book/src/configuration.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 2a3af61176d7..804f77405b4e 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -97,6 +97,7 @@ The following statusline elements can be configured as follows:
 | `selections` | The number of active selections |
 | `position` | The cursor position |
 | `position-percentage` | The cursor position as a percentage of the total number of lines |
+| `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |
 | `spacer` | Inserts a space between elements (multiple/contiguous spacers may be specified) |
 
 ### `[editor.lsp]` Section

From 2ffe06b4759d56214c556ad14ae2f7098e37a8a3 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Fri, 2 Sep 2022 11:56:38 -0400
Subject: [PATCH 12/14] Fixed merge error

---
 helix-term/src/ui/statusline.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index f59011be4436..9bbb268f7b5c 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -160,7 +160,7 @@ where
         format!(
             " {} ",
             if visible {
-                match context.doc.mode() {
+                match context.editor.mode() {
                     Mode::Insert => &modenames.insert,
                     Mode::Select => &modenames.select,
                     Mode::Normal => &modenames.normal,

From f3b4a8f3d492c1100f96b94805800a39fa836871 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Fri, 2 Sep 2022 12:01:12 -0400
Subject: [PATCH 13/14] Update configuration.md

---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 820f0bfdd249..0b64c0cb1842 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -79,7 +79,7 @@ The `[editor.statusline]` key takes the following sub-keys
 | `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
 | `center`      | A list of elements aligned to the middle of the statusline | `[]` |
 | `right`       | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
-| `separator`   | The character used to separate elements in the statusline | `"|"` |
+| `separator`   | The character used to separate elements in the statusline | `"│"` |
 | `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
 | `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
 | `mode.select` | The text shown in the `mode` element for select mode | `"SEL"` |

From 211833b580ab7290b6d705959bafd76ae2a6a51b Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Mon, 12 Sep 2022 11:16:00 -0400
Subject: [PATCH 14/14] Update configuration.md

---
 book/src/configuration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 0b64c0cb1842..d44855c781b3 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -72,7 +72,7 @@ mode.normal = "NORMAL"
 mode.insert = "INSERT"
 mode.select = "SELECT"
 ```
-The `[editor.statusline]` key takes the following sub-keys
+The `[editor.statusline]` key takes the following sub-keys:
 
 | Key           | Description | Default |
 | ---           | ---         | ---     |
@@ -84,7 +84,7 @@ The `[editor.statusline]` key takes the following sub-keys
 | `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
 | `mode.select` | The text shown in the `mode` element for select mode | `"SEL"` |
 
-The following statusline elements can be configured as follows:
+The following statusline elements can be configured:
 
 | Key    | Description |
 | ------ | ----------- |