From 9282f1b8e546583d9e461cd78bed7d2f21dd1770 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 15 Mar 2024 19:52:57 -0400
Subject: [PATCH 001/101] Handle starting and continuing the count separately
 (#9887)

---
 helix-term/src/ui/editor.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index f3bba5d1c7552..c1e36bbddc4e3 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -916,13 +916,15 @@ impl EditorView {
 
     fn command_mode(&mut self, mode: Mode, cxt: &mut commands::Context, event: KeyEvent) {
         match (event, cxt.editor.count) {
-            // count handling
-            (key!(i @ '0'), Some(_)) | (key!(i @ '1'..='9'), _)
-                if !self.keymaps.contains_key(mode, event) =>
-            {
+            // If the count is already started and the input is a number, always continue the count.
+            (key!(i @ '0'..='9'), Some(count)) => {
+                let i = i.to_digit(10).unwrap() as usize;
+                cxt.editor.count = NonZeroUsize::new(count.get() * 10 + i);
+            }
+            // A non-zero digit will start the count if that number isn't used by a keymap.
+            (key!(i @ '1'..='9'), None) if !self.keymaps.contains_key(mode, event) => {
                 let i = i.to_digit(10).unwrap() as usize;
-                cxt.editor.count =
-                    std::num::NonZeroUsize::new(cxt.editor.count.map_or(i, |c| c.get() * 10 + i));
+                cxt.editor.count = NonZeroUsize::new(i);
             }
             // special handling for repeat operator
             (key!('.'), _) if self.keymaps.pending().is_empty() => {

From 6fea7876a47df8627a4b40361a6fc0f692c6601f Mon Sep 17 00:00:00 2001
From: Nick <sop.theteachr@gmail.com>
Date: Sat, 16 Mar 2024 18:20:47 +0530
Subject: [PATCH 002/101] Fix comment key bind behaviour in OCaml (#9894)

---
 languages.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index bf726e349721e..8fbb98e883d17 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1083,7 +1083,6 @@ injection-regex = "ocaml"
 file-types = ["ml"]
 shebangs = ["ocaml", "ocamlrun", "ocamlscript"]
 block-comment-tokens = { start = "(*", end = "*)" }
-comment-token = "(**)"
 language-servers = [ "ocamllsp" ]
 indent = { tab-width = 2, unit = "  " }
 

From 761df60077bf33cb1077eb4cb019885ea3dd6ae7 Mon Sep 17 00:00:00 2001
From: Emi <95967983+EmiOnGit@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:06:24 +0100
Subject: [PATCH 003/101] Keybind for Extend/shrink selection up and down
 (#9080)

* implement another selection modifying command

* Selection feels more ergonomic in case of swapping the direction. This also fixes a problem when starting at an empty line.

* rename select_line_up/down to select_line_above/below

* apply clippy suggestion of using cmp instead of if-chain

* revert `Extent` implementing `Clone/Copy`

* move select_line functions below extend_line implementations

* implement help add function, which saturates at the number of text lines

---------

Co-authored-by: Emi <emanuel.boehm@gmail.com>
---
 helix-term/src/commands.rs | 57 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4ac2496ebd48d..133f2d5408a8c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -57,6 +57,7 @@ use crate::{
 
 use crate::job::{self, Jobs};
 use std::{
+    cmp::Ordering,
     collections::{HashMap, HashSet},
     fmt,
     future::Future,
@@ -300,6 +301,8 @@ impl MappableCommand {
         extend_line, "Select current line, if already selected, extend to another line based on the anchor",
         extend_line_below, "Select current line, if already selected, extend to next line",
         extend_line_above, "Select current line, if already selected, extend to previous line",
+        select_line_above, "Select current line, if already selected, extend or shrink line above based on the anchor",
+        select_line_below, "Select current line, if already selected, extend or shrink line below based on the anchor",
         extend_to_line_bounds, "Extend selection to line bounds",
         shrink_to_line_bounds, "Shrink selection to line bounds",
         delete_selection, "Delete selection",
@@ -2435,7 +2438,6 @@ fn extend_line_below(cx: &mut Context) {
 fn extend_line_above(cx: &mut Context) {
     extend_line_impl(cx, Extend::Above);
 }
-
 fn extend_line_impl(cx: &mut Context, extend: Extend) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
@@ -2474,6 +2476,59 @@ fn extend_line_impl(cx: &mut Context, extend: Extend) {
 
     doc.set_selection(view.id, selection);
 }
+fn select_line_below(cx: &mut Context) {
+    select_line_impl(cx, Extend::Below);
+}
+fn select_line_above(cx: &mut Context) {
+    select_line_impl(cx, Extend::Above);
+}
+fn select_line_impl(cx: &mut Context, extend: Extend) {
+    let mut count = cx.count();
+    let (view, doc) = current!(cx.editor);
+    let text = doc.text();
+    let saturating_add = |a: usize, b: usize| (a + b).min(text.len_lines());
+    let selection = doc.selection(view.id).clone().transform(|range| {
+        let (start_line, end_line) = range.line_range(text.slice(..));
+        let start = text.line_to_char(start_line);
+        let end = text.line_to_char(saturating_add(end_line, 1));
+        let direction = range.direction();
+
+        // Extending to line bounds is counted as one step
+        if range.from() != start || range.to() != end {
+            count = count.saturating_sub(1)
+        }
+        let (anchor_line, head_line) = match (&extend, direction) {
+            (Extend::Above, Direction::Forward) => (start_line, end_line.saturating_sub(count)),
+            (Extend::Above, Direction::Backward) => (end_line, start_line.saturating_sub(count)),
+            (Extend::Below, Direction::Forward) => (start_line, saturating_add(end_line, count)),
+            (Extend::Below, Direction::Backward) => (end_line, saturating_add(start_line, count)),
+        };
+        let (anchor, head) = match anchor_line.cmp(&head_line) {
+            Ordering::Less => (
+                text.line_to_char(anchor_line),
+                text.line_to_char(saturating_add(head_line, 1)),
+            ),
+            Ordering::Equal => match extend {
+                Extend::Above => (
+                    text.line_to_char(saturating_add(anchor_line, 1)),
+                    text.line_to_char(head_line),
+                ),
+                Extend::Below => (
+                    text.line_to_char(head_line),
+                    text.line_to_char(saturating_add(anchor_line, 1)),
+                ),
+            },
+
+            Ordering::Greater => (
+                text.line_to_char(saturating_add(anchor_line, 1)),
+                text.line_to_char(head_line),
+            ),
+        };
+        Range::new(anchor, head)
+    });
+
+    doc.set_selection(view.id, selection);
+}
 
 fn extend_to_line_bounds(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);

From 61f7d9ce2f2d20f4b0bd2f21036eac1f11cb2c5c Mon Sep 17 00:00:00 2001
From: Arthur Deierlein <110528300+c0rydoras@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:36:54 +0100
Subject: [PATCH 004/101] fix typo "braket" in jsx highlights (#9910)

---
 runtime/queries/_jsx/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/_jsx/highlights.scm b/runtime/queries/_jsx/highlights.scm
index 853254e5be4ee..2a696641ca19b 100644
--- a/runtime/queries/_jsx/highlights.scm
+++ b/runtime/queries/_jsx/highlights.scm
@@ -40,4 +40,4 @@
 (jsx_closing_element ["</" ">"] @punctuation.bracket)
 
 ; <Component />
-(jsx_self_closing_element ["<" "/>"] @punctuation.braket)
+(jsx_self_closing_element ["<" "/>"] @punctuation.bracket)

From 9ec0271873ed484f96342489b4117391e88abcd3 Mon Sep 17 00:00:00 2001
From: Arthur Deierlein <110528300+c0rydoras@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:53:30 +0100
Subject: [PATCH 005/101] Add support for hyprland config (#9899)

* feat: add hyprland config language

* adjust indents to helix

* adjust highlights to helix
---
 book/src/generated/lang-support.md      |  1 +
 languages.toml                          | 12 +++++
 runtime/queries/hyprlang/highlights.scm | 58 +++++++++++++++++++++++++
 runtime/queries/hyprlang/indents.scm    |  6 +++
 runtime/queries/hyprlang/injections.scm |  3 ++
 5 files changed, 80 insertions(+)
 create mode 100644 runtime/queries/hyprlang/highlights.scm
 create mode 100644 runtime/queries/hyprlang/indents.scm
 create mode 100644 runtime/queries/hyprlang/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 7792bf5941819..2cb1e926ce31e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -77,6 +77,7 @@
 | hosts | ✓ |  |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
 | hurl | ✓ |  | ✓ |  |
+| hyprlang | ✓ |  | ✓ |  |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
 | ini | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 8fbb98e883d17..b01da144d52f2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3284,3 +3284,15 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "ld"
 source = { git = "https://github.com/mtoohey31/tree-sitter-ld", rev = "81978cde3844bfc199851e39c80a20ec6444d35e" }
+
+[[language]]
+name = "hyprlang"
+scope = "source.hyprlang"
+roots = ["hyprland.conf"]
+file-types = [ { glob = "hyprland.conf"} ]
+comment-token = "#"
+grammar = "hyprlang"
+
+[[grammar]]
+name = "hyprlang"
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang", rev = "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3"}
diff --git a/runtime/queries/hyprlang/highlights.scm b/runtime/queries/hyprlang/highlights.scm
new file mode 100644
index 0000000000000..bf898c9cdd224
--- /dev/null
+++ b/runtime/queries/hyprlang/highlights.scm
@@ -0,0 +1,58 @@
+(comment) @comment
+
+[
+  "source"
+  "exec"
+  "exec-once"
+] @function.builtin
+
+(keyword
+  (name) @keyword)
+
+(assignment
+  (name) @variable.other.member)
+
+(section
+  (name) @namespace)
+
+(section
+  device: (device_name) @type)
+
+(variable) @variable
+
+"$" @punctuation.special
+
+(boolean) @constant.builtin.boolean
+
+(string) @string
+
+(mod) @constant
+
+[
+  "rgb"
+  "rgba"
+] @function.builtin
+
+[
+  (number)
+  (legacy_hex)
+  (angle)
+  (hex)
+] @constant.numeric
+
+"deg" @type
+
+"," @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "="
+  "-"
+  "+"
+] @operator
diff --git a/runtime/queries/hyprlang/indents.scm b/runtime/queries/hyprlang/indents.scm
new file mode 100644
index 0000000000000..88bfe7434276e
--- /dev/null
+++ b/runtime/queries/hyprlang/indents.scm
@@ -0,0 +1,6 @@
+(section) @indent
+
+(section
+  "}" @outdent)
+
+"}" @extend
diff --git a/runtime/queries/hyprlang/injections.scm b/runtime/queries/hyprlang/injections.scm
new file mode 100644
index 0000000000000..1f0199ed807dd
--- /dev/null
+++ b/runtime/queries/hyprlang/injections.scm
@@ -0,0 +1,3 @@
+(exec
+  (string) @injection.content
+  (#set! injection.language "bash"))

From e36774c2c8f967c16ce2e10f2ba074838b324ec6 Mon Sep 17 00:00:00 2001
From: "George \"Riye\" Hollister" <riyeuk@proton.me>
Date: Sun, 17 Mar 2024 22:54:05 +0000
Subject: [PATCH 006/101] Add Support for JSONC (#9906)

* Added `jsonc` language with support for comments

The `vscode-json-language-server` accepts `jsonc` as a language id.
Allowing the use of comments within JSON files.

* fix: Update `injdection-rejex` to be unique

* fix: use includes to remove redundant queries

* ci: Generate language-support docs
---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 10 +++++++++-
 runtime/queries/jsonc/highlights.scm |  2 ++
 runtime/queries/jsonc/indents.scm    |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/jsonc/highlights.scm
 create mode 100644 runtime/queries/jsonc/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 2cb1e926ce31e..40029657f55f4 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -88,6 +88,7 @@
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
 | json5 | ✓ |  |  |  |
+| jsonc | ✓ |  | ✓ | `vscode-json-language-server` |
 | jsonnet | ✓ |  |  | `jsonnet-language-server` |
 | jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ | ✓ | ✓ | `julia` |
diff --git a/languages.toml b/languages.toml
index b01da144d52f2..4018fbe0e3299 100644
--- a/languages.toml
+++ b/languages.toml
@@ -367,7 +367,6 @@ scope = "source.json"
 injection-regex = "json"
 file-types = [
   "json",
-  "jsonc",
   "arb",
   "ipynb",
   "geojson",
@@ -396,6 +395,15 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 source = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "73076754005a460947cafe8e03a8cf5fa4fa2938" }
 
+[[language]]
+name = "jsonc"
+scope = "source.json"
+injection-regex = "jsonc"
+file-types = ["jsonc"]
+grammar = "json"
+language-servers = [ "vscode-json-language-server" ]
+auto-format = true
+indent = { tab-width = 2, unit = "  " }
 
 [[language]]
 name = "json5"
diff --git a/runtime/queries/jsonc/highlights.scm b/runtime/queries/jsonc/highlights.scm
new file mode 100644
index 0000000000000..0164321b60d57
--- /dev/null
+++ b/runtime/queries/jsonc/highlights.scm
@@ -0,0 +1,2 @@
+; inherits: json
+(comment) @comment
diff --git a/runtime/queries/jsonc/indents.scm b/runtime/queries/jsonc/indents.scm
new file mode 100644
index 0000000000000..41269219efd8f
--- /dev/null
+++ b/runtime/queries/jsonc/indents.scm
@@ -0,0 +1 @@
+; inherits: json

From 3890376a23e84d5bcdac31cb9d0f6913abe0fc7f Mon Sep 17 00:00:00 2001
From: Dan Cardamore <dcardamo@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:55:49 -0400
Subject: [PATCH 007/101] add 'file-absolute-path' to statusline (#4535)

* feat: add 'file-abs-path' to statusline (#4434)

* cleanup implementation

* rename to be non-abbreviated names

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/configuration.md       |  1 +
 helix-term/src/ui/statusline.rs | 17 +++++++++++++++++
 helix-view/src/editor.rs        |  3 +++
 3 files changed, 21 insertions(+)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index d8793645793c7..8857af82a98e2 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -108,6 +108,7 @@ The following statusline elements can be configured:
 | `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |
 | `spinner` | A progress spinner indicating LSP activity |
 | `file-name` | The path/name of the opened file |
+| `file-absolute-path` | The absolute path/name of the opened file |
 | `file-base-name` | The basename of the opened file |
 | `file-modification-indicator` | The indicator to show whether the file is modified (a `[+]` appears when there are unsaved changes) |
 | `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 9871828ee3d05..c3464067f06c3 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -142,6 +142,7 @@ where
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
         helix_view::editor::StatusLineElement::FileBaseName => render_file_base_name,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
+        helix_view::editor::StatusLineElement::FileAbsolutePath => render_file_absolute_path,
         helix_view::editor::StatusLineElement::FileModificationIndicator => {
             render_file_modification_indicator
         }
@@ -430,6 +431,22 @@ where
     write(context, title, None);
 }
 
+fn render_file_absolute_path<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let title = {
+        let path = context.doc.path();
+        let path = path
+            .as_ref()
+            .map(|p| p.to_string_lossy())
+            .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
+        format!(" {} ", path)
+    };
+
+    write(context, title, None);
+}
+
 fn render_file_modification_indicator<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 f46a0d6a6cac3..bad61052e8272 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -487,6 +487,9 @@ pub enum StatusLineElement {
     /// The relative file path
     FileName,
 
+    /// The file absolute path
+    FileAbsolutePath,
+
     // The file modification indicator
     FileModificationIndicator,
 

From 0301d01e78fce2d589282cbb58727d8df4a0604c Mon Sep 17 00:00:00 2001
From: Jonas De Vuyst <jdv@foobar.be>
Date: Mon, 18 Mar 2024 02:56:17 +0400
Subject: [PATCH 008/101] Fix URL in doc chapter about Textobject queries
 (#5773)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/guides/textobject.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/guides/textobject.md b/book/src/guides/textobject.md
index 405f11c1b00a3..b83c067e44a0a 100644
--- a/book/src/guides/textobject.md
+++ b/book/src/guides/textobject.md
@@ -44,4 +44,4 @@ doesn't make sense in a navigation context.
 
 [tree-sitter-queries]: https://tree-sitter.github.io/tree-sitter/using-parsers#query-syntax
 [tree-sitter-captures]: https://tree-sitter.github.io/tree-sitter/using-parsers#capturing-nodes
-[textobject-examples]: https://github.com/search?q=repo%3Ahelix-editor%2Fhelix+filename%3Atextobjects.scm&type=Code&ref=advsearch&l=&l=
+[textobject-examples]: https://github.com/search?q=repo%3Ahelix-editor%2Fhelix+path%3A%2A%2A/textobjects.scm&type=Code&ref=advsearch&l=&l=

From 8457652da139320fba7128e02fbd19fcf09ea235 Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@rudder.io>
Date: Sun, 17 Mar 2024 23:56:33 +0100
Subject: [PATCH 009/101] Update to modus-themes 4.4.0 (#9912)

---
 runtime/themes/modus_operandi.toml             | 16 ++++++++--------
 .../themes/modus_operandi_deuteranopia.toml    |  1 +
 runtime/themes/modus_operandi_tinted.toml      |  3 ++-
 runtime/themes/modus_operandi_tritanopia.toml  |  1 +
 runtime/themes/modus_vivendi.toml              | 16 ++++++++--------
 runtime/themes/modus_vivendi_deuteranopia.toml | 12 ++++++------
 runtime/themes/modus_vivendi_tinted.toml       | 18 +++++++++---------
 runtime/themes/modus_vivendi_tritanopia.toml   | 12 ++++++------
 8 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/runtime/themes/modus_operandi.toml b/runtime/themes/modus_operandi.toml
index 2247bb3be837e..ad4b3c85a54c8 100644
--- a/runtime/themes/modus_operandi.toml
+++ b/runtime/themes/modus_operandi.toml
@@ -1,6 +1,6 @@
 # Author: Alexis Mousset <contact@amousset.me>
 # Adapted from https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
-# Version 4.3.0
+# Version 4.4.0
 #
 
 # Syntax highlighting
@@ -86,7 +86,7 @@ punctuation = "fg-dim"
 
 "ui.cursor" = { fg = "bg-main", bg = "fg-main" }
 "ui.cursor.primary" = { fg = "bg-main", bg = "fg-dim" }
-"ui.cursor.match" = { bg = "bg-paren-match" }
+"ui.cursor.match" = { fg = "fg-main", bg = "bg-paren-match" }
 "ui.cursorline.primary" = { bg = "bg-hl-line" }
 
 "ui.highlight" = { bg = "bg-hl-line" }
@@ -162,12 +162,12 @@ bg-blue-subtle = "#ccdfff"
 bg-magenta-subtle = "#ffddff"
 bg-cyan-subtle = "#bfefff"
 
-bg-red-nuanced = "#fff1f0"
-bg-green-nuanced = "#ecf7ed"
-bg-yellow-nuanced = "#fff3da"
-bg-blue-nuanced = "#f3f3ff"
-bg-magenta-nuanced = "#fdf0ff"
-bg-cyan-nuanced = "#ebf6fa"
+bg-red-nuanced = "#ffe8e8"
+bg-green-nuanced = "#e0f6e0"
+bg-yellow-nuanced = "#f8f0d0"
+bg-blue-nuanced = "#ecedff"
+bg-magenta-nuanced = "#f8e6f5"
+bg-cyan-nuanced = "#e0f2fa"
 
 # Special purpose
 bg-completion = "#c0deff"
diff --git a/runtime/themes/modus_operandi_deuteranopia.toml b/runtime/themes/modus_operandi_deuteranopia.toml
index 28601d37f8021..27f19a7ad1517 100644
--- a/runtime/themes/modus_operandi_deuteranopia.toml
+++ b/runtime/themes/modus_operandi_deuteranopia.toml
@@ -2,6 +2,7 @@
 # modus_operandi.toml variant
 #
 # This variant is optimized for users with red-green color deficiency (deuteranopia)
+# Version 4.4.0
 
 inherits = "modus_operandi"
 
diff --git a/runtime/themes/modus_operandi_tinted.toml b/runtime/themes/modus_operandi_tinted.toml
index 14faf0e5ad96a..1f285361b1954 100644
--- a/runtime/themes/modus_operandi_tinted.toml
+++ b/runtime/themes/modus_operandi_tinted.toml
@@ -1,11 +1,12 @@
 # Author: Alexis Mousset <contact@amousset.me>
 # modus_operandi.toml variant
+# Version 4.4.0
 
 inherits = "modus_operandi"
 
 "comment" = "red-faint"
 
-"ui.cursor.primary" = { fg = "bg-main", bg = "red" }
+"ui.cursor.primary" = { fg = "bg-main", bg = "red-intense" }
 
 [palette]
 # Basic values
diff --git a/runtime/themes/modus_operandi_tritanopia.toml b/runtime/themes/modus_operandi_tritanopia.toml
index 8149f653e6f7d..49d40e931a659 100644
--- a/runtime/themes/modus_operandi_tritanopia.toml
+++ b/runtime/themes/modus_operandi_tritanopia.toml
@@ -2,6 +2,7 @@
 # modus_operandi.toml variant
 #
 # This variant is optimized for users with blue-yellow color deficiency (tritanopia)
+# Version 4.4.0
 
 inherits = "modus_operandi"
 
diff --git a/runtime/themes/modus_vivendi.toml b/runtime/themes/modus_vivendi.toml
index 1ae64d894c8ff..a44fbe0f7c6d8 100644
--- a/runtime/themes/modus_vivendi.toml
+++ b/runtime/themes/modus_vivendi.toml
@@ -1,7 +1,7 @@
 # Author: Matous Dzivjak <matousdzivjak@gmail.com>
 # Adapted from https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
 # Source: https://github.com/protesilaos/modus-themes/blob/main/modus-vivendi-theme.el
-# Version 4.3.0
+# Version 4.4.0
 
 # Syntax highlighting
 # -------------------
@@ -89,7 +89,7 @@ punctuation = "fg-dim"
 
 "ui.cursor" = { fg = "bg-main", bg = "fg-main" }
 "ui.cursor.primary" = { fg = "bg-main", bg = "fg-dim" }
-"ui.cursor.match" = { bg = "bg-paren-match" }
+"ui.cursor.match" = { bg = "bg-paren-match", fg = "fg-main" }
 "ui.cursorline.primary" = { bg = "bg-hl-line" }
 
 "ui.highlight" = { bg = "bg-hl-line" }
@@ -174,12 +174,12 @@ bg-blue-subtle = "#242679"
 bg-magenta-subtle = "#552f5f"
 bg-cyan-subtle = "#004065"
 
-bg-red-nuanced = "#2c0614"
-bg-green-nuanced = "#001904"
-bg-yellow-nuanced = "#221000"
-bg-blue-nuanced = "#0f0e39"
-bg-magenta-nuanced = "#230631"
-bg-cyan-nuanced = "#041529"
+bg-red-nuanced = "#3a0c14"
+bg-green-nuanced = "#092f1f"
+bg-yellow-nuanced = "#381d0f"
+bg-blue-nuanced = "#12154a"
+bg-magenta-nuanced = "#2f0c3f"
+bg-cyan-nuanced = "#042837"
 
 # Uncommon accent backgrounds
 bg-ochre = "#442c2f"
diff --git a/runtime/themes/modus_vivendi_deuteranopia.toml b/runtime/themes/modus_vivendi_deuteranopia.toml
index 57c796cb7a243..294196f313454 100644
--- a/runtime/themes/modus_vivendi_deuteranopia.toml
+++ b/runtime/themes/modus_vivendi_deuteranopia.toml
@@ -90,12 +90,12 @@ bg-blue-subtle = "#242679"
 bg-magenta-subtle = "#552f5f"
 bg-cyan-subtle = "#004065"
 
-bg-red-nuanced = "#2c0614"
-bg-green-nuanced = "#001904"
-bg-yellow-nuanced = "#221000"
-bg-blue-nuanced = "#0f0e39"
-bg-magenta-nuanced = "#230631"
-bg-cyan-nuanced = "#041529"
+bg-red-nuanced = "#3a0c14"
+bg-green-nuanced = "#092f1f"
+bg-yellow-nuanced = "#381d0f"
+bg-blue-nuanced = "#12154a"
+bg-magenta-nuanced = "#2f0c3f"
+bg-cyan-nuanced = "#042837"
 
 # Uncommon accent backgrounds
 bg-ochre = "#442c2f"
diff --git a/runtime/themes/modus_vivendi_tinted.toml b/runtime/themes/modus_vivendi_tinted.toml
index 624a261c9642c..2f9e2bb197d97 100644
--- a/runtime/themes/modus_vivendi_tinted.toml
+++ b/runtime/themes/modus_vivendi_tinted.toml
@@ -1,13 +1,13 @@
 # Author: Matous Dzivjak <matousdzivjak@gmail.com>
 # Adapted from: https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
 # Source: https://github.com/protesilaos/modus-themes/blob/main/modus-vivendi-tinted-theme.el
-# Version 4.3.0
+# Version 4.4.0
 
 inherits = "modus_vivendi"
 
 "comment" = "red-faint"
 
-"ui.cursor.primary" = { fg = "bg-main", bg = "red" }
+"ui.cursor.primary" = { fg = "bg-main", bg = "magenta-intense" }
 
 [palette]
 # Basic values
@@ -76,12 +76,12 @@ bg-blue-subtle = "#242679"
 bg-magenta-subtle = "#552f5f"
 bg-cyan-subtle = "#004065"
 
-bg-red-nuanced = "#350f14"
-bg-green-nuanced = "#002718"
-bg-yellow-nuanced = "#2c1f00"
-bg-blue-nuanced = "#131c4d"
-bg-magenta-nuanced = "#2f133f"
-bg-cyan-nuanced = "#04253f"
+bg-red-nuanced = "#3a0c14"
+bg-green-nuanced = "#092f1f"
+bg-yellow-nuanced = "#381d0f"
+bg-blue-nuanced = "#12154a"
+bg-magenta-nuanced = "#2f0c3f"
+bg-cyan-nuanced = "#042837"
 
 # Special purpose
 bg-completion = "#483d8a"
@@ -140,5 +140,5 @@ bg-lavender = "#38325c"
 bg-sage = "#0f3d30"
 
 # Paren match
-bg-paren-match = "#2f7f9f"
+bg-paren-match = "#5f789f"
 bg-paren-expression = "#453040"
diff --git a/runtime/themes/modus_vivendi_tritanopia.toml b/runtime/themes/modus_vivendi_tritanopia.toml
index 983bb7546929d..7d8569d23e0db 100644
--- a/runtime/themes/modus_vivendi_tritanopia.toml
+++ b/runtime/themes/modus_vivendi_tritanopia.toml
@@ -104,12 +104,12 @@ bg-blue-subtle = "#242679"
 bg-magenta-subtle = "#552f5f"
 bg-cyan-subtle = "#004065"
 
-bg-red-nuanced = "#2c0614"
-bg-green-nuanced = "#001904"
-bg-yellow-nuanced = "#221000"
-bg-blue-nuanced = "#0f0e39"
-bg-magenta-nuanced = "#230631"
-bg-cyan-nuanced = "#041529"
+bg-red-nuanced = "#3a0c14"
+bg-green-nuanced = "#092f1f"
+bg-yellow-nuanced = "#381d0f"
+bg-blue-nuanced = "#12154a"
+bg-magenta-nuanced = "#2f0c3f"
+bg-cyan-nuanced = "#042837"
 
 # Uncommon accent backgrounds
 bg-ochre = "#442c2f"

From f7913c1a3bc7609c9c1d6eaa0fbd0e3dda18be63 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Mon, 18 Mar 2024 00:01:11 +0100
Subject: [PATCH 010/101] Extend groovy support (#9677)

* Extend groovy support

Use more complete parser introduced in nvm-treesitter in
https://github.com/nvim-treesitter/nvim-treesitter/commit/d4dac523d2546afc266eb9b5a7986690b5319c41

* Update runtime/queries/groovy/locals.scm

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Drop indent.scm for groovy

It was copied from the tree-sitter repository but is not
compatiblw with the way indent queries are implemented
in Helix.

* Adapt groovy highlights to helix syntax

* Update documentation

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml                        |   2 +-
 runtime/queries/groovy/folds.scm      |   6 +
 runtime/queries/groovy/highlights.scm | 330 ++++++++++++++++++++------
 runtime/queries/groovy/injections.scm |   7 +-
 runtime/queries/groovy/locals.scm     |   6 +
 5 files changed, 269 insertions(+), 82 deletions(-)
 create mode 100644 runtime/queries/groovy/folds.scm
 create mode 100644 runtime/queries/groovy/locals.scm

diff --git a/languages.toml b/languages.toml
index 4018fbe0e3299..e468429838c6d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3247,7 +3247,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "groovy"
-source = { git = "https://github.com/Decodetalkers/tree-sitter-groovy", rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec" }
+source = { git = "https://github.com/murtaza64/tree-sitter-groovy", rev = "235009aad0f580211fc12014bb0846c3910130c1" }
 
 [[language]]
 name = "fidl"
diff --git a/runtime/queries/groovy/folds.scm b/runtime/queries/groovy/folds.scm
new file mode 100644
index 0000000000000..354861a611057
--- /dev/null
+++ b/runtime/queries/groovy/folds.scm
@@ -0,0 +1,6 @@
+[
+  (argument_list)
+  (closure)
+  (list)
+  (map)
+] @fold
diff --git a/runtime/queries/groovy/highlights.scm b/runtime/queries/groovy/highlights.scm
index 4e94ccd3a1ee5..11fb8e46ed842 100644
--- a/runtime/queries/groovy/highlights.scm
+++ b/runtime/queries/groovy/highlights.scm
@@ -1,96 +1,268 @@
-(unit
-  (identifier) @variable)
+[
+  "!instanceof"
+  "assert"
+  "class"
+  "extends"
+  "instanceof"
+  "package"
+] @keyword
 
-(string
-  (identifier) @variable)
+[
+  "!in"
+  "as"
+  "in"
+] @keyword.operator
+
+[
+  "case"
+  "default"
+  "else"
+  "if"
+  "switch"
+] @keyword.control.conditional
 
-(escape_sequence) @constant.character.escape
+[
+  "catch"
+  "finally"
+  "try"
+] @keyword.control.exception
 
-(block
-  (unit
-    (identifier) @namespace))
+"def" @keyword.function
 
-(func
-  (identifier) @function)
+"import" @keyword.control.import
 
-(number) @constant.numeric
+[
+  "for"
+  "while"
+  (break)
+  (continue)
+] @keyword.control.repeat
 
-((identifier) @constant.builtin.boolean
-  (#any-of? @constant.builtin.boolean "true" "false"))
+"return" @keyword.control.return
 
-((identifier) @constant
-  (#match? @constant "^[A-Z][A-Z\\d_]*$"))
-
-((identifier) @constant.builtin
-  (#eq? @constant.builtin "null"))
-
-((identifier) @type
-  (#any-of? @type
-    "String"
-    "Map"
-    "Object"
-    "Boolean"
-    "Integer"
-    "List"))
-
-((identifier) @function.builtin
-  (#any-of? @function.builtin
-    "void"
-    "id"
-    "version"
-    "apply"
-    "implementation"
-    "testImplementation"
-    "androidTestImplementation"
-    "debugImplementation"))
-
-((identifier) @keyword.storage.modifier
-  (#eq? @keyword.storage.modifier "static"))
-
-((identifier) @keyword.storage.type
-  (#any-of? @keyword.storage.type "class" "def" "interface"))
-
-((identifier) @keyword
-  (#any-of? @keyword
-    "assert"
-    "new"
-    "extends"
-    "implements"
-    "instanceof"))
-
-((identifier) @keyword.control.import
-  (#any-of? @keyword.control.import "import" "package"))
-
-((identifier) @keyword.storage.modifier
-  (#any-of? @keyword.storage.modifier
-    "abstract"
-    "protected"
-    "private"
-    "public"))
-
-((identifier) @keyword.control.exception
-  (#any-of? @keyword.control.exception
-    "throw"
-    "finally"
-    "try"
-    "catch"))
+[
+  "true"
+  "false"
+] @constant.builtin.boolean
+
+(null) @constant.builtin
+
+"this" @variable.builtin
+
+[
+  "int"
+  "char"
+  "short"
+  "long"
+  "boolean"
+  "float"
+  "double"
+  "void"
+] @type.builtin
+
+[
+  "final"
+  "private"
+  "protected"
+  "public"
+  "static"
+  "synchronized"
+] @keyword.storage.modifier
+
+(comment) @comment
+
+(shebang) @keyword.directive
 
 (string) @string
 
+(string
+  (escape_sequence) @constant.character.escape)
+
+(string
+  (interpolation
+    "$" @punctuation.special))
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
 [
-  (line_comment)
-  (block_comment)
-] @comment
+  ":"
+  ","
+  "."
+] @punctuation.delimiter
+
+(number_literal) @constant.numeric
 
-((block_comment) @comment.block.documentation
-  (#match? @comment.block.documentation "^/[*][*][^*](?s:.)*[*]/$"))
+(identifier) @variable
 
-((line_comment) @comment.block.documentation
-  (#match? @comment.block.documentation "^///[^/]*.*$"))
+((identifier) @constant
+  (#match? @constant "^[A-Z][A-Z_]+"))
 
 [
-  (operators)
-  (leading_key)
+  "%"
+  "*"
+  "/"
+  "+"
+  "-"
+  "<<"
+  ">>"
+  ">>>"
+  ".."
+  "..<"
+  "<..<"
+  "<.."
+  "<"
+  "<="
+  ">"
+  ">="
+  "=="
+  "!="
+  "<=>"
+  "==="
+  "!=="
+  "=~"
+  "==~"
+  "&"
+  "^"
+  "|"
+  "&&"
+  "||"
+  "?:"
+  "+"
+  "*"
+  ".&"
+  ".@"
+  "?."
+  "*."
+  "*"
+  "*:"
+  "++"
+  "--"
+  "!"
 ] @operator
 
-["(" ")" "[" "]" "{" "}"]  @punctuation.bracket
+(string
+  "/" @string)
+
+(ternary_op
+  ([
+    "?"
+    ":"
+  ]) @keyword.operator)
+
+(map
+  (map_item
+    key: (identifier) @variable.parameter))
+
+(parameter
+  type: (identifier) @type
+  name: (identifier) @variable.parameter)
+
+(generic_param
+  name: (identifier) @variable.parameter)
+
+(declaration
+  type: (identifier) @type)
+
+(function_definition
+  type: (identifier) @type)
+
+(function_declaration
+  type: (identifier) @type)
+
+(class_definition
+  name: (identifier) @type)
+
+(class_definition
+  superclass: (identifier) @type)
+
+(generic_param
+  superclass: (identifier) @type)
+
+(type_with_generics
+  (identifier) @type)
+
+(type_with_generics
+  (generics
+    (identifier) @type))
+
+(generics
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(generic_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+; TODO: Class literals with PascalCase
+(declaration
+  "=" @operator)
+
+(assignment
+  "=" @operator)
+
+(function_call
+  function: (identifier) @function)
+
+(function_call
+  function:
+    (dotted_identifier
+      (identifier) @function .))
+
+(function_call
+  (argument_list
+    (map_item
+      key: (identifier) @variable.parameter)))
+
+(juxt_function_call
+  function: (identifier) @function)
+
+(juxt_function_call
+  function:
+    (dotted_identifier
+      (identifier) @function .))
+
+(juxt_function_call
+  (argument_list
+    (map_item
+      key: (identifier) @variable.parameter)))
+
+(function_definition
+  function: (identifier) @function)
+
+(function_declaration
+  function: (identifier) @function)
+
+(annotation) @function.macro
+
+(annotation
+  (identifier) @function.macro)
+
+"@interface" @function.macro
+
+(groovy_doc) @comment.block.documentation
+
+(groovy_doc
+  [
+    (groovy_doc_param)
+    (groovy_doc_throws)
+    (groovy_doc_tag)
+  ] @string.special)
+
+(groovy_doc
+  (groovy_doc_param
+    (identifier) @variable.parameter))
+
+(groovy_doc
+  (groovy_doc_throws
+    (identifier) @type))
diff --git a/runtime/queries/groovy/injections.scm b/runtime/queries/groovy/injections.scm
index e4509a5fd317b..1c04c65fbb437 100644
--- a/runtime/queries/groovy/injections.scm
+++ b/runtime/queries/groovy/injections.scm
@@ -1,2 +1,5 @@
-([(line_comment) (block_comment)] @injection.content
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((groovy_doc) @injection.content
+  (#set! injection.language "comment"))
diff --git a/runtime/queries/groovy/locals.scm b/runtime/queries/groovy/locals.scm
new file mode 100644
index 0000000000000..380c4ad64f3dd
--- /dev/null
+++ b/runtime/queries/groovy/locals.scm
@@ -0,0 +1,6 @@
+(function_definition) @local.scope
+
+(parameter
+  name: (identifier) @local.definition)
+
+(identifier) @local.reference

From 64389f97fe8e226a0bcf19cdc292eaf7d42478af Mon Sep 17 00:00:00 2001
From: Erasin Wang <erasinoo@gmail.com>
Date: Mon, 18 Mar 2024 07:01:25 +0800
Subject: [PATCH 011/101] Updated grammar for hurl 4 (#9775)

---
 languages.toml                      |  3 ++-
 runtime/queries/hurl/highlights.scm | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index e468429838c6d..6914684198ecf 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2901,11 +2901,12 @@ scope = "source.hurl"
 injection-regex = "hurl"
 file-types = ["hurl"]
 comment-token = "#"
+formatter = { command = "hurlfmt" }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "hurl"
-source = { git = "https://github.com/pfeiferj/tree-sitter-hurl", rev = "264c42064b61ee21abe88d0061f29a0523352e22" }
+source = { git = "https://github.com/pfeiferj/tree-sitter-hurl", rev = "cd1a0ada92cc73dd0f4d7eedc162be4ded758591" }
 
 [[language]]
 name = "markdoc"
diff --git a/runtime/queries/hurl/highlights.scm b/runtime/queries/hurl/highlights.scm
index c066b28447d98..a203763755e66 100644
--- a/runtime/queries/hurl/highlights.scm
+++ b/runtime/queries/hurl/highlights.scm
@@ -51,6 +51,20 @@
   "sha256"
   "md5"
   "bytes"
+  "daysAfterNow"
+  "daysBeforeNow"
+  "htmlEscape"
+  "htmlUnescape"
+  "decode"
+  "format"
+  "nth"
+  "replace"
+  "split"
+  "toDate"
+  "toInt"
+  "urlEncode"
+  "urlDecode"
+  "count"
 ] @function.builtin
 
 (filter) @attribute
@@ -59,8 +73,11 @@
 [
   "null"
   "cacert"
+  "compressed"
   "location"
   "insecure"
+  "path-as-is"
+  "proxy"
   "max-redirs"
   "retry"
   "retry-interval"
@@ -124,4 +141,4 @@
   "base64,"
   "file,"
   "hex,"
-] @string.special
\ No newline at end of file
+] @string.special

From eead105f94c552259cdbf1f572d047cbabb24c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20F=C3=BChrmann?= <cfuhrmann@gmail.com>
Date: Mon, 18 Mar 2024 00:06:23 +0100
Subject: [PATCH 012/101] Fix selected text background in toykonight (#9789)

Before the fix, the color that the original (Neovim) tokyonight uses for
Neovim's visual mode was used in Helix for highlighting the selected
item in the picker. But for the highlighting of selected _text_ in
Helix (corresponding to Neovim's visual mode), a much darker background
was used. This made it very hard to pick out selected text, in
particular in suboptimal lighting conditions.

I swapped the two colors, so that text selection now looks like in
Neovim, while selected items in the picker are highlighted a bit less
strongly. (But still easy to see because the whole line is highlighted.)
---
 runtime/themes/tokyonight.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index fbd8f2ed575ca..be7968575c833 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -76,15 +76,15 @@ hint = { fg = "hint" }
 "ui.menu" = { bg = "bg-menu", fg = "fg" }
 "ui.menu.selected" = { bg = "fg-selected" }
 "ui.popup" = { bg = "bg-menu", fg = "border-highlight" }
-"ui.selection" = { bg = "bg-highlight" }
-"ui.selection.primary" = { bg = "bg-highlight" }
+"ui.selection" = { bg = "bg-selection" }
+"ui.selection.primary" = { bg = "bg-selection" }
 "ui.statusline" = { bg = "bg-menu", fg = "fg-dark" }
 "ui.statusline.inactive" = { bg = "bg-menu", fg = "fg-gutter" }
 "ui.statusline.normal" = { bg = "blue", fg = "bg", modifiers = ["bold"] }
 "ui.statusline.insert" = { bg = "light-green", fg = "bg", modifiers = ["bold"] }
 "ui.statusline.select" = { bg = "magenta", fg = "bg", modifiers = ["bold"] }
 "ui.text" = { bg = "bg", fg = "fg" }
-"ui.text.focus" = { bg = "bg-visual" }
+"ui.text.focus" = { bg = "bg-focus" }
 "ui.text.inactive" = { fg = "comment", modifiers = ["italic"] }
 "ui.text.info" = { bg = "bg-menu", fg = "fg" }
 "ui.virtual.ruler" = { bg = "fg-gutter" }
@@ -126,6 +126,6 @@ border = "#15161e"
 border-highlight = "#27a1b9"
 bg = "#1a1b26"
 bg-inlay = "#1a2b32"
-bg-highlight = "#292e42"
+bg-selection = "#283457"
 bg-menu = "#16161e"
-bg-visual = "#283457"
+bg-focus = "#292e42"

From d99b6177c21df836c80cc60a500c73d64a7f9bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Sun, 17 Mar 2024 20:07:09 -0300
Subject: [PATCH 013/101] Add blade support (#9513)

* Add php-only language config and queries

php-only is required enabling php injections like in blade templates

* Add blade templates support
---
 book/src/generated/lang-support.md      |   2 +
 languages.toml                          |  23 +++++
 runtime/queries/blade/folds.scm         |   8 ++
 runtime/queries/blade/highlights.scm    |   4 +
 runtime/queries/blade/injections.scm    |   9 ++
 runtime/queries/php-only/highlights.scm | 123 ++++++++++++++++++++++++
 runtime/queries/php-only/injections.scm |  10 ++
 runtime/queries/php-only/tags.scm       |  40 ++++++++
 8 files changed, 219 insertions(+)
 create mode 100644 runtime/queries/blade/folds.scm
 create mode 100644 runtime/queries/blade/highlights.scm
 create mode 100644 runtime/queries/blade/injections.scm
 create mode 100644 runtime/queries/php-only/highlights.scm
 create mode 100644 runtime/queries/php-only/injections.scm
 create mode 100644 runtime/queries/php-only/tags.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 40029657f55f4..97ea8e8635185 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -8,6 +8,7 @@
 | beancount | ✓ |  |  |  |
 | bibtex | ✓ |  |  | `texlab` |
 | bicep | ✓ |  |  | `bicep-langserver` |
+| blade | ✓ |  |  |  |
 | blueprint | ✓ |  |  | `blueprint-compiler` |
 | c | ✓ | ✓ | ✓ | `clangd` |
 | c-sharp | ✓ | ✓ |  | `OmniSharp` |
@@ -131,6 +132,7 @@
 | pem | ✓ |  |  |  |
 | perl | ✓ | ✓ | ✓ | `perlnavigator` |
 | php | ✓ | ✓ | ✓ | `intelephense` |
+| php-only | ✓ |  |  |  |
 | pkl | ✓ |  | ✓ |  |
 | po | ✓ | ✓ |  |  |
 | pod | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 6914684198ecf..6e6c57932d108 100644
--- a/languages.toml
+++ b/languages.toml
@@ -940,6 +940,29 @@ indent = { tab-width = 4, unit = "    " }
 name = "php"
 source = { git = "https://github.com/tree-sitter/tree-sitter-php", rev = "f860e598194f4a71747f91789bf536b393ad4a56" }
 
+[[language]]
+name = "php-only"
+scope = "source.php-only"
+injection-regex = "php-only"
+file-types = []
+indent = { tab-width = 4, unit = "    " }
+roots = ["composer.json", "index.php"]
+
+[[grammar]]
+name = "php-only"
+source = { git = "https://github.com/tree-sitter/tree-sitter-php", rev = "cf1f4a0f1c01c705c1d6cf992b104028d5df0b53", subpath = "php_only" }
+
+[[language]]
+name = "blade"
+scope = "source.blade.php"
+file-types = [{ glob = "*.blade.php" }, "blade"]
+injection-regex = "blade"
+roots = ["composer.json", "index.php"]
+
+[[grammar]]
+name = "blade"
+source = { git = "https://github.com/EmranMR/tree-sitter-blade", rev = "4c66efe1e05c639c555ee70092021b8223d2f440" }
+
 [[language]]
 name = "twig"
 scope = "source.twig"
diff --git a/runtime/queries/blade/folds.scm b/runtime/queries/blade/folds.scm
new file mode 100644
index 0000000000000..c171148212b09
--- /dev/null
+++ b/runtime/queries/blade/folds.scm
@@ -0,0 +1,8 @@
+((directive_start) @start
+    (directive_end) @end.after
+    (#set! role block))
+
+
+((bracket_start) @start
+    (bracket_end) @end
+    (#set! role block))
\ No newline at end of file
diff --git a/runtime/queries/blade/highlights.scm b/runtime/queries/blade/highlights.scm
new file mode 100644
index 0000000000000..b3d442a05f630
--- /dev/null
+++ b/runtime/queries/blade/highlights.scm
@@ -0,0 +1,4 @@
+(directive) @tag
+(directive_start) @tag
+(directive_end) @tag
+(comment) @comment
diff --git a/runtime/queries/blade/injections.scm b/runtime/queries/blade/injections.scm
new file mode 100644
index 0000000000000..4c6367349b552
--- /dev/null
+++ b/runtime/queries/blade/injections.scm
@@ -0,0 +1,9 @@
+((text) @injection.content
+    (#set! injection.combined)
+    (#set! injection.language php))
+
+((php_only) @injection.content
+    (#set! injection.language php-only))
+((parameter) @injection.content
+    (#set! injection.language php-only))
+
diff --git a/runtime/queries/php-only/highlights.scm b/runtime/queries/php-only/highlights.scm
new file mode 100644
index 0000000000000..9fdbe02986d98
--- /dev/null
+++ b/runtime/queries/php-only/highlights.scm
@@ -0,0 +1,123 @@
+(php_tag) @tag
+"?>" @tag
+
+; Types
+
+(primitive_type) @type.builtin
+(cast_type) @type.builtin
+(named_type (name) @type) @type
+(named_type (qualified_name) @type) @type
+
+; Functions
+
+(array_creation_expression "array" @function.builtin)
+(list_literal "list" @function.builtin)
+
+(method_declaration
+  name: (name) @function.method)
+
+(function_call_expression
+  function: [(qualified_name (name)) (name)] @function)
+
+(scoped_call_expression
+  name: (name) @function)
+
+(member_call_expression
+  name: (name) @function.method)
+
+(function_definition
+  name: (name) @function)
+
+; Member
+
+(property_element
+  (variable_name) @variable.other.member)
+
+(member_access_expression
+  name: (variable_name (name)) @variable.other.member)
+(member_access_expression
+  name: (name) @variable.other.member)
+
+; Variables
+
+(relative_scope) @variable.builtin
+
+((name) @constant
+ (#match? @constant "^_?[A-Z][A-Z\\d_]+$"))
+((name) @constant.builtin
+ (#match? @constant.builtin "^__[A-Z][A-Z\d_]+__$"))
+
+((name) @constructor
+ (#match? @constructor "^[A-Z]"))
+
+((name) @variable.builtin
+ (#eq? @variable.builtin "this"))
+
+(variable_name) @variable
+
+; Basic tokens
+[
+  (string)
+  (string_value)
+  (encapsed_string)
+  (heredoc)
+  (heredoc_body)
+  (nowdoc_body)
+] @string
+(boolean) @constant.builtin.boolean
+(null) @constant.builtin
+(integer) @constant.builtin.integer
+(float) @constant.builtin.float
+(comment) @comment
+
+"$" @operator
+
+; Keywords
+
+"abstract" @keyword
+"as" @keyword
+"break" @keyword
+"case" @keyword
+"catch" @keyword
+"class" @keyword
+"const" @keyword
+"continue" @keyword
+"declare" @keyword
+"default" @keyword
+"do" @keyword
+"echo" @keyword
+"else" @keyword
+"elseif" @keyword
+"enddeclare" @keyword
+"endforeach" @keyword
+"endif" @keyword
+"endswitch" @keyword
+"endwhile" @keyword
+"extends" @keyword
+"final" @keyword
+"finally" @keyword
+"for" @keyword
+"foreach" @keyword
+"function" @keyword
+"global" @keyword
+"if" @keyword
+"implements" @keyword
+"include_once" @keyword
+"include" @keyword
+"insteadof" @keyword
+"interface" @keyword
+"namespace" @keyword
+"new" @keyword
+"private" @keyword
+"protected" @keyword
+"public" @keyword
+"require_once" @keyword
+"require" @keyword
+"return" @keyword
+"static" @keyword
+"switch" @keyword
+"throw" @keyword
+"trait" @keyword
+"try" @keyword
+"use" @keyword
+"while" @keyword
diff --git a/runtime/queries/php-only/injections.scm b/runtime/queries/php-only/injections.scm
new file mode 100644
index 0000000000000..75150f716e31b
--- /dev/null
+++ b/runtime/queries/php-only/injections.scm
@@ -0,0 +1,10 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+(heredoc
+  (heredoc_body) @injection.content
+  (heredoc_end) @injection.language)
+
+(nowdoc
+  (nowdoc_body) @injection.content
+  (heredoc_end) @injection.language)
diff --git a/runtime/queries/php-only/tags.scm b/runtime/queries/php-only/tags.scm
new file mode 100644
index 0000000000000..66d594c254748
--- /dev/null
+++ b/runtime/queries/php-only/tags.scm
@@ -0,0 +1,40 @@
+(namespace_definition
+  name: (namespace_name) @name) @module
+
+(interface_declaration
+  name: (name) @name) @definition.interface
+
+(trait_declaration
+  name: (name) @name) @definition.interface
+
+(class_declaration
+  name: (name) @name) @definition.class
+
+(class_interface_clause [(name) (qualified_name)] @name) @impl
+
+(property_declaration
+  (property_element (variable_name (name) @name))) @definition.field
+
+(function_definition
+  name: (name) @name) @definition.function
+
+(method_declaration
+  name: (name) @name) @definition.function
+
+(object_creation_expression
+  [
+    (qualified_name (name) @name)
+    (variable_name (name) @name)
+  ]) @reference.class
+
+(function_call_expression
+  function: [
+    (qualified_name (name) @name)
+    (variable_name (name)) @name
+  ]) @reference.call
+
+(scoped_call_expression
+  name: (name) @name) @reference.call
+
+(member_call_expression
+  name: (name) @name) @reference.call

From 476e6baf8f664bb08114aa5bf6bc839925d8d329 Mon Sep 17 00:00:00 2001
From: Joey Hain <hain.joseph@gmail.com>
Date: Sun, 17 Mar 2024 16:11:28 -0700
Subject: [PATCH 014/101] Add textobject queries for vala (#8541)

---
 book/src/generated/lang-support.md   |  2 +-
 runtime/queries/vala/textobjects.scm | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/vala/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 97ea8e8635185..4a0b4b0a9051e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -190,7 +190,7 @@
 | unison | ✓ |  | ✓ |  |
 | uxntal | ✓ |  |  |  |
 | v | ✓ | ✓ | ✓ | `v-analyzer` |
-| vala | ✓ |  |  | `vala-language-server` |
+| vala | ✓ | ✓ |  | `vala-language-server` |
 | verilog | ✓ | ✓ |  | `svlangserver` |
 | vhdl | ✓ |  |  | `vhdl_ls` |
 | vhs | ✓ |  |  |  |
diff --git a/runtime/queries/vala/textobjects.scm b/runtime/queries/vala/textobjects.scm
new file mode 100644
index 0000000000000..b84d9a200a3dd
--- /dev/null
+++ b/runtime/queries/vala/textobjects.scm
@@ -0,0 +1,27 @@
+(method_declaration
+  (block) @function.inside) @function.around
+
+(creation_method_declaration
+  (block) @function.inside) @function.around
+
+(method_declaration
+  ((parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+[
+  (class_declaration)
+  (struct_declaration)
+  (interface_declaration)
+] @class.around
+
+(type_arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(creation_method_declaration
+  ((parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(method_call_expression
+  ((argument) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(comment) @comment.inside
+
+(comment)+ @comment.around

From 38af99f05f76dfcdb36e5b498a64b8c39b2fa27a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 17 Mar 2024 09:42:16 -0400
Subject: [PATCH 015/101] Bump tree-sitter to 0.22.2

---
 Cargo.lock               |  5 +++--
 Cargo.toml               |  2 +-
 helix-core/src/syntax.rs | 20 +++++++-------------
 xtask/src/querycheck.rs  |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7b73b1b1acb3d..0a17dec8fdc6f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2404,8 +2404,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.20.10"
-source = "git+https://github.com/helix-editor/tree-sitter?rev=660481dbf71413eba5a928b0b0ab8da50c1109e0#660481dbf71413eba5a928b0b0ab8da50c1109e0"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb9c9f15eae91dcd00ee0d86a281d16e6263786991b662b34fa9632c21a046b"
 dependencies = [
  "cc",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index 91f6e7cae498b..e56aedc8fcc6c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ package.helix-tui.opt-level = 2
 package.helix-term.opt-level = 2
 
 [workspace.dependencies]
-tree-sitter = { version = "0.20", git = "https://github.com/helix-editor/tree-sitter", rev = "660481dbf71413eba5a928b0b0ab8da50c1109e0" }
+tree-sitter = { version = "0.22" }
 nucleo = "0.2.0"
 
 [workspace.package]
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 3b224e1b2a7c1..0e8917191c914 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -21,7 +21,7 @@ use std::{
     collections::{HashMap, HashSet, VecDeque},
     fmt::{self, Display},
     hash::{Hash, Hasher},
-    mem::{replace, transmute},
+    mem::replace,
     path::{Path, PathBuf},
     str::FromStr,
     sync::Arc,
@@ -805,7 +805,7 @@ impl LanguageConfiguration {
         if query_text.is_empty() {
             return None;
         }
-        let lang = self.highlight_config.get()?.as_ref()?.language;
+        let lang = &self.highlight_config.get()?.as_ref()?.language;
         Query::new(lang, &query_text)
             .map_err(|e| {
                 log::error!(
@@ -1544,13 +1544,7 @@ impl PartialEq for LanguageLayer {
 impl Hash for LanguageLayer {
     fn hash<H: Hasher>(&self, state: &mut H) {
         self.depth.hash(state);
-        // The transmute is necessary here because tree_sitter::Language does not derive Hash at the moment.
-        // However it does use #[repr] transparent so the transmute here is safe
-        // as `Language` (which `Grammar` is an alias for) is just a newtype wrapper around a (thin) pointer.
-        // This is also compatible with the PartialEq implementation of language
-        // as that is just a pointer comparison.
-        let language: *const () = unsafe { transmute(self.config.language) };
-        language.hash(state);
+        self.config.language.hash(state);
         self.ranges.hash(state);
     }
 }
@@ -1567,7 +1561,7 @@ impl LanguageLayer {
             .map_err(|_| Error::InvalidRanges)?;
 
         parser
-            .set_language(self.config.language)
+            .set_language(&self.config.language)
             .map_err(|_| Error::InvalidLanguage)?;
 
         // unsafe { syntax.parser.set_cancellation_flag(cancellation_flag) };
@@ -1867,7 +1861,7 @@ impl HighlightConfiguration {
 
         // Construct a single query by concatenating the three query strings, but record the
         // range of pattern indices that belong to each individual string.
-        let query = Query::new(language, &query_source)?;
+        let query = Query::new(&language, &query_source)?;
         let mut highlights_pattern_index = 0;
         for i in 0..(query.pattern_count()) {
             let pattern_offset = query.start_byte_for_pattern(i);
@@ -1876,7 +1870,7 @@ impl HighlightConfiguration {
             }
         }
 
-        let injections_query = Query::new(language, injection_query)?;
+        let injections_query = Query::new(&language, injection_query)?;
         let combined_injections_patterns = (0..injections_query.pattern_count())
             .filter(|&i| {
                 injections_query
@@ -2730,7 +2724,7 @@ mod test {
         .unwrap();
         let language = get_language("rust").unwrap();
 
-        let query = Query::new(language, query_str).unwrap();
+        let query = Query::new(&language, query_str).unwrap();
         let textobject = TextObjectQuery { query };
         let mut cursor = QueryCursor::new();
 
diff --git a/xtask/src/querycheck.rs b/xtask/src/querycheck.rs
index 454d0e5cd9cbf..a27f85e636bf5 100644
--- a/xtask/src/querycheck.rs
+++ b/xtask/src/querycheck.rs
@@ -21,7 +21,7 @@ pub fn query_check() -> Result<(), DynError> {
             let query_text = read_query(language_name, query_file);
             if let Ok(lang) = language {
                 if !query_text.is_empty() {
-                    if let Err(reason) = Query::new(lang, &query_text) {
+                    if let Err(reason) = Query::new(&lang, &query_text) {
                         return Err(format!(
                             "Failed to parse {} queries for {}: {}",
                             query_file, language_name, reason

From 4ffe9935339a2bd3085720ef6bea62678e9d7e95 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 17 Mar 2024 11:43:35 -0400
Subject: [PATCH 016/101] Fix malformed predicates in highlighting queries

---
 runtime/queries/go/highlights.scm    | 4 ++--
 runtime/queries/julia/highlights.scm | 6 +++---
 runtime/queries/pkl/highlights.scm   | 2 +-
 runtime/queries/pkl/injections.scm   | 2 +-
 runtime/queries/scss/highlights.scm  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 8eed12afbdb36..7dc20e69c9a8c 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -2,7 +2,7 @@
 
 (call_expression
   function: (identifier) @function.builtin
-  (match? @function.builtin "^(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)$"))
+  (#match? @function.builtin "^(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)$"))
 
 (call_expression
   function: (identifier) @function)
@@ -19,7 +19,7 @@
     name: (identifier) @type.parameter))
 
 ((type_identifier) @type.builtin
-  (match? @type.builtin "^(any|bool|byte|comparable|complex128|complex64|error|float32|float64|int|int16|int32|int64|int8|rune|string|uint|uint16|uint32|uint64|uint8|uintptr)$"))
+  (#match? @type.builtin "^(any|bool|byte|comparable|complex128|complex64|error|float32|float64|int|int16|int32|int64|int8|rune|string|uint|uint16|uint32|uint64|uint8|uintptr)$"))
 
 (type_identifier) @type
 
diff --git a/runtime/queries/julia/highlights.scm b/runtime/queries/julia/highlights.scm
index 90baee21355d2..013f50632576b 100644
--- a/runtime/queries/julia/highlights.scm
+++ b/runtime/queries/julia/highlights.scm
@@ -231,7 +231,7 @@
 ] @keyword
 
 ; TODO: fix this
-((identifier) @keyword (match? @keyword "global|local"))
+((identifier) @keyword (#match? @keyword "global|local"))
 
 ; ---------
 ; Operators
@@ -277,12 +277,12 @@
 ; SCREAMING_SNAKE_CASE
 (
   (identifier) @constant
-  (match? @constant "^[A-Z][A-Z0-9_]*$"))
+  (#match? @constant "^[A-Z][A-Z0-9_]*$"))
 
 ; remaining identifiers that start with capital letters should be types (PascalCase)
 (
   (identifier) @type
-  (match? @type "^[A-Z]"))
+  (#match? @type "^[A-Z]"))
 
 ; Field expressions are either module content or struct fields.
 ; Module types and constants should already be captured, so this
diff --git a/runtime/queries/pkl/highlights.scm b/runtime/queries/pkl/highlights.scm
index 501c9485945b9..1de6ba3c0d4d8 100644
--- a/runtime/queries/pkl/highlights.scm
+++ b/runtime/queries/pkl/highlights.scm
@@ -172,7 +172,7 @@
 (clazz (identifier) @type)
 (typeAlias (identifier) @type)
 ((identifier) @type
- (match? @type "^[A-Z]"))
+ (#match? @type "^[A-Z]"))
 
 (typeArgumentList
   "<" @punctuation.bracket
diff --git a/runtime/queries/pkl/injections.scm b/runtime/queries/pkl/injections.scm
index 15867f35e6479..c5d2d4ac5e02a 100644
--- a/runtime/queries/pkl/injections.scm
+++ b/runtime/queries/pkl/injections.scm
@@ -18,7 +18,7 @@
 (
   ((methodCallExpr (identifier) @methodName (argumentList (slStringLiteral) @injection.content))
     (#set! injection.language "regex"))
-  (eq? @methodName "Regex"))
+  (#eq? @methodName "Regex"))
  
 ((lineComment) @injection.content
  (#set! injection.language "comment"))
diff --git a/runtime/queries/scss/highlights.scm b/runtime/queries/scss/highlights.scm
index 8ba00a881c33f..de20e047464db 100644
--- a/runtime/queries/scss/highlights.scm
+++ b/runtime/queries/scss/highlights.scm
@@ -44,9 +44,9 @@
 "@while" @keyword.control.repeat
 
 ((property_name) @variable
- (match? @variable "^--"))
+ (#match? @variable "^--"))
 ((plain_value) @variable
- (match? @variable "^--"))
+ (#match? @variable "^--"))
 
 (tag_name) @tag
 (universal_selector) @tag

From 94d210c9bf78af1d170534bc3398b334f289be33 Mon Sep 17 00:00:00 2001
From: Phil <me@pnelson.ca>
Date: Mon, 18 Mar 2024 12:13:23 +0000
Subject: [PATCH 017/101] Add initial support for SuperCollider (#9329)

---
 book/src/generated/lang-support.md           |  1 +
 languages.toml                               | 12 ++++
 runtime/queries/supercollider/folds.scm      |  7 ++
 runtime/queries/supercollider/highlights.scm | 76 ++++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 runtime/queries/supercollider/folds.scm
 create mode 100644 runtime/queries/supercollider/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 4a0b4b0a9051e..fdec0270216fd 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -170,6 +170,7 @@
 | sshclientconfig | ✓ |  |  |  |
 | starlark | ✓ | ✓ |  |  |
 | strace | ✓ |  |  |  |
+| supercollider | ✓ |  |  |  |
 | svelte | ✓ |  | ✓ | `svelteserver` |
 | sway | ✓ | ✓ | ✓ | `forc` |
 | swift | ✓ |  |  | `sourcekit-lsp` |
diff --git a/languages.toml b/languages.toml
index 6e6c57932d108..f0d6771fc15af 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3328,3 +3328,15 @@ grammar = "hyprlang"
 [[grammar]]
 name = "hyprlang"
 source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang", rev = "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3"}
+
+[[language]]
+name = "supercollider"
+scope = "source.supercollider"
+injection-regex = "supercollider"
+file-types = ["scd", "sc", "quark"]
+comment-token = "//"
+indent = { tab-width = 4, unit = "\t" }
+
+[[grammar]]
+name = "supercollider"
+source = { git = "https://github.com/madskjeldgaard/tree-sitter-supercollider", rev = "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095" }
diff --git a/runtime/queries/supercollider/folds.scm b/runtime/queries/supercollider/folds.scm
new file mode 100644
index 0000000000000..214247bc0fb1c
--- /dev/null
+++ b/runtime/queries/supercollider/folds.scm
@@ -0,0 +1,7 @@
+[
+(function_call)
+(code_block)
+(function_block)
+(control_structure)
+] @fold
+
diff --git a/runtime/queries/supercollider/highlights.scm b/runtime/queries/supercollider/highlights.scm
new file mode 100644
index 0000000000000..0128606de7474
--- /dev/null
+++ b/runtime/queries/supercollider/highlights.scm
@@ -0,0 +1,76 @@
+(line_comment) @comment.line
+(block_comment) @comment.block
+
+(argument name: (identifier) @variable.parameter)
+
+(local_var name: (identifier) @variable)
+(environment_var name:(identifier) @variable.builtin)
+(builtin_var) @constant.builtin
+
+(function_definition name: (variable) @function)
+
+(named_argument name: (identifier) @variable.other.member)
+
+(method_call name: (method_name) @function.method)
+
+(class) @keyword.storage.type
+
+(number) @constant.numeric
+(float) @constant.numeric.float
+
+(string) @string
+(symbol) @string.special.symbol
+
+[
+"&&"
+"||"
+"&"
+"|"
+"^"
+"=="
+"!="
+"<"
+"<="
+">"
+">="
+"<<"
+">>"
+"+"
+"-"
+"*"
+"/"
+"%"
+"="
+"|@|"
+"@@"
+"@|@"
+] @operator
+
+[
+"arg"
+"classvar"
+"const"
+"var"
+] @keyword
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "|"
+] @punctuation.bracket
+
+[
+  ";"
+  "."
+  ","
+] @punctuation.delimiter
+
+(control_structure) @keyword.control.conditional
+
+(escape_sequence) @string.special
+
+(duplicated_statement) @keyword.control.repeat

From 2e4653ea312dcb69d2453eccaa7c0f873cce6aa5 Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Mon, 18 Mar 2024 08:14:10 -0400
Subject: [PATCH 018/101] add koka language support (#8727)

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 book/src/generated/lang-support.md  |   1 +
 languages.toml                      |  12 ++
 runtime/queries/koka/highlights.scm | 272 ++++++++++++++++++++++++++++
 runtime/queries/koka/indents.scm    |  39 ++++
 runtime/queries/koka/injections.scm |   2 +
 runtime/queries/koka/locals.scm     |  30 +++
 6 files changed, 356 insertions(+)
 create mode 100644 runtime/queries/koka/highlights.scm
 create mode 100644 runtime/queries/koka/indents.scm
 create mode 100644 runtime/queries/koka/injections.scm
 create mode 100644 runtime/queries/koka/locals.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index fdec0270216fd..25b22a32748ac 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -95,6 +95,7 @@
 | julia | ✓ | ✓ | ✓ | `julia` |
 | just | ✓ | ✓ | ✓ |  |
 | kdl | ✓ | ✓ | ✓ |  |
+| koka | ✓ |  | ✓ |  |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
 | latex | ✓ | ✓ |  | `texlab` |
 | ld | ✓ |  | ✓ |  |
diff --git a/languages.toml b/languages.toml
index f0d6771fc15af..85d619b8933fa 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3230,6 +3230,18 @@ indent = { tab-width = 2, unit = "  " }
 name = "hocon"
 source = { git = "https://github.com/antosha417/tree-sitter-hocon", rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc" }
 
+[[language]]
+name = "koka"
+scope = "source.koka"
+injection-regex = "koka"
+file-types = ["kk"]
+comment-token = "//"
+indent = { tab-width = 8, unit = "  " }
+
+[[grammar]]
+name = "koka"
+source = { git = "https://github.com/mtoohey31/tree-sitter-koka", rev = "2527e152d4b6a79fd50aebd8d0b4b4336c94a034" }
+
 [[language]]
 name = "tact"
 scope = "source.tact"
diff --git a/runtime/queries/koka/highlights.scm b/runtime/queries/koka/highlights.scm
new file mode 100644
index 0000000000000..fead98384243e
--- /dev/null
+++ b/runtime/queries/koka/highlights.scm
@@ -0,0 +1,272 @@
+; Function calls
+
+(appexpr
+  function: (appexpr
+    (atom
+      (qidentifier
+        [
+          (qvarid) @function
+          (qidop) @function
+          (identifier
+            [(varid) (idop)] @function)
+        ])))
+  ["(" (block) (fnexpr)])
+
+(ntlappexpr
+  function: (ntlappexpr
+    (atom
+      (qidentifier
+        [
+          (qvarid) @function
+          (qidop) @function
+          (identifier
+            [(varid) (idop)] @function)
+        ])))
+  ["(" (block) (fnexpr)])
+
+(appexpr
+  field: (atom
+    (qidentifier
+      [
+        (qvarid) @function
+        (qidop) @function
+        (identifier
+          [(varid) (idop)] @function)
+      ])))
+
+(appexpr
+  (appexpr
+    field: (atom
+      (qidentifier
+        [
+          (qvarid) @variable
+          (qidop) @variable
+          (identifier
+            [(varid) (idop)] @variable)
+        ])))
+  "[")
+
+(ntlappexpr
+  field: (atom
+    (qidentifier
+      [
+        (qvarid) @function
+        (qidop) @function
+        (identifier
+          [(varid) (idop)] @function)
+      ])))
+
+(ntlappexpr
+  (ntlappexpr
+    field: (atom
+      (qidentifier
+        [
+          (qvarid) @variable
+          (qidop) @variable
+          (identifier
+            [(varid) (idop)] @variable)
+        ])))
+  "[")
+
+[
+  "initially"
+  "finally"
+] @function.special
+
+; Function definitions
+
+(puredecl
+  (funid
+    (identifier
+      [(varid) (idop)] @function)))
+
+(fundecl
+  (funid
+    (identifier
+      [(varid) (idop)] @function)))
+
+(operation
+  (identifier
+    [(varid) (idop)] @function))
+
+; Identifiers
+
+(puredecl
+  (binder
+    (identifier
+      [(varid) (idop)] @constant)))
+
+; TODO: Highlight vars differently once helix has an appropriate highlight query
+; for that purpose.
+
+(pparameter
+  (pattern
+    (identifier
+      (varid) @variable.parameter)))
+
+(paramid
+  (identifier
+    (varid) @variable.parameter))
+
+(typedecl
+  "effect"
+  (varid) @type)
+
+(typeid
+  (varid) @type)
+
+(tbinder
+  (varid) @type)
+
+(typecon
+  (varid) @type)
+
+(qvarid
+  (qid) @namespace)
+
+(modulepath (varid) @namespace)
+
+(qconid) @namespace
+
+(qidop) @namespace
+
+(varid) @variable
+
+(conid) @constructor
+
+; Operators
+
+[
+  "!"
+  "~"
+  "="
+  ":="
+  (idop)
+  (op)
+  (qidop)
+] @operator
+
+; Keywords
+
+[
+  "as"
+  "behind"
+  (externtarget)
+  "forall"
+  "handle"
+  "handler"
+  "in"
+  "infix"
+  "infixl"
+  "infixr"
+  "inject"
+  "mask"
+  "other"
+  "pub"
+  "public"
+  "some"
+] @keyword
+
+[
+  "con"
+  "control"
+  "ctl"
+  "fn"
+  "fun"
+  "rawctl"
+  "rcontrol"
+] @keyword.function
+
+"with" @keyword.control
+
+[
+  "elif"
+  "else"
+  "if"
+  "match"
+  "then"
+] @keyword.control.conditional
+
+[
+  "import"
+  "include"
+  "module"
+] @keyword.control.import
+
+[
+  "alias"
+  "effect"
+  "struct"
+  "type"
+  "val"
+  "var"
+] @keyword.storage.type
+
+[
+  "abstract"
+  "co"
+  "extend"
+  "extern"
+  "fbip"
+  "final"
+  "fip"
+  "inline"
+  "linear"
+  "named"
+  "noinline"
+  "open"
+  "override"
+  "raw"
+  "rec"
+  "ref"
+  "reference"
+  "scoped"
+  "tail"
+  "value"
+] @keyword.storage.modifier
+
+"return" @keyword.control.return
+
+; Delimiters
+
+(matchrule "|" @punctuation.delimiter)
+
+[
+  ","
+  "->"
+  "."
+  ":"
+  "::"
+  "<-"
+  ";"
+] @punctuation.delimiter
+
+[
+  "<"
+  ">"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+; Literals
+
+[
+  (string)
+  (char)
+] @string
+
+(escape) @constant.character.escape
+
+(float) @constant.numeric.float
+(int) @constant.numeric.integer
+
+; Comment
+
+[
+  (linecomment)
+  (blockcomment)
+] @comment
diff --git a/runtime/queries/koka/indents.scm b/runtime/queries/koka/indents.scm
new file mode 100644
index 0000000000000..0a47bcbbd2413
--- /dev/null
+++ b/runtime/queries/koka/indents.scm
@@ -0,0 +1,39 @@
+[
+  (appexpr ["[" "("]) ; Applications.
+  (ntlappexpr ["[" "("])
+  (atom ["[" "("]) ; Lists and tuples.
+  (program (moduledecl "{")) ; Braced module declarations.
+  (funbody)
+  (block)
+  (handlerexpr)
+  (opclausex)
+] @indent
+
+[
+  (typedecl
+    [(typeid) (opdecls)]) ; Avoid matching single-operation effects.
+  (externdecl)
+  (matchexpr)
+  (matchrule)
+
+  ; For ifexprs, branches (once they exist) will contain blocks if they're
+  ; indented so we just need to make sure the initial indent happens when we're
+  ; creating them.
+  "then"
+  "else"
+] @indent @extend
+
+(matchrule "->" @indent @extend)
+
+; Handling for error recovery.
+(ERROR "fun") @indent @extend
+(ERROR "match") @indent @extend
+(ERROR "->" @indent.always @extend)
+
+; Don't outdent on function parameter declarations.
+(atom ")" @outdent @extend.prevent-once)
+
+[
+  "]"
+  "}"
+] @outdent @extend.prevent-once
diff --git a/runtime/queries/koka/injections.scm b/runtime/queries/koka/injections.scm
new file mode 100644
index 0000000000000..1d5b8e331fd0e
--- /dev/null
+++ b/runtime/queries/koka/injections.scm
@@ -0,0 +1,2 @@
+([(linecomment) (blockcomment)] @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/koka/locals.scm b/runtime/queries/koka/locals.scm
new file mode 100644
index 0000000000000..f8a83e0cb4ba4
--- /dev/null
+++ b/runtime/queries/koka/locals.scm
@@ -0,0 +1,30 @@
+(modulebody) @local.scope
+
+(block) @local.scope
+
+(pattern
+  (identifier
+    (varid) @local.definition))
+
+(decl
+  (apattern
+    (pattern
+      (identifier
+        (varid) @local.definition))))
+
+(puredecl
+  (funid
+    (identifier
+      (varid) @local.definition)))
+
+(puredecl
+  (binder
+    (identifier
+      (varid) @local.definition)))
+
+(decl
+  (binder
+    (identifier
+      (varid) @local.definition)))
+
+(identifier (varid) @local.reference)

From 58022586a00a23fe20d12a563dbf6e97b3e64df0 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Mon, 18 Mar 2024 21:39:32 +0200
Subject: [PATCH 019/101] Add yaml LSP for docker compose (#9916)

* Add yaml LSP for docker compose

* Change docs
---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 25b22a32748ac..3696804748950 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -31,7 +31,7 @@
 | devicetree | ✓ |  |  |  |
 | dhall | ✓ | ✓ |  | `dhall-lsp-server` |
 | diff | ✓ |  |  |  |
-| docker-compose | ✓ |  | ✓ | `docker-compose-langserver` |
+| docker-compose | ✓ |  | ✓ | `docker-compose-langserver`, `yaml-language-server` |
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | dot | ✓ |  |  | `dot-language-server` |
 | dtd | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 85d619b8933fa..1cf8da374234b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1550,7 +1550,7 @@ source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev =
 name = "docker-compose"
 scope = "source.yaml.docker-compose"
 roots = ["docker-compose.yaml", "docker-compose.yml"]
-language-servers = [ "docker-compose-langserver" ]
+language-servers = [ "docker-compose-langserver", "yaml-language-server" ]
 file-types = [{ glob = "docker-compose.yaml" }, { glob = "docker-compose.yml" }]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }

From 8dc50bded99038492025689dfafef268660d76a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:08:36 +0900
Subject: [PATCH 020/101] build(deps): bump clipboard-win from 5.2.0 to 5.3.0
 (#9922)

Bumps [clipboard-win](https://github.com/DoumanAsh/clipboard-win) from 5.2.0 to 5.3.0.
- [Commits](https://github.com/DoumanAsh/clipboard-win/commits)

---
updated-dependencies:
- dependency-name: clipboard-win
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-view/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a17dec8fdc6f..7cb6a26b160aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297"
+checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee"
 dependencies = [
  "error-code",
 ]
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 335779bc20153..b61ee19ecc632 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -50,7 +50,7 @@ parking_lot = "0.12.1"
 
 
 [target.'cfg(windows)'.dependencies]
-clipboard-win = { version = "5.2", features = ["std"] }
+clipboard-win = { version = "5.3", features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

From 326c078356cd193730c8e73e0da6ceab9c33ffc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:08:43 +0900
Subject: [PATCH 021/101] build(deps): bump thiserror from 1.0.57 to 1.0.58
 (#9923)

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.57 to 1.0.58.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.57...1.0.58)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7cb6a26b160aa..3a71fc26305e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2256,18 +2256,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.57"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.57"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",

From 7ef583bea778edcaab292dd6cab80a72d96236e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:13:28 +0900
Subject: [PATCH 022/101] build(deps): bump gix from 0.58.0 to 0.61.0 (#9924)

Bumps [gix](https://github.com/Byron/gitoxide) from 0.58.0 to 0.61.0.
- [Release notes](https://github.com/Byron/gitoxide/releases)
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Byron/gitoxide/compare/gix-v0.58.0...gix-v0.61.0)

---
updated-dependencies:
- dependency-name: gix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 203 ++++++++++++++++++++++---------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 105 insertions(+), 100 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a71fc26305e7..5675a94ce6a7b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,15 +116,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "btoi"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.12.0"
@@ -415,9 +406,6 @@ name = "faster-hex"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "fastrand"
@@ -467,6 +455,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -531,9 +525,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.58.0"
+version = "0.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31887c304d9a935f3e5494fb5d6a0106c34e965168ec0db9b457424eedd0c741"
+checksum = "e4e0e59a44bf00de058ee98d6ecf3c9ed8f8842c1da642258ae4120d41ded8f7"
 dependencies = [
  "gix-actor",
  "gix-attributes",
@@ -579,23 +573,23 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.30.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a7bb9fad6125c81372987c06469601d37e1a2d421511adb69971b9083517a8a"
+checksum = "45c3a3bde455ad2ee8ba8a195745241ce0b770a8a26faae59fcf409d01b28c46"
 dependencies = [
  "bstr",
- "btoi",
  "gix-date",
+ "gix-utils",
  "itoa",
  "thiserror",
- "winnow",
+ "winnow 0.6.5",
 ]
 
 [[package]]
 name = "gix-attributes"
-version = "0.22.0"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214ee3792e504ee1ce206b36dcafa4f328ca313d1e2ac0b41433d68ef4e14260"
+checksum = "eefb48f42eac136a4a0023f49a54ec31be1c7a9589ed762c45dcb9b953f7ecc8"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -610,27 +604,27 @@ dependencies = [
 
 [[package]]
 name = "gix-bitmap"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b6cd0f246180034ddafac9b00a112f19178135b21eb031b3f79355891f7325"
+checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "003ec6deacf68076a0c157271a127e0bb2c031c1a41f7168cbe5d248d9b85c78"
+checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-command"
-version = "0.3.3"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce1ffc7db3fb50b7dae6ecd937a3527cb725f444614df2ad8988d81806f13f09"
+checksum = "f90009020dc4b3de47beed28e1334706e0a330ddd17f5cfeb097df3b15a54b77"
 dependencies = [
  "bstr",
  "gix-path",
@@ -640,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.24.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82dbd7fb959862e3df2583331f0ad032ac93533e8a52f1b0694bc517f5d292bc"
+checksum = "f7b102311085da4af18823413b5176d7c500fb2272eaf391cfa8635d8bcb12c4"
 dependencies = [
  "bstr",
  "gix-chunk",
@@ -654,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.34.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e62bf2073b6ce3921ffa6d8326f645f30eec5fc4a8e8a4bc0fcb721a2f3f69dc"
+checksum = "62129c75e4b6229fe15fb9838cdc00c655e87105b651e4edd7c183fc5288b5d1"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -670,14 +664,14 @@ dependencies = [
  "smallvec",
  "thiserror",
  "unicode-bom",
- "winnow",
+ "winnow 0.6.5",
 ]
 
 [[package]]
 name = "gix-config-value"
-version = "0.14.4"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e7bfb37a46ed0b8468db37a6d8a0a61d56bdbe4603ae492cb322e5f3958"
+checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804"
 dependencies = [
  "bitflags 2.4.2",
  "bstr",
@@ -688,9 +682,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7f3dfb72bebe3449b5e642be64e3c6ccbe9821c8b8f19f487cf5bfbbf4067e"
+checksum = "180b130a4a41870edfbd36ce4169c7090bca70e195da783dea088dd973daa59c"
 dependencies = [
  "bstr",
  "itoa",
@@ -700,9 +694,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.40.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdcb5e49c4b9729dd1c361040ae5c3cd7c497b2260b18c954f62db3a63e98cf"
+checksum = "78e605593c2ef74980a534ade0909c7dc57cca72baa30cbb67d2dda621f99ac4"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -712,9 +706,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4669218f3ec0cbbf8f16857b32200890f8ca585f36f5817242e4115fe4551af"
+checksum = "64bab49087ed3710caf77e473dc0efc54ca33d8ccc6441359725f121211482b1"
 dependencies = [
  "bstr",
  "dunce",
@@ -728,9 +722,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.38.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "184f7f7d4e45db0e2a362aeaf12c06c5e84817d0ef91d08e8e90170dad9f0b07"
+checksum = "db4254037d20a247a0367aa79333750146a369719f0c6617fec4f5752cc62b37"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -747,9 +741,9 @@ dependencies = [
 
 [[package]]
 name = "gix-filter"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9240862840fb740d209422937195e129e4ed3da49af212383260134bea8f6c1a"
+checksum = "bd71bf3e64d8fb5d5635d4166ca5a36fe56b292ffff06eab1d93ea47fd5beb89"
 dependencies = [
  "bstr",
  "encoding_rs",
@@ -768,9 +762,9 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4436e883d5769f9fb18677b8712b49228357815f9e4104174a6fc2d8461a437b"
+checksum = "634b8a743b0aae03c1a74ee0ea24e8c5136895efac64ce52b3ea106e1c6f0613"
 dependencies = [
  "gix-features",
  "gix-utils",
@@ -778,9 +772,9 @@ dependencies = [
 
 [[package]]
 name = "gix-glob"
-version = "0.16.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4965a1d06d0ab84a29d4a67697a97352ab14ae1da821084e5afb1fd6d8191ca0"
+checksum = "682bdc43cb3c00dbedfcc366de2a849b582efd8d886215dbad2ea662ec156bb5"
 dependencies = [
  "bitflags 2.4.2",
  "bstr",
@@ -790,9 +784,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0ed89cdc1dce26685c80271c4287077901de3c3dd90234d5fa47c22b2268653"
+checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e"
 dependencies = [
  "faster-hex",
  "thiserror",
@@ -800,9 +794,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebe47d8c0887f82355e2e9e16b6cecaa4d5e5346a7a474ca78ff94de1db35a5b"
+checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242"
 dependencies = [
  "gix-hash",
  "hashbrown 0.14.3",
@@ -811,9 +805,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ignore"
-version = "0.11.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7069aaca4a05784c4cb44e392f0eaf627c6e57e05d3100c0e2386a37a682f0"
+checksum = "640dbeb4f5829f9fc14d31f654a34a0350e43a24e32d551ad130d99bf01f63f1"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -824,14 +818,14 @@ dependencies = [
 
 [[package]]
 name = "gix-index"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7152181ba8f0a3addc5075dd612cea31fc3e252b29c8be8c45f4892bf87426"
+checksum = "549621f13d9ccf325a7de45506a3266af0d08f915181c5687abb5e8669bfd2e6"
 dependencies = [
  "bitflags 2.4.2",
  "bstr",
- "btoi",
  "filetime",
+ "fnv",
  "gix-bitmap",
  "gix-features",
  "gix-fs",
@@ -839,6 +833,8 @@ dependencies = [
  "gix-lock",
  "gix-object",
  "gix-traverse",
+ "gix-utils",
+ "hashbrown 0.14.3",
  "itoa",
  "libc",
  "memmap2",
@@ -860,9 +856,9 @@ dependencies = [
 
 [[package]]
 name = "gix-macros"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb"
+checksum = "1dff438f14e67e7713ab9332f5fd18c8f20eb7eb249494f6c2bf170522224032"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -871,28 +867,28 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.41.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693ce9d30741506cb082ef2d8b797415b48e032cce0ab23eff894c19a7e4777b"
+checksum = "3d4f8efae72030df1c4a81d02dbe2348e748d9b9a11e108ed6efbd846326e051"
 dependencies = [
  "bstr",
- "btoi",
  "gix-actor",
  "gix-date",
  "gix-features",
  "gix-hash",
+ "gix-utils",
  "gix-validate",
  "itoa",
  "smallvec",
  "thiserror",
- "winnow",
+ "winnow 0.6.5",
 ]
 
 [[package]]
 name = "gix-odb"
-version = "0.57.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ba2fa9e81f2461b78b4d81a807867667326c84cdab48e0aed7b73a593aa1be4"
+checksum = "81b55378c719693380f66d9dd21ce46721eed2981d8789fc698ec1ada6fa176e"
 dependencies = [
  "arc-swap",
  "gix-date",
@@ -910,9 +906,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.47.0"
+version = "0.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da5f3e78c96b76c4e6fe5e8e06b76221e4a0ee9a255aa935ed1fdf68988dfd8"
+checksum = "6391aeaa030ad64aba346a9f5c69bb1c4e5c6fb4411705b03b40b49d8614ec30"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -942,9 +938,9 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.10.4"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14a6282621aed1becc3f83d64099a564b3b9063f22783d9a87ea502a3e9f2e40"
+checksum = "23623cf0f475691a6d943f898c4d0b89f5c1a2a64d0f92bce0e0322ee6528783"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -955,9 +951,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pathspec"
-version = "0.6.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cbd49750edb26b0a691e5246fc635fa554d344da825cd20fa9ee0da9c1b761f"
+checksum = "1a96ed0e71ce9084a471fddfa74e842576a7cbf02fe8bd50388017ac461aed97"
 dependencies = [
  "bitflags 2.4.2",
  "bstr",
@@ -970,20 +966,20 @@ dependencies = [
 
 [[package]]
 name = "gix-quote"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7dc10303d73a960d10fb82f81188b036ac3e6b11b5795b20b1a60b51d1321f"
+checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff"
 dependencies = [
  "bstr",
- "btoi",
+ "gix-utils",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-ref"
-version = "0.41.0"
+version = "0.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5818958994ad7879fa566f5441ebcc48f0926aa027b28948e6fbf6578894dc31"
+checksum = "fd4aba68b925101cb45d6df328979af0681364579db889098a0de75b36c77b65"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -998,14 +994,14 @@ dependencies = [
  "gix-validate",
  "memmap2",
  "thiserror",
- "winnow",
+ "winnow 0.6.5",
 ]
 
 [[package]]
 name = "gix-refspec"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613aa4d93034c5791d13bdc635e530f4ddab1412ddfb4a8215f76213177b61c7"
+checksum = "dde848865834a54fe4d9b4573f15d0e9a68eaf3d061b42d3ed52b4b8acf880b2"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -1017,9 +1013,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288f6549d7666db74dc3f169a9a333694fc28ecd2f5aa7b2c979c89eb556751a"
+checksum = "9e34196e1969bd5d36e2fbc4467d893999132219d503e23474a8ad2b221cb1e8"
 dependencies = [
  "bstr",
  "gix-date",
@@ -1033,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9b4d91dfc5c14fee61a28c65113ded720403b65a0f46169c0460f731a5d03c"
+checksum = "e0a7d393ae814eeaae41a333c0ff684b243121cc61ccdc5bbe9897094588047d"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1048,9 +1044,9 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.10.4"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8d9bf462feaf05f2121cba7399dbc6c34d88a9cad58fc1e95027791d6a3c6d2"
+checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1"
 dependencies = [
  "bitflags 2.4.2",
  "gix-path",
@@ -1060,9 +1056,9 @@ dependencies = [
 
 [[package]]
 name = "gix-submodule"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73182f6c1f5ed1ed94ba16581ac62593d5e29cd1c028b2af618f836283b8f8d4"
+checksum = "4fb7ea05666362472fecd44c1fc35fe48a5b9b841b431cc4f85b95e6f20c23ec"
 dependencies = [
  "bstr",
  "gix-config",
@@ -1088,15 +1084,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1"
+checksum = "9b838b2db8f62c9447d483a4c28d251b67fee32741a82cb4d35e9eb4e9fdc5ab"
 
 [[package]]
 name = "gix-traverse"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc30c5b5e4e838683b59e1b0574ce6bc1c35916df9709aaab32bb7751daf08b"
+checksum = "95aef84bc777025403a09788b1e4815c06a19332e9e5d87a955e1ed7da9bf0cf"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1110,9 +1106,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.27.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26f1981ecc700f4fd73ae62b9ca2da7c8816c8fd267f0185e3f8c21e967984ac"
+checksum = "8f0b24f3ecc79a5a53539de9c2e99425d0ef23feacdcf3faac983aa9a2f26849"
 dependencies = [
  "bstr",
  "gix-features",
@@ -1124,9 +1120,9 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e839f3d0798b296411263da6bee780a176ef8008a5dfc31287f7eda9266ab8"
+checksum = "0066432d4c277f9877f091279a597ea5331f68ca410efc874f0bdfb1cd348f92"
 dependencies = [
  "fastrand",
  "unicode-normalization",
@@ -1134,9 +1130,9 @@ dependencies = [
 
 [[package]]
 name = "gix-validate"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7cc36f496bd5d96cdca0f9289bb684480725d40db60f48194aa7723b883854"
+checksum = "e39fc6e06044985eac19dd34d474909e517307582e462b2eb4c8fa51b6241545"
 dependencies = [
  "bstr",
  "thiserror",
@@ -1144,9 +1140,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree"
-version = "0.30.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca36bb3dc54038c66507dc75c4d8edbee2d6d5cc45227b4eb508ad13dd60a006"
+checksum = "fe78e03af9eec168eb187e05463a981c57f0a915f64b1788685a776bd2ef969c"
 dependencies = [
  "bstr",
  "gix-attributes",
@@ -2399,7 +2395,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.28",
 ]
 
 [[package]]
@@ -2820,6 +2816,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "xtask"
 version = "23.10.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 874b92d03a622..49b3661e22b32 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -19,7 +19,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
 parking_lot = "0.12"
 arc-swap = { version = "1.7.0" }
 
-gix = { version = "0.58.0", features = ["attributes"], default-features = false, optional = true }
+gix = { version = "0.61.0", features = ["attributes"], default-features = false, optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From ef797acf0d70f4abaf798fe1f6c033dbd3f72509 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:13:35 +0900
Subject: [PATCH 023/101] build(deps): bump anyhow from 1.0.80 to 1.0.81
 (#9925)

Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.80 to 1.0.81.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.80...1.0.81)

---
updated-dependencies:
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5675a94ce6a7b..90bc3d3c0f1b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.80"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arc-swap"

From df8352ec0503f771d79843c957c1a1021ffad658 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:14:09 +0900
Subject: [PATCH 024/101] build(deps): bump tokio-stream from 0.1.14 to 0.1.15
 (#9926)

Bumps [tokio-stream](https://github.com/tokio-rs/tokio) from 0.1.14 to 0.1.15.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-stream-0.1.14...tokio-stream-0.1.15)

---
updated-dependencies:
- dependency-name: tokio-stream
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 4 ++--
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 90bc3d3c0f1b4..075470edc9ee0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2355,9 +2355,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 4284b05209304..88af103889993 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -28,6 +28,6 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.36", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
-tokio-stream = "0.1.14"
+tokio-stream = "0.1.15"
 parking_lot = "0.12.1"
 arc-swap = "1"

From 13533cb99c2a14d9661a3570c346f4cd3ceae777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 19 Mar 2024 14:27:44 +0900
Subject: [PATCH 025/101] ci: Group minor rust dependency dependabot updates

https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5295437815027..286441b664aa5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,6 +7,14 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      tree-sitter:
+        patterns:
+          - "tree-sitter*"
+      rust-dependencies:
+        update-types:
+          - "minor"
+          - "patch"
 
   - package-ecosystem: "github-actions"
     directory: "/"

From 6607938bf82771aff883b45859f614624eadb0d7 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Thu, 29 Feb 2024 23:10:09 +0100
Subject: [PATCH 026/101] Call as_ref only once

---
 helix-stdx/src/env.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-stdx/src/env.rs b/helix-stdx/src/env.rs
index 90a0aee8737d5..59aba0adc2ce5 100644
--- a/helix-stdx/src/env.rs
+++ b/helix-stdx/src/env.rs
@@ -42,8 +42,9 @@ pub fn binary_exists<T: AsRef<OsStr>>(binary_name: T) -> bool {
 pub fn which<T: AsRef<OsStr>>(
     binary_name: T,
 ) -> Result<std::path::PathBuf, ExecutableNotFoundError> {
-    which::which(binary_name.as_ref()).map_err(|err| ExecutableNotFoundError {
-        command: binary_name.as_ref().to_string_lossy().into_owned(),
+    let binary_name = binary_name.as_ref();
+    which::which(binary_name).map_err(|err| ExecutableNotFoundError {
+        command: binary_name.to_string_lossy().into_owned(),
         inner: err,
     })
 }

From 6ed93b6e49df2499cd32cc4e4f6dcfe6d416c907 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Thu, 29 Feb 2024 23:25:44 +0100
Subject: [PATCH 027/101] Optimize fold_home_dir

---
 helix-stdx/src/path.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/helix-stdx/src/path.rs b/helix-stdx/src/path.rs
index 1dc4d0b2448b5..42d7a9b602df4 100644
--- a/helix-stdx/src/path.rs
+++ b/helix-stdx/src/path.rs
@@ -2,6 +2,7 @@ pub use etcetera::home_dir;
 
 use std::{
     borrow::Cow,
+    ffi::OsString,
     path::{Component, Path, PathBuf},
 };
 
@@ -12,7 +13,10 @@ use crate::env::current_working_dir;
 pub fn fold_home_dir(path: &Path) -> PathBuf {
     if let Ok(home) = home_dir() {
         if let Ok(stripped) = path.strip_prefix(&home) {
-            return PathBuf::from("~").join(stripped);
+            let mut path = OsString::with_capacity(2 + stripped.as_os_str().len());
+            path.push("~/");
+            path.push(stripped);
+            return PathBuf::from(path);
         }
     }
 

From e91ec8e880062c1822d08f47dac48dffeab4548f Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Fri, 1 Mar 2024 00:18:12 +0100
Subject: [PATCH 028/101] Optimize getting a relative path

---
 helix-stdx/src/path.rs          | 35 ++++++++++++++++++++-------------
 helix-term/src/ui/statusline.rs |  2 +-
 helix-view/src/document.rs      |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/helix-stdx/src/path.rs b/helix-stdx/src/path.rs
index 42d7a9b602df4..c514f9f271d98 100644
--- a/helix-stdx/src/path.rs
+++ b/helix-stdx/src/path.rs
@@ -10,17 +10,21 @@ use crate::env::current_working_dir;
 
 /// Replaces users home directory from `path` with tilde `~` if the directory
 /// is available, otherwise returns the path unchanged.
-pub fn fold_home_dir(path: &Path) -> PathBuf {
+pub fn fold_home_dir<'a, P>(path: P) -> Cow<'a, Path>
+where
+    P: Into<Cow<'a, Path>>,
+{
+    let path = path.into();
     if let Ok(home) = home_dir() {
         if let Ok(stripped) = path.strip_prefix(&home) {
             let mut path = OsString::with_capacity(2 + stripped.as_os_str().len());
             path.push("~/");
             path.push(stripped);
-            return PathBuf::from(path);
+            return Cow::Owned(PathBuf::from(path));
         }
     }
 
-    path.to_path_buf()
+    path
 }
 
 /// Expands tilde `~` into users home directory if available, otherwise returns the path
@@ -129,18 +133,21 @@ pub fn canonicalize(path: impl AsRef<Path>) -> PathBuf {
     normalize(path)
 }
 
-pub fn get_relative_path(path: impl AsRef<Path>) -> PathBuf {
-    let path = PathBuf::from(path.as_ref());
-    let path = if path.is_absolute() {
+pub fn get_relative_path<'a, P>(path: P) -> Cow<'a, Path>
+where
+    P: Into<Cow<'a, Path>>,
+{
+    let path = path.into();
+    if path.is_absolute() {
         let cwdir = normalize(current_working_dir());
-        normalize(&path)
-            .strip_prefix(cwdir)
-            .map(PathBuf::from)
-            .unwrap_or(path)
-    } else {
-        path
-    };
-    fold_home_dir(&path)
+        if let Ok(stripped) = normalize(&path).strip_prefix(cwdir) {
+            return Cow::Owned(PathBuf::from(stripped));
+        }
+
+        return fold_home_dir(path);
+    }
+
+    path
 }
 
 /// Returns a truncated filepath where the basepart of the path is reduced to the first
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index c3464067f06c3..7437cbd074e58 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -482,7 +482,7 @@ where
         let rel_path = context.doc.relative_path();
         let path = rel_path
             .as_ref()
-            .and_then(|p| p.as_path().file_name().map(|s| s.to_string_lossy()))
+            .and_then(|p| p.file_name().map(|s| s.to_string_lossy()))
             .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
         format!(" {} ", path)
     };
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 4e7b1de9f0cd5..5f3595eeb32a7 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1685,7 +1685,7 @@ impl Document {
         &self.selections
     }
 
-    pub fn relative_path(&self) -> Option<PathBuf> {
+    pub fn relative_path(&self) -> Option<Cow<Path>> {
         self.path
             .as_deref()
             .map(helix_stdx::path::get_relative_path)

From 0f5430ab9eb7049c26ee65e27f14812f91a232d5 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Fri, 1 Mar 2024 00:55:00 +0100
Subject: [PATCH 029/101] Optimize get_truncated_path

---
 helix-stdx/src/path.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/helix-stdx/src/path.rs b/helix-stdx/src/path.rs
index c514f9f271d98..ff2bffae5fa13 100644
--- a/helix-stdx/src/path.rs
+++ b/helix-stdx/src/path.rs
@@ -181,21 +181,20 @@ where
 ///
 pub fn get_truncated_path(path: impl AsRef<Path>) -> PathBuf {
     let cwd = current_working_dir();
-    let path = path
-        .as_ref()
-        .strip_prefix(cwd)
-        .unwrap_or_else(|_| path.as_ref());
+    let path = path.as_ref();
+    let path = path.strip_prefix(cwd).unwrap_or(path);
     let file = path.file_name().unwrap_or_default();
     let base = path.parent().unwrap_or_else(|| Path::new(""));
-    let mut ret = PathBuf::new();
+    let mut ret = PathBuf::with_capacity(file.len());
+    // A char can't be directly pushed to a PathBuf
+    let mut first_char_buffer = String::new();
     for d in base {
-        ret.push(
-            d.to_string_lossy()
-                .chars()
-                .next()
-                .unwrap_or_default()
-                .to_string(),
-        );
+        let Some(first_char) = d.to_string_lossy().chars().next() else {
+            break;
+        };
+        first_char_buffer.push(first_char);
+        ret.push(&first_char_buffer);
+        first_char_buffer.clear();
     }
     ret.push(file);
     ret

From 3d4889ce9a24f485cf0816b69b8e1f579eee0bdd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 15:47:05 +0900
Subject: [PATCH 030/101] build(deps): bump the rust-dependencies group with 3
 updates (#9929)

Bumps the rust-dependencies group with 3 updates: [bitflags](https://github.com/bitflags/bitflags), [toml](https://github.com/toml-rs/toml) and [lsp-types](https://github.com/gluon-lang/lsp-types).


Updates `bitflags` from 2.4.2 to 2.5.0
- [Release notes](https://github.com/bitflags/bitflags/releases)
- [Changelog](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md)
- [Commits](https://github.com/bitflags/bitflags/compare/2.4.2...2.5.0)

Updates `toml` from 0.8.10 to 0.8.12
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.10...toml-v0.8.12)

Updates `lsp-types` from 0.95.0 to 0.95.1
- [Changelog](https://github.com/gluon-lang/lsp-types/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gluon-lang/lsp-types/compare/v0.95.0...v0.95.1)

---
updated-dependencies:
- dependency-name: bitflags
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-dependencies
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: lsp-types
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 57 ++++++++++++++++++-------------------------
 helix-core/Cargo.toml |  2 +-
 helix-tui/Cargo.toml  |  2 +-
 helix-view/Cargo.toml |  2 +-
 4 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 075470edc9ee0..13c1ea3333649 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -101,9 +101,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bstr"
@@ -273,7 +273,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "crossterm_winapi",
  "filedescriptor",
  "futures-core",
@@ -582,7 +582,7 @@ dependencies = [
  "gix-utils",
  "itoa",
  "thiserror",
- "winnow 0.6.5",
+ "winnow",
 ]
 
 [[package]]
@@ -664,7 +664,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "unicode-bom",
- "winnow 0.6.5",
+ "winnow",
 ]
 
 [[package]]
@@ -673,7 +673,7 @@ version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "bstr",
  "gix-path",
  "libc",
@@ -776,7 +776,7 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "682bdc43cb3c00dbedfcc366de2a849b582efd8d886215dbad2ea662ec156bb5"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "bstr",
  "gix-features",
  "gix-path",
@@ -822,7 +822,7 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "549621f13d9ccf325a7de45506a3266af0d08f915181c5687abb5e8669bfd2e6"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "bstr",
  "filetime",
  "fnv",
@@ -881,7 +881,7 @@ dependencies = [
  "itoa",
  "smallvec",
  "thiserror",
- "winnow 0.6.5",
+ "winnow",
 ]
 
 [[package]]
@@ -955,7 +955,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a96ed0e71ce9084a471fddfa74e842576a7cbf02fe8bd50388017ac461aed97"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "bstr",
  "gix-attributes",
  "gix-config-value",
@@ -994,7 +994,7 @@ dependencies = [
  "gix-validate",
  "memmap2",
  "thiserror",
- "winnow 0.6.5",
+ "winnow",
 ]
 
 [[package]]
@@ -1048,7 +1048,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "gix-path",
  "libc",
  "windows-sys 0.52.0",
@@ -1228,7 +1228,7 @@ version = "23.10.0"
 dependencies = [
  "ahash",
  "arc-swap",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "chrono",
  "dunce",
  "encoding_rs",
@@ -1393,7 +1393,7 @@ dependencies = [
 name = "helix-tui"
 version = "23.10.0"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cassowary",
  "crossterm",
  "helix-core",
@@ -1427,7 +1427,7 @@ version = "23.10.0"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "chardetng",
  "clipboard-win",
  "crossterm",
@@ -1640,9 +1640,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "lsp-types"
-version = "0.95.0"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
+checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365"
 dependencies = [
  "bitflags 1.3.2",
  "serde",
@@ -1840,7 +1840,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "memchr",
  "unicase",
 ]
@@ -1985,7 +1985,7 @@ version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2366,9 +2366,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2387,15 +2387,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.4"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
+checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.5.28",
+ "winnow",
 ]
 
 [[package]]
@@ -2807,15 +2807,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
-[[package]]
-name = "winnow"
-version = "0.5.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.5"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 5e2dbd977f759..a992506924b81 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -31,7 +31,7 @@ tree-sitter.workspace = true
 once_cell = "1.19"
 arc-swap = "1"
 regex = "1"
-bitflags = "2.4"
+bitflags = "2.5"
 ahash = "0.8.11"
 hashbrown = { version = "0.14.3", features = ["raw"] }
 dunce = "1.0"
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index f880ca6e34eb9..9b64a45bd574d 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -18,7 +18,7 @@ default = ["crossterm"]
 helix-view = { path = "../helix-view", features = ["term"] }
 helix-core = { path = "../helix-core" }
 
-bitflags = "2.4"
+bitflags = "2.5"
 cassowary = "0.3"
 unicode-segmentation = "1.11"
 crossterm = { version = "0.27", optional = true }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index b61ee19ecc632..6eab0b5e7f96f 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -23,7 +23,7 @@ helix-lsp = { path = "../helix-lsp" }
 helix-dap = { path = "../helix-dap" }
 helix-vcs = { path = "../helix-vcs" }
 
-bitflags = "2.4"
+bitflags = "2.5"
 anyhow = "1"
 crossterm = { version = "0.27", optional = true }
 

From 4d2282cbccff4dd0aaa901a3ea4fb28a2b8120aa Mon Sep 17 00:00:00 2001
From: Khang Nguyen Duy <40488299+iceghost@users.noreply.github.com>
Date: Tue, 19 Mar 2024 18:12:37 +0700
Subject: [PATCH 031/101] Respect undercurl config even with no terminfo
 (#9897)

I have just found out that my recent Windows Terminal version
supported rendering undercurl (see
https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-20-release
). However, looking at the source, terminfo is required for helix to
emit the undercurl control code, which isn't available on Windows AFAIK.

This commit make helix respects the `editor.undercurl` option when
there is no terminfo.

Tested on Windows Terminal Preview 1.20

Signed-off-by: Khang Nguyen <khang.nguyenduycse@hcmut.edu.vn>
---
 helix-tui/src/backend/crossterm.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 88e70f32e6841..37721e8965336 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -52,10 +52,14 @@ impl Default for Capabilities {
 impl Capabilities {
     /// Detect capabilities from the terminfo database located based
     /// on the $TERM environment variable. If detection fails, returns
-    /// a default value where no capability is supported.
+    /// a default value where no capability is supported, or just undercurl
+    /// if config.undercurl is set.
     pub fn from_env_or_default(config: &EditorConfig) -> Self {
         match termini::TermInfo::from_env() {
-            Err(_) => Capabilities::default(),
+            Err(_) => Capabilities {
+                has_extended_underlines: config.undercurl,
+                ..Capabilities::default()
+            },
             Ok(t) => Capabilities {
                 // Smulx, VTE: https://unix.stackexchange.com/a/696253/246284
                 // Su (used by kitty): https://sw.kovidgoyal.net/kitty/underlines

From 6a22d7d1cad8fde27d8ba02629c3d33ab535f7b5 Mon Sep 17 00:00:00 2001
From: Luis Useche <useche@gmail.com>
Date: Tue, 19 Mar 2024 04:16:30 -0700
Subject: [PATCH 032/101] Do not stop reloading docs on error (#9870)

In the `reload-all` command, we should not stop reloading the documents
if one error is found. Instead, we should report the error and continue
trying to reload the current open documents. This is useful in cases
where a backing file does not exist temporarily (e.g. when editing a git
patch in the outstanding chain that doesn't have a file just yet).

This change also remove the error messages in the cases where the
backing is `None`, like in new docs or `tutor`.
---
 helix-term/src/commands/typed.rs |  6 +++++-
 helix-view/src/document.rs       | 12 +++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 384db4ac358eb..2ca3a5617a19d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1318,7 +1318,11 @@ fn reload_all(
         // Ensure that the view is synced with the document's history.
         view.sync_changes(doc);
 
-        doc.reload(view, &cx.editor.diff_providers)?;
+        if let Err(error) = doc.reload(view, &cx.editor.diff_providers) {
+            cx.editor.set_error(format!("{}", error));
+            continue;
+        }
+
         if let Some(path) = doc.path() {
             cx.editor
                 .language_servers
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 5f3595eeb32a7..f813c7424a835 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -993,11 +993,13 @@ impl Document {
         provider_registry: &DiffProviderRegistry,
     ) -> Result<(), Error> {
         let encoding = self.encoding;
-        let path = self
-            .path()
-            .filter(|path| path.exists())
-            .ok_or_else(|| anyhow!("can't find file to reload from {:?}", self.display_name()))?
-            .to_owned();
+        let path = match self.path() {
+            None => return Ok(()),
+            Some(path) => match path.exists() {
+                true => path.to_owned(),
+                false => bail!("can't find file to reload from {:?}", self.display_name()),
+            },
+        };
 
         // Once we have a valid path we check if its readonly status has changed
         self.detect_readonly();

From 0b6dea6dc2f78376890beeb31b591987f7f5249b Mon Sep 17 00:00:00 2001
From: Arthur Deierlein <110528300+c0rydoras@users.noreply.github.com>
Date: Tue, 19 Mar 2024 13:27:46 +0100
Subject: [PATCH 033/101] Enhance support for PKGBUILDS (#9909)

* enhance support for PKGBUILDS

* run cargo xtask docgen
---
 book/src/generated/lang-support.md       |  1 +
 languages.toml                           | 14 +++++++++++++-
 runtime/queries/pkgbuild/highlights.scm  |  1 +
 runtime/queries/pkgbuild/indents.scm     |  1 +
 runtime/queries/pkgbuild/injections.scm  |  1 +
 runtime/queries/pkgbuild/textobjects.scm |  1 +
 6 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/pkgbuild/highlights.scm
 create mode 100644 runtime/queries/pkgbuild/indents.scm
 create mode 100644 runtime/queries/pkgbuild/injections.scm
 create mode 100644 runtime/queries/pkgbuild/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 3696804748950..f7905df7cd14f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -134,6 +134,7 @@
 | perl | ✓ | ✓ | ✓ | `perlnavigator` |
 | php | ✓ | ✓ | ✓ | `intelephense` |
 | php-only | ✓ |  |  |  |
+| pkgbuild | ✓ | ✓ | ✓ | `pkgbuild-language-server`, `bash-language-server` |
 | pkl | ✓ |  | ✓ |  |
 | po | ✓ | ✓ |  |  |
 | pod | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 1cf8da374234b..7c23f1f428f73 100644
--- a/languages.toml
+++ b/languages.toml
@@ -96,6 +96,7 @@ yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
 zls = { command = "zls" }
 blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
 typst-lsp = { command = "typst-lsp" }
+pkgbuild-language-server = { command = "pkgbuild-language-server" }
 
 [language-server.ansible-language-server]
 command = "ansible-language-server"
@@ -906,7 +907,6 @@ file-types = [
   { glob = ".zshrc" },
   { glob = ".zimrc" },
   { glob = "APKBUILD" },
-  { glob = "PKGBUILD" },
   { glob = ".bash_aliases" },
   { glob = ".Renviron" },
   { glob = ".xprofile" },
@@ -3352,3 +3352,15 @@ indent = { tab-width = 4, unit = "\t" }
 [[grammar]]
 name = "supercollider"
 source = { git = "https://github.com/madskjeldgaard/tree-sitter-supercollider", rev = "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095" }
+
+[[language]]
+name = "pkgbuild"
+scope = "source.bash"
+file-types = [{ glob = "PKGBUILD" }]
+grammar = "bash"
+language-servers = [
+  "pkgbuild-language-server",
+  { except-features = [
+    "diagnostics",
+  ], name = "bash-language-server" },
+]
\ No newline at end of file
diff --git a/runtime/queries/pkgbuild/highlights.scm b/runtime/queries/pkgbuild/highlights.scm
new file mode 100644
index 0000000000000..b38e142223457
--- /dev/null
+++ b/runtime/queries/pkgbuild/highlights.scm
@@ -0,0 +1 @@
+; inherits: bash
diff --git a/runtime/queries/pkgbuild/indents.scm b/runtime/queries/pkgbuild/indents.scm
new file mode 100644
index 0000000000000..b38e142223457
--- /dev/null
+++ b/runtime/queries/pkgbuild/indents.scm
@@ -0,0 +1 @@
+; inherits: bash
diff --git a/runtime/queries/pkgbuild/injections.scm b/runtime/queries/pkgbuild/injections.scm
new file mode 100644
index 0000000000000..b38e142223457
--- /dev/null
+++ b/runtime/queries/pkgbuild/injections.scm
@@ -0,0 +1 @@
+; inherits: bash
diff --git a/runtime/queries/pkgbuild/textobjects.scm b/runtime/queries/pkgbuild/textobjects.scm
new file mode 100644
index 0000000000000..b38e142223457
--- /dev/null
+++ b/runtime/queries/pkgbuild/textobjects.scm
@@ -0,0 +1 @@
+; inherits: bash

From 485c5cf0b81ed1f189c5bb06263667449d5684d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Zar=C4=99ba?= <KhazAkar@users.noreply.github.com>
Date: Tue, 19 Mar 2024 13:28:15 +0100
Subject: [PATCH 034/101] Initial Ada language support (after stale) (#9908)

* Adding initial support for ada language, based off #7790 PR from tomekw

* More translation to helix-specific tree-sitter scm labels, add ada gpr switch to ada LSP

* Generate ada in lang-support.md using cargo xtask docgen

* Update tree-sitter definitions according to comments

* Remove .gpr glob from languages.toml

* Fix unit in languages.toml for ada, update locals.scm to helix needs
---
 book/src/generated/lang-support.md  |   1 +
 languages.toml                      |  17 +++
 runtime/queries/ada/folds.scm       |  15 +++
 runtime/queries/ada/highlights.scm  | 176 ++++++++++++++++++++++++++++
 runtime/queries/ada/locals.scm      |  32 +++++
 runtime/queries/ada/textobjects.scm |  21 ++++
 6 files changed, 262 insertions(+)
 create mode 100644 runtime/queries/ada/folds.scm
 create mode 100644 runtime/queries/ada/highlights.scm
 create mode 100644 runtime/queries/ada/locals.scm
 create mode 100644 runtime/queries/ada/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index f7905df7cd14f..3820c39dbca22 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -1,5 +1,6 @@
 | Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
 | --- | --- | --- | --- | --- |
+| ada | ✓ | ✓ |  | `ada_language_server`, `ada_language_server` |
 | agda | ✓ |  |  |  |
 | astro | ✓ |  |  |  |
 | awk | ✓ | ✓ |  | `awk-language-server` |
diff --git a/languages.toml b/languages.toml
index 7c23f1f428f73..ff25e018fbfd1 100644
--- a/languages.toml
+++ b/languages.toml
@@ -6,6 +6,8 @@ use-grammars = { except = [ "hare", "wren", "gemini" ] }
 [language-server]
 
 als = { command = "als" }
+ada-language-server = { command = "ada_language_server" }
+ada-gpr-language-server = {command = "ada_language_server", args = ["--language-gpr"]}
 awk-language-server = { command = "awk-language-server" }
 bash-language-server = { command = "bash-language-server", args = ["start"] }
 bass = { command = "bass", args = ["--lsp"] }
@@ -2367,6 +2369,21 @@ language-servers = [ "jsonnet-language-server" ]
 name = "jsonnet"
 source = { git = "https://github.com/sourcegraph/tree-sitter-jsonnet", rev = "0475a5017ad7dc84845d1d33187f2321abcb261d" }
 
+[[language]]
+name = "ada"
+scope = "source.ada"
+injection-regex = "ada"
+file-types = ["adb", "ads", "gpr"]
+roots = ["alire.toml"]
+comment-token = "--"
+indent = { tab-width = 3, unit = "   " }
+language-servers = ["ada-language-server", "ada-gpr-language-server"]
+
+
+[[grammar]]
+name = "ada"
+source = { git = "https://github.com/briot/tree-sitter-ada", rev = "ba0894efa03beb70780156b91e28c716b7a4764d" }
+
 [[language]]
 name = "astro"
 scope = "source.astro"
diff --git a/runtime/queries/ada/folds.scm b/runtime/queries/ada/folds.scm
new file mode 100644
index 0000000000000..819d92ccdd698
--- /dev/null
+++ b/runtime/queries/ada/folds.scm
@@ -0,0 +1,15 @@
+; Support for folding in Ada
+;;    za     toggles folding a package, subprogram, if statement or loop
+
+[
+   (package_declaration)
+   (generic_package_declaration)
+   (package_body)
+   (subprogram_declaration)
+   (subprogram_body)
+   (block_statement)
+   (if_statement)
+   (loop_statement)
+   (gnatprep_declarative_if_statement)
+   (gnatprep_if_statement)
+] @fold
diff --git a/runtime/queries/ada/highlights.scm b/runtime/queries/ada/highlights.scm
new file mode 100644
index 0000000000000..643fbd66457b1
--- /dev/null
+++ b/runtime/queries/ada/highlights.scm
@@ -0,0 +1,176 @@
+;; highlight queries.
+;; See the syntax at https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries
+;; See also https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#parser-configurations
+;; for a list of recommended @ tags, though not all of them have matching
+;; highlights in neovim.
+
+[
+   "abort"
+   "abs"
+   "abstract"
+   "accept"
+   "access"
+   "all"
+   "array"
+   "at"
+   "begin"
+   "declare"
+   "delay"
+   "delta"
+   "digits"
+   "do"
+   "end"
+   "entry"
+   "exit"
+   "generic"
+   "interface"
+   "is"
+   "limited"
+   "of"
+   "others"
+   "out"
+   "pragma"
+   "private"
+   "range"
+   "synchronized"
+   "tagged"
+   "task"
+   "terminate"
+   "until"
+   "when"
+] @keyword
+[
+   "null"
+] @constant.builtin
+[
+   "aliased"
+   "constant"
+   "renames"
+] @keyword.storage
+[
+   "mod"
+   "new"
+   "protected"
+   "record"
+   "subtype"
+   "type"
+] @type.builtin
+[
+   "with"
+   "use"
+] @keyword.control.import
+[
+   "body"
+   "function"
+   "overriding"
+   "procedure"
+   "package"
+   "separate"
+] @keyword.function
+[
+   "and"
+   "in"
+   "not"
+   "or"
+   "xor"
+] @operator
+[
+   "while"
+   "loop"
+   "for"
+   "parallel"
+   "reverse"
+   "some"
+] @kewyord.control.repeat
+[
+   "return"
+] @keyword.control.return
+[
+   "case"
+   "if"
+   "else"
+   "then"
+   "elsif"
+   "select"
+] @keyword.control.conditional
+[
+   "exception"
+   "raise"
+] @keyword.control.exception
+(comment)         @comment
+(string_literal)  @string
+(character_literal) @string
+(numeric_literal) @constant.numeric
+
+;; Highlight the name of subprograms
+(procedure_specification name: (_) @function.builtin)
+(function_specification name: (_) @function.builtin)
+(package_declaration name: (_) @function.builtin)
+(package_body name: (_) @function.builtin)
+(generic_instantiation name: (_) @function.builtin)
+(entry_declaration . (identifier) @function.builtin)
+
+;; Some keywords should take different categories depending on the context
+(use_clause "use"  @keyword.control.import "type" @keyword.control.import)
+(with_clause "private" @keyword.control.import)
+(with_clause "limited" @keyword.control.import)
+(use_clause (_) @namespace)
+(with_clause (_) @namespace)
+
+(loop_statement "end" @keyword.control.repeat)
+(if_statement "end" @keyword.control.conditional)
+(loop_parameter_specification "in" @keyword.control.repeat)
+(loop_parameter_specification "in" @keyword.control.repeat)
+(iterator_specification ["in" "of"] @keyword.control.repeat)
+(range_attribute_designator "range" @keyword.control.repeat)
+
+(raise_statement "with" @keyword.control.exception)
+
+(gnatprep_declarative_if_statement)  @keyword.directive
+(gnatprep_if_statement)              @keyword.directive
+(gnatprep_identifier)                @keyword.directive
+
+(subprogram_declaration "is" @keyword.function "abstract"  @keyword.function)
+(aspect_specification "with" @keyword.function)
+
+(full_type_declaration "is" @type.builtin)
+(subtype_declaration "is" @type.builtin)
+(record_definition "end" @type.builtin)
+(full_type_declaration (_ "access" @type.builtin))
+(array_type_definition "array" @type.builtin "of" @type.builtin)
+(access_to_object_definition "access" @type.builtin)
+(access_to_object_definition "access" @type.builtin
+   [
+      (general_access_modifier "constant" @type.builtin)
+      (general_access_modifier "all" @type.builtin)
+   ]
+)
+(range_constraint "range" @type.builtin)
+(signed_integer_type_definition "range" @type.builtin)
+(index_subtype_definition "range" @type.builtin)
+(record_type_definition "abstract" @type.builtin)
+(record_type_definition "tagged" @type.builtin)
+(record_type_definition "limited" @type.builtin)
+(record_type_definition (record_definition "null" @type.builtin))
+(private_type_declaration "is" @type.builtin "private" @type.builtin)
+(private_type_declaration "tagged" @type.builtin)
+(private_type_declaration "limited" @type.builtin)
+(task_type_declaration "task" @type.builtin "is" @type.builtin)
+
+;; Gray the body of expression functions
+(expression_function_declaration
+   (function_specification)
+   "is"
+   (_) @attribute
+)
+(subprogram_declaration (aspect_specification) @attribute)
+
+;; Highlight full subprogram specifications
+; (subprogram_body
+;     [
+;        (procedure_specification)
+;        (function_specification)
+;     ] @function.builtin.spec
+; )
+
+
diff --git a/runtime/queries/ada/locals.scm b/runtime/queries/ada/locals.scm
new file mode 100644
index 0000000000000..e532a2f17c151
--- /dev/null
+++ b/runtime/queries/ada/locals.scm
@@ -0,0 +1,32 @@
+;;  Better highlighting by referencing to the definition, for variable references.
+;;  See https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables
+
+(compilation) @local.scope
+(package_declaration) @local.scope
+(package_body) @local.scope
+(subprogram_declaration) @local.scope
+(subprogram_body) @local.scope
+(block_statement) @local.scope
+
+(with_clause (_) @local.definition)
+(procedure_specification name: (_) @local.definition)
+(function_specification name: (_) @local.definition)
+(package_declaration name: (_) @local.definition)
+(package_body name: (_) @local.definition)
+(generic_instantiation . name: (_) @local.definition)
+(component_declaration . (identifier) @local.definition)
+(exception_declaration . (identifier) @local.definition)
+(formal_object_declaration . (identifier) @local.definition)
+(object_declaration . (identifier) @local.definition)
+(parameter_specification . (identifier) @local.definition)
+(full_type_declaration . (identifier) @local.definition)
+(private_type_declaration . (identifier) @local.definition)
+(private_extension_declaration . (identifier) @local.definition)
+(incomplete_type_declaration . (identifier) @local.definition)
+(protected_type_declaration . (identifier) @local.definition)
+(formal_complete_type_declaration . (identifier) @local.definition)
+(formal_incomplete_type_declaration . (identifier) @local.definition)
+(task_type_declaration . (identifier) @local.definition)
+(subtype_declaration . (identifier) @local.definition)
+
+(identifier) @local.reference
diff --git a/runtime/queries/ada/textobjects.scm b/runtime/queries/ada/textobjects.scm
new file mode 100644
index 0000000000000..284b4125652d1
--- /dev/null
+++ b/runtime/queries/ada/textobjects.scm
@@ -0,0 +1,21 @@
+;; Support for high-level text objects selections.
+;; For instance:
+;;    maf     (v)isually select (a) (f)unction or subprogram
+;;    mif     (v)isually select (i)nside a (f)unction or subprogram
+;;    mai     (v)isually select (a) (i)f statement (or loop)
+;;    mii     (v)isually select (i)nside an (i)f statement (or loop)
+;;
+;; For navigations using textobjects, check link below:
+;; https://docs.helix-editor.com/master/usage.html#navigating-using-tree-sitter-textobjects
+;;
+;; For Textobject queries explaination, check out link below:
+;; https://docs.helix-editor.com/master/guides/textobject.html
+
+(subprogram_body) @function.around
+(subprogram_body (non_empty_declarative_part) @function.inside)
+(subprogram_body (handled_sequence_of_statements) @function.inside)
+(function_specification) @function.around
+(procedure_specification) @function.around
+(package_declaration) @function.around
+(generic_package_declaration) @function.around
+(package_body) @function.around

From 5b8bfc547607602a557c6115bb5edb557099f8f2 Mon Sep 17 00:00:00 2001
From: Cyrill Schenkel <cyrill.schenkel@gmail.com>
Date: Tue, 19 Mar 2024 13:30:34 +0100
Subject: [PATCH 035/101] Prevent `shell_keep_pipe` from stopping on nonzero
 exit status code (#9817)

The `shell_impl` and `shell_impl_async` functions no longer return
`success` because it was always `true`. If the command didn't succeed
both functions would return an `Err`.

This was also the reason, why `shell_keep_pipe` didn't work. It relied
upon the value of `success` and aborted in case of an `Err`.
It now removes any selection for which `shell_impl` returns `Err`.

If the command always fails, the selections are preserved and an error
message is displayed in the status bar.
---
 helix-term/src/commands.rs       | 30 +++++++++---------------------
 helix-term/src/commands/typed.rs |  8 ++------
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 133f2d5408a8c..a5e79a53992f0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5436,16 +5436,9 @@ fn shell_keep_pipe(cx: &mut Context) {
 
             for (i, range) in selection.ranges().iter().enumerate() {
                 let fragment = range.slice(text);
-                let (_output, success) = match shell_impl(shell, input, Some(fragment.into())) {
-                    Ok(result) => result,
-                    Err(err) => {
-                        cx.editor.set_error(err.to_string());
-                        return;
-                    }
-                };
-
-                // if the process exits successfully, keep the selection
-                if success {
+                if let Err(err) = shell_impl(shell, input, Some(fragment.into())) {
+                    log::debug!("Shell command failed: {}", err);
+                } else {
                     ranges.push(*range);
                     if i >= old_index && index.is_none() {
                         index = Some(ranges.len() - 1);
@@ -5464,7 +5457,7 @@ fn shell_keep_pipe(cx: &mut Context) {
     );
 }
 
-fn shell_impl(shell: &[String], cmd: &str, input: Option<Rope>) -> anyhow::Result<(Tendril, bool)> {
+fn shell_impl(shell: &[String], cmd: &str, input: Option<Rope>) -> anyhow::Result<Tendril> {
     tokio::task::block_in_place(|| helix_lsp::block_on(shell_impl_async(shell, cmd, input)))
 }
 
@@ -5472,7 +5465,7 @@ async fn shell_impl_async(
     shell: &[String],
     cmd: &str,
     input: Option<Rope>,
-) -> anyhow::Result<(Tendril, bool)> {
+) -> anyhow::Result<Tendril> {
     use std::process::Stdio;
     use tokio::process::Command;
     ensure!(!shell.is_empty(), "No shell set");
@@ -5535,7 +5528,7 @@ async fn shell_impl_async(
     let str = std::str::from_utf8(&output.stdout)
         .map_err(|_| anyhow!("Process did not output valid UTF-8"))?;
     let tendril = Tendril::from(str);
-    Ok((tendril, output.status.success()))
+    Ok(tendril)
 }
 
 fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
@@ -5556,14 +5549,14 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
     let mut shell_output: Option<Tendril> = None;
     let mut offset = 0isize;
     for range in selection.ranges() {
-        let (output, success) = if let Some(output) = shell_output.as_ref() {
-            (output.clone(), true)
+        let output = if let Some(output) = shell_output.as_ref() {
+            output.clone()
         } else {
             let fragment = range.slice(text);
             match shell_impl(shell, cmd, pipe.then(|| fragment.into())) {
                 Ok(result) => {
                     if !pipe {
-                        shell_output = Some(result.0.clone());
+                        shell_output = Some(result.clone());
                     }
                     result
                 }
@@ -5574,11 +5567,6 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
             }
         };
 
-        if !success {
-            cx.editor.set_error("Command failed");
-            return;
-        }
-
         let output_len = output.chars().count();
 
         let (from, to, deleted_len) = match behavior {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 2ca3a5617a19d..593837e22efdb 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2261,7 +2261,7 @@ fn run_shell_command(
     let args = args.join(" ");
 
     let callback = async move {
-        let (output, success) = shell_impl_async(&shell, &args, None).await?;
+        let output = shell_impl_async(&shell, &args, None).await?;
         let call: job::Callback = Callback::EditorCompositor(Box::new(
             move |editor: &mut Editor, compositor: &mut Compositor| {
                 if !output.is_empty() {
@@ -2274,11 +2274,7 @@ fn run_shell_command(
                     ));
                     compositor.replace_or_push("shell", popup);
                 }
-                if success {
-                    editor.set_status("Command succeeded");
-                } else {
-                    editor.set_error("Command failed");
-                }
+                editor.set_status("Command succeeded");
             },
         ));
         Ok(call)

From 4b4947639a4495e6a0ebd0d5ce44ff083e240b7b Mon Sep 17 00:00:00 2001
From: Arthur Deierlein <110528300+c0rydoras@users.noreply.github.com>
Date: Tue, 19 Mar 2024 15:07:44 +0100
Subject: [PATCH 036/101] feat: add suport for helm charts (#9900)

---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 12 +++++++++++-
 runtime/queries/helm/highlights.scm |  1 +
 runtime/queries/helm/injections.scm |  1 +
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/helm/highlights.scm
 create mode 100644 runtime/queries/helm/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 3820c39dbca22..47f8057e006f8 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -74,6 +74,7 @@
 | haskell-persistent | ✓ |  |  |  |
 | hcl | ✓ | ✓ | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
+| helm | ✓ |  |  | `helm_ls` |
 | hocon | ✓ |  | ✓ |  |
 | hoon | ✓ |  |  |  |
 | hosts | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index ff25e018fbfd1..ccd546fa7de7a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -99,6 +99,7 @@ zls = { command = "zls" }
 blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
 typst-lsp = { command = "typst-lsp" }
 pkgbuild-language-server = { command = "pkgbuild-language-server" }
+helm_ls = { command = "helm_ls", args = ["serve"] }
 
 [language-server.ansible-language-server]
 command = "ansible-language-server"
@@ -3380,4 +3381,13 @@ language-servers = [
   { except-features = [
     "diagnostics",
   ], name = "bash-language-server" },
-]
\ No newline at end of file
+]
+
+[[language]]
+name = "helm"
+grammar = "gotmpl"
+scope = "source.helm"
+roots = ["Chart.yaml"]
+comment-token = "#"
+language-servers = ["helm_ls"]
+file-types = [ { glob = "templates/*.yaml" }, { glob = "templates/_helpers.tpl"}, { glob = "templates/NOTES.txt" } ]
\ No newline at end of file
diff --git a/runtime/queries/helm/highlights.scm b/runtime/queries/helm/highlights.scm
new file mode 100644
index 0000000000000..6ffb4b7d467b8
--- /dev/null
+++ b/runtime/queries/helm/highlights.scm
@@ -0,0 +1 @@
+; inherits: gotmpl
diff --git a/runtime/queries/helm/injections.scm b/runtime/queries/helm/injections.scm
new file mode 100644
index 0000000000000..6ffb4b7d467b8
--- /dev/null
+++ b/runtime/queries/helm/injections.scm
@@ -0,0 +1 @@
+; inherits: gotmpl

From 1d1806c85af37bfb2c8e972bd6e07df08fab61dc Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@slint.dev>
Date: Tue, 19 Mar 2024 15:08:50 +0100
Subject: [PATCH 037/101] Ignore more version control systems (#9935)

Ignore `.pijul` and `.jj` as well as `.git`. This makes hx so much more
usable with VCSes other than git!
---
 helix-term/src/lib.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index cdde86ec5903c..8b7919951813d 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -48,10 +48,13 @@ fn true_color() -> bool {
 
 /// Function used for filtering dir entries in the various file pickers.
 fn filter_picker_entry(entry: &DirEntry, root: &Path, dedup_symlinks: bool) -> bool {
-    // We always want to ignore the .git directory, otherwise if
+    // We always want to ignore popular VCS directories, otherwise if
     // `ignore` is turned off, we end up with a lot of noise
     // in our picker.
-    if entry.file_name() == ".git" {
+    if matches!(
+        entry.file_name().to_str(),
+        Some(".git" | ".pijul" | ".jj" | ".hg")
+    ) {
         return false;
     }
 

From d9de809a573e28c425b5da9da8c77340d2a0174e Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Tue, 19 Mar 2024 12:26:32 -0400
Subject: [PATCH 038/101] add register completion (#9936)

---
 helix-term/src/commands/typed.rs | 20 ++++++++++----------
 helix-term/src/ui/mod.rs         | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 593837e22efdb..0dfcdb6e9bee4 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2423,6 +2423,14 @@ fn yank_diagnostic(
         return Ok(());
     }
 
+    let reg = match args.first() {
+        Some(s) => {
+            ensure!(s.chars().count() == 1, format!("Invalid register {s}"));
+            s.chars().next().unwrap()
+        }
+        None => '+',
+    };
+
     let (view, doc) = current_ref!(cx.editor);
     let primary = doc.selection(view.id).primary();
 
@@ -2438,14 +2446,6 @@ fn yank_diagnostic(
         bail!("No diagnostics under primary selection");
     }
 
-    let reg = match args.get(0) {
-        Some(s) => {
-            ensure!(s.chars().count() == 1, format!("Invalid register {s}"));
-            s.chars().next().unwrap()
-        }
-        None => '+',
-    };
-
     cx.editor.registers.write(reg, diag)?;
     cx.editor.set_status(format!(
         "Yanked {n} diagnostic{} to register {reg}",
@@ -3045,7 +3045,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         aliases: &[],
         doc: "Clear given register. If no argument is provided, clear all registers.",
         fun: clear_register,
-        signature: CommandSignature::none(),
+        signature: CommandSignature::all(completers::register),
     },
     TypableCommand {
         name: "redraw",
@@ -3066,7 +3066,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         aliases: &[],
         doc: "Yank diagnostic(s) under primary cursor to register, or clipboard by default",
         fun: yank_diagnostic,
-        signature: CommandSignature::none(),
+        signature: CommandSignature::all(completers::register),
     },
 ];
 
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index a4b148af34426..b5969818cf563 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -509,4 +509,18 @@ pub mod completers {
             files
         }
     }
+
+    pub fn register(editor: &Editor, input: &str) -> Vec<Completion> {
+        let iter = editor
+            .registers
+            .iter_preview()
+            // Exclude special registers that shouldn't be written to
+            .filter(|(ch, _)| !matches!(ch, '%' | '#' | '.'))
+            .map(|(ch, _)| ch.to_string());
+
+        fuzzy_match(input, iter, false)
+            .into_iter()
+            .map(|(name, _)| ((0..), name.into()))
+            .collect()
+    }
 }

From 427dd2f383ab54457ec4e7bbb9cf0d83b9d7908a Mon Sep 17 00:00:00 2001
From: Arthur Deierlein <110528300+c0rydoras@users.noreply.github.com>
Date: Tue, 19 Mar 2024 17:26:50 +0100
Subject: [PATCH 039/101] Add support for ember.js templates (#9902)

* feat: add support for ember .hbs (glimmer) templates

* adjust highlights to helix

* highlight this correctly in block statements

* correctly highlight attributes

* correctly highlight hash_pair

* add newline to highlights.scm

* refactor: use #any-of and #eq instead of #match

* chore: add newline to languages.toml
---
 book/src/generated/lang-support.md     |  1 +
 languages.toml                         | 25 ++++++-
 runtime/queries/glimmer/highlights.scm | 94 ++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/glimmer/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 47f8057e006f8..b74a8cdb7cd5b 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -60,6 +60,7 @@
 | git-ignore | ✓ |  |  |  |
 | git-rebase | ✓ |  |  |  |
 | gleam | ✓ | ✓ |  | `gleam` |
+| glimmer | ✓ |  |  | `ember-language-server` |
 | glsl | ✓ | ✓ | ✓ |  |
 | gn | ✓ |  |  |  |
 | go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
diff --git a/languages.toml b/languages.toml
index ccd546fa7de7a..5ce10bf0ee9ea 100644
--- a/languages.toml
+++ b/languages.toml
@@ -100,6 +100,7 @@ blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
 typst-lsp = { command = "typst-lsp" }
 pkgbuild-language-server = { command = "pkgbuild-language-server" }
 helm_ls = { command = "helm_ls", args = ["serve"] }
+ember-language-server = { command = "ember-language-server", args = ["--stdio"] }
 
 [language-server.ansible-language-server]
 command = "ansible-language-server"
@@ -3390,4 +3391,26 @@ scope = "source.helm"
 roots = ["Chart.yaml"]
 comment-token = "#"
 language-servers = ["helm_ls"]
-file-types = [ { glob = "templates/*.yaml" }, { glob = "templates/_helpers.tpl"}, { glob = "templates/NOTES.txt" } ]
\ No newline at end of file
+file-types = [ { glob = "templates/*.yaml" }, { glob = "templates/_helpers.tpl"}, { glob = "templates/NOTES.txt" } ]
+
+[[language]]
+name = "glimmer"
+scope = "source.glimmer"
+injection-regex = "hbs"
+file-types = [{ glob = "{app,addon}/{components,templates}/*.hbs" }]
+block-comment-tokens = { start = "{{!", end = "}}" }
+roots = ["package.json", "ember-cli-build.js"]
+grammar = "glimmer"
+language-servers = ["ember-language-server"]
+formatter = { command = "prettier", args = ['--parser', 'glimmer'] }
+
+[language.auto-pairs]
+'"' = '"'
+'{' = '}'
+'(' = ')'
+'<' = '>'
+"'" = "'"
+
+[[grammar]]
+name = "glimmer"
+source = { git = "https://github.com/ember-tooling/tree-sitter-glimmer", rev = "5dc6d1040e8ff8978ff3680e818d85447bbc10aa" }
diff --git a/runtime/queries/glimmer/highlights.scm b/runtime/queries/glimmer/highlights.scm
new file mode 100644
index 0000000000000..789722ad0736e
--- /dev/null
+++ b/runtime/queries/glimmer/highlights.scm
@@ -0,0 +1,94 @@
+; === Tag Names ===
+
+; Tags that start with a lower case letter are HTML tags
+; We'll also use this highlighting for named blocks (which start with `:`)
+((tag_name) @tag
+  (#match? @tag "^(:)?[a-z]"))
+; Tags that start with a capital letter are Glimmer components
+((tag_name) @constructor
+  (#match? @constructor "^[A-Z]"))
+
+(attribute_name) @attribute
+
+(string_literal) @string
+(number_literal) @constant.numeric.integer
+(boolean_literal) @constant.builtin.boolean
+
+(concat_statement) @string
+
+; === Block Statements ===
+
+; Highlight the brackets
+(block_statement_start) @punctuation.delimiter
+(block_statement_end) @punctuation.delimiter
+
+; Highlight `if`/`each`/`let`
+(block_statement_start path: (identifier) @keyword.control.conditional)
+(block_statement_end path: (identifier) @keyword.control.conditional)
+((mustache_statement (identifier) @keyword.control.conditional)
+ (#eq? @keyword.control.conditional "else"))
+
+; == Mustache Statements ===
+
+; Hightlight the whole statement, to color brackets and separators
+(mustache_statement) @punctuation.delimiter
+
+; An identifier in a mustache expression is a variable
+((mustache_statement [
+  (path_expression (identifier) @variable)
+  (identifier) @variable
+  ])
+  (#not-any-of? @variable "yield" "outlet" "this" "else"))
+; As are arguments in a block statement
+((block_statement_start argument: [
+  (path_expression (identifier) @variable)
+  (identifier) @variable
+  ])
+ (#not-eq? @variable "this"))
+; As is an identifier in a block param
+(block_params (identifier) @variable)
+; As are helper arguments
+((helper_invocation argument: [
+  (path_expression (identifier) @variable)
+  (identifier) @variable
+  ])
+  (#not-eq? @variable "this"))
+; `this` should be highlighted as a built-in variable
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "this"))
+
+; If the identifier is just "yield" or "outlet", it's a keyword
+((mustache_statement (identifier) @keyword.control.return)
+  (#any-of? @keyword.control.return "yield" "outlet"))
+
+; Helpers are functions
+((helper_invocation helper: [
+  (path_expression (identifier) @function)
+  (identifier) @function
+  ])
+  (#not-any-of? @function "if" "yield"))
+
+((helper_invocation helper: (identifier) @keyword.control.conditional)
+  (#any-of? @keyword.control.conditional "if" "yield"))
+
+(hash_pair key: (identifier) @variable)
+(hash_pair value: (identifier) @variable)
+(hash_pair [
+  (path_expression (identifier) @variable)
+  (identifier) @variable
+  ])
+
+(comment_statement) @comment
+
+(attribute_node "=" @operator)
+
+(block_params "as" @keyword.control)
+(block_params "|" @operator)
+
+[
+  "<"
+  ">"
+  "</"
+  "/>"
+] @punctuation.delimiter
+

From bcf7b26393cd2a32e38c187f69b602be018798f4 Mon Sep 17 00:00:00 2001
From: Szabin <szabin@hamrik.hu>
Date: Tue, 19 Mar 2024 17:31:39 +0100
Subject: [PATCH 040/101] Refactor statusline elements to build `Spans` (#9122)

* Refactor statusline elements to return Spans

* Split render fn to build Spans and blit to Surface
---
 helix-term/src/ui/statusline.rs | 397 +++++++++++++-------------------
 1 file changed, 155 insertions(+), 242 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 7437cbd074e58..79a66cc14085a 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -4,7 +4,6 @@ use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
     graphics::Rect,
-    theme::Style,
     Document, Editor, View,
 };
 
@@ -20,7 +19,6 @@ pub struct RenderContext<'a> {
     pub view: &'a View,
     pub focused: bool,
     pub spinners: &'a ProgressSpinners,
-    pub parts: RenderBuffer<'a>,
 }
 
 impl<'a> RenderContext<'a> {
@@ -37,18 +35,10 @@ impl<'a> RenderContext<'a> {
             view,
             focused,
             spinners,
-            parts: RenderBuffer::default(),
         }
     }
 }
 
-#[derive(Default)]
-pub struct RenderBuffer<'a> {
-    pub left: Spans<'a>,
-    pub center: Spans<'a>,
-    pub right: Spans<'a>,
-}
-
 pub fn render(context: &mut RenderContext, viewport: Rect, surface: &mut Surface) {
     let base_style = if context.focused {
         context.editor.theme.get("ui.statusline")
@@ -58,85 +48,72 @@ pub fn render(context: &mut RenderContext, viewport: Rect, surface: &mut Surface
 
     surface.set_style(viewport.with_height(1), base_style);
 
-    let write_left = |context: &mut RenderContext, text, style| {
-        append(&mut context.parts.left, text, &base_style, style)
-    };
-    let write_center = |context: &mut RenderContext, text, style| {
-        append(&mut context.parts.center, text, &base_style, style)
-    };
-    let write_right = |context: &mut RenderContext, text, style| {
-        append(&mut context.parts.right, text, &base_style, style)
-    };
-
-    // Left side of the status line.
-
-    let config = context.editor.config();
-
-    let element_ids = &config.statusline.left;
-    element_ids
-        .iter()
-        .map(|element_id| get_render_function(*element_id))
-        .for_each(|render| render(context, write_left));
+    let statusline = render_statusline(context, viewport.width as usize);
 
     surface.set_spans(
         viewport.x,
         viewport.y,
-        &context.parts.left,
-        context.parts.left.width() as u16,
+        &statusline,
+        statusline.width() as u16,
     );
+}
 
-    // Right side of the status line.
+pub fn render_statusline<'a>(context: &mut RenderContext, width: usize) -> Spans<'a> {
+    let config = context.editor.config();
 
-    let element_ids = &config.statusline.right;
-    element_ids
+    let element_ids = &config.statusline.left;
+    let mut left = element_ids
         .iter()
         .map(|element_id| get_render_function(*element_id))
-        .for_each(|render| render(context, write_right));
-
-    surface.set_spans(
-        viewport.x
-            + viewport
-                .width
-                .saturating_sub(context.parts.right.width() as u16),
-        viewport.y,
-        &context.parts.right,
-        context.parts.right.width() as u16,
-    );
-
-    // Center of the status line.
+        .flat_map(|render| render(context).0)
+        .collect::<Vec<Span>>();
 
     let element_ids = &config.statusline.center;
-    element_ids
+    let mut center = element_ids
         .iter()
         .map(|element_id| get_render_function(*element_id))
-        .for_each(|render| render(context, write_center));
+        .flat_map(|render| render(context).0)
+        .collect::<Vec<Span>>();
 
-    // Width of the empty space between the left and center area and between the center and right area.
-    let spacing = 1u16;
-
-    let edge_width = context.parts.left.width().max(context.parts.right.width()) as u16;
-    let center_max_width = viewport.width.saturating_sub(2 * edge_width + 2 * spacing);
-    let center_width = center_max_width.min(context.parts.center.width() as u16);
-
-    surface.set_spans(
-        viewport.x + viewport.width / 2 - center_width / 2,
-        viewport.y,
-        &context.parts.center,
-        center_width,
-    );
-}
+    let element_ids = &config.statusline.right;
+    let mut right = element_ids
+        .iter()
+        .map(|element_id| get_render_function(*element_id))
+        .flat_map(|render| render(context).0)
+        .collect::<Vec<Span>>();
+
+    let left_area_width: usize = left.iter().map(|s| s.width()).sum();
+    let center_area_width: usize = center.iter().map(|s| s.width()).sum();
+    let right_area_width: usize = right.iter().map(|s| s.width()).sum();
+
+    let min_spacing_between_areas = 1usize;
+    let sides_space_required = left_area_width + right_area_width + min_spacing_between_areas;
+    let total_space_required = sides_space_required + center_area_width + min_spacing_between_areas;
+
+    let mut statusline: Vec<Span> = vec![];
+
+    if center_area_width > 0 && total_space_required <= width {
+        let center_margin = (width - center_area_width) / 2;
+        statusline.append(&mut left);
+        statusline.push(" ".repeat(center_margin - left_area_width).into());
+        statusline.append(&mut center);
+        statusline.push(" ".repeat(center_margin - right_area_width).into());
+        statusline.append(&mut right);
+    } else if right_area_width > 0 && sides_space_required <= width {
+        let side_areas_width = left_area_width + right_area_width;
+        statusline.append(&mut left);
+        statusline.push(" ".repeat(width - side_areas_width).into());
+        statusline.append(&mut right);
+    } else if left_area_width <= width {
+        statusline.append(&mut left);
+    }
 
-fn append(buffer: &mut Spans, text: String, base_style: &Style, style: Option<Style>) {
-    buffer.0.push(Span::styled(
-        text,
-        style.map_or(*base_style, |s| (*base_style).patch(s)),
-    ));
+    statusline.into()
 }
 
-fn get_render_function<F>(element_id: StatusLineElementID) -> impl Fn(&mut RenderContext, F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn get_render_function<'a>(
+    element_id: StatusLineElementID,
+) -> impl Fn(&RenderContext) -> Spans<'a> {
     match element_id {
         helix_view::editor::StatusLineElement::Mode => render_mode,
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
@@ -166,48 +143,40 @@ where
     }
 }
 
-fn render_mode<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_mode<'a>(context: &RenderContext) -> Spans<'a> {
     let visible = context.focused;
     let config = context.editor.config();
     let modenames = &config.statusline.mode;
-    write(
-        context,
-        format!(
-            " {} ",
-            if visible {
-                match context.editor.mode() {
-                    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.
-                "   "
-            }
-        ),
-        if visible && config.color_modes {
+    let modename = if visible {
+        match context.editor.mode() {
+            Mode::Insert => modenames.insert.clone(),
+            Mode::Select => modenames.select.clone(),
+            Mode::Normal => modenames.normal.clone(),
+        }
+    } else {
+        // If not focused, explicitly leave an empty space.
+        " ".into()
+    };
+    let modename = format!(" {} ", modename);
+    if config.color_modes {
+        Span::styled(
+            modename,
             match context.editor.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
-        },
-    );
+                Mode::Insert => context.editor.theme.get("ui.statusline.insert"),
+                Mode::Select => context.editor.theme.get("ui.statusline.select"),
+                Mode::Normal => context.editor.theme.get("ui.statusline.normal"),
+            },
+        )
+        .into()
+    } else {
+        Span::raw(modename).into()
+    }
 }
 
 // TODO think about handling multiple language servers
-fn render_lsp_spinner<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_lsp_spinner<'a>(context: &RenderContext) -> Spans<'a> {
     let language_server = context.doc.language_servers().next();
-    write(
-        context,
+    Span::raw(
         language_server
             .and_then(|srv| {
                 context
@@ -218,14 +187,11 @@ where
             // Even if there's no spinner; reserve its space to avoid elements frequently shifting.
             .unwrap_or(" ")
             .to_string(),
-        None,
-    );
+    )
+    .into()
 }
 
-fn render_diagnostics<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_diagnostics<'a>(context: &RenderContext) -> Spans<'a> {
     let (warnings, errors) = context
         .doc
         .diagnostics()
@@ -240,29 +206,28 @@ where
             counts
         });
 
+    let mut output = Spans::default();
+
     if warnings > 0 {
-        write(
-            context,
+        output.0.push(Span::styled(
             "●".to_string(),
-            Some(context.editor.theme.get("warning")),
-        );
-        write(context, format!(" {} ", warnings), None);
+            context.editor.theme.get("warning"),
+        ));
+        output.0.push(Span::raw(format!(" {} ", warnings)));
     }
 
     if errors > 0 {
-        write(
-            context,
+        output.0.push(Span::styled(
             "●".to_string(),
-            Some(context.editor.theme.get("error")),
-        );
-        write(context, format!(" {} ", errors), None);
+            context.editor.theme.get("error"),
+        ));
+        output.0.push(Span::raw(format!(" {} ", errors)));
     }
+
+    output
 }
 
-fn render_workspace_diagnostics<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_workspace_diagnostics<'a>(context: &RenderContext) -> Spans<'a> {
     let (warnings, errors) =
         context
             .editor
@@ -278,51 +243,49 @@ where
                 counts
             });
 
+    let mut output = Spans::default();
+
     if warnings > 0 || errors > 0 {
-        write(context, " W ".into(), None);
+        output.0.push(Span::raw(" W "));
     }
 
     if warnings > 0 {
-        write(
-            context,
+        output.0.push(Span::styled(
             "●".to_string(),
-            Some(context.editor.theme.get("warning")),
-        );
-        write(context, format!(" {} ", warnings), None);
+            context.editor.theme.get("warning"),
+        ));
+        output.0.push(Span::raw(format!(" {} ", warnings)));
     }
 
     if errors > 0 {
-        write(
-            context,
+        output.0.push(Span::styled(
             "●".to_string(),
-            Some(context.editor.theme.get("error")),
-        );
-        write(context, format!(" {} ", errors), None);
+            context.editor.theme.get("error"),
+        ));
+        output.0.push(Span::raw(format!(" {} ", errors)));
     }
+
+    output
 }
 
-fn render_selections<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_selections<'a>(context: &RenderContext) -> Spans<'a> {
     let count = context.doc.selection(context.view.id).len();
-    write(
-        context,
-        format!(" {} sel{} ", count, if count == 1 { "" } else { "s" }),
-        None,
-    );
+    Span::raw(format!(
+        " {} sel{} ",
+        count,
+        if count == 1 { "" } else { "s" }
+    ))
+    .into()
 }
 
-fn render_primary_selection_length<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_primary_selection_length<'a>(context: &RenderContext) -> Spans<'a> {
     let tot_sel = context.doc.selection(context.view.id).primary().len();
-    write(
-        context,
-        format!(" {} char{} ", tot_sel, if tot_sel == 1 { "" } else { "s" }),
-        None,
-    );
+    Span::raw(format!(
+        " {} char{} ",
+        tot_sel,
+        if tot_sel == 1 { "" } else { "s" }
+    ))
+    .into()
 }
 
 fn get_position(context: &RenderContext) -> Position {
@@ -336,55 +299,33 @@ fn get_position(context: &RenderContext) -> Position {
     )
 }
 
-fn render_position<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_position<'a>(context: &RenderContext) -> Spans<'a> {
     let position = get_position(context);
-    write(
-        context,
-        format!(" {}:{} ", position.row + 1, position.col + 1),
-        None,
-    );
+    Span::raw(format!(" {}:{} ", position.row + 1, position.col + 1)).into()
 }
 
-fn render_total_line_numbers<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_total_line_numbers<'a>(context: &RenderContext) -> Spans<'a> {
     let total_line_numbers = context.doc.text().len_lines();
-
-    write(context, format!(" {} ", total_line_numbers), None);
+    Span::raw(format!(" {} ", total_line_numbers)).into()
 }
 
-fn render_position_percentage<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_position_percentage<'a>(context: &RenderContext) -> Spans<'a> {
     let position = get_position(context);
     let maxrows = context.doc.text().len_lines();
-    write(
-        context,
-        format!("{}%", (position.row + 1) * 100 / maxrows),
-        None,
-    );
+    Span::raw(format!("{}%", (position.row + 1) * 100 / maxrows)).into()
 }
 
-fn render_file_encoding<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_file_encoding<'a>(context: &RenderContext) -> Spans<'a> {
     let enc = context.doc.encoding();
 
     if enc != encoding::UTF_8 {
-        write(context, format!(" {} ", enc.name()), None);
+        Span::raw(format!(" {} ", enc.name())).into()
+    } else {
+        Spans::default()
     }
 }
 
-fn render_file_line_ending<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_file_line_ending<'a>(context: &RenderContext) -> Spans<'a> {
     use helix_core::LineEnding::*;
     let line_ending = match context.doc.line_ending {
         Crlf => "CRLF",
@@ -403,22 +344,16 @@ where
         PS => "PS", // U+2029 -- ParagraphSeparator
     };
 
-    write(context, format!(" {} ", line_ending), None);
+    Span::raw(format!(" {} ", line_ending)).into()
 }
 
-fn render_file_type<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_file_type<'a>(context: &RenderContext) -> Spans<'a> {
     let file_type = context.doc.language_name().unwrap_or(DEFAULT_LANGUAGE_NAME);
 
-    write(context, format!(" {} ", file_type), None);
+    Span::raw(format!(" {} ", file_type)).into()
 }
 
-fn render_file_name<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_file_name<'a>(context: &RenderContext) -> Spans<'a> {
     let title = {
         let rel_path = context.doc.relative_path();
         let path = rel_path
@@ -428,13 +363,10 @@ where
         format!(" {} ", path)
     };
 
-    write(context, title, None);
+    Span::raw(title).into()
 }
 
-fn render_file_absolute_path<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_file_absolute_path<'a>(context: &RenderContext) -> Spans<'a> {
     let title = {
         let path = context.doc.path();
         let path = path
@@ -444,13 +376,10 @@ where
         format!(" {} ", path)
     };
 
-    write(context, title, None);
+    Span::raw(title).into()
 }
 
-fn render_file_modification_indicator<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_file_modification_indicator<'a>(context: &RenderContext) -> Spans<'a> {
     let title = (if context.doc.is_modified() {
         "[+]"
     } else {
@@ -458,26 +387,20 @@ where
     })
     .to_string();
 
-    write(context, title, None);
+    Span::raw(title).into()
 }
 
-fn render_read_only_indicator<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_read_only_indicator<'a>(context: &RenderContext) -> Spans<'a> {
     let title = if context.doc.readonly {
         " [readonly] "
     } else {
         ""
     }
     .to_string();
-    write(context, title, None);
+    Span::raw(title).into()
 }
 
-fn render_file_base_name<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_file_base_name<'a>(context: &RenderContext) -> Spans<'a> {
     let title = {
         let rel_path = context.doc.relative_path();
         let path = rel_path
@@ -487,47 +410,37 @@ where
         format!(" {} ", path)
     };
 
-    write(context, title, None);
+    Span::raw(title).into()
 }
 
-fn render_separator<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_separator<'a>(context: &RenderContext) -> Spans<'a> {
     let sep = &context.editor.config().statusline.separator;
 
-    write(
-        context,
+    Span::styled(
         sep.to_string(),
-        Some(context.editor.theme.get("ui.statusline.separator")),
-    );
+        context.editor.theme.get("ui.statusline.separator"),
+    )
+    .into()
 }
 
-fn render_spacer<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
-    write(context, String::from(" "), None);
+fn render_spacer<'a>(_context: &RenderContext) -> Spans<'a> {
+    Span::raw(" ").into()
 }
 
-fn render_version_control<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_version_control<'a>(context: &RenderContext) -> Spans<'a> {
     let head = context
         .doc
         .version_control_head()
         .unwrap_or_default()
         .to_string();
 
-    write(context, head, None);
+    Span::raw(head).into()
 }
 
-fn render_register<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
+fn render_register<'a>(context: &RenderContext) -> Spans<'a> {
     if let Some(reg) = context.editor.selected_register {
-        write(context, format!(" reg={} ", reg), None)
+        Span::raw(format!(" reg={} ", reg)).into()
+    } else {
+        Spans::default()
     }
 }

From b8e79c0ef52e71136712959af426f318d674fc96 Mon Sep 17 00:00:00 2001
From: Hendrik Norkowski <hnorkowski@mail.de>
Date: Wed, 20 Mar 2024 13:09:45 +0100
Subject: [PATCH 041/101] fix(languages): specify correct comment-token for
 PKGBUILD files (#9943)

---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index 5ce10bf0ee9ea..9b0a161263738 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3376,6 +3376,7 @@ source = { git = "https://github.com/madskjeldgaard/tree-sitter-supercollider",
 name = "pkgbuild"
 scope = "source.bash"
 file-types = [{ glob = "PKGBUILD" }]
+comment-token = "#"
 grammar = "bash"
 language-servers = [
   "pkgbuild-language-server",

From 52a0734120772f4dc2e523f50b6533466849fbeb Mon Sep 17 00:00:00 2001
From: David Else <12832280+David-Else@users.noreply.github.com>
Date: Wed, 20 Mar 2024 23:31:48 +0000
Subject: [PATCH 042/101] Add new theme keys for LSP diagnostic tags for
 dark_plus (#9949)

---
 runtime/themes/dark_plus.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index c94bd587f52c0..819cd62aa1444 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -98,6 +98,8 @@
 
 "diagnostic.error".underline = { color = "red", style = "curl" }
 "diagnostic".underline = { color = "gold", style = "curl" }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 white = "#ffffff"

From 7f5fd63835d2d539c8ef3f8cfd40beebe9ed51ae Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 20 Mar 2024 20:16:58 -0400
Subject: [PATCH 043/101] Evenly space statusline areas when there isn't space
 to align middle (#9950)

The refactor in bcf7b263 introduced a possible subtraction with overflow
when the statusline is layed out so that the left or right sides are
larger than the padding it would take to align the center area to the
middle.

When the left or right areas are too large, we can evenly space the
elements rather than trying to align the center area to the middle.
This prevents possible underflows and makes sense visually - it's
still easy to tell the areas apart at a glance.
---
 helix-term/src/ui/statusline.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 79a66cc14085a..2939a257328a4 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -93,11 +93,26 @@ pub fn render_statusline<'a>(context: &mut RenderContext, width: usize) -> Spans
     let mut statusline: Vec<Span> = vec![];
 
     if center_area_width > 0 && total_space_required <= width {
+        // SAFETY: this subtraction cannot underflow because `left_area_width + center_area_width + right_area_width`
+        // is smaller than `total_space_required`, which is smaller than `width` in this branch.
+        let total_spacers = width - (left_area_width + center_area_width + right_area_width);
+        // This is how much padding space it would take on either side to align the center area to the middle.
         let center_margin = (width - center_area_width) / 2;
+        let left_spacers = if left_area_width < center_margin && right_area_width < center_margin {
+            // Align the center area to the middle if there is enough space on both sides.
+            center_margin - left_area_width
+        } else {
+            // Otherwise split the available space evenly and use it as margin.
+            // The center element won't be aligned to the middle but it will be evenly
+            // spaced between the left and right areas.
+            total_spacers / 2
+        };
+        let right_spacers = total_spacers - left_spacers;
+
         statusline.append(&mut left);
-        statusline.push(" ".repeat(center_margin - left_area_width).into());
+        statusline.push(" ".repeat(left_spacers).into());
         statusline.append(&mut center);
-        statusline.push(" ".repeat(center_margin - right_area_width).into());
+        statusline.push(" ".repeat(right_spacers).into());
         statusline.append(&mut right);
     } else if right_area_width > 0 && sides_space_required <= width {
         let side_areas_width = left_area_width + right_area_width;

From 5ba36fe9b39734ff6222aae6722398004884e998 Mon Sep 17 00:00:00 2001
From: Jordan Reger <mail@jordanreger.com>
Date: Wed, 20 Mar 2024 23:35:34 -0400
Subject: [PATCH 044/101] Update rasmus.toml (#9939)

* Update rasmus.toml

Remove "ui.virtual" setting as it selects seemingly random characters to highlight.

* Add ui.virtual.ruler
---
 runtime/themes/rasmus.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/rasmus.toml b/runtime/themes/rasmus.toml
index bcfb0c66cfe6e..a0b7e74d41187 100644
--- a/runtime/themes/rasmus.toml
+++ b/runtime/themes/rasmus.toml
@@ -84,6 +84,7 @@
 "ui.text.focus" = { fg = "white" }
 
 "ui.virtual" = { fg = "gray03" }
+"ui.virtual.ruler" = { bg = "gray03" }
 "ui.virtual.indent-guide" = { fg = "gray04" }
 "ui.virtual.inlay-hint" = { fg = "gray05" }
 

From 51739f1290b9007febc68706727189a085265017 Mon Sep 17 00:00:00 2001
From: JR <jerabaul29@users.noreply.github.com>
Date: Thu, 21 Mar 2024 14:37:08 +0100
Subject: [PATCH 045/101] Create a tutor entry for using splits (#9417)

* WIP

* WIP

* WIP

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* WIP

* WIP

* WIP

* Fix typos

* Fix typos

* Minor updates

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Remove mention of arrows in split tutorial

* Do not mention starting in normal mode

* Fix right drift of titles

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Update runtime/tutor

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>

* Reflow paragraphs

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Update runtime/tutor

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

---------

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 runtime/tutor | 188 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 182 insertions(+), 6 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 5892be85fcf44..f2535dd92ac14 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -1209,7 +1209,7 @@ move to ], and press mm to jump to [ .
 
 
 =================================================================
-=                   12.2 USING MATCH MODE SELECT INSIDE         =
+=              12.2 USING MATCH MODE SELECT INSIDE              =
 =================================================================
 
 Match mode also lets you select the "inside" content between a
@@ -1231,7 +1231,7 @@ surrounding matching pair). This also works with "" and similar
 --> try ( with nested [ pairs of ( parenthesis) and "brackets" ])
 
 =================================================================
-=                   12.3 USING MATCH MODE SELECT AROUND         =
+=               12.3 USING MATCH MODE SELECT AROUND             =
 =================================================================
 
 You can also select the "around" content, i.e. both the inside
@@ -1253,7 +1253,7 @@ This naturally works with other delimiters too:
 
 
 =================================================================
-=                   12.4 USING MATCH MODE SURROUND              =
+=                12.4 USING MATCH MODE SURROUND                 =
 =================================================================
 
 The match mode can also be used to add surrounding around the
@@ -1275,7 +1275,7 @@ with adding a surrounding pair of "", or {}, or [].
 
 
 =================================================================
-=                   12.5 USING MATCH MODE DELETE SURROUND       =
+=              12.5 USING MATCH MODE DELETE SURROUND            =
 =================================================================
 
 You can delete surrounding pair of delimiters with the md
@@ -1297,7 +1297,7 @@ Trying to delete unexisting surrounding delimiters print an error
 at the bottom bar and does nothing.
 
 =================================================================
-=                   12.6 USING MATCH MODE REPLACE SURROUND      =
+=             12.6 USING MATCH MODE REPLACE SURROUND            =
 =================================================================
 
 You can replace surrounding pairs of delimiters with the mr
@@ -1319,7 +1319,7 @@ an error warning at the bottom bar and do nothing.
 
 
 =================================================================
-=                     CHAPTER 12 RECAP                       =
+=                       CHAPTER 12 RECAP                        =
 =================================================================
 
 You can enter the match mode with the m key; this will show the
@@ -1340,6 +1340,182 @@ actions available in a popup. This will allow you to:
 
 
 
+=================================================================
+=                CHAPTER 13.1 CREATE NEW SPLIT                  =
+=================================================================
+
+In Normal mode, press Ctrl-w to open the Window menu, which displays
+a list of available commands.
+
+To open a new empty buffer in a vertical split on the right half
+of your current window, use Ctrl-w nv (i.e., press Ctrl
+and w simultaneously, then press n, followed by v). Your current
+window will now split in 2 vertically. A new empty buffer split
+will appear on the right half and your cursor will jump to the
+new vertical split.
+
+To create a new empty buffer in a horizontal split, press
+Ctrl-w ns. This action divides your current window into two
+horizontally, creates a new buffer, and moves your cursor to the
+new horizontal split.
+
+
+
+
+=================================================================
+=                CHAPTER 13.2 MOVE BETWEEN SPLITS               =
+=================================================================
+
+Use Ctrl-w k to move to the split above your current split. Use
+Ctrl-w j to move to the split below. Use Ctrl-w h to move to
+the split on the left and Ctrl-w l to move to the split on the
+right. To navigate to the next split (in the order they were
+opened), press Ctrl-w w.
+
+You can now do whatever you want in your new buffers and splits.
+Once you are done with using your new buffer split,
+you can close it with Ctrl-w q . Move to the bottom right split
+with Ctrl-w l then Ctrl-w j, then press Ctrl-w q to close this
+specific split.
+
+You can also close all splits except the current one with Ctrl-w o .
+Open a third vertical split with Ctrl-w nv , then move to the
+leftmost split with Ctrl-w h twice, then from inside the split on
+the left press Ctrl-w o to close all except this split.
+
+
+=================================================================
+=               CHAPTER 13.3 SPLIT CURRENT BUFFER               =
+=================================================================
+
+Use Ctrl-w s to split the view of the current buffer horizontally
+and Ctrl-w v to split it vertically with the buffer opened in both
+splits.
+
+Close extra splits with Ctrl-w o to return to a single window view.
+
+
+
+
+
+
+
+
+
+
+
+
+
+=================================================================
+=               CHAPTER 13.4 USE COMMANDS TO SPLIT              =
+=================================================================
+
+The :vsplit (or :vs for short) and :hsplit (or :hs) commands can
+also be used to split a specific buffer vertically or horizontally.
+For example, enter the command:
+
+:vs something
+
+to open a new vertical split named "something" to the right. Here,
+"something" is not an existing file, so a new buffer with this name
+will open; however, you can replace "something" with any file name
+to open it in a new buffer. Similarly, you can enter the command:
+
+:hs some_more
+
+to open a new buffer named "some_more" in the lower half.
+"some_more" could be any file or path to open this specific file
+or path instead of a new empty buffer.
+
+
+=================================================================
+=                  CHAPTER 13.5 SWAPPING SPLITS                 =
+=================================================================
+
+Open a split on the left with :vs hello1 and then a split below
+with :hs hello2.
+
+From hello2, press Ctrl-w K to swap it with the split above. Now
+hello2 is at the top while hello1 is at the bottom.
+
+Still from hello2, press Ctrl-w H to swap with the split on the
+left: now hello2 is on the left and the tutor is on the top
+right. After Ctrl-w you can use HJKL to split with the buffer
+on the left / below / above / on the right.
+
+Move back to the tutor split, and press Ctrl-w o to only keep
+this split.
+
+
+
+
+
+=================================================================
+=                CHAPTER 13.6 TRANSPOSE SPLITS                  =
+=================================================================
+
+Open a split on the left with :vs hello1 and then a split below
+with :vs hello2.
+
+Move to the tutor split, then press Ctrl-w t to transpose the
+vertical split opened from this window: now, hello1 and
+hello2 are below, rather than to the right of, the tutor. Press
+Ctrl-w t again to transpose back.
+
+Move to the hello1 split, then press Ctrl-w t to transpose the
+horizontal split that was opened from this window: now hello2
+is on the right, rather than below, hello1. Press Ctrl-w t to
+transpose back.
+
+Move back to the tutor split and press Ctrl-w o to close all but
+the tutor window.
+
+
+
+=================================================================
+=             CHAPTER 13.7 OPEN SPLIT FROM FILEPICKER           =
+=================================================================
+
+Splits can also be opened directly from the file picker. Press
+space f to open the file picker. From there, you can type in text
+to perform file lookup with fuzzy matching, and use the arrows
+up and down to move the selected file (indicated by the > symbol).
+If you want to exit the file picker, press Escape.
+
+Select any file you like in the file picker. You could open it in
+the current view by pressing enter (do not do this at present).
+But you can also open it in a new split. Press Ctrl-v to open
+the selected file in a new vertical split. Press space f again,
+select any file you want, and press Ctrl-s to open it in a
+horizontal split.
+
+Move back to the tutor split, and press Ctrl-w o to close all
+splits except this one.
+
+
+
+=================================================================
+=                        CHAPTER 13 RECAP                       =
+=================================================================
+
+Splits can be used to display either the same buffer several times
+or several buffers. To access the main windows and splits commands,
+press Ctrl-w . You can move between splits with Ctrl-w hjkl ,
+you can close a split with Ctrl-w q , and you can close all but
+the present split with Ctrl-w o .
+
+Splits can also be opened by using the :vs FILENAME and
+:hs FILENAME commands.
+
+Splits can also be used directly from the file pickers, by using
+Ctrl-v to open the file selected in a new vertical split, and
+Ctrl-s in a horizontal split.
+
+
+
+
+
+
 =================================================================
  This tutorial is still a work-in-progress.
  More sections are planned.

From 961025433d8707c49d912bd22e7e1615574baec2 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 21 Mar 2024 10:13:38 -0400
Subject: [PATCH 046/101] Update tree-sitter-git-commit

This commit has partial support for escapes within strings.
---
 languages.toml                            | 2 +-
 runtime/queries/git-config/highlights.scm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 9b0a161263738..970c943f90e43 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1617,7 +1617,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
 name = "git-config"
-source = { git = "https://github.com/the-mikedavis/tree-sitter-git-config", rev = "0e4f0baf90b57e5aeb62dcdbf03062c6315d43ea" }
+source = { git = "https://github.com/the-mikedavis/tree-sitter-git-config", rev = "9c2a1b7894e6d9eedfe99805b829b4ecd871375e" }
 
 [[language]]
 name = "git-attributes"
diff --git a/runtime/queries/git-config/highlights.scm b/runtime/queries/git-config/highlights.scm
index 84767edc63396..456639ce33cad 100644
--- a/runtime/queries/git-config/highlights.scm
+++ b/runtime/queries/git-config/highlights.scm
@@ -19,9 +19,10 @@
 [
   "["
   "]"
-  "\""
 ] @punctuation.bracket
 
-"=" @punctuation.delimiter
+["=" "\\"] @punctuation.delimiter
+
+(escape_sequence) @constant.character.escape
 
 (comment) @comment

From 459eb9a4c12a4c650c551a4fe2746b3187fefadd Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 5 May 2023 15:34:17 -0500
Subject: [PATCH 047/101] Recognize 'mmd' as mermaid

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 970c943f90e43..608ec8a0aa929 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2668,7 +2668,7 @@ source = { git = "https://github.com/yuja/tree-sitter-qmljs", rev = "0b2b25bcaa7
 name = "mermaid"
 scope = "source.mermaid"
 injection-regex = "mermaid"
-file-types = ["mermaid"]
+file-types = ["mermaid", "mmd"]
 comment-token = "%%"
 indent = { tab-width = 4, unit = "    " }
 

From fdcd461e65aebc8432e4fbfd51b10856fcb65605 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 14 Apr 2023 11:41:20 -0500
Subject: [PATCH 048/101] Update tree-sitter-erlang and highlights

A few changes:

* 0-arity type specs like the following previously would not have the
  expected 'variable.parameter' highlighting for the return type:

    -spec foo() -> Value when Value :: term().

* Highlight module, type and function docs as documentation comments
  and inject markdown into them.

* Replace `#match?` predicates with `#any-of?` where possible.

* Remove custom auto-pairs. Now that Erlang uses markdown for
  documentation, the asciidoc-style backtick-singlequote pair is no
  longer useful.
---
 languages.toml                        | 10 +---------
 runtime/queries/erlang/highlights.scm | 16 ++++++++++++----
 runtime/queries/erlang/injections.scm | 10 ++++++++++
 runtime/queries/erlang/locals.scm     |  2 +-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/languages.toml b/languages.toml
index 608ec8a0aa929..3e4084bf43c1f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1711,17 +1711,9 @@ comment-token = "%%"
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "erlang-ls" ]
 
-[language.auto-pairs]
-'(' = ')'
-'{' = '}'
-'[' = ']'
-'"' = '"'
-"'" = "'"
-'`' = "'"
-
 [[grammar]]
 name = "erlang"
-source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "731e50555a51f0d8635992b0e60dc98cc47a58d7" }
+source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "9d4b36a76d5519e3dbf1ec4f4b61bb1a293f584c" }
 
 [[language]]
 name = "kotlin"
diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 6d0ec36d7c944..f09f6104220ed 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -3,7 +3,7 @@
 (attribute
   name: (atom) @keyword
   (arguments (atom) @namespace)
- (#match? @keyword "(module|behaviou?r)"))
+ (#any-of? @keyword "module" "behaviour" "behavior"))
 
 (attribute
   name: (atom) @keyword
@@ -50,12 +50,20 @@
   name: (atom) @keyword
   (arguments
     (_) @keyword.directive)
- (#match? @keyword "ifn?def"))
+ (#any-of? @keyword "ifndef" "ifdef"))
 
 (attribute
   name: (atom) @keyword
   module: (atom) @namespace
- (#match? @keyword "(spec|callback)"))
+ (#any-of? @keyword "spec" "callback"))
+
+(attribute
+  name: (atom) @keyword
+  (arguments [
+    (string)
+    (sigil)
+  ] @comment.block.documentation)
+ (#any-of? @keyword "doc" "moduledoc"))
 
 ; Functions
 (function_clause name: (atom) @function)
@@ -84,7 +92,7 @@
 ((attribute
    name: (atom) @keyword
    (stab_clause
-     pattern: (arguments (variable) @variable.parameter)
+     pattern: (arguments (variable)? @variable.parameter)
      body: (variable)? @variable.parameter))
  (#match? @keyword "(spec|callback)"))
 ; functions
diff --git a/runtime/queries/erlang/injections.scm b/runtime/queries/erlang/injections.scm
index 11cbd01e3c0bb..798882f538a9d 100644
--- a/runtime/queries/erlang/injections.scm
+++ b/runtime/queries/erlang/injections.scm
@@ -5,3 +5,13 @@
 
 ((comment (comment_content) @injection.content)
  (#set! injection.language "comment"))
+
+; EEP-59 doc attributes use markdown by default.
+(attribute
+  name: (atom) @_attribute
+  (arguments [
+    (string (quoted_content) @injection.content)
+    (sigil (quoted_content) @injection.content)
+  ])
+ (#set! injection.language "markdown")
+ (#any-of? @_attribute "doc" "moduledoc"))
diff --git a/runtime/queries/erlang/locals.scm b/runtime/queries/erlang/locals.scm
index 7379926b07e07..156e403817d4d 100644
--- a/runtime/queries/erlang/locals.scm
+++ b/runtime/queries/erlang/locals.scm
@@ -1,7 +1,7 @@
 ; Specs and Callbacks
 (attribute
   (stab_clause
-    pattern: (arguments (variable) @local.definition)
+    pattern: (arguments (variable)? @local.definition)
     ; If a spec uses a variable as the return type (and later a `when` clause to type it):
     body: (variable)? @local.definition)) @local.scope
 

From 9ceeea5a83270284b42813a128962ca5102b07f6 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 5 Jun 2023 08:40:48 -0500
Subject: [PATCH 049/101] Update tree-sitter-gleam and highlights

This contains a few syntax fixes. The highlights have been updated as
well for reserved identifiers and escape sequences
---
 languages.toml                       | 2 +-
 runtime/queries/gleam/highlights.scm | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 3e4084bf43c1f..1653fbbcdf890 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1795,7 +1795,7 @@ auto-format = true
 
 [[grammar]]
 name = "gleam"
-source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "b2afa4fd6bb41a7bf912b034c653c90af7ae5122" }
+source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "bcf9c45b56cbe46e9dac5eee0aee75df270000ac" }
 
 [[language]]
 name = "ron"
diff --git a/runtime/queries/gleam/highlights.scm b/runtime/queries/gleam/highlights.scm
index 95a08141bd51e..b40574b04fc2d 100644
--- a/runtime/queries/gleam/highlights.scm
+++ b/runtime/queries/gleam/highlights.scm
@@ -61,10 +61,17 @@
 
 ; Literals
 (string) @string
+((escape_sequence) @warning
+ (#eq? @warning "\\e")) ; deprecated escape sequence
+(escape_sequence) @constant.character.escape
 (bit_string_segment_option) @function.builtin
 (integer) @constant.numeric.integer
 (float) @constant.numeric.float
 
+; Reserved identifiers
+((identifier) @error
+ (#any-of? @error "auto" "delegate" "derive" "else" "implement" "macro" "test" "echo"))
+
 ; Variables
 (identifier) @variable
 (discard) @comment.unused

From c099dde2a7c28a34a665d304e9a04acbb9c325e4 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 7 Mar 2024 10:07:57 -0500
Subject: [PATCH 050/101] Rust: Highlight extern crate aliases

For example `extern crate alloc as myalloc;`
---
 runtime/queries/rust/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 3cda9d52083c7..09068b4f54f5e 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -376,7 +376,8 @@
 (use_wildcard
   (identifier) @namespace)
 (extern_crate_declaration
-  name: (identifier) @namespace)
+  name: (identifier) @namespace
+  alias: (identifier)? @namespace)
 (mod_item
   name: (identifier) @namespace)
 (scoped_use_list

From f5d95de22784bd33b8dec0edfbfd106582427318 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 21 Mar 2024 10:05:48 -0400
Subject: [PATCH 051/101] C++: Improve parameter highlighting

This adds parameter highlighting for reference parameters and defaulted
parameters. For example:

```cpp
auto strip_prefix_only(std::string& s,
                       Hidden_Homonym skip_hidden_homonym = {}) const
    -> Affixing_Result<Prefix>;
```

Previously both parameters were only highlighted as variables.
---
 runtime/queries/cpp/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 509dcdf7d4c0a..c1d14a0b13a37 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -49,6 +49,13 @@
 (this) @variable.builtin
 (nullptr) @constant.builtin
 
+; Parameters
+
+(parameter_declaration
+  declarator: (reference_declarator (identifier) @variable.parameter))
+(optional_parameter_declaration
+  declarator: (identifier) @variable.parameter)
+
 ; Keywords
 
 (template_argument_list (["<" ">"] @punctuation.bracket))

From c9e34c556b84c135e8f9d76fb900e97568e88b97 Mon Sep 17 00:00:00 2001
From: David Else <12832280+David-Else@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:10:16 +0000
Subject: [PATCH 052/101] Add rclone.conf as a glob to make it behave as an ini
 file (#9959)

---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index 1653fbbcdf890..cbbfc5a91d3a9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2616,6 +2616,7 @@ file-types = [
   "kube",
   "network",
   { glob = ".editorconfig" },
+  { glob = "rclone.conf" },
   "properties",
   "cfg",
   "directory"

From be307a420480178c1bc443992c8336f6471b8b7b Mon Sep 17 00:00:00 2001
From: Carter Watson <54688033+cartwatson@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:07:47 -0700
Subject: [PATCH 053/101] fix: undefined bufferline colors (#9960)

---
 runtime/themes/gruvbox.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 6025852c5fc52..e3eef1855a9c1 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -47,6 +47,9 @@
 "ui.statusline.insert" = { fg = "fg1", bg = "blue0" }
 "ui.statusline.select" = { fg = "fg1", bg = "orange0" }
 "ui.statusline.inactive" = { fg = "fg4", bg = "bg1" }
+"ui.bufferline" = { fg = "fg1", bg = "bg1" }
+"ui.bufferline.active" = { fg = "bg0", bg = "yellow0" }
+"ui.bufferline.background" = { bg = "bg2" }
 "ui.popup" = { bg = "bg1" }
 "ui.window" = { bg = "bg1" }
 "ui.help" = { bg = "bg1", fg = "fg1" }

From d5c2973cd10c38512f6e568f097bedca46ff5f48 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Sat, 23 Mar 2024 08:25:08 +0200
Subject: [PATCH 054/101] Fix repeat last motion for goto next/prev diagnostic
 (#9966)

---
 book/src/keymap.md         |  2 +-
 helix-term/src/commands.rs | 71 +++++++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index bb09b03197b8f..60ada4a27b21c 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -49,7 +49,7 @@ Normal mode is the default mode when you launch helix. You can return to it from
 | `T`                   | Find 'till previous char                           | `till_prev_char`            |
 | `F`                   | Find previous char                                 | `find_prev_char`            |
 | `G`                   | Go to line number `<n>`                            | `goto_line`                 |
-| `Alt-.`               | Repeat last motion (`f`, `t` or `m`)               | `repeat_last_motion`        |
+| `Alt-.`               | Repeat last motion (`f`, `t`, `m`, `[` or `]`)     | `repeat_last_motion`        |
 | `Home`                | Move to the start of the line                      | `goto_line_start`           |
 | `End`                 | Move to the end of the line                        | `goto_line_end`             |
 | `Ctrl-b`, `PageUp`    | Move page up                                       | `page_up`                   |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a5e79a53992f0..291ab1fed0d4a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3439,48 +3439,55 @@ fn goto_last_diag(cx: &mut Context) {
 }
 
 fn goto_next_diag(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
+    let motion = move |editor: &mut Editor| {
+        let (view, doc) = current!(editor);
 
-    let cursor_pos = doc
-        .selection(view.id)
-        .primary()
-        .cursor(doc.text().slice(..));
+        let cursor_pos = doc
+            .selection(view.id)
+            .primary()
+            .cursor(doc.text().slice(..));
 
-    let diag = doc
-        .diagnostics()
-        .iter()
-        .find(|diag| diag.range.start > cursor_pos)
-        .or_else(|| doc.diagnostics().first());
+        let diag = doc
+            .diagnostics()
+            .iter()
+            .find(|diag| diag.range.start > cursor_pos)
+            .or_else(|| doc.diagnostics().first());
 
-    let selection = match diag {
-        Some(diag) => Selection::single(diag.range.start, diag.range.end),
-        None => return,
+        let selection = match diag {
+            Some(diag) => Selection::single(diag.range.start, diag.range.end),
+            None => return,
+        };
+        doc.set_selection(view.id, selection);
     };
-    doc.set_selection(view.id, selection);
+
+    cx.editor.apply_motion(motion);
 }
 
 fn goto_prev_diag(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
+    let motion = move |editor: &mut Editor| {
+        let (view, doc) = current!(editor);
 
-    let cursor_pos = doc
-        .selection(view.id)
-        .primary()
-        .cursor(doc.text().slice(..));
+        let cursor_pos = doc
+            .selection(view.id)
+            .primary()
+            .cursor(doc.text().slice(..));
 
-    let diag = doc
-        .diagnostics()
-        .iter()
-        .rev()
-        .find(|diag| diag.range.start < cursor_pos)
-        .or_else(|| doc.diagnostics().last());
-
-    let selection = match diag {
-        // NOTE: the selection is reversed because we're jumping to the
-        // previous diagnostic.
-        Some(diag) => Selection::single(diag.range.end, diag.range.start),
-        None => return,
+        let diag = doc
+            .diagnostics()
+            .iter()
+            .rev()
+            .find(|diag| diag.range.start < cursor_pos)
+            .or_else(|| doc.diagnostics().last());
+
+        let selection = match diag {
+            // NOTE: the selection is reversed because we're jumping to the
+            // previous diagnostic.
+            Some(diag) => Selection::single(diag.range.end, diag.range.start),
+            None => return,
+        };
+        doc.set_selection(view.id, selection);
     };
-    doc.set_selection(view.id, selection);
+    cx.editor.apply_motion(motion)
 }
 
 fn goto_first_change(cx: &mut Context) {

From 6dd46bfe1c87a4ba4d3ae2feef1270a90ef5f67b Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 10 Jan 2024 13:06:57 -0500
Subject: [PATCH 055/101] syntax: Track parent LanguageLayer IDs

This commit adds a `parent` field to the `LanguageLayer`. This
information is conveniently already available when we parse injections.
This will be used in the child commit to create a type that can
traverse injection layers using this information.
---
 helix-core/src/syntax.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 0e8917191c914..6414f3ce9841a 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1090,6 +1090,7 @@ impl Syntax {
                 start_point: Point::new(0, 0),
                 end_point: Point::new(usize::MAX, usize::MAX),
             }],
+            parent: None,
         };
 
         // track scope_descriptor: a Vec of scopes for item in tree
@@ -1360,6 +1361,7 @@ impl Syntax {
                         depth,
                         ranges,
                         flags: LayerUpdateFlags::empty(),
+                        parent: Some(layer_id),
                     };
 
                     // Find an identical existing layer
@@ -1525,6 +1527,7 @@ pub struct LanguageLayer {
     pub ranges: Vec<Range>,
     pub depth: u32,
     flags: LayerUpdateFlags,
+    parent: Option<LayerId>,
 }
 
 /// This PartialEq implementation only checks if that

From b1222f06640c02feb1b87b988d6bca53fdddb9c0 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 10 Jan 2024 15:58:44 -0500
Subject: [PATCH 056/101] Add a TreeCursor type that travels over injection
 layers

This uses the layer parentage information from the parent commit to
traverse the layers. It's a similar API to `tree_sitter:TreeCursor`
but internally it does not use a `tree_sitter::TreeCursor` currently
because that interface is behaving very unexpectedly. Using the
`next_sibling`/`prev_sibling`/`parent` API on `tree_sitter::Node`
reflects the previous code's behavior so this should result in no
surprising changes.
---
 helix-core/src/syntax.rs             |  16 ++-
 helix-core/src/syntax/tree_cursor.rs | 160 +++++++++++++++++++++++++++
 2 files changed, 173 insertions(+), 3 deletions(-)
 create mode 100644 helix-core/src/syntax/tree_cursor.rs

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 6414f3ce9841a..78abc0b0a7407 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1,3 +1,5 @@
+mod tree_cursor;
+
 use crate::{
     auto_pairs::AutoPairs,
     chars::char_is_line_ending,
@@ -32,6 +34,8 @@ use serde::{ser::SerializeSeq, Deserialize, Serialize};
 
 use helix_loader::grammar::{get_language, load_runtime_file};
 
+pub use tree_cursor::TreeCursor;
+
 fn deserialize_regex<'de, D>(deserializer: D) -> Result<Option<Regex>, D::Error>
 where
     D: serde::Deserializer<'de>,
@@ -1495,6 +1499,12 @@ impl Syntax {
             .descendant_for_byte_range(start, end)
     }
 
+    pub fn walk(&self) -> TreeCursor<'_> {
+        // data structure to find the smallest range that contains a point
+        // when some of the ranges in the structure can overlap.
+        TreeCursor::new(&self.layers, self.root)
+    }
+
     // Commenting
     // comment_strings_for_pos
     // is_commented
@@ -1723,7 +1733,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::{iter, mem, ops, str, usize};
 use tree_sitter::{
     Language as Grammar, Node, Parser, Point, Query, QueryCaptures, QueryCursor, QueryError,
-    QueryMatch, Range, TextProvider, Tree, TreeCursor,
+    QueryMatch, Range, TextProvider, Tree,
 };
 
 const CANCELLATION_CHECK_INTERVAL: usize = 100;
@@ -2657,7 +2667,7 @@ pub fn pretty_print_tree<W: fmt::Write>(fmt: &mut W, node: Node) -> fmt::Result
 
 fn pretty_print_tree_impl<W: fmt::Write>(
     fmt: &mut W,
-    cursor: &mut TreeCursor,
+    cursor: &mut tree_sitter::TreeCursor,
     depth: usize,
 ) -> fmt::Result {
     let node = cursor.node();
@@ -2967,7 +2977,7 @@ mod test {
         // rule but `name` and `body` belong to an unnamed helper `_method_rest`.
         // This can cause a bug with a pretty-printing implementation that
         // uses `Node::field_name_for_child` to determine field names but is
-        // fixed when using `TreeCursor::field_name`.
+        // fixed when using `tree_sitter::TreeCursor::field_name`.
         let source = "def self.method_name
           true
         end";
diff --git a/helix-core/src/syntax/tree_cursor.rs b/helix-core/src/syntax/tree_cursor.rs
new file mode 100644
index 0000000000000..d9d140c9f747a
--- /dev/null
+++ b/helix-core/src/syntax/tree_cursor.rs
@@ -0,0 +1,160 @@
+use std::{cmp::Reverse, ops::Range};
+
+use super::{LanguageLayer, LayerId};
+
+use slotmap::HopSlotMap;
+use tree_sitter::Node;
+
+/// The byte range of an injection layer.
+///
+/// Injection ranges may overlap, but all overlapping parts are subsets of their parent ranges.
+/// This allows us to sort the ranges ahead of time in order to efficiently find a range that
+/// contains a point with maximum depth.
+#[derive(Debug)]
+struct InjectionRange {
+    start: usize,
+    end: usize,
+    layer_id: LayerId,
+    depth: u32,
+}
+
+pub struct TreeCursor<'a> {
+    layers: &'a HopSlotMap<LayerId, LanguageLayer>,
+    root: LayerId,
+    current: LayerId,
+    injection_ranges: Vec<InjectionRange>,
+    // TODO: Ideally this would be a `tree_sitter::TreeCursor<'a>` but
+    // that returns very surprising results in testing.
+    cursor: Node<'a>,
+}
+
+impl<'a> TreeCursor<'a> {
+    pub(super) fn new(layers: &'a HopSlotMap<LayerId, LanguageLayer>, root: LayerId) -> Self {
+        let mut injection_ranges = Vec::new();
+
+        for (layer_id, layer) in layers.iter() {
+            // Skip the root layer
+            if layer.parent.is_none() {
+                continue;
+            }
+            for byte_range in layer.ranges.iter() {
+                let range = InjectionRange {
+                    start: byte_range.start_byte,
+                    end: byte_range.end_byte,
+                    layer_id,
+                    depth: layer.depth,
+                };
+                injection_ranges.push(range);
+            }
+        }
+
+        injection_ranges.sort_unstable_by_key(|range| (range.end, Reverse(range.depth)));
+
+        let cursor = layers[root].tree().root_node();
+
+        Self {
+            layers,
+            root,
+            current: root,
+            injection_ranges,
+            cursor,
+        }
+    }
+
+    pub fn node(&self) -> Node<'a> {
+        self.cursor
+    }
+
+    pub fn goto_parent(&mut self) -> bool {
+        if let Some(parent) = self.node().parent() {
+            self.cursor = parent;
+            return true;
+        }
+
+        // If we are already on the root layer, we cannot ascend.
+        if self.current == self.root {
+            return false;
+        }
+
+        // Ascend to the parent layer.
+        let range = self.node().byte_range();
+        let parent_id = self.layers[self.current]
+            .parent
+            .expect("non-root layers have a parent");
+        self.current = parent_id;
+        let root = self.layers[self.current].tree().root_node();
+        self.cursor = root
+            .descendant_for_byte_range(range.start, range.end)
+            .unwrap_or(root);
+
+        true
+    }
+
+    /// Finds the injection layer that has exactly the same range as the given `range`.
+    fn layer_id_of_byte_range(&self, search_range: Range<usize>) -> Option<LayerId> {
+        let start_idx = self
+            .injection_ranges
+            .partition_point(|range| range.end < search_range.end);
+
+        self.injection_ranges[start_idx..]
+            .iter()
+            .take_while(|range| range.end == search_range.end)
+            .find_map(|range| (range.start == search_range.start).then_some(range.layer_id))
+    }
+
+    pub fn goto_first_child(&mut self) -> bool {
+        // Check if the current node's range is an exact injection layer range.
+        if let Some(layer_id) = self
+            .layer_id_of_byte_range(self.node().byte_range())
+            .filter(|&layer_id| layer_id != self.current)
+        {
+            // Switch to the child layer.
+            self.current = layer_id;
+            self.cursor = self.layers[self.current].tree().root_node();
+            true
+        } else if let Some(child) = self.cursor.child(0) {
+            // Otherwise descend in the current tree.
+            self.cursor = child;
+            true
+        } else {
+            false
+        }
+    }
+
+    pub fn goto_next_sibling(&mut self) -> bool {
+        if let Some(sibling) = self.cursor.next_sibling() {
+            self.cursor = sibling;
+            true
+        } else {
+            false
+        }
+    }
+
+    pub fn goto_prev_sibling(&mut self) -> bool {
+        if let Some(sibling) = self.cursor.prev_sibling() {
+            self.cursor = sibling;
+            true
+        } else {
+            false
+        }
+    }
+
+    /// Finds the injection layer that contains the given start-end range.
+    fn layer_id_containing_byte_range(&self, start: usize, end: usize) -> LayerId {
+        let start_idx = self
+            .injection_ranges
+            .partition_point(|range| range.end < end);
+
+        self.injection_ranges[start_idx..]
+            .iter()
+            .take_while(|range| range.start < end)
+            .find_map(|range| (range.start <= start).then_some(range.layer_id))
+            .unwrap_or(self.root)
+    }
+
+    pub fn reset_to_byte_range(&mut self, start: usize, end: usize) {
+        self.current = self.layer_id_containing_byte_range(start, end);
+        let root = self.layers[self.current].tree().root_node();
+        self.cursor = root.descendant_for_byte_range(start, end).unwrap_or(root);
+    }
+}

From 68b21578ac4b5ded1a262469c6887794a689284f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 10 Jan 2024 14:31:05 -0500
Subject: [PATCH 057/101] Reimplement tree motions in terms of
 syntax::TreeCursor

This uses the new TreeCursor type from the parent commit to reimplement
the tree-sitter motions (`A-p/o/i/n`). Other tree-sitter related
features like textobjects are not touched with this change and will
need a different, unrelated approach to solve.
---
 helix-core/src/object.rs          | 86 ++++++++++++++++---------------
 helix-term/src/commands.rs        | 14 +++--
 helix-term/tests/test/movement.rs | 57 ++++++++++++++++++++
 3 files changed, 107 insertions(+), 50 deletions(-)

diff --git a/helix-core/src/object.rs b/helix-core/src/object.rs
index d2d4fe70ac028..0df105f1a5170 100644
--- a/helix-core/src/object.rs
+++ b/helix-core/src/object.rs
@@ -1,42 +1,52 @@
-use crate::{Range, RopeSlice, Selection, Syntax};
-use tree_sitter::Node;
+use crate::{syntax::TreeCursor, Range, RopeSlice, Selection, Syntax};
 
 pub fn expand_selection(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
-    select_node_impl(syntax, text, selection, |mut node, from, to| {
-        while node.start_byte() == from && node.end_byte() == to {
-            node = node.parent()?;
+    let cursor = &mut syntax.walk();
+
+    selection.transform(|range| {
+        let from = text.char_to_byte(range.from());
+        let to = text.char_to_byte(range.to());
+
+        let byte_range = from..to;
+        cursor.reset_to_byte_range(from, to);
+
+        while cursor.node().byte_range() == byte_range {
+            if !cursor.goto_parent() {
+                break;
+            }
         }
-        Some(node)
+
+        let node = cursor.node();
+        let from = text.byte_to_char(node.start_byte());
+        let to = text.byte_to_char(node.end_byte());
+
+        Range::new(to, from).with_direction(range.direction())
     })
 }
 
 pub fn shrink_selection(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
-    select_node_impl(syntax, text, selection, |descendant, _from, _to| {
-        descendant.child(0).or(Some(descendant))
+    select_node_impl(syntax, text, selection, |cursor| {
+        cursor.goto_first_child();
     })
 }
 
-pub fn select_sibling<F>(
-    syntax: &Syntax,
-    text: RopeSlice,
-    selection: Selection,
-    sibling_fn: &F,
-) -> Selection
-where
-    F: Fn(Node) -> Option<Node>,
-{
-    select_node_impl(syntax, text, selection, |descendant, _from, _to| {
-        find_sibling_recursive(descendant, sibling_fn)
+pub fn select_next_sibling(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
+    select_node_impl(syntax, text, selection, |cursor| {
+        while !cursor.goto_next_sibling() {
+            if !cursor.goto_parent() {
+                break;
+            }
+        }
     })
 }
 
-fn find_sibling_recursive<F>(node: Node, sibling_fn: F) -> Option<Node>
-where
-    F: Fn(Node) -> Option<Node>,
-{
-    sibling_fn(node).or_else(|| {
-        node.parent()
-            .and_then(|node| find_sibling_recursive(node, sibling_fn))
+pub fn select_prev_sibling(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
+    select_node_impl(syntax, text, selection, |cursor| {
+        while !cursor.goto_prev_sibling() {
+            if !cursor.goto_parent() {
+                break;
+            }
+        }
     })
 }
 
@@ -44,33 +54,25 @@ fn select_node_impl<F>(
     syntax: &Syntax,
     text: RopeSlice,
     selection: Selection,
-    select_fn: F,
+    motion: F,
 ) -> Selection
 where
-    F: Fn(Node, usize, usize) -> Option<Node>,
+    F: Fn(&mut TreeCursor),
 {
-    let tree = syntax.tree();
+    let cursor = &mut syntax.walk();
 
     selection.transform(|range| {
         let from = text.char_to_byte(range.from());
         let to = text.char_to_byte(range.to());
 
-        let node = match tree
-            .root_node()
-            .descendant_for_byte_range(from, to)
-            .and_then(|node| select_fn(node, from, to))
-        {
-            Some(node) => node,
-            None => return range,
-        };
+        cursor.reset_to_byte_range(from, to);
 
+        motion(cursor);
+
+        let node = cursor.node();
         let from = text.byte_to_char(node.start_byte());
         let to = text.byte_to_char(node.end_byte());
 
-        if range.head < range.anchor {
-            Range::new(to, from)
-        } else {
-            Range::new(from, to)
-        }
+        Range::new(from, to).with_direction(range.direction())
     })
 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 291ab1fed0d4a..ff72cee1fd3a1 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -26,7 +26,6 @@ use helix_core::{
     syntax::{BlockCommentToken, LanguageServerFeature},
     text_annotations::TextAnnotations,
     textobject,
-    tree_sitter::Node,
     unicode::width::UnicodeWidthChar,
     visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
     RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
@@ -4775,18 +4774,17 @@ fn shrink_selection(cx: &mut Context) {
     cx.editor.apply_motion(motion);
 }
 
-fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
+fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: F)
 where
-    F: Fn(Node) -> Option<Node>,
+    F: Fn(&helix_core::Syntax, RopeSlice, Selection) -> Selection + 'static,
 {
-    let motion = |editor: &mut Editor| {
+    let motion = move |editor: &mut Editor| {
         let (view, doc) = current!(editor);
 
         if let Some(syntax) = doc.syntax() {
             let text = doc.text().slice(..);
             let current_selection = doc.selection(view.id);
-            let selection =
-                object::select_sibling(syntax, text, current_selection.clone(), sibling_fn);
+            let selection = sibling_fn(syntax, text, current_selection.clone());
             doc.set_selection(view.id, selection);
         }
     };
@@ -4794,11 +4792,11 @@ where
 }
 
 fn select_next_sibling(cx: &mut Context) {
-    select_sibling_impl(cx, &|node| Node::next_sibling(&node))
+    select_sibling_impl(cx, object::select_next_sibling)
 }
 
 fn select_prev_sibling(cx: &mut Context) {
-    select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
+    select_sibling_impl(cx, object::select_prev_sibling)
 }
 
 fn move_node_bound_impl(cx: &mut Context, dir: Direction, movement: Movement) {
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 4ebaae854fdcf..1c25032c2f1b0 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -635,3 +635,60 @@ async fn test_surround_delete() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn tree_sitter_motions_work_across_injections() -> anyhow::Result<()> {
+    test_with_config(
+        AppBuilder::new().with_file("foo.html", None),
+        (
+            "<script>let #[|x]# = 1;</script>",
+            "<A-o>",
+            "<script>let #[|x = 1]#;</script>",
+        ),
+    )
+    .await?;
+
+    // When the full injected layer is selected, expand_selection jumps to
+    // a more shallow layer.
+    test_with_config(
+        AppBuilder::new().with_file("foo.html", None),
+        (
+            "<script>#[|let x = 1;]#</script>",
+            "<A-o>",
+            "#[|<script>let x = 1;</script>]#",
+        ),
+    )
+    .await?;
+
+    test_with_config(
+        AppBuilder::new().with_file("foo.html", None),
+        (
+            "<script>let #[|x = 1]#;</script>",
+            "<A-i>",
+            "<script>let #[|x]# = 1;</script>",
+        ),
+    )
+    .await?;
+
+    test_with_config(
+        AppBuilder::new().with_file("foo.html", None),
+        (
+            "<script>let #[|x]# = 1;</script>",
+            "<A-n>",
+            "<script>let x #[|=]# 1;</script>",
+        ),
+    )
+    .await?;
+
+    test_with_config(
+        AppBuilder::new().with_file("foo.html", None),
+        (
+            "<script>let #[|x]# = 1;</script>",
+            "<A-p>",
+            "<script>#[|let]# x = 1;</script>",
+        ),
+    )
+    .await?;
+
+    Ok(())
+}

From 69e07ab61e51598ba6e31bdd79608091fdbba254 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Sun, 19 Nov 2023 22:34:03 +0100
Subject: [PATCH 058/101] use slices instead of Rc for virtual text

---
 helix-core/src/doc_formatter.rs      |  2 +-
 helix-core/src/doc_formatter/test.rs | 19 +++++++++----
 helix-core/src/text_annotations.rs   | 31 ++++++++++----------
 helix-term/src/commands.rs           |  4 ++-
 helix-term/src/commands/lsp.rs       | 10 +++----
 helix-view/src/document.rs           | 42 +++++++++++-----------------
 helix-view/src/view.rs               | 28 ++++++++-----------
 7 files changed, 66 insertions(+), 70 deletions(-)

diff --git a/helix-core/src/doc_formatter.rs b/helix-core/src/doc_formatter.rs
index c7dc9081f5cfd..cbe2da3b697a5 100644
--- a/helix-core/src/doc_formatter.rs
+++ b/helix-core/src/doc_formatter.rs
@@ -116,7 +116,7 @@ impl Default for TextFormat {
 #[derive(Debug)]
 pub struct DocumentFormatter<'t> {
     text_fmt: &'t TextFormat,
-    annotations: &'t TextAnnotations,
+    annotations: &'t TextAnnotations<'t>,
 
     /// The visual position at the end of the last yielded word boundary
     visual_pos: Position,
diff --git a/helix-core/src/doc_formatter/test.rs b/helix-core/src/doc_formatter/test.rs
index ac8918bb71ea0..d2b6ddc74a915 100644
--- a/helix-core/src/doc_formatter/test.rs
+++ b/helix-core/src/doc_formatter/test.rs
@@ -1,5 +1,3 @@
-use std::rc::Rc;
-
 use crate::doc_formatter::{DocumentFormatter, TextFormat};
 use crate::text_annotations::{InlineAnnotation, Overlay, TextAnnotations};
 
@@ -105,7 +103,7 @@ fn overlay_text(text: &str, char_pos: usize, softwrap: bool, overlays: &[Overlay
     DocumentFormatter::new_at_prev_checkpoint(
         text.into(),
         &TextFormat::new_test(softwrap),
-        TextAnnotations::default().add_overlay(overlays.into(), None),
+        TextAnnotations::default().add_overlay(overlays, None),
         char_pos,
     )
     .0
@@ -142,7 +140,7 @@ fn annotate_text(text: &str, softwrap: bool, annotations: &[InlineAnnotation]) -
     DocumentFormatter::new_at_prev_checkpoint(
         text.into(),
         &TextFormat::new_test(softwrap),
-        TextAnnotations::default().add_inline_annotations(annotations.into(), None),
+        TextAnnotations::default().add_inline_annotations(annotations, None),
         0,
     )
     .0
@@ -164,15 +162,24 @@ fn annotation() {
         "foo foo foo foo \n.foo foo foo foo \n.foo foo foo  "
     );
 }
+
 #[test]
 fn annotation_and_overlay() {
+    let annotations = [InlineAnnotation {
+        char_idx: 0,
+        text: "fooo".into(),
+    }];
+    let overlay = [Overlay {
+        char_idx: 0,
+        grapheme: "\t".into(),
+    }];
     assert_eq!(
         DocumentFormatter::new_at_prev_checkpoint(
             "bbar".into(),
             &TextFormat::new_test(false),
             TextAnnotations::default()
-                .add_inline_annotations(Rc::new([InlineAnnotation::new(0, "fooo")]), None)
-                .add_overlay(Rc::new([Overlay::new(0, "\t")]), None),
+                .add_inline_annotations(annotations.as_slice(), None)
+                .add_overlay(overlay.as_slice(), None),
             0,
         )
         .0
diff --git a/helix-core/src/text_annotations.rs b/helix-core/src/text_annotations.rs
index 11d19d4856425..1576914e3653c 100644
--- a/helix-core/src/text_annotations.rs
+++ b/helix-core/src/text_annotations.rs
@@ -1,6 +1,5 @@
 use std::cell::Cell;
 use std::ops::Range;
-use std::rc::Rc;
 
 use crate::syntax::Highlight;
 use crate::Tendril;
@@ -92,23 +91,23 @@ pub struct LineAnnotation {
 }
 
 #[derive(Debug)]
-struct Layer<A, M> {
-    annotations: Rc<[A]>,
+struct Layer<'a, A, M> {
+    annotations: &'a [A],
     current_index: Cell<usize>,
     metadata: M,
 }
 
-impl<A, M: Clone> Clone for Layer<A, M> {
+impl<A, M: Clone> Clone for Layer<'_, A, M> {
     fn clone(&self) -> Self {
         Layer {
-            annotations: self.annotations.clone(),
+            annotations: self.annotations,
             current_index: self.current_index.clone(),
             metadata: self.metadata.clone(),
         }
     }
 }
 
-impl<A, M> Layer<A, M> {
+impl<A, M> Layer<'_, A, M> {
     pub fn reset_pos(&self, char_idx: usize, get_char_idx: impl Fn(&A) -> usize) {
         let new_index = self
             .annotations
@@ -128,8 +127,8 @@ impl<A, M> Layer<A, M> {
     }
 }
 
-impl<A, M> From<(Rc<[A]>, M)> for Layer<A, M> {
-    fn from((annotations, metadata): (Rc<[A]>, M)) -> Layer<A, M> {
+impl<'a, A, M> From<(&'a [A], M)> for Layer<'a, A, M> {
+    fn from((annotations, metadata): (&'a [A], M)) -> Layer<A, M> {
         Layer {
             annotations,
             current_index: Cell::new(0),
@@ -147,13 +146,13 @@ fn reset_pos<A, M>(layers: &[Layer<A, M>], pos: usize, get_pos: impl Fn(&A) -> u
 /// Annotations that change that is displayed when the document is render.
 /// Also commonly called virtual text.
 #[derive(Default, Debug, Clone)]
-pub struct TextAnnotations {
-    inline_annotations: Vec<Layer<InlineAnnotation, Option<Highlight>>>,
-    overlays: Vec<Layer<Overlay, Option<Highlight>>>,
-    line_annotations: Vec<Layer<LineAnnotation, ()>>,
+pub struct TextAnnotations<'a> {
+    inline_annotations: Vec<Layer<'a, InlineAnnotation, Option<Highlight>>>,
+    overlays: Vec<Layer<'a, Overlay, Option<Highlight>>>,
+    line_annotations: Vec<Layer<'a, LineAnnotation, ()>>,
 }
 
-impl TextAnnotations {
+impl<'a> TextAnnotations<'a> {
     /// Prepare the TextAnnotations for iteration starting at char_idx
     pub fn reset_pos(&self, char_idx: usize) {
         reset_pos(&self.inline_annotations, char_idx, |annot| annot.char_idx);
@@ -194,7 +193,7 @@ impl TextAnnotations {
     /// the annotations that belong to the layers added first will be shown first.
     pub fn add_inline_annotations(
         &mut self,
-        layer: Rc<[InlineAnnotation]>,
+        layer: &'a [InlineAnnotation],
         highlight: Option<Highlight>,
     ) -> &mut Self {
         self.inline_annotations.push((layer, highlight).into());
@@ -211,7 +210,7 @@ impl TextAnnotations {
     ///
     /// If multiple layers contain overlay at the same position
     /// the overlay from the layer added last will be show.
-    pub fn add_overlay(&mut self, layer: Rc<[Overlay]>, highlight: Option<Highlight>) -> &mut Self {
+    pub fn add_overlay(&mut self, layer: &'a [Overlay], highlight: Option<Highlight>) -> &mut Self {
         self.overlays.push((layer, highlight).into());
         self
     }
@@ -220,7 +219,7 @@ impl TextAnnotations {
     ///
     /// The line annotations **must be sorted** by their `char_idx`.
     /// Multiple line annotations with the same `char_idx` **are not allowed**.
-    pub fn add_line_annotation(&mut self, layer: Rc<[LineAnnotation]>) -> &mut Self {
+    pub fn add_line_annotation(&mut self, layer: &'a [LineAnnotation]) -> &mut Self {
         self.line_annotations.push((layer, ()).into());
         self
     }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ff72cee1fd3a1..6de056518bf3c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -617,6 +617,7 @@ fn move_impl(cx: &mut Context, move_fn: MoveFn, dir: Direction, behaviour: Movem
             &mut annotations,
         )
     });
+    drop(annotations);
     doc.set_selection(view.id, selection);
 }
 
@@ -1637,7 +1638,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction, sync_cursor
     let doc_text = doc.text().slice(..);
     let viewport = view.inner_area(doc);
     let text_fmt = doc.text_format(viewport.width, None);
-    let mut annotations = view.text_annotations(doc, None);
+    let mut annotations = view.text_annotations(&*doc, None);
     (view.offset.anchor, view.offset.vertical_offset) = char_idx_at_visual_offset(
         doc_text,
         view.offset.anchor,
@@ -1715,6 +1716,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction, sync_cursor
     let mut sel = doc.selection(view.id).clone();
     let idx = sel.primary_index();
     sel = sel.replace(idx, prim_sel);
+    drop(annotations);
     doc.set_selection(view.id, sel);
 }
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index a3168dc2d5853..63d1608f928c7 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1315,11 +1315,11 @@ fn compute_inlay_hints_for_view(
                 view_id,
                 DocumentInlayHints {
                     id: new_doc_inlay_hints_id,
-                    type_inlay_hints: type_inlay_hints.into(),
-                    parameter_inlay_hints: parameter_inlay_hints.into(),
-                    other_inlay_hints: other_inlay_hints.into(),
-                    padding_before_inlay_hints: padding_before_inlay_hints.into(),
-                    padding_after_inlay_hints: padding_after_inlay_hints.into(),
+                    type_inlay_hints,
+                    parameter_inlay_hints,
+                    other_inlay_hints,
+                    padding_before_inlay_hints,
+                    padding_after_inlay_hints,
                 },
             );
             doc.inlay_hints_oudated = false;
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index f813c7424a835..090e4dd5ccc9a 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -8,7 +8,7 @@ use helix_core::chars::char_is_word;
 use helix_core::doc_formatter::TextFormat;
 use helix_core::encoding::Encoding;
 use helix_core::syntax::{Highlight, LanguageServerFeature};
-use helix_core::text_annotations::{InlineAnnotation, TextAnnotations};
+use helix_core::text_annotations::InlineAnnotation;
 use helix_lsp::util::lsp_pos_to_pos;
 use helix_vcs::{DiffHandle, DiffProviderRegistry};
 
@@ -21,7 +21,6 @@ use std::collections::HashMap;
 use std::fmt::Display;
 use std::future::Future;
 use std::path::{Path, PathBuf};
-use std::rc::Rc;
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
 use std::time::SystemTime;
@@ -200,22 +199,22 @@ pub struct DocumentInlayHints {
     pub id: DocumentInlayHintsId,
 
     /// Inlay hints of `TYPE` kind, if any.
-    pub type_inlay_hints: Rc<[InlineAnnotation]>,
+    pub type_inlay_hints: Vec<InlineAnnotation>,
 
     /// Inlay hints of `PARAMETER` kind, if any.
-    pub parameter_inlay_hints: Rc<[InlineAnnotation]>,
+    pub parameter_inlay_hints: Vec<InlineAnnotation>,
 
     /// Inlay hints that are neither `TYPE` nor `PARAMETER`.
     ///
     /// LSPs are not required to associate a kind to their inlay hints, for example Rust-Analyzer
     /// currently never does (February 2023) and the LSP spec may add new kinds in the future that
     /// we want to display even if we don't have some special highlighting for them.
-    pub other_inlay_hints: Rc<[InlineAnnotation]>,
+    pub other_inlay_hints: Vec<InlineAnnotation>,
 
     /// Inlay hint padding. When creating the final `TextAnnotations`, the `before` padding must be
     /// added first, then the regular inlay hints, then the `after` padding.
-    pub padding_before_inlay_hints: Rc<[InlineAnnotation]>,
-    pub padding_after_inlay_hints: Rc<[InlineAnnotation]>,
+    pub padding_before_inlay_hints: Vec<InlineAnnotation>,
+    pub padding_after_inlay_hints: Vec<InlineAnnotation>,
 }
 
 impl DocumentInlayHints {
@@ -223,11 +222,11 @@ impl DocumentInlayHints {
     pub fn empty_with_id(id: DocumentInlayHintsId) -> Self {
         Self {
             id,
-            type_inlay_hints: Rc::new([]),
-            parameter_inlay_hints: Rc::new([]),
-            other_inlay_hints: Rc::new([]),
-            padding_before_inlay_hints: Rc::new([]),
-            padding_after_inlay_hints: Rc::new([]),
+            type_inlay_hints: Vec::new(),
+            parameter_inlay_hints: Vec::new(),
+            other_inlay_hints: Vec::new(),
+            padding_before_inlay_hints: Vec::new(),
+            padding_after_inlay_hints: Vec::new(),
         }
     }
 }
@@ -1266,13 +1265,12 @@ impl Document {
             });
 
             // Update the inlay hint annotations' positions, helping ensure they are displayed in the proper place
-            let apply_inlay_hint_changes = |annotations: &mut Rc<[InlineAnnotation]>| {
-                if let Some(data) = Rc::get_mut(annotations) {
-                    changes.update_positions(
-                        data.iter_mut()
-                            .map(|annotation| (&mut annotation.char_idx, Assoc::After)),
-                    );
-                }
+            let apply_inlay_hint_changes = |annotations: &mut Vec<InlineAnnotation>| {
+                changes.update_positions(
+                    annotations
+                        .iter_mut()
+                        .map(|annotation| (&mut annotation.char_idx, Assoc::After)),
+                );
             };
 
             self.inlay_hints_oudated = true;
@@ -1940,12 +1938,6 @@ impl Document {
         }
     }
 
-    /// Get the text annotations that apply to the whole document, those that do not apply to any
-    /// specific view.
-    pub fn text_annotations(&self, _theme: Option<&Theme>) -> TextAnnotations {
-        TextAnnotations::default()
-    }
-
     /// Set the inlay hints for this document and `view_id`.
     pub fn set_inlay_hints(&mut self, view_id: ViewId, inlay_hints: DocumentInlayHints) {
         self.inlay_hints.insert(view_id, inlay_hints);
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index e5e2641a8c5c7..bbdc74a74449c 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -19,7 +19,6 @@ use helix_core::{
 use std::{
     collections::{HashMap, VecDeque},
     fmt,
-    rc::Rc,
 };
 
 const JUMP_LIST_CAPACITY: usize = 30;
@@ -409,10 +408,12 @@ impl View {
     }
 
     /// Get the text annotations to display in the current view for the given document and theme.
-    pub fn text_annotations(&self, doc: &Document, theme: Option<&Theme>) -> TextAnnotations {
-        // TODO custom annotations for custom views like side by side diffs
-
-        let mut text_annotations = doc.text_annotations(theme);
+    pub fn text_annotations<'a>(
+        &self,
+        doc: &'a Document,
+        theme: Option<&Theme>,
+    ) -> TextAnnotations<'a> {
+        let mut text_annotations = TextAnnotations::default();
 
         let DocumentInlayHints {
             id: _,
@@ -436,20 +437,15 @@ impl View {
             .and_then(|t| t.find_scope_index("ui.virtual.inlay-hint"))
             .map(Highlight);
 
-        let mut add_annotations = |annotations: &Rc<[_]>, style| {
-            if !annotations.is_empty() {
-                text_annotations.add_inline_annotations(Rc::clone(annotations), style);
-            }
-        };
-
         // Overlapping annotations are ignored apart from the first so the order here is not random:
         // types -> parameters -> others should hopefully be the "correct" order for most use cases,
         // with the padding coming before and after as expected.
-        add_annotations(padding_before_inlay_hints, None);
-        add_annotations(type_inlay_hints, type_style);
-        add_annotations(parameter_inlay_hints, parameter_style);
-        add_annotations(other_inlay_hints, other_style);
-        add_annotations(padding_after_inlay_hints, None);
+        text_annotations
+            .add_inline_annotations(padding_before_inlay_hints, None)
+            .add_inline_annotations(type_inlay_hints, type_style)
+            .add_inline_annotations(parameter_inlay_hints, parameter_style)
+            .add_inline_annotations(other_inlay_hints, other_style)
+            .add_inline_annotations(padding_after_inlay_hints, None);
 
         text_annotations
     }

From 66b9ff1d2a9ad9ed0ec3e0416934437cfd1ab01f Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Fri, 1 Dec 2023 00:00:16 +0100
Subject: [PATCH 059/101] dismiss pending keys properly for mouse/paste

---
 helix-term/src/ui/editor.rs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index c1e36bbddc4e3..ad7aa5c5a89ac 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1048,13 +1048,33 @@ impl EditorView {
 }
 
 impl EditorView {
+    /// must be called whenever the editor processed input that
+    /// is not a `KeyEvent`. In these cases any pending keys/on next
+    /// key callbacks must be canceled.
+    fn handle_non_key_input(&mut self, cxt: &mut commands::Context) {
+        cxt.editor.status_msg = None;
+        cxt.editor.reset_idle_timer();
+        // HACKS: create a fake key event that will never trigger any actual map
+        // and therefore simply acts as "dismiss"
+        let null_key_event = KeyEvent {
+            code: KeyCode::Null,
+            modifiers: KeyModifiers::empty(),
+        };
+        // dismiss any pending keys
+        if let Some(on_next_key) = self.on_next_key.take() {
+            on_next_key(cxt, null_key_event);
+        }
+        self.handle_keymap_event(cxt.editor.mode, cxt, null_key_event);
+        self.pseudo_pending.clear();
+    }
+
     fn handle_mouse_event(
         &mut self,
         event: &MouseEvent,
         cxt: &mut commands::Context,
     ) -> EventResult {
         if event.kind != MouseEventKind::Moved {
-            cxt.editor.reset_idle_timer();
+            self.handle_non_key_input(cxt)
         }
 
         let config = cxt.editor.config();
@@ -1279,6 +1299,7 @@ impl Component for EditorView {
 
         match event {
             Event::Paste(contents) => {
+                self.handle_non_key_input(&mut cx);
                 cx.count = cx.editor.count;
                 commands::paste_bracketed_value(&mut cx, contents.clone());
                 cx.editor.count = None;

From 3001f22b315e479dcfc24c7a0fd221d7fb03d276 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Fri, 8 Mar 2024 15:45:08 +0100
Subject: [PATCH 060/101] add reverse rope grapheme iterator

---
 helix-core/src/graphemes.rs | 79 +++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/helix-core/src/graphemes.rs b/helix-core/src/graphemes.rs
index d9e5e0224732a..7cb5cd0625d5c 100644
--- a/helix-core/src/graphemes.rs
+++ b/helix-core/src/graphemes.rs
@@ -425,6 +425,85 @@ impl<'a> Iterator for RopeGraphemes<'a> {
     }
 }
 
+/// An iterator over the graphemes of a `RopeSlice` in reverse.
+#[derive(Clone)]
+pub struct RevRopeGraphemes<'a> {
+    text: RopeSlice<'a>,
+    chunks: Chunks<'a>,
+    cur_chunk: &'a str,
+    cur_chunk_start: usize,
+    cursor: GraphemeCursor,
+}
+
+impl<'a> fmt::Debug for RevRopeGraphemes<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("RevRopeGraphemes")
+            .field("text", &self.text)
+            .field("chunks", &self.chunks)
+            .field("cur_chunk", &self.cur_chunk)
+            .field("cur_chunk_start", &self.cur_chunk_start)
+            // .field("cursor", &self.cursor)
+            .finish()
+    }
+}
+
+impl<'a> RevRopeGraphemes<'a> {
+    #[must_use]
+    pub fn new(slice: RopeSlice) -> RevRopeGraphemes {
+        let (mut chunks, mut cur_chunk_start, _, _) = slice.chunks_at_byte(slice.len_bytes());
+        chunks.reverse();
+        let first_chunk = chunks.next().unwrap_or("");
+        cur_chunk_start -= first_chunk.len();
+        RevRopeGraphemes {
+            text: slice,
+            chunks,
+            cur_chunk: first_chunk,
+            cur_chunk_start,
+            cursor: GraphemeCursor::new(slice.len_bytes(), slice.len_bytes(), true),
+        }
+    }
+}
+
+impl<'a> Iterator for RevRopeGraphemes<'a> {
+    type Item = RopeSlice<'a>;
+
+    fn next(&mut self) -> Option<RopeSlice<'a>> {
+        let a = self.cursor.cur_cursor();
+        let b;
+        loop {
+            match self
+                .cursor
+                .prev_boundary(self.cur_chunk, self.cur_chunk_start)
+            {
+                Ok(None) => {
+                    return None;
+                }
+                Ok(Some(n)) => {
+                    b = n;
+                    break;
+                }
+                Err(GraphemeIncomplete::PrevChunk) => {
+                    self.cur_chunk = self.chunks.next().unwrap_or("");
+                    self.cur_chunk_start -= self.cur_chunk.len();
+                }
+                Err(GraphemeIncomplete::PreContext(idx)) => {
+                    let (chunk, byte_idx, _, _) = self.text.chunk_at_byte(idx.saturating_sub(1));
+                    self.cursor.provide_context(chunk, byte_idx);
+                }
+                _ => unreachable!(),
+            }
+        }
+
+        if a >= self.cur_chunk_start + self.cur_chunk.len() {
+            Some(self.text.byte_slice(b..a))
+        } else {
+            let a2 = a - self.cur_chunk_start;
+            let b2 = b - self.cur_chunk_start;
+            Some((&self.cur_chunk[b2..a2]).into())
+        }
+    }
+}
+
 /// A highly compressed Cow<'a, str> that holds
 /// atmost u31::MAX bytes and is readonly
 pub struct GraphemeStr<'a> {

From b46064b8c469c85b9626dba60728e23798354ed8 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Tue, 21 Nov 2023 01:46:12 +0100
Subject: [PATCH 061/101] Add an Amp-like jump command

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/configuration.md           |   1 +
 book/src/keymap.md                  |   1 +
 book/src/themes.md                  |   1 +
 helix-core/src/selection.rs         |   9 ++
 helix-term/src/commands.rs          | 190 +++++++++++++++++++++++++++-
 helix-term/src/keymap/default.rs    |   2 +
 helix-view/src/document.rs          |  13 +-
 helix-view/src/editor.rs            |  23 +++-
 helix-view/src/view.rs              |   7 +
 runtime/themes/everforest_dark.toml |   1 +
 theme.toml                          |   2 +-
 11 files changed, 244 insertions(+), 6 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 8857af82a98e2..c55426c013d19 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -68,6 +68,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
 | `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |
 | `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid`
+| `jump-label-alphabet` | The characters that are used to generate two character jump labels. Characters at the start of the alphabet are used first. | "abcdefghijklmnopqrstuvwxyz"
 
 ### `[editor.statusline]` Section
 
diff --git a/book/src/keymap.md b/book/src/keymap.md
index 60ada4a27b21c..3a5ccca533114 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -224,6 +224,7 @@ Jumps to various locations.
 | `.`   | Go to last modification in current file          | `goto_last_modification`   |
 | `j`   | Move down textual (instead of visual) line       | `move_line_down`           |
 | `k`   | Move up textual (instead of visual) line         | `move_line_up`             |
+| `w`   | Show labels at each word and select the word that belongs to the entered labels | `goto_word` |
 
 #### Match mode
 
diff --git a/book/src/themes.md b/book/src/themes.md
index 04d6a69b39142..29a8c4ba82e8e 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -314,6 +314,7 @@ These scopes are used for theming the editor interface:
 | `ui.virtual.inlay-hint.parameter` | Style for inlay hints of kind `parameter` (LSPs are not required to set a kind)                |
 | `ui.virtual.inlay-hint.type`      | Style for inlay hints of kind `type` (LSPs are not required to set a kind)                     |
 | `ui.virtual.wrap`                 | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section])                      |
+| `ui.virtual.jump-label`           | Style for virtual jump labels                                                                  |
 | `ui.menu`                         | Code and command completion menus                                                              |
 | `ui.menu.selected`                | Selected autocomplete item                                                                     |
 | `ui.menu.scroll`                  | `fg` sets thumb color, `bg` sets track color of scrollbar                                      |
diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index bd252deb9d2cf..579499de5e4ab 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -705,6 +705,15 @@ impl IntoIterator for Selection {
     }
 }
 
+impl From<Range> for Selection {
+    fn from(range: Range) -> Self {
+        Self {
+            ranges: smallvec![range],
+            primary_index: 0,
+        }
+    }
+}
+
 // TODO: checkSelection -> check if valid for doc length && sorted
 
 pub fn keep_or_remove_matches(
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 6de056518bf3c..d545480b53085 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -10,9 +10,12 @@ use tui::widgets::Row;
 pub use typed::*;
 
 use helix_core::{
-    char_idx_at_visual_offset, comment,
+    char_idx_at_visual_offset,
+    chars::char_is_word,
+    comment,
     doc_formatter::TextFormat,
-    encoding, find_workspace, graphemes,
+    encoding, find_workspace,
+    graphemes::{self, next_grapheme_boundary, RevRopeGraphemes},
     history::UndoKind,
     increment, indent,
     indent::IndentStyle,
@@ -24,7 +27,7 @@ use helix_core::{
     search::{self, CharMatcher},
     selection, shellwords, surround,
     syntax::{BlockCommentToken, LanguageServerFeature},
-    text_annotations::TextAnnotations,
+    text_annotations::{Overlay, TextAnnotations},
     textobject,
     unicode::width::UnicodeWidthChar,
     visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
@@ -502,6 +505,8 @@ impl MappableCommand {
         record_macro, "Record macro",
         replay_macro, "Replay macro",
         command_palette, "Open command palette",
+        goto_word, "Jump to a two-character label",
+        extend_to_word, "Extend to a two-character label",
     );
 }
 
@@ -5814,3 +5819,182 @@ fn replay_macro(cx: &mut Context) {
         cx.editor.macro_replaying.pop();
     }));
 }
+
+fn goto_word(cx: &mut Context) {
+    jump_to_word(cx, Movement::Move)
+}
+
+fn extend_to_word(cx: &mut Context) {
+    jump_to_word(cx, Movement::Extend)
+}
+
+fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
+    let doc = doc!(cx.editor);
+    let alphabet = &cx.editor.config().jump_label_alphabet;
+    if labels.is_empty() {
+        return;
+    }
+    let alphabet_char = |i| {
+        let mut res = Tendril::new();
+        res.push(alphabet[i]);
+        res
+    };
+
+    // Add label for each jump candidate to the View as virtual text.
+    let text = doc.text().slice(..);
+    let mut overlays: Vec<_> = labels
+        .iter()
+        .enumerate()
+        .flat_map(|(i, range)| {
+            [
+                Overlay::new(range.from(), alphabet_char(i / alphabet.len())),
+                Overlay::new(
+                    graphemes::next_grapheme_boundary(text, range.from()),
+                    alphabet_char(i % alphabet.len()),
+                ),
+            ]
+        })
+        .collect();
+    overlays.sort_unstable_by_key(|overlay| overlay.char_idx);
+    let (view, doc) = current!(cx.editor);
+    doc.set_jump_labels(view.id, overlays);
+
+    // Accept two characters matching a visible label. Jump to the candidate
+    // for that label if it exists.
+    let primary_selection = doc.selection(view.id).primary();
+    let view = view.id;
+    let doc = doc.id();
+    cx.on_next_key(move |cx, event| {
+        let alphabet = &cx.editor.config().jump_label_alphabet;
+        let Some(i ) = event.char().and_then(|ch| alphabet.iter().position(|&it| it == ch)) else {
+            doc_mut!(cx.editor, &doc).remove_jump_labels(view);
+            return;
+        };
+        let outer = i * alphabet.len();
+        // Bail if the given character cannot be a jump label.
+        if outer > labels.len() {
+            doc_mut!(cx.editor, &doc).remove_jump_labels(view);
+            return;
+        }
+        cx.on_next_key(move |cx, event| {
+            doc_mut!(cx.editor, &doc).remove_jump_labels(view);
+            let alphabet = &cx.editor.config().jump_label_alphabet;
+            let Some(inner ) = event.char().and_then(|ch| alphabet.iter().position(|&it| it == ch)) else {
+                return;
+            };
+            if let Some(mut range) = labels.get(outer + inner).copied() {
+                range = if behaviour == Movement::Extend {
+                    let anchor = if range.anchor < range.head {
+                        let from = primary_selection.from();
+                        if range.anchor < from {
+                            range.anchor
+                        } else {
+                            from
+                        }
+                    } else {
+                        let to = primary_selection.to();
+                        if range.anchor > to {
+                            range.anchor
+                        } else {
+                            to
+                        }
+                    };
+                     Range::new(anchor, range.head)
+                }else{
+                    range.with_direction(Direction::Forward)
+                };
+                doc_mut!(cx.editor, &doc).set_selection(view, range.into());
+            }
+        });
+    });
+}
+
+fn jump_to_word(cx: &mut Context, behaviour: Movement) {
+    // Calculate the jump candidates: ranges for any visible words with two or
+    // more characters.
+    let alphabet = &cx.editor.config().jump_label_alphabet;
+    let jump_label_limit = alphabet.len() * alphabet.len();
+    let mut words = Vec::with_capacity(jump_label_limit);
+    let (view, doc) = current_ref!(cx.editor);
+    let text = doc.text().slice(..);
+
+    // This is not necessarily exact if there is virtual text like soft wrap.
+    // It's ok though because the extra jump labels will not be rendered.
+    let start = text.line_to_char(text.char_to_line(view.offset.anchor));
+    let end = text.line_to_char(view.estimate_last_doc_line(doc) + 1);
+
+    let primary_selection = doc.selection(view.id).primary();
+    let cursor = primary_selection.cursor(text);
+    let mut cursor_fwd = Range::point(cursor);
+    let mut cursor_rev = Range::point(cursor);
+    if text.get_char(cursor).is_some_and(|c| !c.is_whitespace()) {
+        let cursor_word_end = movement::move_next_word_end(text, cursor_fwd, 1);
+        //  single grapheme words need a specical case
+        if cursor_word_end.anchor == cursor {
+            cursor_fwd = cursor_word_end;
+        }
+        let cursor_word_start = movement::move_prev_word_start(text, cursor_rev, 1);
+        if cursor_word_start.anchor == next_grapheme_boundary(text, cursor) {
+            cursor_rev = cursor_word_start;
+        }
+    }
+    'outer: loop {
+        let mut changed = false;
+        while cursor_fwd.head < end {
+            cursor_fwd = movement::move_next_word_end(text, cursor_fwd, 1);
+            // The cursor is on a word that is atleast two graphemes long and
+            // madeup of word characters. The latter condition is needed because
+            // move_next_word_end simply treats a sequence of characters from
+            // the same char class as a word so `=<` would also count as a word.
+            let add_label = RevRopeGraphemes::new(text.slice(..cursor_fwd.head))
+                .take(2)
+                .take_while(|g| g.chars().all(char_is_word))
+                .count()
+                == 2;
+            if !add_label {
+                continue;
+            }
+            changed = true;
+            // skip any leading whitespace
+            cursor_fwd.anchor += text
+                .chars_at(cursor_fwd.anchor)
+                .take_while(|&c| !char_is_word(c))
+                .count();
+            words.push(cursor_fwd);
+            if words.len() == jump_label_limit {
+                break 'outer;
+            }
+            break;
+        }
+        while cursor_rev.head > start {
+            cursor_rev = movement::move_prev_word_start(text, cursor_rev, 1);
+            // The cursor is on a word that is atleast two graphemes long and
+            // madeup of word characters. The latter condition is needed because
+            // move_prev_word_start simply treats a sequence of characters from
+            // the same char class as a word so `=<` would also count as a word.
+            let add_label = RopeGraphemes::new(text.slice(cursor_rev.head..))
+                .take(2)
+                .take_while(|g| g.chars().all(char_is_word))
+                .count()
+                == 2;
+            if !add_label {
+                continue;
+            }
+            changed = true;
+            cursor_rev.anchor -= text
+                .chars_at(cursor_rev.anchor)
+                .reversed()
+                .take_while(|&c| !char_is_word(c))
+                .count();
+            words.push(cursor_rev);
+            if words.len() == jump_label_limit {
+                break 'outer;
+            }
+            break;
+        }
+        if !changed {
+            break;
+        }
+    }
+    jump_to_label(cx, words, behaviour)
+}
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index bab662b04dd35..ca5a21d26a164 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -58,6 +58,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "k" => move_line_up,
             "j" => move_line_down,
             "." => goto_last_modification,
+            "w" => goto_word,
         },
         ":" => command_mode,
 
@@ -360,6 +361,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
         "g" => { "Goto"
             "k" => extend_line_up,
             "j" => extend_line_down,
+            "w" => extend_to_word,
         },
     }));
     let insert = keymap!({ "Insert mode"
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 090e4dd5ccc9a..da68a67fb4e6b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -8,7 +8,7 @@ use helix_core::chars::char_is_word;
 use helix_core::doc_formatter::TextFormat;
 use helix_core::encoding::Encoding;
 use helix_core::syntax::{Highlight, LanguageServerFeature};
-use helix_core::text_annotations::InlineAnnotation;
+use helix_core::text_annotations::{InlineAnnotation, Overlay};
 use helix_lsp::util::lsp_pos_to_pos;
 use helix_vcs::{DiffHandle, DiffProviderRegistry};
 
@@ -125,6 +125,7 @@ pub struct Document {
     ///
     /// To know if they're up-to-date, check the `id` field in `DocumentInlayHints`.
     pub(crate) inlay_hints: HashMap<ViewId, DocumentInlayHints>,
+    pub(crate) jump_labels: HashMap<ViewId, Vec<Overlay>>,
     /// Set to `true` when the document is updated, reset to `false` on the next inlay hints
     /// update from the LSP
     pub inlay_hints_oudated: bool,
@@ -665,6 +666,7 @@ impl Document {
             version_control_head: None,
             focused_at: std::time::Instant::now(),
             readonly: false,
+            jump_labels: HashMap::new(),
         }
     }
 
@@ -1138,6 +1140,7 @@ impl Document {
     pub fn remove_view(&mut self, view_id: ViewId) {
         self.selections.remove(&view_id);
         self.inlay_hints.remove(&view_id);
+        self.jump_labels.remove(&view_id);
     }
 
     /// Apply a [`Transaction`] to the [`Document`] to change its text.
@@ -1943,6 +1946,14 @@ impl Document {
         self.inlay_hints.insert(view_id, inlay_hints);
     }
 
+    pub fn set_jump_labels(&mut self, view_id: ViewId, labels: Vec<Overlay>) {
+        self.jump_labels.insert(view_id, labels);
+    }
+
+    pub fn remove_jump_labels(&mut self, view_id: ViewId) {
+        self.jump_labels.remove(&view_id);
+    }
+
     /// Get the inlay hints for this document and `view_id`.
     pub fn inlay_hints(&self, view_id: ViewId) -> Option<&DocumentInlayHints> {
         self.inlay_hints.get(&view_id)
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index bad61052e8272..3c530c4e89bf1 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -22,7 +22,7 @@ use tokio_stream::wrappers::UnboundedReceiverStream;
 use std::{
     borrow::Cow,
     cell::Cell,
-    collections::{BTreeMap, HashMap},
+    collections::{BTreeMap, HashMap, HashSet},
     fs,
     io::{self, stdin},
     num::NonZeroUsize,
@@ -212,6 +212,23 @@ impl Default for FilePickerConfig {
     }
 }
 
+fn deserialize_alphabet<'de, D>(deserializer: D) -> Result<Vec<char>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    use serde::de::Error;
+
+    let str = String::deserialize(deserializer)?;
+    let chars: Vec<_> = str.chars().collect();
+    let unique_chars: HashSet<_> = chars.iter().copied().collect();
+    if unique_chars.len() != chars.len() {
+        return Err(<D::Error as Error>::custom(
+            "jump-label-alphabet must contain unique characters",
+        ));
+    }
+    Ok(chars)
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct Config {
@@ -305,6 +322,9 @@ pub struct Config {
     /// Which indent heuristic to use when a new line is inserted
     #[serde(default)]
     pub indent_heuristic: IndentationHeuristic,
+    /// labels characters used in jumpmode
+    #[serde(skip_serializing, deserialize_with = "deserialize_alphabet")]
+    pub jump_label_alphabet: Vec<char>,
 }
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
@@ -870,6 +890,7 @@ impl Default for Config {
             smart_tab: Some(SmartTabConfig::default()),
             popup_border: PopupBorderConfig::None,
             indent_heuristic: IndentationHeuristic::default(),
+            jump_label_alphabet: ('a'..='z').collect(),
         }
     }
 }
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index bbdc74a74449c..b5dc0615a5afd 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -415,6 +415,13 @@ impl View {
     ) -> TextAnnotations<'a> {
         let mut text_annotations = TextAnnotations::default();
 
+        if let Some(labels) = doc.jump_labels.get(&self.id) {
+            let style = theme
+                .and_then(|t| t.find_scope_index("ui.virtual.jump-label"))
+                .map(Highlight);
+            text_annotations.add_overlay(labels, style);
+        }
+
         let DocumentInlayHints {
             id: _,
             type_inlay_hints,
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 25a4913458d1e..a3083d5390760 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -40,6 +40,7 @@
 "constructor" = "green"
 "module" = "yellow"
 "special" = "blue"
+"ui.virtual.jump-label" = { fg = "#00dfff", modifiers = ["bold"] }
 
 "markup.heading.marker" = "grey1"
 "markup.heading.1" = { fg = "red", modifiers = ["bold"] }
diff --git a/theme.toml b/theme.toml
index 8a5bfd72d299a..a853ce6fe0447 100644
--- a/theme.toml
+++ b/theme.toml
@@ -52,11 +52,11 @@ label = "honey"
 "ui.popup" = { bg = "revolver" }
 "ui.window" = { fg = "bossanova" }
 "ui.help" = { bg = "#7958DC", fg = "#171452" }
-
 "ui.text" = { fg = "lavender" }
 "ui.text.focus" = { fg = "white" }
 "ui.text.inactive" = "sirocco"
 "ui.virtual" = { fg = "comet" }
+"ui.virtual.jump-label" = { fg = "apricot", modifiers = ["bold"] }
 
 "ui.virtual.indent-guide" = { fg = "comet" }
 

From 8f65bfe089a5e15d74f9fb9839e4b852db2c3289 Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Sat, 23 Mar 2024 13:40:19 +0100
Subject: [PATCH 062/101] feat: add jump label color to dracula themes (#9973)

---
 runtime/themes/dracula.toml          | 1 +
 runtime/themes/dracula_at_night.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 32d9c8f5da41e..4e01bae2d2fac 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -120,6 +120,7 @@
 "ui.virtual.inlay-hint"           = { fg    = "cyan"                                                        }
 "ui.virtual.inlay-hint.parameter" = { fg    = "cyan",            modifiers = ["italic", "dim"]              }
 "ui.virtual.inlay-hint.type"      = { fg    = "cyan",            modifiers = ["italic", "dim"]              }
+"ui.virtual.jump-label"           = { fg    = "pink",            modifiers = ["bold"]                       }
 "ui.virtual.ruler"                = { bg    = "black"                                                       }
 "ui.virtual.whitespace"           = { fg    = "whitespace"                                                  }
 "ui.virtual.wrap"                 = { fg    = "current_line"                                                }
diff --git a/runtime/themes/dracula_at_night.toml b/runtime/themes/dracula_at_night.toml
index b2e3b9a9fc110..b91bd00d0f828 100644
--- a/runtime/themes/dracula_at_night.toml
+++ b/runtime/themes/dracula_at_night.toml
@@ -43,6 +43,7 @@
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { fg = "cyan" }
 "ui.window" = { fg = "foreground" }
+"ui.virtual.jump-label" = { fg = "pink", modifiers = ["bold"] }
 "ui.virtual.ruler" = { bg = "background_dark" }
 
 "error" = { fg = "red" }

From 54fab657be758d891bc5ea623db177f785572426 Mon Sep 17 00:00:00 2001
From: ves <28784043+vesdev@users.noreply.github.com>
Date: Sun, 24 Mar 2024 04:42:01 +0200
Subject: [PATCH 063/101] Add jump label color to horizon-dark theme (#9984)

---
 runtime/themes/horizon-dark.toml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/runtime/themes/horizon-dark.toml b/runtime/themes/horizon-dark.toml
index 2ab10e9116ae6..b879b432c6560 100644
--- a/runtime/themes/horizon-dark.toml
+++ b/runtime/themes/horizon-dark.toml
@@ -27,8 +27,8 @@ namespace = "orange"
 "ui.gutter" = "gray"
 "ui.gutter.selected" = "light-gray"
 "ui.selection" = { bg = "selection" }
-"ui.virtual.indent-guide" = { fg = "gray"}
-"ui.virtual.whitespace" = { fg = "light-gray"}
+"ui.virtual.indent-guide" = { fg = "gray" }
+"ui.virtual.whitespace" = { fg = "light-gray" }
 "ui.statusline" = { bg = "dark-bg", fg = "light-gray" }
 "ui.popup" = { bg = "dark-bg", fg = "orange" }
 "ui.help" = { bg = "dark-bg", fg = "orange" }
@@ -37,13 +37,14 @@ namespace = "orange"
 "ui.window" = "selection"
 "ui.bufferline" = { bg = "dark-bg", fg = "light-gray" }
 "ui.bufferline.active" = { bg = "dark-bg", fg = "orange" }
+"ui.virtual.jump-label" = { fg = "pink", modifiers = ["bold"] }
 
 # Diagnostics
 "diagnostic" = { underline = { style = "curl" } }
 "diagnostic.hint" = { underline = { color = "green", style = "curl" } }
 "diagnostic.info" = { underline = { color = "blue", style = "curl" } }
-"diagnostics.error" = { underline = { color = "red", style = "curl"} }
-"diagnostics.warning" = { underline = { color = "orange", style = "curl"} }
+"diagnostics.error" = { underline = { color = "red", style = "curl" } }
+"diagnostics.warning" = { underline = { color = "orange", style = "curl" } }
 
 warning = { fg = "orange", modifiers = ["bold"] }
 error = { fg = "red", modifiers = ["bold"] }
@@ -62,7 +63,7 @@ hint = { fg = "green", modifiers = ["bold"] }
 "markup.quote" = "orange"
 "markup.raw" = "orange"
 
-"diff.plus" =  "green"
+"diff.plus" = "green"
 "diff.minus" = "red"
 "diff.delta" = "orange"
 

From 2178adfe93ab0e9af48da30f5633d4da0ab57915 Mon Sep 17 00:00:00 2001
From: Florent Nuttens <fnuttens@dabao.fr>
Date: Sat, 23 Mar 2024 23:06:37 +0100
Subject: [PATCH 064/101] feat: add jump label color to catppuccin themes

---
 runtime/themes/catppuccin_mocha.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index 65ba76e4bfba2..d1e08356407ca 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -89,6 +89,7 @@
 "ui.virtual.ruler" = { bg = "surface0" }
 "ui.virtual.indent-guide" = "surface0"
 "ui.virtual.inlay-hint" = { fg = "overlay0", bg = "base" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 "ui.selection" = { bg = "surface1" }
 

From 628dcd5c567176062f2b4013cb7e12a7d7541888 Mon Sep 17 00:00:00 2001
From: Florent Nuttens <fnuttens@dabao.fr>
Date: Sat, 23 Mar 2024 23:27:31 +0100
Subject: [PATCH 065/101] feat: add jump label color to dark plus theme

---
 runtime/themes/dark_plus.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 819cd62aa1444..11be7fd6a28f3 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -90,6 +90,7 @@
 "ui.virtual.ruler" = { bg = "borders" }
 "ui.virtual.indent-guide" = { fg = "dark_gray4" }
 "ui.virtual.inlay-hint" = { fg = "dark_gray5"}
+"ui.virtual.jump-label" = { fg = "dark_gray", modifiers = ["bold"] }
 
 "warning" = { fg = "gold2" }
 "error" = { fg = "red" }

From da2dec174a227baa94d61aa115585dad9297adc3 Mon Sep 17 00:00:00 2001
From: Florent Nuttens <fnuttens@dabao.fr>
Date: Sat, 23 Mar 2024 23:28:14 +0100
Subject: [PATCH 066/101] feat: add jump label color to onedark theme

---
 runtime/themes/onedark.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index eae11172e8098..5b049aff9425b 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -56,6 +56,7 @@
 "ui.virtual.whitespace" = { fg = "light-gray" }
 "ui.virtual.ruler" = { bg = "gray" }
 "ui.virtual.inlay-hint" = { fg = "light-gray" }
+"ui.virtual.jump-label" = { fg = "light-gray", modifiers = ["bold"] }
 
 "ui.cursor" = { fg = "white", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }

From 7bce9530d3e18c23fb87ae1ef8ac9e496e3eed6d Mon Sep 17 00:00:00 2001
From: Tobias Brunner <50907345+tobibrunner@users.noreply.github.com>
Date: Sun, 24 Mar 2024 03:42:57 +0100
Subject: [PATCH 067/101] Add jump label color to rose-pine themes (#9981)

---
 runtime/themes/rose_pine.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 456237e94e774..27b7a630e71e6 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -37,6 +37,7 @@
 "ui.text.focus" = { bg = "overlay" }
 "ui.text.info" = { fg = "subtle" }
 
+"ui.virtual.jump-label" = { fg = "love", modifiers = ["bold"] }
 "ui.virtual.ruler" = { bg = "overlay" }
 "ui.virtual.whitespace" = { fg = "highlight_high" }
 "ui.virtual.indent-guide" = { fg = "muted" }

From 47995bfb0cf3b0bc232a87340c7a01ff26d45bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Armando=20P=C3=A9rez=20Marqu=C3=A9s?= <gmandx@gmail.com>
Date: Sun, 24 Mar 2024 00:02:26 -0700
Subject: [PATCH 068/101] Add jump label color ("rosewater") to catppuccin
 themes (#9983)

---
 runtime/themes/catppuccin_mocha.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index d1e08356407ca..5fcb723172e32 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -89,7 +89,7 @@
 "ui.virtual.ruler" = { bg = "surface0" }
 "ui.virtual.indent-guide" = "surface0"
 "ui.virtual.inlay-hint" = { fg = "overlay0", bg = "base" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
+"ui.virtual.jump-label" = { fg = "rosewater", modifiers = ["bold"] }
 
 "ui.selection" = { bg = "surface1" }
 

From 2d9e336f640cccdd347e35289c3e4c0371777a3f Mon Sep 17 00:00:00 2001
From: Novus Nota <68142933+novusnota@users.noreply.github.com>
Date: Sun, 24 Mar 2024 23:30:59 +0100
Subject: [PATCH 069/101] feat: Add `Ohm` language support (#9991)

* feat: Add `Ohm` language support

Hope this commit makes it into release :)

* Update runtime/queries/ohm/highlights.scm

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* chore: final newline

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md  |   1 +
 languages.toml                      |  22 +++++
 runtime/queries/ohm/highlights.scm  | 122 ++++++++++++++++++++++++++++
 runtime/queries/ohm/indents.scm     |  37 +++++++++
 runtime/queries/ohm/injections.scm  |   7 ++
 runtime/queries/ohm/textobjects.scm |  40 +++++++++
 6 files changed, 229 insertions(+)
 create mode 100644 runtime/queries/ohm/highlights.scm
 create mode 100644 runtime/queries/ohm/indents.scm
 create mode 100644 runtime/queries/ohm/injections.scm
 create mode 100644 runtime/queries/ohm/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index b74a8cdb7cd5b..2030949eb465c 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -128,6 +128,7 @@
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
 | ocaml-interface | ✓ |  |  | `ocamllsp` |
 | odin | ✓ |  | ✓ | `ols` |
+| ohm | ✓ | ✓ | ✓ |  |
 | opencl | ✓ | ✓ | ✓ | `clangd` |
 | openscad | ✓ |  |  | `openscad-lsp` |
 | org | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index cbbfc5a91d3a9..9eb80414f36b0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3408,3 +3408,25 @@ formatter = { command = "prettier", args = ['--parser', 'glimmer'] }
 [[grammar]]
 name = "glimmer"
 source = { git = "https://github.com/ember-tooling/tree-sitter-glimmer", rev = "5dc6d1040e8ff8978ff3680e818d85447bbc10aa" }
+
+[[language]]
+name = "ohm"
+scope = "source.ohm"
+injection-regex = "ohm"
+file-types = ["ohm"]
+comment-token = "//"
+block-comment-tokens = [
+  { start = "/*", end = "*/" },
+  { start = "/**", end = "*/" },
+]
+indent = { tab-width = 2, unit = "  " }
+
+[language.auto-pairs]
+'"' = '"'
+'{' = '}'
+'(' = ')'
+'<' = '>'
+
+[[grammar]]
+name = "ohm"
+source = { git = "https://github.com/novusnota/tree-sitter-ohm", rev = "80f14f0e477ddacc1e137d5ed8e830329e3fb7a3" }
diff --git a/runtime/queries/ohm/highlights.scm b/runtime/queries/ohm/highlights.scm
new file mode 100644
index 0000000000000..68477aacc5aa6
--- /dev/null
+++ b/runtime/queries/ohm/highlights.scm
@@ -0,0 +1,122 @@
+; See: https://docs.helix-editor.com/master/themes.html#syntax-highlighting
+
+; attribute
+; ---------
+
+(case_name) @attribute
+
+; comment.line
+; ------------
+
+[
+  (singleline_comment)
+  (rule_descr)
+] @comment.line
+
+; comment.block
+; -------------
+
+(multiline_comment) @comment.block
+
+; function.method
+; ---------------
+
+(rule
+  name: (identifier) @function.method)
+
+; function.builtin
+; ----------------
+
+; Lexical
+((identifier) @function.builtin
+  (#any-of? @function.builtin
+    "any"
+    "alnum"
+    "end"
+    "digit" "hexDigit"
+    "letter"
+    "space"
+    "lower" "upper" "caseInsensitive"
+    "listOf" "nonemptyListOf" "emptyListOf"
+    "applySyntactic")
+  (#is-not? local))
+
+; Syntactic
+((identifier) @function.builtin
+  (#any-of? @function.builtin "ListOf" "NonemptyListOf" "EmptyListOf")
+  (#is-not? local))
+
+; function.method (continuing)
+; ---------------
+
+(term
+  base: (identifier) @function.method)
+
+; string.special
+; --------------
+
+(escape_char) @constant.character.escape
+
+; string
+; ------
+
+[
+  (terminal_string)
+  (one_char_terminal)
+] @string
+
+; type
+; ----
+
+(super_grammar
+  name: (identifier) @type)
+
+(grammar
+  name: (identifier) @type)
+
+; operator
+; --------
+
+[
+  ; "=" ":=" "+="
+  (define) (override) (extend)
+
+  ; "&" "~"
+  (lookahead) (negative_lookahead)
+
+  ; "#"
+  (lexification)
+
+  ; "*" "+" "?"
+  (zero_or_more) (one_or_more) (zero_or_one)
+
+  ; "..."
+  (super_splice)
+
+  "<:" ".." "|"
+] @operator
+
+; punctuation.bracket
+; -------------------
+
+[
+  "<"
+  ">"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(alt
+  "(" @punctuation.bracket
+  ")" @punctuation.bracket)
+
+; punctuation.delimiter
+; ---------------------
+
+"," @punctuation.delimiter
+
+; variable.parameter
+; ------------------
+
+(formals
+  (identifier) @variable.parameter)
diff --git a/runtime/queries/ohm/indents.scm b/runtime/queries/ohm/indents.scm
new file mode 100644
index 0000000000000..f56119aecff24
--- /dev/null
+++ b/runtime/queries/ohm/indents.scm
@@ -0,0 +1,37 @@
+; See: https://docs.helix-editor.com/guides/indent.html
+
+; indent
+; ------
+
+[
+  ; <..., ...>
+  (formals)
+  (params)
+
+  ; (...| ...)
+  (alt)
+] @indent
+
+; outdent
+; -------
+
+[
+  "}"
+  ")"
+  ">"
+] @outdent
+
+; align
+; -----
+
+; | ... | ...
+(rule_body
+  . (top_level_term) @anchor
+  (#set! "scope" "tail")) @align
+
+; N/A or unused:
+; --------------
+; indent.always
+; outdent.always
+; extend
+; extend.prevent-once
diff --git a/runtime/queries/ohm/injections.scm b/runtime/queries/ohm/injections.scm
new file mode 100644
index 0000000000000..dc50a7654705a
--- /dev/null
+++ b/runtime/queries/ohm/injections.scm
@@ -0,0 +1,7 @@
+; See: https://docs.helix-editor.com/guides/injection.html
+
+((singleline_comment) @injection.content
+ (#set! injection.language "comment"))
+
+((multiline_comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/ohm/textobjects.scm b/runtime/queries/ohm/textobjects.scm
new file mode 100644
index 0000000000000..855ad8de7181c
--- /dev/null
+++ b/runtime/queries/ohm/textobjects.scm
@@ -0,0 +1,40 @@
+; See: https://docs.helix-editor.com/guides/textobject.html
+
+; function.inside & around
+; ------------------------
+
+(rule
+  body: (_) @function.inside) @function.around
+
+; class.inside & around
+; ---------------------
+
+(grammar
+  body: (_) @class.inside) @class.around
+
+; parameter.inside & around
+; -------------------------
+
+(formals
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(rule_body
+  ((_) @parameter.inside . "|"? @parameter.around) @parameter.around)
+
+(params
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(alt
+  ((_) @parameter.inside . "|"? @parameter.around) @parameter.around)
+
+; comment.inside
+; --------------
+
+(multiline_comment)+ @comment.inside
+(singleline_comment)+ @comment.inside
+
+; comment.around
+; --------------
+
+(multiline_comment)+ @comment.around
+(singleline_comment)+ @comment.around

From 614a744d24e54225eae2ad0d27719b81c0cf9a4d Mon Sep 17 00:00:00 2001
From: Quentin <quentin.bettoum@mailo.com>
Date: Mon, 25 Mar 2024 02:29:36 +0100
Subject: [PATCH 070/101] Add narrow no-break space support (#9604)

---
 book/src/configuration.md       |  7 +++++--
 helix-term/src/ui/document.rs   |  9 +++++++++
 helix-tui/src/widgets/reflow.rs | 18 +++++++++++++++++-
 helix-view/src/editor.rs        | 11 +++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index c55426c013d19..83ab3f6b9d69a 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -255,8 +255,8 @@ Options for rendering whitespace with visible characters. Use `:set whitespace.r
 
 | Key | Description | Default |
 |-----|-------------|---------|
-| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `nbsp`, `tab`, and `newline` | `"none"` |
-| `characters` | Literal characters to use when rendering whitespace. Sub-keys may be any of `tab`, `space`, `nbsp`, `newline` or `tabpad` | See example below |
+| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `nbsp`, `nnbsp`, `tab`, and `newline` | `"none"` |
+| `characters` | Literal characters to use when rendering whitespace. Sub-keys may be any of `tab`, `space`, `nbsp`, `nnbsp`, `newline` or `tabpad` | See example below |
 
 Example
 
@@ -267,11 +267,14 @@ render = "all"
 [editor.whitespace.render]
 space = "all"
 tab = "all"
+nbsp = "none"
+nnbsp = "none"
 newline = "none"
 
 [editor.whitespace.characters]
 space = "·"
 nbsp = "⍽"
+nnbsp = "␣"
 tab = "→"
 newline = "⏎"
 tabpad = "·" # Tabs will look like "→···" (depending on tab width)
diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index dc61ca2e3b2bc..b571b83c2ddd5 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -341,6 +341,7 @@ pub struct TextRenderer<'a> {
     pub indent_guide_style: Style,
     pub newline: String,
     pub nbsp: String,
+    pub nnbsp: String,
     pub space: String,
     pub tab: String,
     pub virtual_tab: String,
@@ -395,6 +396,11 @@ impl<'a> TextRenderer<'a> {
         } else {
             " ".to_owned()
         };
+        let nnbsp = if ws_render.nnbsp() == WhitespaceRenderValue::All {
+            ws_chars.nnbsp.into()
+        } else {
+            " ".to_owned()
+        };
 
         let text_style = theme.get("ui.text");
 
@@ -405,6 +411,7 @@ impl<'a> TextRenderer<'a> {
             indent_guide_char: editor_config.indent_guides.character.into(),
             newline,
             nbsp,
+            nnbsp,
             space,
             tab,
             virtual_tab,
@@ -448,6 +455,7 @@ impl<'a> TextRenderer<'a> {
         let width = grapheme.width();
         let space = if is_virtual { " " } else { &self.space };
         let nbsp = if is_virtual { " " } else { &self.nbsp };
+        let nnbsp = if is_virtual { " " } else { &self.nnbsp };
         let tab = if is_virtual {
             &self.virtual_tab
         } else {
@@ -461,6 +469,7 @@ impl<'a> TextRenderer<'a> {
             // TODO special rendering for other whitespaces?
             Grapheme::Other { ref g } if g == " " => space,
             Grapheme::Other { ref g } if g == "\u{00A0}" => nbsp,
+            Grapheme::Other { ref g } if g == "\u{202F}" => nnbsp,
             Grapheme::Other { ref g } => g,
             Grapheme::Newline => &self.newline,
         };
diff --git a/helix-tui/src/widgets/reflow.rs b/helix-tui/src/widgets/reflow.rs
index c30aa6e032a1a..67c4db443892b 100644
--- a/helix-tui/src/widgets/reflow.rs
+++ b/helix-tui/src/widgets/reflow.rs
@@ -4,6 +4,7 @@ use helix_core::unicode::width::UnicodeWidthStr;
 use unicode_segmentation::UnicodeSegmentation;
 
 const NBSP: &str = "\u{00a0}";
+const NNBSP: &str = "\u{202f}";
 
 /// A state machine to pack styled symbols into lines.
 /// Cannot implement it as Iterator since it yields slices of the internal buffer (need streaming
@@ -58,7 +59,8 @@ impl<'a, 'b> LineComposer<'a> for WordWrapper<'a, 'b> {
         let mut symbols_exhausted = true;
         for StyledGrapheme { symbol, style } in &mut self.symbols {
             symbols_exhausted = false;
-            let symbol_whitespace = symbol.chars().all(&char::is_whitespace) && symbol != NBSP;
+            let symbol_whitespace =
+                symbol.chars().all(&char::is_whitespace) && symbol != NBSP && symbol != NNBSP;
 
             // Ignore characters wider that the total max width.
             if symbol.width() as u16 > self.max_line_width
@@ -496,6 +498,20 @@ mod test {
         assert_eq!(word_wrapper_space, vec!["AAAAAAAAAAAAAAA AAAA", "AAA",]);
     }
 
+    #[test]
+    fn line_composer_word_wrapper_nnbsp() {
+        let width = 20;
+        let text = "AAAAAAAAAAAAAAA AAAA\u{202f}AAA";
+        let (word_wrapper, _) = run_composer(Composer::WordWrapper { trim: true }, text, width);
+        assert_eq!(word_wrapper, vec!["AAAAAAAAAAAAAAA", "AAAA\u{202f}AAA",]);
+
+        // Ensure that if the character was a regular space, it would be wrapped differently.
+        let text_space = text.replace('\u{202f}', " ");
+        let (word_wrapper_space, _) =
+            run_composer(Composer::WordWrapper { trim: true }, &text_space, width);
+        assert_eq!(word_wrapper_space, vec!["AAAAAAAAAAAAAAA AAAA", "AAA",]);
+    }
+
     #[test]
     fn line_composer_word_wrapper_preserve_indentation() {
         let width = 20;
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 3c530c4e89bf1..dd360a78ebdd5 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -702,6 +702,7 @@ pub enum WhitespaceRender {
         default: Option<WhitespaceRenderValue>,
         space: Option<WhitespaceRenderValue>,
         nbsp: Option<WhitespaceRenderValue>,
+        nnbsp: Option<WhitespaceRenderValue>,
         tab: Option<WhitespaceRenderValue>,
         newline: Option<WhitespaceRenderValue>,
     },
@@ -733,6 +734,14 @@ impl WhitespaceRender {
             }
         }
     }
+    pub fn nnbsp(&self) -> WhitespaceRenderValue {
+        match *self {
+            Self::Basic(val) => val,
+            Self::Specific { default, nnbsp, .. } => {
+                nnbsp.or(default).unwrap_or(WhitespaceRenderValue::None)
+            }
+        }
+    }
     pub fn tab(&self) -> WhitespaceRenderValue {
         match *self {
             Self::Basic(val) => val,
@@ -756,6 +765,7 @@ impl WhitespaceRender {
 pub struct WhitespaceCharacters {
     pub space: char,
     pub nbsp: char,
+    pub nnbsp: char,
     pub tab: char,
     pub tabpad: char,
     pub newline: char,
@@ -766,6 +776,7 @@ impl Default for WhitespaceCharacters {
         Self {
             space: '·',   // U+00B7
             nbsp: '⍽',    // U+237D
+            nnbsp: '␣',   // U+2423
             tab: '→',     // U+2192
             newline: '⏎', // U+23CE
             tabpad: ' ',

From 1d1087822a3b91dfc6617e0d67bf4293ad4f38e2 Mon Sep 17 00:00:00 2001
From: Mo <76752051+mo8it@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:59:33 +0100
Subject: [PATCH 071/101] Use the OS path separator instead of / (#10000)

---
 helix-stdx/src/path.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-stdx/src/path.rs b/helix-stdx/src/path.rs
index ff2bffae5fa13..968596a703fc9 100644
--- a/helix-stdx/src/path.rs
+++ b/helix-stdx/src/path.rs
@@ -3,7 +3,7 @@ pub use etcetera::home_dir;
 use std::{
     borrow::Cow,
     ffi::OsString,
-    path::{Component, Path, PathBuf},
+    path::{Component, Path, PathBuf, MAIN_SEPARATOR_STR},
 };
 
 use crate::env::current_working_dir;
@@ -18,7 +18,8 @@ where
     if let Ok(home) = home_dir() {
         if let Ok(stripped) = path.strip_prefix(&home) {
             let mut path = OsString::with_capacity(2 + stripped.as_os_str().len());
-            path.push("~/");
+            path.push("~");
+            path.push(MAIN_SEPARATOR_STR);
             path.push(stripped);
             return Cow::Owned(PathBuf::from(path));
         }

From d4b467090bfc4f29e66cc92aff2138e04c30cf65 Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Tue, 26 Mar 2024 01:08:42 +0100
Subject: [PATCH 072/101] doc: small formatting corrections (#9986)

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

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 83ab3f6b9d69a..5e22cebf8f662 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -68,7 +68,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
 | `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |
 | `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid`
-| `jump-label-alphabet` | The characters that are used to generate two character jump labels. Characters at the start of the alphabet are used first. | "abcdefghijklmnopqrstuvwxyz"
+| `jump-label-alphabet` | The characters that are used to generate two character jump labels. Characters at the start of the alphabet are used first. | `"abcdefghijklmnopqrstuvwxyz"`
 
 ### `[editor.statusline]` Section
 
@@ -76,7 +76,7 @@ Allows configuring the statusline at the bottom of the editor.
 
 The configuration distinguishes between three areas of the status line:
 
-`[ ... ... LEFT ... ... | ... ... ... ... CENTER ... ... ... ... | ... ... RIGHT ... ... ]`
+`[ ... ... LEFT ... ... | ... ... ... CENTER ... ... ... | ... ... RIGHT ... ... ]`
 
 Statusline elements can be defined as follows:
 
@@ -179,7 +179,7 @@ All git related options are only enabled in a git repository.
 |`git-ignore` | Enables reading `.gitignore` files | `true`
 |`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludesfile` option | `true`
 |`git-exclude` | Enables reading `.git/info/exclude` files | `true`
-|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
+|`max-depth` | Set with an integer value for maximum depth to recurse | Unset by default
 
 Ignore files can be placed locally as `.ignore` or put in your home directory as `~/.ignore`. They support the usual ignore and negative ignore (unignore) rules used in `.gitignore` files.
 
@@ -225,7 +225,7 @@ Additionally, this setting can be used in a language config. Unless
 the editor setting is `false`, this will override the editor config in
 documents with this language.
 
-Example `languages.toml` that adds <> and removes ''
+Example `languages.toml` that adds `<>` and removes `''`
 
 ```toml
 [[language]]
@@ -255,7 +255,7 @@ Options for rendering whitespace with visible characters. Use `:set whitespace.r
 
 | Key | Description | Default |
 |-----|-------------|---------|
-| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `nbsp`, `nnbsp`, `tab`, and `newline` | `"none"` |
+| `render` | Whether to render whitespace. May either be `all` or `none`, or a table with sub-keys `space`, `nbsp`, `nnbsp`, `tab`, and `newline` | `none` |
 | `characters` | Literal characters to use when rendering whitespace. Sub-keys may be any of `tab`, `space`, `nbsp`, `nnbsp`, `newline` or `tabpad` | See example below |
 
 Example

From 3205bc413217e6eb3759b192c903082e578d279c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 12:55:58 +0900
Subject: [PATCH 073/101] build(deps): bump the rust-dependencies group with 6
 updates (#10007)

Bumps the rust-dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [smallvec](https://github.com/servo/rust-smallvec) | `1.13.1` | `1.13.2` |
| [arc-swap](https://github.com/vorner/arc-swap) | `1.7.0` | `1.7.1` |
| [regex](https://github.com/rust-lang/regex) | `1.10.3` | `1.10.4` |
| [indoc](https://github.com/dtolnay/indoc) | `2.0.4` | `2.0.5` |
| [rustix](https://github.com/bytecodealliance/rustix) | `0.38.31` | `0.38.32` |
| [which](https://github.com/harryfei/which-rs) | `6.0.0` | `6.0.1` |


Updates `smallvec` from 1.13.1 to 1.13.2
- [Release notes](https://github.com/servo/rust-smallvec/releases)
- [Commits](https://github.com/servo/rust-smallvec/compare/v1.13.1...v1.13.2)

Updates `arc-swap` from 1.7.0 to 1.7.1
- [Changelog](https://github.com/vorner/arc-swap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vorner/arc-swap/commits)

Updates `regex` from 1.10.3 to 1.10.4
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.10.3...1.10.4)

Updates `indoc` from 2.0.4 to 2.0.5
- [Release notes](https://github.com/dtolnay/indoc/releases)
- [Commits](https://github.com/dtolnay/indoc/compare/2.0.4...2.0.5)

Updates `rustix` from 0.38.31 to 0.38.32
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.31...v0.38.32)

Updates `which` from 6.0.0 to 6.0.1
- [Release notes](https://github.com/harryfei/which-rs/releases)
- [Changelog](https://github.com/harryfei/which-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/harryfei/which-rs/compare/6.0.0...6.0.1)

---
updated-dependencies:
- dependency-name: smallvec
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: arc-swap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: indoc
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: rustix
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: which
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 33 +++++++++++++++++++--------------
 helix-core/Cargo.toml |  2 +-
 helix-term/Cargo.toml |  4 ++--
 helix-vcs/Cargo.toml  |  2 +-
 helix-view/Cargo.toml |  2 +-
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 13c1ea3333649..a53734552dafc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,9 +68,9 @@ checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "arc-swap"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "autocfg"
@@ -1544,9 +1544,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "is-docker"
@@ -1923,9 +1923,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1981,9 +1981,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
  "bitflags 2.5.0",
  "errno",
@@ -2144,9 +2144,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smartstring"
@@ -2558,15 +2558,14 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "which"
-version = "6.0.0"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c"
+checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7"
 dependencies = [
  "either",
  "home",
- "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "winsafe",
 ]
 
 [[package]]
@@ -2816,6 +2815,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winsafe"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+
 [[package]]
 name = "xtask"
 version = "23.10.0"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index a992506924b81..7482262eb59e3 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -56,4 +56,4 @@ globset = "0.4.14"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
-indoc = "2.0.4"
+indoc = "2.0.5"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index bc3117d205e97..b00e97488f2fa 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -41,7 +41,7 @@ crossterm = { version = "0.27", features = ["event-stream"] }
 signal-hook = "0.3"
 tokio-stream = "0.1"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
-arc-swap = { version = "1.7.0" }
+arc-swap = { version = "1.7.1" }
 termini = "1"
 
 # Logging
@@ -83,5 +83,5 @@ helix-loader = { path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.13"
-indoc = "2.0.4"
+indoc = "2.0.5"
 tempfile = "3.10.1"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 49b3661e22b32..d54f5312bbc5f 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -17,7 +17,7 @@ helix-event = { path = "../helix-event" }
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 parking_lot = "0.12"
-arc-swap = { version = "1.7.0" }
+arc-swap = { version = "1.7.1" }
 
 gix = { version = "0.61.0", features = ["attributes"], default-features = false, optional = true }
 imara-diff = "0.1.5"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 6eab0b5e7f96f..f12185c86a5e3 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -31,7 +31,7 @@ crossterm = { version = "0.27", optional = true }
 once_cell = "1.19"
 url = "2.5.0"
 
-arc-swap = { version = "1.7.0" }
+arc-swap = { version = "1.7.1" }
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tokio-stream = "0.1"

From a0d6566140fe43a3b2e74ece1f8e753241a60cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 26 Mar 2024 14:46:56 +0900
Subject: [PATCH 074/101] Fix regression in color-modes

Fixes #10006
---
 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 2939a257328a4..8a87242f99e8d 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -173,7 +173,7 @@ fn render_mode<'a>(context: &RenderContext) -> Spans<'a> {
         " ".into()
     };
     let modename = format!(" {} ", modename);
-    if config.color_modes {
+    if visible && config.color_modes {
         Span::styled(
             modename,
             match context.editor.mode() {

From 07e21a10f065eab5491e1e4a1a7aa12000b47d59 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 26 Mar 2024 01:49:39 -0400
Subject: [PATCH 075/101] Revert "helix-term: allow to backspace out-of the
 command prompt (#9828)" (#10005)

This reverts commit 0dc67ff8852ce99d40ad4464062ebe212b0b03a1.

See the post-merge discussion in #9828. The old behavior was less
surprising and we have other ways to abort from a prompt, so let's
revert the behavior change.
---
 helix-term/src/ui/prompt.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index d46c131381944..a6ee7f05dde6e 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -544,10 +544,6 @@ impl Component for Prompt {
                 (self.callback_fn)(cx, &self.line, PromptEvent::Update);
             }
             ctrl!('h') | key!(Backspace) | shift!(Backspace) => {
-                if self.line.is_empty() {
-                    (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
-                    return close_fn;
-                }
                 self.delete_char_backwards(cx.editor);
                 (self.callback_fn)(cx, &self.line, PromptEvent::Update);
             }

From 1e50fb8b556db083a5aaf6bf1279595cde59a1c1 Mon Sep 17 00:00:00 2001
From: Ben Lee-Cohen <ben@bencohen.net>
Date: Tue, 26 Mar 2024 10:51:53 -0400
Subject: [PATCH 076/101] Adding jump styles for Nord and Nord Light (#10008)

Co-authored-by: Ben Lee-Cohen <ben@lee-cohen.com>
---
 runtime/themes/nord.toml       | 3 ++-
 runtime/themes/nord_light.toml | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index dab31610f6ac5..0fe6db12fd2f9 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -123,9 +123,10 @@
 "ui.statusline.select" = { fg = "nord1", bg = "nord7" }
 "ui.statusline.separator" = "nord3"
 
-# Virtual/invisable text
+# Virtual/invisible text
 "ui.virtual.indent-guide" = "nord3"
 "ui.virtual.inlay-hint" = { fg = "nord3", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "nord11", modifiers = ["bold"] }
 "ui.virtual.ruler" = { bg = "nord1" }
 "ui.virtual.whitespace" = "nord3"
 "ui.virtual.wrap" = "nord3"
diff --git a/runtime/themes/nord_light.toml b/runtime/themes/nord_light.toml
index b37d35962bc32..2d36cc806d853 100644
--- a/runtime/themes/nord_light.toml
+++ b/runtime/themes/nord_light.toml
@@ -6,8 +6,6 @@
 "ui.cursorline" = {bg="nord4"}
 "ui.statusline" = {bg="nord4", fg="nord0"}
 "ui.statusline.inactive" = {bg="nord5", fg="nord0"}
-"ui.virtual" = "nord8"
-"ui.virtual.ruler" = {bg="nord4"}
 "ui.cursor.match" = {bg="nord8"}
 "ui.cursor" = {bg="nord10", fg="nord6"}
 "ui.cursorline.primary" = {bg="nord5"}
@@ -25,6 +23,13 @@
 "ui.statusline.insert" = { fg = "nord0", bg = "nord13" }
 "ui.statusline.select" = { fg = "nord0", bg = "nord15" }
 
+# Virtual/invisible text
+"ui.virtual" = "nord8"
+"ui.virtual.ruler" = {bg="nord4"}
+"ui.virtual.inlay-hint" = { fg = "nord3", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "nord11", modifiers = ["bold"] }
+
+
 
 "diagnostic.error" = { underline = { color = "nord11", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }

From cef839e47779026322c072a10298217742d27166 Mon Sep 17 00:00:00 2001
From: Ben Lee-Cohen <ben@bencohen.net>
Date: Tue, 26 Mar 2024 12:18:13 -0400
Subject: [PATCH 077/101] feat: add jump format for monokai family (#10009)

Co-authored-by: Ben Lee-Cohen <ben@lee-cohen.com>
---
 runtime/themes/monokai.toml               | 1 +
 runtime/themes/monokai_aqua.toml          | 2 ++
 runtime/themes/monokai_pro.toml           | 1 +
 runtime/themes/monokai_pro_machine.toml   | 1 +
 runtime/themes/monokai_pro_octagon.toml   | 1 +
 runtime/themes/monokai_pro_ristretto.toml | 1 +
 runtime/themes/monokai_pro_spectrum.toml  | 1 +
 runtime/themes/monokai_soda.toml          | 1 +
 8 files changed, 9 insertions(+)

diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index 66106d4801fe8..bcb6c8d05f6b3 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -34,6 +34,7 @@
 "comment" = { fg = "#88846F" }
 "ui.virtual.whitespace" = "#88846F"
 "ui.virtual.ruler" = { bg = "#24241e" }
+"ui.virtual.jump-label" = { fg = "special", modifiers = ["bold"] }
 
 "string" = { fg = "#e6db74" }
 "constant.character" = { fg = "#e6db74" }
diff --git a/runtime/themes/monokai_aqua.toml b/runtime/themes/monokai_aqua.toml
index 0fe482546a0d2..0cb9300d053a3 100644
--- a/runtime/themes/monokai_aqua.toml
+++ b/runtime/themes/monokai_aqua.toml
@@ -12,6 +12,8 @@ inherits = "monokai"
 "ui.statusline.insert" = { fg = "light-black", bg = "green" }
 "ui.statusline.select" = { fg = "light-black", bg = "purple" }
 
+"ui.virtual.jump-label" = { fg = "cyan", modifiers = ["bold"] }
+
 [palette]
 cyan = "#66D9EF"
 type = "#66D9EF"
diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index a898671f64bd6..65a95a7d39a66 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -8,6 +8,7 @@
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
 "ui.virtual.ruler" = { bg = "base1" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 "info" = "base8"
 "hint" = "base8"
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index 519c9ed3999cd..739418ceaeb2e 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -8,6 +8,7 @@
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
 "ui.virtual.ruler" = { bg = "base1" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 "info" = "base8"
 "hint" = "base8"
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index 9be6bdc00e2da..c88b327bdb181 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -8,6 +8,7 @@
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
 "ui.virtual.ruler" = { bg = "base1" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 "info" = "base8"
 "hint" = "base8"
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index d002d13fa9493..6e1a0cb29187d 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -8,6 +8,7 @@
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
 "ui.virtual.ruler" = { bg = "base1" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 "info" = "base8"
 "hint" = "base8"
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 3cec2f1a3f10e..89b131bea0f42 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -8,6 +8,7 @@
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base4"
 "ui.virtual.ruler" = { bg = "base1" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 "info" = "base8"
 "hint" = "base8"
diff --git a/runtime/themes/monokai_soda.toml b/runtime/themes/monokai_soda.toml
index 7e43247e3c0d4..84a846eb75ba0 100644
--- a/runtime/themes/monokai_soda.toml
+++ b/runtime/themes/monokai_soda.toml
@@ -102,6 +102,7 @@
 "ui.text.focus" = { fg = "yellow", modifiers = ["bold"] }
 "ui.virtual" = "darkgray"
 "ui.virtual.ruler" = { bg = "darkgray" }
+"ui.virtual.jump-label" = { fg = "softorange", modifiers = ["bold"] }
 
 # Palette
 

From a6c6fa4c8ea3db3520f64de88c55729980720928 Mon Sep 17 00:00:00 2001
From: RoloEdits <RoloEdits@gmail.com>
Date: Tue, 26 Mar 2024 12:48:08 -0700
Subject: [PATCH 078/101] feat(themes): add `jump-label` for gruvbox themes
 (#10012)

---
 runtime/themes/gruvbox.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index e3eef1855a9c1..3c1dfc593725d 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -65,6 +65,7 @@
 "ui.virtual.ruler" = { bg = "bg1" }
 "ui.virtual.inlay-hint" = { fg = "gray1" }
 "ui.virtual.wrap" = { fg = "bg2" }
+"ui.virtual.jump-label" = { fg = "purple0", modifiers = ["bold"] }
 
 "diagnostic.warning" = { underline = { color = "orange1", style = "curl" } }
 "diagnostic.error" = { underline = { color = "red1", style = "curl" } }

From cb286b7a5df247057602f3bba3254b4c58093375 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 27 Mar 2024 01:34:47 -0400
Subject: [PATCH 079/101] Fix rustc warnings about unused 'pub use's (#10011)

---
 helix-term/src/handlers.rs | 1 -
 helix-term/src/lib.rs      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/helix-term/src/handlers.rs b/helix-term/src/handlers.rs
index ef5369f8505eb..1b7d9b8c0b923 100644
--- a/helix-term/src/handlers.rs
+++ b/helix-term/src/handlers.rs
@@ -9,7 +9,6 @@ use crate::handlers::completion::CompletionHandler;
 use crate::handlers::signature_help::SignatureHelpHandler;
 
 pub use completion::trigger_auto_completion;
-pub use helix_view::handlers::lsp::SignatureHelpInvoked;
 pub use helix_view::handlers::Handlers;
 
 mod completion;
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index 8b7919951813d..7719a6965548d 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -20,8 +20,6 @@ mod handlers;
 use ignore::DirEntry;
 use url::Url;
 
-pub use keymap::macros::*;
-
 #[cfg(windows)]
 fn true_color() -> bool {
     true

From f21efc7a2fe579d06867d63c3ec86b1458415707 Mon Sep 17 00:00:00 2001
From: Vladyslav Karasov <36513243+cotneit@users.noreply.github.com>
Date: Wed, 27 Mar 2024 15:31:35 +0200
Subject: [PATCH 080/101] fix: don't highlight colons (:) in comments (#10014)

---
 runtime/queries/comment/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/runtime/queries/comment/highlights.scm b/runtime/queries/comment/highlights.scm
index ba26ca0bfa704..e0916cecedff5 100644
--- a/runtime/queries/comment/highlights.scm
+++ b/runtime/queries/comment/highlights.scm
@@ -1,5 +1,3 @@
-":" @punctuation.delimiter
-
 ; Hint level tags
 ((tag (name) @hint)
  (#match? @hint "^(HINT|MARK|PASSED|STUB|MOCK)$"))

From c69ad7b3bf53e79807b053dce03ffbac73ba34cf Mon Sep 17 00:00:00 2001
From: mlemesle <33993288+mlemesle@users.noreply.github.com>
Date: Thu, 28 Mar 2024 15:58:50 +0100
Subject: [PATCH 081/101] Add jump-label to Kanagawa theme + format (#10030)

* Add jump-label to Kanagawa theme + format

* Remove bg color for jump-label

* Remove values alignment
---
 runtime/themes/kanagawa.toml | 77 ++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index d0576a4e37474..4ec938f4183d1 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -19,6 +19,7 @@
 "ui.virtual.inlay-hint" = "fujiGray"
 "ui.virtual.inlay-hint.parameter" = { fg = "carpYellow", modifiers = ["dim"] }
 "ui.virtual.inlay-hint.type" = { fg = "waveAqua2", modifiers = ["dim"] }
+"ui.virtual.jump-label" = { fg = "peachRed", modifiers = ["bold"] }
 
 "ui.statusline" = { fg = "oldWhite", bg = "sumiInk0" }
 "ui.statusline.inactive" = { fg = "fujiGray", bg = "sumiInk0" }
@@ -36,7 +37,7 @@
 "ui.text" = "fujiWhite"
 "ui.text.focus" = { fg = "fujiWhite", bg = "waveBlue1", modifiers = ["bold"] }
 
-"ui.cursor" = { fg = "waveBlue1", bg = "waveAqua2"}
+"ui.cursor" = { fg = "waveBlue1", bg = "waveAqua2" }
 "ui.cursor.primary" = { fg = "waveBlue1", bg = "fujiWhite" }
 "ui.cursor.match" = { fg = "waveRed", modifiers = ["bold"] }
 "ui.highlight" = { fg = "fujiWhite", bg = "waveBlue2" }
@@ -44,7 +45,7 @@
 "ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue2", modifiers = ["bold"] }
 "ui.menu.scroll" = { fg = "oldWhite", bg = "waveBlue1" }
 
-"ui.cursorline.primary" = { bg = "sumiInk3"}
+"ui.cursorline.primary" = { bg = "sumiInk3" }
 "ui.cursorcolumn.primary" = { bg = "sumiInk3" }
 
 "diagnostic.error" = { underline = { color = "samuraiRed", style = "curl" } }
@@ -112,41 +113,41 @@ hint = "dragonBlue"
 "markup.raw" = "springGreen"
 
 [palette]
-seaFoam       = "#C7CCD1" # custom lighter foreground
-fujiWhite     = "#DCD7BA" # default foreground
-oldWhite      = "#C8C093" # dark foreground, e.g. statuslines
-sumiInk0      = "#16161D" # dark background, e.g. statuslines, floating windows
-sumiInk1      = "#1F1F28" # default background
-sumiInk2      = "#2A2A37" # lighter background, e.g. colorcolumns, folds
-sumiInk3      = "#363646" # lighter background, e.g. cursorline
-sumiInk4      = "#54546D" # darker foreground, e.g. linenumbers, fold column
-waveBlue1     = "#223249" # popup background, visual selection background
-waveBlue2     = "#2D4F67" # popup selection background, search background
-winterGreen   = "#2B3328" # diff add background
-winterYellow  = "#49443C" # diff change background
-winterRed     = "#43242B" # diff deleted background
-winterBlue    = "#252535" # diff line background
-autumnGreen   = "#76946A" # git add
-autumnRed     = "#C34043" # git delete
-autumnYellow  = "#DCA561" # git change
-samuraiRed    = "#E82424" # diagnostic error
-roninYellow   = "#FF9E3B" # diagnostic warning
-waveAqua1     = "#6A9589" # diagnostic info
-dragonBlue    = "#658594" # diagnostic hint
-fujiGray      = "#727169" # comments
+seaFoam = "#C7CCD1"       # custom lighter foreground
+fujiWhite = "#DCD7BA"     # default foreground
+oldWhite = "#C8C093"      # dark foreground, e.g. statuslines
+sumiInk0 = "#16161D"      # dark background, e.g. statuslines, floating windows
+sumiInk1 = "#1F1F28"      # default background
+sumiInk2 = "#2A2A37"      # lighter background, e.g. colorcolumns, folds
+sumiInk3 = "#363646"      # lighter background, e.g. cursorline
+sumiInk4 = "#54546D"      # darker foreground, e.g. linenumbers, fold column
+waveBlue1 = "#223249"     # popup background, visual selection background
+waveBlue2 = "#2D4F67"     # popup selection background, search background
+winterGreen = "#2B3328"   # diff add background
+winterYellow = "#49443C"  # diff change background
+winterRed = "#43242B"     # diff deleted background
+winterBlue = "#252535"    # diff line background
+autumnGreen = "#76946A"   # git add
+autumnRed = "#C34043"     # git delete
+autumnYellow = "#DCA561"  # git change
+samuraiRed = "#E82424"    # diagnostic error
+roninYellow = "#FF9E3B"   # diagnostic warning
+waveAqua1 = "#6A9589"     # diagnostic info
+dragonBlue = "#658594"    # diagnostic hint
+fujiGray = "#727169"      # comments
 springViolet1 = "#938AA9" # light foreground
-oniViolet     = "#957FB8" # statements and keywords
-crystalBlue   = "#7E9CD8" # functions and titles
+oniViolet = "#957FB8"     # statements and keywords
+crystalBlue = "#7E9CD8"   # functions and titles
 springViolet2 = "#9CABCA" # brackets and punctuation
-springBlue    = "#7FB4CA" # specials and builtins
-lightBlue     = "#A3D4D5" # not used!
-waveAqua2     = "#7AA89F" # types
-springGreen   = "#98BB6C" # strings
-boatYellow1   = "#938056" # not used
-boatYellow2   = "#C0A36E" # operators, regex
-carpYellow    = "#E6C384" # identifiers
-sakuraPink    = "#D27E99" # numbers
-waveRed       = "#E46876" # standout specials 1, e.g. builtin variables
-peachRed      = "#FF5D62" # standout specials 2, e.g. exception handling, returns
-surimiOrange  = "#FFA066" # constants, imports, booleans
-katanaGray    = "#717C7C" # deprecated
+springBlue = "#7FB4CA"    # specials and builtins
+lightBlue = "#A3D4D5"     # not used!
+waveAqua2 = "#7AA89F"     # types
+springGreen = "#98BB6C"   # strings
+boatYellow1 = "#938056"   # not used
+boatYellow2 = "#C0A36E"   # operators, regex
+carpYellow = "#E6C384"    # identifiers
+sakuraPink = "#D27E99"    # numbers
+waveRed = "#E46876"       # standout specials 1, e.g. builtin variables
+peachRed = "#FF5D62"      # standout specials 2, e.g. exception handling, returns
+surimiOrange = "#FFA066"  # constants, imports, booleans
+katanaGray = "#717C7C"    # deprecated

From 7ec509e2f9a054eb814789ac34f4222bebb67230 Mon Sep 17 00:00:00 2001
From: Joe <Josephharrisonlim@gmail.com>
Date: Thu, 28 Mar 2024 21:45:17 -0400
Subject: [PATCH 082/101] Add injections for GraphQL and ERB in Ruby (#10036)

---
 runtime/queries/ruby/injections.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/runtime/queries/ruby/injections.scm b/runtime/queries/ruby/injections.scm
index 1a865df1969f4..3e0d8bb833979 100644
--- a/runtime/queries/ruby/injections.scm
+++ b/runtime/queries/ruby/injections.scm
@@ -6,3 +6,18 @@
   (heredoc_end) @name
   (#set! injection.language "sql")) 
  (#eq? @name "SQL"))
+
+((heredoc_body
+  (heredoc_content) @injection.content
+  (heredoc_end) @name
+  (#set! injection.language "graphql"))
+ (#any-of? @name
+       "GQL"
+       "GRAPHQL"))
+
+((heredoc_body
+  (heredoc_content) @injection.content
+  (heredoc_end) @name
+  (#set! injection.language "erb"))
+ (#eq? @name "ERB"))
+

From 527cbe656c740c997b299f989ac1be7cac4a8e16 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 29 Mar 2024 08:31:27 -0500
Subject: [PATCH 083/101] chore: update tree-sitter-markdown (#10039)

---
 languages.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 9eb80414f36b0..4a21fe74bfd07 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1481,7 +1481,7 @@ block-comment-tokens = { start = "<!--", end = "-->" }
 
 [[grammar]]
 name = "markdown"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee", subpath = "tree-sitter-markdown" }
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "62516e8c78380e3b51d5b55727995d2c511436d8", subpath = "tree-sitter-markdown" }
 
 [[language]]
 name = "markdown.inline"
@@ -1492,7 +1492,7 @@ grammar = "markdown_inline"
 
 [[grammar]]
 name = "markdown_inline"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee", subpath = "tree-sitter-markdown-inline" }
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "62516e8c78380e3b51d5b55727995d2c511436d8", subpath = "tree-sitter-markdown-inline" }
 
 [[language]]
 name = "dart"

From 381976a04cca05b6658eb1eaf921532d4895298d Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Sat, 30 Mar 2024 11:43:53 +0100
Subject: [PATCH 084/101] fix: cursor line on material themes (#10043)

---
 runtime/themes/material_darker.toml     | 1 +
 runtime/themes/material_deep_ocean.toml | 3 ++-
 runtime/themes/material_oceanic.toml    | 3 ++-
 runtime/themes/material_palenight.toml  | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/material_darker.toml b/runtime/themes/material_darker.toml
index f117f7194078c..52cea1d4cd225 100644
--- a/runtime/themes/material_darker.toml
+++ b/runtime/themes/material_darker.toml
@@ -13,6 +13,7 @@ disabled = "#474747"
 
 accent = "#ff9800"
 
+active = "#323232"
 highlight = "#3f3f3f"
 
 comment = "#616161"
diff --git a/runtime/themes/material_deep_ocean.toml b/runtime/themes/material_deep_ocean.toml
index b98a32e559b0a..6cf4c0a6fcec9 100644
--- a/runtime/themes/material_deep_ocean.toml
+++ b/runtime/themes/material_deep_ocean.toml
@@ -76,7 +76,7 @@
 "ui.cursor" = { bg = "highlight", fg = "white" }
 
 "ui.cursor.primary" = { bg = "white", fg = "gray" }
-"ui.cursorline.primary" = { bg = "white" }
+"ui.cursorline.primary" = { bg = "active" }
 
 "ui.virtual" = { fg = "gray" }
 "ui.virtual.ruler" = { bg = "highlight" }
@@ -114,6 +114,7 @@ disabled = "#464b5d"
 
 accent = "#84ffff"
 
+active = "#1a1c25"
 highlight = "#1f2233"
 
 comment = "#464b5d"
diff --git a/runtime/themes/material_oceanic.toml b/runtime/themes/material_oceanic.toml
index ea4930d30510a..fde54d7d4233d 100644
--- a/runtime/themes/material_oceanic.toml
+++ b/runtime/themes/material_oceanic.toml
@@ -12,10 +12,11 @@ disabled = "#415967"
 
 accent = "#009688"
 
+active = "#314549"
 highlight = "#425b67"
 
 comment = "#546e7a"
 
 selection = "#395b65"
 
-line-number = "#355058"
\ No newline at end of file
+line-number = "#355058"
diff --git a/runtime/themes/material_palenight.toml b/runtime/themes/material_palenight.toml
index ef9c27e26acd9..f34517df2aacf 100644
--- a/runtime/themes/material_palenight.toml
+++ b/runtime/themes/material_palenight.toml
@@ -10,10 +10,11 @@ disabled = "#515772"
 
 accent = "#ab47bc"
 
+active = "#414863"
 highlight = "#444267"
 
 comment = "#676e95"
 
 selection = "#444267"
 
-line-number = "#3a3f58"
\ No newline at end of file
+line-number = "#3a3f58"

From 787a237f8b5c77bfa3cf6897573ba79f94839e81 Mon Sep 17 00:00:00 2001
From: Yannic Nuwenhof <ynuwenhof@pm.me>
Date: Sat, 30 Mar 2024 10:45:38 +0000
Subject: [PATCH 085/101] Add JetBrains default dark theme (#9967)

---
 runtime/themes/jetbrains_dark.toml | 99 ++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 runtime/themes/jetbrains_dark.toml

diff --git a/runtime/themes/jetbrains_dark.toml b/runtime/themes/jetbrains_dark.toml
new file mode 100644
index 0000000000000..c73fe93afcaab
--- /dev/null
+++ b/runtime/themes/jetbrains_dark.toml
@@ -0,0 +1,99 @@
+"type.builtin" = "red207"
+"type.enum" = "red199"
+"constant.builtin" = "red207"
+"constant.numeric" = "blue184"
+string = "green171"
+comment = "blue133"
+"comment.block.documentation" = "green130"
+"variable.builtin" = "red207"
+"variable.other.member" = "red199"
+label = "red199"
+keyword = "red207"
+function = "blue245"
+"function.macro" = "red179"
+tag = "red213"
+
+"markup.heading" = { fg = "red199", modifiers = ["italic"] }
+"markup.heading.marker" = "red207"
+"markup.list" = "red207"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link" = { fg = "blue247", underline = { style = "line" } }
+"markup.raw" = { bg = "blue64" }
+
+"diff.plus" = "green145"
+"diff.minus" = "blue145"
+"diff.delta" = "blue173"
+
+"ui.background" = { fg = "blue196", bg = "blue34" }
+"ui.gutter" = "blue56"
+"ui.gutter.selected" = { fg ="blue56", bg = "blue46" }
+"ui.linenr" = "blue89"
+"ui.linenr.selected" = "blue171"
+"ui.statusline" = { bg = "blue48" }
+"ui.statusline.inactive" = "blue89"
+"ui.statusline.normal" = { fg = "blue48", bg = "green156", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "blue48", bg = "blue247", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "blue48", bg = "red194", modifiers = ["bold"] }
+"ui.popup" = { bg = "blue48" }
+"ui.text.focus" = "blue247"
+"ui.virtual" = "blue122"
+"ui.virtual.ruler" = { bg = "blue64" }
+"ui.virtual.whitespace" = "blue122"
+"ui.virtual.indent-guide" = "blue56"
+"ui.virtual.inlay-hint" = { fg = "blue145", bg = "blue50" }
+"ui.menu" = { bg = "blue48" }
+"ui.menu.selected" = { bg = "blue110" }
+"ui.menu.scroll" = { fg = "blue81", bg = "blue48" }
+"ui.selection" = { bg = "blue131" }
+"ui.cursorline.primary" = { bg = "blue46" }
+"ui.cursorline.secondary" = { bg = "blue46" }
+"ui.cursorcolumn.primary" = { bg = "blue46" }
+"ui.cursorcolumn.secondary" = { bg = "blue46" }
+
+warning = "red194"
+error = "red214"
+info = "blue247"
+hint = "green156"
+
+"diagnostic" = { underline = { style = "curl" } }
+"diagnostic.hint" = { underline = { color = "green156", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue247", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "red194", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red214", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
+
+[palette]
+red179 = "#b3ae60"
+red194 = "#c29e4a"
+red199 = "#c77dbb"
+red207 = "#cf8e6d"
+red213 = "#d5b778"
+red214 = "#d64d5b"
+
+green130 = "#5f826b"
+green145 = "#549159"
+green156 = "#499c54"
+green171 = "#6aab73"
+
+blue34 = "#1e1f22"
+blue46 = "#26282e"
+blue48 = "#2b2d30"
+blue50 = "#2d2e32"
+blue56 = "#313438"
+blue64 = "#293c40"
+blue81 = "#4d4e51"
+blue89 = "#4b5059"
+blue110 = "#2e436e"
+blue122 = "#6f737a"
+blue131 = "#214283"
+blue133 = "#7a7e85"
+blue145 = "#868a91"
+blue171 = "#A1A3AB"
+blue173 = "#375fad"
+blue184 = "#2aacb8"
+blue196 = "#bcbec4"
+blue245 = "#56a8f5"
+blue247 = "#57aaf7"

From 64c1de19884b0eaf43ccb3335115c2cbca8d7432 Mon Sep 17 00:00:00 2001
From: Chris <artofchrism@gmail.com>
Date: Sat, 30 Mar 2024 12:40:38 +0000
Subject: [PATCH 086/101] Add main.odin to Odin roots (#9968)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 4a21fe74bfd07..a5764420b1569 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2038,7 +2038,7 @@ name = "odin"
 auto-format = true
 scope = "source.odin"
 file-types = ["odin"]
-roots = ["ols.json"]
+roots = ["ols.json", "main.odin"]
 language-servers = [ "ols" ]
 comment-token = "//"
 block-comment-tokens = { start = "/*", end = "*/" }

From 2cadec0b1182332338a5a1cc3062776f834d8835 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 30 Mar 2024 09:28:02 -0400
Subject: [PATCH 087/101] Add changelog notes for 24.03 (#9946)

* changelog: Checkpoint 2024-03-20

commit: b8e79c0ef52e71136712959af426f318d674fc96

* Bump the version to 24.3.0

* changelog: Checkpoint 2024-03-25

commit: 614a744d24e54225eae2ad0d27719b81c0cf9a4d

* Address review comments

* changelog: Checkpoint 2024-03-30

commit: 64c1de19884b0eaf43ccb3335115c2cbca8d7432

* Adjust release day to 2024-03-30

* Linkify
---
 CHANGELOG.md              | 253 ++++++++++++++++++++++++++++++++++++++
 Cargo.lock                |  24 ++--
 Cargo.toml                |   2 +-
 contrib/Helix.appdata.xml |   3 +
 4 files changed, 269 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5edbf72b122b..5ff92a2779bf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,256 @@
+# 24.03 (2024-03-30)
+
+As always, a big thank you to the all of the contributors! This release saw changes from 125 contributors.
+
+Breaking changes:
+
+- `suffix` file-types in the `file-types` key in language configuration have been removed ([#8006](https://github.com/helix-editor/helix/pull/8006))
+- The `file-types` key in language configuration no longer matches full filenames without a glob pattern ([#8006](https://github.com/helix-editor/helix/pull/8006))
+
+Features:
+
+- Open URLs with the `goto_file` command ([#5820](https://github.com/helix-editor/helix/pull/5820))
+- Support drawing a border around popups and menus ([#4313](https://github.com/helix-editor/helix/pull/4313), [#9508](https://github.com/helix-editor/helix/pull/9508))
+- Track long lived diagnostic sources like Clippy or `rustc` ([#6447](https://github.com/helix-editor/helix/pull/6447), [#9280](https://github.com/helix-editor/helix/pull/9280))
+    - This improves the handling of diagnostics from sources that only update the diagnostic positions on save.
+- Add support for LSP `window/showDocument` requests ([#8865](https://github.com/helix-editor/helix/pull/8865))
+- Refactor ad-hoc hooks to use a new generic event system ([#8021](https://github.com/helix-editor/helix/pull/8021), [#9668](https://github.com/helix-editor/helix/pull/9668), [#9660](https://github.com/helix-editor/helix/pull/9660))
+    - This improves the behavior of autocompletions. For example navigating in insert mode no longer automatically triggers completions.
+- Allow using globs in the language configuration `file-types` key ([#8006](https://github.com/helix-editor/helix/pull/8006))
+- Allow specifying required roots for situational LSP activation ([#8696](https://github.com/helix-editor/helix/pull/8696))
+- Extend selections using mouse clicks in select mode ([#5436](https://github.com/helix-editor/helix/pull/5436))
+- Toggle block comments ([#4718](https://github.com/helix-editor/helix/pull/4718), [#9894](https://github.com/helix-editor/helix/pull/9894))
+- Support LSP diagnostic tags ([#9780](https://github.com/helix-editor/helix/pull/9780))
+- Add a `file-absolute-path` statusline element ([#4535](https://github.com/helix-editor/helix/pull/4535))
+- Cross injection layers in tree-sitter motions (`A-p`/`A-o`/`A-i`/`A-n`) ([#5176](https://github.com/helix-editor/helix/pull/5176))
+- Add a Amp-editor-like jumping command ([#8875](https://github.com/helix-editor/helix/pull/8875))
+
+Commands:
+
+- `:move` - move buffers with LSP support ([#8584](https://github.com/helix-editor/helix/pull/8584))
+     - Also see [#8949](https://github.com/helix-editor/helix/pull/8949) which made path changes conform to the LSP spec and fixed the behavior of this command.
+- `page_cursor_up`, `page_cursor_down`, `page_cursor_half_up`, `page_cursor_half_down` - commands for scrolling the cursor and page together ([#8015](https://github.com/helix-editor/helix/pull/8015))
+- `:yank-diagnostic` - yank the diagnostic(s) under the primary cursor ([#9640](https://github.com/helix-editor/helix/pull/9640))
+- `select_line_above` / `select_line_below` - extend or shrink a selection based on the direction and anchor ([#9080](https://github.com/helix-editor/helix/pull/9080))
+
+Usability improvements:
+
+- Make `roots` key of `[[language]]` entries in `languages.toml` configuration optional ([#8803](https://github.com/helix-editor/helix/pull/8803))
+- Exit select mode in commands that modify the buffer ([#8689](https://github.com/helix-editor/helix/pull/8689))
+- Use crossterm cursor when out of focus ([#6858](https://github.com/helix-editor/helix/pull/6858), [#8934](https://github.com/helix-editor/helix/pull/8934))
+- Join empty lines with only one space in `join_selections` ([#8989](https://github.com/helix-editor/helix/pull/8989))
+- Introduce a hybrid tree-sitter and contextual indentation heuristic ([#8307](https://github.com/helix-editor/helix/pull/8307))
+- Allow configuring the indentation heuristic ([#8307](https://github.com/helix-editor/helix/pull/8307))
+- Check for LSP rename support before showing rename prompt ([#9277](https://github.com/helix-editor/helix/pull/9277))
+- Normalize `S-<lower-ascii>` keymaps to uppercase ascii ([#9213](https://github.com/helix-editor/helix/pull/9213))
+- Add formatter status to `--health` output ([#7986](https://github.com/helix-editor/helix/pull/7986))
+- Change path normalization strategy to not resolve symlinks ([#9330](https://github.com/helix-editor/helix/pull/9330))
+- Select subtree within injections in `:tree-sitter-subtree` ([#9309](https://github.com/helix-editor/helix/pull/9309))
+- Use tilde expansion and normalization for `$HELIX_RUNTIME` paths ([1bc7aac](https://github.com/helix-editor/helix/commit/1bc7aac))
+- Improve failure message for LSP goto references ([#9382](https://github.com/helix-editor/helix/pull/9382))
+- Use injection syntax trees for bracket matching ([5e0b3cc](https://github.com/helix-editor/helix/commit/5e0b3cc))
+- Respect injections in `:tree-sitter-highlight-name` ([8b6565c](https://github.com/helix-editor/helix/commit/8b6565c))
+- Respect injections in `move_parent_node_end` ([035b8ea](https://github.com/helix-editor/helix/commit/035b8ea))
+- Use `gix` pipeline filter instead of manual CRLF implementation ([#9503](https://github.com/helix-editor/helix/pull/9503))
+- Follow Neovim's truecolor detection ([#9577](https://github.com/helix-editor/helix/pull/9577))
+- Reload language configuration with `:reload`, SIGHUP ([#9415](https://github.com/helix-editor/helix/pull/9415))
+- Allow numbers as bindings ([#8471](https://github.com/helix-editor/helix/pull/8471), [#9887](https://github.com/helix-editor/helix/pull/9887))
+- Respect undercurl config when terminfo is not available ([#9897](https://github.com/helix-editor/helix/pull/9897))
+- Ignore `.pijul`, `.hg`, `.jj` in addition to `.git` in file pickers configured to show hidden files ([#9935](https://github.com/helix-editor/helix/pull/9935))
+- Add completion for registers to `:clear-register` and `:yank-diagnostic` ([#9936](https://github.com/helix-editor/helix/pull/9936))
+- Repeat last motion for goto next/prev diagnostic ([#9966](https://github.com/helix-editor/helix/pull/9966))
+- Allow configuring a character to use when rendering narrow no-breaking space ([#9604](https://github.com/helix-editor/helix/pull/9604))
+- Switch to a streaming regex engine (regex-cursor crate) to significantly speed up regex-based commands and features ([#9422](https://github.com/helix-editor/helix/pull/9422), [#9756](https://github.com/helix-editor/helix/pull/9756), [#9891](https://github.com/helix-editor/helix/pull/9891))
+
+Fixes:
+
+- Swap `*` and `+` registers ([#8703](https://github.com/helix-editor/helix/pull/8703), [#8708](https://github.com/helix-editor/helix/pull/8708))
+- Use terminfo to reset terminal cursor style ([#8591](https://github.com/helix-editor/helix/pull/8591))
+- Fix precedence of `@align` captures in indentat computation ([#8659](https://github.com/helix-editor/helix/pull/8659))
+- Only render the preview if a Picker has a preview function ([#8667](https://github.com/helix-editor/helix/pull/8667))
+- Fix the precedence of `ui.virtual.whitespace` ([#8750](https://github.com/helix-editor/helix/pull/8750), [#8879](https://github.com/helix-editor/helix/pull/8879))
+- Fix crash in `:indent-style` ([#9087](https://github.com/helix-editor/helix/pull/9087))
+- Fix `didSave` text inclusion when sync capability is a kind variant ([#9101](https://github.com/helix-editor/helix/pull/9101))
+- Update the history of newly focused views ([#9271](https://github.com/helix-editor/helix/pull/9271))
+- Initialize diagnostics when opening a document ([#8873](https://github.com/helix-editor/helix/pull/8873))
+- Sync views when applying edits to unfocused views ([#9173](https://github.com/helix-editor/helix/pull/9173))
+    - This fixes crashes that could occur from LSP workspace edits or `:write-all`.
+- Treat non-numeric `+arg`s passed in the CLI args as filenames ([#9333](https://github.com/helix-editor/helix/pull/9333))
+- Fix crash when using `mm` on an empty plaintext file ([2fb7e50](https://github.com/helix-editor/helix/commit/2fb7e50))
+- Ignore empty tree-sitter nodes in match bracket ([445f7a2](https://github.com/helix-editor/helix/commit/445f7a2))
+- Exit a language server if it sends a message with invalid JSON ([#9332](https://github.com/helix-editor/helix/pull/9332))
+- Handle failures to enable bracketed paste ([#9353](https://github.com/helix-editor/helix/pull/9353))
+- Gate all captures in a pattern behind `#is-not? local` predicates ([#9390](https://github.com/helix-editor/helix/pull/9390))
+- Make path changes LSP spec conformant ([#8949](https://github.com/helix-editor/helix/pull/8949))
+- Use range positions to determine `insert_newline` motion ([#9448](https://github.com/helix-editor/helix/pull/9448))
+- Fix division by zero when prompt completion area is too small ([#9524](https://github.com/helix-editor/helix/pull/9524))
+- Add changes to history in clipboard replacement typable commands ([#9625](https://github.com/helix-editor/helix/pull/9625))
+- Fix a crash in DAP with an unspecified `line` in breakpoints ([#9632](https://github.com/helix-editor/helix/pull/9632))
+- Fix space handling for filenames in bash completion ([#9702](https://github.com/helix-editor/helix/pull/9702), [#9708](https://github.com/helix-editor/helix/pull/9708))
+- Key diagnostics off of paths instead of LSP URIs ([#7367](https://github.com/helix-editor/helix/pull/7367))
+- Fix panic when using `join_selections_space` ([#9783](https://github.com/helix-editor/helix/pull/9783))
+- Fix panic when using `surround_replace`, `surround_delete` ([#9796](https://github.com/helix-editor/helix/pull/9796))
+- Fix panic in `surround_replace`, `surround_delete` with nested surrounds and multiple cursors ([#9815](https://github.com/helix-editor/helix/pull/9815))
+- Fix panic in `select_textobject_around` ([#9832](https://github.com/helix-editor/helix/pull/9832))
+- Don't stop reloading documents when reloading fails in `:reload-all` ([#9870](https://github.com/helix-editor/helix/pull/9870))
+- Prevent `shell_keep_pipe` from stopping on nonzero exit status codes ([#9817](https://github.com/helix-editor/helix/pull/9817))
+
+Themes:
+
+- Add `gruber-dark` ([#8598](https://github.com/helix-editor/helix/pull/8598))
+- Update `everblush` ([#8705](https://github.com/helix-editor/helix/pull/8705))
+- Update `papercolor` ([#8718](https://github.com/helix-editor/helix/pull/8718), [#8827](https://github.com/helix-editor/helix/pull/8827))
+- Add `polmandres` ([#8759](https://github.com/helix-editor/helix/pull/8759))
+- Add `starlight` ([#8787](https://github.com/helix-editor/helix/pull/8787))
+- Update `naysayer` ([#8838](https://github.com/helix-editor/helix/pull/8838))
+- Add modus operandi themes ([#8728](https://github.com/helix-editor/helix/pull/8728), [#9912](https://github.com/helix-editor/helix/pull/9912))
+- Update `rose_pine` ([#8946](https://github.com/helix-editor/helix/pull/8946))
+- Update `darcula` ([#8738](https://github.com/helix-editor/helix/pull/8738), [#9002](https://github.com/helix-editor/helix/pull/9002), [#9449](https://github.com/helix-editor/helix/pull/9449), [#9588](https://github.com/helix-editor/helix/pull/9588))
+- Add modus vivendi themes ([#8894](https://github.com/helix-editor/helix/pull/8894), [#9912](https://github.com/helix-editor/helix/pull/9912))
+- Add `horizon-dark` ([#9008](https://github.com/helix-editor/helix/pull/9008), [#9493](https://github.com/helix-editor/helix/pull/9493))
+- Update `noctis` ([#9123](https://github.com/helix-editor/helix/pull/9123))
+- Update `nord` ([#9135](https://github.com/helix-editor/helix/pull/9135))
+- Update monokai pro themes ([#9148](https://github.com/helix-editor/helix/pull/9148))
+- Update tokyonight themes ([#9099](https://github.com/helix-editor/helix/pull/9099), [#9724](https://github.com/helix-editor/helix/pull/9724), [#9789](https://github.com/helix-editor/helix/pull/9789))
+- Add `ttox` ([#8524](https://github.com/helix-editor/helix/pull/8524))
+- Add `voxed` ([#9164](https://github.com/helix-editor/helix/pull/9164))
+- Update `sonokai` ([#9370](https://github.com/helix-editor/helix/pull/9370), [#9376](https://github.com/helix-editor/helix/pull/9376), [#5379](https://github.com/helix-editor/helix/pull/5379))
+- Update `onedark`, `onedarker` ([#9397](https://github.com/helix-editor/helix/pull/9397))
+- Update `cyan_light` ([#9375](https://github.com/helix-editor/helix/pull/9375), [#9688](https://github.com/helix-editor/helix/pull/9688))
+- Add `gruvbox_light_soft`, `gruvbox_light_hard` ([#9266](https://github.com/helix-editor/helix/pull/9266))
+- Update GitHub themes ([#9487](https://github.com/helix-editor/helix/pull/9487))
+- Add `term16_dark`, `term16_light` ([#9477](https://github.com/helix-editor/helix/pull/9477))
+- Update Zed themes ([#9544](https://github.com/helix-editor/helix/pull/9544), [#9549](https://github.com/helix-editor/helix/pull/9549))
+- Add `curzon` ([#9553](https://github.com/helix-editor/helix/pull/9553))
+- Add `monokai_soda` ([#9651](https://github.com/helix-editor/helix/pull/9651))
+- Update catppuccin themes ([#9859](https://github.com/helix-editor/helix/pull/9859))
+- Update `rasmus` ([#9939](https://github.com/helix-editor/helix/pull/9939))
+- Update `dark_plus` ([#9949](https://github.com/helix-editor/helix/pull/9949), [628dcd5](https://github.com/helix-editor/helix/commit/628dcd5))
+- Update gruvbox themes ([#9960](https://github.com/helix-editor/helix/pull/9960))
+- Add jump label theming to `dracula` ([#9973](https://github.com/helix-editor/helix/pull/9973))
+- Add jump label theming to `horizon-dark` ([#9984](https://github.com/helix-editor/helix/pull/9984))
+- Add jump label theming to catppuccin themes ([2178adf](https://github.com/helix-editor/helix/commit/2178adf), [#9983](https://github.com/helix-editor/helix/pull/9983))
+- Add jump label theming to `onedark` themes ([da2dec1](https://github.com/helix-editor/helix/commit/da2dec1))
+- Add jump label theming to rose-pine themes ([#9981](https://github.com/helix-editor/helix/pull/9981))
+- Add jump label theming to Nord themes ([#10008](https://github.com/helix-editor/helix/pull/10008))
+- Add jump label theming to Monokai themes ([#10009](https://github.com/helix-editor/helix/pull/10009))
+- Add jump label theming to gruvbox themes ([#10012](https://github.com/helix-editor/helix/pull/10012))
+- Add jump label theming to `kanagawa` ([#10030](https://github.com/helix-editor/helix/pull/10030))
+- Update material themes ([#10043](https://github.com/helix-editor/helix/pull/10043))
+- Add `jetbrains_dark` ([#9967](https://github.com/helix-editor/helix/pull/9967))
+
+New languages:
+
+- Typst ([#7474](https://github.com/helix-editor/helix/pull/7474))
+- LPF ([#8536](https://github.com/helix-editor/helix/pull/8536))
+- GN ([#6969](https://github.com/helix-editor/helix/pull/6969))
+- DBML ([#8860](https://github.com/helix-editor/helix/pull/8860))
+- log ([#8916](https://github.com/helix-editor/helix/pull/8916))
+- Janet ([#9081](https://github.com/helix-editor/helix/pull/9081), [#9247](https://github.com/helix-editor/helix/pull/9247))
+- Agda ([#8285](https://github.com/helix-editor/helix/pull/8285))
+- Avro ([#9113](https://github.com/helix-editor/helix/pull/9113))
+- Smali ([#9089](https://github.com/helix-editor/helix/pull/9089))
+- HOCON ([#9203](https://github.com/helix-editor/helix/pull/9203))
+- Tact ([#9512](https://github.com/helix-editor/helix/pull/9512))
+- PKL ([#9515](https://github.com/helix-editor/helix/pull/9515))
+- CEL ([#9296](https://github.com/helix-editor/helix/pull/9296))
+- SpiceDB ([#9296](https://github.com/helix-editor/helix/pull/9296))
+- Hoon ([#9190](https://github.com/helix-editor/helix/pull/9190))
+- DockerCompose ([#9661](https://github.com/helix-editor/helix/pull/9661), [#9916](https://github.com/helix-editor/helix/pull/9916))
+- Groovy ([#9350](https://github.com/helix-editor/helix/pull/9350), [#9681](https://github.com/helix-editor/helix/pull/9681), [#9677](https://github.com/helix-editor/helix/pull/9677))
+- FIDL ([#9713](https://github.com/helix-editor/helix/pull/9713))
+- Powershell ([#9827](https://github.com/helix-editor/helix/pull/9827))
+- ld ([#9835](https://github.com/helix-editor/helix/pull/9835))
+- Hyperland config ([#9899](https://github.com/helix-editor/helix/pull/9899))
+- JSONC ([#9906](https://github.com/helix-editor/helix/pull/9906))
+- PHP Blade ([#9513](https://github.com/helix-editor/helix/pull/9513))
+- SuperCollider ([#9329](https://github.com/helix-editor/helix/pull/9329))
+- Koka ([#8727](https://github.com/helix-editor/helix/pull/8727))
+- PKGBUILD ([#9909](https://github.com/helix-editor/helix/pull/9909), [#9943](https://github.com/helix-editor/helix/pull/9943))
+- Ada ([#9908](https://github.com/helix-editor/helix/pull/9908))
+- Helm charts ([#9900](https://github.com/helix-editor/helix/pull/9900))
+- Ember.js templates ([#9902](https://github.com/helix-editor/helix/pull/9902))
+- Ohm ([#9991](https://github.com/helix-editor/helix/pull/9991))
+
+Updated languages and queries:
+
+- Add HTML injection queries for Rust ([#8603](https://github.com/helix-editor/helix/pull/8603))
+- Switch to tree-sitter-ron for RON ([#8624](https://github.com/helix-editor/helix/pull/8624))
+- Update and improve comment highlighting ([#8564](https://github.com/helix-editor/helix/pull/8564), [#9253](https://github.com/helix-editor/helix/pull/9253), [#9800](https://github.com/helix-editor/helix/pull/9800), [#10014](https://github.com/helix-editor/helix/pull/10014))
+- Highlight type parameters in Rust ([#8660](https://github.com/helix-editor/helix/pull/8660))
+- Change KDL tree-sitter parsers ([#8652](https://github.com/helix-editor/helix/pull/8652))
+- Update tree-sitter-markdown ([#8721](https://github.com/helix-editor/helix/pull/8721), [#10039](https://github.com/helix-editor/helix/pull/10039))
+- Update tree-sitter-purescript ([#8712](https://github.com/helix-editor/helix/pull/8712))
+- Add type parameter highlighting to TypeScript, Go, Haskell, OCaml and Kotlin ([#8718](https://github.com/helix-editor/helix/pull/8718))
+- Add indentation queries for Scheme and lisps using tree-sitter-scheme ([#8720](https://github.com/helix-editor/helix/pull/8720))
+- Recognize `meson_options.txt` as Meson ([#8794](https://github.com/helix-editor/helix/pull/8794))
+- Add language server configuration for Nushell ([#8878](https://github.com/helix-editor/helix/pull/8878))
+- Recognize `musicxml` as XML ([#8935](https://github.com/helix-editor/helix/pull/8935))
+- Update tree-sitter-rescript ([#8962](https://github.com/helix-editor/helix/pull/8962))
+- Update tree-sitter-python ([#8976](https://github.com/helix-editor/helix/pull/8976))
+- Recognize `.envrc.local` and `.envrc.private` as env ([#8988](https://github.com/helix-editor/helix/pull/8988))
+- Update tree-sitter-gleam ([#9003](https://github.com/helix-editor/helix/pull/9003), [9ceeea5](https://github.com/helix-editor/helix/commit/9ceeea5))
+- Update tree-sitter-d ([#9021](https://github.com/helix-editor/helix/pull/9021))
+- Fix R-markdown language name for LSP detection ([#9012](https://github.com/helix-editor/helix/pull/9012))
+- Add haskell-language-server LSP configuration ([#9111](https://github.com/helix-editor/helix/pull/9111))
+- Recognize `glif` as XML ([#9130](https://github.com/helix-editor/helix/pull/9130))
+- Recognize `.prettierrc` as JSON ([#9214](https://github.com/helix-editor/helix/pull/9214))
+- Add auto-pairs configuration for scheme ([#9232](https://github.com/helix-editor/helix/pull/9232))
+- Add textobject queries for Scala ([#9191](https://github.com/helix-editor/helix/pull/9191))
+- Add textobject queries for Protobuf ([#9184](https://github.com/helix-editor/helix/pull/9184))
+- Update tree-sitter-wren ([#8544](https://github.com/helix-editor/helix/pull/8544))
+- Add `spago.yaml` as an LSP root for PureScript ([#9362](https://github.com/helix-editor/helix/pull/9362))
+- Improve highlight and indent queries for Bash, Make and CSS ([#9393](https://github.com/helix-editor/helix/pull/9393))
+- Update tree-sitter-scala ([#9348](https://github.com/helix-editor/helix/pull/9348), [#9340](https://github.com/helix-editor/helix/pull/9340), [#9475](https://github.com/helix-editor/helix/pull/9475))
+- Recognize `.bash_history` as Bash ([#9401](https://github.com/helix-editor/helix/pull/9401))
+- Recognize Helix ignore files as ignore ([#9447](https://github.com/helix-editor/helix/pull/9447))
+- Inject SQL into Scala SQL strings ([#9428](https://github.com/helix-editor/helix/pull/9428))
+- Update gdscript textobjects ([#9288](https://github.com/helix-editor/helix/pull/9288))
+- Update Go queries ([#9510](https://github.com/helix-editor/helix/pull/9510), [#9525](https://github.com/helix-editor/helix/pull/9525))
+- Update tree-sitter-nushell ([#9502](https://github.com/helix-editor/helix/pull/9502))
+- Update tree-sitter-unison, add indent queries ([#9505](https://github.com/helix-editor/helix/pull/9505))
+- Update tree-sitter-slint ([#9551](https://github.com/helix-editor/helix/pull/9551), [#9698](https://github.com/helix-editor/helix/pull/9698))
+- Update tree-sitter-swift ([#9586](https://github.com/helix-editor/helix/pull/9586))
+- Add `fish_indent` as formatter for fish ([78ed3ad](https://github.com/helix-editor/helix/commit/78ed3ad))
+- Recognize `zon` as Zig ([#9582](https://github.com/helix-editor/helix/pull/9582))
+- Add a formatter for Odin ([#9537](https://github.com/helix-editor/helix/pull/9537))
+- Update tree-sitter-erlang ([#9627](https://github.com/helix-editor/helix/pull/9627), [fdcd461](https://github.com/helix-editor/helix/commit/fdcd461))
+- Capture Rust fields as argument textobjects ([#9637](https://github.com/helix-editor/helix/pull/9637))
+- Improve Dart textobjects ([#9644](https://github.com/helix-editor/helix/pull/9644))
+- Recognize `tmux.conf` as a bash file-type ([#9653](https://github.com/helix-editor/helix/pull/9653))
+- Add textobjects queries for Nix ([#9659](https://github.com/helix-editor/helix/pull/9659))
+- Add textobjects queries for HCL ([#9658](https://github.com/helix-editor/helix/pull/9658))
+- Recognize osm and osc extensions as XML ([#9697](https://github.com/helix-editor/helix/pull/9697))
+- Update tree-sitter-sql ([#9634](https://github.com/helix-editor/helix/pull/9634))
+- Recognize pde Processing files as Java ([#9741](https://github.com/helix-editor/helix/pull/9741))
+- Update tree-sitter-lua ([#9727](https://github.com/helix-editor/helix/pull/9727))
+- Switch tree-sitter-nim parsers ([#9722](https://github.com/helix-editor/helix/pull/9722))
+- Recognize GTK builder ui files as XML ([#9754](https://github.com/helix-editor/helix/pull/9754))
+- Add configuration for markdown-oxide language server ([#9758](https://github.com/helix-editor/helix/pull/9758))
+- Add a shebang for elvish ([#9779](https://github.com/helix-editor/helix/pull/9779))
+- Fix precedence of Svelte TypeScript injection ([#9777](https://github.com/helix-editor/helix/pull/9777))
+- Recognize common Dockerfile file types ([#9772](https://github.com/helix-editor/helix/pull/9772))
+- Recognize NUON files as Nu ([#9839](https://github.com/helix-editor/helix/pull/9839))
+- Add textobjects for Java native functions and constructors ([#9806](https://github.com/helix-editor/helix/pull/9806))
+- Fix "braket" typeo in JSX highlights ([#9910](https://github.com/helix-editor/helix/pull/9910))
+- Update tree-sitter-hurl ([#9775](https://github.com/helix-editor/helix/pull/9775))
+- Add textobjects queries for Vala ([#8541](https://github.com/helix-editor/helix/pull/8541))
+- Update tree-sitter-git-config ([9610254](https://github.com/helix-editor/helix/commit/9610254))
+- Recognize 'mmd' as Mermaid ([459eb9a](https://github.com/helix-editor/helix/commit/459eb9a))
+- Highlight Rust extern crate aliases ([c099dde](https://github.com/helix-editor/helix/commit/c099dde))
+- Improve parameter highlighting in C++ ([f5d95de](https://github.com/helix-editor/helix/commit/f5d95de))
+- Recognize 'rclone.conf' as INI ([#9959](https://github.com/helix-editor/helix/pull/9959))
+- Add injections for GraphQL and ERB in Ruby heredocs ([#10036](https://github.com/helix-editor/helix/pull/10036))
+- Add `main.odin` to Odin LSP roots ([#9968](https://github.com/helix-editor/helix/pull/9968))
+
+Packaging:
+
+- Allow user overlays in Nix grammars build ([#8749](https://github.com/helix-editor/helix/pull/8749))
+- Set Cargo feature resolver to v2 ([#8917](https://github.com/helix-editor/helix/pull/8917))
+- Use workspace inheritance for common Cargo metadata ([#8925](https://github.com/helix-editor/helix/pull/8925))
+- Remove sourcehut-based tree-sitter grammars from default build ([#9316](https://github.com/helix-editor/helix/pull/9316), [#9326](https://github.com/helix-editor/helix/pull/9326))
+- Add icon to Windows executable ([#9104](https://github.com/helix-editor/helix/pull/9104))
+
 # 23.10 (2023-10-24)
 
 A big shout out to all the contributors! We had 118 contributors in this release.
diff --git a/Cargo.lock b/Cargo.lock
index a53734552dafc..d04a1c3374a0e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1224,7 +1224,7 @@ dependencies = [
 
 [[package]]
 name = "helix-core"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -1261,7 +1261,7 @@ dependencies = [
 
 [[package]]
 name = "helix-dap"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "anyhow",
  "fern",
@@ -1276,7 +1276,7 @@ dependencies = [
 
 [[package]]
 name = "helix-event"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "ahash",
  "anyhow",
@@ -1290,7 +1290,7 @@ dependencies = [
 
 [[package]]
 name = "helix-loader"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "anyhow",
  "cc",
@@ -1309,7 +1309,7 @@ dependencies = [
 
 [[package]]
 name = "helix-lsp"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1332,11 +1332,11 @@ dependencies = [
 
 [[package]]
 name = "helix-parsec"
-version = "23.10.0"
+version = "24.3.0"
 
 [[package]]
 name = "helix-stdx"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "dunce",
  "etcetera",
@@ -1348,7 +1348,7 @@ dependencies = [
 
 [[package]]
 name = "helix-term"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1391,7 +1391,7 @@ dependencies = [
 
 [[package]]
 name = "helix-tui"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "bitflags 2.5.0",
  "cassowary",
@@ -1407,7 +1407,7 @@ dependencies = [
 
 [[package]]
 name = "helix-vcs"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1423,7 +1423,7 @@ dependencies = [
 
 [[package]]
 name = "helix-view"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2823,7 +2823,7 @@ checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
 [[package]]
 name = "xtask"
-version = "23.10.0"
+version = "24.3.0"
 dependencies = [
  "helix-core",
  "helix-loader",
diff --git a/Cargo.toml b/Cargo.toml
index e56aedc8fcc6c..3bfc4b8e18a30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ tree-sitter = { version = "0.22" }
 nucleo = "0.2.0"
 
 [workspace.package]
-version = "23.10.0"
+version = "24.3.0"
 edition = "2021"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 categories = ["editor"]
diff --git a/contrib/Helix.appdata.xml b/contrib/Helix.appdata.xml
index c455b242e90ee..9b5663744a2c3 100644
--- a/contrib/Helix.appdata.xml
+++ b/contrib/Helix.appdata.xml
@@ -48,6 +48,9 @@
   <content_rating type="oars-1.1" />
 
   <releases>
+    <release version="24.03" date="2024-03-30">
+      <url>https://helix-editor.com/news/release-24-03-highlights/</url>
+    </release>
     <release version="23.10" date="2023-10-24">
       <url>https://helix-editor.com/news/release-23-10-highlights/</url>
     </release>

From 3d6f34c27020b63bd3afcb63f21b0d653a63f4bc Mon Sep 17 00:00:00 2001
From: blt-r <63462729+blt-r@users.noreply.github.com>
Date: Sat, 30 Mar 2024 22:51:46 +0400
Subject: [PATCH 088/101] Make Helix.appdata.xml spec-compliant (#10051)

- The <description> tag shouldn't be translated, but instead the
  individual paragraphs.
- The <developer> tag is required.
- The <requires> tag actually means that the app can't even be installed
  without that control. What this should be is <recommends>.
---
 contrib/Helix.appdata.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/contrib/Helix.appdata.xml b/contrib/Helix.appdata.xml
index 9b5663744a2c3..a46ef796be40f 100644
--- a/contrib/Helix.appdata.xml
+++ b/contrib/Helix.appdata.xml
@@ -6,27 +6,26 @@
   <name>Helix</name>
   <summary>A post-modern text editor</summary>
   <summary xml:lang="ar">مُحَرِّرُ نُصُوصٍ سَابِقٌ لِعَهدِه</summary>
+  <developer id="com.helix_editor">
+    <name>Blaž Hrastnik</name>
+  </developer>
 
   <description>
     <p>
       Helix is a terminal-based text editor inspired by Kakoune / Neovim and written in Rust.
     </p>
+    <p xml:lang="ar">
+      مُحَرِّرُ نُصُوصٍ يَعمَلُ فِي الطَّرَفِيَّة، مُستَلهَمٌ مِن Kakoune وَ Neovim وَمَكتُوبٌ بِلُغَةِ رَست البَرمَجِيَّة.
+    </p>
     <ul>
       <li>Vim-like modal editing</li>
+      <li xml:lang="ar">تَحرِيرٌ وَضعِيٌّ شَبيهٌ بِـVim</li>
       <li>Multiple selections</li>
+      <li xml:lang="ar">تَحدِيدَاتٌ لِلنَّصِ مُتَعَدِّدَة</li>
       <li>Built-in language server support</li>
+      <li xml:lang="ar">دَعْمٌ مُدمَجٌ لِخَوادِمِ اللُّغَات</li>
       <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
-    </ul>
-  </description>
-  <description xml:lang="ar">
-    <p>
-      مُحَرِّرُ نُصُوصٍ يَعمَلُ فِي الطَّرَفِيَّة، مُستَلهَمٌ مِن Kakoune وَ Neovim وَمَكتُوبٌ بِلُغَةِ رَست البَرمَجِيَّة.
-    </p>
-    <ul>
-      <li>تَحرِيرٌ وَضعِيٌّ شَبيهٌ بِـVim</li>
-      <li>تَحدِيدَاتٌ لِلنَّصِ مُتَعَدِّدَة</li>
-      <li>دَعْمٌ مُدمَجٌ لِخَوادِمِ اللُّغَات</li>
-      <li>تَحرِيرُ التَّعلِيمَاتِ البَّرمَجِيَّةِ مَعَ تَمييزٍ لِلتَّركِيبِ النَّحُويِّ بِواسِطَةِ tree-sitter</li>
+      <li xml:lang="ar">تَحرِيرُ التَّعلِيمَاتِ البَّرمَجِيَّةِ مَعَ تَمييزٍ لِلتَّركِيبِ النَّحُويِّ بِواسِطَةِ tree-sitter</li>
     </ul>
   </description>
 
@@ -74,9 +73,9 @@
     </release>
   </releases>
 
-  <requires>
+  <recommends>
     <control>keyboard</control>
-  </requires>
+  </recommends>
 
   <categories>
     <category>Utility</category>

From 96220cb632ad2bfd38745fc7c76ba0ab459aa4bd Mon Sep 17 00:00:00 2001
From: Pedro Fedricci <pedromfedricci@gmail.com>
Date: Sat, 30 Mar 2024 18:58:16 -0300
Subject: [PATCH 089/101] feat(themes): add jump-label style for nightfox
 (#10052)

---
 runtime/themes/nightfox.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/nightfox.toml b/runtime/themes/nightfox.toml
index 6c5ed3501f93b..3dfb4fce55275 100644
--- a/runtime/themes/nightfox.toml
+++ b/runtime/themes/nightfox.toml
@@ -34,6 +34,7 @@
 "ui.virtual.whitespace" = { fg = "bg3" } # Whitespace markers in editing area.
 "ui.virtual.indent-guide" = { fg = "black" } # Vertical indent width guides
 "ui.virtual.inlay-hint" = { fg = "comment", bg = "bg2" } # Default style for inlay hints of all kinds
+"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold"] } # Style for virtual jump labels
 
 "ui.statusline" = { fg = "fg2", bg = "bg0" } # Status line.
 "ui.statusline.inactive" = { fg = "fg3", bg = "bg0" } # Status line in unfocused windows.

From 825ae74b9e7e96120650f9651fa1d63019814e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= <dpc@dpc.pw>
Date: Sat, 30 Mar 2024 16:49:16 -0700
Subject: [PATCH 090/101] chore: add "ui.virtual.jump-label" to solarized
 colorschemes (#10056)

---
 runtime/themes/solarized_dark.toml  | 1 +
 runtime/themes/solarized_light.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index 88f857d3dd36a..74f017a31befb 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -42,6 +42,7 @@
 
 "ui.virtual.whitespace" = { fg = "base01" }
 "ui.virtual.inlay-hint" = { fg = "base01", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 # 行号栏
 "ui.linenr" = { fg = "base0", bg = "base02" }
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index cd2d2b3647484..02ca7bdc6c686 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -43,6 +43,7 @@
 
 "ui.virtual.whitespace" = { fg = "base01" }
 "ui.virtual.inlay-hint" = { fg = "base01", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 # 行号栏
 # line number column

From 25d8e9445cb7959c426eff27c5e48f13552a2a0d Mon Sep 17 00:00:00 2001
From: Abderrahmane TAHRI JOUTI <302837+atahrijouti@users.noreply.github.com>
Date: Sun, 31 Mar 2024 00:49:49 +0100
Subject: [PATCH 091/101] Add jump-label (#10058)

---
 runtime/themes/cyan_light.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/themes/cyan_light.toml b/runtime/themes/cyan_light.toml
index a35ad58470f18..d8c93fe7e9e4b 100644
--- a/runtime/themes/cyan_light.toml
+++ b/runtime/themes/cyan_light.toml
@@ -98,9 +98,12 @@
 "ui.help" = { fg = "shade06", bg = "shade01" }
 "ui.text" = "shade05"
 "ui.text.focus" = { fg = "shade07", bg = "light_blue" }
+
 "ui.virtual" = "shade03"
 "ui.virtual.ruler" = { bg = "shade01" }
 "ui.virtual.inlay-hint" = { fg = "shade03_darker" }
+"ui.virtual.jump-label" = { fg = "shade07", bg = "shade01", modifiers = ["bold" ] }
+
 "ui.menu" = { fg = "shade05", bg = "shade01" }
 "ui.menu.selected" = { fg = "shade07", bg = "light_blue" }
 
@@ -108,6 +111,7 @@
 "info" = "light_blue"
 "warning" = "orange"
 "error" = "red"
+
 "diagnostic" = { modifiers = [] }
 "diagnostic.hint" = { underline = { color = "shade04", style = "line" } }
 "diagnostic.info" = { underline = { color = "light_blue", style = "line" } }

From 8b7cbf5280e99c56895d641621de78a5d941d66e Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Sun, 31 Mar 2024 13:59:46 +0200
Subject: [PATCH 092/101] typo (#10060)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ff92a2779bf9..de15f143c0a46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # 24.03 (2024-03-30)
 
-As always, a big thank you to the all of the contributors! This release saw changes from 125 contributors.
+As always, a big thank you to all of the contributors! This release saw changes from 125 contributors.
 
 Breaking changes:
 

From 2533b08f641bfef75b8de8c69cff337d0415137c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Sun, 31 Mar 2024 14:03:05 +0200
Subject: [PATCH 093/101] feat(languages): .mkdn as markdown extension (#10065)

GitHub recognizes `.mkdn` as markdown files. Add `.mkdn` as a valid
file type for Markdown.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index a5764420b1569..03e471a578ba0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1473,7 +1473,7 @@ source = { git = "https://github.com/Flakebi/tree-sitter-tablegen", rev = "568dd
 name = "markdown"
 scope = "source.md"
 injection-regex = "md|markdown"
-file-types = ["md", "markdown", "mkd", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook", { glob = "PULLREQ_EDITMSG" }]
+file-types = ["md", "markdown", "mkd", "mkdn", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook", { glob = "PULLREQ_EDITMSG" }]
 roots = [".marksman.toml"]
 language-servers = [ "marksman", "markdown-oxide" ]
 indent = { tab-width = 2, unit = "  " }

From f5991657f47a26347e7a5350945e654238cacc77 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 31 Mar 2024 08:12:17 -0400
Subject: [PATCH 094/101] Factor out line ending handling in integration tests
 (#9921)

Prior to this change, every integration test which wanted its line
endings to be handled transparently across platforms, i.e. test with
the same input that has its platform's line feed characters, converting
the line endings was up to each individual test by calling the
`platform_line` helper function. This significantly increases the amount
of boilerplate one has to copy between all the tests.

However, there are some test cases that need to exert strict control
over the exact input text without being manipulated behind the scenes by
the test framework.

So, with this change, the line feed conversions are factored into
the `TestCase` struct. By default, line endings of the input text
are converted to the platform's native line feed ending, but one can
explicitly specify in their test case when the input text should be left
alone and tested as is.
---
 helix-term/tests/test/auto_indent.rs       |   6 +-
 helix-term/tests/test/auto_pairs.rs        |  28 ++
 helix-term/tests/test/commands.rs          | 283 ++++++++++----------
 helix-term/tests/test/commands/movement.rs | 152 +++++------
 helix-term/tests/test/commands/write.rs    |  37 +--
 helix-term/tests/test/helpers.rs           |  76 ++++--
 helix-term/tests/test/languages/go.rs      |  16 +-
 helix-term/tests/test/languages/yaml.rs    | 296 ++++++++++-----------
 helix-term/tests/test/movement.rs          | 109 ++++----
 helix-term/tests/test/splits.rs            |  31 ++-
 helix-vcs/src/lib.rs                       |   8 +-
 11 files changed, 564 insertions(+), 478 deletions(-)

diff --git a/helix-term/tests/test/auto_indent.rs b/helix-term/tests/test/auto_indent.rs
index 5132d44d983b4..5ea1024b78c1d 100644
--- a/helix-term/tests/test/auto_indent.rs
+++ b/helix-term/tests/test/auto_indent.rs
@@ -6,13 +6,13 @@ async fn auto_indent_c() -> anyhow::Result<()> {
         AppBuilder::new().with_file("foo.c", None),
         // switches to append mode?
         (
-            helpers::platform_line("void foo() {#[|}]#"),
+            "void foo() {#[|}]#",
             "i<ret><esc>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 void foo() {
                   #[|\n]#\
                 }
-            "}),
+            "},
         ),
     )
     .await?;
diff --git a/helix-term/tests/test/auto_pairs.rs b/helix-term/tests/test/auto_pairs.rs
index ada488fc9991d..c921e2ae7d566 100644
--- a/helix-term/tests/test/auto_pairs.rs
+++ b/helix-term/tests/test/auto_pairs.rs
@@ -19,6 +19,7 @@ async fn insert_basic() -> anyhow::Result<()> {
             format!("#[{}|]#", LINE_END),
             format!("i{}", pair.0),
             format!("{}#[|{}]#{}", pair.0, pair.1, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -46,6 +47,7 @@ async fn insert_configured_multi_byte_chars() -> anyhow::Result<()> {
                 format!("#[{}|]#", LINE_END),
                 format!("i{}", open),
                 format!("{}#[|{}]#{}", open, close, LINE_END),
+                LineFeedHandling::AsIs,
             ),
         )
         .await?;
@@ -56,6 +58,7 @@ async fn insert_configured_multi_byte_chars() -> anyhow::Result<()> {
                 format!("{}#[{}|]#{}", open, close, LINE_END),
                 format!("i{}", close),
                 format!("{}{}#[|{}]#", open, close, LINE_END),
+                LineFeedHandling::AsIs,
             ),
         )
         .await?;
@@ -71,6 +74,7 @@ async fn insert_after_word() -> anyhow::Result<()> {
             format!("foo#[{}|]#", LINE_END),
             format!("i{}", pair.0),
             format!("foo{}#[|{}]#{}", pair.0, pair.1, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -80,6 +84,7 @@ async fn insert_after_word() -> anyhow::Result<()> {
             format!("foo#[{}|]#", LINE_END),
             format!("i{}", pair.0),
             format!("foo{}#[|{}]#", pair.0, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -94,6 +99,7 @@ async fn insert_before_word() -> anyhow::Result<()> {
             format!("#[f|]#oo{}", LINE_END),
             format!("i{}", pair.0),
             format!("{}#[|f]#oo{}", pair.0, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -108,6 +114,7 @@ async fn insert_before_word_selection() -> anyhow::Result<()> {
             format!("#[foo|]#{}", LINE_END),
             format!("i{}", pair.0),
             format!("{}#[|foo]#{}", pair.0, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -122,6 +129,7 @@ async fn insert_before_word_selection_trailing_word() -> anyhow::Result<()> {
             format!("foo#[ wor|]#{}", LINE_END),
             format!("i{}", pair.0),
             format!("foo{}#[|{} wor]#{}", pair.0, pair.1, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -136,6 +144,7 @@ async fn insert_closer_selection_trailing_word() -> anyhow::Result<()> {
             format!("foo{}#[|{} wor]#{}", pair.0, pair.1, LINE_END),
             format!("i{}", pair.1),
             format!("foo{}{}#[| wor]#{}", pair.0, pair.1, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -155,6 +164,7 @@ async fn insert_before_eol() -> anyhow::Result<()> {
                 open = pair.0,
                 close = pair.1
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -177,6 +187,7 @@ async fn insert_auto_pairs_disabled() -> anyhow::Result<()> {
                 format!("#[{}|]#", LINE_END),
                 format!("i{}", pair.0),
                 format!("{}#[|{}]#", pair.0, LINE_END),
+                LineFeedHandling::AsIs,
             ),
         )
         .await?;
@@ -197,6 +208,7 @@ async fn insert_multi_range() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -211,6 +223,7 @@ async fn insert_before_multi_code_point_graphemes() -> anyhow::Result<()> {
             format!("hello #[👨‍👩‍👧‍👦|]# goodbye{}", LINE_END),
             format!("i{}", pair.1),
             format!("hello {}#[|👨‍👩‍👧‍👦]# goodbye{}", pair.1, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -226,6 +239,7 @@ async fn insert_at_end_of_document() -> anyhow::Result<()> {
             in_keys: format!("i{}", pair.0),
             out_text: format!("{}{}{}", LINE_END, pair.0, pair.1),
             out_selection: Selection::single(LINE_END.len() + 1, LINE_END.len() + 2),
+            line_feed_handling: LineFeedHandling::AsIs,
         })
         .await?;
 
@@ -235,6 +249,7 @@ async fn insert_at_end_of_document() -> anyhow::Result<()> {
             in_keys: format!("i{}", pair.0),
             out_text: format!("foo{}{}{}", LINE_END, pair.0, pair.1),
             out_selection: Selection::single(LINE_END.len() + 4, LINE_END.len() + 5),
+            line_feed_handling: LineFeedHandling::AsIs,
         })
         .await?;
     }
@@ -259,6 +274,7 @@ async fn insert_close_inside_pair() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -283,6 +299,7 @@ async fn insert_close_inside_pair_multi() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -307,6 +324,7 @@ async fn insert_nested_open_inside_pair() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -338,6 +356,7 @@ async fn insert_nested_open_inside_pair_multi() -> anyhow::Result<()> {
                     inner_close = inner_pair.1,
                     eol = LINE_END
                 ),
+                LineFeedHandling::AsIs,
             ))
             .await?;
         }
@@ -358,6 +377,7 @@ async fn append_basic() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -377,6 +397,7 @@ async fn append_multi_range() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -401,6 +422,7 @@ async fn append_close_inside_pair() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -425,6 +447,7 @@ async fn append_close_inside_pair_multi() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -444,6 +467,7 @@ async fn append_end_of_word() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -458,6 +482,7 @@ async fn append_middle_of_word() -> anyhow::Result<()> {
             format!("#[wo|]#rd{}", LINE_END),
             format!("a{}", pair.1),
             format!("#[wo{}r|]#d{}", pair.1, LINE_END),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -477,6 +502,7 @@ async fn append_end_of_word_multi() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -501,6 +527,7 @@ async fn append_inside_nested_pair() -> anyhow::Result<()> {
                 close = pair.1,
                 eol = LINE_END
             ),
+            LineFeedHandling::AsIs,
         ))
         .await?;
     }
@@ -532,6 +559,7 @@ async fn append_inside_nested_pair_multi() -> anyhow::Result<()> {
                     inner_close = inner_pair.1,
                     eol = LINE_END
                 ),
+                LineFeedHandling::AsIs,
             ))
             .await?;
         }
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 1172a798101cc..aaa442f36e184 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -9,89 +9,89 @@ mod write;
 async fn test_selection_duplication() -> anyhow::Result<()> {
     // Forward
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[lo|]#rem
             ipsum
             dolor
-            "}),
+            "},
         "CC",
-        platform_line(indoc! {"\
+        indoc! {"\
             #(lo|)#rem
             #(ip|)#sum
             #[do|]#lor
-            "}),
+            "},
     ))
     .await?;
 
     // Backward
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|lo]#rem
             ipsum
             dolor
-            "}),
+            "},
         "CC",
-        platform_line(indoc! {"\
+        indoc! {"\
             #(|lo)#rem
             #(|ip)#sum
             #[|do]#lor
-            "}),
+            "},
     ))
     .await?;
 
     // Copy the selection to previous line, skipping the first line in the file
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             test
             #[testitem|]#
-            "}),
+            "},
         "<A-C>",
-        platform_line(indoc! {"\
+        indoc! {"\
             test
             #[testitem|]#
-            "}),
+            "},
     ))
     .await?;
 
     // Copy the selection to previous line, including the first line in the file
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             test
             #[test|]#
-            "}),
+            "},
         "<A-C>",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[test|]#
             #(test|)#
-            "}),
+            "},
     ))
     .await?;
 
     // Copy the selection to next line, skipping the last line in the file
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[testitem|]#
             test
-            "}),
+            "},
         "C",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[testitem|]#
             test
-            "}),
+            "},
     ))
     .await?;
 
     // Copy the selection to next line, including the last line in the file
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[test|]#
             test
-            "}),
+            "},
         "C",
-        platform_line(indoc! {"\
+        indoc! {"\
             #(test|)#
             #[test|]#
-            "}),
+            "},
     ))
     .await?;
     Ok(())
@@ -159,17 +159,17 @@ async fn test_goto_file_impl() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_multi_selection_paste() -> anyhow::Result<()> {
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|lorem]#
             #(|ipsum)#
             #(|dolor)#
-            "}),
+            "},
         "yp",
-        platform_line(indoc! {"\
+        indoc! {"\
             lorem#[|lorem]#
             ipsum#(|ipsum)#
             dolor#(|dolor)#
-            "}),
+            "},
     ))
     .await?;
 
@@ -180,58 +180,58 @@ async fn test_multi_selection_paste() -> anyhow::Result<()> {
 async fn test_multi_selection_shell_commands() -> anyhow::Result<()> {
     // pipe
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|lorem]#
             #(|ipsum)#
             #(|dolor)#
-            "}),
+            "},
         "|echo foo<ret>",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|foo\n]#
             
             #(|foo\n)#
             
             #(|foo\n)#
             
-            "}),
+            "},
     ))
     .await?;
 
     // insert-output
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|lorem]#
             #(|ipsum)#
             #(|dolor)#
-            "}),
+            "},
         "!echo foo<ret>",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|foo\n]#
             lorem
             #(|foo\n)#
             ipsum
             #(|foo\n)#
             dolor
-            "}),
+            "},
     ))
     .await?;
 
     // append-output
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|lorem]#
             #(|ipsum)#
             #(|dolor)#
-            "}),
+            "},
         "<A-!>echo foo<ret>",
-        platform_line(indoc! {"\
+        indoc! {"\
             lorem#[|foo\n]#
             
             ipsum#(|foo\n)#
             
             dolor#(|foo\n)#
             
-            "}),
+            "},
     ))
     .await?;
 
@@ -247,7 +247,13 @@ async fn test_undo_redo() -> anyhow::Result<()> {
     // * u           Undo the two newlines. We're now on line 1.
     // * <C-o><C-i>  Jump forward an back again in the jumplist. This would panic
     //               if the jumplist were not being updated correctly.
-    test(("#[|]#", "2[<space><C-s>u<C-o><C-i>", "#[|]#")).await?;
+    test((
+        "#[|]#",
+        "2[<space><C-s>u<C-o><C-i>",
+        "#[|]#",
+        LineFeedHandling::AsIs,
+    ))
+    .await?;
 
     // A jumplist selection is passed through an edit and then an undo and then a redo.
     //
@@ -258,10 +264,22 @@ async fn test_undo_redo() -> anyhow::Result<()> {
     // * <C-o>       Jump back in the jumplist. This would panic if the jumplist were not being
     //               updated correctly.
     // * <C-i>       Jump forward to line 1.
-    test(("#[|]#", "[<space><C-s>kduU<C-o><C-i>", "#[|]#")).await?;
+    test((
+        "#[|]#",
+        "[<space><C-s>kduU<C-o><C-i>",
+        "#[|]#",
+        LineFeedHandling::AsIs,
+    ))
+    .await?;
 
     // In this case we 'redo' manually to ensure that the transactions are composing correctly.
-    test(("#[|]#", "[<space>u[<space>u", "#[|]#")).await?;
+    test((
+        "#[|]#",
+        "[<space>u[<space>u",
+        "#[|]#",
+        LineFeedHandling::AsIs,
+    ))
+    .await?;
 
     Ok(())
 }
@@ -270,35 +288,35 @@ async fn test_undo_redo() -> anyhow::Result<()> {
 async fn test_extend_line() -> anyhow::Result<()> {
     // extend with line selected then count
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[l|]#orem
             ipsum
             dolor
             
-            "}),
+            "},
         "x2x",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[lorem
             ipsum
             dolor\n|]#
             
-            "}),
+            "},
     ))
     .await?;
 
     // extend with count on partial selection
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[l|]#orem
             ipsum
             
-            "}),
+            "},
         "2x",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[lorem
             ipsum\n|]#
             
-            "}),
+            "},
     ))
     .await?;
 
@@ -366,16 +384,11 @@ async fn test_character_info() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_delete_char_backward() -> anyhow::Result<()> {
     // don't panic when deleting overlapping ranges
+    test(("#(x|)# #[x|]#", "c<space><backspace><esc>", "#[\n|]#")).await?;
     test((
-        platform_line("#(x|)# #[x|]#"),
-        "c<space><backspace><esc>",
-        platform_line("#[\n|]#"),
-    ))
-    .await?;
-    test((
-        platform_line("#( |)##( |)#a#( |)#axx#[x|]#a"),
+        "#( |)##( |)#a#( |)#axx#[x|]#a",
         "li<backspace><esc>",
-        platform_line("#(a|)##(|a)#xx#[|a]#"),
+        "#(a|)##(|a)#xx#[|a]#",
     ))
     .await?;
 
@@ -385,43 +398,33 @@ async fn test_delete_char_backward() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_delete_word_backward() -> anyhow::Result<()> {
     // don't panic when deleting overlapping ranges
-    test((
-        platform_line("fo#[o|]#ba#(r|)#"),
-        "a<C-w><esc>",
-        platform_line("#[\n|]#"),
-    ))
-    .await?;
+    test(("fo#[o|]#ba#(r|)#", "a<C-w><esc>", "#[\n|]#")).await?;
     Ok(())
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_delete_word_forward() -> anyhow::Result<()> {
     // don't panic when deleting overlapping ranges
-    test((
-        platform_line("fo#[o|]#b#(|ar)#"),
-        "i<A-d><esc>",
-        platform_line("fo#[\n|]#"),
-    ))
-    .await?;
+    test(("fo#[o|]#b#(|ar)#", "i<A-d><esc>", "fo#[\n|]#")).await?;
     Ok(())
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_delete_char_forward() -> anyhow::Result<()> {
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
                 #[abc|]#def
                 #(abc|)#ef
                 #(abc|)#f
                 #(abc|)#
-            "}),
+            "},
         "a<del><esc>",
-        platform_line(indoc! {"\
+        indoc! {"\
                 #[abc|]#ef
                 #(abc|)#f
                 #(abc|)#
                 #(abc|)#
-            "}),
+            "},
     ))
     .await?;
 
@@ -430,33 +433,37 @@ async fn test_delete_char_forward() -> anyhow::Result<()> {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_insert_with_indent() -> anyhow::Result<()> {
-    const INPUT: &str = "\
-#[f|]#n foo() {
-    if let Some(_) = None {
+    const INPUT: &str = indoc! { "
+        #[f|]#n foo() {
+            if let Some(_) = None {
 
-    }
-\x20
-}
+            }
+         
+        }
 
-fn bar() {
+        fn bar() {
 
-}";
+        }
+        "
+    };
 
     // insert_at_line_start
     test((
         INPUT,
         ":lang rust<ret>%<A-s>I",
-        "\
-#[f|]#n foo() {
-    #(i|)#f let Some(_) = None {
-        #(\n|)#\
-\x20   #(}|)#
-#(\x20|)#
-#(}|)#
-#(\n|)#\
-#(f|)#n bar() {
-    #(\n|)#\
-#(}|)#",
+        indoc! { "
+            #[f|]#n foo() {
+                #(i|)#f let Some(_) = None {
+                    #(\n|)#
+                #(}|)#
+            #( |)#
+            #(}|)#
+            #(\n|)#
+            #(f|)#n bar() {
+                #(\n|)#
+            #(}|)#
+            "
+        },
     ))
     .await?;
 
@@ -464,17 +471,19 @@ fn bar() {
     test((
         INPUT,
         ":lang rust<ret>%<A-s>A",
-        "\
-fn foo() {#[\n|]#\
-\x20   if let Some(_) = None {#(\n|)#\
-\x20       #(\n|)#\
-\x20   }#(\n|)#\
-\x20#(\n|)#\
-}#(\n|)#\
-#(\n|)#\
-fn bar() {#(\n|)#\
-\x20   #(\n|)#\
-}#(|)#",
+        indoc! { "
+            fn foo() {#[\n|]#
+                if let Some(_) = None {#(\n|)#
+                    #(\n|)#
+                }#(\n|)#
+             #(\n|)#
+            }#(\n|)#
+            #(\n|)#
+            fn bar() {#(\n|)#
+                #(\n|)#
+            }#(\n|)#
+            "
+        },
     ))
     .await?;
 
@@ -485,42 +494,42 @@ fn bar() {#(\n|)#\
 async fn test_join_selections() -> anyhow::Result<()> {
     // normal join
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc
             def
-        "}),
+        "},
         "J",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc def
-        "}),
+        "},
     ))
     .await?;
 
     // join with empty line
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc
 
             def
-        "}),
+        "},
         "JJ",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc def
-        "}),
+        "},
     ))
     .await?;
 
     // join with additional space in non-empty line
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc
 
                 def
-        "}),
+        "},
         "JJ",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc def
-        "}),
+        "},
     ))
     .await?;
 
@@ -531,7 +540,7 @@ async fn test_join_selections() -> anyhow::Result<()> {
 async fn test_join_selections_space() -> anyhow::Result<()> {
     // join with empty lines panic
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a
 
             b
@@ -541,69 +550,69 @@ async fn test_join_selections_space() -> anyhow::Result<()> {
             d
 
             e|]#
-        "}),
+        "},
         "<A-J>",
-        platform_line(indoc! {"\
+        indoc! {"\
             a#[ |]#b#( |)#c#( |)#d#( |)#e
-        "}),
+        "},
     ))
     .await?;
 
     // normal join
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc
             def
-        "}),
+        "},
         "<A-J>",
-        platform_line(indoc! {"\
+        indoc! {"\
             abc#[ |]#def
-        "}),
+        "},
     ))
     .await?;
 
     // join with empty line
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc
 
             def
-        "}),
+        "},
         "<A-J>",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc
             def
-        "}),
+        "},
     ))
     .await?;
 
     // join with additional space in non-empty line
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#bc
 
                 def
-        "}),
+        "},
         "<A-J><A-J>",
-        platform_line(indoc! {"\
+        indoc! {"\
             abc#[ |]#def
-        "}),
+        "},
     ))
     .await?;
 
     // join with retained trailing spaces
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             #[aaa   
 
             bb  
 
             c |]#
-        "}),
+        "},
         "<A-J>",
-        platform_line(indoc! {"\
+        indoc! {"\
             aaa   #[ |]#bb  #( |)#c 
-        "}),
+        "},
     ))
     .await?;
 
diff --git a/helix-term/tests/test/commands/movement.rs b/helix-term/tests/test/commands/movement.rs
index 5be68837c64c2..34c9d23b2b8e6 100644
--- a/helix-term/tests/test/commands/movement.rs
+++ b/helix-term/tests/test/commands/movement.rs
@@ -6,7 +6,7 @@ async fn test_move_parent_node_end() -> anyhow::Result<()> {
         // single cursor stays single cursor, first goes to end of current
         // node, then parent
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 fn foo() {
                     let result = if true {
                         "yes"
@@ -14,9 +14,9 @@ async fn test_move_parent_node_end() -> anyhow::Result<()> {
                         "no#["|]#
                     }
                 }
-            "##}),
+            "##},
             "<A-e>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -24,10 +24,10 @@ async fn test_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"#[\n|]#
                     }
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -35,9 +35,9 @@ async fn test_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"#[\n|]#
                     }
                 }
-            "}),
+            "},
             "<A-e>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -45,11 +45,11 @@ async fn test_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"
                     }#[\n|]#
                 }
-            "}),
+            "},
         ),
         // select mode extends
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 fn foo() {
                     let result = if true {
                         "yes"
@@ -57,9 +57,9 @@ async fn test_move_parent_node_end() -> anyhow::Result<()> {
                         #["no"|]#
                     }
                 }
-            "##}),
+            "##},
             "v<A-e><A-e>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -67,7 +67,7 @@ async fn test_move_parent_node_end() -> anyhow::Result<()> {
                         #[\"no\"
                     }\n|]#
                 }
-            "}),
+            "},
         ),
     ];
 
@@ -84,7 +84,7 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
         // single cursor stays single cursor, first goes to end of current
         // node, then parent
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 fn foo() {
                     let result = if true {
                         "yes"
@@ -92,9 +92,9 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         "no#["|]#
                     }
                 }
-            "##}),
+            "##},
             "<A-b>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -102,10 +102,10 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         #[\"|]#no\"
                     }
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -113,9 +113,9 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         \"no\"#[\n|]#
                     }
                 }
-            "}),
+            "},
             "<A-b>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -123,10 +123,10 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         \"no\"
                     }
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -134,9 +134,9 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         \"no\"
                     }
                 }
-            "}),
+            "},
             "<A-b>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -144,11 +144,11 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         \"no\"
                     }
                 }
-            "}),
+            "},
         ),
         // select mode extends
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 fn foo() {
                     let result = if true {
                         "yes"
@@ -156,9 +156,9 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         #["no"|]#
                     }
                 }
-            "##}),
+            "##},
             "v<A-b><A-b>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -166,10 +166,10 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         ]#\"no\"
                     }
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 fn foo() {
                     let result = if true {
                         "yes"
@@ -177,9 +177,9 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         #["no"|]#
                     }
                 }
-            "##}),
+            "##},
             "v<A-b><A-b><A-b>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -187,7 +187,7 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
                         ]#\"no\"
                     }
                 }
-            "}),
+            "},
         ),
     ];
 
@@ -204,7 +204,7 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
         // single cursor stays single cursor, first goes to end of current
         // node, then parent
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 fn foo() {
                     let result = if true {
                         "yes"
@@ -212,9 +212,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         "no#["|]#
                     }
                 }
-            "##}),
+            "##},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -222,10 +222,10 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"#[|\n]#
                     }
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -233,9 +233,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"#[\n|]#
                     }
                 }
-            "}),
+            "},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -243,12 +243,12 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"
                     }#[|\n]#
                 }
-            "}),
+            "},
         ),
         // appending to the end of a line should still look at the current
         // line, not the next one
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -256,9 +256,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no#[\"|]#
                     }
                 }
-            "}),
+            "},
             "a<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -266,11 +266,11 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"
                     }#[\n|]#
                 }
-            "}),
+            "},
         ),
         // before cursor is all whitespace, so insert tab
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -278,9 +278,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         #[\"no\"|]#
                     }
                 }
-            "}),
+            "},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -288,12 +288,12 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                             #[|\"no\"]#
                     }
                 }
-            "}),
+            "},
         ),
         // if selection spans multiple lines, it should still only look at the
         // line on which the head is
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         #[\"yes\"
@@ -301,9 +301,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"|]#
                     }
                 }
-            "}),
+            "},
             "a<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -311,10 +311,10 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"
                     }#[\n|]#
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         #[\"yes\"
@@ -322,9 +322,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"|]#
                     }
                 }
-            "}),
+            "},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                             #[|\"yes\"
@@ -332,10 +332,10 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"]#
                     }
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     #[l|]#et result = if true {
                         #(\"yes\"
@@ -343,9 +343,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"|)#
                     }
                 }
-            "}),
+            "},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                         #[|l]#et result = if true {
                             #(|\"yes\"
@@ -353,10 +353,10 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\")#
                     }
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"#[\n|]#
@@ -364,9 +364,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"#(\n|)#
                     }
                 }
-            "}),
+            "},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -374,10 +374,10 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"
                     }#(|\n)#
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         #[\"yes\"|]#
@@ -385,9 +385,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         #(\"no\"|)#
                     }
                 }
-            "}),
+            "},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                             #[|\"yes\"]#
@@ -395,12 +395,12 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                             #(|\"no\")#
                     }
                 }
-            "}),
+            "},
         ),
         // if any cursors are not preceded by all whitespace, then do the
         // smart_tab action
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         #[\"yes\"\n|]#
@@ -408,9 +408,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no#(\"\n|)#
                     }
                 }
-            "}),
+            "},
             "i<tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         \"yes\"
@@ -418,11 +418,11 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no\"
                     }#(|\n)#
                 }
-            "}),
+            "},
         ),
         // Ctrl-tab always inserts a tab
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                         #[\"yes\"\n|]#
@@ -430,9 +430,9 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no#(\"\n|)#
                     }
                 }
-            "}),
+            "},
             "i<S-tab>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 fn foo() {
                     let result = if true {
                             #[|\"yes\"\n]#
@@ -440,7 +440,7 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
                         \"no    #(|\"\n)#
                     }
                 }
-            "}),
+            "},
         ),
     ];
 
diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index f65352c7e68de..7259b4e581e26 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs
@@ -94,7 +94,10 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     )
     .await?;
 
-    helpers::assert_file_has_content(file.as_file_mut(), &platform_line(&RANGE.end().to_string()))?;
+    helpers::assert_file_has_content(
+        file.as_file_mut(),
+        &LineFeedHandling::Native.apply(&RANGE.end().to_string()),
+    )?;
 
     Ok(())
 }
@@ -121,7 +124,7 @@ async fn test_write() -> anyhow::Result<()> {
     file.as_file_mut().read_to_string(&mut file_content)?;
 
     assert_eq!(
-        helpers::platform_line("the gostak distims the doshes"),
+        LineFeedHandling::Native.apply("the gostak distims the doshes"),
         file_content
     );
 
@@ -138,7 +141,7 @@ async fn test_overwrite_protection() -> anyhow::Result<()> {
     helpers::run_event_loop_until_idle(&mut app).await;
 
     file.as_file_mut()
-        .write_all(helpers::platform_line("extremely important content").as_bytes())?;
+        .write_all("extremely important content".as_bytes())?;
 
     file.as_file_mut().flush()?;
     file.as_file_mut().sync_all()?;
@@ -152,10 +155,7 @@ async fn test_overwrite_protection() -> anyhow::Result<()> {
     let mut file_content = String::new();
     file.as_file_mut().read_to_string(&mut file_content)?;
 
-    assert_eq!(
-        helpers::platform_line("extremely important content"),
-        file_content
-    );
+    assert_eq!("extremely important content", file_content);
 
     Ok(())
 }
@@ -182,7 +182,7 @@ async fn test_write_quit() -> anyhow::Result<()> {
     file.as_file_mut().read_to_string(&mut file_content)?;
 
     assert_eq!(
-        helpers::platform_line("the gostak distims the doshes"),
+        LineFeedHandling::Native.apply("the gostak distims the doshes"),
         file_content
     );
 
@@ -210,7 +210,10 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
 
     let mut file_content = String::new();
     file.as_file_mut().read_to_string(&mut file_content)?;
-    assert_eq!(platform_line(&RANGE.end().to_string()), file_content);
+    assert_eq!(
+        LineFeedHandling::Native.apply(&RANGE.end().to_string()),
+        file_content
+    );
 
     Ok(())
 }
@@ -276,7 +279,7 @@ async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {
     )
     .await?;
 
-    helpers::assert_file_has_content(file.as_file_mut(), &helpers::platform_line("hello"))?;
+    helpers::assert_file_has_content(file.as_file_mut(), &LineFeedHandling::Native.apply("hello"))?;
 
     Ok(())
 }
@@ -361,12 +364,12 @@ async fn test_write_new_path() -> anyhow::Result<()> {
 
     helpers::assert_file_has_content(
         file1.as_file_mut(),
-        &helpers::platform_line("i can eat glass, it will not hurt me\n"),
+        &LineFeedHandling::Native.apply("i can eat glass, it will not hurt me\n"),
     )?;
 
     helpers::assert_file_has_content(
         file2.as_file_mut(),
-        &helpers::platform_line("i can eat glass, it will not hurt me\n"),
+        &LineFeedHandling::Native.apply("i can eat glass, it will not hurt me\n"),
     )?;
 
     Ok(())
@@ -437,7 +440,7 @@ async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()
 
     helpers::assert_file_has_content(
         file.as_file_mut(),
-        &helpers::platform_line("have you tried chamomile tea?\n"),
+        &LineFeedHandling::Native.apply("have you tried chamomile tea?\n"),
     )?;
 
     Ok(())
@@ -448,14 +451,14 @@ async fn test_write_insert_final_newline_unchanged_if_not_missing() -> anyhow::R
     let mut file = tempfile::NamedTempFile::new()?;
     let mut app = helpers::AppBuilder::new()
         .with_file(file.path(), None)
-        .with_input_text(&helpers::platform_line("#[t|]#en minutes, please\n"))
+        .with_input_text(LineFeedHandling::Native.apply("#[t|]#en minutes, please\n"))
         .build()?;
 
     test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
 
     helpers::assert_file_has_content(
         file.as_file_mut(),
-        &helpers::platform_line("ten minutes, please\n"),
+        &LineFeedHandling::Native.apply("ten minutes, please\n"),
     )?;
 
     Ok(())
@@ -508,12 +511,12 @@ async fn test_write_all_insert_final_newline_add_if_missing_and_modified() -> an
 
     helpers::assert_file_has_content(
         file1.as_file_mut(),
-        &helpers::platform_line("we don't serve time travelers here\n"),
+        &LineFeedHandling::Native.apply("we don't serve time travelers here\n"),
     )?;
 
     helpers::assert_file_has_content(
         file2.as_file_mut(),
-        &helpers::platform_line("a time traveler walks into a bar\n"),
+        &LineFeedHandling::Native.apply("a time traveler walks into a bar\n"),
     )?;
 
     Ok(())
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index a978f386e3354..41eab4273e537 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -14,6 +14,46 @@ use helix_view::{current_ref, doc, editor::LspConfig, input::parse_macro, Editor
 use tempfile::NamedTempFile;
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
+/// Specify how to set up the input text with line feeds
+#[derive(Clone, Debug)]
+pub enum LineFeedHandling {
+    /// Replaces all LF chars with the system's appropriate line feed character,
+    /// and if one doesn't exist already, appends the system's appropriate line
+    /// ending to the end of a string.
+    Native,
+
+    /// Do not modify the input text in any way. What you give is what you test.
+    AsIs,
+}
+
+impl LineFeedHandling {
+    /// Apply the line feed handling to the input string, yielding a set of
+    /// resulting texts with the appropriate line feed substitutions.
+    pub fn apply(&self, text: &str) -> String {
+        let line_end = match self {
+            LineFeedHandling::Native => helix_core::NATIVE_LINE_ENDING,
+            LineFeedHandling::AsIs => return text.into(),
+        }
+        .as_str();
+
+        // we can assume that the source files in this code base will always
+        // be LF, so indoc strings will always insert LF
+        let mut output = text.replace('\n', line_end);
+
+        if !output.ends_with(line_end) {
+            output.push_str(line_end);
+        }
+
+        output
+    }
+}
+
+impl Default for LineFeedHandling {
+    fn default() -> Self {
+        Self::Native
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct TestCase {
     pub in_text: String,
@@ -21,6 +61,8 @@ pub struct TestCase {
     pub in_keys: String,
     pub out_text: String,
     pub out_selection: Selection,
+
+    pub line_feed_handling: LineFeedHandling,
 }
 
 impl<S, R, V> From<(S, R, V)> for TestCase
@@ -30,8 +72,19 @@ where
     V: Into<String>,
 {
     fn from((input, keys, output): (S, R, V)) -> Self {
-        let (in_text, in_selection) = test::print(&input.into());
-        let (out_text, out_selection) = test::print(&output.into());
+        TestCase::from((input, keys, output, LineFeedHandling::default()))
+    }
+}
+
+impl<S, R, V> From<(S, R, V, LineFeedHandling)> for TestCase
+where
+    S: Into<String>,
+    R: Into<String>,
+    V: Into<String>,
+{
+    fn from((input, keys, output, line_feed_handling): (S, R, V, LineFeedHandling)) -> Self {
+        let (in_text, in_selection) = test::print(&line_feed_handling.apply(&input.into()));
+        let (out_text, out_selection) = test::print(&line_feed_handling.apply(&output.into()));
 
         TestCase {
             in_text,
@@ -39,6 +92,7 @@ where
             in_keys: keys.into(),
             out_text,
             out_selection,
+            line_feed_handling,
         }
     }
 }
@@ -137,6 +191,7 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     should_exit: bool,
 ) -> anyhow::Result<()> {
     let test_case = test_case.into();
+
     let mut app = match app {
         Some(app) => app,
         None => Application::new(Args::default(), test_config(), test_syntax_loader(None))?,
@@ -240,23 +295,6 @@ pub fn test_editor_config() -> helix_view::editor::Config {
     }
 }
 
-/// Replaces all LF chars with the system's appropriate line feed
-/// character, and if one doesn't exist already, appends the system's
-/// appropriate line ending to the end of a string.
-pub fn platform_line(input: &str) -> String {
-    let line_end = helix_core::NATIVE_LINE_ENDING.as_str();
-
-    // we can assume that the source files in this code base will always
-    // be LF, so indoc strings will always insert LF
-    let mut output = input.replace('\n', line_end);
-
-    if !output.ends_with(line_end) {
-        output.push_str(line_end);
-    }
-
-    output
-}
-
 /// Creates a new temporary file that is set to read only. Useful for
 /// testing write failures.
 pub fn new_readonly_tempfile() -> anyhow::Result<NamedTempFile> {
diff --git a/helix-term/tests/test/languages/go.rs b/helix-term/tests/test/languages/go.rs
index 7bb3651e6ad73..57ef92f82a34b 100644
--- a/helix-term/tests/test/languages/go.rs
+++ b/helix-term/tests/test/languages/go.rs
@@ -6,30 +6,30 @@ async fn auto_indent() -> anyhow::Result<()> {
 
     let enter_tests = [
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 type Test struct {#[}|]#
-            "##}),
+            "##},
             "i<ret>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 type Test struct {
                 \t#[|\n]#
                 }
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 func main() {
                 \tswitch nil {#[}|]#
                 }
-             "}),
+             "},
             "i<ret>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 func main() {
                 \tswitch nil {
                 \t\t#[|\n]#
                 \t}
                 }
-            "}),
+            "},
         ),
     ];
 
diff --git a/helix-term/tests/test/languages/yaml.rs b/helix-term/tests/test/languages/yaml.rs
index 7669e8a278aac..10e1861d475b5 100644
--- a/helix-term/tests/test/languages/yaml.rs
+++ b/helix-term/tests/test/languages/yaml.rs
@@ -6,7 +6,7 @@ async fn auto_indent() -> anyhow::Result<()> {
 
     let below_tests = [
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 #[t|]#op:
                   baz: foo
                   bazi:
@@ -17,9 +17,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   #[\n|]#
                   baz: foo
@@ -31,10 +31,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   b#[a|]#z: foo
                   bazi:
@@ -45,9 +45,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   #[\n|]#
@@ -59,10 +59,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   baz: foo
                   bazi#[:|]#
@@ -73,9 +73,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -87,10 +87,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   baz: foo
                   bazi:
@@ -101,9 +101,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -115,10 +115,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   baz: foo
                   bazi:
@@ -129,9 +129,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -143,10 +143,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -157,9 +157,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -171,10 +171,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -185,9 +185,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -199,10 +199,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -213,9 +213,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:#[\n|]#
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -227,10 +227,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                   bax: foox
                 fook:
                   #[\n|]#
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: |
@@ -239,9 +239,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     line
                     string#[\n|]#
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: |
@@ -251,10 +251,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     string
                     #[\n|]#
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >
@@ -263,9 +263,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     line#[\n|]#
                     string
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >
@@ -275,74 +275,74 @@ async fn auto_indent() -> anyhow::Result<()> {
                     #[\n|]#
                     string
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >#[\n|]#
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >
                     #[\n|]#
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:#[\n|]#
                   baz: foo
                   bax: foox
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   #[\n|]#
                   baz: foo
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   baz: foo#[\n|]#
                   bax: foox
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   baz: foo
                   #[\n|]#
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   baz: foo
                   bax: foox#[\n|]#
                 fook:
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   baz: foo
                   bax: foox
                   #[\n|]#
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
                 baz:
                   - one: two#[\n|]#
@@ -350,9 +350,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                   - top:
                       baz: foo
                       bax: foox
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
                 baz:
                   - one: two
@@ -361,42 +361,42 @@ async fn auto_indent() -> anyhow::Result<()> {
                   - top:
                       baz: foo
                       bax: foox
-            "}),
+            "},
         ),
         // yaml map without a key
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:#[\n|]#
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
                 #[\n|]#
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top#[:|]#
               bottom: withvalue
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
                 #[\n|]#
               bottom: withvalue
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               bottom: withvalue
               top#[:|]#
-            "}),
+            "},
             "o",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               bottom: withvalue
               top:
                 #[\n|]#
-            "}),
+            "},
         ),
     ];
 
@@ -406,7 +406,7 @@ async fn auto_indent() -> anyhow::Result<()> {
 
     let above_tests = [
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 #[t|]#op:
                   baz: foo
                   bazi:
@@ -417,9 +417,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 #[\n|]#
                 top:
                   baz: foo
@@ -431,10 +431,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   b#[a|]#z: foo
                   bazi:
@@ -445,9 +445,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   #[\n|]#
                   baz: foo
@@ -459,10 +459,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   baz: foo
                   bazi#[:|]#
@@ -473,9 +473,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   #[\n|]#
@@ -487,10 +487,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   baz: foo
                   bazi:
@@ -501,9 +501,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -515,10 +515,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 top:
                   baz: foo
                   bazi:
@@ -529,9 +529,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "##}),
+            "##},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -543,10 +543,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -557,9 +557,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -571,10 +571,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -585,9 +585,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -599,10 +599,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -613,9 +613,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     - 2
                   bax: foox
                 fook:#[\n|]#
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bazi:
@@ -627,10 +627,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                   bax: foox
                   #[\n|]#
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: |
@@ -639,9 +639,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     line
                     string#[\n|]#
                 fook:
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: |
@@ -651,10 +651,10 @@ async fn auto_indent() -> anyhow::Result<()> {
                     #[\n|]#
                     string
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >
@@ -663,9 +663,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                     line
                     string
                 fook:
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >
@@ -675,58 +675,58 @@ async fn auto_indent() -> anyhow::Result<()> {
                     line
                     string
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >
                 fook:#[\n|]#
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 top:
                   baz: foo
                   bax: >
                     #[\n|]#
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   baz: foo#[\n|]#
                   bax: foox
                 fook:
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   #[\n|]#
                   baz: foo
                   bax: foox
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   baz: foo
                   bax: foox
                 fook:#[\n|]#
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               - top:
                   baz: foo
                   bax: foox
                   #[\n|]#
                 fook:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
                 baz:
                   - one: two#[\n|]#
@@ -734,9 +734,9 @@ async fn auto_indent() -> anyhow::Result<()> {
                   - top:
                       baz: foo
                       bax: foox
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
                 baz:
                   #[\n|]#
@@ -745,42 +745,42 @@ async fn auto_indent() -> anyhow::Result<()> {
                   - top:
                       baz: foo
                       bax: foox
-            "}),
+            "},
         ),
         // yaml map without a key
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:#[\n|]#
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               #[\n|]#
               top:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               bottom: withvalue
               top#[:|]#
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               bottom: withvalue
               #[\n|]#
               top:
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
               bottom:#[ |]#withvalue
-            "}),
+            "},
             "O",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
               top:
                 #[\n|]#
               bottom: withvalue
-            "}),
+            "},
         ),
     ];
 
@@ -790,24 +790,24 @@ async fn auto_indent() -> anyhow::Result<()> {
 
     let enter_tests = [
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 foo: #[b|]#ar
-            "##}),
+            "##},
             "i<ret>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 foo: 
                   #[|b]#ar
-            "}),
+            "},
         ),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 foo:#[\n|]#
-            "}),
+            "},
             "i<ret>",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 foo:
                   #[|\n]#
-            "}),
+            "},
         ),
     ];
 
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 1c25032c2f1b0..9ecaf6bb094f1 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -8,6 +8,7 @@ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
         in_keys: "i".into(),
         out_text: String::new(),
         out_selection: Selection::single(0, 0),
+        line_feed_handling: LineFeedHandling::AsIs,
     })
     .await?;
 
@@ -392,20 +393,10 @@ async fn cursor_position_newly_opened_file() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn cursor_position_append_eof() -> anyhow::Result<()> {
     // Selection is forwards
-    test((
-        "#[foo|]#",
-        "abar<esc>",
-        helpers::platform_line("#[foobar|]#\n"),
-    ))
-    .await?;
+    test(("#[foo|]#", "abar<esc>", "#[foobar|]#\n")).await?;
 
     // Selection is backwards
-    test((
-        "#[|foo]#",
-        "abar<esc>",
-        helpers::platform_line("#[foobar|]#\n"),
-    ))
-    .await?;
+    test(("#[|foo]#", "abar<esc>", "#[foobar|]#\n")).await?;
 
     Ok(())
 }
@@ -415,19 +406,19 @@ async fn select_mode_tree_sitter_next_function_is_union_of_objects() -> anyhow::
     test_with_config(
         AppBuilder::new().with_file("foo.rs", None),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 #[/|]#// Increments
                 fn inc(x: usize) -> usize { x + 1 }
                 /// Decrements
                 fn dec(x: usize) -> usize { x - 1 }
-            "}),
+            "},
             "]fv]f",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 /// Increments
                 #[fn inc(x: usize) -> usize { x + 1 }
                 /// Decrements
                 fn dec(x: usize) -> usize { x - 1 }|]#
-            "}),
+            "},
         ),
     )
     .await?;
@@ -440,19 +431,19 @@ async fn select_mode_tree_sitter_prev_function_unselects_object() -> anyhow::Res
     test_with_config(
         AppBuilder::new().with_file("foo.rs", None),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 /// Increments
                 #[fn inc(x: usize) -> usize { x + 1 }
                 /// Decrements
                 fn dec(x: usize) -> usize { x - 1 }|]#
-            "}),
+            "},
             "v[f",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 /// Increments
                 #[fn inc(x: usize) -> usize { x + 1 }|]#
                 /// Decrements
                 fn dec(x: usize) -> usize { x - 1 }
-            "}),
+            "},
         ),
     )
     .await?;
@@ -466,23 +457,23 @@ async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> any
     test_with_config(
         AppBuilder::new().with_file("foo.rs", None),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 /// Increments
                 fn inc(x: usize) -> usize { x + 1 }
                 /// Decrements
                 fn dec(x: usize) -> usize { x - 1 }
                 /// Identity
                 #[fn ident(x: usize) -> usize { x }|]#
-            "}),
+            "},
             "v[f",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 /// Increments
                 fn inc(x: usize) -> usize { x + 1 }
                 /// Decrements
                 #[|fn dec(x: usize) -> usize { x - 1 }
                 /// Identity
                 ]#fn ident(x: usize) -> usize { x }
-            "}),
+            "},
         ),
     )
     .await?;
@@ -490,23 +481,23 @@ async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> any
     test_with_config(
         AppBuilder::new().with_file("foo.rs", None),
         (
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 /// Increments
                 fn inc(x: usize) -> usize { x + 1 }
                 /// Decrements
                 fn dec(x: usize) -> usize { x - 1 }
                 /// Identity
                 #[fn ident(x: usize) -> usize { x }|]#
-            "}),
+            "},
             "v[f[f",
-            helpers::platform_line(indoc! {"\
+            indoc! {"\
                 /// Increments
                 #[|fn inc(x: usize) -> usize { x + 1 }
                 /// Decrements
                 fn dec(x: usize) -> usize { x - 1 }
                 /// Identity
                 ]#fn ident(x: usize) -> usize { x }
-            "}),
+            "},
         ),
     )
     .await?;
@@ -517,36 +508,36 @@ async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> any
 #[tokio::test(flavor = "multi_thread")]
 async fn find_char_line_ending() -> anyhow::Result<()> {
     test((
-        helpers::platform_line(indoc! {
+        indoc! {
             "\
             one
             #[|t]#wo
             three"
-        }),
+        },
         "T<ret>gll2f<ret>",
-        helpers::platform_line(indoc! {
+        indoc! {
             "\
             one
             two#[
             |]#three"
-        }),
+        },
     ))
     .await?;
 
     test((
-        helpers::platform_line(indoc! {
+        indoc! {
             "\
             #[|o]#ne
             two
             three"
-        }),
+        },
         "f<ret>2t<ret>ghT<ret>F<ret>",
-        helpers::platform_line(indoc! {
+        indoc! {
             "\
             one#[|
             t]#wo
             three"
-        }),
+        },
     ))
     .await?;
 
@@ -556,41 +547,41 @@ async fn find_char_line_ending() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_surround_replace() -> anyhow::Result<()> {
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             (#[|a]#)
-            "}),
+            "},
         "mrm{",
-        platform_line(indoc! {"\
+        indoc! {"\
             {#[|a]#}
-            "}),
+            "},
     ))
     .await?;
 
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             (#[a|]#)
-            "}),
+            "},
         "mrm{",
-        platform_line(indoc! {"\
+        indoc! {"\
             {#[a|]#}
-            "}),
+            "},
     ))
     .await?;
 
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             {{
 
             #(}|)#
             #[}|]#
-            "}),
+            "},
         "mrm)",
-        platform_line(indoc! {"\
+        indoc! {"\
             ((
 
             #()|)#
             #[)|]#
-            "}),
+            "},
     ))
     .await?;
 
@@ -600,36 +591,36 @@ async fn test_surround_replace() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_surround_delete() -> anyhow::Result<()> {
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             (#[|a]#)
-            "}),
+            "},
         "mdm",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[|a]#
-            "}),
+            "},
     ))
     .await?;
 
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             (#[a|]#)
-            "}),
+            "},
         "mdm",
-        platform_line(indoc! {"\
+        indoc! {"\
             #[a|]#
-            "}),
+            "},
     ))
     .await?;
 
     test((
-        platform_line(indoc! {"\
+        indoc! {"\
             {{
 
             #(}|)#
             #[}|]#
-            "}),
+            "},
         "mdm",
-        platform_line("\n\n#(\n|)##[\n|]#"),
+        "\n\n#(\n|)##[\n|]#",
     ))
     .await?;
 
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index 3b66c04864212..f19e30041e8d7 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -62,9 +62,18 @@ async fn test_split_write_quit_all() -> anyhow::Result<()> {
     )
     .await?;
 
-    helpers::assert_file_has_content(file1.as_file_mut(), &platform_line("hello1"))?;
-    helpers::assert_file_has_content(file2.as_file_mut(), &platform_line("hello2"))?;
-    helpers::assert_file_has_content(file3.as_file_mut(), &platform_line("hello3"))?;
+    helpers::assert_file_has_content(
+        file1.as_file_mut(),
+        &LineFeedHandling::Native.apply("hello1"),
+    )?;
+    helpers::assert_file_has_content(
+        file2.as_file_mut(),
+        &LineFeedHandling::Native.apply("hello2"),
+    )?;
+    helpers::assert_file_has_content(
+        file3.as_file_mut(),
+        &LineFeedHandling::Native.apply("hello3"),
+    )?;
 
     Ok(())
 }
@@ -91,7 +100,7 @@ async fn test_split_write_quit_same_file() -> anyhow::Result<()> {
                     let doc = docs.pop().unwrap();
 
                     assert_eq!(
-                        helpers::platform_line("hello\ngoodbye"),
+                        LineFeedHandling::Native.apply("hello\ngoodbye"),
                         doc.text().to_string()
                     );
 
@@ -110,7 +119,7 @@ async fn test_split_write_quit_same_file() -> anyhow::Result<()> {
                     let doc = docs.pop().unwrap();
 
                     assert_eq!(
-                        helpers::platform_line("hello\ngoodbye"),
+                        LineFeedHandling::Native.apply("hello\ngoodbye"),
                         doc.text().to_string()
                     );
 
@@ -124,7 +133,7 @@ async fn test_split_write_quit_same_file() -> anyhow::Result<()> {
 
     helpers::assert_file_has_content(
         file.as_file_mut(),
-        &helpers::platform_line("hello\ngoodbye"),
+        &LineFeedHandling::Native.apply("hello\ngoodbye"),
     )?;
 
     Ok(())
@@ -151,7 +160,13 @@ async fn test_changes_in_splits_apply_to_all_views() -> anyhow::Result<()> {
     //
     // This panicked in the past because the jumplist entry on line 2 of window 2
     // was not updated and after the `kd` step, pointed outside of the document.
-    test(("#[|]#", "<C-w>v[<space><C-s><C-w>wkd<C-w>qd", "#[|]#")).await?;
+    test((
+        "#[|]#",
+        "<C-w>v[<space><C-s><C-w>wkd<C-w>qd",
+        "#[|]#",
+        LineFeedHandling::AsIs,
+    ))
+    .await?;
 
     // Transactions are applied to the views for windows lazily when they are focused.
     // This case panics if the transactions and inversions are not applied in the
@@ -160,6 +175,7 @@ async fn test_changes_in_splits_apply_to_all_views() -> anyhow::Result<()> {
         "#[|]#",
         "[<space>[<space>[<space><C-w>vuuu<C-w>wUUU<C-w>quuu",
         "#[|]#",
+        LineFeedHandling::AsIs,
     ))
     .await?;
 
@@ -185,6 +201,7 @@ async fn test_changes_in_splits_apply_to_all_views() -> anyhow::Result<()> {
         "#[|]#",
         "3[<space><C-w>v<C-s><C-w>wuu3[<space><C-w>q%d",
         "#[|]#",
+        LineFeedHandling::AsIs,
     ))
     .await?;
 
diff --git a/helix-vcs/src/lib.rs b/helix-vcs/src/lib.rs
index 63487fbcde6c7..851fd6e91c226 100644
--- a/helix-vcs/src/lib.rs
+++ b/helix-vcs/src/lib.rs
@@ -46,8 +46,8 @@ impl DiffProviderRegistry {
             .find_map(|provider| match provider.get_diff_base(file) {
                 Ok(res) => Some(res),
                 Err(err) => {
-                    log::info!("{err:#?}");
-                    log::info!("failed to open diff base for {}", file.display());
+                    log::debug!("{err:#?}");
+                    log::debug!("failed to open diff base for {}", file.display());
                     None
                 }
             })
@@ -59,8 +59,8 @@ impl DiffProviderRegistry {
             .find_map(|provider| match provider.get_current_head_name(file) {
                 Ok(res) => Some(res),
                 Err(err) => {
-                    log::info!("{err:#?}");
-                    log::info!("failed to obtain current head name for {}", file.display());
+                    log::debug!("{err:#?}");
+                    log::debug!("failed to obtain current head name for {}", file.display());
                     None
                 }
             })

From 9a80f7203da9a7d4904a73e3af5754248656be6a Mon Sep 17 00:00:00 2001
From: Pascal Eberhard <99962926+pascaleberhard0se@users.noreply.github.com>
Date: Sun, 31 Mar 2024 14:16:19 +0200
Subject: [PATCH 095/101] add initial support for bitbake language (#10010)

Signed-off-by: Pascal Eberhard <pascal.eberhard@se.com>
---
 book/src/generated/lang-support.md     |  1 +
 languages.toml                         | 12 ++++
 runtime/queries/bitbake/highlights.scm | 82 ++++++++++++++++++++++++++
 runtime/queries/bitbake/injections.scm | 18 ++++++
 4 files changed, 113 insertions(+)
 create mode 100644 runtime/queries/bitbake/highlights.scm
 create mode 100644 runtime/queries/bitbake/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 2030949eb465c..a43c0b70a8cbd 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -9,6 +9,7 @@
 | beancount | ✓ |  |  |  |
 | bibtex | ✓ |  |  | `texlab` |
 | bicep | ✓ |  |  | `bicep-langserver` |
+| bitbake | ✓ |  |  | `bitbake-language-server` |
 | blade | ✓ |  |  |  |
 | blueprint | ✓ |  |  | `blueprint-compiler` |
 | c | ✓ | ✓ | ✓ | `clangd` |
diff --git a/languages.toml b/languages.toml
index 03e471a578ba0..6fbcbbc4e7608 100644
--- a/languages.toml
+++ b/languages.toml
@@ -12,6 +12,7 @@ awk-language-server = { command = "awk-language-server" }
 bash-language-server = { command = "bash-language-server", args = ["start"] }
 bass = { command = "bass", args = ["--lsp"] }
 bicep-langserver = { command = "bicep-langserver" }
+bitbake-language-server = { command = "bitbake-language-server" }
 bufls = { command = "bufls", args = ["serve"] }
 cairo-language-server = { command = "cairo-language-server", args = [] }
 cl-lsp = { command = "cl-lsp", args = [ "stdio" ] }
@@ -3209,6 +3210,17 @@ indent = { tab-width = 2, unit = "  " }
 name = "dbml"
 source = { git = "https://github.com/dynamotn/tree-sitter-dbml", rev = "2e2fa5640268c33c3d3f27f7e676f631a9c68fd9" }
 
+[[language]]
+name = "bitbake"
+language-servers = [ "bitbake-language-server" ]
+scope = "source.bitbake"
+file-types = ["bb", "bbappend", "bbclass", {glob = "conf/*.conf" }, {glob = "conf/*/*.{inc,conf}" }, { glob = "recipe-*/*/*.inc" }]
+comment-token = "#"
+
+[[grammar]]
+name = "bitbake"
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-bitbake", rev = "10bacac929ff36a1e8f4056503fe4f8717b21b94" }
+
 [[language]]
 name = "log"
 scope = "source.log"
diff --git a/runtime/queries/bitbake/highlights.scm b/runtime/queries/bitbake/highlights.scm
new file mode 100644
index 0000000000000..6e8ab0cf3d3ee
--- /dev/null
+++ b/runtime/queries/bitbake/highlights.scm
@@ -0,0 +1,82 @@
+
+; variables
+(variable_assignment (identifier) @variable.other.member)
+(variable_assignment (concatenation (identifier) @variable.other.member))
+(unset_statement (identifier) @variable.other.member)
+(export_statement (identifier) @variable.other.member)
+(variable_expansion (identifier) @variable.other.member)
+(python_function_definition (parameters (python_identifier) @variable.other.member))
+
+(variable_assignment (override) @keyword.storage.modifier)
+(overrides_statement (identifier) @keyword.storage.modifier)
+(flag) @keyword.storage.modifier
+
+[
+  "="
+  "?="
+  "??="
+  ":="
+  "=+"
+  "+="
+  ".="
+  "=."
+
+] @operator
+
+(variable_expansion [ "${" "}" ] @punctuation.special)
+[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
+
+[
+  "noexec"
+  "INHERIT"
+  "OVERRIDES"
+  "$BB_ENV_PASSTHROUGH"
+  "$BB_ENV_PASSTHROUGH_ADDITIONS"
+] @variable.builtin
+
+; functions
+
+(python_function_definition (python_identifier) @function)
+(anonymous_python_function (identifier) @function)
+(function_definition (identifier) @function)
+(export_functions_statement (identifier) @function)
+(addtask_statement (identifier) @function)
+(deltask_statement (identifier) @function)
+(addhandler_statement (identifier) @function)
+(function_definition (override) @keyword.storage.modifier)
+
+[
+  "addtask"
+  "deltask"
+  "addhandler"
+  "unset"
+  "EXPORT_FUNCTIONS"
+  "python"
+  "def"
+] @keyword.function
+
+[
+  "append"
+  "prepend"
+  "remove"
+
+  "before"
+  "after"
+] @keyword.operator
+
+; imports
+
+[
+  "inherit"
+  "include"
+  "require"
+  "export"
+  "import"
+] @keyword.control.import
+
+(inherit_path) @namespace
+(include_path) @namespace
+
+
+(string) @string
+(comment) @comment
diff --git a/runtime/queries/bitbake/injections.scm b/runtime/queries/bitbake/injections.scm
new file mode 100644
index 0000000000000..adae990e43262
--- /dev/null
+++ b/runtime/queries/bitbake/injections.scm
@@ -0,0 +1,18 @@
+((python_function_definition) @injection.content
+  (#set! injection.language "python")
+  (#set! injection.include-children))
+
+((anonymous_python_function (block) @injection.content)
+  (#set! injection.language "python")
+  (#set! injection.include-children))
+
+((inline_python) @injection.content
+  (#set! injection.language "python")
+  (#set! injection.include-children))
+
+((function_definition) @injection.content
+  (#set! injection.language "bash")
+  (#set! injection.include-children))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 0da58656958184677b44372f72a922baacfc4940 Mon Sep 17 00:00:00 2001
From: Erasin Wang <erasinoo@gmail.com>
Date: Sun, 31 Mar 2024 20:16:48 +0800
Subject: [PATCH 096/101] feat(themes): add `jump-label` for oneLight theme
 (#10061)

---
 runtime/themes/onelight.toml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml
index e35abdb376daf..209f71ab66391 100644
--- a/runtime/themes/onelight.toml
+++ b/runtime/themes/onelight.toml
@@ -17,12 +17,12 @@
 
 "constant" = { fg = "cyan", modifiers = ["bold"] }
 "constant.builtin" = { fg = "deep-purple" }
-"constant.builtin.boolean" = { fg = "purple" }
+"constant.builtin.boolean" = { fg = "purple" , modifiers = ["bold"]}
 "constant.character" = { fg = "green" }
-"constant.character.escape" = { fg = "brown" }
-"constant.numeric" = { fg = "brown" }
-"constant.numeric.integer" = { fg = "brown" }
-"constant.numeric.float" = { fg = "brown" }
+"constant.character.escape" = { fg = "brown" , modifiers = ["bold"]}
+"constant.numeric" = { fg = "brown" , modifiers = ["bold"]}
+"constant.numeric.integer" = { fg = "brown" , modifiers = ["bold"]}
+"constant.numeric.float" = { fg = "brown" , modifiers = ["bold"]}
 
 "string" = { fg = "green" }
 "string.regexp" = { fg = "purple" }
@@ -137,11 +137,12 @@
 "ui.virtual" = { fg = "grey-500" }
 "ui.virtual.ruler" = { bg = "grey-200" }
 "ui.virtual.wrap" = { fg = "grey-500" }
-"ui.virtual.whitespace" = { fg = "grey-300" }
+"ui.virtual.whitespace" = { fg = "grey-400" }
 "ui.virtual.indent-guide" = { fg = "grey-500" }
 "ui.virtual.inlay-hint" = { fg = "grey-500" }
 "ui.virtual.inlay-hint.parameter" = { fg = "grey-500", modifiers = ["italic"] }
 "ui.virtual.inlay-hint.type" = { fg = "grey-500" }
+"ui.virtual.jump-label" = { fg = "black", bg = "grey-200", modifiers = ["bold" ] }
 
 "ui.menu" = { fg = "black", bg = "grey-300" }
 "ui.menu.selected" = { fg = "white", bg = "light-blue" }

From 957d030be9e387aef445be29631fe6c503dc5a32 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 31 Mar 2024 18:17:13 +0530
Subject: [PATCH 097/101] Support scrolling popup contents using mouse (#10053)

* Extract popup scrolling code into named functions

* Scroll popup contents on mouse scroll event

* Ignore mouse events outside the popup

* Remove unneeded return statement
---
 helix-term/src/ui/popup.rs | 48 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index b38b8b6e3fbcd..4f379b4a1d5b9 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -11,6 +11,7 @@ use tui::{
 use helix_core::Position;
 use helix_view::{
     graphics::{Margin, Rect},
+    input::{MouseEvent, MouseEventKind},
     Editor,
 };
 
@@ -23,6 +24,7 @@ pub struct Popup<T: Component> {
     margin: Margin,
     size: (u16, u16),
     child_size: (u16, u16),
+    area: Rect,
     position_bias: Open,
     scroll: usize,
     auto_close: bool,
@@ -40,6 +42,7 @@ impl<T: Component> Popup<T> {
             size: (0, 0),
             position_bias: Open::Below,
             child_size: (0, 0),
+            area: Rect::new(0, 0, 0, 0),
             scroll: 0,
             auto_close: false,
             ignore_escape_key: false,
@@ -146,6 +149,14 @@ impl<T: Component> Popup<T> {
         }
     }
 
+    pub fn scroll_half_page_down(&mut self) {
+        self.scroll(self.size.1 as usize / 2, true)
+    }
+
+    pub fn scroll_half_page_up(&mut self) {
+        self.scroll(self.size.1 as usize / 2, false)
+    }
+
     /// Toggles the Popup's scrollbar.
     /// Consider disabling the scrollbar in case the child
     /// already has its own.
@@ -171,12 +182,44 @@ impl<T: Component> Popup<T> {
         // clip to viewport
         viewport.intersection(Rect::new(rel_x, rel_y, self.size.0, self.size.1))
     }
+
+    fn handle_mouse_event(
+        &mut self,
+        &MouseEvent {
+            kind,
+            column: x,
+            row: y,
+            ..
+        }: &MouseEvent,
+    ) -> EventResult {
+        let mouse_is_within_popup = x >= self.area.left()
+            && x < self.area.right()
+            && y >= self.area.top()
+            && y < self.area.bottom();
+
+        if !mouse_is_within_popup {
+            return EventResult::Ignored(None);
+        }
+
+        match kind {
+            MouseEventKind::ScrollDown if self.has_scrollbar => {
+                self.scroll_half_page_down();
+                EventResult::Consumed(None)
+            }
+            MouseEventKind::ScrollUp if self.has_scrollbar => {
+                self.scroll_half_page_up();
+                EventResult::Consumed(None)
+            }
+            _ => EventResult::Ignored(None),
+        }
+    }
 }
 
 impl<T: Component> Component for Popup<T> {
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let key = match event {
             Event::Key(event) => *event,
+            Event::Mouse(event) => return self.handle_mouse_event(event),
             Event::Resize(_, _) => {
                 // TODO: calculate inner area, call component's handle_event with that area
                 return EventResult::Ignored(None);
@@ -200,11 +243,11 @@ impl<T: Component> Component for Popup<T> {
                 EventResult::Consumed(Some(close_fn))
             }
             ctrl!('d') => {
-                self.scroll(self.size.1 as usize / 2, true);
+                self.scroll_half_page_down();
                 EventResult::Consumed(None)
             }
             ctrl!('u') => {
-                self.scroll(self.size.1 as usize / 2, false);
+                self.scroll_half_page_up();
                 EventResult::Consumed(None)
             }
             _ => {
@@ -249,6 +292,7 @@ impl<T: Component> Component for Popup<T> {
 
     fn render(&mut self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
         let area = self.area(viewport, cx.editor);
+        self.area = area;
         cx.scroll = Some(self.scroll);
 
         // clear area

From 0c3bc46ac45aae12596021c99c5c1cddea3d4923 Mon Sep 17 00:00:00 2001
From: Ni <22556482+1-bit-wonder@users.noreply.github.com>
Date: Sun, 31 Mar 2024 07:48:29 -0500
Subject: [PATCH 098/101] added ../gleam/injections.scm (#10062)

Co-authored-by: Ni <ni@superboring.net>
---
 runtime/queries/gleam/injections.scm | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 runtime/queries/gleam/injections.scm

diff --git a/runtime/queries/gleam/injections.scm b/runtime/queries/gleam/injections.scm
new file mode 100644
index 0000000000000..ac82a3e5f4186
--- /dev/null
+++ b/runtime/queries/gleam/injections.scm
@@ -0,0 +1,3 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
+

From 2f4572d91e5846f2b300c9292c5b446474c5fe52 Mon Sep 17 00:00:00 2001
From: ftqo <brian.baum96@gmail.com>
Date: Sun, 31 Mar 2024 08:50:37 -0400
Subject: [PATCH 099/101] add flexoki theme (#10002)

* add flexoki theme

* change ruler color to bg-2
---
 runtime/themes/flexoki_dark.toml  | 20 +++++++
 runtime/themes/flexoki_light.toml | 96 +++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 runtime/themes/flexoki_dark.toml
 create mode 100644 runtime/themes/flexoki_light.toml

diff --git a/runtime/themes/flexoki_dark.toml b/runtime/themes/flexoki_dark.toml
new file mode 100644
index 0000000000000..759f019b8cde3
--- /dev/null
+++ b/runtime/themes/flexoki_dark.toml
@@ -0,0 +1,20 @@
+inherits = "flexoki_light"
+
+[palette]
+tx = "#CECDC3"
+tx-2 = "#878580"
+tx-3 = "#575653"
+ui-3 = "#403E3C"
+ui-2 = "#343331"
+ui = "#282726"
+bg-2 = "#1C1B1A"
+bg = "#100F0F"
+
+re = "#D14D41"
+or = "#DA702C"
+ye = "#D0A215"
+gr = "#879A39"
+cy = "#3AA99F"
+bl = "#4385BE"
+pu = "#8B7EC8"
+ma = "#CE5D97"
diff --git a/runtime/themes/flexoki_light.toml b/runtime/themes/flexoki_light.toml
new file mode 100644
index 0000000000000..b506ab428e82e
--- /dev/null
+++ b/runtime/themes/flexoki_light.toml
@@ -0,0 +1,96 @@
+# Based on Flexoki: https://stephango.com/flexoki
+
+"ui.background" = { bg = "bg" }
+"ui.cursor" = { fg = "tx", bg = "tx-3" }
+"ui.cursor.primary" = { fg = "bg", bg = "tx" }
+"ui.cursor.match" = { modifiers = ["bold"] }
+"ui.linenr" = "tx-3"
+"ui.linenr.selected" = "tx"
+"ui.selection" = { bg = "ui-2" }
+"ui.statusline" = { fg = "tx", bg = "bg-2" }
+"ui.statusline.normal" = { fg = "bg", bg = "bl" }
+"ui.statusline.insert" = { fg = "bg", bg = "or" }
+"ui.statusline.select" = { fg = "bg", bg = "ma" }
+"ui.cursorline" = { bg = "bg-2" }
+"ui.popup" = { fg = "tx", bg = "bg-2" }
+"ui.window" = "tx"
+"ui.help" = { fg = "tx", bg = "bg" }
+"ui.text" = "tx"
+"ui.text.focus" = { bg = "bg-2", fg = "tx" }
+"ui.text.info" = "tx"
+"ui.virtual.whitespace" = "bg-2"
+"ui.virtual.ruler" = { bg = "bg-2" }
+"ui.virtual.inlay-hint" = { fg = "tx-3", bg = "bg" }
+"ui.virtual.jump-label" = { bg = "bg-2", modifiers = ["bold"]}
+"ui.menu" = { fg = "tx", bg = "bg" }
+"ui.menu.selected" = { bg = "ui", fg = "tx" }
+"ui.debug" = { fg = "or", bg = "bg" }
+"ui.highlight.frameline" = { bg = "ye" }
+"diagnostic.hint" = { underline = { color = "bl", style = "curl" } }
+"diagnostic.info" = { underline = { color = "bl", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "ye", style = "curl" } }
+"diagnostic.error" = { underline = { color = "re", style = "curl" } }
+"hint" = { fg = "bl", modifiers = ["bold"] }
+"info" = { fg = "ye", modifiers = ["bold"] }
+"warning" = { fg = "or", modifiers = ["bold"] }
+"error" = { fg = "re", modifiers = ["bold"] }
+
+"attribute" = "ye"
+"type" = "ye"
+"constructor" = "gr"
+"constant" = "pu"
+"constant.builtin" = "ye"
+"string" = "cy"
+"string.regexp" = "or"
+"string.special" = "ye"
+"comment" = "tx-3"
+"variable" = "tx"
+"variable.builtin" = "ma"
+"variable.other" = "bl"
+"punctuation" = "tx-2"
+"keyword" = "gr"
+"keyword.control" = "re"
+"keyword.control.conditional" = "gr"
+"keyword.control.import" = "ye"
+"keyword.control.return" = "gr"
+"keyword.function" = "gr"
+"keyword.storage.type" = "bl"
+"keyword.storage.modifier" = "bl"
+"operator" = "tx-2"
+"function" = "or"
+"tag" = "bl"
+"namespace" = "re"
+
+"markup.heading" = "or"
+"markup.list" = "ye"
+"markup.bold" = { fg = "or", modifiers = ["bold"] }
+"markup.italic" = { fg = "or", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.raw.block" = "or"
+"markup.link.url" = "bl"
+"markup.link.text" = "ye"
+"markup.link.label" = "gr"
+"markup.quote" = "ye"
+"markup.raw" = "bl"
+"diff.plus" = "gr"
+"diff.minus" = "re"
+"diff.delta" = "ye"
+
+[palette]
+tx = "#100F0F"
+tx-2 = "#6F6E69"
+tx-3 = "#B7B5AC"
+ui-3 = "#CECDC3"
+ui-2 = "#DAD8CE"
+ui = "#E6E4D9"
+bg-2 = "#F2F0E5"
+bg = "#FFFCF0"
+
+re = "#AF3029"
+or = "#BC5215"
+ye = "#AD8301"
+gr = "#66800B"
+cy = "#24837B"
+bl = "#205EA6"
+pu = "#5E409D"
+ma = "#A02F6F"

From 47ef9f0ca23359608e290e7d3fb8fa8a4636dab7 Mon Sep 17 00:00:00 2001
From: Krishan <54745129+krish-r@users.noreply.github.com>
Date: Sun, 31 Mar 2024 19:30:14 +0530
Subject: [PATCH 100/101] add new theme keys for LSP diagnostic tags (#10064)

---
 runtime/themes/acme.toml                   | 2 ++
 runtime/themes/adwaita-dark.toml           | 2 ++
 runtime/themes/amberwood.toml              | 2 ++
 runtime/themes/autumn.toml                 | 2 ++
 runtime/themes/ayu_dark.toml               | 2 ++
 runtime/themes/ayu_light.toml              | 2 ++
 runtime/themes/ayu_mirage.toml             | 2 ++
 runtime/themes/bogster.toml                | 2 ++
 runtime/themes/bogster_light.toml          | 2 ++
 runtime/themes/boo_berry.toml              | 2 ++
 runtime/themes/catppuccin_mocha.toml       | 2 ++
 runtime/themes/curzon.toml                 | 2 ++
 runtime/themes/cyan_light.toml             | 2 ++
 runtime/themes/darcula.toml                | 2 ++
 runtime/themes/dark_high_contrast.toml     | 2 ++
 runtime/themes/doom_acario_dark.toml       | 2 ++
 runtime/themes/dracula.toml                | 2 ++
 runtime/themes/dracula_at_night.toml       | 3 +++
 runtime/themes/emacs.toml                  | 2 ++
 runtime/themes/everblush.toml              | 2 ++
 runtime/themes/everforest_dark.toml        | 2 ++
 runtime/themes/everforest_light.toml       | 2 ++
 runtime/themes/ferra.toml                  | 2 ++
 runtime/themes/flatwhite.toml              | 2 ++
 runtime/themes/fleet_dark.toml             | 2 ++
 runtime/themes/flexoki_light.toml          | 2 ++
 runtime/themes/github_dark.toml            | 2 ++
 runtime/themes/github_light.toml           | 2 ++
 runtime/themes/gruber-darker.toml          | 2 ++
 runtime/themes/gruvbox.toml                | 2 ++
 runtime/themes/heisenberg.toml             | 2 ++
 runtime/themes/hex_steel.toml              | 2 ++
 runtime/themes/horizon-dark.toml           | 2 ++
 runtime/themes/ingrid.toml                 | 2 ++
 runtime/themes/jellybeans.toml             | 2 ++
 runtime/themes/kanagawa.toml               | 2 ++
 runtime/themes/kaolin-dark.toml            | 2 ++
 runtime/themes/material_deep_ocean.toml    | 3 +++
 runtime/themes/meliora.toml                | 2 ++
 runtime/themes/mellow.toml                 | 2 ++
 runtime/themes/merionette.toml             | 2 ++
 runtime/themes/modus_operandi.toml         | 2 ++
 runtime/themes/modus_vivendi.toml          | 2 ++
 runtime/themes/monokai.toml                | 2 ++
 runtime/themes/monokai_pro.toml            | 2 ++
 runtime/themes/monokai_pro_machine.toml    | 2 ++
 runtime/themes/monokai_pro_octagon.toml    | 2 ++
 runtime/themes/monokai_pro_ristretto.toml  | 2 ++
 runtime/themes/monokai_pro_spectrum.toml   | 2 ++
 runtime/themes/monokai_soda.toml           | 2 ++
 runtime/themes/naysayer.toml               | 2 ++
 runtime/themes/new_moon.toml               | 2 ++
 runtime/themes/night_owl.toml              | 2 ++
 runtime/themes/nightfox.toml               | 2 ++
 runtime/themes/noctis.toml                 | 2 ++
 runtime/themes/noctis_bordo.toml           | 2 ++
 runtime/themes/nord.toml                   | 2 ++
 runtime/themes/nord_light.toml             | 2 ++
 runtime/themes/onedark.toml                | 2 ++
 runtime/themes/onedarker.toml              | 2 ++
 runtime/themes/onelight.toml               | 2 ++
 runtime/themes/papercolor-light.toml       | 2 ++
 runtime/themes/penumbra+.toml              | 2 ++
 runtime/themes/poimandres.toml             | 2 ++
 runtime/themes/pop-dark.toml               | 2 ++
 runtime/themes/rasmus.toml                 | 2 ++
 runtime/themes/rose_pine.toml              | 2 ++
 runtime/themes/serika-dark.toml            | 2 ++
 runtime/themes/serika-light.toml           | 2 ++
 runtime/themes/snazzy.toml                 | 3 +++
 runtime/themes/solarized_dark.toml         | 2 ++
 runtime/themes/solarized_light.toml        | 2 ++
 runtime/themes/sonokai.toml                | 2 ++
 runtime/themes/spacebones_light.toml       | 2 ++
 runtime/themes/starlight.toml              | 2 ++
 runtime/themes/tokyonight.toml             | 2 ++
 runtime/themes/ttox.toml                   | 2 ++
 runtime/themes/varua.toml                  | 2 ++
 runtime/themes/vim_dark_high_contrast.toml | 2 ++
 runtime/themes/voxed.toml                  | 2 ++
 runtime/themes/yellowed.toml               | 2 ++
 runtime/themes/zed_onedark.toml            | 2 ++
 runtime/themes/zenburn.toml                | 2 ++
 83 files changed, 169 insertions(+)

diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index 650924741db99..195e06354f986 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -24,6 +24,8 @@
 "diagnostic.error" = {bg="red", fg="white", modifiers=["bold"]}
 "diagnostic.warning" = {bg="orange", fg="black", modifiers=["bold"]}
 "diagnostic.hint" = {fg="gray", modifiers=["bold"]}
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "ui.bufferline" = { fg = "black", bg = "acme_bar_bg" }
 "ui.bufferline.active" = { fg = "black", bg = "acme_bg" }
 "diff.plus" = {fg = "green"}
diff --git a/runtime/themes/adwaita-dark.toml b/runtime/themes/adwaita-dark.toml
index 2ecfe08e00e19..e8f1a58875252 100644
--- a/runtime/themes/adwaita-dark.toml
+++ b/runtime/themes/adwaita-dark.toml
@@ -98,6 +98,8 @@
 "diagnostic.info" = { fg = "purple_2", modifiers = ["dim"] }
 "diagnostic.error" = { fg = "red_4", modifiers = ["underlined"] }
 "diagnostic.warning" = { fg = "yellow_2", modifiers = ["underlined"] }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "ui.bufferline" = { fg = "dark_2", bg = "libadwaita_dark" }
 "ui.bufferline.active" = { fg = "light_4", bg = "libadwaita_dark_alt" }
diff --git a/runtime/themes/amberwood.toml b/runtime/themes/amberwood.toml
index 142ded369303d..30b4169ab5581 100644
--- a/runtime/themes/amberwood.toml
+++ b/runtime/themes/amberwood.toml
@@ -95,6 +95,8 @@
 "ui.menu.scroll" = { fg = "gray04", bg = "gray01" }
 
 diagnostic = { modifiers = ["underlined"] }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 warning = "yellow"
 error = "error"
diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index ce684a6a68bb0..93ccf688e0a4a 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -19,6 +19,8 @@
 "diagnostic.info" = { underline = { style = "line" } }
 "diagnostic" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
 "diagnostic.warning" = { underline = { style = "curl", color = "my_yellow2" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "diff.delta" = "my_gray5"
 "diff.minus" = "my_red"
 "diff.plus" = "my_green"
diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index 0b011b0eaf2f3..ff6694e92d11f 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -66,6 +66,8 @@
 "diagnostic.info"= { underline = { color = "blue", style="curl"} }
 "diagnostic.warning"= { underline = { color = "yellow", style="curl"} }
 "diagnostic.error"= { underline = { color = "red", style="curl"} }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 "ui.debug" = { fg = "orange", bg = "background" }
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index 6c405381d044c..d0eca78a137a2 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -66,6 +66,8 @@
 "diagnostic.info"= { underline = { color = "blue", style = "curl" } }
 "diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
 "diagnostic.error"= { underline = { color = "red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 "ui.debug" = { fg = "orange", bg = "background" }
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index a4b74fcfbd776..677a7af6f1d4e 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -66,6 +66,8 @@
 "diagnostic.info"= { underline = { color = "blue", style = "curl" } }
 "diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
 "diagnostic.error"= { underline = { color = "red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 "ui.debug" = { fg = "orange", bg = "background" }
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index 1ea13f1f528fd..f7d08daa99145 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -77,6 +77,8 @@
 "diagnostic.error" = { underline = { color = "bogster-lred", style = "curl"} }
 "diagnostic.info" = { underline = { color = "bogster-teal", style = "curl"} }
 "diagnostic.hint" = { underline = { color = "bogster-blue", style = "curl"} }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 bogster-yellow = "#dcb659"
diff --git a/runtime/themes/bogster_light.toml b/runtime/themes/bogster_light.toml
index e528d89d9e520..3259d6777cbe6 100644
--- a/runtime/themes/bogster_light.toml
+++ b/runtime/themes/bogster_light.toml
@@ -77,6 +77,8 @@
 "diagnostic.error" = { underline = { color = "bogster-lred", style = "curl"} }
 "diagnostic.info" = { underline = { color = "bogster-teal", style = "curl"} }
 "diagnostic.hint" = { underline = { color = "bogster-blue", style = "curl"} }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 bogster-orange = "#dc7759"
diff --git a/runtime/themes/boo_berry.toml b/runtime/themes/boo_berry.toml
index d3a3e22328f4e..929bbc742d034 100644
--- a/runtime/themes/boo_berry.toml
+++ b/runtime/themes/boo_berry.toml
@@ -67,6 +67,8 @@
 "diagnostic.error" = { underline = { color = "gold", style = "curl"} }
 "diagnostic.info" = { underline = { color = "lilac", style = "curl"} }
 "diagnostic.hint" = { underline = { color = "lilac", style = "curl"} }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 berry = "#3A2A4D"
diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index 5fcb723172e32..58173dab15c34 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -116,6 +116,8 @@
 "diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
 "diagnostic.info" = { underline = { color = "sky", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "teal", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 error = "red"
 warning = "yellow"
diff --git a/runtime/themes/curzon.toml b/runtime/themes/curzon.toml
index 1303519fb6104..d5a608f5f78a9 100644
--- a/runtime/themes/curzon.toml
+++ b/runtime/themes/curzon.toml
@@ -75,6 +75,8 @@ label = "label"
 "diagnostic.info" = { underline = { color = "info", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "warning", style = "curl" } }
 "diagnostic.error" = { underline = { color = "error", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 warning = "warning"
 error = "#f43f5e"
diff --git a/runtime/themes/cyan_light.toml b/runtime/themes/cyan_light.toml
index d8c93fe7e9e4b..2ac57cd3249be 100644
--- a/runtime/themes/cyan_light.toml
+++ b/runtime/themes/cyan_light.toml
@@ -117,6 +117,8 @@
 "diagnostic.info" = { underline = { color = "light_blue", style = "line" } }
 "diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 shade00 = "#f2f3f7"
diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index b704d60ee79b3..db6ce989dfcb7 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -76,6 +76,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl"} }
 "diagnostic.info" = { underline = { color = "grey05", style = "curl"} }
 "diagnostic.hint" = { underline = { color = "grey05", style = "curl"} }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "info" = "grey05"
 "hint" = "grey05"
diff --git a/runtime/themes/dark_high_contrast.toml b/runtime/themes/dark_high_contrast.toml
index 51701cfce9354..6da2389a601b3 100644
--- a/runtime/themes/dark_high_contrast.toml
+++ b/runtime/themes/dark_high_contrast.toml
@@ -54,6 +54,8 @@
 "diagnostic.hint" = { underline = { color = "yellow", style = "dashed" } }
 "diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "info" = "white" 
 "hint" = "yellow"
 "warning" = "orange"
diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index 47f1dfca8bc76..5c4bd0dd87fbe 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -78,6 +78,8 @@
 'diagnostic.error'= { underline = { color = 'red', style = "curl"} }
 'diagnostic.info'= { underline = { color = 'blue', style = "curl"} }
 'diagnostic.warning'= { underline = { color = 'yellow', style = "curl"} }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 'special' = { fg = 'orange' }
 
diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 4e01bae2d2fac..c1a9a12bc84a4 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -26,6 +26,8 @@
 "diagnostic.warning"              = { underline = { color = "yellow",          style = "curl"             } }
 "diagnostic.error"                = { underline = { color = "red",             style = "curl"             } }
 "diagnostic.info"                 = { underline = { color = "cyan",            style = "curl"             } }
+"diagnostic.unnecessary"          = { modifiers = ["dim"]                                                   }
+"diagnostic.deprecated"           = { modifiers = ["crossed_out"]                                           }
 
 "error"                           = { fg    = "red"                                                         }
 "hint"                            = { fg    = "purple"                                                      }
diff --git a/runtime/themes/dracula_at_night.toml b/runtime/themes/dracula_at_night.toml
index b91bd00d0f828..55f2615398c14 100644
--- a/runtime/themes/dracula_at_night.toml
+++ b/runtime/themes/dracula_at_night.toml
@@ -49,6 +49,9 @@
 "error" = { fg = "red" }
 "warning" = { fg = "cyan" }
 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
+
 "markup.heading" = { fg = "purple", modifiers = ["bold"] }
 "markup.list" = "cyan"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
diff --git a/runtime/themes/emacs.toml b/runtime/themes/emacs.toml
index 513af60e165ff..c60afe99e3381 100644
--- a/runtime/themes/emacs.toml
+++ b/runtime/themes/emacs.toml
@@ -87,6 +87,8 @@
 "diagnostic.warning" = { underline = { color = "dark_orange", style = "curl" } }
 "diagnostic.info" = { underline = { color = "forest_green", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "dark_cyan", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 black = "#000000"
diff --git a/runtime/themes/everblush.toml b/runtime/themes/everblush.toml
index b49bf0494fa6b..9c1fa062e8806 100644
--- a/runtime/themes/everblush.toml
+++ b/runtime/themes/everblush.toml
@@ -79,6 +79,8 @@
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
 "diagnostic.info" = { underline = { style = "curl", color = "blue" } }
 "diagnostic.hint" = { underline = { style = "curl", color = "green" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "special" = { fg = "red-light" }
 
 "markup.heading" = { fg = "blue", modifiers = ["bold"] }
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index a3083d5390760..37b6756f5b977 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -111,6 +111,8 @@
 "diagnostic.info" = { underline = { color = "blue", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index cf39e23d62fd7..b7448455ca22f 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -110,6 +110,8 @@
 "diagnostic.info" = { underline = { color = "blue", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 
diff --git a/runtime/themes/ferra.toml b/runtime/themes/ferra.toml
index 0734f24078360..212fb5105bdde 100644
--- a/runtime/themes/ferra.toml
+++ b/runtime/themes/ferra.toml
@@ -68,6 +68,8 @@
 "diagnostic.error" = { underline = { color = "ferra_ember", style = "curl" } }
 "diagnostic.info" = { underline = { color = "ferra_blush", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "ferra_blush", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 ferra_night = "#2b292d"
diff --git a/runtime/themes/flatwhite.toml b/runtime/themes/flatwhite.toml
index d833d5c66eae3..cc8f536cbd86b 100644
--- a/runtime/themes/flatwhite.toml
+++ b/runtime/themes/flatwhite.toml
@@ -25,6 +25,8 @@
 "diagnostic.info" = { underline = { color = "orange_text", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "orange_text", style = "curl" } }
 "diagnostic.error" = { underline = { color = "diff_delete", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "info" = { fg = "orange_text", bg = "orange_bg" }
 "hint" = { modifiers = ["bold"] }
diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml
index b5ad1aa3ecc0d..7fd26c1f89371 100644
--- a/runtime/themes/fleet_dark.toml
+++ b/runtime/themes/fleet_dark.toml
@@ -105,6 +105,8 @@
 "diagnostic.info" = { underline = { color = "#A366C4", style = "line" } }
 "diagnostic.warning" = { underline = { color = "#FACB66", style = "line" } }
 "diagnostic.error" = { underline = { color = "#FF5269", style = "line" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 "White" = "#ffffff"
diff --git a/runtime/themes/flexoki_light.toml b/runtime/themes/flexoki_light.toml
index b506ab428e82e..8badd922232c1 100644
--- a/runtime/themes/flexoki_light.toml
+++ b/runtime/themes/flexoki_light.toml
@@ -30,6 +30,8 @@
 "diagnostic.info" = { underline = { color = "bl", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "ye", style = "curl" } }
 "diagnostic.error" = { underline = { color = "re", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "hint" = { fg = "bl", modifiers = ["bold"] }
 "info" = { fg = "ye", modifiers = ["bold"] }
 "warning" = { fg = "or", modifiers = ["bold"] }
diff --git a/runtime/themes/github_dark.toml b/runtime/themes/github_dark.toml
index 6b3354848c977..dafba559dbd36 100644
--- a/runtime/themes/github_dark.toml
+++ b/runtime/themes/github_dark.toml
@@ -78,6 +78,8 @@ label = "scale.red.3"
 "diagnostic.info" = { underline = { color = "accent.fg", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "attention.fg", style = "curl" } }
 "diagnostic.error" = { underline = { color = "danger.fg", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 hint = "success.fg"
 info = "accent.fg"
diff --git a/runtime/themes/github_light.toml b/runtime/themes/github_light.toml
index e6912a987c60b..cd3f1e5d16cd0 100644
--- a/runtime/themes/github_light.toml
+++ b/runtime/themes/github_light.toml
@@ -78,6 +78,8 @@ label = "scale.red.5"
 "diagnostic.info" = { underline = { color = "accent.fg", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "attention.fg", style = "curl" } }
 "diagnostic.error" = { underline = { color = "danger.fg", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 hint = "success.fg"
 info = "accent.fg"
diff --git a/runtime/themes/gruber-darker.toml b/runtime/themes/gruber-darker.toml
index 355a3be83e8b5..4737f52f74e53 100644
--- a/runtime/themes/gruber-darker.toml
+++ b/runtime/themes/gruber-darker.toml
@@ -72,6 +72,8 @@
 "diagnostic.error" = { underline = { color = "red3", style = "dashed" } }
 "diagnostic.info" = { underline = { color = "aqua1", style = "dashed" } }
 "diagnostic.hint" = { underline = { color = "blue0", style = "dashed" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "markup.heading" = { fg = "aqua1", modifiers = ["bold"] }
 "markup.bold" = { modifiers = ["bold"] }
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 3c1dfc593725d..a6b0636d3e9e4 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -71,6 +71,8 @@
 "diagnostic.error" = { underline = { color = "red1", style = "curl" } }
 "diagnostic.info" = { underline = { color = "aqua1", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "blue1", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "markup.heading" = "aqua1"
 "markup.bold" = { modifiers = ["bold"] }
diff --git a/runtime/themes/heisenberg.toml b/runtime/themes/heisenberg.toml
index 3c127a3e4bf90..9f8ca1832f10b 100644
--- a/runtime/themes/heisenberg.toml
+++ b/runtime/themes/heisenberg.toml
@@ -63,6 +63,8 @@
 "diagnostic.info" = { underline = {color = "crystal_blue", style = "curl" } }
 "diagnostic.warning" = { underline = {color = "vapor_yellow", style = "curl" } }
 "diagnostic.error" = { underline = {color = "chili_powder_red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
diff --git a/runtime/themes/hex_steel.toml b/runtime/themes/hex_steel.toml
index c81df4097371f..fb4fc1fd89def 100644
--- a/runtime/themes/hex_steel.toml
+++ b/runtime/themes/hex_steel.toml
@@ -64,6 +64,8 @@
 "diagnostic.warning" = { underline = { color = "warning", style = "curl" } }
 "diagnostic.info" = { underline = { color = "info", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "display", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "error" = { fg = "error", modifiers = ["bold"] }
 "warning" = { fg = "warning", modifiers = ["bold"] }
diff --git a/runtime/themes/horizon-dark.toml b/runtime/themes/horizon-dark.toml
index b879b432c6560..64f4022d9f047 100644
--- a/runtime/themes/horizon-dark.toml
+++ b/runtime/themes/horizon-dark.toml
@@ -45,6 +45,8 @@ namespace = "orange"
 "diagnostic.info" = { underline = { color = "blue", style = "curl" } }
 "diagnostics.error" = { underline = { color = "red", style = "curl" } }
 "diagnostics.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 warning = { fg = "orange", modifiers = ["bold"] }
 error = { fg = "red", modifiers = ["bold"] }
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index 8942c3ca2971b..975f7a733c275 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -73,3 +73,5 @@
 "diagnostic.error" = { underline = { color = "#D74E50", style = "curl" } }
 "diagnostic.info" = { underline = { color = "#839A53", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "#A6B6CE", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
diff --git a/runtime/themes/jellybeans.toml b/runtime/themes/jellybeans.toml
index 55088c2981943..6f8c326f42623 100644
--- a/runtime/themes/jellybeans.toml
+++ b/runtime/themes/jellybeans.toml
@@ -99,6 +99,8 @@
 "diagnostic.info" = { underline = { color = "blue_accent", style = "line" } }
 "diagnostic.warning" = { underline = { color = "yellow_accent", style = "line" } }
 "diagnostic.error" = { underline = { color = "red_error", style = "line" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 background = "#151515"
diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index 4ec938f4183d1..99cbed332a9b8 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -52,6 +52,8 @@
 "diagnostic.warning" = { underline = { color = "roninYellow", style = "curl" } }
 "diagnostic.info" = { underline = { color = "waveAqua1", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "dragonBlue", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 error = "samuraiRed"
 warning = "roninYellow"
diff --git a/runtime/themes/kaolin-dark.toml b/runtime/themes/kaolin-dark.toml
index b8188f7693ded..d8c17391ce28b 100644
--- a/runtime/themes/kaolin-dark.toml
+++ b/runtime/themes/kaolin-dark.toml
@@ -44,6 +44,8 @@
 "diagnostic.warning" = { underline = { style = "curl", color = "warn" } }
 "diagnostic.info" = { underline = { style = "curl", color = "info" } }
 "diagnostic.hint" = { underline = { style = "curl", color = "hint" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "gray0" }
diff --git a/runtime/themes/material_deep_ocean.toml b/runtime/themes/material_deep_ocean.toml
index 6cf4c0a6fcec9..874731769d6c5 100644
--- a/runtime/themes/material_deep_ocean.toml
+++ b/runtime/themes/material_deep_ocean.toml
@@ -95,6 +95,9 @@ error = "error"
 info = "blue"
 hint = "purple"
 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
+
 [palette]
 bg = "#0f111a"
 text = "#a6accd"
diff --git a/runtime/themes/meliora.toml b/runtime/themes/meliora.toml
index e7037e18d7a64..87f0cb092b545 100644
--- a/runtime/themes/meliora.toml
+++ b/runtime/themes/meliora.toml
@@ -58,6 +58,8 @@
 "diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
 "diagnostic.info" = { underline = { color = "blue", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "magenta", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "error" = { fg = "red" }
 "warning" = { fg = "orange" }
diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml
index 16d7b60866b5c..8ab66622f058a 100644
--- a/runtime/themes/mellow.toml
+++ b/runtime/themes/mellow.toml
@@ -99,6 +99,8 @@
 "diagnostic.error" = { underline = { color = "bright_red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "bright_blue", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "bright_cyan", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 warning = "bright_yellow"
 error = "bright_red"
diff --git a/runtime/themes/merionette.toml b/runtime/themes/merionette.toml
index e4d5d67373c88..d8e7d77036815 100644
--- a/runtime/themes/merionette.toml
+++ b/runtime/themes/merionette.toml
@@ -63,6 +63,8 @@
 "diagnostic.hint" = { underline = { color = "white0", style = "double_line" } }
 "diagnostic.info" = { underline = { color = "blue0", style = "double_line" } }
 "diagnostic.warning" = { underline = { color = "green1", style = "double_line" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "markup.bold" = { modifiers = ["bold"] }
 "markup.heading" = { fg = "orange1", modifiers = ["bold"] }
diff --git a/runtime/themes/modus_operandi.toml b/runtime/themes/modus_operandi.toml
index ad4b3c85a54c8..e7599c018c0a8 100644
--- a/runtime/themes/modus_operandi.toml
+++ b/runtime/themes/modus_operandi.toml
@@ -99,6 +99,8 @@ punctuation = "fg-dim"
 "diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
 "diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 error = "red"
 warning = "yellow-warmer"
diff --git a/runtime/themes/modus_vivendi.toml b/runtime/themes/modus_vivendi.toml
index a44fbe0f7c6d8..74974bcb2ce32 100644
--- a/runtime/themes/modus_vivendi.toml
+++ b/runtime/themes/modus_vivendi.toml
@@ -102,6 +102,8 @@ punctuation = "fg-dim"
 "diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
 "diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 error = "red"
 warning = "yellow-warmer"
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index bcb6c8d05f6b3..a849ae96d2a9a 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -96,6 +96,8 @@
 "diagnostic.error" = { underline = { color = "#f48771", style = "curl" } }
 "diagnostic.info" = { underline = { color = "#75beff", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "#eeeeb3", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 type = "#A6E22E"
diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index 65a95a7d39a66..97f2a57c5c2c0 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -100,6 +100,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "base8", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index 739418ceaeb2e..e1f74b1cbeab8 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -97,6 +97,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "base8", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index c88b327bdb181..cfa85b651b586 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -100,6 +100,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "base8", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index 6e1a0cb29187d..a6ba6fcf31d74 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -97,6 +97,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "base8", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 89b131bea0f42..1bfcb688928e0 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -97,6 +97,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "base8", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_soda.toml b/runtime/themes/monokai_soda.toml
index 84a846eb75ba0..ca36d4e9393cd 100644
--- a/runtime/themes/monokai_soda.toml
+++ b/runtime/themes/monokai_soda.toml
@@ -14,6 +14,8 @@
 "diagnostic.error" = { underline = { style = "curl", color = "pink" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "orange" } }
 "diagnostic.info" = { underline = { style = "curl", color = "white" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 ## Diffs
 "diff.plus" = "green"
diff --git a/runtime/themes/naysayer.toml b/runtime/themes/naysayer.toml
index 41530d1416a9f..d85f31e2db7c1 100644
--- a/runtime/themes/naysayer.toml
+++ b/runtime/themes/naysayer.toml
@@ -25,6 +25,8 @@
 "diagnostic.error" = { bg = "error", fg = "text", modifiers = ["bold"] }
 "diagnostic.warning" = { bg = "warning", fg = "text", modifiers = ["bold"] }
 "diagnostic.hint" = { bg = "cyan", modifiers = ["bold"] }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "ui.bufferline" = { fg = "text", bg = "bg" }
 "ui.bufferline.active" = { fg = "text", bg = "bg", modifiers = ['underlined'] }
 "ui.gutter.selected" = { bg = "highlight-line", modifiers = ["bold"] }
diff --git a/runtime/themes/new_moon.toml b/runtime/themes/new_moon.toml
index 4f878c7e0fd76..2f0dbb0add691 100644
--- a/runtime/themes/new_moon.toml
+++ b/runtime/themes/new_moon.toml
@@ -96,6 +96,8 @@
 
 "diagnostic.error".underline = { color = "red", style = "curl" }
 "diagnostic".underline = { color = "yellow", style = "curl" }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 darkest = "#2d2d2d"
diff --git a/runtime/themes/night_owl.toml b/runtime/themes/night_owl.toml
index fc27dc7ccb4c0..ed3c028913a37 100644
--- a/runtime/themes/night_owl.toml
+++ b/runtime/themes/night_owl.toml
@@ -10,6 +10,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "blue", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "paleblue", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # UI
 'ui.background' = { fg = 'foreground', bg = 'background' }
diff --git a/runtime/themes/nightfox.toml b/runtime/themes/nightfox.toml
index 3dfb4fce55275..62db82c0061a0 100644
--- a/runtime/themes/nightfox.toml
+++ b/runtime/themes/nightfox.toml
@@ -76,6 +76,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } } #	Diagnostics error (editing area)
 "diagnostic.info" = { underline = { color = "blue", style = "curl" } } #	Diagnostics info (editing area)
 "diagnostic.hint" = { underline = { color = "green", style = "curl" } } #	Diagnostics hint (editing area)
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 
 # SYNTAX HIGHLIGHTING
diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml
index c9f95f7fe69a7..db127229e59b7 100644
--- a/runtime/themes/noctis.toml
+++ b/runtime/themes/noctis.toml
@@ -17,6 +17,8 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "mid-blue", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "light-green", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # UI ==============================
 # For styling helix itself.
diff --git a/runtime/themes/noctis_bordo.toml b/runtime/themes/noctis_bordo.toml
index c3bbe79c9b2ad..c5e04f2a11cde 100644
--- a/runtime/themes/noctis_bordo.toml
+++ b/runtime/themes/noctis_bordo.toml
@@ -59,6 +59,8 @@
 "diagnostic.hint" = { underline = { color = "base03", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "base09", style = "curl" } }
 "diagnostic.error" = { underline = { color = "base08", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "ui.gutter" = { bg = "base01" }
 "info" = "base0D"
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 0fe6db12fd2f9..4916c3e84f5ed 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -24,6 +24,8 @@
 "info" = "nord8"
 "diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }
 "warning" = "nord13"
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # Diffs
 "diff.delta" = "nord13"
diff --git a/runtime/themes/nord_light.toml b/runtime/themes/nord_light.toml
index 2d36cc806d853..6c27c507ae1da 100644
--- a/runtime/themes/nord_light.toml
+++ b/runtime/themes/nord_light.toml
@@ -35,6 +35,8 @@
 "diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }
 "diagnostic.info" = { underline = { color = "nord13", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "nord13", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "constant.numeric" = {fg="nord15"}
 "constant.builtin" = {fg="nord15"}
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 5b049aff9425b..7cdeac0957a81 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -45,6 +45,8 @@
 "diagnostic.hint".underline = { color = "green", style = "curl" } 
 "diagnostic.warning".underline = { color = "yellow", style = "curl" } 
 "diagnostic.error".underline = { color = "red", style = "curl" } 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }
diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
index 3078714457164..ffa3ae2dc5735 100644
--- a/runtime/themes/onedarker.toml
+++ b/runtime/themes/onedarker.toml
@@ -46,6 +46,8 @@
 "diagnostic.hint".underline = { color = "green", style = "curl" } 
 "diagnostic.warning".underline = { color = "yellow", style = "curl" } 
 "diagnostic.error".underline = { color = "red", style = "curl" } 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml
index 209f71ab66391..e395716dd0487 100644
--- a/runtime/themes/onelight.toml
+++ b/runtime/themes/onelight.toml
@@ -163,6 +163,8 @@
 "diagnostic.hint" = { underline = { color = "green", style = "dashed" } }
 "diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index 279fa24299646..246b0ddd85e20 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -49,6 +49,8 @@
 "diagnostic.error".underline = { color = "bright1", style = "curl" }
 "diagnostic.info".underline = { color = "bright4", style = "curl" }
 "diagnostic.hint".underline = { color = "bright6", style = "curl" }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 # Tree-sitter scopes for syntax highlighting
 "attribute" = "bright4"
diff --git a/runtime/themes/penumbra+.toml b/runtime/themes/penumbra+.toml
index bc53e82e07b05..728a80900b9a2 100644
--- a/runtime/themes/penumbra+.toml
+++ b/runtime/themes/penumbra+.toml
@@ -47,6 +47,8 @@ error = "red"
 "diagnostic.info".underline = { color = "sky", style = "curl" } 
 "diagnostic.warning".underline = { color = "yellow", style = "curl" } 
 "diagnostic.error".underline = { color = "red", style = "curl" } 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "ui.background" = { bg = "shade" }
 "ui.background.separator" = "sky"
diff --git a/runtime/themes/poimandres.toml b/runtime/themes/poimandres.toml
index 5dbc799d58a2b..c62c2ad276653 100644
--- a/runtime/themes/poimandres.toml
+++ b/runtime/themes/poimandres.toml
@@ -76,6 +76,8 @@ string = { fg = "brightMint" }
 "diagnostic.info" = { underline = { color = "lightBlue", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "brightYellow", style = "curl" } }
 "diagnostic.error" = { underline = { color = "hotRed", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 hint = "lowerMint"
 info = "lightBlue"
diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml
index 54db3d1b10363..66436c1539792 100644
--- a/runtime/themes/pop-dark.toml
+++ b/runtime/themes/pop-dark.toml
@@ -12,6 +12,8 @@ error = { fg = 'redE', modifiers = ['bold'] }
 'diagnostic.hint'.underline = { color = 'yellowH', style = 'curl' } 
 'diagnostic.warning'.underline = { color = 'orangeW', style = 'curl' } 
 'diagnostic.error'.underline = { color = 'redE', style = 'curl' } 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 'ui.background' = { bg = 'brownN' }
 'ui.window' = { bg = 'brownH', fg = 'brownD' } 
 'ui.gutter' = { bg = 'brownU' }
diff --git a/runtime/themes/rasmus.toml b/runtime/themes/rasmus.toml
index a0b7e74d41187..a05ef633070ba 100644
--- a/runtime/themes/rasmus.toml
+++ b/runtime/themes/rasmus.toml
@@ -107,6 +107,8 @@
 "diagnostic.error".underline = { color = "bright_red", style = "curl" } 
 "diagnostic.info".underline = { color = "bright_blue", style = "curl" } 
 "diagnostic.hint".underline = { color = "bright_cyan", style = "curl" } 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 warning = "bright_yellow"
 error = "bright_red"
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 27b7a630e71e6..9a5ba450e92e1 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -64,6 +64,8 @@
 "diagnostic.info" = { underline = { color = "foam", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "gold", style = "curl" } }
 "diagnostic.error" = { underline = { color = "love", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "special" = "rose"
 
 "attribute" = "iris"
diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index d184197987d27..eb8d6c8399b94 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -63,6 +63,8 @@
 "diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
 "diagnostic.error" = { underline = { style = "curl", color = "nasty-red" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index 1e3901ef24ed4..00fa84cbb5f7e 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -63,6 +63,8 @@
 "diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
 "diagnostic.error" = { underline = { style = "curl", color = "nasty-red" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "diff.plus" = { fg = "bg_green" }
 "diff.delta" = { fg = "bg_blue" }
diff --git a/runtime/themes/snazzy.toml b/runtime/themes/snazzy.toml
index eb88c5eb86b3d..09d0cdd57b3d6 100644
--- a/runtime/themes/snazzy.toml
+++ b/runtime/themes/snazzy.toml
@@ -79,6 +79,9 @@
 "error" = { fg = "red" }
 "warning" = { fg = "cyan" }
 
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
+
 "markup.heading" = { fg = "purple", modifiers = ["bold"] }
 "markup.link.label" = { fg = "blue", modifiers = ["italic"] }
 "markup.list" = "cyan"
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index 74f017a31befb..9e23aff25c131 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -109,6 +109,8 @@
 "diagnostic.error" = { underline = { style = "curl", color = "red" } }
 "diagnostic.info" = { underline = { style = "curl", color = "blue" } }
 "diagnostic.hint" = { underline = { style = "curl", color = "base01" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 # 深色 越来越深
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index 02ca7bdc6c686..60a2a0e210f78 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -126,6 +126,8 @@
 "diagnostic.error" = { underline = { style = "curl", color = "red" } }
 "diagnostic.info" = { underline = { style = "curl", color = "blue" } }
 "diagnostic.hint" = { underline = { style = "curl", color = "base01" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 
 [palette]
diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index 4bbdb4dbedf1f..ebe1ae8d2eaa2 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -85,6 +85,8 @@ error = { fg = 'red', bg = 'bg2', modifiers = ['bold'] }
 "diagnostic.hint" = { underline = { style = "curl", color = "blue" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
 "diagnostic.error" = { underline = { style = "curl", color = "red" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 
 
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index ad2a04d5ab267..7870f67ca111a 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -78,6 +78,8 @@
 "diagnostic.error" = { underline = { style = "curl", color = "#e0211d" } }
 "diagnostic.info" = { underline = { style = "curl", color = "theme_yellow" } }
 "diagnostic.hint" = { underline = { style = "curl", color = "bg2" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 base = "#655370"
diff --git a/runtime/themes/starlight.toml b/runtime/themes/starlight.toml
index 09db90fd6f576..335d1493aa9b9 100644
--- a/runtime/themes/starlight.toml
+++ b/runtime/themes/starlight.toml
@@ -85,6 +85,8 @@
 "diagnostic.warning"  = { underline = { color = "yellow", style = "curl" } }
 "diagnostic.info"     = { underline = { color = "blue", style = "curl" } }
 "diagnostic.hint"     = { underline = { color = "blue", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "info"     = "blue"
 "hint"     = "blue"
diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index be7968575c833..38eb269dee5e6 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -65,6 +65,8 @@ hint = { fg = "hint" }
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow"} }
 "diagnostic.info" = { underline = { style = "curl", color = "info"} }
 "diagnostic.hint" = { underline = { style = "curl", color = "hint" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 "ui.background" = { bg = "bg", fg = "fg" }
 "ui.cursor" = { modifiers = ["reversed"] }
diff --git a/runtime/themes/ttox.toml b/runtime/themes/ttox.toml
index 16909cc7013e4..0bc964b458473 100644
--- a/runtime/themes/ttox.toml
+++ b/runtime/themes/ttox.toml
@@ -29,3 +29,5 @@
 "diagnostic.warning" = { fg = "black", bg = "light-yellow" }
 "diagnostic.error" = { fg = "black", bg = "light-red" }
 "diagnostic.hint" = { fg = "black", bg = "light-blue" }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
diff --git a/runtime/themes/varua.toml b/runtime/themes/varua.toml
index b07ab08dcd2dd..1c6b5e8632896 100644
--- a/runtime/themes/varua.toml
+++ b/runtime/themes/varua.toml
@@ -76,6 +76,8 @@
 "diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
 "diagnostic.error" = { underline = { style = "curl", color = "red" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 [palette]
 bg0 = "#282828"
diff --git a/runtime/themes/vim_dark_high_contrast.toml b/runtime/themes/vim_dark_high_contrast.toml
index ecd6942b572e7..4e2480dbad933 100644
--- a/runtime/themes/vim_dark_high_contrast.toml
+++ b/runtime/themes/vim_dark_high_contrast.toml
@@ -21,6 +21,8 @@
 "diagnostic.warning" = { bg = "dark-yellow" }
 "diagnostic.hint" = { bg = "dark-cyan" }
 "diagnostic.info" = { bg = "dark-white" }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "warning" = { fg = "yellow", bg = "dark-yellow" }
 "error" = { fg = "red", bg = "dark-red" }
 "info" = { fg = "default", bg = "dark-white" }
diff --git a/runtime/themes/voxed.toml b/runtime/themes/voxed.toml
index e55b46e5d3292..c2be9afefe5fe 100644
--- a/runtime/themes/voxed.toml
+++ b/runtime/themes/voxed.toml
@@ -75,6 +75,8 @@ label = "yellow"
 "diagnostic.info" = { underline = { color = "sglow", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "redish", style = "curl" } }
 "diagnostic.error" = { underline = { color = "bpink", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 warning = "bpink"
 error = "bsienna"
diff --git a/runtime/themes/yellowed.toml b/runtime/themes/yellowed.toml
index 091b93eeb54fb..d94a75fcbe77c 100644
--- a/runtime/themes/yellowed.toml
+++ b/runtime/themes/yellowed.toml
@@ -111,6 +111,8 @@
 "diagnostic.error"                = { underline = { color = "error", style = "curl" } }
 "diagnostic.info"                 = { underline = { color = "info", style = "curl" } }
 "diagnostic.hint"                 = { underline = { color = "hint", style = "curl" } }
+"diagnostic.unnecessary"          = { modifiers = ["dim"] }
+"diagnostic.deprecated"           = { modifiers = ["crossed_out"] }
 
 [palette]
 # interface
diff --git a/runtime/themes/zed_onedark.toml b/runtime/themes/zed_onedark.toml
index 7ac1e73cc5861..3eeabab30ef62 100644
--- a/runtime/themes/zed_onedark.toml
+++ b/runtime/themes/zed_onedark.toml
@@ -42,6 +42,8 @@
 "diagnostic.hint".underline = { color = "green", style = "curl" }
 "diagnostic.warning".underline = { color = "yellow", style = "curl" }
 "diagnostic.error".underline = { color = "red", style = "curl" }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }
diff --git a/runtime/themes/zenburn.toml b/runtime/themes/zenburn.toml
index 9a4a7abccf6ab..27f941220dd56 100644
--- a/runtime/themes/zenburn.toml
+++ b/runtime/themes/zenburn.toml
@@ -45,6 +45,8 @@
 
 "diagnostic" = {bg = "statusbg"}
 "diagnostic.error" = { fg = "errorfg", bg = "errorbg"}
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 "ui.gutter" = { bg = "statusbg" }
 "hint" = {fg = "numeric", bg = "statusbg"}
 "warning" = "numeric"

From 1abb64e48d38e41ce22a1c78c764d921fa04706f Mon Sep 17 00:00:00 2001
From: Daniel S Poulin <dan.poulin@digitalsurgeons.com>
Date: Sun, 31 Mar 2024 12:53:15 -0400
Subject: [PATCH 101/101] Add textobject for entries/elements of list-like
 things (#8150)

---
 book/src/generated/lang-support.md          |  6 +++---
 book/src/guides/textobject.md               |  2 ++
 helix-term/src/commands.rs                  | 12 +++++++++++
 helix-term/src/keymap/default.rs            |  2 ++
 runtime/queries/_typescript/textobjects.scm |  6 ++++++
 runtime/queries/bash/textobjects.scm        |  3 +++
 runtime/queries/c/textobjects.scm           |  6 ++++++
 runtime/queries/ecma/textobjects.scm        |  9 ++++++++
 runtime/queries/graphql/textobjects.scm     | 23 ++++++++++++++++++++
 runtime/queries/java/textobjects.scm        |  6 ++++++
 runtime/queries/json/textobjects.scm        |  5 +++++
 runtime/queries/lua/textobjects.scm         |  3 +++
 runtime/queries/php/textobjects.scm         | 12 +++++++++++
 runtime/queries/python/textobjects.scm      | 12 +++++++++++
 runtime/queries/ruby/textobjects.scm        | 12 +++++++++++
 runtime/queries/rust/textobjects.scm        | 24 +++++++++++++++++++++
 runtime/queries/toml/textobjects.scm        |  5 +++++
 17 files changed, 145 insertions(+), 3 deletions(-)
 create mode 100644 runtime/queries/graphql/textobjects.scm
 create mode 100644 runtime/queries/json/textobjects.scm
 create mode 100644 runtime/queries/toml/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a43c0b70a8cbd..6bbea10aceb4c 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -69,7 +69,7 @@
 | gomod | ✓ |  |  | `gopls` |
 | gotmpl | ✓ |  |  | `gopls` |
 | gowork | ✓ |  |  | `gopls` |
-| graphql | ✓ |  |  | `graphql-lsp` |
+| graphql | ✓ | ✓ |  | `graphql-lsp` |
 | groovy | ✓ |  |  |  |
 | hare | ✓ |  |  |  |
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
@@ -91,7 +91,7 @@
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jinja | ✓ |  |  |  |
 | jsdoc | ✓ |  |  |  |
-| json | ✓ |  | ✓ | `vscode-json-language-server` |
+| json | ✓ | ✓ | ✓ | `vscode-json-language-server` |
 | json5 | ✓ |  |  |  |
 | jsonc | ✓ |  | ✓ | `vscode-json-language-server` |
 | jsonnet | ✓ |  |  | `jsonnet-language-server` |
@@ -188,7 +188,7 @@
 | templ | ✓ |  |  | `templ` |
 | tfvars | ✓ |  | ✓ | `terraform-ls` |
 | todotxt | ✓ |  |  |  |
-| toml | ✓ |  |  | `taplo` |
+| toml | ✓ | ✓ |  | `taplo` |
 | tsq | ✓ |  |  |  |
 | tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | twig | ✓ |  |  |  |
diff --git a/book/src/guides/textobject.md b/book/src/guides/textobject.md
index b83c067e44a0a..a31baef937e95 100644
--- a/book/src/guides/textobject.md
+++ b/book/src/guides/textobject.md
@@ -25,6 +25,8 @@ The following [captures][tree-sitter-captures] are recognized:
 | `parameter.inside` |
 | `comment.inside`   |
 | `comment.around`   |
+| `entry.inside`     |
+| `entry.around`     |
 
 [Example query files][textobject-examples] can be found in the helix GitHub repository.
 
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d545480b53085..d927d3f471b0b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -475,6 +475,8 @@ impl MappableCommand {
         goto_prev_comment, "Goto previous comment",
         goto_next_test, "Goto next test",
         goto_prev_test, "Goto previous test",
+        goto_next_entry, "Goto next pairing",
+        goto_prev_entry, "Goto previous pairing",
         goto_next_paragraph, "Goto next paragraph",
         goto_prev_paragraph, "Goto previous paragraph",
         dap_launch, "Launch debug target",
@@ -5167,6 +5169,14 @@ fn goto_prev_test(cx: &mut Context) {
     goto_ts_object_impl(cx, "test", Direction::Backward)
 }
 
+fn goto_next_entry(cx: &mut Context) {
+    goto_ts_object_impl(cx, "entry", Direction::Forward)
+}
+
+fn goto_prev_entry(cx: &mut Context) {
+    goto_ts_object_impl(cx, "entry", Direction::Backward)
+}
+
 fn select_textobject_around(cx: &mut Context) {
     select_textobject(cx, textobject::TextObject::Around);
 }
@@ -5231,6 +5241,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
                         'a' => textobject_treesitter("parameter", range),
                         'c' => textobject_treesitter("comment", range),
                         'T' => textobject_treesitter("test", range),
+                        'e' => textobject_treesitter("entry", range),
                         'p' => textobject::textobject_paragraph(text, range, objtype, count),
                         'm' => textobject::textobject_pair_surround_closest(
                             text, range, objtype, count,
@@ -5263,6 +5274,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
         ("a", "Argument/parameter (tree-sitter)"),
         ("c", "Comment (tree-sitter)"),
         ("T", "Test (tree-sitter)"),
+        ("e", "Data structure entry (tree-sitter)"),
         ("m", "Closest surrounding pair"),
         (" ", "... or any character acting as a pair"),
     ];
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index ca5a21d26a164..ffd076ad3c38c 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -114,6 +114,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "t" => goto_prev_class,
             "a" => goto_prev_parameter,
             "c" => goto_prev_comment,
+            "e" => goto_prev_entry,
             "T" => goto_prev_test,
             "p" => goto_prev_paragraph,
             "space" => add_newline_above,
@@ -127,6 +128,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "t" => goto_next_class,
             "a" => goto_next_parameter,
             "c" => goto_next_comment,
+            "e" => goto_next_entry,
             "T" => goto_next_test,
             "p" => goto_next_paragraph,
             "space" => add_newline_below,
diff --git a/runtime/queries/_typescript/textobjects.scm b/runtime/queries/_typescript/textobjects.scm
index c248aeade4977..09198519fb4cc 100644
--- a/runtime/queries/_typescript/textobjects.scm
+++ b/runtime/queries/_typescript/textobjects.scm
@@ -4,3 +4,9 @@
   (type_alias_declaration 
     value: (_) @class.inside)
 ] @class.around
+
+(enum_body
+  (_) @entry.around)
+
+(enum_assignment (_) @entry.inside)
+
diff --git a/runtime/queries/bash/textobjects.scm b/runtime/queries/bash/textobjects.scm
index 59983b30ceed8..09536a6b54cf9 100644
--- a/runtime/queries/bash/textobjects.scm
+++ b/runtime/queries/bash/textobjects.scm
@@ -7,3 +7,6 @@
 (comment) @comment.inside
 
 (comment)+ @comment.around
+
+(array
+  (_) @entry.around)
diff --git a/runtime/queries/c/textobjects.scm b/runtime/queries/c/textobjects.scm
index 2a3da66f3be97..63ec4a5677f2d 100644
--- a/runtime/queries/c/textobjects.scm
+++ b/runtime/queries/c/textobjects.scm
@@ -19,3 +19,9 @@
 (comment) @comment.inside
 
 (comment)+ @comment.around
+
+(enumerator
+  (_) @entry.inside) @entry.around
+
+(initializer_list
+  (_) @entry.around)
diff --git a/runtime/queries/ecma/textobjects.scm b/runtime/queries/ecma/textobjects.scm
index c80dc81b4cc7d..a19eb25bb1c6e 100644
--- a/runtime/queries/ecma/textobjects.scm
+++ b/runtime/queries/ecma/textobjects.scm
@@ -34,3 +34,12 @@
 (comment) @comment.inside
 
 (comment)+ @comment.around
+
+(array 
+  (_) @entry.around)
+
+(pair
+  (_) @entry.inside) @entry.around
+
+(pair_pattern
+  (_) @entry.inside) @entry.around
diff --git a/runtime/queries/graphql/textobjects.scm b/runtime/queries/graphql/textobjects.scm
new file mode 100644
index 0000000000000..b6035367242cc
--- /dev/null
+++ b/runtime/queries/graphql/textobjects.scm
@@ -0,0 +1,23 @@
+(type_definition) @class.around
+
+(executable_definition) @function.around
+
+(arguments_definition
+  (input_value_definition) @parameter.inside @parameter.movement)
+
+(arguments
+  (argument) @parameter.inside @parameter.movement)
+
+(selection
+  [(field) (fragment_spread)] @entry.around)
+
+(selection
+  (field (selection_set) @entry.inside))
+
+(field_definition
+  (_) @entry.inside) @entry.around
+
+(input_fields_definition
+  (input_value_definition ) @entry.around)
+
+(enum_value) @entry.around
diff --git a/runtime/queries/java/textobjects.scm b/runtime/queries/java/textobjects.scm
index b0e73a0a75dbf..1fe0726a839e2 100644
--- a/runtime/queries/java/textobjects.scm
+++ b/runtime/queries/java/textobjects.scm
@@ -36,3 +36,9 @@
 (line_comment)+ @comment.around
 
 (block_comment) @comment.around
+
+(array_initializer
+  (_) @entry.around)
+
+(enum_body
+  (enum_constant) @entry.around)
diff --git a/runtime/queries/json/textobjects.scm b/runtime/queries/json/textobjects.scm
new file mode 100644
index 0000000000000..a8fd57c994156
--- /dev/null
+++ b/runtime/queries/json/textobjects.scm
@@ -0,0 +1,5 @@
+(pair 
+  (_) @entry.inside) @entry.around
+
+(array
+  (_) @entry.around)
diff --git a/runtime/queries/lua/textobjects.scm b/runtime/queries/lua/textobjects.scm
index 6fb2000df40ea..305c3ae7d8ffe 100644
--- a/runtime/queries/lua/textobjects.scm
+++ b/runtime/queries/lua/textobjects.scm
@@ -13,3 +13,6 @@
 (comment) @comment.inside
 
 (comment)+ @comment.around
+
+(table_constructor
+  (field (_) @entry.inside) @entry.around)
diff --git a/runtime/queries/php/textobjects.scm b/runtime/queries/php/textobjects.scm
index e35eebd767ca7..e721b864d46d0 100644
--- a/runtime/queries/php/textobjects.scm
+++ b/runtime/queries/php/textobjects.scm
@@ -38,3 +38,15 @@
 (comment) @comment.inside
 
 (comment)+ @comment.around
+
+(array_creation_expression
+  (array_element_initializer
+    (_) @entry.inside
+  ) @entry.around @entry.movement)
+
+(list_literal
+  (_) @entry.inside @entry.around @entry.movement)
+
+[
+  (enum_case)
+] @entry.around @entry.movement
diff --git a/runtime/queries/python/textobjects.scm b/runtime/queries/python/textobjects.scm
index 966e47446a692..2b9556fca7bc3 100644
--- a/runtime/queries/python/textobjects.scm
+++ b/runtime/queries/python/textobjects.scm
@@ -21,3 +21,15 @@
    name: (identifier) @_name
    body: (block)? @test.inside) @test.around
  (#match? @_name "^test_"))
+
+(list
+  (_) @entry.around)
+
+(tuple
+  (_) @entry.around)
+
+(set
+  (_) @entry.around)
+
+(pair
+  (_) @entry.inside) @entry.around
diff --git a/runtime/queries/ruby/textobjects.scm b/runtime/queries/ruby/textobjects.scm
index 2d48fa6fccd72..123c55678cfc3 100644
--- a/runtime/queries/ruby/textobjects.scm
+++ b/runtime/queries/ruby/textobjects.scm
@@ -42,3 +42,15 @@
 ; Comments
 (comment) @comment.inside 
 (comment)+ @comment.around
+
+(pair
+  (_) @entry.inside) @entry.around
+
+(array
+  (_) @entry.around)
+
+(string_array
+  (_) @entry.around)
+
+(symbol_array
+  (_) @entry.around)
diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm
index df26331d83897..de517d3624080 100644
--- a/runtime/queries/rust/textobjects.scm
+++ b/runtime/queries/rust/textobjects.scm
@@ -59,3 +59,27 @@
  (function_item
    body: (_) @test.inside) @test.around
  (#eq? @_test_attribute "test"))
+
+(array_expression
+  (_) @entry.around)
+
+(tuple_expression
+  (_) @entry.around)
+
+(tuple_pattern
+  (_) @entry.around)
+
+; Commonly used vec macro intializer is special cased
+(macro_invocation
+  (identifier) @_id (token_tree (_) @entry.around)
+  (#eq? @_id "vec"))
+
+(enum_variant) @entry.around
+
+(field_declaration
+  (_) @entry.inside) @entry.around
+
+(field_initializer
+  (_) @entry.inside) @entry.around
+
+(shorthand_field_initializer) @entry.around
diff --git a/runtime/queries/toml/textobjects.scm b/runtime/queries/toml/textobjects.scm
new file mode 100644
index 0000000000000..a8fd57c994156
--- /dev/null
+++ b/runtime/queries/toml/textobjects.scm
@@ -0,0 +1,5 @@
+(pair 
+  (_) @entry.inside) @entry.around
+
+(array
+  (_) @entry.around)