From de0ef8af15945fb7f761503c615a2d6213d2fd82 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sun, 4 Jun 2023 17:20:04 +0200
Subject: [PATCH 001/967] fix UB in diff gutter (#7227)

---
 helix-vcs/src/diff/line_cache.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/helix-vcs/src/diff/line_cache.rs b/helix-vcs/src/diff/line_cache.rs
index 8e48250f1..460a2065e 100644
--- a/helix-vcs/src/diff/line_cache.rs
+++ b/helix-vcs/src/diff/line_cache.rs
@@ -20,8 +20,8 @@ use super::{MAX_DIFF_BYTES, MAX_DIFF_LINES};
 /// A cache that stores the `lines` of a rope as a vector.
 /// It allows safely reusing the allocation of the vec when updating the rope
 pub(crate) struct InternedRopeLines {
-    diff_base: Rope,
-    doc: Rope,
+    diff_base: Box<Rope>,
+    doc: Box<Rope>,
     num_tokens_diff_base: u32,
     interned: InternedInput<RopeSlice<'static>>,
 }
@@ -34,8 +34,8 @@ impl InternedRopeLines {
                 after: Vec::with_capacity(doc.len_lines()),
                 interner: Interner::new(diff_base.len_lines() + doc.len_lines()),
             },
-            diff_base,
-            doc,
+            diff_base: Box::new(diff_base),
+            doc: Box::new(doc),
             // will be populated by update_diff_base_impl
             num_tokens_diff_base: 0,
         };
@@ -44,19 +44,19 @@ impl InternedRopeLines {
     }
 
     pub fn doc(&self) -> Rope {
-        self.doc.clone()
+        Rope::clone(&*self.doc)
     }
 
     pub fn diff_base(&self) -> Rope {
-        self.diff_base.clone()
+        Rope::clone(&*self.diff_base)
     }
 
     /// Updates the `diff_base` and optionally the document if `doc` is not None
     pub fn update_diff_base(&mut self, diff_base: Rope, doc: Option<Rope>) {
         self.interned.clear();
-        self.diff_base = diff_base;
+        self.diff_base = Box::new(diff_base);
         if let Some(doc) = doc {
-            self.doc = doc
+            self.doc = Box::new(doc)
         }
         if !self.is_too_large() {
             self.update_diff_base_impl();
@@ -74,7 +74,7 @@ impl InternedRopeLines {
             .interner
             .erase_tokens_after(self.num_tokens_diff_base.into());
 
-        self.doc = doc;
+        self.doc = Box::new(doc);
         if self.is_too_large() {
             self.interned.after.clear();
         } else {

From 232d9f96a0d9144457716ec0a9309db2f6924ac8 Mon Sep 17 00:00:00 2001
From: avaunit02 <avagordon01@gmail.com>
Date: Sun, 4 Jun 2023 16:20:54 +0100
Subject: [PATCH 002/967] Fix textobject keybindings in usage docs (#7197)

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

diff --git a/book/src/usage.md b/book/src/usage.md
index 81cf83725..3c48e3065 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -96,13 +96,13 @@ function or block of code.
 | `(`, `[`, `'`, etc.    | Specified surround pairs |
 | `m`                    | The closest surround pair    |
 | `f`                    | Function                 |
-| `c`                    | Class                    |
+| `t`                    | Type (or Class)          |
 | `a`                    | Argument/parameter       |
-| `o`                    | Comment                  |
-| `t`                    | Test                     |
+| `c`                    | Comment                  |
+| `T`                    | Test                     |
 | `g`                    | Change                   |
 
-> 💡 `f`, `c`, etc. need a tree-sitter grammar active for the current
+> 💡 `f`, `t`, etc. need a tree-sitter grammar active for the current
 document and a special tree-sitter query file to work properly. [Only
 some grammars][lang-support] currently have the query file implemented.
 Contributions are welcome!
@@ -112,7 +112,7 @@ Contributions are welcome!
 Navigating between functions, classes, parameters, and other elements is
 possible using tree-sitter and textobject queries. For
 example to move to the next function use `]f`, to move to previous
-class use `[c`, and so on.
+type use `[t`, and so on.
 
 ![Tree-sitter-nav-demo][tree-sitter-nav-demo]
 

From 751da0130322b63c5233904ecd2f7ff1c068c4e7 Mon Sep 17 00:00:00 2001
From: Rich Seymour <105805+rseymour@users.noreply.github.com>
Date: Sun, 4 Jun 2023 20:06:25 -0400
Subject: [PATCH 003/967] Update install.md instructions regarding symlinks
 (#7231)

* Update install.md

Fixes `ln` command line bug that could hit users moving from packaged to source builds.

* Remove extra 'how to' command example
---
 book/src/install.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/book/src/install.md b/book/src/install.md
index 8d80712fe..7483be299 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -204,9 +204,11 @@ HELIX_RUNTIME=/home/user-name/src/helix/runtime
 Or, create a symlink in `~/.config/helix` that links to the source code directory:
 
 ```sh
-ln -s $PWD/runtime ~/.config/helix/runtime
+ln -Ts $PWD/runtime ~/.config/helix/runtime
 ```
 
+If the above command fails to create a symbolic link because the file exists either move `~/.config/helix/runtime` to a new location or delete it, then run the symlink command above again. 
+
 #### Windows
 
 Either set the `HELIX_RUNTIME` environment variable to point to the runtime files using the Windows setting (search for

From 2022e6175ba72a772b6b6fda4479a8e554e0de02 Mon Sep 17 00:00:00 2001
From: Ivan Tkachuk <116971836+seshotake@users.noreply.github.com>
Date: Mon, 5 Jun 2023 11:40:14 +0300
Subject: [PATCH 004/967] Add blueprint language (#7213)

* Add blueprint tree-sitter support

* Add blueprint lsp support

* Run cargo xtask docgen
---
 book/src/generated/lang-support.md       |  1 +
 languages.toml                           | 15 +++++++
 runtime/queries/blueprint/highlights.scm | 56 ++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 runtime/queries/blueprint/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index d35966575..59fe310f0 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -7,6 +7,7 @@
 | beancount | ✓ |  |  |  |
 | bibtex | ✓ |  |  | `texlab` |
 | bicep | ✓ |  |  | `bicep-langserver` |
+| blueprint | ✓ |  |  | `blueprint-compiler` |
 | c | ✓ | ✓ | ✓ | `clangd` |
 | c-sharp | ✓ | ✓ |  | `OmniSharp` |
 | cabal |  |  |  |  |
diff --git a/languages.toml b/languages.toml
index 9e74bf7fb..964dc0812 100644
--- a/languages.toml
+++ b/languages.toml
@@ -77,6 +77,7 @@ vuels = { command = "vls" }
 wgsl_analyzer = { command = "wgsl_analyzer" }
 yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
 zls = { command = "zls" }
+blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
 
 
 [language-server.lua-language-server]
@@ -2577,3 +2578,17 @@ indent = { tab-width = 4, unit = "\t" }
 [[grammar]]
 name = "just"
 source = { git = "https://github.com/IndianBoy42/tree-sitter-just", rev = "8af0aab79854aaf25b620a52c39485849922f766" }
+
+[[language]]
+name = "blueprint"
+scope = "source.blueprint"
+injection-regex = "blueprint"
+file-types = ["blp"]
+roots = []
+comment-token = "//"
+language-servers = [ "blueprint-compiler" ]
+indent = { tab-width = 4, unit = "    " }
+
+[[grammar]]
+name = "blueprint"
+source = { git = "https://gitlab.com/gabmus/tree-sitter-blueprint", rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14" }
diff --git a/runtime/queries/blueprint/highlights.scm b/runtime/queries/blueprint/highlights.scm
new file mode 100644
index 000000000..05533cea4
--- /dev/null
+++ b/runtime/queries/blueprint/highlights.scm
@@ -0,0 +1,56 @@
+(object_id) @attribute
+
+(string) @string
+(escape_sequence) @constant.character.escape
+
+(comment) @comment
+
+(constant) @constant.builtin
+(boolean) @constant.builtin.boolean
+
+(template) @keyword
+
+(using) @keyword.control.import
+
+(decorator) @attribute
+
+(property_definition (property_name) @variable.other.member)
+
+(object) @type
+
+(signal_binding (signal_name) @function.builtin)
+(signal_binding (function (identifier)) @function)
+(signal_binding "swapped" @keyword)
+
+(styles_list "styles" @function.macro)
+(layout_definition "layout" @function.macro)
+
+(gettext_string "_" @function.builtin)
+
+(menu_definition "menu" @keyword)
+(menu_section "section" @keyword)
+(menu_item "item" @function.macro)
+
+(template_definition (template_name_qualifier) @keyword.storage.type)
+
+(import_statement (gobject_library) @namespace)
+
+(import_statement (version_number) @constant.numeric.float)
+
+(float) @constant.numeric.float
+(number) @constant.numeric
+
+[
+  ";"
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket

From d5707a4696af0c63ec350791501440e7d0adc036 Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Mon, 5 Jun 2023 15:22:05 +0200
Subject: [PATCH 005/967] feat(commands): allows cycling option values at
 runtime (#4411)

---
 helix-term/src/commands/typed.rs | 49 ++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 706442e45..fb285e726 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -8,7 +8,6 @@ use super::*;
 use helix_core::{encoding, shellwords::Shellwords};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
-use serde_json::Value;
 use ui::completers::{self, Completer};
 
 #[derive(Clone)]
@@ -1790,8 +1789,8 @@ fn toggle_option(
         return Ok(());
     }
 
-    if args.len() != 1 {
-        anyhow::bail!("Bad arguments. Usage: `:toggle key`");
+    if args.is_empty() {
+        anyhow::bail!("Bad arguments. Usage: `:toggle key [values]?`");
     }
     let key = &args[0].to_lowercase();
 
@@ -1801,22 +1800,48 @@ fn toggle_option(
     let pointer = format!("/{}", key.replace('.', "/"));
     let value = config.pointer_mut(&pointer).ok_or_else(key_error)?;
 
-    let Value::Bool(old_value) = *value else {
-        anyhow::bail!("Key `{}` is not toggle-able", key)
+    *value = match value.as_bool() {
+        Some(value) => {
+            ensure!(
+                args.len() == 1,
+                "Bad arguments. For boolean configurations use: `:toggle key`"
+            );
+            serde_json::Value::Bool(!value)
+        }
+        None => {
+            ensure!(
+                args.len() > 2,
+                "Bad arguments. For non-boolean configurations use: `:toggle key val1 val2 ...`",
+            );
+            ensure!(
+                value.is_string(),
+                "Bad configuration. Cannot cycle non-string configurations"
+            );
+
+            let value = value
+                .as_str()
+                .expect("programming error: should have been ensured before");
+
+            serde_json::Value::String(
+                args[1..]
+                    .iter()
+                    .skip_while(|e| *e != value)
+                    .nth(1)
+                    .unwrap_or_else(|| &args[1])
+                    .to_string(),
+            )
+        }
     };
 
-    let new_value = !old_value;
-    *value = Value::Bool(new_value);
-    // This unwrap should never fail because we only replace one boolean value
-    // with another, maintaining a valid json config
-    let config = serde_json::from_value(config).unwrap();
+    let status = format!("'{key}' is now set to {value}");
+    let config = serde_json::from_value(config)
+        .map_err(|_| anyhow::anyhow!("Could not parse field: `{:?}`", &args))?;
 
     cx.editor
         .config_events
         .0
         .send(ConfigEvent::Update(config))?;
-    cx.editor
-        .set_status(format!("Option `{}` is now set to `{}`", key, new_value));
+    cx.editor.set_status(status);
     Ok(())
 }
 

From 428d33ab504cea9b66404356c6fe12fbbdc4db7d Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 5 Jun 2023 08:27:57 -0500
Subject: [PATCH 006/967] Exit gracefully on termination signals (#7236)

---
 helix-term/src/application.rs | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 0ea314133..7e9684827 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -231,8 +231,14 @@ impl Application {
         #[cfg(windows)]
         let signals = futures_util::stream::empty();
         #[cfg(not(windows))]
-        let signals = Signals::new([signal::SIGTSTP, signal::SIGCONT, signal::SIGUSR1])
-            .context("build signal handler")?;
+        let signals = Signals::new([
+            signal::SIGTSTP,
+            signal::SIGCONT,
+            signal::SIGUSR1,
+            signal::SIGTERM,
+            signal::SIGINT,
+        ])
+        .context("build signal handler")?;
 
         let app = Self {
             compositor,
@@ -318,7 +324,9 @@ impl Application {
                 biased;
 
                 Some(signal) = self.signals.next() => {
-                    self.handle_signals(signal).await;
+                    if !self.handle_signals(signal).await {
+                        return false;
+                    };
                 }
                 Some(event) = input_stream.next() => {
                     self.handle_terminal_events(event).await;
@@ -442,10 +450,12 @@ impl Application {
 
     #[cfg(windows)]
     // no signal handling available on windows
-    pub async fn handle_signals(&mut self, _signal: ()) {}
+    pub async fn handle_signals(&mut self, _signal: ()) -> bool {
+        true
+    }
 
     #[cfg(not(windows))]
-    pub async fn handle_signals(&mut self, signal: i32) {
+    pub async fn handle_signals(&mut self, signal: i32) -> bool {
         match signal {
             signal::SIGTSTP => {
                 self.restore_term().unwrap();
@@ -499,8 +509,14 @@ impl Application {
                 self.refresh_config();
                 self.render().await;
             }
+            signal::SIGTERM | signal::SIGINT => {
+                self.restore_term().unwrap();
+                return false;
+            }
             _ => unreachable!(),
         }
+
+        true
     }
 
     pub async fn handle_idle_timeout(&mut self) {

From a2b8cfdb8c8c97ba01bc7913cab15df94705f462 Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Mon, 5 Jun 2023 16:13:00 +0200
Subject: [PATCH 007/967] feat(core): add plaintext matching fallback to
 tree-sitter matching (#4288)

---
 helix-core/src/match_brackets.rs | 121 ++++++++++++++++++++++++++++---
 helix-term/src/commands.rs       |  29 ++++----
 2 files changed, 128 insertions(+), 22 deletions(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index 0189deddb..fd43a110e 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -2,6 +2,9 @@ use tree_sitter::Node;
 
 use crate::{Rope, Syntax};
 
+const MAX_PLAINTEXT_SCAN: usize = 10000;
+
+// Limit matching pairs to only ( ) { } [ ] < > ' ' " "
 const PAIRS: &[(char, char)] = &[
     ('(', ')'),
     ('{', '}'),
@@ -11,15 +14,15 @@ const PAIRS: &[(char, char)] = &[
     ('\"', '\"'),
 ];
 
-// limit matching pairs to only ( ) { } [ ] < > ' ' " "
-
-// Returns the position of the matching bracket under cursor.
-//
-// If the cursor is one the opening bracket, the position of
-// the closing bracket is returned. If the cursor in the closing
-// bracket, the position of the opening bracket is returned.
-//
-// If the cursor is not on a bracket, `None` is returned.
+/// Returns the position of the matching bracket under cursor.
+///
+/// If the cursor is on the opening bracket, the position of
+/// the closing bracket is returned. If the cursor on the closing
+/// bracket, the position of the opening bracket is returned.
+///
+/// If the cursor is not on a bracket, `None` is returned.
+///
+/// If no matching bracket is found, `None` is returned.
 #[must_use]
 pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
     if pos >= doc.len_chars() || !is_valid_bracket(doc.char(pos)) {
@@ -70,10 +73,77 @@ fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) ->
     }
 }
 
+/// Returns the position of the matching bracket under cursor.
+/// This function works on plain text and ignores tree-sitter grammar.
+/// The search is limited to `MAX_PLAINTEXT_SCAN` characters
+///
+/// If the cursor is on the opening bracket, the position of
+/// the closing bracket is returned. If the cursor on the closing
+/// bracket, the position of the opening bracket is returned.
+///
+/// If the cursor is not on a bracket, `None` is returned.
+///
+/// If no matching bracket is found, `None` is returned.
+#[must_use]
+pub fn find_matching_bracket_current_line_plaintext(
+    doc: &Rope,
+    cursor_pos: usize,
+) -> Option<usize> {
+    // Don't do anything when the cursor is not on top of a bracket.
+    let bracket = doc.char(cursor_pos);
+    if !is_valid_bracket(bracket) {
+        return None;
+    }
+
+    // Determine the direction of the matching.
+    let is_fwd = is_forward_bracket(bracket);
+    let chars_iter = if is_fwd {
+        doc.chars_at(cursor_pos + 1)
+    } else {
+        doc.chars_at(cursor_pos).reversed()
+    };
+
+    let mut open_cnt = 1;
+
+    for (i, candidate) in chars_iter.take(MAX_PLAINTEXT_SCAN).enumerate() {
+        if candidate == bracket {
+            open_cnt += 1;
+        } else if is_valid_pair(
+            doc,
+            if is_fwd {
+                cursor_pos
+            } else {
+                cursor_pos - i - 1
+            },
+            if is_fwd {
+                cursor_pos + i + 1
+            } else {
+                cursor_pos
+            },
+        ) {
+            // Return when all pending brackets have been closed.
+            if open_cnt == 1 {
+                return Some(if is_fwd {
+                    cursor_pos + i + 1
+                } else {
+                    cursor_pos - i - 1
+                });
+            }
+            open_cnt -= 1;
+        }
+    }
+
+    None
+}
+
 fn is_valid_bracket(c: char) -> bool {
     PAIRS.iter().any(|(l, r)| *l == c || *r == c)
 }
 
+fn is_forward_bracket(c: char) -> bool {
+    PAIRS.iter().any(|(l, _)| *l == c)
+}
+
 fn is_valid_pair(doc: &Rope, start_char: usize, end_char: usize) -> bool {
     PAIRS.contains(&(doc.char(start_char), doc.char(end_char)))
 }
@@ -90,3 +160,36 @@ fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
 
     Some((start_byte, end_byte))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_find_matching_bracket_current_line_plaintext() {
+        let assert = |input: &str, pos, expected| {
+            let input = &Rope::from(input);
+            let actual = find_matching_bracket_current_line_plaintext(input, pos);
+            assert_eq!(expected, actual.unwrap());
+
+            let actual = find_matching_bracket_current_line_plaintext(input, expected);
+            assert_eq!(pos, actual.unwrap(), "expected symmetrical behaviour");
+        };
+
+        assert("(hello)", 0, 6);
+        assert("((hello))", 0, 8);
+        assert("((hello))", 1, 7);
+        assert("(((hello)))", 2, 8);
+
+        assert("key: ${value}", 6, 12);
+        assert("key: ${value} # (some comment)", 16, 29);
+
+        assert("(paren (paren {bracket}))", 0, 24);
+        assert("(paren (paren {bracket}))", 7, 23);
+        assert("(paren (paren {bracket}))", 14, 22);
+
+        assert("(prev line\n ) (middle) ( \n next line)", 0, 12);
+        assert("(prev line\n ) (middle) ( \n next line)", 14, 21);
+        assert("(prev line\n ) (middle) ( \n next line)", 23, 36);
+    }
+}
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 911c9c1f7..1e89fe1cb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4528,20 +4528,23 @@ fn select_prev_sibling(cx: &mut Context) {
 
 fn match_brackets(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
+    let is_select = cx.editor.mode == Mode::Select;
+    let text = doc.text();
+    let text_slice = text.slice(..);
 
-    if let Some(syntax) = doc.syntax() {
-        let text = doc.text().slice(..);
-        let selection = doc.selection(view.id).clone().transform(|range| {
-            if let Some(pos) =
-                match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.cursor(text))
-            {
-                range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
-            } else {
-                range
-            }
-        });
-        doc.set_selection(view.id, selection);
-    }
+    let selection = doc.selection(view.id).clone().transform(|range| {
+        let pos = range.cursor(text_slice);
+        if let Some(matched_pos) = doc.syntax().map_or_else(
+            || match_brackets::find_matching_bracket_current_line_plaintext(text, pos),
+            |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text, pos),
+        ) {
+            range.put_cursor(text_slice, matched_pos, is_select)
+        } else {
+            range
+        }
+    });
+
+    doc.set_selection(view.id, selection);
 }
 
 //

From cd01dc886aa9e2ee6422476b90e508974437480e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:13:28 +0900
Subject: [PATCH 008/967] build(deps): bump libc from 0.2.144 to 0.2.145
 (#7244)

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

diff --git a/Cargo.lock b/Cargo.lock
index 6f0a90999..1d64c43ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1451,9 +1451,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index f7496087a..1c3543d31 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -68,7 +68,7 @@ grep-searcher = "0.1.11"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.144"
+libc = "0.2.145"
 
 [build-dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }

From 1d114ecb6ef8a2fca481f73207d5271fc0c7b25a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:13:43 +0900
Subject: [PATCH 009/967] build(deps): bump chrono from 0.4.25 to 0.4.26
 (#7245)

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 1d64c43ce..e4bd2a7e9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -164,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbc37d37da9e5bce8173f3a41b71d9bf3c674deebbaceacd0ebdabde76efb03"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",

From a8c99fb24c78842381d9cb77d861e11e8fd2a7f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:14:05 +0900
Subject: [PATCH 010/967] build(deps): bump hashbrown from 0.13.2 to 0.14.0
 (#7246)

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

diff --git a/Cargo.lock b/Cargo.lock
index e4bd2a7e9..009849a47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -49,6 +49,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4f263788a35611fba42eb41ff811c5d0360c58b97402570312a350736e2542e"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -1087,8 +1093,15 @@ name = "hashbrown"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
 dependencies = [
  "ahash 0.8.3",
+ "allocator-api2",
 ]
 
 [[package]]
@@ -1102,7 +1115,7 @@ dependencies = [
  "dunce",
  "encoding_rs",
  "etcetera",
- "hashbrown 0.13.2",
+ "hashbrown 0.14.0",
  "helix-loader",
  "imara-diff",
  "indoc",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 244cfbc10..e9e18aa3d 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -31,7 +31,7 @@ arc-swap = "1"
 regex = "1"
 bitflags = "2.3"
 ahash = "0.8.3"
-hashbrown = { version = "0.13.2", features = ["raw"] }
+hashbrown = { version = "0.14.0", features = ["raw"] }
 dunce = "1.0"
 
 log = "0.4"

From a56222cd0eca5b22de15ec115b83c1480ccd5593 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:14:22 +0900
Subject: [PATCH 011/967] build(deps): bump url from 2.3.1 to 2.4.0 (#7247)

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

diff --git a/Cargo.lock b/Cargo.lock
index 009849a47..e7e9c1e7b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -421,9 +421,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
 dependencies = [
  "percent-encoding",
 ]
@@ -1351,9 +1351,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -1633,9 +1633,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pin-project-lite"
@@ -2275,9 +2275,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
 dependencies = [
  "form_urlencoded",
  "idna",

From 6deb0e4ef7f60e806e146085be545a58d068cab5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:14:36 +0900
Subject: [PATCH 012/967] build(deps): bump once_cell from 1.17.2 to 1.18.0
 (#7248)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 4 ++--
 helix-core/Cargo.toml   | 2 +-
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-tui/Cargo.toml    | 2 +-
 helix-view/Cargo.toml   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e7e9c1e7b..4b7bedcea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1604,9 +1604,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.2"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "parking_lot"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index e9e18aa3d..1b3d75ebc 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -26,7 +26,7 @@ unicode-general-category = "0.6"
 # slab = "0.4.2"
 slotmap = "1.0"
 tree-sitter = "0.20"
-once_cell = "1.17"
+once_cell = "1.18"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.3"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 18216bcba..b0d8f1462 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.7"
 etcetera = "0.8"
 tree-sitter = "0.20"
-once_cell = "1.17"
+once_cell = "1.18"
 log = "0.4"
 
 # TODO: these two should be on !wasm32 only
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 1c3543d31..e623e2de1 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -31,7 +31,7 @@ helix-vcs = { version = "0.6", path = "../helix-vcs" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 anyhow = "1"
-once_cell = "1.17"
+once_cell = "1.18"
 
 which = "4.4"
 
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 4cfeba865..32e8a52f3 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -22,7 +22,7 @@ unicode-segmentation = "1.10"
 crossterm = { version = "0.26", optional = true }
 termini = "1.0"
 serde = { version = "1", "optional" = true, features = ["derive"]}
-once_cell = "1.17"
+once_cell = "1.18"
 log = "~0.4"
 helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
 helix-core = { version = "0.6", path = "../helix-core" }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 9ffef00ef..203b5dad3 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -24,7 +24,7 @@ crossterm = { version = "0.26", optional = true }
 helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits
-once_cell = "1.17"
+once_cell = "1.18"
 url = "2"
 
 arc-swap = { version = "1.6.0" }

From 9f5b965627420768298c7e2f77b4954e5e72d855 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 12:26:44 +0900
Subject: [PATCH 013/967] build(deps): bump regex from 1.8.3 to 1.8.4 (#7249)

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 4b7bedcea..182eed9e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1731,9 +1731,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.3"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
 dependencies = [
  "aho-corasick 1.0.1",
  "memchr",

From 71688a387bb4435294c7f15502746210788dabda Mon Sep 17 00:00:00 2001
From: Tobias Clasen <sandalbanditten@tutanota.com>
Date: Tue, 6 Jun 2023 15:13:27 +0200
Subject: [PATCH 014/967] Recognize 'make' file-type as Makefile (#7212)

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

diff --git a/languages.toml b/languages.toml
index 964dc0812..4930b067e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1042,7 +1042,7 @@ source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef30
 [[language]]
 name = "make"
 scope = "source.make"
-file-types = ["Makefile", "makefile", "mk"]
+file-types = ["Makefile", "makefile", "make", "mk"]
 injection-regex = "(make|makefile|Makefile|mk)"
 roots = []
 comment-token = "#"

From 78e869542022638af482c0dd85a07086a942907a Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Tue, 6 Jun 2023 15:14:34 +0200
Subject: [PATCH 015/967] Add support for Forth (#7256)

---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 13 +++++++++++++
 runtime/queries/forth/highlights.scm |  8 ++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 runtime/queries/forth/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 59fe310f0..b8753d587 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -41,6 +41,7 @@
 | erlang | ✓ | ✓ |  | `erlang_ls` |
 | esdl | ✓ |  |  |  |
 | fish | ✓ | ✓ | ✓ |  |
+| forth | ✓ |  |  |  |
 | fortran | ✓ |  | ✓ | `fortls` |
 | gdscript | ✓ | ✓ | ✓ |  |
 | git-attributes | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 4930b067e..219ea541f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2592,3 +2592,16 @@ indent = { tab-width = 4, unit = "    " }
 [[grammar]]
 name = "blueprint"
 source = { git = "https://gitlab.com/gabmus/tree-sitter-blueprint", rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14" }
+
+[[language]]
+name = "forth"
+scope = "source.forth"
+injection-regex = "forth"
+file-types = ["fs", "forth", "fth", "4th"]
+roots = []
+comment-token = "\\"
+indent = { tab-width = 3, unit = "   " }
+
+[[grammar]]
+name = "forth"
+source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "c6fae50a17763af827604627c0fa9e4604aaac0b" }
diff --git a/runtime/queries/forth/highlights.scm b/runtime/queries/forth/highlights.scm
new file mode 100644
index 000000000..7be0d132e
--- /dev/null
+++ b/runtime/queries/forth/highlights.scm
@@ -0,0 +1,8 @@
+([(start_definition)(end_definition)] @keyword)
+([(lparen) (rparen)] @punctuation.bracket)
+((stack_effect_sep) @punctuation)
+((number) @constant)
+((word) @function)
+((comment) @comment)
+([(core)] @type)
+([(operator)] @operator)

From a56af221d73d2894ed081b351a0b5a239885ded7 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Wed, 31 May 2023 23:32:55 +0200
Subject: [PATCH 016/967] keymap: Derive `Default` for KeyTrieNode

---
 helix-term/src/keymap.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 3033c6a48..ea34209b1 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -18,7 +18,7 @@ use std::{
 pub use default::default;
 use macros::key;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct KeyTrieNode {
     /// A label for keys coming under this node, like "Goto mode"
     name: String,
@@ -117,12 +117,6 @@ impl KeyTrieNode {
     }
 }
 
-impl Default for KeyTrieNode {
-    fn default() -> Self {
-        Self::new("", HashMap::new(), Vec::new())
-    }
-}
-
 impl PartialEq for KeyTrieNode {
     fn eq(&self, other: &Self) -> bool {
         self.map == other.map

From daea97a89fb5e9b2678964974f68f92b129e2b57 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Wed, 31 May 2023 23:40:02 +0200
Subject: [PATCH 017/967] keymap: Rename KeyTrie::Leaf ->
 KeyTrie::MapppableCommand

The variant Sequence is technically also a leaf.
---
 helix-term/src/keymap.rs        | 26 +++++++++++++-------------
 helix-term/src/keymap/macros.rs |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index ea34209b1..761d068ff 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -80,7 +80,7 @@ impl KeyTrieNode {
         let mut body: Vec<(&str, BTreeSet<KeyEvent>)> = Vec::with_capacity(self.len());
         for (&key, trie) in self.iter() {
             let desc = match trie {
-                KeyTrie::Leaf(cmd) => {
+                KeyTrie::MappableCommand(cmd) => {
                     if cmd.name() == "no_op" {
                         continue;
                     }
@@ -139,7 +139,7 @@ impl DerefMut for KeyTrieNode {
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum KeyTrie {
-    Leaf(MappableCommand),
+    MappableCommand(MappableCommand),
     Sequence(Vec<MappableCommand>),
     Node(KeyTrieNode),
 }
@@ -168,7 +168,7 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
     {
         command
             .parse::<MappableCommand>()
-            .map(KeyTrie::Leaf)
+            .map(KeyTrie::MappableCommand)
             .map_err(E::custom)
     }
 
@@ -205,14 +205,14 @@ impl KeyTrie {
     pub fn node(&self) -> Option<&KeyTrieNode> {
         match *self {
             KeyTrie::Node(ref node) => Some(node),
-            KeyTrie::Leaf(_) | KeyTrie::Sequence(_) => None,
+            KeyTrie::MappableCommand(_) | KeyTrie::Sequence(_) => None,
         }
     }
 
     pub fn node_mut(&mut self) -> Option<&mut KeyTrieNode> {
         match *self {
             KeyTrie::Node(ref mut node) => Some(node),
-            KeyTrie::Leaf(_) | KeyTrie::Sequence(_) => None,
+            KeyTrie::MappableCommand(_) | KeyTrie::Sequence(_) => None,
         }
     }
 
@@ -229,7 +229,7 @@ impl KeyTrie {
             trie = match trie {
                 KeyTrie::Node(map) => map.get(key),
                 // leaf encountered while keys left to process
-                KeyTrie::Leaf(_) | KeyTrie::Sequence(_) => None,
+                KeyTrie::MappableCommand(_) | KeyTrie::Sequence(_) => None,
             }?
         }
         Some(trie)
@@ -269,7 +269,7 @@ impl Keymap {
         // recursively visit all nodes in keymap
         fn map_node(cmd_map: &mut ReverseKeymap, node: &KeyTrie, keys: &mut Vec<KeyEvent>) {
             match node {
-                KeyTrie::Leaf(cmd) => match cmd {
+                KeyTrie::MappableCommand(cmd) => match cmd {
                     MappableCommand::Typable { name, .. } => {
                         cmd_map.entry(name.into()).or_default().push(keys.clone())
                     }
@@ -371,7 +371,7 @@ impl Keymaps {
         };
 
         let trie = match trie_node.search(&[*first]) {
-            Some(KeyTrie::Leaf(ref cmd)) => {
+            Some(KeyTrie::MappableCommand(ref cmd)) => {
                 return KeymapResult::Matched(cmd.clone());
             }
             Some(KeyTrie::Sequence(ref cmds)) => {
@@ -390,7 +390,7 @@ impl Keymaps {
                 }
                 KeymapResult::Pending(map.clone())
             }
-            Some(KeyTrie::Leaf(cmd)) => {
+            Some(KeyTrie::MappableCommand(cmd)) => {
                 self.state.clear();
                 KeymapResult::Matched(cmd.clone())
             }
@@ -479,19 +479,19 @@ mod tests {
         // Assumes that `g` is a node in default keymap
         assert_eq!(
             keymap.root().search(&[key!('g'), key!('$')]).unwrap(),
-            &KeyTrie::Leaf(MappableCommand::goto_line_end),
+            &KeyTrie::MappableCommand(MappableCommand::goto_line_end),
             "Leaf should be present in merged subnode"
         );
         // Assumes that `gg` is in default keymap
         assert_eq!(
             keymap.root().search(&[key!('g'), key!('g')]).unwrap(),
-            &KeyTrie::Leaf(MappableCommand::delete_char_forward),
+            &KeyTrie::MappableCommand(MappableCommand::delete_char_forward),
             "Leaf should replace old leaf in merged subnode"
         );
         // Assumes that `ge` is in default keymap
         assert_eq!(
             keymap.root().search(&[key!('g'), key!('e')]).unwrap(),
-            &KeyTrie::Leaf(MappableCommand::goto_last_line),
+            &KeyTrie::MappableCommand(MappableCommand::goto_last_line),
             "Old leaves in subnode should be present in merged node"
         );
 
@@ -523,7 +523,7 @@ mod tests {
                 .root()
                 .search(&[key!(' '), key!('s'), key!('v')])
                 .unwrap(),
-            &KeyTrie::Leaf(MappableCommand::vsplit),
+            &KeyTrie::MappableCommand(MappableCommand::vsplit),
             "Leaf should be present in merged subnode"
         );
         // Make sure an order was set during merge
diff --git a/helix-term/src/keymap/macros.rs b/helix-term/src/keymap/macros.rs
index c4a1bfbb3..b2822069c 100644
--- a/helix-term/src/keymap/macros.rs
+++ b/helix-term/src/keymap/macros.rs
@@ -81,7 +81,7 @@ macro_rules! alt {
 #[macro_export]
 macro_rules! keymap {
     (@trie $cmd:ident) => {
-        $crate::keymap::KeyTrie::Leaf($crate::commands::MappableCommand::$cmd)
+        $crate::keymap::KeyTrie::MappableCommand($crate::commands::MappableCommand::$cmd)
     };
 
     (@trie

From f7df53c9481ebd9024a439eacb0467051faa30f9 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Wed, 31 May 2023 23:59:29 +0200
Subject: [PATCH 018/967] Make `Keymap` a tuple struct.

---
 helix-term/src/keymap.rs | 66 ++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 761d068ff..dc578e66d 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -252,17 +252,14 @@ pub enum KeymapResult {
 
 #[derive(Debug, Clone, PartialEq, Deserialize)]
 #[serde(transparent)]
-pub struct Keymap {
-    /// Always a Node
-    root: KeyTrie,
-}
+pub struct Keymap(KeyTrie);
 
 /// A map of command names to keybinds that will execute the command.
 pub type ReverseKeymap = HashMap<String, Vec<Vec<KeyEvent>>>;
 
 impl Keymap {
     pub fn new(root: KeyTrie) -> Self {
-        Keymap { root }
+        Keymap(root)
     }
 
     pub fn reverse_map(&self) -> ReverseKeymap {
@@ -290,30 +287,28 @@ impl Keymap {
         }
 
         let mut res = HashMap::new();
-        map_node(&mut res, &self.root, &mut Vec::new());
+        map_node(&mut res, &self.0, &mut Vec::new());
         res
     }
-
-    pub fn root(&self) -> &KeyTrie {
-        &self.root
-    }
-
-    pub fn merge(&mut self, other: Self) {
-        self.root.merge_nodes(other.root);
-    }
 }
 
 impl Deref for Keymap {
-    type Target = KeyTrieNode;
+    type Target = KeyTrie;
 
     fn deref(&self) -> &Self::Target {
-        self.root.node().unwrap()
+        &self.0
+    }
+}
+
+impl DerefMut for Keymap {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
     }
 }
 
 impl Default for Keymap {
     fn default() -> Self {
-        Self::new(KeyTrie::Node(KeyTrieNode::default()))
+        Self(KeyTrie::Node(KeyTrieNode::default()))
     }
 }
 
@@ -367,7 +362,7 @@ impl Keymaps {
         let first = self.state.get(0).unwrap_or(&key);
         let trie_node = match self.sticky {
             Some(ref trie) => Cow::Owned(KeyTrie::Node(trie.clone())),
-            None => Cow::Borrowed(&keymap.root),
+            None => Cow::Borrowed(&keymap.0),
         };
 
         let trie = match trie_node.search(&[*first]) {
@@ -412,7 +407,7 @@ impl Default for Keymaps {
 /// Merge default config keys with user overwritten keys for custom user config.
 pub fn merge_keys(dst: &mut HashMap<Mode, Keymap>, mut delta: HashMap<Mode, Keymap>) {
     for (mode, keys) in dst {
-        keys.merge(delta.remove(mode).unwrap_or_default())
+        keys.merge_nodes(delta.remove(mode).unwrap_or_default().0)
     }
 }
 
@@ -478,25 +473,39 @@ mod tests {
         let keymap = merged_keyamp.get_mut(&Mode::Normal).unwrap();
         // Assumes that `g` is a node in default keymap
         assert_eq!(
-            keymap.root().search(&[key!('g'), key!('$')]).unwrap(),
+            keymap.search(&[key!('g'), key!('$')]).unwrap(),
             &KeyTrie::MappableCommand(MappableCommand::goto_line_end),
             "Leaf should be present in merged subnode"
         );
         // Assumes that `gg` is in default keymap
         assert_eq!(
-            keymap.root().search(&[key!('g'), key!('g')]).unwrap(),
+            keymap.search(&[key!('g'), key!('g')]).unwrap(),
             &KeyTrie::MappableCommand(MappableCommand::delete_char_forward),
             "Leaf should replace old leaf in merged subnode"
         );
         // Assumes that `ge` is in default keymap
         assert_eq!(
-            keymap.root().search(&[key!('g'), key!('e')]).unwrap(),
+            keymap.search(&[key!('g'), key!('e')]).unwrap(),
             &KeyTrie::MappableCommand(MappableCommand::goto_last_line),
             "Old leaves in subnode should be present in merged node"
         );
 
-        assert!(merged_keyamp.get(&Mode::Normal).unwrap().len() > 1);
-        assert!(merged_keyamp.get(&Mode::Insert).unwrap().len() > 0);
+        assert!(
+            merged_keyamp
+                .get(&Mode::Normal)
+                .and_then(|key_trie| key_trie.node())
+                .unwrap()
+                .len()
+                > 1
+        );
+        assert!(
+            merged_keyamp
+                .get(&Mode::Insert)
+                .and_then(|key_trie| key_trie.node())
+                .unwrap()
+                .len()
+                > 0
+        );
     }
 
     #[test]
@@ -519,22 +528,19 @@ mod tests {
         let keymap = merged_keyamp.get_mut(&Mode::Normal).unwrap();
         // Make sure mapping works
         assert_eq!(
-            keymap
-                .root()
-                .search(&[key!(' '), key!('s'), key!('v')])
-                .unwrap(),
+            keymap.search(&[key!(' '), key!('s'), key!('v')]).unwrap(),
             &KeyTrie::MappableCommand(MappableCommand::vsplit),
             "Leaf should be present in merged subnode"
         );
         // Make sure an order was set during merge
-        let node = keymap.root().search(&[crate::key!(' ')]).unwrap();
+        let node = keymap.search(&[crate::key!(' ')]).unwrap();
         assert!(!node.node().unwrap().order().is_empty())
     }
 
     #[test]
     fn aliased_modes_are_same_in_default_keymap() {
         let keymaps = Keymaps::default().map();
-        let root = keymaps.get(&Mode::Normal).unwrap().root();
+        let root = keymaps.get(&Mode::Normal).unwrap();
         assert_eq!(
             root.search(&[key!(' '), key!('w')]).unwrap(),
             root.search(&["C-w".parse::<KeyEvent>().unwrap()]).unwrap(),

From d20c1632a7331876215db59410361f0605f2f3ed Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Mon, 29 May 2023 21:36:23 +0200
Subject: [PATCH 019/967] `helix_term::keymap`: Remove one-liner solely used
 for a test.

---
 helix-term/src/keymap.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index dc578e66d..79d6b46a7 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -111,10 +111,6 @@ impl KeyTrieNode {
         }
         Info::from_keymap(self.name(), body)
     }
-    /// Get a reference to the key trie node's order.
-    pub fn order(&self) -> &[KeyEvent] {
-        self.order.as_slice()
-    }
 }
 
 impl PartialEq for KeyTrieNode {
@@ -534,7 +530,7 @@ mod tests {
         );
         // Make sure an order was set during merge
         let node = keymap.search(&[crate::key!(' ')]).unwrap();
-        assert!(!node.node().unwrap().order().is_empty())
+        assert!(!node.node().unwrap().order.as_slice().is_empty())
     }
 
     #[test]

From 39773e48d32edd76d98b7b25224db2b6d24937be Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Mon, 29 May 2023 21:42:24 +0200
Subject: [PATCH 020/967] Remove superfluous command description pruning for
 keymap infobox:

Exist under the wrong (possibly just outdated) assumption that command
descriptions are written with their `KeyTrie` name prefixed
---
 helix-term/src/keymap.rs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 79d6b46a7..f5626ee86 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -102,13 +102,6 @@ impl KeyTrieNode {
                 .position(|&k| k == *keys.iter().next().unwrap())
                 .unwrap()
         });
-        let prefix = format!("{} ", self.name());
-        if body.iter().all(|(desc, _)| desc.starts_with(&prefix)) {
-            body = body
-                .into_iter()
-                .map(|(desc, keys)| (desc.strip_prefix(&prefix).unwrap(), keys))
-                .collect();
-        }
         Info::from_keymap(self.name(), body)
     }
 }

From 3a0892f793a0dbf1f99f5b7e6fb23cdff68fb519 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Mon, 29 May 2023 22:22:15 +0200
Subject: [PATCH 021/967] Exclude config no_op bindings in command palette.

---
 helix-term/src/keymap.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index f5626ee86..b5f711352 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -255,15 +255,12 @@ impl Keymap {
         // recursively visit all nodes in keymap
         fn map_node(cmd_map: &mut ReverseKeymap, node: &KeyTrie, keys: &mut Vec<KeyEvent>) {
             match node {
-                KeyTrie::MappableCommand(cmd) => match cmd {
-                    MappableCommand::Typable { name, .. } => {
+                KeyTrie::MappableCommand(cmd) => {
+                    let name = cmd.name();
+                    if name != "no_op" {
                         cmd_map.entry(name.into()).or_default().push(keys.clone())
                     }
-                    MappableCommand::Static { name, .. } => cmd_map
-                        .entry(name.to_string())
-                        .or_default()
-                        .push(keys.clone()),
-                },
+                }
                 KeyTrie::Node(next) => {
                     for (key, trie) in &next.map {
                         keys.push(*key);

From 19326d23d15f5e7a1df61249d071e835a28905ed Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Mon, 29 May 2023 22:01:45 +0200
Subject: [PATCH 022/967] Keymap infobox: Idiomatic body tuple.

Does not change any behavior other than making the tuple slightly
more idiomatic.  Keymap infobox shows key events, then the respective
description. This commit makes sure that order is used from the get go,
rather than flipping it midway.
---
 helix-term/src/keymap.rs | 10 +++++-----
 helix-view/src/info.rs   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index b5f711352..b9e0ec1d0 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -77,7 +77,7 @@ impl KeyTrieNode {
     }
 
     pub fn infobox(&self) -> Info {
-        let mut body: Vec<(&str, BTreeSet<KeyEvent>)> = Vec::with_capacity(self.len());
+        let mut body: Vec<(BTreeSet<KeyEvent>, &str)> = Vec::with_capacity(self.len());
         for (&key, trie) in self.iter() {
             let desc = match trie {
                 KeyTrie::MappableCommand(cmd) => {
@@ -89,14 +89,14 @@ impl KeyTrieNode {
                 KeyTrie::Node(n) => n.name(),
                 KeyTrie::Sequence(_) => "[Multiple commands]",
             };
-            match body.iter().position(|(d, _)| d == &desc) {
+            match body.iter().position(|(_, d)| d == &desc) {
                 Some(pos) => {
-                    body[pos].1.insert(key);
+                    body[pos].0.insert(key);
                 }
-                None => body.push((desc, BTreeSet::from([key]))),
+                None => body.push((BTreeSet::from([key]), desc)),
             }
         }
-        body.sort_unstable_by_key(|(_, keys)| {
+        body.sort_unstable_by_key(|(keys, _)| {
             self.order
                 .iter()
                 .position(|&k| k == *keys.iter().next().unwrap())
diff --git a/helix-view/src/info.rs b/helix-view/src/info.rs
index 3080cf8e1..eced78e10 100644
--- a/helix-view/src/info.rs
+++ b/helix-view/src/info.rs
@@ -55,10 +55,10 @@ impl Info {
         }
     }
 
-    pub fn from_keymap(title: &str, body: Vec<(&str, BTreeSet<KeyEvent>)>) -> Self {
+    pub fn from_keymap(title: &str, body: Vec<(BTreeSet<KeyEvent>, &str)>) -> Self {
         let body: Vec<_> = body
             .into_iter()
-            .map(|(desc, events)| {
+            .map(|(events, desc)| {
                 let events = events.iter().map(ToString::to_string).collect::<Vec<_>>();
                 (events.join(", "), desc)
             })

From 3d0bc720994a404ba316562621dd186e3efe98c5 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Sat, 3 Jun 2023 10:37:06 +0200
Subject: [PATCH 023/967] Place `Info::from_keymap()` contents in
 `keymap.infobox()`:

This makes it easier later control the order in which the key events
are presented.
---
 helix-term/src/keymap.rs | 10 +++++++++-
 helix-view/src/info.rs   | 15 +--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index b9e0ec1d0..973786d53 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -102,7 +102,15 @@ impl KeyTrieNode {
                 .position(|&k| k == *keys.iter().next().unwrap())
                 .unwrap()
         });
-        Info::from_keymap(self.name(), body)
+
+        let body: Vec<_> = body
+            .into_iter()
+            .map(|(events, desc)| {
+                let events = events.iter().map(ToString::to_string).collect::<Vec<_>>();
+                (events.join(", "), desc)
+            })
+            .collect();
+        Info::new(self.name(), &body)
     }
 }
 
diff --git a/helix-view/src/info.rs b/helix-view/src/info.rs
index eced78e10..1503e855e 100644
--- a/helix-view/src/info.rs
+++ b/helix-view/src/info.rs
@@ -1,6 +1,5 @@
-use crate::input::KeyEvent;
 use helix_core::{register::Registers, unicode::width::UnicodeWidthStr};
-use std::{collections::BTreeSet, fmt::Write};
+use std::fmt::Write;
 
 #[derive(Debug)]
 /// Info box used in editor. Rendering logic will be in other crate.
@@ -55,18 +54,6 @@ impl Info {
         }
     }
 
-    pub fn from_keymap(title: &str, body: Vec<(BTreeSet<KeyEvent>, &str)>) -> Self {
-        let body: Vec<_> = body
-            .into_iter()
-            .map(|(events, desc)| {
-                let events = events.iter().map(ToString::to_string).collect::<Vec<_>>();
-                (events.join(", "), desc)
-            })
-            .collect();
-
-        Self::new(title, &body)
-    }
-
     pub fn from_registers(registers: &Registers) -> Self {
         let body: Vec<_> = registers
             .inner()

From eda4c79f2f9e8383bda1ccc995c02223904f8be1 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Sat, 3 Jun 2023 10:46:59 +0200
Subject: [PATCH 024/967] Remove pub keymap.name();

`keymap.name` is only used internally.
---
 helix-term/src/keymap.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 973786d53..e0934f76b 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -52,10 +52,6 @@ impl KeyTrieNode {
         }
     }
 
-    pub fn name(&self) -> &str {
-        &self.name
-    }
-
     /// Merge another Node in. Leaves and subnodes from the other node replace
     /// corresponding keyevent in self, except when both other and self have
     /// subnodes for same key. In that case the merge is recursive.
@@ -86,7 +82,7 @@ impl KeyTrieNode {
                     }
                     cmd.doc()
                 }
-                KeyTrie::Node(n) => n.name(),
+                KeyTrie::Node(n) => &n.name,
                 KeyTrie::Sequence(_) => "[Multiple commands]",
             };
             match body.iter().position(|(_, d)| d == &desc) {
@@ -110,7 +106,7 @@ impl KeyTrieNode {
                 (events.join(", "), desc)
             })
             .collect();
-        Info::new(self.name(), &body)
+        Info::new(&self.name, &body)
     }
 }
 

From b8563685ec44fd6958514f478d879ba785e916ad Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Sat, 3 Jun 2023 10:59:54 +0200
Subject: [PATCH 025/967] Move `keymap.reverse_keymap()` to `Keytrie`:

The plan is let `Keymaps` simply store `KeyTrie`s, as the `Keymap(Keytrie)` wrapping serves little to no purpose.
---
 helix-term/src/keymap.rs | 52 ++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index e0934f76b..ea2937bb4 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -195,6 +195,32 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
 }
 
 impl KeyTrie {
+    pub fn reverse_map(&self) -> ReverseKeymap {
+        // recursively visit all nodes in keymap
+        fn map_node(cmd_map: &mut ReverseKeymap, node: &KeyTrie, keys: &mut Vec<KeyEvent>) {
+            match node {
+                KeyTrie::MappableCommand(cmd) => {
+                    let name = cmd.name();
+                    if name != "no_op" {
+                        cmd_map.entry(name.into()).or_default().push(keys.clone())
+                    }
+                }
+                KeyTrie::Node(next) => {
+                    for (key, trie) in &next.map {
+                        keys.push(*key);
+                        map_node(cmd_map, trie, keys);
+                        keys.pop();
+                    }
+                }
+                KeyTrie::Sequence(_) => {}
+            };
+        }
+
+        let mut res = HashMap::new();
+        map_node(&mut res, self, &mut Vec::new());
+        res
+    }
+
     pub fn node(&self) -> Option<&KeyTrieNode> {
         match *self {
             KeyTrie::Node(ref node) => Some(node),
@@ -254,32 +280,6 @@ impl Keymap {
     pub fn new(root: KeyTrie) -> Self {
         Keymap(root)
     }
-
-    pub fn reverse_map(&self) -> ReverseKeymap {
-        // recursively visit all nodes in keymap
-        fn map_node(cmd_map: &mut ReverseKeymap, node: &KeyTrie, keys: &mut Vec<KeyEvent>) {
-            match node {
-                KeyTrie::MappableCommand(cmd) => {
-                    let name = cmd.name();
-                    if name != "no_op" {
-                        cmd_map.entry(name.into()).or_default().push(keys.clone())
-                    }
-                }
-                KeyTrie::Node(next) => {
-                    for (key, trie) in &next.map {
-                        keys.push(*key);
-                        map_node(cmd_map, trie, keys);
-                        keys.pop();
-                    }
-                }
-                KeyTrie::Sequence(_) => {}
-            };
-        }
-
-        let mut res = HashMap::new();
-        map_node(&mut res, &self.0, &mut Vec::new());
-        res
-    }
 }
 
 impl Deref for Keymap {

From 9926c2d292712f38615cc2cb0ca75c1e8ef3bed9 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Sat, 3 Jun 2023 11:29:08 +0200
Subject: [PATCH 026/967] Remove Keymap(KeyTrie) and simply use KeyTrie.

---
 helix-term/src/config.rs         | 15 ++++----
 helix-term/src/keymap.rs         | 60 ++++++++------------------------
 helix-term/src/keymap/default.rs | 10 +++---
 helix-term/src/keymap/macros.rs  |  5 ++-
 4 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs
index 9776ef7a4..f37b03ec7 100644
--- a/helix-term/src/config.rs
+++ b/helix-term/src/config.rs
@@ -1,5 +1,5 @@
 use crate::keymap;
-use crate::keymap::{merge_keys, Keymap};
+use crate::keymap::{merge_keys, KeyTrie};
 use helix_loader::merge_toml_values;
 use helix_view::document::Mode;
 use serde::Deserialize;
@@ -12,7 +12,7 @@ use toml::de::Error as TomlError;
 #[derive(Debug, Clone, PartialEq)]
 pub struct Config {
     pub theme: Option<String>,
-    pub keys: HashMap<Mode, Keymap>,
+    pub keys: HashMap<Mode, KeyTrie>,
     pub editor: helix_view::editor::Config,
 }
 
@@ -20,7 +20,7 @@ pub struct Config {
 #[serde(deny_unknown_fields)]
 pub struct ConfigRaw {
     pub theme: Option<String>,
-    pub keys: Option<HashMap<Mode, Keymap>>,
+    pub keys: Option<HashMap<Mode, KeyTrie>>,
     pub editor: Option<toml::Value>,
 }
 
@@ -138,7 +138,6 @@ mod tests {
     #[test]
     fn parsing_keymaps_config_file() {
         use crate::keymap;
-        use crate::keymap::Keymap;
         use helix_core::hashmap;
         use helix_view::document::Mode;
 
@@ -155,13 +154,13 @@ mod tests {
         merge_keys(
             &mut keys,
             hashmap! {
-                Mode::Insert => Keymap::new(keymap!({ "Insert mode"
+                Mode::Insert => keymap!({ "Insert mode"
                     "y" => move_line_down,
                     "S-C-a" => delete_selection,
-                })),
-                Mode::Normal => Keymap::new(keymap!({ "Normal mode"
+                }),
+                Mode::Normal => keymap!({ "Normal mode"
                     "A-F12" => move_next_word_end,
-                })),
+                }),
             },
         );
 
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index ea2937bb4..5a72a35a5 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -269,41 +269,11 @@ pub enum KeymapResult {
     Cancelled(Vec<KeyEvent>),
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize)]
-#[serde(transparent)]
-pub struct Keymap(KeyTrie);
-
 /// A map of command names to keybinds that will execute the command.
 pub type ReverseKeymap = HashMap<String, Vec<Vec<KeyEvent>>>;
 
-impl Keymap {
-    pub fn new(root: KeyTrie) -> Self {
-        Keymap(root)
-    }
-}
-
-impl Deref for Keymap {
-    type Target = KeyTrie;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Keymap {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl Default for Keymap {
-    fn default() -> Self {
-        Self(KeyTrie::Node(KeyTrieNode::default()))
-    }
-}
-
 pub struct Keymaps {
-    pub map: Box<dyn DynAccess<HashMap<Mode, Keymap>>>,
+    pub map: Box<dyn DynAccess<HashMap<Mode, KeyTrie>>>,
     /// Stores pending keys waiting for the next key. This is relative to a
     /// sticky node if one is in use.
     state: Vec<KeyEvent>,
@@ -312,7 +282,7 @@ pub struct Keymaps {
 }
 
 impl Keymaps {
-    pub fn new(map: Box<dyn DynAccess<HashMap<Mode, Keymap>>>) -> Self {
+    pub fn new(map: Box<dyn DynAccess<HashMap<Mode, KeyTrie>>>) -> Self {
         Self {
             map,
             state: Vec::new(),
@@ -320,7 +290,7 @@ impl Keymaps {
         }
     }
 
-    pub fn map(&self) -> DynGuard<HashMap<Mode, Keymap>> {
+    pub fn map(&self) -> DynGuard<HashMap<Mode, KeyTrie>> {
         self.map.load()
     }
 
@@ -352,7 +322,7 @@ impl Keymaps {
         let first = self.state.get(0).unwrap_or(&key);
         let trie_node = match self.sticky {
             Some(ref trie) => Cow::Owned(KeyTrie::Node(trie.clone())),
-            None => Cow::Borrowed(&keymap.0),
+            None => Cow::Borrowed(keymap),
         };
 
         let trie = match trie_node.search(&[*first]) {
@@ -395,9 +365,13 @@ impl Default for Keymaps {
 }
 
 /// Merge default config keys with user overwritten keys for custom user config.
-pub fn merge_keys(dst: &mut HashMap<Mode, Keymap>, mut delta: HashMap<Mode, Keymap>) {
+pub fn merge_keys(dst: &mut HashMap<Mode, KeyTrie>, mut delta: HashMap<Mode, KeyTrie>) {
     for (mode, keys) in dst {
-        keys.merge_nodes(delta.remove(mode).unwrap_or_default().0)
+        keys.merge_nodes(
+            delta
+                .remove(mode)
+                .unwrap_or_else(|| KeyTrie::Node(KeyTrieNode::default())),
+        )
     }
 }
 
@@ -426,8 +400,7 @@ mod tests {
     #[test]
     fn merge_partial_keys() {
         let keymap = hashmap! {
-            Mode::Normal => Keymap::new(
-                keymap!({ "Normal mode"
+            Mode::Normal => keymap!({ "Normal mode"
                     "i" => normal_mode,
                     "无" => insert_mode,
                     "z" => jump_backward,
@@ -436,7 +409,6 @@ mod tests {
                         "g" => delete_char_forward,
                     },
                 })
-            )
         };
         let mut merged_keyamp = default();
         merge_keys(&mut merged_keyamp, keymap.clone());
@@ -501,8 +473,7 @@ mod tests {
     #[test]
     fn order_should_be_set() {
         let keymap = hashmap! {
-            Mode::Normal => Keymap::new(
-                keymap!({ "Normal mode"
+            Mode::Normal => keymap!({ "Normal mode"
                     "space" => { ""
                         "s" => { ""
                             "v" => vsplit,
@@ -510,7 +481,6 @@ mod tests {
                         },
                     },
                 })
-            )
         };
         let mut merged_keyamp = default();
         merge_keys(&mut merged_keyamp, keymap.clone());
@@ -553,7 +523,7 @@ mod tests {
             },
             "j" | "k" => move_line_down,
         });
-        let keymap = Keymap::new(normal_mode);
+        let keymap = normal_mode;
         let mut reverse_map = keymap.reverse_map();
 
         // sort keybindings in order to have consistent tests
@@ -601,7 +571,7 @@ mod tests {
             modifiers: KeyModifiers::NONE,
         };
 
-        let expectation = Keymap::new(KeyTrie::Node(KeyTrieNode::new(
+        let expectation = KeyTrie::Node(KeyTrieNode::new(
             "",
             hashmap! {
                 key => KeyTrie::Sequence(vec!{
@@ -618,7 +588,7 @@ mod tests {
                 })
             },
             vec![key],
-        )));
+        ));
 
         assert_eq!(toml::from_str(keys), Ok(expectation));
     }
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index d80ab1ffb..c84c616c6 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -1,10 +1,10 @@
 use std::collections::HashMap;
 
 use super::macros::keymap;
-use super::{Keymap, Mode};
+use super::{KeyTrie, Mode};
 use helix_core::hashmap;
 
-pub fn default() -> HashMap<Mode, Keymap> {
+pub fn default() -> HashMap<Mode, KeyTrie> {
     let normal = keymap!({ "Normal mode"
         "h" | "left" => move_char_left,
         "j" | "down" => move_visual_line_down,
@@ -380,8 +380,8 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "end" => goto_line_end_newline,
     });
     hashmap!(
-        Mode::Normal => Keymap::new(normal),
-        Mode::Select => Keymap::new(select),
-        Mode::Insert => Keymap::new(insert),
+        Mode::Normal => normal,
+        Mode::Select => select,
+        Mode::Insert => insert,
     )
 }
diff --git a/helix-term/src/keymap/macros.rs b/helix-term/src/keymap/macros.rs
index b2822069c..15d2aa53b 100644
--- a/helix-term/src/keymap/macros.rs
+++ b/helix-term/src/keymap/macros.rs
@@ -62,12 +62,11 @@ macro_rules! alt {
     };
 }
 
-/// Macro for defining the root of a `Keymap` object. Example:
+/// Macro for defining a `KeyTrie`. Example:
 ///
 /// ```
 /// # use helix_core::hashmap;
 /// # use helix_term::keymap;
-/// # use helix_term::keymap::Keymap;
 /// let normal_mode = keymap!({ "Normal mode"
 ///     "i" => insert_mode,
 ///     "g" => { "Goto"
@@ -76,7 +75,7 @@ macro_rules! alt {
 ///     },
 ///     "j" | "down" => move_line_down,
 /// });
-/// let keymap = Keymap::new(normal_mode);
+/// let keymap = normal_mode;
 /// ```
 #[macro_export]
 macro_rules! keymap {

From 3e927ac5787e9870e79129b9cfa4a9ac482c168e Mon Sep 17 00:00:00 2001
From: Jens Getreu <getreu@web.de>
Date: Wed, 7 Jun 2023 11:49:39 +0300
Subject: [PATCH 027/967] Autumn theme: style "soft-wrap indicator" +
 maintenance (#7229)

Co-authored-by: Jens Getreu <getreu@getreu@web.de>
---
 runtime/themes/autumn.toml       | 19 ++++++++++++-------
 runtime/themes/autumn_night.toml |  5 +++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index 4474b0d41..23af7d6f5 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -22,8 +22,9 @@
 "ui.statusline.insert" = {fg = "my_black", bg = "my_gray6", modifiers = ["bold"]}
 "ui.statusline.normal" = {fg = "my_gray7", bg = "my_gray2"}
 "ui.statusline.select" = {fg = "my_gray7", bg = "my_black", modifiers = ["bold"]}
-"ui.cursor" = { fg = "my_gray6", modifiers = ["reversed"] }
+"ui.cursor" = { bg = "my_white4", fg = "my_black" }
 "ui.cursor.primary" = { fg = "my_white", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "my_white", modifiers = ["bold"], underline = { style = "double_line", color = "my_white" }, bg = "my_black"}
 "ui.cursorline.primary" = { bg = "my_black" }
 "ui.cursorline.secondary" = { bg = "my_black" }
 "ui.highlight.frameline" = { bg = "#8b6904" }
@@ -36,7 +37,6 @@
 "constant" = "my_white3"
 "attribute" = "my_turquoise"
 "type" = { fg = "my_white3", modifiers = ["italic"] }
-"ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] }
 "string"  = "my_green"
 "variable.other.member" = "my_brown"
 "constant.character.escape" = "my_turquoise"
@@ -47,9 +47,10 @@
 "label" = "my_red"
 "namespace" = "my_white3"
 "ui.help" = { fg = "my_gray7", bg = "my_gray2" }
+"ui.virtual.wrap" = "my_gray4"
 "ui.virtual.whitespace" = { fg = "my_gray6" }
 "ui.virtual.ruler" = { bg = "my_gray1" }
-"ui.virtual.inlay-hint" = { fg = "my_gray4", modifiers = ["normal"] }
+"ui.virtual.inlay-hint" = { fg = "my_gray4", bg="my_black", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.parameter" = { fg = "my_gray4", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.type" = { fg = "my_gray4", modifiers = ["italic"] }
 
@@ -67,7 +68,10 @@
 "diff.delta" = "my_gray5"
 "diff.minus" = "my_red"
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
+"diagnostic.hint" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
+"diagnostic.info" = { underline = { style = "line" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "my_yellow2" } }
 "diagnostic.error" = { underline = { style = "curl", color = "my_red" } }
 "ui.gutter" = { bg = "my_gray0" }
 "hint" = "my_gray6"
@@ -78,18 +82,19 @@
 
 [palette]
 my_black      = "#212121" # Cursorline
-my_gray0      = "#262626" # Default Background
+my_gray0      = "#232323" # Default Background
 my_gray1      = "#2b2b2b" # Ruler
 my_gray2      = "#323232" # Lighter Background (Used for status bars, line number and folding marks)
 my_gray3      = "#404040" # Selection Background
-my_gray4      = "#6a6a6a" # Inlay-hint
-my_gray5      = "#848484" # Comments, Invisibles, Line Highlighting
+my_gray4      = "#646f69" # Inlay-hint
+my_gray5      = "#646f69" # Comments, Invisibles, Line Highlighting
 my_gray6      = "#a8a8a8" # Dark Foreground (Used for status bars)
 my_gray7      = "#c8c8c8" # Light Foreground
 my_gray8      = "#e8e8e8" # Light Background
 my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
 my_white3     = "#F3F2CC" # Classes, Markup Bold, Search Text Background
+my_white4     = "#7e7d6a" # Cursor match
 my_turquoise  = "#86c1b9" # Support, Regular Expressions, Escape Characters
 my_turquoise2 = "#72a59e" # URL
 my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted
diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml
index 70045f42d..493976263 100644
--- a/runtime/themes/autumn_night.toml
+++ b/runtime/themes/autumn_night.toml
@@ -15,14 +15,15 @@ my_gray0      = "#090909" # Default Background
 my_gray1      = "#0e0e0e" # Ruler
 my_gray2      = "#1a1a1a" # Lighter Background (Used for status bars, line number and folding marks)
 my_gray3      = "#404040" # Selection Background
-my_gray4      = "#626262" # Inlay-hint
-my_gray5      = "#808080" # Comments, Invisibles, Line Highlighting
+my_gray4      = "#626C66" # Inlay-hint
+my_gray5      = "#626C66" # Comments, Invisibles, Line Highlighting
 my_gray6      = "#aaaaaa" # Dark Foreground (Used for status bars)
 my_gray7      = "#c4c4c4" # Light Foreground
 my_gray8      = "#e8e8e8" # Light Background
 my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
 my_white3     = "#F3F2CC" # Classes, Markup Bold, Search Text Background
+my_white4     = "#7e7d6a" # Secondary cursors
 my_turquoise  = "#86c1b9" # Support, Regular Expressions, Escape Characters
 my_turquoise2 = "#72a59e" # URL
 my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted

From ba691f4fb0c0ef3baf34ee5f05360dd11ac204bc Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Wed, 7 Jun 2023 12:49:52 +0400
Subject: [PATCH 028/967] Fix verilog grammar source repo and revision (#7262)

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

diff --git a/languages.toml b/languages.toml
index 219ea541f..373a8be06 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1804,7 +1804,7 @@ injection-regex = "verilog"
 
 [[grammar]]
 name = "verilog"
-source = { git = "https://github.com/andreytkachenko/tree-sitter-verilog", rev = "514d8d70593d29ef3ef667fa6b0e504ae7c977e3" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-verilog", rev = "4457145e795b363f072463e697dfe2f6973c9a52" }
 
 [[language]]
 name = "edoc"

From 204bac1706badaf562304b67a4beb63102560e40 Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Wed, 7 Jun 2023 10:50:16 +0200
Subject: [PATCH 029/967] commands(toggle): use pattern matching on the Value
 enum (#7240)

---
 helix-term/src/commands/typed.rs | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index fb285e726..824abbf4c 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -8,6 +8,7 @@ use super::*;
 use helix_core::{encoding, shellwords::Shellwords};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
+use serde_json::Value;
 use ui::completers::{self, Completer};
 
 #[derive(Clone)]
@@ -1764,7 +1765,7 @@ fn set_option(
 
     *value = if value.is_string() {
         // JSON strings require quotes, so we can't .parse() directly
-        serde_json::Value::String(arg.to_string())
+        Value::String(arg.to_string())
     } else {
         arg.parse().map_err(field_error)?
     };
@@ -1800,29 +1801,21 @@ fn toggle_option(
     let pointer = format!("/{}", key.replace('.', "/"));
     let value = config.pointer_mut(&pointer).ok_or_else(key_error)?;
 
-    *value = match value.as_bool() {
-        Some(value) => {
+    *value = match value {
+        Value::Bool(ref value) => {
             ensure!(
                 args.len() == 1,
                 "Bad arguments. For boolean configurations use: `:toggle key`"
             );
-            serde_json::Value::Bool(!value)
+            Value::Bool(!value)
         }
-        None => {
+        Value::String(ref value) => {
             ensure!(
                 args.len() > 2,
-                "Bad arguments. For non-boolean configurations use: `:toggle key val1 val2 ...`",
-            );
-            ensure!(
-                value.is_string(),
-                "Bad configuration. Cannot cycle non-string configurations"
+                "Bad arguments. For string configurations use: `:toggle key val1 val2 ...`",
             );
 
-            let value = value
-                .as_str()
-                .expect("programming error: should have been ensured before");
-
-            serde_json::Value::String(
+            Value::String(
                 args[1..]
                     .iter()
                     .skip_while(|e| *e != value)
@@ -1831,6 +1824,9 @@ fn toggle_option(
                     .to_string(),
             )
         }
+        Value::Null | Value::Object(_) | Value::Array(_) | Value::Number(_) => {
+            anyhow::bail!("Configuration {key} does not support toggle yet")
+        }
     };
 
     let status = format!("'{key}' is now set to {value}");

From 77e9a22aff13a12cb17d67dbd1bc47aa5d5072f4 Mon Sep 17 00:00:00 2001
From: Ilya Sovtsov <70143303+bo1led-owl@users.noreply.github.com>
Date: Wed, 7 Jun 2023 12:51:29 +0400
Subject: [PATCH 030/967] Add check for a non-zero value for tab width (#7178)

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

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index c2dd33106..2a5bb974d 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -48,6 +48,21 @@ where
         .transpose()
 }
 
+fn deserialize_tab_width<'de, D>(deserializer: D) -> Result<usize, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    usize::deserialize(deserializer).and_then(|n| {
+        if n > 0 && n <= 16 {
+            Ok(n)
+        } else {
+            Err(serde::de::Error::custom(
+                "tab width must be a value from 1 to 16 inclusive",
+            ))
+        }
+    })
+}
+
 pub fn deserialize_auto_pairs<'de, D>(deserializer: D) -> Result<Option<AutoPairs>, D::Error>
 where
     D: serde::Deserializer<'de>,
@@ -424,6 +439,7 @@ pub struct DebuggerQuirks {
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct IndentationConfiguration {
+    #[serde(deserialize_with = "deserialize_tab_width")]
     pub tab_width: usize,
     pub unit: String,
 }

From 0e083497a5bf24a51ffe2430dcf3a1cca7ad0f9a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 7 Jun 2023 09:55:16 -0500
Subject: [PATCH 031/967] Persist register selection in pending keymaps

Previously the register selection (via `"`) would be lost in the middle
of any key sequence longer than one key. For example, `<space>f` would
clear the register selection after the `<space>` making it inaccessible
for the `file_picker` command.

This behavior does not currently have any effect in the default keymap
but might affect custom keymaps. This change aligns the behavior of the
register with count. Making this change allows propagating the register
to the `command_palette` (see the child commit) or other pickers should
we decide to use registers in those in the future. (Interactive global
search for example.)
---
 helix-term/src/ui/editor.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 43b5d1af6..4f7916ffd 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -943,6 +943,8 @@ impl EditorView {
                 self.handle_keymap_event(mode, cxt, event);
                 if self.keymaps.pending().is_empty() {
                     cxt.editor.count = None
+                } else {
+                    cxt.editor.selected_register = cxt.register.take();
                 }
             }
         }

From b3949979ae72a7af84c34e69d2a2e17023bb8dbc Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 7 Jun 2023 10:06:26 -0500
Subject: [PATCH 032/967] Propagate the count and register to command palette
 commands

Previously a count or register selection would be lost while opening
the command palette. This change allows using a register selection or
count in any command chosen from the command palette.
---
 helix-term/src/commands.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1e89fe1cb..0c24c6933 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2705,6 +2705,9 @@ impl ui::menu::Item for MappableCommand {
 }
 
 pub fn command_palette(cx: &mut Context) {
+    let register = cx.register;
+    let count = cx.count;
+
     cx.callback = Some(Box::new(
         move |compositor: &mut Compositor, cx: &mut compositor::Context| {
             let keymap = compositor.find::<ui::EditorView>().unwrap().keymaps.map()
@@ -2722,8 +2725,8 @@ pub fn command_palette(cx: &mut Context) {
 
             let picker = Picker::new(commands, keymap, move |cx, command, _action| {
                 let mut ctx = Context {
-                    register: None,
-                    count: std::num::NonZeroUsize::new(1),
+                    register,
+                    count,
                     editor: cx.editor,
                     callback: None,
                     on_next_key_callback: None,

From 2f9b63999fb9d7b8e2ba7d728faf0dc37566987b Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Wed, 7 Jun 2023 23:19:55 +0200
Subject: [PATCH 033/967] Break long sentence in book configuration footnote
 (#7279)

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

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 253a07269..5df63207a 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -131,8 +131,8 @@ The following statusline elements can be configured:
 | `goto-reference-include-declaration` | Include declaration in the goto references popup. | `true`  |
 
 [^1]: By default, a progress spinner is shown in the statusline beside the file path.
-[^2]: You may also have to activate them in the LSP config for them to appear, not just in Helix.
-      Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances, please report any bugs you see so we can fix them!
+
+[^2]: You may also have to activate them in the LSP config for them to appear, not just in Helix. Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances. Please report any bugs you see so we can fix them!
 
 ### `[editor.cursor-shape]` Section
 

From 352d1574a63b5ecd9ec7fdd8c4ae8e4eedbd4cf3 Mon Sep 17 00:00:00 2001
From: vwkd <33468089+vwkd@users.noreply.github.com>
Date: Thu, 8 Jun 2023 00:41:35 +0200
Subject: [PATCH 034/967] add move_prev_long_word_end and
 extend_prev_long_word_end (#6905)

---
 helix-core/src/movement.rs | 107 +++++++++++++++++++++++++++++++++++--
 helix-term/src/commands.rs |  10 ++++
 2 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index b44d149fb..003a1f370 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -177,6 +177,10 @@ pub fn move_prev_word_start(slice: RopeSlice, range: Range, count: usize) -> Ran
     word_move(slice, range, count, WordMotionTarget::PrevWordStart)
 }
 
+pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
+    word_move(slice, range, count, WordMotionTarget::PrevWordEnd)
+}
+
 pub fn move_next_long_word_start(slice: RopeSlice, range: Range, count: usize) -> Range {
     word_move(slice, range, count, WordMotionTarget::NextLongWordStart)
 }
@@ -189,8 +193,8 @@ pub fn move_prev_long_word_start(slice: RopeSlice, range: Range, count: usize) -
     word_move(slice, range, count, WordMotionTarget::PrevLongWordStart)
 }
 
-pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
-    word_move(slice, range, count, WordMotionTarget::PrevWordEnd)
+pub fn move_prev_long_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
+    word_move(slice, range, count, WordMotionTarget::PrevLongWordEnd)
 }
 
 fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {
@@ -199,6 +203,7 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar
         WordMotionTarget::PrevWordStart
             | WordMotionTarget::PrevLongWordStart
             | WordMotionTarget::PrevWordEnd
+            | WordMotionTarget::PrevLongWordEnd
     );
 
     // Special-case early-out.
@@ -377,6 +382,7 @@ pub enum WordMotionTarget {
     NextLongWordStart,
     NextLongWordEnd,
     PrevLongWordStart,
+    PrevLongWordEnd,
 }
 
 pub trait CharHelpers {
@@ -393,6 +399,7 @@ impl CharHelpers for Chars<'_> {
             WordMotionTarget::PrevWordStart
                 | WordMotionTarget::PrevLongWordStart
                 | WordMotionTarget::PrevWordEnd
+                | WordMotionTarget::PrevLongWordEnd
         );
 
         // Reverse the iterator if needed for the motion direction.
@@ -479,7 +486,7 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo
             is_word_boundary(prev_ch, next_ch)
                 && (!prev_ch.is_whitespace() || char_is_line_ending(next_ch))
         }
-        WordMotionTarget::NextLongWordStart => {
+        WordMotionTarget::NextLongWordStart | WordMotionTarget::PrevLongWordEnd => {
             is_long_word_boundary(prev_ch, next_ch)
                 && (char_is_line_ending(next_ch) || !next_ch.is_whitespace())
         }
@@ -1445,6 +1452,100 @@ mod test {
         }
     }
 
+    #[test]
+    fn test_behaviour_when_moving_to_end_of_prev_long_words() {
+        let tests = [
+            (
+                "Basic backward motion from the middle of a word",
+                vec![(1, Range::new(3, 3), Range::new(4, 0))],
+            ),
+            ("Starting from after boundary retreats the anchor",
+                vec![(1, Range::new(0, 9), Range::new(8, 0))],
+            ),
+            (
+                "Jump    to end of a word succeeded by whitespace",
+                vec![(1, Range::new(10, 10), Range::new(10, 4))],
+            ),
+            (
+                "    Jump to start of line from end of word preceded by whitespace",
+                vec![(1, Range::new(3, 4), Range::new(4, 0))],
+            ),
+            ("Previous anchor is irrelevant for backward motions",
+                vec![(1, Range::new(12, 5), Range::new(6, 0))]),
+            (
+                "    Starting from whitespace moves to first space in sequence",
+                vec![(1, Range::new(0, 4), Range::new(4, 0))],
+            ),
+            ("Identifiers_with_underscores are considered a single word",
+                vec![(1, Range::new(0, 20), Range::new(20, 0))]),
+            (
+                "Jumping\n    \nback through a newline selects whitespace",
+                vec![(1, Range::new(0, 13), Range::new(12, 8))],
+            ),
+            (
+                "Jumping to start of word from the end selects the word",
+                vec![(1, Range::new(6, 7), Range::new(7, 0))],
+            ),
+            (
+                "alphanumeric.!,and.?=punctuation are treated exactly the same",
+                vec![(1, Range::new(29, 30), Range::new(30, 0))],
+            ),
+            (
+                "...   ... punctuation and spaces behave as expected",
+                vec![
+                    (1, Range::new(0, 10), Range::new(9, 3)),
+                    (1, Range::new(10, 6), Range::new(7, 3)),
+                ],
+            ),
+            (".._.._ punctuation is joined by underscores into a single block",
+                vec![(1, Range::new(0, 6), Range::new(6, 0))]),
+            (
+                "Newlines\n\nare bridged seamlessly.",
+                vec![(1, Range::new(0, 10), Range::new(8, 0))],
+            ),
+            (
+                "Jumping    \n\n\n\n\nback from within a newline group selects previous block",
+                vec![(1, Range::new(0, 13), Range::new(11, 7))],
+            ),
+            (
+                "Failed motions do not modify the range",
+                vec![(0, Range::new(3, 0), Range::new(3, 0))],
+            ),
+            (
+                "Multiple motions at once resolve correctly",
+                vec![(3, Range::new(19, 19), Range::new(8, 0))],
+            ),
+            (
+                "Excessive motions are performed partially",
+                vec![(999, Range::new(40, 40), Range::new(9, 0))],
+            ),
+            (
+                "", // Edge case of moving backwards in empty string
+                vec![(1, Range::new(0, 0), Range::new(0, 0))],
+            ),
+            (
+                "\n\n\n\n\n", // Edge case of moving backwards in all newlines
+                vec![(1, Range::new(5, 5), Range::new(0, 0))],
+            ),
+            ("   \n   \nJumping back through alternated space blocks and newlines selects the space blocks",
+                vec![
+                    (1, Range::new(0, 8), Range::new(7, 4)),
+                    (1, Range::new(7, 4), Range::new(3, 0)),
+                ]),
+            ("ヒーリ..クス multibyte characters behave as normal characters, including when interacting with punctuation",
+                vec![
+                    (1, Range::new(0, 8), Range::new(7, 0)),
+                ]),
+        ];
+
+        for (sample, scenario) in tests {
+            for (count, begin, expected_end) in scenario.into_iter() {
+                let range = move_prev_long_word_end(Rope::from(sample).slice(..), begin, count);
+                assert_eq!(range, expected_end, "Case failed: [{}]", sample);
+            }
+        }
+    }
+
     #[test]
     fn test_behaviour_when_moving_to_prev_paragraph_single() {
         let tests = [
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0c24c6933..99f50b041 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -247,6 +247,7 @@ impl MappableCommand {
         move_next_long_word_start, "Move to start of next long word",
         move_prev_long_word_start, "Move to start of previous long word",
         move_next_long_word_end, "Move to end of next long word",
+        move_prev_long_word_end, "Move to end of previous long word",
         extend_next_word_start, "Extend to start of next word",
         extend_prev_word_start, "Extend to start of previous word",
         extend_next_word_end, "Extend to end of next word",
@@ -254,6 +255,7 @@ impl MappableCommand {
         extend_next_long_word_start, "Extend to start of next long word",
         extend_prev_long_word_start, "Extend to start of previous long word",
         extend_next_long_word_end, "Extend to end of next long word",
+        extend_prev_long_word_end, "Extend to end of prev long word",
         find_till_char, "Move till next occurrence of char",
         find_next_char, "Move to next occurrence of char",
         extend_till_char, "Extend till next occurrence of char",
@@ -1067,6 +1069,10 @@ fn move_prev_long_word_start(cx: &mut Context) {
     move_word_impl(cx, movement::move_prev_long_word_start)
 }
 
+fn move_prev_long_word_end(cx: &mut Context) {
+    move_word_impl(cx, movement::move_prev_long_word_end)
+}
+
 fn move_next_long_word_end(cx: &mut Context) {
     move_word_impl(cx, movement::move_next_long_word_end)
 }
@@ -1224,6 +1230,10 @@ fn extend_prev_long_word_start(cx: &mut Context) {
     extend_word_impl(cx, movement::move_prev_long_word_start)
 }
 
+fn extend_prev_long_word_end(cx: &mut Context) {
+    extend_word_impl(cx, movement::move_prev_long_word_end)
+}
+
 fn extend_next_long_word_end(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_long_word_end)
 }

From d324feb07244e0649229b845a92f0d0b8a0ecaf4 Mon Sep 17 00:00:00 2001
From: Christoph Sax <xasc@users.noreply.github.com>
Date: Thu, 8 Jun 2023 01:01:25 +0200
Subject: [PATCH 035/967] Add support for language t32 (#7140)

Co-authored-by: Christoph Sax <christoph.sax@mailbox.org>
---
 book/src/generated/lang-support.md |   1 +
 languages.toml                     |  13 +++
 runtime/queries/t32/highlights.scm | 145 +++++++++++++++++++++++++++++
 runtime/queries/t32/injections.scm |   2 +
 4 files changed, 161 insertions(+)
 create mode 100644 runtime/queries/t32/highlights.scm
 create mode 100644 runtime/queries/t32/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index b8753d587..e77bc17bc 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -143,6 +143,7 @@
 | svelte | ✓ |  |  | `svelteserver` |
 | sway | ✓ | ✓ | ✓ | `forc` |
 | swift | ✓ |  |  | `sourcekit-lsp` |
+| t32 | ✓ |  |  |  |
 | tablegen | ✓ | ✓ | ✓ |  |
 | task | ✓ |  |  |  |
 | tfvars | ✓ |  | ✓ | `terraform-ls` |
diff --git a/languages.toml b/languages.toml
index 373a8be06..28669c553 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2605,3 +2605,16 @@ indent = { tab-width = 3, unit = "   " }
 [[grammar]]
 name = "forth"
 source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "c6fae50a17763af827604627c0fa9e4604aaac0b" }
+
+[[language]]
+name = "t32"
+scope = "source.t32"
+injection-regex = "t32"
+file-types = ["cmm", "t32"]
+roots = []
+comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "t32"
+source = { git = "https://codeberg.org/xasc/tree-sitter-t32", rev = "1dd98248b01e4a3933c1b85b58bab0875e2ba437" }
diff --git a/runtime/queries/t32/highlights.scm b/runtime/queries/t32/highlights.scm
new file mode 100644
index 000000000..c3bba8143
--- /dev/null
+++ b/runtime/queries/t32/highlights.scm
@@ -0,0 +1,145 @@
+[
+  "="
+  "^^"
+  "||"
+  "&&"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "|"
+  "^"
+  "=="
+  "!="
+  ">"
+  ">="
+  "<="
+  "<"
+  "<<"
+  ">>"
+  ".."
+  "--"
+  "++"
+  "+"
+  "-"
+  "~"
+  "!"
+  "&"
+  "->"
+  "*"
+] @operator
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+ "["
+ "]"
+] @punctuation.bracket
+
+[
+  ","
+  "."
+  ";"
+] @punctuation.delimiter
+
+; Constants
+[
+  (access_class)
+  (address)
+  (bitmask)
+  (file_handle)
+  (frequency)
+  (time)
+] @constant.builtin
+
+[
+  (float)
+  (percentage)
+] @constant.numeric.float
+
+(integer) @constant.numeric.integer
+
+(character) @constant.character
+
+; Strings
+(string) @string
+
+(path) @string.special.path
+
+(symbol) @string.special.symbol
+
+; Returns
+(
+  (command_expression
+    command: (identifier) @keyword.return)
+  (#match? @keyword.return "^[eE][nN][dD]([dD][oO])?$")
+)
+(
+  (command_expression
+    command: (identifier) @keyword.return)
+  (#match? @keyword.return "^[rR][eE][tT][uU][rR][nN]$")
+)
+
+; Subroutine calls
+(subroutine_call_expression
+  command: (identifier) @keyword
+  subroutine: (identifier) @function)
+
+; Subroutine blocks
+(subroutine_block
+  command: (identifier) @keyword
+  subroutine: (identifier) @function)
+
+(labeled_expression
+  label: (identifier) @function
+  (block))
+
+; Parameter declarations
+(parameter_declaration
+  command: (identifier) @keyword
+  (identifier)? @constant.builtin
+  macro: (macro) @variable.parameter)
+
+; Variables, constants and labels
+(macro) @variable
+(internal_c_variable) @variable
+
+(
+  (command_expression
+    command: (identifier) @keyword
+    arguments: (argument_list . (identifier) @label))
+  (#match? @keyword "^[gG][oO][tT][oO]$")
+)
+(labeled_expression
+  label: (identifier) @label)
+
+(
+ (argument_list (identifier) @constant.builtin)
+ (#match? @constant.builtin "^[%/][a-zA-Z][a-zA-Z0-9.]*$")
+)
+(argument_list
+  (identifier) @constant)
+
+; Commands
+(command_expression command: (identifier) @keyword)
+(macro_definition command: (identifier) @keyword)
+
+; Control flow
+(if_block
+  command: (identifier) @keyword.control.conditional.if)
+(else_block
+  command: (identifier) @keyword.control.control.else)
+
+(while_block
+  command: (identifier) @keyword.control.repeat.while)
+(repeat_block
+  command: (identifier) @keyword.control.loop)
+
+(call_expression
+  function: (identifier) @function)
+
+(type_identifier) @type
+(comment) @comment
diff --git a/runtime/queries/t32/injections.scm b/runtime/queries/t32/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/runtime/queries/t32/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From ef5bcd5060e6298a2deae53a7c29514d4a50a2fc Mon Sep 17 00:00:00 2001
From: broke <broke@in-fucking.space>
Date: Thu, 8 Jun 2023 01:13:08 +0200
Subject: [PATCH 036/967] theme: added gruvbox dark soft variant (#7139)

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

diff --git a/runtime/themes/gruvbox_dark_soft.toml b/runtime/themes/gruvbox_dark_soft.toml
new file mode 100644
index 000000000..6482ac12b
--- /dev/null
+++ b/runtime/themes/gruvbox_dark_soft.toml
@@ -0,0 +1,7 @@
+# Author : broke <broke@in-fucking.space>
+# The theme uses the gruvbox dark palette with soft contrast: github.com/morhetz/gruvbox
+
+inherits = "gruvbox"
+
+[palette]
+bg0 = "#32302f" # main background

From 31b8b728a2ba5585a66da4f3dab279b08bd5600a Mon Sep 17 00:00:00 2001
From: Dimitri Sabadie <dimitri.sabadie@gmail.com>
Date: Thu, 8 Jun 2023 01:13:39 +0200
Subject: [PATCH 037/967] Fix C++ queries and update tree-sitter-cpp (#7285)

---
 languages.toml                     | 2 +-
 runtime/queries/cpp/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 28669c553..868abd962 100644
--- a/languages.toml
+++ b/languages.toml
@@ -372,7 +372,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "cpp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "670404d7c689be1c868a46f919ba2a3912f2b7ef" }
 
 [[language]]
 name = "crystal"
diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 8637489e5..509dcdf7d 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -32,7 +32,7 @@
 
 (using_declaration ("using" "namespace" (identifier) @namespace))
 (using_declaration ("using" "namespace" (qualified_identifier name: (identifier) @namespace)))
-(namespace_definition name: (identifier) @namespace)
+(namespace_definition name: (namespace_identifier) @namespace)
 (namespace_identifier) @namespace
 
 (qualified_identifier name: (identifier) @type.enum.variant)

From d4427125eb9f1f6936fae4c8569feb0893b76155 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 7 Jun 2023 19:48:11 -0500
Subject: [PATCH 038/967] Bail if no language servers support workspace symbols
 (#7286)

---
 helix-term/src/commands/lsp.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 3596df45b..8c3fd13b5 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -442,6 +442,15 @@ pub fn symbol_picker(cx: &mut Context) {
 
 pub fn workspace_symbol_picker(cx: &mut Context) {
     let doc = doc!(cx.editor);
+    if doc
+        .language_servers_with_feature(LanguageServerFeature::WorkspaceSymbols)
+        .count()
+        == 0
+    {
+        cx.editor
+            .set_error("No configured language server supports workspace symbols");
+        return;
+    }
 
     let get_symbols = move |pattern: String, editor: &mut Editor| {
         let doc = doc!(editor);

From 27891cdc8d48a61b4a25b95a8ac45256ff69fcbe Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang.mbambo@ferrous-systems.com>
Date: Thu, 8 Jun 2023 06:27:58 +0200
Subject: [PATCH 039/967] misc doc fixes/improvements (#7282)

---
 CHANGELOG.md          |  2 +-
 book/src/install.md   |  2 +-
 book/src/keymap.md    |  2 +-
 book/src/languages.md | 32 ++++++++++++++++----------------
 docs/releases.md      |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f2775b29..9f7509b0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1596,7 +1596,7 @@ to distinguish it in bug reports..
 
 - The `runtime/` directory is now properly detected on binary releases and
   on cargo run. `~/.config/helix/runtime` can also be used.
-- Registers can now be selected via " (for example `"ay`)
+- Registers can now be selected via " (for example, `"ay`)
 - Support for Nix files was added
 - Movement is now fully tested and matches Kakoune implementation
 - A per-file LSP symbol picker was added to space+s
diff --git a/book/src/install.md b/book/src/install.md
index 7483be299..0b5e1a30a 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -161,7 +161,7 @@ Requirements:
 
 - The [Rust toolchain](https://www.rust-lang.org/tools/install)
 - The [Git version control system](https://git-scm.com/)
-- A c++14 compatible compiler to build the tree-sitter grammars, for example GCC or Clang
+- A C++14 compatible compiler to build the tree-sitter grammars, for example GCC or Clang
 
 If you are using the `musl-libc` standard library instead of `glibc` the following environment variable must be set during the build to ensure tree-sitter grammars can be loaded correctly:
 
diff --git a/book/src/keymap.md b/book/src/keymap.md
index e8b140c85..add73191d 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -392,7 +392,7 @@ end = "no_op"
 
 Select mode echoes Normal mode, but changes any movements to extend
 selections rather than replace them. Goto motions are also changed to
-extend, so that `vgl` for example extends the selection to the end of
+extend, so that `vgl`, for example, extends the selection to the end of
 the line.
 
 Search is also affected. By default, `n` and `N` will remove the current
diff --git a/book/src/languages.md b/book/src/languages.md
index c334186b5..5e56a332f 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -7,24 +7,24 @@ in `languages.toml` files.
 
 There are three possible locations for a `languages.toml` file:
 
-1. In the Helix source code, this lives in the
+1. In the Helix source code, which lives in the
    [Helix repository](https://github.com/helix-editor/helix/blob/master/languages.toml).
    It provides the default configurations for languages and language servers.
 
 2. In your [configuration directory](./configuration.md). This overrides values
-   from the built-in language configuration. For example to disable
+   from the built-in language configuration. For example, to disable
    auto-LSP-formatting in Rust:
 
-```toml
-# in <config_dir>/helix/languages.toml
+   ```toml
+   # in <config_dir>/helix/languages.toml
 
-[language-server.mylang-lsp]
-command = "mylang-lsp"
+   [language-server.mylang-lsp]
+   command = "mylang-lsp"
 
-[[language]]
-name = "rust"
-auto-format = false
-```
+   [[language]]
+   name = "rust"
+   auto-format = false
+   ```
 
 3. In a `.helix` folder in your project. Language configuration may also be
    overridden local to a project by creating a `languages.toml` file in a
@@ -128,7 +128,7 @@ These are the available options for a language server.
 
 A `format` sub-table within `config` can be used to pass extra formatting options to
 [Document Formatting Requests](https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-17.md#document-formatting-request--leftwards_arrow_with_hook).
-For example with typescript:
+For example, with typescript:
 
 ```toml
 [language-server.typescript-language-server]
@@ -147,8 +147,8 @@ Different languages can use the same language server instance, e.g. `typescript-
 In case multiple language servers are specified in the `language-servers` attribute of a `language`,
 it's often useful to only enable/disable certain language-server features for these language servers.
 
-For example `efm-lsp-prettier` of the previous example is used only with a formatting command `prettier`,
-so everything else should be handled by the `typescript-language-server` (which is configured by default)
+As an example, `efm-lsp-prettier` of the previous example is used only with a formatting command `prettier`,
+so everything else should be handled by the `typescript-language-server` (which is configured by default).
 The language configuration for typescript could look like this:
 
 ```toml
@@ -166,10 +166,10 @@ language-servers = [ { name = "typescript-language-server", except-features = [
 ```
 
 Each requested LSP feature is prioritized in the order of the `language-servers` array.
-For example the first `goto-definition` supported language server (in this case `typescript-language-server`) will be taken for the relevant LSP request (command `goto_definition`).
+For example, the first `goto-definition` supported language server (in this case `typescript-language-server`) will be taken for the relevant LSP request (command `goto_definition`).
 The features `diagnostics`, `code-action`, `completion`, `document-symbols` and `workspace-symbols` are an exception to that rule, as they are working for all language servers at the same time and are merged together, if enabled for the language.
-If no `except-features` or `only-features` is given all features for the language server are enabled.
-If a language server itself doesn't support a feature the next language server array entry will be tried (and so on).
+If no `except-features` or `only-features` is given, all features for the language server are enabled.
+If a language server itself doesn't support a feature, the next language server array entry will be tried (and so on).
 
 The list of supported features is:
 
diff --git a/docs/releases.md b/docs/releases.md
index 6e7c37c6e..842886753 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -1,7 +1,7 @@
 ## Checklist
 
 Helix releases are versioned in the Calendar Versioning scheme:
-`YY.0M(.MICRO)`, for example `22.05` for May of 2022. In these instructions
+`YY.0M(.MICRO)`, for example, `22.05` for May of 2022. In these instructions
 we'll use `<tag>` as a placeholder for the tag being published.
 
 * Merge the changelog PR
@@ -30,7 +30,7 @@ we'll use `<tag>` as a placeholder for the tag being published.
 
 The changelog is currently created manually by reading through commits in the
 log since the last release. GitHub's compare view is a nice way to approach
-this. For example when creating the 22.07 release notes, this compare link
+this. For example, when creating the 22.07 release notes, this compare link
 may be used
 
 ```

From b0129b552dbc5fd60ae0a88c85e16042e8b3fc45 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 7 Jun 2023 23:28:26 -0500
Subject: [PATCH 040/967] Fix style overwriting in table rows with multiple
 cells (#7281)

---
 helix-tui/src/widgets/table.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-tui/src/widgets/table.rs b/helix-tui/src/widgets/table.rs
index 97762167e..3564871de 100644
--- a/helix-tui/src/widgets/table.rs
+++ b/helix-tui/src/widgets/table.rs
@@ -450,11 +450,11 @@ impl<'a> Table<'a> {
             } else {
                 col
             };
+            if is_selected {
+                buf.set_style(table_row_area, self.highlight_style);
+            }
             let mut col = table_row_start_col;
             for (width, cell) in columns_widths.iter().zip(table_row.cells.iter()) {
-                if is_selected {
-                    buf.set_style(table_row_area, self.highlight_style);
-                }
                 render_cell(
                     buf,
                     cell,

From e2a1678436ded3542be4d91d5eeee63eb777bde7 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang.mbambo@ferrous-systems.com>
Date: Thu, 8 Jun 2023 10:12:36 +0200
Subject: [PATCH 041/967] Fix book configuration for edit template (#7278)

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

diff --git a/book/book.toml b/book/book.toml
index 9835145ce..f68dece81 100644
--- a/book/book.toml
+++ b/book/book.toml
@@ -3,10 +3,10 @@ authors = ["Blaž Hrastnik"]
 language = "en"
 multilingual = false
 src = "src"
-edit-url-template = "https://github.com/helix-editor/helix/tree/master/book/{path}?mode=edit"
 
 [output.html]
 cname = "docs.helix-editor.com"
 default-theme = "colibri"
 preferred-dark-theme = "colibri"
 git-repository-url = "https://github.com/helix-editor/helix"
+edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"

From 993c68ad6f9d15c3870871ae5be16ebbd4de0382 Mon Sep 17 00:00:00 2001
From: Alex <3957610+CptPotato@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:11:40 +0200
Subject: [PATCH 042/967] Auto indent on `insert_at_line_start` (#5837)

---
 helix-term/src/commands.rs        | 83 +++++++++++++++++++++++++++----
 helix-term/tests/test/commands.rs | 53 ++++++++++++++++++++
 2 files changed, 126 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 99f50b041..99f27c009 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2775,24 +2775,87 @@ fn last_picker(cx: &mut Context) {
     }));
 }
 
-// I inserts at the first nonwhitespace character of each line with a selection
+/// Fallback position to use for [`insert_with_indent`].
+enum IndentFallbackPos {
+    LineStart,
+    LineEnd,
+}
+
+// `I` inserts at the first nonwhitespace character of each line with a selection.
+// If the line is empty, automatically indent.
 fn insert_at_line_start(cx: &mut Context) {
-    goto_first_nonwhitespace(cx);
-    enter_insert_mode(cx);
+    insert_with_indent(cx, IndentFallbackPos::LineStart);
 }
 
-// A inserts at the end of each line with a selection
+// `A` inserts at the end of each line with a selection.
+// If the line is empty, automatically indent.
 fn insert_at_line_end(cx: &mut Context) {
+    insert_with_indent(cx, IndentFallbackPos::LineEnd);
+}
+
+// Enter insert mode and auto-indent the current line if it is empty.
+// If the line is not empty, move the cursor to the specified fallback position.
+fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
     enter_insert_mode(cx);
+
     let (view, doc) = current!(cx.editor);
 
-    let selection = doc.selection(view.id).clone().transform(|range| {
-        let text = doc.text().slice(..);
-        let line = range.cursor_line(text);
-        let pos = line_end_char_index(&text, line);
-        Range::new(pos, pos)
+    let text = doc.text().slice(..);
+    let contents = doc.text();
+    let selection = doc.selection(view.id);
+
+    let language_config = doc.language_config();
+    let syntax = doc.syntax();
+    let tab_width = doc.tab_width();
+
+    let mut ranges = SmallVec::with_capacity(selection.len());
+    let mut offs = 0;
+
+    let mut transaction = Transaction::change_by_selection(contents, selection, |range| {
+        let cursor_line = range.cursor_line(text);
+        let cursor_line_start = text.line_to_char(cursor_line);
+
+        if line_end_char_index(&text, cursor_line) == cursor_line_start {
+            // line is empty => auto indent
+            let line_end_index = cursor_line_start;
+
+            let indent = indent::indent_for_newline(
+                language_config,
+                syntax,
+                &doc.indent_style,
+                tab_width,
+                text,
+                cursor_line,
+                line_end_index,
+                cursor_line,
+            );
+
+            // calculate new selection ranges
+            let pos = offs + cursor_line_start;
+            let indent_width = indent.chars().count();
+            ranges.push(Range::point(pos + indent_width));
+            offs += indent_width;
+
+            (line_end_index, line_end_index, Some(indent.into()))
+        } else {
+            // move cursor to the fallback position
+            let pos = match cursor_fallback {
+                IndentFallbackPos::LineStart => {
+                    find_first_non_whitespace_char(text.line(cursor_line))
+                        .map(|ws_offset| ws_offset + cursor_line_start)
+                        .unwrap_or(cursor_line_start)
+                }
+                IndentFallbackPos::LineEnd => line_end_char_index(&text, cursor_line),
+            };
+
+            ranges.push(range.put_cursor(text, pos + offs, cx.editor.mode == Mode::Select));
+
+            (cursor_line_start, cursor_line_start, None)
+        }
     });
-    doc.set_selection(view.id, selection);
+
+    transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
+    doc.apply(&transaction, view.id);
 }
 
 // Creates an LspCallback that waits for formatting changes to be computed. When they're done,
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 52b123c7e..b13c37bcd 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -426,3 +426,56 @@ async fn test_delete_char_forward() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_insert_with_indent() -> anyhow::Result<()> {
+    const INPUT: &str = "\
+#[f|]#n foo() {
+    if let Some(_) = None {
+
+    }
+\x20
+}
+
+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|)#\
+#(}|)#",
+    ))
+    .await?;
+
+    // insert_at_line_end
+    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|)#\
+}#(|)#",
+    ))
+    .await?;
+
+    Ok(())
+}

From 00b152facd8cc9d671f1781a3b931bcc9830efce Mon Sep 17 00:00:00 2001
From: spectre256 <72505298+spectre256@users.noreply.github.com>
Date: Thu, 8 Jun 2023 15:34:07 -0400
Subject: [PATCH 043/967] Add register statusline element (#7222)

---
 book/src/configuration.md       |  1 +
 helix-term/src/ui/statusline.rs | 10 ++++++++++
 helix-view/src/editor.rs        | 11 ++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 5df63207a..b7ddfdef8 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -117,6 +117,7 @@ The following statusline elements can be configured:
 | `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |
 | `spacer` | Inserts a space between elements (multiple/contiguous spacers may be specified) |
 | `version-control` | The current branch name or detached commit hash of the opened workspace |
+| `register` | The current selected register |
 
 ### `[editor.lsp]` Section
 
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index dbf5ac314..61fca609b 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -160,6 +160,7 @@ where
         helix_view::editor::StatusLineElement::Separator => render_separator,
         helix_view::editor::StatusLineElement::Spacer => render_spacer,
         helix_view::editor::StatusLineElement::VersionControl => render_version_control,
+        helix_view::editor::StatusLineElement::Register => render_register,
     }
 }
 
@@ -489,3 +490,12 @@ where
 
     write(context, head, None);
 }
+
+fn render_register<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    if let Some(reg) = context.editor.selected_register {
+        write(context, format!(" reg={} ", reg), None)
+    }
+}
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 1f27603c9..b999836f8 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -403,7 +403,13 @@ impl Default for StatusLineConfig {
                 E::FileModificationIndicator,
             ],
             center: vec![],
-            right: vec![E::Diagnostics, E::Selections, E::Position, E::FileEncoding],
+            right: vec![
+                E::Diagnostics,
+                E::Selections,
+                E::Register,
+                E::Position,
+                E::FileEncoding,
+            ],
             separator: String::from("│"),
             mode: ModeConfig::default(),
         }
@@ -484,6 +490,9 @@ pub enum StatusLineElement {
 
     /// Current version control information
     VersionControl,
+
+    /// Indicator for selected register
+    Register,
 }
 
 // Cursor shape is read and used on every rendered frame and so needs

From dbd248fdfa680373d94fbc10094a160aafa0f7a7 Mon Sep 17 00:00:00 2001
From: Luca Schlecker <luca.schlecker@hotmail.com>
Date: Wed, 7 Jun 2023 14:18:25 +0200
Subject: [PATCH 044/967] add config option for instant completion entry
 preview (defaulting to true).

Signed-off-by: Luca Schlecker <luca.schlecker@hotmail.com>
---
 book/src/configuration.md       | 1 +
 helix-term/src/ui/completion.rs | 4 +++-
 helix-view/src/editor.rs        | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index b7ddfdef8..723e9601f 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -52,6 +52,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `auto-format` | Enable automatic formatting on save | `true` |
 | `auto-save` | Enable automatic saving on the focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal | `false` |
 | `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `400` |
+| `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |
 | `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
 | `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |
 | `auto-info` | Whether to display info boxes | `true` |
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index d997e8ae1..1ebcd192c 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -110,6 +110,7 @@ impl Completion {
         start_offset: usize,
         trigger_offset: usize,
     ) -> Self {
+        let preview_completion_insert = editor.config().preview_completion_insert;
         let replace_mode = editor.config().completion_replace;
         // Sort completion items according to their preselect status (given by the LSP server)
         items.sort_by_key(|item| !item.item.preselect.unwrap_or(false));
@@ -230,7 +231,7 @@ impl Completion {
 
             match event {
                 PromptEvent::Abort => {}
-                PromptEvent::Update => {
+                PromptEvent::Update if preview_completion_insert => {
                     // Update creates "ghost" transactions which are not sent to the
                     // lsp server to avoid messing up re-requesting completions. Once a
                     // completion has been selected (with tab, c-n or c-p) it's always accepted whenever anything
@@ -263,6 +264,7 @@ impl Completion {
                     );
                     doc.apply_temporary(&transaction, view.id);
                 }
+                PromptEvent::Update => {}
                 PromptEvent::Validate => {
                     if let Some(CompleteAction::Selected { savepoint }) =
                         editor.last_completion.take()
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index b999836f8..b2e07c730 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -251,6 +251,8 @@ pub struct Config {
         deserialize_with = "deserialize_duration_millis"
     )]
     pub idle_timeout: Duration,
+    /// Whether to insert the completion suggestion on hover. Defaults to true.
+    pub preview_completion_insert: bool,
     pub completion_trigger_len: u8,
     /// Whether to instruct the LSP to replace the entire word when applying a completion
     /// or to only insert new text
@@ -746,6 +748,7 @@ impl Default for Config {
             auto_format: true,
             auto_save: false,
             idle_timeout: Duration::from_millis(400),
+            preview_completion_insert: true,
             completion_trigger_len: 2,
             auto_info: true,
             file_picker: FilePickerConfig::default(),

From a981a2525d5b5cf9301c71cc54197bdc9f7b0f96 Mon Sep 17 00:00:00 2001
From: Vitalii Solodilov <mcdoker18@gmail.com>
Date: Sat, 10 Jun 2023 03:31:02 +0300
Subject: [PATCH 045/967] Support core mode for delve debugger (#7300)

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

diff --git a/languages.toml b/languages.toml
index 868abd962..94d305685 100644
--- a/languages.toml
+++ b/languages.toml
@@ -460,6 +460,12 @@ request = "attach"
 completion = [ "pid" ]
 args = { mode = "local", processId = "{0}" }
 
+[[language.debugger.templates]]
+name = "core"
+request = "launch"
+completion = [ { name = "binary", completion = "filename" }, { name = "core", completion = "filename" } ]
+args = { mode = "core", program = "{0}", coreFilePath = "{1}" }
+
 [[grammar]]
 name = "go"
 source = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "64457ea6b73ef5422ed1687178d4545c3e91334a" }

From a197ce869a208739107617af833dc6494c510514 Mon Sep 17 00:00:00 2001
From: lefp <70862148+lefp@users.noreply.github.com>
Date: Sat, 10 Jun 2023 11:27:46 -0400
Subject: [PATCH 046/967] Add Fortran comment injections (#7305)

---
 runtime/queries/fortran/injections.scm | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 runtime/queries/fortran/injections.scm

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

From 8c6eb88c6acdad68327b52204f20f9720b38f41e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?0xHiro=20/=20=E3=83=92=E3=83=AD?=
 <90010840+0xhiro@users.noreply.github.com>
Date: Sat, 10 Jun 2023 17:40:39 +0100
Subject: [PATCH 047/967] fix: add file argument in help text (#7307)

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

diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index e0c3f6e70..73513bf39 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -68,7 +68,7 @@ FLAGS:
     -g, --grammar {{fetch|build}}    Fetches or builds tree-sitter grammars listed in languages.toml
     -c, --config <file>            Specifies a file to use for configuration
     -v                             Increases logging verbosity each use for up to 3 times
-    --log                          Specifies a file to use for logging
+    --log <file>                   Specifies a file to use for logging
                                    (default file: {})
     -V, --version                  Prints version information
     --vsplit                       Splits all given files vertically into different windows

From 18e07addfd464844fc18833cfb1d1cd38c683c11 Mon Sep 17 00:00:00 2001
From: Selwyn <talk@selwyn.cc>
Date: Sun, 11 Jun 2023 17:46:47 +0200
Subject: [PATCH 048/967] Use Vue language server based on Volar (#7312)

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

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index e77bc17bc..da37dfb34 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -159,7 +159,7 @@
 | verilog | ✓ | ✓ |  | `svlangserver` |
 | vhdl | ✓ |  |  | `vhdl_ls` |
 | vhs | ✓ |  |  |  |
-| vue | ✓ |  |  | `vls` |
+| vue | ✓ |  |  | `vue-language-server` |
 | wast | ✓ |  |  |  |
 | wat | ✓ |  |  |  |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
diff --git a/languages.toml b/languages.toml
index 94d305685..63678bf40 100644
--- a/languages.toml
+++ b/languages.toml
@@ -73,7 +73,7 @@ vlang-language-server = { command = "v", args = ["ls"] }
 vscode-css-language-server = { command = "vscode-css-language-server", args = ["--stdio"], config = { "provideFormatter" = true }}
 vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
 vscode-json-language-server =  { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true } }
-vuels = { command = "vls" }
+vuels = { command = "vue-language-server", args = ["--stdio"], config = { typescript = { tsdk = "node_modules/typescript/lib/" } } }
 wgsl_analyzer = { command = "wgsl_analyzer" }
 yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
 zls = { command = "zls" }
@@ -921,7 +921,7 @@ name = "vue"
 scope = "source.vue"
 injection-regex = "vue"
 file-types = ["vue"]
-roots = ["package.json", "vue.config.js"]
+roots = ["package.json"]
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "vuels" ]
 

From 25ad534d6404e2aa39536df818371dcbbc928b52 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 12 Jun 2023 10:32:36 -0500
Subject: [PATCH 049/967] Check for 'git' before fetching/building grammars
 (#7320)

Previously the error message for this potential failure-case was
confusing: "no such file or directory". `hx -g fetch`, `hx -g build` and
the helix-term builder should bail early if the git binary is not
available.
---
 Cargo.lock                  |  1 +
 helix-loader/Cargo.toml     |  1 +
 helix-loader/src/grammar.rs | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 182eed9e7..d86ba9553 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1167,6 +1167,7 @@ dependencies = [
  "threadpool",
  "toml",
  "tree-sitter",
+ "which",
 ]
 
 [[package]]
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index b0d8f1462..6e0217a29 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -21,6 +21,7 @@ etcetera = "0.8"
 tree-sitter = "0.20"
 once_cell = "1.18"
 log = "0.4"
+which = "4.4"
 
 # TODO: these two should be on !wasm32 only
 
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 16955187e..66111aebb 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -85,7 +85,16 @@ pub fn get_language(name: &str) -> Result<Language> {
     Ok(language)
 }
 
+fn ensure_git_is_available() -> Result<()> {
+    match which::which("git") {
+        Ok(_cmd) => Ok(()),
+        Err(err) => Err(anyhow::anyhow!("'git' could not be found ({err})")),
+    }
+}
+
 pub fn fetch_grammars() -> Result<()> {
+    ensure_git_is_available()?;
+
     // We do not need to fetch local grammars.
     let mut grammars = get_grammar_configs()?;
     grammars.retain(|grammar| !matches!(grammar.source, GrammarSource::Local { .. }));
@@ -145,6 +154,8 @@ pub fn fetch_grammars() -> Result<()> {
 }
 
 pub fn build_grammars(target: Option<String>) -> Result<()> {
+    ensure_git_is_available()?;
+
     let grammars = get_grammar_configs()?;
     println!("Building {} grammars", grammars.len());
     let results = run_parallel(grammars, move |grammar| {

From 2a11fb485d33eb33a7743899e9a86f745f6d5e02 Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Mon, 12 Jun 2023 18:37:47 +0200
Subject: [PATCH 050/967] Fix underflow when repeating a completion that has a
 negative shift position (#7322)

---
 helix-term/src/ui/editor.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 4f7916ffd..16940e337 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -907,8 +907,9 @@ impl EditorView {
                                 let text = doc.text().slice(..);
                                 let cursor = doc.selection(view.id).primary().cursor(text);
 
-                                let shift_position =
-                                    |pos: usize| -> usize { pos + cursor - trigger_offset };
+                                let shift_position = |pos: usize| -> usize {
+                                    (pos + cursor).saturating_sub(trigger_offset)
+                                };
 
                                 let tx = Transaction::change(
                                     doc.text(),

From a6fd32eef4dccd792cdaa23a0f0c4ce31aae6fd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 09:51:11 +0900
Subject: [PATCH 051/967] build(deps): bump log from 0.4.18 to 0.4.19 (#7324)

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 d86ba9553..e6c2a7c8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1506,9 +1506,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.18"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "lsp-types"

From 3c23ea5d153c25743937120b0681cb1e45444c99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 09:51:25 +0900
Subject: [PATCH 052/967] build(deps): bump serde from 1.0.163 to 1.0.164
 (#7328)

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 e6c2a7c8e..530680ca7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1812,18 +1812,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.163"
+version = "1.0.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
 dependencies = [
  "proc-macro2",
  "quote",

From 0d998c99d4289f8db6f25b8fe3c82da4ec13e858 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 09:51:34 +0900
Subject: [PATCH 053/967] build(deps): bump tempfile from 3.5.0 to 3.6.0
 (#7326)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 7 ++++---
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-vcs/Cargo.toml    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 530680ca7..a791f05a7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2002,15 +2002,16 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.5.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
 dependencies = [
+ "autocfg",
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 6e0217a29..3e7fc2e78 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -28,7 +28,7 @@ which = "4.4"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.5.0"
+tempfile = "3.6.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 libloading = "0.8"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index e623e2de1..9f9e9f56d 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -76,4 +76,4 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.10"
 indoc = "2.0.1"
-tempfile = "3.4.0"
+tempfile = "3.6.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index f644add5b..a76664f28 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -27,4 +27,4 @@ log = "0.4"
 git = ["gix"]
 
 [dev-dependencies]
-tempfile = "3.4"
\ No newline at end of file
+tempfile = "3.6"
\ No newline at end of file

From 66ed5bd013314a49926afc52ae7c2847e9ecdf01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 09:51:47 +0900
Subject: [PATCH 054/967] build(deps): bump gix from 0.44.1 to 0.46.0 (#7325)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 204 +++++++++++++++++++++++++++----------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 128 insertions(+), 78 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a791f05a7..8dbbabf85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -486,12 +486,13 @@ dependencies = [
 
 [[package]]
 name = "gix"
-version = "0.44.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf41b61f7df395284f7a579c0fa1a7e012c5aede655174d4e91299ef1cac643"
+checksum = "99368b48a2f68c3fdc26e62c6425bdc4baeb4f30a4f24eb2e0904d29a2ba97ab"
 dependencies = [
  "gix-actor",
  "gix-attributes",
+ "gix-commitgraph",
  "gix-config",
  "gix-credentials",
  "gix-date",
@@ -506,6 +507,7 @@ dependencies = [
  "gix-index",
  "gix-lock",
  "gix-mailmap",
+ "gix-negotiate",
  "gix-object",
  "gix-odb",
  "gix-pack",
@@ -531,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848efa0f1210cea8638f95691c82a46f98a74b9e3524f01d4955ebc25a8f84f3"
+checksum = "9fe73f9f6be1afbf1bd5be919a9636fa560e2f14d42262a934423ed6760cd838"
 dependencies = [
  "bstr",
  "btoi",
@@ -545,9 +547,9 @@ dependencies = [
 
 [[package]]
 name = "gix-attributes"
-version = "0.12.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3015baa01ad2122fbcaab7863c857a603eb7b7ec12ac8141207c42c6439805e2"
+checksum = "78b79590ac382f80d87e06416f5fcac6fee5d83dcb152a00ed0bdbaa988acc31"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -562,36 +564,50 @@ dependencies = [
 
 [[package]]
 name = "gix-bitmap"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55a95f4942360766c3880bdb2b4b57f1ef73b190fc424755e7fdf480430af618"
+checksum = "fc02feb20ad313d52a450852f2005c2205d24f851e74d82b7807cbe12c371667"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d39583cab06464b8bf73b3f1707458270f0e7383cb24c3c9c1a16e6f792978"
+checksum = "a7acf3bc6c4b91e8fb260086daf5e105ea3a6d913f5fd3318137f7e309d6e540"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-command"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2c6f75c1e0f924de39e750880a6e21307194bb1ab773efe3c7d2d787277f8ab"
+checksum = "5f6141b70cfb21255223e42f3379855037cbbe8673b58dd8318d2f09b516fad1"
 dependencies = [
  "bstr",
 ]
 
+[[package]]
+name = "gix-commitgraph"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8490ae1b3d55c47e6a71d247c082304a2f79f8d0332c1a2f5693d42a2021a09"
+dependencies = [
+ "bstr",
+ "gix-chunk",
+ "gix-features",
+ "gix-hash",
+ "memmap2",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-config"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d252a0eddb6df74600d3d8872dc9fe98835a7da43110411d705b682f49d4ac1"
+checksum = "51f310120ae1ba8f0ca52fb22876ce9bad5b15c8ffb3eb7302e4b64a3b9f681c"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -611,9 +627,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786861e84a5793ad5f863d846de5eb064cd23b87e61ad708c8c402608202e7be"
+checksum = "6f216df1c33e6e1555923eff0096858a879e8aaadd35b5d788641e4e8064c892"
 dependencies = [
  "bitflags 2.3.1",
  "bstr",
@@ -624,9 +640,9 @@ dependencies = [
 
 [[package]]
 name = "gix-credentials"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4874a4fc11ffa844a3c2b87a66957bda30a73b577ef1acf15ac34df5745de5ff"
+checksum = "c6f89fea8acd28f5ef8fa5042146f1637afd4d834bc8f13439d8fd1e5aca0d65"
 dependencies = [
  "bstr",
  "gix-command",
@@ -640,9 +656,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99056f37270715f5c7584fd8b46899a2296af9cae92463bf58b8bd1f5a78e553"
+checksum = "bc164145670e9130a60a21670d9b6f0f4f8de04e5dd256c51fa5a0340c625902"
 dependencies = [
  "bstr",
  "itoa",
@@ -652,9 +668,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.29.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644a0f2768bc42d7a69289ada80c9e15c589caefc6a315d2307202df83ed1186"
+checksum = "9029ad0083cc286a4bd2f5b3bf66bb66398abc26f2731a2824cd5edfc41a0e33"
 dependencies = [
  "gix-hash",
  "gix-object",
@@ -664,9 +680,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a6b61363e63e7cdaa3e6f96acb0257ebdb3d8883e21eba5930c99f07f0a5fc0"
+checksum = "aba9c6c0d1f2b2efe65581de73de4305004612d49c83773e783202a7ef204f46"
 dependencies = [
  "bstr",
  "dunce",
@@ -679,9 +695,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf69b0f5c701cc3ae22d3204b671907668f6437ca88862d355eaf9bc47a4f897"
+checksum = "3a8c493409bf6060d408eec9bbdd1b12ea351266b50012e2a522f75dfc7b8314"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -696,18 +712,18 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b37a1832f691fdc09910bd267f9a2e413737c1f9ec68c6e31f9e802616278a9"
+checksum = "30da8997008adb87f94e15beb7ee229f8a48e97af585a584bfee4a5a1880aab5"
 dependencies = [
  "gix-features",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07c98204529ac3f24b34754540a852593d2a4c7349008df389240266627a72a"
+checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e"
 dependencies = [
  "bitflags 2.3.1",
  "bstr",
@@ -717,9 +733,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078eec3ac2808cc03f0bddd2704cb661da5c5dc33b41a9d7947b141d499c7c42"
+checksum = "ee181c85d3955f54c4426e6bfaeeada4428692e1a39b8788c2ac7785fc301dd8"
 dependencies = [
  "hex",
  "thiserror",
@@ -727,9 +743,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afebb85691c6a085b114e01a27f4a61364519298c5826cb87a45c304802299bc"
+checksum = "bd259bd0d96e6153e357a8cdaca76c48e103fd34208b6c0ce77b1ad995834bd2"
 dependencies = [
  "gix-hash",
  "hashbrown 0.13.2",
@@ -738,9 +754,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ignore"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba205b6df563e2906768bb22834c82eb46c5fdfcd86ba2c347270bc8309a05b2"
+checksum = "fc6f7f101a0ccce808dbf7008ba131dede94e20257e7bde7a44cbb2f8c775625"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -750,9 +766,9 @@ dependencies = [
 
 [[package]]
 name = "gix-index"
-version = "0.16.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa282756760f79c401d4f4f42588fbb4aa27bbb4b0830f3b4d3480c21a4ac5a7"
+checksum = "ca0380cdab7863e67966eee4aed32856c864c20b077e026b637af6bb3a9281b4"
 dependencies = [
  "bitflags 2.3.1",
  "bstr",
@@ -772,31 +788,46 @@ dependencies = [
 
 [[package]]
 name = "gix-lock"
-version = "5.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b80172055c5d8017a48ddac5cc7a95421c00211047db0165c97853c4f05194"
+checksum = "3ec5d5e6f07316d3553aa7425e3ecd935ec29882556021fe1696297a448af8d2"
 dependencies = [
- "fastrand",
  "gix-tempfile",
+ "gix-utils",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-mailmap"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8856cec3bdc3610c06970d28b6cb20a0c6621621cf9a8ec48cbd23f2630f362"
+checksum = "4653701922c920e009f1bc4309feaff14882ade017770788f9a150928da3fa6a"
 dependencies = [
  "bstr",
  "gix-actor",
  "thiserror",
 ]
 
+[[package]]
+name = "gix-negotiate"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c"
+dependencies = [
+ "bitflags 2.3.1",
+ "gix-commitgraph",
+ "gix-hash",
+ "gix-object",
+ "gix-revision",
+ "smallvec",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-object"
-version = "0.29.1"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9bb30ce0818d37096daa29efe361a4bc6dd0b51a5726598898be7e9a40a01e1"
+checksum = "8926c8f51c44dec3e709cb5dbc93deb9e8d4064c43c9efc54c158dcdfe8446c7"
 dependencies = [
  "bstr",
  "btoi",
@@ -813,9 +844,9 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.45.0"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2f324aa67672b6d0f2c0fa93f96eb6a7029d260e4c1df5dce3c015f5e5add"
+checksum = "91d98eaba4f649fed17250651c4ddfaf997c80a30f5ee4b47ac9bc18ffe3eb16"
 dependencies = [
  "arc-swap",
  "gix-features",
@@ -831,9 +862,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164a515900a83257ae4aa80e741655bee7a2e39113fb535d7a5ac623b445ff20"
+checksum = "82e9e228f18cd87e7596e687b38619b5e4caebc678644ae6bb3d842598166d72"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -853,9 +884,9 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc78f47095a0c15aea0e66103838f0748f4494bf7a9555dfe0f00425400396c"
+checksum = "c1226f2e50adeb4d76c754c1856c06f13a24cad1624801653fbf09b869e5b808"
 dependencies = [
  "bstr",
  "home",
@@ -865,9 +896,9 @@ dependencies = [
 
 [[package]]
 name = "gix-prompt"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330d11fdf88fff3366c2491efde2f3e454958efe7d5ddf60272e8fb1d944bb01"
+checksum = "e15fe57fa48572b7d3bf465d6a2a0351cd3c55cba74fd5f0b9c23689f9c1a31e"
 dependencies = [
  "gix-command",
  "gix-config-value",
@@ -878,9 +909,9 @@ dependencies = [
 
 [[package]]
 name = "gix-quote"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a282f5a8d9ee0b09ec47390ac727350c48f2f5c76d803cd8da6b3e7ad56e0bcb"
+checksum = "29d59489bff95b06dcdabe763b7266d3dc0a628cac1ac1caf65a7ca0a43eeae0"
 dependencies = [
  "bstr",
  "btoi",
@@ -889,9 +920,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.29.1"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e03989e9d49954368e1b526578230fc7189d1634acdfbe79e9ba1de717e15d5"
+checksum = "ebdd999256f4ce8a5eefa89999879c159c263f3493a951d62aa5ce42c0397e1c"
 dependencies = [
  "gix-actor",
  "gix-features",
@@ -909,9 +940,9 @@ dependencies = [
 
 [[package]]
 name = "gix-refspec"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6ea733820df67e4cd7797deb12727905824d8f5b7c59d943c456d314475892"
+checksum = "72bfd622abc86dd8ad1ec51b9eb77b4f1a766b94e3a1b87cf4a022c5b5570cf4"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -923,23 +954,38 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.13.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810f35e9afeccca999d5d348b239f9c162353127d2e13ff3240e31b919e35476"
+checksum = "5044f56cd7a487ce9b034cbe0252ae0b6b47ff56ca3dabd79bc30214d0932cd7"
 dependencies = [
  "bstr",
  "gix-date",
  "gix-hash",
  "gix-hashtable",
  "gix-object",
+ "gix-revwalk",
+ "thiserror",
+]
+
+[[package]]
+name = "gix-revwalk"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc2623ba8747914f151f5e12b65adac576ab459dbed5f50a36c7a3e9cbf2d3ca"
+dependencies = [
+ "gix-commitgraph",
+ "gix-hash",
+ "gix-hashtable",
+ "gix-object",
+ "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-sec"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794520043d5a024dfeac335c6e520cb616f6963e30dab995892382e998c12897"
+checksum = "b2b7b38b766eb95dcc5350a9c450030b69892c0902fa35f4a6d0809273bd9dae"
 dependencies = [
  "bitflags 2.3.1",
  "gix-path",
@@ -949,10 +995,11 @@ dependencies = [
 
 [[package]]
 name = "gix-tempfile"
-version = "5.0.2"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ceb30a610e3f5f2d5f9a5114689fde507ba9417705a8cf3429604275b2153c"
+checksum = "b3785cb010e9dc5c446dfbf02bc1119fc17d3a48a27c029efcb3a3c32953eb10"
 dependencies = [
+ "gix-fs",
  "libc",
  "once_cell",
  "parking_lot",
@@ -963,21 +1010,24 @@ dependencies = [
 
 [[package]]
 name = "gix-traverse"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5be1e807f288c33bb005075111886cceb43ed8a167b3182a0f62c186e2a0dd1"
+checksum = "8673546506391a10fdfd4e48c8e0f3ec92355cf1fac787d2e714c7d45e301ede"
 dependencies = [
+ "gix-commitgraph",
  "gix-hash",
  "gix-hashtable",
  "gix-object",
+ "gix-revwalk",
+ "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-url"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc77f89054297cc81491e31f1bab4027e554b5ef742a44bd7035db9a0f78b76"
+checksum = "f1663df25ac42047a2547618d2a6979a26f478073f6306997429235d2cd4c863"
 dependencies = [
  "bstr",
  "gix-features",
@@ -989,18 +1039,18 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c10b69beac219acb8df673187a1f07dde2d74092f974fb3f9eb385aeb667c909"
+checksum = "dbcfcb150c7ef553d76988467d223254045bdcad0dc6724890f32fbe96415da5"
 dependencies = [
  "fastrand",
 ]
 
 [[package]]
 name = "gix-validate"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd629d3680773e1785e585d76fd4295b740b559cad9141517300d99a0c8c049"
+checksum = "57ea5845b506c7728b9d89f4227cc369a5fc5a1d5b26c3add0f0d323413a3a60"
 dependencies = [
  "bstr",
  "thiserror",
@@ -1008,9 +1058,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10bf56a1f5037d84293ea6cece61d9f27c4866b1e13c1c95f37cf56b7da7af25"
+checksum = "0b32a0e7ed52577bfb050f5350bdee2741d1b08a9ed02a2f2df6effe353896ca"
 dependencies = [
  "bstr",
  "filetime",
@@ -1661,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "prodash"
-version = "23.1.2"
+version = "25.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9516b775656bc3e8985e19cd4b8c0c0de045095074e453d2c0a513b5f978392d"
+checksum = "3236ce1618b6da4c7b618e0143c4d5b5dc190f75f81c49f248221382f7e9e9ae"
 
 [[package]]
 name = "pulldown-cmark"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index a76664f28..4ac0f25e8 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
 parking_lot = "0.12"
 arc-swap = { version = "1.6.0" }
 
-gix = { version = "0.44.1", default-features = false , optional = true }
+gix = { version = "0.46.0", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From 0e42e4e193c65f0e9489e9cf871dbd58eba2b12e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 09:52:06 +0900
Subject: [PATCH 055/967] build(deps): bump libc from 0.2.145 to 0.2.146
 (#7327)

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

diff --git a/Cargo.lock b/Cargo.lock
index 8dbbabf85..5fd993c98 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1515,9 +1515,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.145"
+version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 9f9e9f56d..55885a9f2 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -68,7 +68,7 @@ grep-searcher = "0.1.11"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.145"
+libc = "0.2.146"
 
 [build-dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }

From 37fcd160db610feb4a910a3c587cc73a3a2e6635 Mon Sep 17 00:00:00 2001
From: kazimir malevich <64121410+kazimir-malevich@users.noreply.github.com>
Date: Tue, 13 Jun 2023 02:35:12 +0100
Subject: [PATCH 056/967] Clarify the runtime directory location in
 installation docs (#6624)

* runtime config made clearer

* following Unix FHS

* we probably want to install Helix as a regular user without sudo access

* suggestions adopted from @the-mikedavis

* attempted to synthesise comments given

* capitalisation of second header

* required changes hopefully made

* we should have a match now

* Linux windows dir match
---
 book/src/install.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/book/src/install.md b/book/src/install.md
index 0b5e1a30a..f7ffa42f9 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -159,6 +159,10 @@ pacman -S mingw-w64-ucrt-x86_64-helix
 
 Requirements:
 
+Clone the Helix GitHub repository into a directory of your choice. The
+examples in this documentation assume installation into either `~/src/` on
+Linux and macOS, or `%userprofile%\src\` on Windows.
+
 - The [Rust toolchain](https://www.rust-lang.org/tools/install)
 - The [Git version control system](https://git-scm.com/)
 - A C++14 compatible compiler to build the tree-sitter grammars, for example GCC or Clang
@@ -195,13 +199,15 @@ grammars in the local `runtime` folder.
 
 #### Linux and macOS
 
-Either set the `HELIX_RUNTIME` environment variable to point to the runtime files and add it to your `~/.bashrc` or equivalent:
+The **runtime** directory is one below the Helix source, so either set a
+`HELIX_RUNTIME` environment variable to point to that directory and add it to
+your `~/.bashrc` or equivalent:
 
 ```sh
-HELIX_RUNTIME=/home/user-name/src/helix/runtime
+HELIX_RUNTIME=~/src/helix/runtime
 ```
 
-Or, create a symlink in `~/.config/helix` that links to the source code directory:
+Or, create a symbolic link:
 
 ```sh
 ln -Ts $PWD/runtime ~/.config/helix/runtime

From 015c079acc59653390797cbd700fdf7657e220a9 Mon Sep 17 00:00:00 2001
From: Robert <robert@clover.gdn>
Date: Tue, 13 Jun 2023 13:36:28 +0000
Subject: [PATCH 057/967] Add reverse_selection_contents (#7329)

---
 helix-term/src/commands.rs | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 99f27c009..a4f4414ab 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -406,6 +406,7 @@ impl MappableCommand {
         rotate_selections_backward, "Rotate selections backward",
         rotate_selection_contents_forward, "Rotate selection contents forward",
         rotate_selection_contents_backward, "Rotate selections contents backward",
+        reverse_selection_contents, "Reverse selections contents",
         expand_selection, "Expand selection to parent syntax node",
         shrink_selection, "Shrink selection to previously expanded syntax node",
         select_next_sibling, "Select next sibling in syntax tree",
@@ -4482,7 +4483,13 @@ fn rotate_selections_backward(cx: &mut Context) {
     rotate_selections(cx, Direction::Backward)
 }
 
-fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
+enum ReorderStrategy {
+    RotateForward,
+    RotateBackward,
+    Reverse,
+}
+
+fn reorder_selection_contents(cx: &mut Context, strategy: ReorderStrategy) {
     let count = cx.count;
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
@@ -4500,9 +4507,10 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
 
     for chunk in fragments.chunks_mut(group) {
         // TODO: also modify main index
-        match direction {
-            Direction::Forward => chunk.rotate_right(1),
-            Direction::Backward => chunk.rotate_left(1),
+        match strategy {
+            ReorderStrategy::RotateForward => chunk.rotate_right(1),
+            ReorderStrategy::RotateBackward => chunk.rotate_left(1),
+            ReorderStrategy::Reverse => chunk.reverse(),
         };
     }
 
@@ -4519,10 +4527,13 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
 }
 
 fn rotate_selection_contents_forward(cx: &mut Context) {
-    rotate_selection_contents(cx, Direction::Forward)
+    reorder_selection_contents(cx, ReorderStrategy::RotateForward)
 }
 fn rotate_selection_contents_backward(cx: &mut Context) {
-    rotate_selection_contents(cx, Direction::Backward)
+    reorder_selection_contents(cx, ReorderStrategy::RotateBackward)
+}
+fn reverse_selection_contents(cx: &mut Context) {
+    reorder_selection_contents(cx, ReorderStrategy::Reverse)
 }
 
 // tree sitter node selection

From fbd22afe29ea9ddb833a3bf1c3b479ccab210c36 Mon Sep 17 00:00:00 2001
From: Zisulin Morbrot <22527555+morlinbrot@users.noreply.github.com>
Date: Tue, 13 Jun 2023 15:50:50 +0200
Subject: [PATCH 058/967] Add rl and rla aliasses for reload and reload-all
 commands (#7158)

---
 book/src/generated/typable-cmd.md | 4 ++--
 helix-term/src/commands/typed.rs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 0f488dc04..5fcafd5c3 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -46,8 +46,8 @@
 | `:show-directory`, `:pwd` | Show the current working directory. |
 | `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
 | `:character-info`, `:char` | Get info about the character under the primary cursor. |
-| `:reload` | Discard changes and reload from the source file. |
-| `:reload-all` | Discard changes and reload all documents from the source files. |
+| `:reload`, `:rl` | Discard changes and reload from the source file. |
+| `:reload-all`, `:rla` | Discard changes and reload all documents from the source files. |
 | `:update`, `:u` | Write changes only if the file has been modified. |
 | `:lsp-workspace-command` | Open workspace command picker |
 | `:lsp-restart` | Restarts the language servers used by the current doc |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 824abbf4c..80beab31d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2581,14 +2581,14 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         },
         TypableCommand {
             name: "reload",
-            aliases: &[],
+            aliases: &["rl"],
             doc: "Discard changes and reload from the source file.",
             fun: reload,
             signature: CommandSignature::none(),
         },
         TypableCommand {
             name: "reload-all",
-            aliases: &[],
+            aliases: &["rla"],
             doc: "Discard changes and reload all documents from the source files.",
             fun: reload_all,
             signature: CommandSignature::none(),

From d249639114a648c87c231b00fdeeadb0ffad7c8d Mon Sep 17 00:00:00 2001
From: Jorge Santiago <jsantiago12tone@gmail.com>
Date: Tue, 13 Jun 2023 11:01:02 -0300
Subject: [PATCH 059/967] Add merionette theme (#7186)

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

diff --git a/runtime/themes/merionette.toml b/runtime/themes/merionette.toml
new file mode 100644
index 000000000..e4d5d6737
--- /dev/null
+++ b/runtime/themes/merionette.toml
@@ -0,0 +1,98 @@
+"attribute" = "blue0"
+"comment" = { fg = "pink1", modifiers = ["italic"]  }
+"constant" = { fg = "orange0" }
+"constant.builtin" = { fg = "orange0", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "orange0", modifiers = ["bold"] }
+"constant.numeric" = "orange0"
+"constructor" = { fg = "blue0", modifiers = ["bold"] }
+"function" = { fg = "green0", modifiers = ["bold"] }
+"function.builtin" = "green0"
+"function.macro" = "green0"
+"keyword" = { fg = "orange1" }
+"label" = "blue0"
+"module" = "blue0"
+"namespace" = "pink2"
+"operator" = "orange1"
+"punctuation" = "orange1"
+"special" = "pink2"
+"string" = "violet0"
+"tag" = "green0"
+"type" = "blue0"
+"type.builtin" = "orange0"
+"variable" = "white0"
+"variable.builtin" = "blue0"
+"variable.other.member" = "blue0"
+"variable.parameter" = "green1"
+
+"diff.delta" = "violet0"
+"diff.minus" = "pink2"
+"diff.plus" = "green1"
+
+"error" = "orange1"
+"hint" = "white0"
+"info" = "blue0"
+"warning" = "green1"
+
+"ui.background" = { bg = "dark_red0" }
+"ui.cursor.match" = { bg = "pink0", fg = "pink4" }
+"ui.cursor.primary" = { bg = "pink3", fg = "dark_red0" }
+"ui.cursorline" = { bg = "dark_red2" }
+"ui.help" = { bg = "dark_red2", fg = "white0" }
+"ui.linenr" = { fg = "white0" }
+"ui.linenr.selected" = { fg = "pink4" }
+"ui.menu" = { fg = "white0", bg = "dark_red3" }
+"ui.menu.selected" = { fg = "orange1", bg = "dark_red1", modifiers = ["bold"] }
+"ui.popup" = { bg = "dark_red2" }
+"ui.selection" = { bg = "dark_red4" }
+"ui.selection.primary" = { bg = "dark_red3" }
+"ui.statusline" = { fg = "dark_red0", bg = "pink1" }
+"ui.statusline.inactive" = { fg = "dark_red0", bg = "pink0" }
+"ui.statusline.insert" = { fg = "dark_red0", bg = "green0" }
+"ui.statusline.normal" = { fg = "dark_red0", bg = "pink1" }
+"ui.statusline.select" = { fg = "dark_red0", bg = "blue0" }
+"ui.text" = { fg = "white0" }
+"ui.text.focus" = { fg = "orange1" }
+"ui.virtual" = { fg = "pink1" }
+"ui.virtual.indent-guide" = { fg = "dark_red4" }
+"ui.virtual.inlay-hint" = { fg = "blue0" }
+"ui.virtual.ruler" = { bg = "dark_red2" }
+"ui.virtual.whitespace" = "dark_red4"
+"ui.window" = { bg = "dark_red2" }
+
+"diagnostic.error" = { underline = { color = "orange1", style = "double_line" } }
+"diagnostic.hint" = { underline = { color = "white0", style = "double_line" } }
+"diagnostic.info" = { underline = { color = "blue0", style = "double_line" } }
+"diagnostic.warning" = { underline = { color = "green1", style = "double_line" } }
+
+"markup.bold" = { modifiers = ["bold"] }
+"markup.heading" = { fg = "orange1", modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.text" = "green1"
+"markup.link.url" = { fg = "blue0", modifiers = ["underlined"] }
+"markup.raw" = "pink2"
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+
+[palette]
+blue0     = "#65aba3"
+
+dark_red0 = "#190f0f"
+dark_red1 = "#331c1e"
+dark_red2 = "#2c1617"
+dark_red3 = "#442022"
+dark_red4 = "#704144"
+
+green0    = "#8ea84d"
+green1    = "#6db269"
+
+orange0   = "#ff7550"
+orange1   = "#eb842b"
+
+pink0     = "#622b30"
+pink1     = "#d2505f"
+pink2     = "#d95362"
+pink3     = "#c79295"
+pink4     = "#e97e8a"
+
+violet0   = "#ce8b9f"
+
+white0    = "#cebabf"

From a4a86120e8f46eccdb318828069c7c439bfb876f Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Tue, 13 Jun 2023 17:04:11 +0300
Subject: [PATCH 060/967] Fix next/prev tree-sitter inconsistency (#7332)

* Fix next/prev tree-sitter inconsistency

Before there where different results going to next or previous due to
sorting not dealing with multiple captures that start/end at the same
pos. I chose to prefer longer matches.

* Revert unnecessary change
---
 helix-core/src/movement.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index 003a1f370..2b29f36de 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -1,4 +1,4 @@
-use std::iter;
+use std::{cmp::Reverse, iter};
 
 use ropey::iter::Chars;
 use tree_sitter::{Node, QueryCursor};
@@ -527,10 +527,10 @@ pub fn goto_treesitter_object(
         let node = match dir {
             Direction::Forward => nodes
                 .filter(|n| n.start_byte() > byte_pos)
-                .min_by_key(|n| n.start_byte())?,
+                .min_by_key(|n| (n.start_byte(), Reverse(n.end_byte())))?,
             Direction::Backward => nodes
                 .filter(|n| n.end_byte() < byte_pos)
-                .max_by_key(|n| n.end_byte())?,
+                .max_by_key(|n| (n.end_byte(), Reverse(n.start_byte())))?,
         };
 
         let len = slice.len_bytes();

From 4d8c9a394ebfde3d1e0015f9632499f44ca28c57 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Tue, 13 Jun 2023 17:05:01 +0300
Subject: [PATCH 061/967] Preview scratch buffers in jumplist picker (#7331)

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

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a4f4414ab..b7a22c7b2 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2680,7 +2680,7 @@ fn jumplist_picker(cx: &mut Context) {
         |editor, meta| {
             let doc = &editor.documents.get(&meta.id)?;
             let line = meta.selection.primary().cursor_line(doc.text().slice(..));
-            Some((meta.path.clone()?.into(), Some((line, line))))
+            Some((meta.id.into(), Some((line, line))))
         },
     );
     cx.push_layer(Box::new(overlaid(picker)));

From cbe2308210e0a5fb53ab8771ab3cbfb906b79a30 Mon Sep 17 00:00:00 2001
From: Thomas Aarholt <thomasaarholt@gmail.com>
Date: Tue, 13 Jun 2023 17:07:12 +0200
Subject: [PATCH 062/967] Explain how to enter Select mode in keymap (#7333)

* Explain how to enter Select mode

Also added an equivalent explanation that Insert mode is the default, with how to return to it.

* Fix glarious typo
---
 book/src/keymap.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index add73191d..153f3b648 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -25,6 +25,8 @@
 
 ## Normal mode
 
+Normal mode is the default mode when you launch helix. Return to it from other modes by typing `Escape`.
+
 ### Movement
 
 > NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line.
@@ -337,6 +339,8 @@ These mappings are in the style of [vim-unimpaired](https://github.com/tpope/vim
 
 ## Insert mode
 
+Accessed by typing `i` in [normal mode](#normal-mode).
+
 Insert mode bindings are minimal by default. Helix is designed to
 be a modal editor, and this is reflected in the user experience and internal
 mechanics. Changes to the text are only saved for undos when
@@ -390,6 +394,8 @@ end = "no_op"
 
 ## Select / extend mode
 
+Accessed by typing `v` in [normal mode](#normal-mode).
+
 Select mode echoes Normal mode, but changes any movements to extend
 selections rather than replace them. Goto motions are also changed to
 extend, so that `vgl`, for example, extends the selection to the end of

From df094909d17469ded9782bd3fa714a7c34f20cd6 Mon Sep 17 00:00:00 2001
From: Ivan Svoboda <ivanisekeev0@gmail.com>
Date: Tue, 13 Jun 2023 21:41:30 +0600
Subject: [PATCH 063/967] Webc language support (#7290)

* feat: add webc language support

* feat: add to lang-support book webc
---
 book/src/generated/lang-support.md  | 1 +
 languages.toml                      | 9 +++++++++
 runtime/queries/webc/highlights.scm | 1 +
 runtime/queries/webc/injections.scm | 1 +
 4 files changed, 12 insertions(+)
 create mode 100644 runtime/queries/webc/highlights.scm
 create mode 100644 runtime/queries/webc/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index da37dfb34..dbf4d3e05 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -162,6 +162,7 @@
 | vue | ✓ |  |  | `vue-language-server` |
 | wast | ✓ |  |  |  |
 | wat | ✓ |  |  |  |
+| webc | ✓ |  |  |  |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
 | wit | ✓ |  | ✓ |  |
 | xit | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 63678bf40..3dec26938 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2624,3 +2624,12 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "t32"
 source = { git = "https://codeberg.org/xasc/tree-sitter-t32", rev = "1dd98248b01e4a3933c1b85b58bab0875e2ba437" }
+
+[[language]]
+name = "webc"
+scope = "text.html.webc"
+injection-regex = "webc"
+file-types = ["webc"]
+roots = []
+indent = { tab-width = 2, unit = "  " }
+grammar = "html"
diff --git a/runtime/queries/webc/highlights.scm b/runtime/queries/webc/highlights.scm
new file mode 100644
index 000000000..207cf4eea
--- /dev/null
+++ b/runtime/queries/webc/highlights.scm
@@ -0,0 +1 @@
+; inherits: html
\ No newline at end of file
diff --git a/runtime/queries/webc/injections.scm b/runtime/queries/webc/injections.scm
new file mode 100644
index 000000000..207cf4eea
--- /dev/null
+++ b/runtime/queries/webc/injections.scm
@@ -0,0 +1 @@
+; inherits: html
\ No newline at end of file

From 3fb9fafb2a366d004a04aa3d45d52e3ecfb57241 Mon Sep 17 00:00:00 2001
From: Alex <3957610+CptPotato@users.noreply.github.com>
Date: Fri, 16 Jun 2023 19:02:15 +0200
Subject: [PATCH 064/967] Add config for default line ending (#5621)

---
 book/src/configuration.md           |  1 +
 helix-core/src/lib.rs               |  2 +-
 helix-core/src/line_ending.rs       |  4 +--
 helix-term/tests/test/auto_pairs.rs |  2 +-
 helix-term/tests/test/helpers.rs    |  2 +-
 helix-view/src/document.rs          | 22 +++++++-----
 helix-view/src/editor.rs            | 52 +++++++++++++++++++++++++++--
 7 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 723e9601f..1b94ae856 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -63,6 +63,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `color-modes` | Whether to color the mode indicator with different colors depending on the mode itself | `false` |
 | `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set | `80` |
 | `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
+| `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
 
 ### `[editor.statusline]` Section
 
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 14abf0162..03fbdedfa 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -66,5 +66,5 @@ pub use syntax::Syntax;
 
 pub use diagnostic::Diagnostic;
 
-pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};
+pub use line_ending::{LineEnding, NATIVE_LINE_ENDING};
 pub use transaction::{Assoc, Change, ChangeSet, Deletion, Operation, Transaction};
diff --git a/helix-core/src/line_ending.rs b/helix-core/src/line_ending.rs
index 953d567d5..36c02a941 100644
--- a/helix-core/src/line_ending.rs
+++ b/helix-core/src/line_ending.rs
@@ -1,9 +1,9 @@
 use crate::{Rope, RopeSlice};
 
 #[cfg(target_os = "windows")]
-pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;
+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::Crlf;
 #[cfg(not(target_os = "windows"))]
-pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::LF;
+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::LF;
 
 /// Represents one of the valid Unicode line endings.
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
diff --git a/helix-term/tests/test/auto_pairs.rs b/helix-term/tests/test/auto_pairs.rs
index e10e0840b..ada488fc9 100644
--- a/helix-term/tests/test/auto_pairs.rs
+++ b/helix-term/tests/test/auto_pairs.rs
@@ -2,7 +2,7 @@ use helix_core::{auto_pairs::DEFAULT_PAIRS, hashmap};
 
 use super::*;
 
-const LINE_END: &str = helix_core::DEFAULT_LINE_ENDING.as_str();
+const LINE_END: &str = helix_core::NATIVE_LINE_ENDING.as_str();
 
 fn differing_pairs() -> impl Iterator<Item = &'static (char, char)> {
     DEFAULT_PAIRS.iter().filter(|(open, close)| open != close)
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 30fe7d0ed..6466bc764 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -244,7 +244,7 @@ pub fn test_editor_config() -> helix_view::editor::Config {
 /// 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::DEFAULT_LINE_ENDING.as_str();
+    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
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index bd3c465d4..6ec9ab973 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -8,7 +8,6 @@ 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::Range;
 use helix_vcs::{DiffHandle, DiffProviderRegistry};
 
 use ::parking_lot::Mutex;
@@ -31,8 +30,8 @@ use helix_core::{
     indent::{auto_detect_indent_style, IndentStyle},
     line_ending::auto_detect_line_ending,
     syntax::{self, LanguageConfiguration},
-    ChangeSet, Diagnostic, LineEnding, Rope, RopeBuilder, Selection, Syntax, Transaction,
-    DEFAULT_LINE_ENDING,
+    ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction,
+    NATIVE_LINE_ENDING,
 };
 
 use crate::editor::{Config, RedrawHandle};
@@ -590,6 +589,7 @@ impl Document {
         config: Arc<dyn DynAccess<Config>>,
     ) -> Self {
         let (encoding, has_bom) = encoding_with_bom_info.unwrap_or((encoding::UTF_8, false));
+        let line_ending = config.load().default_line_ending.into();
         let changes = ChangeSet::new(&text);
         let old_state = None;
 
@@ -603,7 +603,7 @@ impl Document {
             inlay_hints: HashMap::default(),
             inlay_hints_oudated: false,
             indent_style: DEFAULT_INDENT,
-            line_ending: DEFAULT_LINE_ENDING,
+            line_ending,
             restore_cursor: false,
             syntax: None,
             language: None,
@@ -623,10 +623,12 @@ impl Document {
             focused_at: std::time::Instant::now(),
         }
     }
+
     pub fn default(config: Arc<dyn DynAccess<Config>>) -> Self {
-        let text = Rope::from(DEFAULT_LINE_ENDING.as_str());
+        let text = Rope::from(NATIVE_LINE_ENDING.as_str());
         Self::from(text, None, config)
     }
+
     // TODO: async fn?
     /// Create a new document from `path`. Encoding is auto-detected, but it can be manually
     /// overwritten with the `encoding` parameter.
@@ -643,7 +645,7 @@ impl Document {
             from_reader(&mut file, encoding)?
         } else {
             let encoding = encoding.unwrap_or(encoding::UTF_8);
-            (Rope::from(DEFAULT_LINE_ENDING.as_str()), encoding, false)
+            (Rope::from(NATIVE_LINE_ENDING.as_str()), encoding, false)
         };
 
         let mut doc = Self::from(rope, Some((encoding, has_bom)), config);
@@ -887,14 +889,16 @@ impl Document {
 
     /// Detect the indentation used in the file, or otherwise defaults to the language indentation
     /// configured in `languages.toml`, with a fallback to tabs if it isn't specified. Line ending
-    /// is likewise auto-detected, and will fallback to the default OS line ending.
+    /// is likewise auto-detected, and will remain unchanged if no line endings were detected.
     pub fn detect_indent_and_line_ending(&mut self) {
         self.indent_style = auto_detect_indent_style(&self.text).unwrap_or_else(|| {
             self.language_config()
                 .and_then(|config| config.indent.as_ref())
                 .map_or(DEFAULT_INDENT, |config| IndentStyle::from_str(&config.unit))
         });
-        self.line_ending = auto_detect_line_ending(&self.text).unwrap_or(DEFAULT_LINE_ENDING);
+        if let Some(line_ending) = auto_detect_line_ending(&self.text) {
+            self.line_ending = line_ending;
+        }
     }
 
     /// Reload the document from its path.
@@ -1921,7 +1925,7 @@ mod test {
             Document::default(Arc::new(ArcSwap::new(Arc::new(Config::default()))))
                 .text()
                 .to_string(),
-            DEFAULT_LINE_ENDING.as_str()
+            NATIVE_LINE_ENDING.as_str()
         );
     }
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index b2e07c730..1a884c324 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -44,7 +44,7 @@ pub use helix_core::register::Registers;
 use helix_core::{
     auto_pairs::AutoPairs,
     syntax::{self, AutoPairConfig, SoftWrap},
-    Change,
+    Change, LineEnding, NATIVE_LINE_ENDING,
 };
 use helix_core::{Position, Selection};
 use helix_dap as dap;
@@ -273,7 +273,7 @@ pub struct Config {
     pub search: SearchConfig,
     pub lsp: LspConfig,
     pub terminal: Option<TerminalConfig>,
-    /// Column numbers at which to draw the rulers. Default to `[]`, meaning no rulers.
+    /// Column numbers at which to draw the rulers. Defaults to `[]`, meaning no rulers.
     pub rulers: Vec<u16>,
     #[serde(default)]
     pub whitespace: WhitespaceConfig,
@@ -286,6 +286,8 @@ pub struct Config {
     pub soft_wrap: SoftWrap,
     /// Workspace specific lsp ceiling dirs
     pub workspace_lsp_roots: Vec<PathBuf>,
+    /// Which line ending to choose for new documents. Defaults to `native`. i.e. `crlf` on Windows, otherwise `lf`.
+    pub default_line_ending: LineEndingConfig,
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -727,6 +729,51 @@ impl Default for IndentGuidesConfig {
     }
 }
 
+/// Line ending configuration.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum LineEndingConfig {
+    /// The platform's native line ending.
+    ///
+    /// `crlf` on Windows, otherwise `lf`.
+    Native,
+    /// Line feed.
+    LF,
+    /// Carriage return followed by line feed.
+    Crlf,
+    /// Form feed.
+    #[cfg(feature = "unicode-lines")]
+    FF,
+    /// Carriage return.
+    #[cfg(feature = "unicode-lines")]
+    CR,
+    /// Next line.
+    #[cfg(feature = "unicode-lines")]
+    Nel,
+}
+
+impl Default for LineEndingConfig {
+    fn default() -> Self {
+        LineEndingConfig::Native
+    }
+}
+
+impl From<LineEndingConfig> for LineEnding {
+    fn from(line_ending: LineEndingConfig) -> Self {
+        match line_ending {
+            LineEndingConfig::Native => NATIVE_LINE_ENDING,
+            LineEndingConfig::LF => LineEnding::LF,
+            LineEndingConfig::Crlf => LineEnding::Crlf,
+            #[cfg(feature = "unicode-lines")]
+            LineEndingConfig::FF => LineEnding::FF,
+            #[cfg(feature = "unicode-lines")]
+            LineEndingConfig::CR => LineEnding::CR,
+            #[cfg(feature = "unicode-lines")]
+            LineEndingConfig::Nel => LineEnding::Nel,
+        }
+    }
+}
+
 impl Default for Config {
     fn default() -> Self {
         Self {
@@ -771,6 +818,7 @@ impl Default for Config {
             text_width: 80,
             completion_replace: false,
             workspace_lsp_roots: Vec::new(),
+            default_line_ending: LineEndingConfig::default(),
         }
     }
 }

From d8b7232a475a7e79d86458096954b354fc4faeca Mon Sep 17 00:00:00 2001
From: spectre256 <72505298+spectre256@users.noreply.github.com>
Date: Fri, 16 Jun 2023 15:13:23 -0400
Subject: [PATCH 065/967] Add yank_joined command (#7195)

Resolves issue #6888 by adding a command to join all selections and yank
them to the specified register. The typed command takes an argument as
the separator to use when joining the selections.
---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands.rs        | 33 +++++++++++++++++++++++++++++++
 helix-term/src/commands/typed.rs  | 26 ++++++++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 5fcafd5c3..a3949960f 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -31,6 +31,7 @@
 | `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |
 | `:cquit!`, `:cq!` | Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2). |
 | `:theme` | Change the editor theme (show current theme if no name specified). |
+| `:yank-join` | Yank joined selections. A separator can be provided as first argument. Default value is newline. |
 | `:clipboard-yank` | Yank main selection into system clipboard. |
 | `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |
 | `:primary-clipboard-yank` | Yank main selection into system primary clipboard. |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b7a22c7b2..5fb4a70eb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -376,6 +376,7 @@ impl MappableCommand {
         later, "Move forward in history",
         commit_undo_checkpoint, "Commit changes to new checkpoint",
         yank, "Yank selection",
+        yank_joined, "Join and yank selections",
         yank_joined_to_clipboard, "Join and yank selections to clipboard",
         yank_main_selection_to_clipboard, "Yank main selection to clipboard",
         yank_joined_to_primary_clipboard, "Join and yank selections to primary clipboard",
@@ -3724,6 +3725,38 @@ fn yank(cx: &mut Context) {
     exit_select_mode(cx);
 }
 
+fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
+    let (view, doc) = current!(editor);
+    let text = doc.text().slice(..);
+
+    let selection = doc.selection(view.id);
+    let joined = selection
+        .fragments(text)
+        .fold(String::new(), |mut acc, fragment| {
+            if !acc.is_empty() {
+                acc.push_str(separator);
+            }
+            acc.push_str(&fragment);
+            acc
+        });
+
+    let msg = format!(
+        "joined and yanked {} selection(s) to register {}",
+        selection.len(),
+        register,
+    );
+
+    editor.registers.write(register, vec![joined]);
+    editor.set_status(msg);
+}
+
+fn yank_joined(cx: &mut Context) {
+    let line_ending = doc!(cx.editor).line_ending;
+    let register = cx.register.unwrap_or('"');
+    yank_joined_impl(cx.editor, line_ending.as_str(), register);
+    exit_select_mode(cx);
+}
+
 fn yank_joined_to_clipboard_impl(
     editor: &mut Editor,
     separator: &str,
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 80beab31d..5198e5bdf 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -895,6 +895,25 @@ fn yank_main_selection_to_clipboard(
     yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard)
 }
 
+fn yank_joined(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    ensure!(args.len() <= 1, ":yank-join takes at most 1 argument");
+
+    let doc = doc!(cx.editor);
+    let default_sep = Cow::Borrowed(doc.line_ending.as_str());
+    let separator = args.first().unwrap_or(&default_sep);
+    let register = cx.editor.selected_register.unwrap_or('"');
+    yank_joined_impl(cx.editor, separator, register);
+    Ok(())
+}
+
 fn yank_joined_to_clipboard(
     cx: &mut compositor::Context,
     args: &[Cow<str>],
@@ -2474,6 +2493,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: theme,
             signature: CommandSignature::positional(&[completers::theme]),
         },
+        TypableCommand {
+            name: "yank-join",
+            aliases: &[],
+            doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
+            fun: yank_joined,
+            signature: CommandSignature::none(),
+        },
         TypableCommand {
             name: "clipboard-yank",
             aliases: &[],

From b4fe31cad61caa64ae735db104a4d510ad14c6d7 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Fri, 16 Jun 2023 23:12:29 +0200
Subject: [PATCH 066/967] Add forth-lsp and update tree-sitter-forth (#7334)

* feat: add forth lsp and update tree sitter

* fix: update highlights
---
 book/src/generated/lang-support.md   | 2 +-
 languages.toml                       | 4 +++-
 runtime/queries/forth/highlights.scm | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index dbf4d3e05..e2f627347 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -41,7 +41,7 @@
 | erlang | ✓ | ✓ |  | `erlang_ls` |
 | esdl | ✓ |  |  |  |
 | fish | ✓ | ✓ | ✓ |  |
-| forth | ✓ |  |  |  |
+| forth | ✓ |  |  | `forth-lsp` |
 | fortran | ✓ |  | ✓ | `fortls` |
 | gdscript | ✓ | ✓ | ✓ |  |
 | git-attributes | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 3dec26938..ef7b0bf11 100644
--- a/languages.toml
+++ b/languages.toml
@@ -24,6 +24,7 @@ elm-language-server = { command = "elm-language-server" }
 elvish = { command = "elvish", args = ["-lsp"] }
 erlang-ls = { command = "erlang_ls" }
 forc = { command = "forc", args = ["lsp"] }
+forth-lsp = { command = "forth-lsp" }
 fortls = { command = "fortls", args = ["--lowercase_intrinsics"] }
 gleam = { command = "gleam", args = ["lsp"] }
 haskell-language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }
@@ -2606,11 +2607,12 @@ injection-regex = "forth"
 file-types = ["fs", "forth", "fth", "4th"]
 roots = []
 comment-token = "\\"
+language-servers = [ "forth-lsp" ]
 indent = { tab-width = 3, unit = "   " }
 
 [[grammar]]
 name = "forth"
-source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "c6fae50a17763af827604627c0fa9e4604aaac0b" }
+source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "304ed77beb113e37af38b20ff14e3c37bf350d10" }
 
 [[language]]
 name = "t32"
diff --git a/runtime/queries/forth/highlights.scm b/runtime/queries/forth/highlights.scm
index 7be0d132e..e3e494f63 100644
--- a/runtime/queries/forth/highlights.scm
+++ b/runtime/queries/forth/highlights.scm
@@ -1,7 +1,6 @@
 ([(start_definition)(end_definition)] @keyword)
-([(lparen) (rparen)] @punctuation.bracket)
-((stack_effect_sep) @punctuation)
 ((number) @constant)
+((string) @string)
 ((word) @function)
 ((comment) @comment)
 ([(core)] @type)

From d5af6031f6ccd0a3f32efbb210aec24cd9c71ab1 Mon Sep 17 00:00:00 2001
From: Alex <3957610+CptPotato@users.noreply.github.com>
Date: Sat, 17 Jun 2023 21:36:36 +0200
Subject: [PATCH 067/967] Use default line ending in open command (#7357)

---
 helix-view/src/document.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 6ec9ab973..52b2dfc0c 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -31,7 +31,6 @@ use helix_core::{
     line_ending::auto_detect_line_ending,
     syntax::{self, LanguageConfiguration},
     ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction,
-    NATIVE_LINE_ENDING,
 };
 
 use crate::editor::{Config, RedrawHandle};
@@ -625,7 +624,8 @@ impl Document {
     }
 
     pub fn default(config: Arc<dyn DynAccess<Config>>) -> Self {
-        let text = Rope::from(NATIVE_LINE_ENDING.as_str());
+        let line_ending: LineEnding = config.load().default_line_ending.into();
+        let text = Rope::from(line_ending.as_str());
         Self::from(text, None, config)
     }
 
@@ -644,8 +644,9 @@ impl Document {
                 std::fs::File::open(path).context(format!("unable to open {:?}", path))?;
             from_reader(&mut file, encoding)?
         } else {
+            let line_ending: LineEnding = config.load().default_line_ending.into();
             let encoding = encoding.unwrap_or(encoding::UTF_8);
-            (Rope::from(NATIVE_LINE_ENDING.as_str()), encoding, false)
+            (Rope::from(line_ending.as_str()), encoding, false)
         };
 
         let mut doc = Self::from(rope, Some((encoding, has_bom)), config);
@@ -1925,7 +1926,7 @@ mod test {
             Document::default(Arc::new(ArcSwap::new(Arc::new(Config::default()))))
                 .text()
                 .to_string(),
-            NATIVE_LINE_ENDING.as_str()
+            helix_core::NATIVE_LINE_ENDING.as_str()
         );
     }
 

From 40916dff6355a741f91bc47ca0a3c6443ac2d5a3 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 11:34:13 -0500
Subject: [PATCH 068/967] Move FilePicker::render from Component impl to normal
 impl

Merges the code for the Picker and FilePicker into a single Picker that
can show a file preview if a preview callback is provided. This change
was mainly made to facilitate refactoring out a simple skeleton of a
picker that does not do any filtering to be reused in a normal Picker
and a DynamicPicker (see #5714; in particular [mikes-comment] and
[gokuls-comment]).

The crux of the issue is that a picker maintains a list of predefined
options (eg. list of files in the directory) and (re-)filters them every
time the picker prompt changes, while a dynamic picker (eg. interactive
global search, #4687) recalculates the full list of options on every
prompt change. Using a filtering picker to drive a dynamic picker hence
does duplicate work of filtering thousands of matches for no reason. It
could also cause problems like interfering with the regex pattern in the
global search.

I tried to directly extract a PickerBase to be reused in Picker and
FilePicker and DynamicPicker, but the problem is that DynamicPicker is
actually a DynamicFilePicker (i.e. it can preview file contents) which
means we would need PickerBase, Picker, FilePicker, DynamicPicker and
DynamicFilePicker and then another way of sharing the previewing code
between a FilePicker and a DynamicFilePicker. By merging Picker and
FilePicker into Picker, we only need PickerBase, Picker and
DynamicPicker.

[gokuls-comment]: https://github.com/helix-editor/helix/issues/5714#issuecomment-1410949578
[mikes-comment]: https://github.com/helix-editor/helix/issues/5714#issuecomment-1407451963
---
 helix-term/src/ui/picker.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index d161f786c..c357c6d63 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -269,10 +269,8 @@ impl<T: Item + 'static> FilePicker<T> {
 
         EventResult::Consumed(callback)
     }
-}
 
-impl<T: Item + 'static> Component for FilePicker<T> {
-    fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
+    fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         // +---------+ +---------+
         // |prompt   | |preview  |
         // +---------+ |         |
@@ -416,6 +414,12 @@ impl<T: Item + 'static> Component for FilePicker<T> {
     }
 }
 
+impl<T: Item + 'static> Component for FilePicker<T> {
+    fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
+        self.render_picker(area, surface, cx);
+    }
+}
+
 #[derive(PartialEq, Eq, Debug)]
 struct PickerMatch {
     score: i64,

From 104036bd7feed66b6f5d2467d5dbf1fbaa5ff9c3 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 11:40:30 -0500
Subject: [PATCH 069/967] Copy struct fields and new() from Picker to
 FilePicker

---
 helix-term/src/ui/picker.rs | 167 ++++++++++++++++++++----------------
 1 file changed, 93 insertions(+), 74 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index c357c6d63..d1f6d45e7 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -78,6 +78,26 @@ type FileCallback<T> = Box<dyn Fn(&Editor, &T) -> Option<FileLocation>>;
 pub type FileLocation = (PathOrId, Option<(usize, usize)>);
 
 pub struct FilePicker<T: Item> {
+    options: Vec<T>,
+    editor_data: T::Data,
+    // filter: String,
+    matcher: Box<Matcher>,
+    matches: Vec<PickerMatch>,
+
+    /// Current height of the completions box
+    completion_height: u16,
+
+    cursor: usize,
+    // pattern: String,
+    prompt: Prompt,
+    previous_pattern: (String, FuzzyQuery),
+    /// Whether to show the preview panel (default true)
+    show_preview: bool,
+    /// Constraints for tabular formatting
+    widths: Vec<Constraint>,
+
+    callback_fn: PickerCallback<T>,
+
     picker: Picker<T>,
     pub truncate_start: bool,
     /// Caches paths to documents
@@ -131,17 +151,49 @@ impl<T: Item + 'static> FilePicker<T> {
         callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
         preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
     ) -> Self {
-        let truncate_start = true;
-        let mut picker = Picker::new(options, editor_data, callback_fn);
-        picker.truncate_start = truncate_start;
+        let prompt = Prompt::new(
+            "".into(),
+            None,
+            ui::completers::none,
+            |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
+        );
 
-        Self {
-            picker,
-            truncate_start,
+        let mut picker = Self {
+            options,
+            editor_data,
+            matcher: Box::default(),
+            matches: Vec::new(),
+            cursor: 0,
+            prompt,
+            previous_pattern: (String::new(), FuzzyQuery::default()),
+            truncate_start: true,
+            show_preview: true,
+            callback_fn: Box::new(callback_fn),
+            completion_height: 0,
+            widths: Vec::new(),
             preview_cache: HashMap::new(),
             read_buffer: Vec::with_capacity(1024),
             file_fn: Box::new(preview_fn),
-        }
+
+            picker: unimplemented!(),
+        };
+
+        picker.calculate_column_widths();
+
+        // scoring on empty input
+        // TODO: just reuse score()
+        picker
+            .matches
+            .extend(picker.options.iter().enumerate().map(|(index, option)| {
+                let text = option.filter_text(&picker.editor_data);
+                PickerMatch {
+                    index,
+                    score: 0,
+                    len: text.chars().count(),
+                }
+            }));
+
+        picker
     }
 
     pub fn truncate_start(mut self, truncate_start: bool) -> Self {
@@ -150,6 +202,38 @@ impl<T: Item + 'static> FilePicker<T> {
         self
     }
 
+    pub fn set_options(&mut self, new_options: Vec<T>) {
+        self.options = new_options;
+        self.cursor = 0;
+        self.force_score();
+        self.calculate_column_widths();
+    }
+
+    /// Calculate the width constraints using the maximum widths of each column
+    /// for the current options.
+    fn calculate_column_widths(&mut self) {
+        let n = self
+            .options
+            .first()
+            .map(|option| option.format(&self.editor_data).cells.len())
+            .unwrap_or_default();
+        let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
+            let row = option.format(&self.editor_data);
+            // maintain max for each column
+            for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
+                let width = cell.content.width();
+                if width > *acc {
+                    *acc = width;
+                }
+            }
+            acc
+        });
+        self.widths = max_lens
+            .into_iter()
+            .map(|len| Constraint::Length(len as u16))
+            .collect();
+    }
+
     fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
         self.picker
             .selection()
@@ -477,76 +561,11 @@ impl<T: Item> Picker<T> {
         editor_data: T::Data,
         callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
     ) -> Self {
-        let prompt = Prompt::new(
-            "".into(),
-            None,
-            ui::completers::none,
-            |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
-        );
-
-        let mut picker = Self {
-            options,
-            editor_data,
-            matcher: Box::default(),
-            matches: Vec::new(),
-            cursor: 0,
-            prompt,
-            previous_pattern: (String::new(), FuzzyQuery::default()),
-            truncate_start: true,
-            show_preview: true,
-            callback_fn: Box::new(callback_fn),
-            completion_height: 0,
-            widths: Vec::new(),
-        };
-
-        picker.calculate_column_widths();
-
-        // scoring on empty input
-        // TODO: just reuse score()
-        picker
-            .matches
-            .extend(picker.options.iter().enumerate().map(|(index, option)| {
-                let text = option.filter_text(&picker.editor_data);
-                PickerMatch {
-                    index,
-                    score: 0,
-                    len: text.chars().count(),
-                }
-            }));
-
-        picker
+        unimplemented!()
     }
 
     pub fn set_options(&mut self, new_options: Vec<T>) {
-        self.options = new_options;
-        self.cursor = 0;
-        self.force_score();
-        self.calculate_column_widths();
-    }
-
-    /// Calculate the width constraints using the maximum widths of each column
-    /// for the current options.
-    fn calculate_column_widths(&mut self) {
-        let n = self
-            .options
-            .first()
-            .map(|option| option.format(&self.editor_data).cells.len())
-            .unwrap_or_default();
-        let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
-            let row = option.format(&self.editor_data);
-            // maintain max for each column
-            for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
-                let width = cell.content.width();
-                if width > *acc {
-                    *acc = width;
-                }
-            }
-            acc
-        });
-        self.widths = max_lens
-            .into_iter()
-            .map(|len| Constraint::Length(len as u16))
-            .collect();
+        unimplemented!()
     }
 
     pub fn score(&mut self) {

From 7a058c73617bb827a57dd635bba798a972809503 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:05:17 -0500
Subject: [PATCH 070/967] Move scoring functions from Picker to FilePicker

---
 helix-term/src/ui/picker.rs | 152 +++++++++++++++++++-----------------
 1 file changed, 80 insertions(+), 72 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index d1f6d45e7..b7f593a81 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -234,6 +234,84 @@ impl<T: Item + 'static> FilePicker<T> {
             .collect();
     }
 
+    pub fn score(&mut self) {
+        let pattern = self.prompt.line();
+
+        if pattern == &self.previous_pattern.0 {
+            return;
+        }
+
+        let (query, is_refined) = self
+            .previous_pattern
+            .1
+            .refine(pattern, &self.previous_pattern.0);
+
+        if pattern.is_empty() {
+            // Fast path for no pattern.
+            self.matches.clear();
+            self.matches
+                .extend(self.options.iter().enumerate().map(|(index, option)| {
+                    let text = option.filter_text(&self.editor_data);
+                    PickerMatch {
+                        index,
+                        score: 0,
+                        len: text.chars().count(),
+                    }
+                }));
+        } else if is_refined {
+            // optimization: if the pattern is a more specific version of the previous one
+            // then we can score the filtered set.
+            self.matches.retain_mut(|pmatch| {
+                let option = &self.options[pmatch.index];
+                let text = option.sort_text(&self.editor_data);
+
+                match query.fuzzy_match(&text, &self.matcher) {
+                    Some(s) => {
+                        // Update the score
+                        pmatch.score = s;
+                        true
+                    }
+                    None => false,
+                }
+            });
+
+            self.matches.sort_unstable();
+        } else {
+            self.force_score();
+        }
+
+        // reset cursor position
+        self.cursor = 0;
+        let pattern = self.prompt.line();
+        self.previous_pattern.0.clone_from(pattern);
+        self.previous_pattern.1 = query;
+    }
+
+    pub fn force_score(&mut self) {
+        let pattern = self.prompt.line();
+
+        let query = FuzzyQuery::new(pattern);
+        self.matches.clear();
+        self.matches.extend(
+            self.options
+                .iter()
+                .enumerate()
+                .filter_map(|(index, option)| {
+                    let text = option.filter_text(&self.editor_data);
+
+                    query
+                        .fuzzy_match(&text, &self.matcher)
+                        .map(|score| PickerMatch {
+                            index,
+                            score,
+                            len: text.chars().count(),
+                        })
+                }),
+        );
+
+        self.matches.sort_unstable();
+    }
+
     fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
         self.picker
             .selection()
@@ -569,81 +647,11 @@ impl<T: Item> Picker<T> {
     }
 
     pub fn score(&mut self) {
-        let pattern = self.prompt.line();
-
-        if pattern == &self.previous_pattern.0 {
-            return;
-        }
-
-        let (query, is_refined) = self
-            .previous_pattern
-            .1
-            .refine(pattern, &self.previous_pattern.0);
-
-        if pattern.is_empty() {
-            // Fast path for no pattern.
-            self.matches.clear();
-            self.matches
-                .extend(self.options.iter().enumerate().map(|(index, option)| {
-                    let text = option.filter_text(&self.editor_data);
-                    PickerMatch {
-                        index,
-                        score: 0,
-                        len: text.chars().count(),
-                    }
-                }));
-        } else if is_refined {
-            // optimization: if the pattern is a more specific version of the previous one
-            // then we can score the filtered set.
-            self.matches.retain_mut(|pmatch| {
-                let option = &self.options[pmatch.index];
-                let text = option.sort_text(&self.editor_data);
-
-                match query.fuzzy_match(&text, &self.matcher) {
-                    Some(s) => {
-                        // Update the score
-                        pmatch.score = s;
-                        true
-                    }
-                    None => false,
-                }
-            });
-
-            self.matches.sort_unstable();
-        } else {
-            self.force_score();
-        }
-
-        // reset cursor position
-        self.cursor = 0;
-        let pattern = self.prompt.line();
-        self.previous_pattern.0.clone_from(pattern);
-        self.previous_pattern.1 = query;
+        unimplemented!()
     }
 
     pub fn force_score(&mut self) {
-        let pattern = self.prompt.line();
-
-        let query = FuzzyQuery::new(pattern);
-        self.matches.clear();
-        self.matches.extend(
-            self.options
-                .iter()
-                .enumerate()
-                .filter_map(|(index, option)| {
-                    let text = option.filter_text(&self.editor_data);
-
-                    query
-                        .fuzzy_match(&text, &self.matcher)
-                        .map(|score| PickerMatch {
-                            index,
-                            score,
-                            len: text.chars().count(),
-                        })
-                }),
-        );
-
-        self.matches.sort_unstable();
+        unimplemented!()
     }
 
     /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)

From 8516f43837005474439b7e3c8184ecc9f3df0efc Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:05:59 -0500
Subject: [PATCH 071/967] Move navigation methods from Picker to FilePicker

---
 helix-term/src/ui/picker.rs | 79 ++++++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 23 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index b7f593a81..b6d1fbb82 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -312,6 +312,55 @@ impl<T: Item + 'static> FilePicker<T> {
         self.matches.sort_unstable();
     }
 
+    /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
+    pub fn move_by(&mut self, amount: usize, direction: Direction) {
+        let len = self.matches.len();
+
+        if len == 0 {
+            // No results, can't move.
+            return;
+        }
+
+        match direction {
+            Direction::Forward => {
+                self.cursor = self.cursor.saturating_add(amount) % len;
+            }
+            Direction::Backward => {
+                self.cursor = self.cursor.saturating_add(len).saturating_sub(amount) % len;
+            }
+        }
+    }
+
+    /// Move the cursor down by exactly one page. After the last page comes the first page.
+    pub fn page_up(&mut self) {
+        self.move_by(self.completion_height as usize, Direction::Backward);
+    }
+
+    /// Move the cursor up by exactly one page. After the first page comes the last page.
+    pub fn page_down(&mut self) {
+        self.move_by(self.completion_height as usize, Direction::Forward);
+    }
+
+    /// Move the cursor to the first entry
+    pub fn to_start(&mut self) {
+        self.cursor = 0;
+    }
+
+    /// Move the cursor to the last entry
+    pub fn to_end(&mut self) {
+        self.cursor = self.matches.len().saturating_sub(1);
+    }
+
+    pub fn selection(&self) -> Option<&T> {
+        self.matches
+            .get(self.cursor)
+            .map(|pmatch| &self.options[pmatch.index])
+    }
+
+    pub fn toggle_preview(&mut self) {
+        self.show_preview = !self.show_preview;
+    }
+
     fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
         self.picker
             .selection()
@@ -656,51 +705,35 @@ impl<T: Item> Picker<T> {
 
     /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
     pub fn move_by(&mut self, amount: usize, direction: Direction) {
-        let len = self.matches.len();
-
-        if len == 0 {
-            // No results, can't move.
-            return;
-        }
-
-        match direction {
-            Direction::Forward => {
-                self.cursor = self.cursor.saturating_add(amount) % len;
-            }
-            Direction::Backward => {
-                self.cursor = self.cursor.saturating_add(len).saturating_sub(amount) % len;
-            }
-        }
+        unimplemented!()
     }
 
     /// Move the cursor down by exactly one page. After the last page comes the first page.
     pub fn page_up(&mut self) {
-        self.move_by(self.completion_height as usize, Direction::Backward);
+        unimplemented!()
     }
 
     /// Move the cursor up by exactly one page. After the first page comes the last page.
     pub fn page_down(&mut self) {
-        self.move_by(self.completion_height as usize, Direction::Forward);
+        unimplemented!()
     }
 
     /// Move the cursor to the first entry
     pub fn to_start(&mut self) {
-        self.cursor = 0;
+        unimplemented!()
     }
 
     /// Move the cursor to the last entry
     pub fn to_end(&mut self) {
-        self.cursor = self.matches.len().saturating_sub(1);
+        unimplemented!()
     }
 
     pub fn selection(&self) -> Option<&T> {
-        self.matches
-            .get(self.cursor)
-            .map(|pmatch| &self.options[pmatch.index])
+        unimplemented!()
     }
 
     pub fn toggle_preview(&mut self) {
-        self.show_preview = !self.show_preview;
+        unimplemented!()
     }
 
     fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {

From 1e66e9198c3e00afd531f155816617043e787bb0 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:07:38 -0500
Subject: [PATCH 072/967] Move handle_event methods from Picker to FilePicker

---
 helix-term/src/ui/picker.rs | 156 +++++++++++++++++++-----------------
 1 file changed, 81 insertions(+), 75 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index b6d1fbb82..0f334548b 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -361,6 +361,14 @@ impl<T: Item + 'static> FilePicker<T> {
         self.show_preview = !self.show_preview;
     }
 
+    fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
+        if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
+            // TODO: recalculate only if pattern changed
+            self.score();
+        }
+        EventResult::Consumed(None)
+    }
+
     fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
         self.picker
             .selection()
@@ -603,7 +611,77 @@ impl<T: Item + 'static> FilePicker<T> {
             return self.handle_idle_timeout(ctx);
         }
         // TODO: keybinds for scrolling preview
-        self.picker.handle_event(event, ctx)
+
+        let key_event = match event {
+            Event::Key(event) => *event,
+            Event::Paste(..) => return self.prompt_handle_event(event, ctx),
+            Event::Resize(..) => return EventResult::Consumed(None),
+            _ => return EventResult::Ignored(None),
+        };
+
+        let close_fn =
+            EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor, _ctx| {
+                // remove the layer
+                compositor.last_picker = compositor.pop();
+            })));
+
+        // So that idle timeout retriggers
+        ctx.editor.reset_idle_timer();
+
+        match key_event {
+            shift!(Tab) | key!(Up) | ctrl!('p') => {
+                self.move_by(1, Direction::Backward);
+            }
+            key!(Tab) | key!(Down) | ctrl!('n') => {
+                self.move_by(1, Direction::Forward);
+            }
+            key!(PageDown) | ctrl!('d') => {
+                self.page_down();
+            }
+            key!(PageUp) | ctrl!('u') => {
+                self.page_up();
+            }
+            key!(Home) => {
+                self.to_start();
+            }
+            key!(End) => {
+                self.to_end();
+            }
+            key!(Esc) | ctrl!('c') => {
+                return close_fn;
+            }
+            alt!(Enter) => {
+                if let Some(option) = self.selection() {
+                    (self.callback_fn)(ctx, option, Action::Load);
+                }
+            }
+            key!(Enter) => {
+                if let Some(option) = self.selection() {
+                    (self.callback_fn)(ctx, option, Action::Replace);
+                }
+                return close_fn;
+            }
+            ctrl!('s') => {
+                if let Some(option) = self.selection() {
+                    (self.callback_fn)(ctx, option, Action::HorizontalSplit);
+                }
+                return close_fn;
+            }
+            ctrl!('v') => {
+                if let Some(option) = self.selection() {
+                    (self.callback_fn)(ctx, option, Action::VerticalSplit);
+                }
+                return close_fn;
+            }
+            ctrl!('t') => {
+                self.toggle_preview();
+            }
+            _ => {
+                self.prompt_handle_event(event, ctx);
+            }
+        }
+
+        EventResult::Consumed(None)
     }
 
     fn cursor(&self, area: Rect, ctx: &Editor) -> (Option<Position>, CursorKind) {
@@ -737,11 +815,7 @@ impl<T: Item> Picker<T> {
     }
 
     fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
-        if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
-            // TODO: recalculate only if pattern changed
-            self.score();
-        }
-        EventResult::Consumed(None)
+        unimplemented!()
     }
 }
 
@@ -757,75 +831,7 @@ impl<T: Item + 'static> Component for Picker<T> {
     }
 
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
-        let key_event = match event {
-            Event::Key(event) => *event,
-            Event::Paste(..) => return self.prompt_handle_event(event, cx),
-            Event::Resize(..) => return EventResult::Consumed(None),
-            _ => return EventResult::Ignored(None),
-        };
-
-        let close_fn = EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor, _cx| {
-            // remove the layer
-            compositor.last_picker = compositor.pop();
-        })));
-
-        // So that idle timeout retriggers
-        cx.editor.reset_idle_timer();
-
-        match key_event {
-            shift!(Tab) | key!(Up) | ctrl!('p') => {
-                self.move_by(1, Direction::Backward);
-            }
-            key!(Tab) | key!(Down) | ctrl!('n') => {
-                self.move_by(1, Direction::Forward);
-            }
-            key!(PageDown) | ctrl!('d') => {
-                self.page_down();
-            }
-            key!(PageUp) | ctrl!('u') => {
-                self.page_up();
-            }
-            key!(Home) => {
-                self.to_start();
-            }
-            key!(End) => {
-                self.to_end();
-            }
-            key!(Esc) | ctrl!('c') => {
-                return close_fn;
-            }
-            alt!(Enter) => {
-                if let Some(option) = self.selection() {
-                    (self.callback_fn)(cx, option, Action::Load);
-                }
-            }
-            key!(Enter) => {
-                if let Some(option) = self.selection() {
-                    (self.callback_fn)(cx, option, Action::Replace);
-                }
-                return close_fn;
-            }
-            ctrl!('s') => {
-                if let Some(option) = self.selection() {
-                    (self.callback_fn)(cx, option, Action::HorizontalSplit);
-                }
-                return close_fn;
-            }
-            ctrl!('v') => {
-                if let Some(option) = self.selection() {
-                    (self.callback_fn)(cx, option, Action::VerticalSplit);
-                }
-                return close_fn;
-            }
-            ctrl!('t') => {
-                self.toggle_preview();
-            }
-            _ => {
-                self.prompt_handle_event(event, cx);
-            }
-        }
-
-        EventResult::Consumed(None)
+        unimplemented!()
     }
 
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {

From 49fbf8df53195d521cf03d03e288c583bcba4c7c Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:10:00 -0500
Subject: [PATCH 073/967] Move Component methods except render() to FilePicker

---
 helix-term/src/ui/picker.rs | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 0f334548b..627f94724 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -684,17 +684,19 @@ impl<T: Item + 'static> FilePicker<T> {
         EventResult::Consumed(None)
     }
 
-    fn cursor(&self, area: Rect, ctx: &Editor) -> (Option<Position>, CursorKind) {
-        self.picker.cursor(area, ctx)
+    fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
+        let block = Block::default().borders(Borders::ALL);
+        // calculate the inner area inside the box
+        let inner = block.inner(area);
+
+        // prompt area
+        let area = inner.clip_left(1).with_height(1);
+
+        self.prompt.cursor(area, editor)
     }
 
     fn required_size(&mut self, (width, height): (u16, u16)) -> Option<(u16, u16)> {
-        let picker_width = if width > MIN_AREA_WIDTH_FOR_PREVIEW {
-            width / 2
-        } else {
-            width
-        };
-        self.picker.required_size((picker_width, height))?;
+        self.completion_height = height.saturating_sub(4);
         Some((width, height))
     }
 
@@ -826,8 +828,7 @@ impl<T: Item> Picker<T> {
 
 impl<T: Item + 'static> Component for Picker<T> {
     fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
-        self.completion_height = viewport.1.saturating_sub(4);
-        Some(viewport)
+        unimplemented!()
     }
 
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
@@ -1001,14 +1002,7 @@ impl<T: Item + 'static> Component for Picker<T> {
     }
 
     fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
-        let block = Block::default().borders(Borders::ALL);
-        // calculate the inner area inside the box
-        let inner = block.inner(area);
-
-        // prompt area
-        let area = inner.clip_left(1).with_height(1);
-
-        self.prompt.cursor(area, editor)
+        unimplemented!()
     }
 }
 

From 34c8f9ab73ad7706d84f15eefddc182fd5db8b4e Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:11:24 -0500
Subject: [PATCH 074/967] Move Picker::render into FilePicker::render

---
 helix-term/src/ui/picker.rs | 330 ++++++++++++++++++------------------
 1 file changed, 167 insertions(+), 163 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 627f94724..e11dd1b76 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -490,6 +490,172 @@ impl<T: Item + 'static> FilePicker<T> {
     }
 
     fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
+        let text_style = cx.editor.theme.get("ui.text");
+        let selected = cx.editor.theme.get("ui.text.focus");
+        let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
+
+        // -- Render the frame:
+        // clear area
+        let background = cx.editor.theme.get("ui.background");
+        surface.clear_with(area, background);
+
+        // don't like this but the lifetime sucks
+        let block = Block::default().borders(Borders::ALL);
+
+        // calculate the inner area inside the box
+        let inner = block.inner(area);
+
+        block.render(area, surface);
+
+        // -- Render the input bar:
+
+        let area = inner.clip_left(1).with_height(1);
+
+        let count = format!("{}/{}", self.matches.len(), self.options.len());
+        surface.set_stringn(
+            (area.x + area.width).saturating_sub(count.len() as u16 + 1),
+            area.y,
+            &count,
+            (count.len()).min(area.width as usize),
+            text_style,
+        );
+
+        self.prompt.render(area, surface, cx);
+
+        // -- Separator
+        let sep_style = cx.editor.theme.get("ui.background.separator");
+        let borders = BorderType::line_symbols(BorderType::Plain);
+        for x in inner.left()..inner.right() {
+            if let Some(cell) = surface.get_mut(x, inner.y + 1) {
+                cell.set_symbol(borders.horizontal).set_style(sep_style);
+            }
+        }
+
+        // -- Render the contents:
+        // subtract area of prompt from top
+        let inner = inner.clip_top(2);
+
+        let rows = inner.height;
+        let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));
+        let cursor = self.cursor.saturating_sub(offset);
+
+        let options = self
+            .matches
+            .iter()
+            .skip(offset)
+            .take(rows as usize)
+            .map(|pmatch| &self.options[pmatch.index])
+            .map(|option| option.format(&self.editor_data))
+            .map(|mut row| {
+                const TEMP_CELL_SEP: &str = " ";
+
+                let line = row.cell_text().fold(String::new(), |mut s, frag| {
+                    s.push_str(&frag);
+                    s.push_str(TEMP_CELL_SEP);
+                    s
+                });
+
+                // Items are filtered by using the text returned by menu::Item::filter_text
+                // but we do highlighting here using the text in Row and therefore there
+                // might be inconsistencies. This is the best we can do since only the
+                // text in Row is displayed to the end user.
+                let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
+                    .fuzzy_indices(&line, &self.matcher)
+                    .unwrap_or_default();
+
+                let highlight_byte_ranges: Vec<_> = line
+                    .char_indices()
+                    .enumerate()
+                    .filter_map(|(char_idx, (byte_offset, ch))| {
+                        highlights
+                            .contains(&char_idx)
+                            .then(|| byte_offset..byte_offset + ch.len_utf8())
+                    })
+                    .collect();
+
+                // The starting byte index of the current (iterating) cell
+                let mut cell_start_byte_offset = 0;
+                for cell in row.cells.iter_mut() {
+                    let spans = match cell.content.lines.get(0) {
+                        Some(s) => s,
+                        None => {
+                            cell_start_byte_offset += TEMP_CELL_SEP.len();
+                            continue;
+                        }
+                    };
+
+                    let mut cell_len = 0;
+
+                    let graphemes_with_style: Vec<_> = spans
+                        .0
+                        .iter()
+                        .flat_map(|span| {
+                            span.content
+                                .grapheme_indices(true)
+                                .zip(std::iter::repeat(span.style))
+                        })
+                        .map(|((grapheme_byte_offset, grapheme), style)| {
+                            cell_len += grapheme.len();
+                            let start = cell_start_byte_offset;
+
+                            let grapheme_byte_range =
+                                grapheme_byte_offset..grapheme_byte_offset + grapheme.len();
+
+                            if highlight_byte_ranges.iter().any(|hl_rng| {
+                                hl_rng.start >= start + grapheme_byte_range.start
+                                    && hl_rng.end <= start + grapheme_byte_range.end
+                            }) {
+                                (grapheme, style.patch(highlight_style))
+                            } else {
+                                (grapheme, style)
+                            }
+                        })
+                        .collect();
+
+                    let mut span_list: Vec<(String, Style)> = Vec::new();
+                    for (grapheme, style) in graphemes_with_style {
+                        if span_list.last().map(|(_, sty)| sty) == Some(&style) {
+                            let (string, _) = span_list.last_mut().unwrap();
+                            string.push_str(grapheme);
+                        } else {
+                            span_list.push((String::from(grapheme), style))
+                        }
+                    }
+
+                    let spans: Vec<Span> = span_list
+                        .into_iter()
+                        .map(|(string, style)| Span::styled(string, style))
+                        .collect();
+                    let spans: Spans = spans.into();
+                    *cell = Cell::from(spans);
+
+                    cell_start_byte_offset += cell_len + TEMP_CELL_SEP.len();
+                }
+
+                row
+            });
+
+        let table = Table::new(options)
+            .style(text_style)
+            .highlight_style(selected)
+            .highlight_symbol(" > ")
+            .column_spacing(1)
+            .widths(&self.widths);
+
+        use tui::widgets::TableState;
+
+        table.render_table(
+            inner,
+            surface,
+            &mut TableState {
+                offset: 0,
+                selected: Some(cursor),
+            },
+            self.truncate_start,
+        );
+    }
+
+    fn render_preview(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         // +---------+ +---------+
         // |prompt   | |preview  |
         // +---------+ |         |
@@ -836,169 +1002,7 @@ impl<T: Item + 'static> Component for Picker<T> {
     }
 
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
-        let text_style = cx.editor.theme.get("ui.text");
-        let selected = cx.editor.theme.get("ui.text.focus");
-        let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
-
-        // -- Render the frame:
-        // clear area
-        let background = cx.editor.theme.get("ui.background");
-        surface.clear_with(area, background);
-
-        // don't like this but the lifetime sucks
-        let block = Block::default().borders(Borders::ALL);
-
-        // calculate the inner area inside the box
-        let inner = block.inner(area);
-
-        block.render(area, surface);
-
-        // -- Render the input bar:
-
-        let area = inner.clip_left(1).with_height(1);
-
-        let count = format!("{}/{}", self.matches.len(), self.options.len());
-        surface.set_stringn(
-            (area.x + area.width).saturating_sub(count.len() as u16 + 1),
-            area.y,
-            &count,
-            (count.len()).min(area.width as usize),
-            text_style,
-        );
-
-        self.prompt.render(area, surface, cx);
-
-        // -- Separator
-        let sep_style = cx.editor.theme.get("ui.background.separator");
-        let borders = BorderType::line_symbols(BorderType::Plain);
-        for x in inner.left()..inner.right() {
-            if let Some(cell) = surface.get_mut(x, inner.y + 1) {
-                cell.set_symbol(borders.horizontal).set_style(sep_style);
-            }
-        }
-
-        // -- Render the contents:
-        // subtract area of prompt from top
-        let inner = inner.clip_top(2);
-
-        let rows = inner.height;
-        let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));
-        let cursor = self.cursor.saturating_sub(offset);
-
-        let options = self
-            .matches
-            .iter()
-            .skip(offset)
-            .take(rows as usize)
-            .map(|pmatch| &self.options[pmatch.index])
-            .map(|option| option.format(&self.editor_data))
-            .map(|mut row| {
-                const TEMP_CELL_SEP: &str = " ";
-
-                let line = row.cell_text().fold(String::new(), |mut s, frag| {
-                    s.push_str(&frag);
-                    s.push_str(TEMP_CELL_SEP);
-                    s
-                });
-
-                // Items are filtered by using the text returned by menu::Item::filter_text
-                // but we do highlighting here using the text in Row and therefore there
-                // might be inconsistencies. This is the best we can do since only the
-                // text in Row is displayed to the end user.
-                let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
-                    .fuzzy_indices(&line, &self.matcher)
-                    .unwrap_or_default();
-
-                let highlight_byte_ranges: Vec<_> = line
-                    .char_indices()
-                    .enumerate()
-                    .filter_map(|(char_idx, (byte_offset, ch))| {
-                        highlights
-                            .contains(&char_idx)
-                            .then(|| byte_offset..byte_offset + ch.len_utf8())
-                    })
-                    .collect();
-
-                // The starting byte index of the current (iterating) cell
-                let mut cell_start_byte_offset = 0;
-                for cell in row.cells.iter_mut() {
-                    let spans = match cell.content.lines.get(0) {
-                        Some(s) => s,
-                        None => {
-                            cell_start_byte_offset += TEMP_CELL_SEP.len();
-                            continue;
-                        }
-                    };
-
-                    let mut cell_len = 0;
-
-                    let graphemes_with_style: Vec<_> = spans
-                        .0
-                        .iter()
-                        .flat_map(|span| {
-                            span.content
-                                .grapheme_indices(true)
-                                .zip(std::iter::repeat(span.style))
-                        })
-                        .map(|((grapheme_byte_offset, grapheme), style)| {
-                            cell_len += grapheme.len();
-                            let start = cell_start_byte_offset;
-
-                            let grapheme_byte_range =
-                                grapheme_byte_offset..grapheme_byte_offset + grapheme.len();
-
-                            if highlight_byte_ranges.iter().any(|hl_rng| {
-                                hl_rng.start >= start + grapheme_byte_range.start
-                                    && hl_rng.end <= start + grapheme_byte_range.end
-                            }) {
-                                (grapheme, style.patch(highlight_style))
-                            } else {
-                                (grapheme, style)
-                            }
-                        })
-                        .collect();
-
-                    let mut span_list: Vec<(String, Style)> = Vec::new();
-                    for (grapheme, style) in graphemes_with_style {
-                        if span_list.last().map(|(_, sty)| sty) == Some(&style) {
-                            let (string, _) = span_list.last_mut().unwrap();
-                            string.push_str(grapheme);
-                        } else {
-                            span_list.push((String::from(grapheme), style))
-                        }
-                    }
-
-                    let spans: Vec<Span> = span_list
-                        .into_iter()
-                        .map(|(string, style)| Span::styled(string, style))
-                        .collect();
-                    let spans: Spans = spans.into();
-                    *cell = Cell::from(spans);
-
-                    cell_start_byte_offset += cell_len + TEMP_CELL_SEP.len();
-                }
-
-                row
-            });
-
-        let table = Table::new(options)
-            .style(text_style)
-            .highlight_style(selected)
-            .highlight_symbol(" > ")
-            .column_spacing(1)
-            .widths(&self.widths);
-
-        use tui::widgets::TableState;
-
-        table.render_table(
-            inner,
-            surface,
-            &mut TableState {
-                offset: 0,
-                selected: Some(cursor),
-            },
-            self.truncate_start,
-        );
+        unimplemented!()
     }
 
     fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {

From 15cc09fc81d971cb9dbc2d5132e43919601190c2 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:14:09 -0500
Subject: [PATCH 075/967] Render the preview in FilePicker

---
 helix-term/src/ui/picker.rs | 50 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index e11dd1b76..902c16a0e 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -656,44 +656,21 @@ impl<T: Item + 'static> FilePicker<T> {
     }
 
     fn render_preview(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
-        // +---------+ +---------+
-        // |prompt   | |preview  |
-        // +---------+ |         |
-        // |picker   | |         |
-        // |         | |         |
-        // +---------+ +---------+
-
-        let render_preview = self.picker.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
         // -- Render the frame:
         // clear area
         let background = cx.editor.theme.get("ui.background");
         let text = cx.editor.theme.get("ui.text");
         surface.clear_with(area, background);
 
-        let picker_width = if render_preview {
-            area.width / 2
-        } else {
-            area.width
-        };
-
-        let picker_area = area.with_width(picker_width);
-        self.picker.render(picker_area, surface, cx);
-
-        if !render_preview {
-            return;
-        }
-
-        let preview_area = area.clip_left(picker_width);
-
         // don't like this but the lifetime sucks
         let block = Block::default().borders(Borders::ALL);
 
         // calculate the inner area inside the box
-        let inner = block.inner(preview_area);
+        let inner = block.inner(area);
         // 1 column gap on either side
         let margin = Margin::horizontal(1);
         let inner = inner.inner(&margin);
-        block.render(preview_area, surface);
+        block.render(area, surface);
 
         if let Some((path, range)) = self.current_file(cx.editor) {
             let preview = self.get_preview(path, cx.editor);
@@ -873,7 +850,28 @@ impl<T: Item + 'static> FilePicker<T> {
 
 impl<T: Item + 'static> Component for FilePicker<T> {
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
-        self.render_picker(area, surface, cx);
+        // +---------+ +---------+
+        // |prompt   | |preview  |
+        // +---------+ |         |
+        // |picker   | |         |
+        // |         | |         |
+        // +---------+ +---------+
+
+        let render_preview = self.picker.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
+
+        let picker_width = if render_preview {
+            area.width / 2
+        } else {
+            area.width
+        };
+
+        let picker_area = area.with_width(picker_width);
+        self.render_picker(picker_area, surface, cx);
+
+        if render_preview {
+            let preview_area = area.clip_left(picker_width);
+            self.render_preview(preview_area, surface, cx);
+        }
     }
 }
 

From fc111213b5b5a3130399cda8a1964fa89acf153a Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:14:41 -0500
Subject: [PATCH 076/967] Move FilePicker struct def closer to impl block

---
 helix-term/src/ui/picker.rs | 60 ++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 902c16a0e..c06918d4d 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -77,36 +77,6 @@ type FileCallback<T> = Box<dyn Fn(&Editor, &T) -> Option<FileLocation>>;
 /// File path and range of lines (used to align and highlight lines)
 pub type FileLocation = (PathOrId, Option<(usize, usize)>);
 
-pub struct FilePicker<T: Item> {
-    options: Vec<T>,
-    editor_data: T::Data,
-    // filter: String,
-    matcher: Box<Matcher>,
-    matches: Vec<PickerMatch>,
-
-    /// Current height of the completions box
-    completion_height: u16,
-
-    cursor: usize,
-    // pattern: String,
-    prompt: Prompt,
-    previous_pattern: (String, FuzzyQuery),
-    /// Whether to show the preview panel (default true)
-    show_preview: bool,
-    /// Constraints for tabular formatting
-    widths: Vec<Constraint>,
-
-    callback_fn: PickerCallback<T>,
-
-    picker: Picker<T>,
-    pub truncate_start: bool,
-    /// Caches paths to documents
-    preview_cache: HashMap<PathBuf, CachedPreview>,
-    read_buffer: Vec<u8>,
-    /// Given an item in the picker, return the file path and line number to display.
-    file_fn: FileCallback<T>,
-}
-
 pub enum CachedPreview {
     Document(Box<Document>),
     Binary,
@@ -144,6 +114,36 @@ impl Preview<'_, '_> {
     }
 }
 
+pub struct FilePicker<T: Item> {
+    options: Vec<T>,
+    editor_data: T::Data,
+    // filter: String,
+    matcher: Box<Matcher>,
+    matches: Vec<PickerMatch>,
+
+    /// Current height of the completions box
+    completion_height: u16,
+
+    cursor: usize,
+    // pattern: String,
+    prompt: Prompt,
+    previous_pattern: (String, FuzzyQuery),
+    /// Whether to show the preview panel (default true)
+    show_preview: bool,
+    /// Constraints for tabular formatting
+    widths: Vec<Constraint>,
+
+    callback_fn: PickerCallback<T>,
+
+    picker: Picker<T>,
+    pub truncate_start: bool,
+    /// Caches paths to documents
+    preview_cache: HashMap<PathBuf, CachedPreview>,
+    read_buffer: Vec<u8>,
+    /// Given an item in the picker, return the file path and line number to display.
+    file_fn: FileCallback<T>,
+}
+
 impl<T: Item + 'static> FilePicker<T> {
     pub fn new(
         options: Vec<T>,

From 545acfda8884c890b78e586c86e4f7c5f9a15477 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 18 Jun 2023 12:23:15 -0500
Subject: [PATCH 077/967] Make file preview callback optional

When Picker and FilePicker are merged, not all Pickers will be able to
show a preview.

Co-authored-by: Gokul Soumya <gokulps15@gmail.com>
---
 helix-term/src/commands.rs     | 46 ++++++++---------
 helix-term/src/commands/dap.rs | 92 ++++++++++++++++------------------
 helix-term/src/commands/lsp.rs | 80 +++++++++++++----------------
 helix-term/src/ui/mod.rs       | 26 ++++------
 helix-term/src/ui/picker.rs    | 15 ++++--
 5 files changed, 121 insertions(+), 138 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5fb4a70eb..b760b6924 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2184,11 +2184,9 @@ fn global_search(cx: &mut Context) {
 
                         doc.set_selection(view.id, Selection::single(start, end));
                         align_view(doc, view, Align::Center);
-                    },
-                    |_editor, FileResult { path, line_num }| {
+                    }).with_preview(|_editor, FileResult { path, line_num }| {
                         Some((path.clone().into(), Some((*line_num, *line_num))))
-                    },
-                );
+                    });
                 compositor.push(Box::new(overlaid(picker)));
             },
         ));
@@ -2579,22 +2577,18 @@ fn buffer_picker(cx: &mut Context) {
     // mru
     items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
 
-    let picker = FilePicker::new(
-        items,
-        (),
-        |cx, meta, action| {
-            cx.editor.switch(meta.id, action);
-        },
-        |editor, meta| {
-            let doc = &editor.documents.get(&meta.id)?;
-            let &view_id = doc.selections().keys().next()?;
-            let line = doc
-                .selection(view_id)
-                .primary()
-                .cursor_line(doc.text().slice(..));
-            Some((meta.id.into(), Some((line, line))))
-        },
-    );
+    let picker = FilePicker::new(items, (), |cx, meta, action| {
+        cx.editor.switch(meta.id, action);
+    })
+    .with_preview(|editor, meta| {
+        let doc = &editor.documents.get(&meta.id)?;
+        let &view_id = doc.selections().keys().next()?;
+        let line = doc
+            .selection(view_id)
+            .primary()
+            .cursor_line(doc.text().slice(..));
+        Some((meta.id.into(), Some((line, line))))
+    });
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
@@ -2678,12 +2672,12 @@ fn jumplist_picker(cx: &mut Context) {
             doc.set_selection(view.id, meta.selection.clone());
             view.ensure_cursor_in_view_center(doc, config.scrolloff);
         },
-        |editor, meta| {
-            let doc = &editor.documents.get(&meta.id)?;
-            let line = meta.selection.primary().cursor_line(doc.text().slice(..));
-            Some((meta.id.into(), Some((line, line))))
-        },
-    );
+    )
+    .with_preview(|editor, meta| {
+        let doc = &editor.documents.get(&meta.id)?;
+        let line = meta.selection.primary().cursor_line(doc.text().slice(..));
+        Some((meta.id.into(), Some((line, line))))
+    });
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index 84794bedf..2684e9469 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -73,21 +73,19 @@ fn thread_picker(
             let debugger = debugger!(editor);
 
             let thread_states = debugger.thread_states.clone();
-            let picker = FilePicker::new(
-                threads,
-                thread_states,
-                move |cx, thread, _action| callback_fn(cx.editor, thread),
-                move |editor, thread| {
-                    let frames = editor.debugger.as_ref()?.stack_frames.get(&thread.id)?;
-                    let frame = frames.get(0)?;
-                    let path = frame.source.as_ref()?.path.clone()?;
-                    let pos = Some((
-                        frame.line.saturating_sub(1),
-                        frame.end_line.unwrap_or(frame.line).saturating_sub(1),
-                    ));
-                    Some((path.into(), pos))
-                },
-            );
+            let picker = FilePicker::new(threads, thread_states, move |cx, thread, _action| {
+                callback_fn(cx.editor, thread)
+            })
+            .with_preview(move |editor, thread| {
+                let frames = editor.debugger.as_ref()?.stack_frames.get(&thread.id)?;
+                let frame = frames.get(0)?;
+                let path = frame.source.as_ref()?.path.clone()?;
+                let pos = Some((
+                    frame.line.saturating_sub(1),
+                    frame.end_line.unwrap_or(frame.line).saturating_sub(1),
+                ));
+                Some((path.into(), pos))
+            });
             compositor.push(Box::new(picker));
         },
     );
@@ -728,39 +726,35 @@ pub fn dap_switch_stack_frame(cx: &mut Context) {
 
     let frames = debugger.stack_frames[&thread_id].clone();
 
-    let picker = FilePicker::new(
-        frames,
-        (),
-        move |cx, frame, _action| {
-            let debugger = debugger!(cx.editor);
-            // TODO: this should be simpler to find
-            let pos = debugger.stack_frames[&thread_id]
-                .iter()
-                .position(|f| f.id == frame.id);
-            debugger.active_frame = pos;
-
-            let frame = debugger.stack_frames[&thread_id]
-                .get(pos.unwrap_or(0))
-                .cloned();
-            if let Some(frame) = &frame {
-                jump_to_stack_frame(cx.editor, frame);
-            }
-        },
-        move |_editor, frame| {
-            frame
-                .source
-                .as_ref()
-                .and_then(|source| source.path.clone())
-                .map(|path| {
-                    (
-                        path.into(),
-                        Some((
-                            frame.line.saturating_sub(1),
-                            frame.end_line.unwrap_or(frame.line).saturating_sub(1),
-                        )),
-                    )
-                })
-        },
-    );
+    let picker = FilePicker::new(frames, (), move |cx, frame, _action| {
+        let debugger = debugger!(cx.editor);
+        // TODO: this should be simpler to find
+        let pos = debugger.stack_frames[&thread_id]
+            .iter()
+            .position(|f| f.id == frame.id);
+        debugger.active_frame = pos;
+
+        let frame = debugger.stack_frames[&thread_id]
+            .get(pos.unwrap_or(0))
+            .cloned();
+        if let Some(frame) = &frame {
+            jump_to_stack_frame(cx.editor, frame);
+        }
+    })
+    .with_preview(move |_editor, frame| {
+        frame
+            .source
+            .as_ref()
+            .and_then(|source| source.path.clone())
+            .map(|path| {
+                (
+                    path.into(),
+                    Some((
+                        frame.line.saturating_sub(1),
+                        frame.end_line.unwrap_or(frame.line).saturating_sub(1),
+                    )),
+                )
+            })
+    });
     cx.push_layer(Box::new(picker))
 }
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 8c3fd13b5..7cc2eaf84 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -240,44 +240,40 @@ type SymbolPicker = FilePicker<SymbolInformationItem>;
 
 fn sym_picker(symbols: Vec<SymbolInformationItem>, current_path: Option<lsp::Url>) -> SymbolPicker {
     // TODO: drop current_path comparison and instead use workspace: bool flag?
-    FilePicker::new(
-        symbols,
-        current_path.clone(),
-        move |cx, item, action| {
-            let (view, doc) = current!(cx.editor);
-            push_jump(view, doc);
-
-            if current_path.as_ref() != Some(&item.symbol.location.uri) {
-                let uri = &item.symbol.location.uri;
-                let path = match uri.to_file_path() {
-                    Ok(path) => path,
-                    Err(_) => {
-                        let err = format!("unable to convert URI to filepath: {}", uri);
-                        cx.editor.set_error(err);
-                        return;
-                    }
-                };
-                if let Err(err) = cx.editor.open(&path, action) {
-                    let err = format!("failed to open document: {}: {}", uri, err);
-                    log::error!("{}", err);
+    FilePicker::new(symbols, current_path.clone(), move |cx, item, action| {
+        let (view, doc) = current!(cx.editor);
+        push_jump(view, doc);
+
+        if current_path.as_ref() != Some(&item.symbol.location.uri) {
+            let uri = &item.symbol.location.uri;
+            let path = match uri.to_file_path() {
+                Ok(path) => path,
+                Err(_) => {
+                    let err = format!("unable to convert URI to filepath: {}", uri);
                     cx.editor.set_error(err);
                     return;
                 }
+            };
+            if let Err(err) = cx.editor.open(&path, action) {
+                let err = format!("failed to open document: {}: {}", uri, err);
+                log::error!("{}", err);
+                cx.editor.set_error(err);
+                return;
             }
+        }
 
-            let (view, doc) = current!(cx.editor);
+        let (view, doc) = current!(cx.editor);
 
-            if let Some(range) =
-                lsp_range_to_range(doc.text(), item.symbol.location.range, item.offset_encoding)
-            {
-                // we flip the range so that the cursor sits on the start of the symbol
-                // (for example start of the function).
-                doc.set_selection(view.id, Selection::single(range.head, range.anchor));
-                align_view(doc, view, Align::Center);
-            }
-        },
-        move |_editor, item| Some(location_to_file_location(&item.symbol.location)),
-    )
+        if let Some(range) =
+            lsp_range_to_range(doc.text(), item.symbol.location.range, item.offset_encoding)
+        {
+            // we flip the range so that the cursor sits on the start of the symbol
+            // (for example start of the function).
+            doc.set_selection(view.id, Selection::single(range.head, range.anchor));
+            align_view(doc, view, Align::Center);
+        }
+    })
+    .with_preview(move |_editor, item| Some(location_to_file_location(&item.symbol.location)))
     .truncate_start(false)
 }
 
@@ -345,11 +341,11 @@ fn diag_picker(
                 align_view(doc, view, Align::Center);
             }
         },
-        move |_editor, PickerDiagnostic { url, diag, .. }| {
-            let location = lsp::Location::new(url.clone(), diag.range);
-            Some(location_to_file_location(&location))
-        },
     )
+    .with_preview(move |_editor, PickerDiagnostic { url, diag, .. }| {
+        let location = lsp::Location::new(url.clone(), diag.range);
+        Some(location_to_file_location(&location))
+    })
     .truncate_start(false)
 }
 
@@ -1047,14 +1043,10 @@ fn goto_impl(
             editor.set_error("No definition found.");
         }
         _locations => {
-            let picker = FilePicker::new(
-                locations,
-                cwdir,
-                move |cx, location, action| {
-                    jump_to_location(cx.editor, location, offset_encoding, action)
-                },
-                move |_editor, location| Some(location_to_file_location(location)),
-            );
+            let picker = FilePicker::new(locations, cwdir, move |cx, location, action| {
+                jump_to_location(cx.editor, location, offset_encoding, action)
+            })
+            .with_preview(move |_editor, location| Some(location_to_file_location(location)));
             compositor.push(Box::new(overlaid(picker)));
         }
     }
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index ec328ec55..c5e66d865 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -217,21 +217,17 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
 
-    FilePicker::new(
-        files,
-        root,
-        move |cx, path: &PathBuf, action| {
-            if let Err(e) = cx.editor.open(path, action) {
-                let err = if let Some(err) = e.source() {
-                    format!("{}", err)
-                } else {
-                    format!("unable to open \"{}\"", path.display())
-                };
-                cx.editor.set_error(err);
-            }
-        },
-        |_editor, path| Some((path.clone().into(), None)),
-    )
+    FilePicker::new(files, root, move |cx, path: &PathBuf, action| {
+        if let Err(e) = cx.editor.open(path, action) {
+            let err = if let Some(err) = e.source() {
+                format!("{}", err)
+            } else {
+                format!("unable to open \"{}\"", path.display())
+            };
+            cx.editor.set_error(err);
+        }
+    })
+    .with_preview(|_editor, path| Some((path.clone().into(), None)))
 }
 
 pub mod completers {
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index c06918d4d..001526c44 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -141,7 +141,7 @@ pub struct FilePicker<T: Item> {
     preview_cache: HashMap<PathBuf, CachedPreview>,
     read_buffer: Vec<u8>,
     /// Given an item in the picker, return the file path and line number to display.
-    file_fn: FileCallback<T>,
+    file_fn: Option<FileCallback<T>>,
 }
 
 impl<T: Item + 'static> FilePicker<T> {
@@ -149,7 +149,6 @@ impl<T: Item + 'static> FilePicker<T> {
         options: Vec<T>,
         editor_data: T::Data,
         callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
-        preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
     ) -> Self {
         let prompt = Prompt::new(
             "".into(),
@@ -173,7 +172,7 @@ impl<T: Item + 'static> FilePicker<T> {
             widths: Vec::new(),
             preview_cache: HashMap::new(),
             read_buffer: Vec::with_capacity(1024),
-            file_fn: Box::new(preview_fn),
+            file_fn: None,
 
             picker: unimplemented!(),
         };
@@ -202,6 +201,14 @@ impl<T: Item + 'static> FilePicker<T> {
         self
     }
 
+    pub fn with_preview(
+        mut self,
+        preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
+    ) -> Self {
+        self.file_fn = Some(Box::new(preview_fn));
+        self
+    }
+
     pub fn set_options(&mut self, new_options: Vec<T>) {
         self.options = new_options;
         self.cursor = 0;
@@ -372,7 +379,7 @@ impl<T: Item + 'static> FilePicker<T> {
     fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
         self.picker
             .selection()
-            .and_then(|current| (self.file_fn)(editor, current))
+            .and_then(|current| (self.file_fn.as_ref()?)(editor, current))
             .and_then(|(path_or_id, line)| path_or_id.get_canonicalized().ok().zip(Some(line)))
     }
 

From f18acadbd0d7b15bc314fc3ede99f4546b72d76d Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Jun 2023 12:27:11 -0500
Subject: [PATCH 078/967] Completely remove old Picker and rename FilePicker to
 Picker

---
 helix-term/src/commands.rs     |  10 +--
 helix-term/src/commands/dap.rs |   6 +-
 helix-term/src/commands/lsp.rs |  14 ++--
 helix-term/src/ui/mod.rs       |   6 +-
 helix-term/src/ui/picker.rs    | 133 +++------------------------------
 5 files changed, 27 insertions(+), 142 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b760b6924..2c9295f11 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -55,8 +55,8 @@ use crate::{
     job::Callback,
     keymap::ReverseKeymap,
     ui::{
-        self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem,
-        FilePicker, Picker, Popup, Prompt, PromptEvent,
+        self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem, Picker,
+        Popup, Prompt, PromptEvent,
     },
 };
 
@@ -2156,7 +2156,7 @@ fn global_search(cx: &mut Context) {
                     return;
                 }
 
-                let picker = FilePicker::new(
+                let picker = Picker::new(
                     all_matches,
                     current_path,
                     move |cx, FileResult { path, line_num }, action| {
@@ -2577,7 +2577,7 @@ fn buffer_picker(cx: &mut Context) {
     // mru
     items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
 
-    let picker = FilePicker::new(items, (), |cx, meta, action| {
+    let picker = Picker::new(items, (), |cx, meta, action| {
         cx.editor.switch(meta.id, action);
     })
     .with_preview(|editor, meta| {
@@ -2654,7 +2654,7 @@ fn jumplist_picker(cx: &mut Context) {
         }
     };
 
-    let picker = FilePicker::new(
+    let picker = Picker::new(
         cx.editor
             .tree
             .views()
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index 2684e9469..70a5ec212 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -2,7 +2,7 @@ use super::{Context, Editor};
 use crate::{
     compositor::{self, Compositor},
     job::{Callback, Jobs},
-    ui::{self, overlay::overlaid, FilePicker, Picker, Popup, Prompt, PromptEvent, Text},
+    ui::{self, overlay::overlaid, Picker, Popup, Prompt, PromptEvent, Text},
 };
 use dap::{StackFrame, Thread, ThreadStates};
 use helix_core::syntax::{DebugArgumentValue, DebugConfigCompletion, DebugTemplate};
@@ -73,7 +73,7 @@ fn thread_picker(
             let debugger = debugger!(editor);
 
             let thread_states = debugger.thread_states.clone();
-            let picker = FilePicker::new(threads, thread_states, move |cx, thread, _action| {
+            let picker = Picker::new(threads, thread_states, move |cx, thread, _action| {
                 callback_fn(cx.editor, thread)
             })
             .with_preview(move |editor, thread| {
@@ -726,7 +726,7 @@ pub fn dap_switch_stack_frame(cx: &mut Context) {
 
     let frames = debugger.stack_frames[&thread_id].clone();
 
-    let picker = FilePicker::new(frames, (), move |cx, frame, _action| {
+    let picker = Picker::new(frames, (), move |cx, frame, _action| {
         let debugger = debugger!(cx.editor);
         // TODO: this should be simpler to find
         let pos = debugger.stack_frames[&thread_id]
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 7cc2eaf84..55153648a 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -31,8 +31,8 @@ use crate::{
     compositor::{self, Compositor},
     job::Callback,
     ui::{
-        self, lsp::SignatureHelp, overlay::overlaid, DynamicPicker, FileLocation, FilePicker,
-        Popup, PromptEvent,
+        self, lsp::SignatureHelp, overlay::overlaid, DynamicPicker, FileLocation, Picker, Popup,
+        PromptEvent,
     },
 };
 
@@ -236,11 +236,11 @@ fn jump_to_location(
     align_view(doc, view, Align::Center);
 }
 
-type SymbolPicker = FilePicker<SymbolInformationItem>;
+type SymbolPicker = Picker<SymbolInformationItem>;
 
 fn sym_picker(symbols: Vec<SymbolInformationItem>, current_path: Option<lsp::Url>) -> SymbolPicker {
     // TODO: drop current_path comparison and instead use workspace: bool flag?
-    FilePicker::new(symbols, current_path.clone(), move |cx, item, action| {
+    Picker::new(symbols, current_path.clone(), move |cx, item, action| {
         let (view, doc) = current!(cx.editor);
         push_jump(view, doc);
 
@@ -288,7 +288,7 @@ fn diag_picker(
     diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
     current_path: Option<lsp::Url>,
     format: DiagnosticsFormat,
-) -> FilePicker<PickerDiagnostic> {
+) -> Picker<PickerDiagnostic> {
     // TODO: drop current_path comparison and instead use workspace: bool flag?
 
     // flatten the map to a vec of (url, diag) pairs
@@ -314,7 +314,7 @@ fn diag_picker(
         error: cx.editor.theme.get("error"),
     };
 
-    FilePicker::new(
+    Picker::new(
         flat_diag,
         (styles, format),
         move |cx,
@@ -1043,7 +1043,7 @@ fn goto_impl(
             editor.set_error("No definition found.");
         }
         _locations => {
-            let picker = FilePicker::new(locations, cwdir, move |cx, location, action| {
+            let picker = Picker::new(locations, cwdir, move |cx, location, action| {
                 jump_to_location(cx.editor, location, offset_encoding, action)
             })
             .with_preview(move |_editor, location| Some(location_to_file_location(location)));
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index c5e66d865..155f24356 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -21,7 +21,7 @@ pub use completion::{Completion, CompletionItem};
 pub use editor::EditorView;
 pub use markdown::Markdown;
 pub use menu::Menu;
-pub use picker::{DynamicPicker, FileLocation, FilePicker, Picker};
+pub use picker::{DynamicPicker, FileLocation, Picker};
 pub use popup::Popup;
 pub use prompt::{Prompt, PromptEvent};
 pub use spinner::{ProgressSpinners, Spinner};
@@ -158,7 +158,7 @@ pub fn regex_prompt(
     cx.push_layer(Box::new(prompt));
 }
 
-pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePicker<PathBuf> {
+pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker<PathBuf> {
     use ignore::{types::TypesBuilder, WalkBuilder};
     use std::time::Instant;
 
@@ -217,7 +217,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
 
-    FilePicker::new(files, root, move |cx, path: &PathBuf, action| {
+    Picker::new(files, root, move |cx, path: &PathBuf, action| {
         if let Err(e) = cx.editor.open(path, action) {
             let err = if let Some(err) = e.source() {
                 format!("{}", err)
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 001526c44..04ed940cd 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -114,7 +114,7 @@ impl Preview<'_, '_> {
     }
 }
 
-pub struct FilePicker<T: Item> {
+pub struct Picker<T: Item> {
     options: Vec<T>,
     editor_data: T::Data,
     // filter: String,
@@ -135,7 +135,6 @@ pub struct FilePicker<T: Item> {
 
     callback_fn: PickerCallback<T>,
 
-    picker: Picker<T>,
     pub truncate_start: bool,
     /// Caches paths to documents
     preview_cache: HashMap<PathBuf, CachedPreview>,
@@ -144,7 +143,7 @@ pub struct FilePicker<T: Item> {
     file_fn: Option<FileCallback<T>>,
 }
 
-impl<T: Item + 'static> FilePicker<T> {
+impl<T: Item + 'static> Picker<T> {
     pub fn new(
         options: Vec<T>,
         editor_data: T::Data,
@@ -173,8 +172,6 @@ impl<T: Item + 'static> FilePicker<T> {
             preview_cache: HashMap::new(),
             read_buffer: Vec::with_capacity(1024),
             file_fn: None,
-
-            picker: unimplemented!(),
         };
 
         picker.calculate_column_widths();
@@ -197,7 +194,6 @@ impl<T: Item + 'static> FilePicker<T> {
 
     pub fn truncate_start(mut self, truncate_start: bool) -> Self {
         self.truncate_start = truncate_start;
-        self.picker.truncate_start = truncate_start;
         self
     }
 
@@ -377,8 +373,7 @@ impl<T: Item + 'static> FilePicker<T> {
     }
 
     fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
-        self.picker
-            .selection()
+        self.selection()
             .and_then(|current| (self.file_fn.as_ref()?)(editor, current))
             .and_then(|(path_or_id, line)| path_or_id.get_canonicalized().ok().zip(Some(line)))
     }
@@ -849,13 +844,9 @@ impl<T: Item + 'static> FilePicker<T> {
         self.completion_height = height.saturating_sub(4);
         Some((width, height))
     }
-
-    fn id(&self) -> Option<&'static str> {
-        Some("file-picker")
-    }
 }
 
-impl<T: Item + 'static> Component for FilePicker<T> {
+impl<T: Item + 'static> Component for Picker<T> {
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         // +---------+ +---------+
         // |prompt   | |preview  |
@@ -864,7 +855,7 @@ impl<T: Item + 'static> Component for FilePicker<T> {
         // |         | |         |
         // +---------+ +---------+
 
-        let render_preview = self.picker.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
+        let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
 
         let picker_width = if render_preview {
             area.width / 2
@@ -909,112 +900,6 @@ impl Ord for PickerMatch {
 
 type PickerCallback<T> = Box<dyn Fn(&mut Context, &T, Action)>;
 
-pub struct Picker<T: Item> {
-    options: Vec<T>,
-    editor_data: T::Data,
-    // filter: String,
-    matcher: Box<Matcher>,
-    matches: Vec<PickerMatch>,
-
-    /// Current height of the completions box
-    completion_height: u16,
-
-    cursor: usize,
-    // pattern: String,
-    prompt: Prompt,
-    previous_pattern: (String, FuzzyQuery),
-    /// Whether to truncate the start (default true)
-    pub truncate_start: bool,
-    /// Whether to show the preview panel (default true)
-    show_preview: bool,
-    /// Constraints for tabular formatting
-    widths: Vec<Constraint>,
-
-    callback_fn: PickerCallback<T>,
-}
-
-impl<T: Item> Picker<T> {
-    pub fn new(
-        options: Vec<T>,
-        editor_data: T::Data,
-        callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
-    ) -> Self {
-        unimplemented!()
-    }
-
-    pub fn set_options(&mut self, new_options: Vec<T>) {
-        unimplemented!()
-    }
-
-    pub fn score(&mut self) {
-        unimplemented!()
-    }
-
-    pub fn force_score(&mut self) {
-        unimplemented!()
-    }
-
-    /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
-    pub fn move_by(&mut self, amount: usize, direction: Direction) {
-        unimplemented!()
-    }
-
-    /// Move the cursor down by exactly one page. After the last page comes the first page.
-    pub fn page_up(&mut self) {
-        unimplemented!()
-    }
-
-    /// Move the cursor up by exactly one page. After the first page comes the last page.
-    pub fn page_down(&mut self) {
-        unimplemented!()
-    }
-
-    /// Move the cursor to the first entry
-    pub fn to_start(&mut self) {
-        unimplemented!()
-    }
-
-    /// Move the cursor to the last entry
-    pub fn to_end(&mut self) {
-        unimplemented!()
-    }
-
-    pub fn selection(&self) -> Option<&T> {
-        unimplemented!()
-    }
-
-    pub fn toggle_preview(&mut self) {
-        unimplemented!()
-    }
-
-    fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
-        unimplemented!()
-    }
-}
-
-// process:
-// - read all the files into a list, maxed out at a large value
-// - on input change:
-//  - score all the names in relation to input
-
-impl<T: Item + 'static> Component for Picker<T> {
-    fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
-        unimplemented!()
-    }
-
-    fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
-        unimplemented!()
-    }
-
-    fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
-        unimplemented!()
-    }
-
-    fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
-        unimplemented!()
-    }
-}
-
 /// Returns a new list of options to replace the contents of the picker
 /// when called with the current picker query,
 pub type DynQueryCallback<T> =
@@ -1023,7 +908,7 @@ pub type DynQueryCallback<T> =
 /// A picker that updates its contents via a callback whenever the
 /// query string changes. Useful for live grep, workspace symbols, etc.
 pub struct DynamicPicker<T: ui::menu::Item + Send> {
-    file_picker: FilePicker<T>,
+    file_picker: Picker<T>,
     query_callback: DynQueryCallback<T>,
     query: String,
 }
@@ -1031,7 +916,7 @@ pub struct DynamicPicker<T: ui::menu::Item + Send> {
 impl<T: ui::menu::Item + Send> DynamicPicker<T> {
     pub const ID: &'static str = "dynamic-picker";
 
-    pub fn new(file_picker: FilePicker<T>, query_callback: DynQueryCallback<T>) -> Self {
+    pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
         Self {
             file_picker,
             query_callback,
@@ -1047,7 +932,7 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
 
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let event_result = self.file_picker.handle_event(event, cx);
-        let current_query = self.file_picker.picker.prompt.line();
+        let current_query = self.file_picker.prompt.line();
 
         if !matches!(event, Event::IdleTimeout) || self.query == *current_query {
             return event_result;
@@ -1063,7 +948,7 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
                 // Wrapping of pickers in overlay is done outside the picker code,
                 // so this is fragile and will break if wrapped in some other widget.
                 let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(Self::ID) {
-                    Some(overlay) => &mut overlay.content.file_picker.picker,
+                    Some(overlay) => &mut overlay.content.file_picker,
                     None => return,
                 };
                 picker.set_options(new_options);

From 29638babea410d6d8397b02e6a826de0076a69c0 Mon Sep 17 00:00:00 2001
From: tomleb <tomleb@users.noreply.github.com>
Date: Sun, 18 Jun 2023 22:02:34 -0400
Subject: [PATCH 079/967] Allow ANSI colors in themes (#5119)

---
 helix-view/src/theme.rs | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index a8cc59260..bf3379ca9 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -390,8 +390,23 @@ impl ThemePalette {
         Self { palette: default }
     }
 
-    pub fn hex_string_to_rgb(s: &str) -> Result<Color, String> {
-        if s.starts_with('#') && s.len() >= 7 {
+    pub fn string_to_rgb(s: &str) -> Result<Color, String> {
+        if s.starts_with('#') {
+            Self::hex_string_to_rgb(s)
+        } else {
+            Self::ansi_string_to_rgb(s)
+        }
+    }
+
+    fn ansi_string_to_rgb(s: &str) -> Result<Color, String> {
+        if let Ok(index) = s.parse::<u8>() {
+            return Ok(Color::Indexed(index));
+        }
+        Err(format!("Theme: malformed ANSI: {}", s))
+    }
+
+    fn hex_string_to_rgb(s: &str) -> Result<Color, String> {
+        if s.len() >= 7 {
             if let (Ok(red), Ok(green), Ok(blue)) = (
                 u8::from_str_radix(&s[1..3], 16),
                 u8::from_str_radix(&s[3..5], 16),
@@ -417,7 +432,7 @@ impl ThemePalette {
             .get(value)
             .copied()
             .ok_or("")
-            .or_else(|_| Self::hex_string_to_rgb(value))
+            .or_else(|_| Self::string_to_rgb(value))
     }
 
     pub fn parse_modifier(value: &Value) -> Result<Modifier, String> {
@@ -493,7 +508,7 @@ impl TryFrom<Value> for ThemePalette {
         let mut palette = HashMap::with_capacity(map.len());
         for (name, value) in map {
             let value = Self::parse_value_as_str(&value)?;
-            let color = Self::hex_string_to_rgb(value)?;
+            let color = Self::string_to_rgb(value)?;
             palette.insert(name, color);
         }
 

From 9690e0b733fd82e0ced65388a24ad80f769ce3b4 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 19 Jun 2023 04:55:46 -0500
Subject: [PATCH 080/967] Fix Component implementations for Picker (#7382)

---
 helix-term/src/ui/picker.rs | 54 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 04ed940cd..13746cfc8 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -750,6 +750,33 @@ impl<T: Item + 'static> Picker<T> {
             );
         }
     }
+}
+
+impl<T: Item + 'static> Component for Picker<T> {
+    fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
+        // +---------+ +---------+
+        // |prompt   | |preview  |
+        // +---------+ |         |
+        // |picker   | |         |
+        // |         | |         |
+        // +---------+ +---------+
+
+        let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
+
+        let picker_width = if render_preview {
+            area.width / 2
+        } else {
+            area.width
+        };
+
+        let picker_area = area.with_width(picker_width);
+        self.render_picker(picker_area, surface, cx);
+
+        if render_preview {
+            let preview_area = area.clip_left(picker_width);
+            self.render_preview(preview_area, surface, cx);
+        }
+    }
 
     fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
         if let Event::IdleTimeout = event {
@@ -846,33 +873,6 @@ impl<T: Item + 'static> Picker<T> {
     }
 }
 
-impl<T: Item + 'static> Component for Picker<T> {
-    fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
-        // +---------+ +---------+
-        // |prompt   | |preview  |
-        // +---------+ |         |
-        // |picker   | |         |
-        // |         | |         |
-        // +---------+ +---------+
-
-        let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
-
-        let picker_width = if render_preview {
-            area.width / 2
-        } else {
-            area.width
-        };
-
-        let picker_area = area.with_width(picker_width);
-        self.render_picker(picker_area, surface, cx);
-
-        if render_preview {
-            let preview_area = area.clip_left(picker_width);
-            self.render_preview(preview_area, surface, cx);
-        }
-    }
-}
-
 #[derive(PartialEq, Eq, Debug)]
 struct PickerMatch {
     score: i64,

From 48ad9ae1bb3d913038c800157c9b50ec729cde2e Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Tue, 20 Jun 2023 00:04:40 +0200
Subject: [PATCH 081/967] highlight(sql): Update tree-sitter-sql to `98a7fc9`
 (#7387)

* highlight(sql): Update tree-sitter-sql to 92018a3

* highlight(sql): Update tree-sitter-sql to 98a7fc9
---
 languages.toml                     |  2 +-
 runtime/queries/sql/highlights.scm | 76 +++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/languages.toml b/languages.toml
index ef7b0bf11..66250383f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1621,7 +1621,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d" }
 
 [[language]]
 name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index f15a92e7e..2faa67ed3 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -8,7 +8,6 @@
   (keyword_brin)
 
   (cast)
-  (count)
   (group_concat)
   (invocation)
 ] @function.builtin
@@ -65,12 +64,14 @@
   (keyword_replace)
   (keyword_update)
   (keyword_into)
+  (keyword_overwrite)
   (keyword_values)
   (keyword_set)
   (keyword_from)
   (keyword_left)
   (keyword_right)
   (keyword_inner)
+  (keyword_full)
   (keyword_outer)
   (keyword_cross)
   (keyword_join)
@@ -90,10 +91,12 @@
   (keyword_create)
   (keyword_alter)
   (keyword_change)
+  (keyword_analyze)
   (keyword_modify)
   (keyword_drop)
   (keyword_add)
   (keyword_table)
+  (keyword_tables)
   (keyword_view)
   (keyword_materialized)
   (keyword_column)
@@ -102,7 +105,6 @@
   (keyword_distinct)
   (keyword_constraint)
   ; (keyword_cast)
-  ; (keyword_count)
   ; (keyword_group_concat)
   (keyword_separator)
   (keyword_max)
@@ -118,6 +120,8 @@
   (keyword_if)
   (keyword_exists)
   (keyword_auto_increment)
+  (keyword_generated)
+  (keyword_always)
   (keyword_collate)
   (keyword_character)
   (keyword_engine)
@@ -137,6 +141,8 @@
   (keyword_unlogged)
   (keyword_union)
   (keyword_all)
+  (keyword_any)
+  (keyword_some)
   (keyword_except)
   (keyword_intersect)
   (keyword_returning)
@@ -164,6 +170,8 @@
   (keyword_others)
   (keyword_only)
   (keyword_unique)
+  (keyword_foreign)
+  (keyword_references)
   (keyword_concurrently)
   ; (keyword_btree)
   ; (keyword_hash)
@@ -176,6 +184,47 @@
   (keyword_preserve)
   (keyword_unsigned)
   (keyword_zerofill)
+  (keyword_conflict)
+  (keyword_do)
+  (keyword_nothing)
+  (keyword_high_priority)
+  (keyword_low_priority)
+  (keyword_delayed)
+  (keyword_recursive)
+  (keyword_cascaded)
+  (keyword_local)
+  (keyword_current_timestamp)
+  (keyword_check)
+  (keyword_option)
+  (keyword_vacuum)
+  (keyword_wait)
+  (keyword_nowait)
+
+  (keyword_trigger)
+  (keyword_function)
+  (keyword_returns)
+  (keyword_return)
+  (keyword_setof)
+  (keyword_atomic)
+  (keyword_declare)
+  ; (keyword_language)
+  (keyword_sql)
+  (keyword_plpgsql)
+  (keyword_immutable)
+  (keyword_stable)
+  (keyword_volatile)
+  (keyword_leakproof)
+  (keyword_parallel)
+  (keyword_safe)
+  (keyword_unsafe)
+  (keyword_restricted)
+  (keyword_called)
+  (keyword_returns)
+  (keyword_input)
+  (keyword_strict)
+  (keyword_cost)
+  (keyword_rows)
+  (keyword_support)
 
   (keyword_external)
   (keyword_stored)
@@ -183,8 +232,14 @@
   (keyword_uncached)
   (keyword_replication)
   (keyword_tblproperties)
+  (keyword_options)
   (keyword_compute)
   (keyword_stats)
+  (keyword_statistics)
+  (keyword_optimize)
+  (keyword_rewrite)
+  (keyword_bin_pack)
+  (keyword_incremental)
   (keyword_location)
   (keyword_partitioned)
   (keyword_comment)
@@ -195,6 +250,9 @@
   (keyword_terminated)
   (keyword_escaped)
   (keyword_lines)
+  (keyword_cache)
+  (keyword_metadata)
+  (keyword_noscan)
 
   (keyword_parquet)
   (keyword_rcfile)
@@ -205,6 +263,9 @@
   (keyword_orc)
   (keyword_avro)
   (keyword_jsonfile)
+
+  (keyword_precision)
+  (keyword_inet)
 ] @keyword
 
 [
@@ -224,6 +285,8 @@
 
 [
   (keyword_boolean)
+  (bit)
+  (keyword_binary)
 
   (keyword_smallserial)
   (keyword_serial)
@@ -244,6 +307,8 @@
 
   (char)
   (varchar)
+  (numeric)
+  (keyword_string)
   (keyword_text)
 
   (keyword_uuid)
@@ -253,6 +318,9 @@
   (keyword_xml)
 
   (keyword_bytea)
+  (keyword_inet)
+
+  (enum)
 
   (keyword_date)
   (keyword_datetime)
@@ -266,10 +334,6 @@
   (keyword_box2d)
   (keyword_box3d)
 
-  (char)
-  (varchar)
-  (numeric)
-
   (keyword_oid)
   (keyword_name)
   (keyword_regclass)

From b0cdc2d6e14f782c9247e16b59ab4156daac471c Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Tue, 20 Jun 2023 00:10:50 -0400
Subject: [PATCH 082/967] remove mention of Wasm from `vision.md` (#7395)

---
 docs/vision.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/vision.md b/docs/vision.md
index d49dd64d7..d9f1a8ac1 100644
--- a/docs/vision.md
+++ b/docs/vision.md
@@ -20,5 +20,5 @@ Vision statements are all well and good, but are also vague and subjective.  Her
 * **Built-in tools** for working with code bases efficiently.  Most projects aren't a single file, and an editor should handle that as a first-class use case.  In Helix's case, this means (among other things) a fuzzy-search file navigator and LSP support.
 * **Edit anything** that comes up when coding, within reason.  Whether it's a 200 MB XML file, a megabyte of minified javascript on a single line, or Japanese text encoded in ShiftJIS, you should be able to open it and edit it without problems.  (Note: this doesn't mean handle every esoteric use case.  Sometimes you do just need a specialized tool, and Helix isn't that.)
 * **Configurable**, within reason.  Although the defaults should be good, not everyone will agree on what "good" is.  Within the bounds of Helix's core interaction models, it should be reasonably configurable so that it can be "good" for more people.  This means, for example, custom key maps among other things.
-* **Extensible**, within reason.  Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor.  The basics should be built-in, but you should be able to extend it with additional functionality as needed.  Right now we're thinking Wasm-based plugins.
+* **Extensible**, within reason.  Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor.  The basics should be built-in, but you should be able to extend it with additional functionality as needed.
 * **Clean code base.**  Sometimes other factors (e.g. significant performance gains, important features, correctness, etc.) will trump strict readability, but we nevertheless want to keep the code base straightforward and easy to understand to the extent we can.

From 293a55ad2b4324dcb7c239fe2b8730704c36eccb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 15:24:46 +0200
Subject: [PATCH 083/967] build(deps): bump cachix/install-nix-action from 21
 to 22 (#7392)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index effe32173..7adb53269 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install nix
-      uses: cachix/install-nix-action@v21
+      uses: cachix/install-nix-action@v22
 
     - name: Authenticate with Cachix
       uses: cachix/cachix-action@v12

From 00e819cfd497c3de10652f1f3f47e9e489b7b45f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 15:48:51 +0200
Subject: [PATCH 084/967] build(deps): bump serde_json from 1.0.96 to 1.0.97
 (#7393)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.96 to 1.0.97.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.96...v1.0.97)

---
updated-dependencies:
- dependency-name: serde_json
  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 5fd993c98..0485365ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1882,9 +1882,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
 dependencies = [
  "itoa",
  "ryu",

From 18160a667be6ce30eb644dac2604d75fab9d63dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 18:53:26 +0200
Subject: [PATCH 085/967] build(deps): bump bitflags from 2.3.1 to 2.3.2
 (#7394)

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

diff --git a/Cargo.lock b/Cargo.lock
index 0485365ce..a6db4c393 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -96,9 +96,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
+checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
 
 [[package]]
 name = "bstr"
@@ -631,7 +631,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f216df1c33e6e1555923eff0096858a879e8aaadd35b5d788641e4e8064c892"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "bstr",
  "gix-path",
  "libc",
@@ -725,7 +725,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "bstr",
  "gix-features",
  "gix-path",
@@ -770,7 +770,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca0380cdab7863e67966eee4aed32856c864c20b077e026b637af6bb3a9281b4"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "bstr",
  "btoi",
  "filetime",
@@ -814,7 +814,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "gix-commitgraph",
  "gix-hash",
  "gix-object",
@@ -987,7 +987,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2b7b38b766eb95dcc5350a9c450030b69892c0902fa35f4a6d0809273bd9dae"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "gix-path",
  "libc",
  "windows",
@@ -1160,7 +1160,7 @@ version = "0.6.0"
 dependencies = [
  "ahash 0.8.3",
  "arc-swap",
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "chrono",
  "dunce",
  "encoding_rs",
@@ -1288,7 +1288,7 @@ dependencies = [
 name = "helix-tui"
 version = "0.6.0"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "cassowary",
  "crossterm",
  "helix-core",
@@ -1321,7 +1321,7 @@ version = "0.6.0"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "chardetng",
  "clipboard-win",
  "crossterm",

From eb81cf3c013232fb1b01c51e9f3edba4cf39d977 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Wed, 21 Jun 2023 17:52:42 +0300
Subject: [PATCH 086/967] Fix tree sitter chunking (#7417)

Call as bytes before slicing, that way you can take bytes that aren't
aligned to chars. Should technically also be slightly faster since you
don't have to check alignment...
---
 helix-core/src/syntax.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 2a5bb974d..f43b03ade 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1402,7 +1402,7 @@ impl LanguageLayer {
                 &mut |byte, _| {
                     if byte <= source.len_bytes() {
                         let (chunk, start_byte, _, _) = source.chunk_at_byte(byte);
-                        chunk[byte - start_byte..].as_bytes()
+                        &chunk.as_bytes()[byte - start_byte..]
                     } else {
                         // out of range
                         &[]

From 37058e0401e1b241e3d8ad1cfc1d5362cd83e19e Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 6 Jun 2023 00:57:28 +0200
Subject: [PATCH 087/967] match pairs which don't form a standalone TS node

---
 helix-core/src/match_brackets.rs | 112 +++++++++++++++++++++++++++----
 1 file changed, 99 insertions(+), 13 deletions(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index fd43a110e..01deb82cb 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -1,8 +1,11 @@
+use std::iter;
+
 use tree_sitter::Node;
 
 use crate::{Rope, Syntax};
 
 const MAX_PLAINTEXT_SCAN: usize = 10000;
+const MATCH_LIMIT: usize = 16;
 
 // Limit matching pairs to only ( ) { } [ ] < > ' ' " "
 const PAIRS: &[(char, char)] = &[
@@ -50,26 +53,55 @@ fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) ->
     let tree = syntax.tree();
     let pos = doc.char_to_byte(pos);
 
-    let mut node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
+    let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;
 
     loop {
-        let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;
-        let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));
+        if node.is_named() {
+            let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;
+            let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));
 
-        if is_valid_pair(doc, start_char, end_char) {
-            if end_byte == pos {
-                return Some(start_char);
+            if is_valid_pair(doc, start_char, end_char) {
+                if end_byte == pos {
+                    return Some(start_char);
+                }
+                // We return the end char if the cursor is either on the start char
+                // or at some arbitrary position between start and end char.
+                return Some(end_char);
             }
-            // We return the end char if the cursor is either on the start char
-            // or at some arbitrary position between start and end char.
-            return Some(end_char);
         }
+        // this node itselt wasn't a pair but maybe its siblings are
 
-        if traverse_parents {
-            node = node.parent()?;
-        } else {
-            return None;
+        // check if we are *on* the pair (special cased so we don't look
+        // at the current node twice and to jump to the start on that case)
+        if let Some(open) = as_close_pair(doc, &node) {
+            if let Some(pair_start) = find_pair_end(doc, node.prev_sibling(), open, Backward) {
+                return Some(pair_start);
+            }
         }
+
+        if !traverse_parents {
+            // check if we are *on* the opening pair (special cased here as
+            // an opptimization since we only care about bracket on the cursor
+            // here)
+            if let Some(close) = as_open_pair(doc, &node) {
+                if let Some(pair_end) = find_pair_end(doc, node.next_sibling(), close, Forward) {
+                    return Some(pair_end);
+                }
+            }
+            if node.is_named() {
+                return None;
+            }
+        }
+
+        for close in
+            iter::successors(node.next_sibling(), |node| node.next_sibling()).take(MATCH_LIMIT)
+        {
+            let Some(open) = as_close_pair(doc, &close) else { continue; };
+            if find_pair_end(doc, Some(node), open, Backward).is_some() {
+                return doc.try_byte_to_char(close.start_byte()).ok();
+            }
+        }
+        node = node.parent()?;
     }
 }
 
@@ -161,6 +193,60 @@ fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
     Some((start_byte, end_byte))
 }
 
+/// Checks if `node` or its siblings (at most MATCH_LIMIT nodes) is the specified openiing char
+///
+/// # Returns
+///
+/// The position of the found node or `None` otherwise
+fn find_open_pair(doc: &Rope, node: Option<Node>, open: char) -> Option<usize> {
+    iter::successors(node, |node| node.prev_sibling())
+        .take(MATCH_LIMIT)
+        .find_map(|node| {
+            let (pos, c) = as_char(doc, &node)?;
+            (c == open).then_some(pos)
+        })
+}
+
+/// Tests if this node is a pair close char and returns the expected open char
+fn as_close_pair(doc: &Rope, node: &Node) -> Option<char> {
+    let close = as_char(doc, node)?.1;
+    PAIRS
+        .iter()
+        .find_map(|&(open, close_)| (close_ == close).then_some(open))
+}
+
+/// Checks if `node` or its siblings (at most MATCH_LIMIT nodes) is the specified closing char
+///
+/// # Returns
+///
+/// The position of the found node or `None` otherwise
+fn find_close_pair(doc: &Rope, node: Option<Node>, close: char) -> Option<usize> {
+    iter::successors(node, |node| node.next_sibling())
+        .take(MATCH_LIMIT)
+        .find_map(|node| {
+            let (pos, c) = as_char(doc, &node)?;
+            (end_char == c).then_some(pos)
+        })
+}
+
+/// Tests if this node is a pair close char and returns the expected open char
+fn as_open_pair(doc: &Rope, node: &Node) -> Option<char> {
+    let close = as_char(doc, node)?.1;
+    PAIRS
+        .iter()
+        .find_map(|&(open_, close)| (open_ == open).then_some(close))
+}
+
+/// Tests if this node is a pair opening and returns the expected close char
+fn as_char(doc: &Rope, node: &Node) -> Option<(usize, char)> {
+    // TODO: multi char/non ASCII pairs
+    if node.byte_range().len() != 1 {
+        return None;
+    }
+    let pos = doc.try_byte_to_char(node.start_byte()).ok()?;
+    Some((pos, doc.char(pos)))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From 5dba649d81d706125e16fa695747ed936e7b105a Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 6 Jun 2023 01:37:36 +0200
Subject: [PATCH 088/967] Avoid false positives in non-fuzzy bracket match

---
 helix-core/src/match_brackets.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index 01deb82cb..434df9040 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -64,9 +64,12 @@ fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) ->
                 if end_byte == pos {
                     return Some(start_char);
                 }
+
                 // We return the end char if the cursor is either on the start char
                 // or at some arbitrary position between start and end char.
-                return Some(end_char);
+                if traverse_parents || start_byte == pos {
+                    return Some(end_char);
+                }
             }
         }
         // this node itselt wasn't a pair but maybe its siblings are

From a0359f7f22d26548d5680fb1dc177f6d4b07ad11 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 6 Jun 2023 01:48:36 +0200
Subject: [PATCH 089/967] make TS matching fallback to plaintext

---
 helix-core/src/match_brackets.rs | 81 +++++++++++++++++---------------
 helix-term/src/commands.rs       |  4 +-
 helix-term/src/ui/editor.rs      |  4 +-
 3 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index 434df9040..7fda6d7e5 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -1,8 +1,10 @@
 use std::iter;
 
+use ropey::RopeSlice;
 use tree_sitter::Node;
 
-use crate::{Rope, Syntax};
+use crate::movement::Direction::{self, Backward, Forward};
+use crate::Syntax;
 
 const MAX_PLAINTEXT_SCAN: usize = 10000;
 const MATCH_LIMIT: usize = 16;
@@ -27,7 +29,7 @@ const PAIRS: &[(char, char)] = &[
 ///
 /// If no matching bracket is found, `None` is returned.
 #[must_use]
-pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
+pub fn find_matching_bracket(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
     if pos >= doc.len_chars() || !is_valid_bracket(doc.char(pos)) {
         return None;
     }
@@ -45,13 +47,18 @@ pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<
 //
 // If no surrounding scope is found, the function returns `None`.
 #[must_use]
-pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
+pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
     find_pair(syntax, doc, pos, true)
 }
 
-fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) -> Option<usize> {
+fn find_pair(
+    syntax: &Syntax,
+    doc: RopeSlice,
+    pos_: usize,
+    traverse_parents: bool,
+) -> Option<usize> {
     let tree = syntax.tree();
-    let pos = doc.char_to_byte(pos);
+    let pos = doc.char_to_byte(pos_);
 
     let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;
 
@@ -92,7 +99,7 @@ fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) ->
                 }
             }
             if node.is_named() {
-                return None;
+                break;
             }
         }
 
@@ -104,8 +111,16 @@ fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) ->
                 return doc.try_byte_to_char(close.start_byte()).ok();
             }
         }
-        node = node.parent()?;
+        let Some(parent) = node.parent() else { break; };
+        node = parent;
+    }
+    let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
+    if node.child_count() != 0 {
+        return None;
     }
+    let node_start = doc.byte_to_char(node.start_byte());
+    find_matching_bracket_plaintext(doc.byte_slice(node.byte_range()), pos_ - node_start)
+        .map(|pos| pos + node_start)
 }
 
 /// Returns the position of the matching bracket under cursor.
@@ -120,10 +135,7 @@ fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) ->
 ///
 /// If no matching bracket is found, `None` is returned.
 #[must_use]
-pub fn find_matching_bracket_current_line_plaintext(
-    doc: &Rope,
-    cursor_pos: usize,
-) -> Option<usize> {
+pub fn find_matching_bracket_plaintext(doc: RopeSlice, cursor_pos: usize) -> Option<usize> {
     // Don't do anything when the cursor is not on top of a bracket.
     let bracket = doc.char(cursor_pos);
     if !is_valid_bracket(bracket) {
@@ -179,11 +191,11 @@ fn is_forward_bracket(c: char) -> bool {
     PAIRS.iter().any(|(l, _)| *l == c)
 }
 
-fn is_valid_pair(doc: &Rope, start_char: usize, end_char: usize) -> bool {
+fn is_valid_pair(doc: RopeSlice, start_char: usize, end_char: usize) -> bool {
     PAIRS.contains(&(doc.char(start_char), doc.char(end_char)))
 }
 
-fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
+fn surrounding_bytes(doc: RopeSlice, node: &Node) -> Option<(usize, usize)> {
     let len = doc.len_bytes();
 
     let start_byte = node.start_byte();
@@ -196,22 +208,8 @@ fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
     Some((start_byte, end_byte))
 }
 
-/// Checks if `node` or its siblings (at most MATCH_LIMIT nodes) is the specified openiing char
-///
-/// # Returns
-///
-/// The position of the found node or `None` otherwise
-fn find_open_pair(doc: &Rope, node: Option<Node>, open: char) -> Option<usize> {
-    iter::successors(node, |node| node.prev_sibling())
-        .take(MATCH_LIMIT)
-        .find_map(|node| {
-            let (pos, c) = as_char(doc, &node)?;
-            (c == open).then_some(pos)
-        })
-}
-
 /// Tests if this node is a pair close char and returns the expected open char
-fn as_close_pair(doc: &Rope, node: &Node) -> Option<char> {
+fn as_close_pair(doc: RopeSlice, node: &Node) -> Option<char> {
     let close = as_char(doc, node)?.1;
     PAIRS
         .iter()
@@ -223,8 +221,17 @@ fn as_close_pair(doc: &Rope, node: &Node) -> Option<char> {
 /// # Returns
 ///
 /// The position of the found node or `None` otherwise
-fn find_close_pair(doc: &Rope, node: Option<Node>, close: char) -> Option<usize> {
-    iter::successors(node, |node| node.next_sibling())
+fn find_pair_end(
+    doc: RopeSlice,
+    node: Option<Node>,
+    end_char: char,
+    direction: Direction,
+) -> Option<usize> {
+    let advance = match direction {
+        Forward => Node::next_sibling,
+        Backward => Node::prev_sibling,
+    };
+    iter::successors(node, advance)
         .take(MATCH_LIMIT)
         .find_map(|node| {
             let (pos, c) = as_char(doc, &node)?;
@@ -233,15 +240,15 @@ fn find_close_pair(doc: &Rope, node: Option<Node>, close: char) -> Option<usize>
 }
 
 /// Tests if this node is a pair close char and returns the expected open char
-fn as_open_pair(doc: &Rope, node: &Node) -> Option<char> {
-    let close = as_char(doc, node)?.1;
+fn as_open_pair(doc: RopeSlice, node: &Node) -> Option<char> {
+    let open = as_char(doc, node)?.1;
     PAIRS
         .iter()
         .find_map(|&(open_, close)| (open_ == open).then_some(close))
 }
 
-/// Tests if this node is a pair opening and returns the expected close char
-fn as_char(doc: &Rope, node: &Node) -> Option<(usize, char)> {
+/// If node is a single char return it (and its char position)
+fn as_char(doc: RopeSlice, node: &Node) -> Option<(usize, char)> {
     // TODO: multi char/non ASCII pairs
     if node.byte_range().len() != 1 {
         return None;
@@ -257,11 +264,11 @@ mod tests {
     #[test]
     fn test_find_matching_bracket_current_line_plaintext() {
         let assert = |input: &str, pos, expected| {
-            let input = &Rope::from(input);
-            let actual = find_matching_bracket_current_line_plaintext(input, pos);
+            let input = RopeSlice::from(input);
+            let actual = find_matching_bracket_plaintext(input, pos);
             assert_eq!(expected, actual.unwrap());
 
-            let actual = find_matching_bracket_current_line_plaintext(input, expected);
+            let actual = find_matching_bracket_plaintext(input, expected);
             assert_eq!(pos, actual.unwrap(), "expected symmetrical behaviour");
         };
 
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 2c9295f11..1bd736523 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4649,8 +4649,8 @@ fn match_brackets(cx: &mut Context) {
     let selection = doc.selection(view.id).clone().transform(|range| {
         let pos = range.cursor(text_slice);
         if let Some(matched_pos) = doc.syntax().map_or_else(
-            || match_brackets::find_matching_bracket_current_line_plaintext(text, pos),
-            |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text, pos),
+            || match_brackets::find_matching_bracket_plaintext(text.slice(..), pos),
+            |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text.slice(..), pos),
         ) {
             range.put_cursor(text_slice, matched_pos, is_select)
         } else {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 16940e337..5b5cda935 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -501,7 +501,9 @@ impl EditorView {
             use helix_core::match_brackets;
             let pos = doc.selection(view.id).primary().cursor(text);
 
-            if let Some(pos) = match_brackets::find_matching_bracket(syntax, doc.text(), pos) {
+            if let Some(pos) =
+                match_brackets::find_matching_bracket(syntax, doc.text().slice(..), pos)
+            {
                 // ensure col is on screen
                 if let Some(highlight) = theme.find_scope_index_exact("ui.cursor.match") {
                     return vec![(highlight, pos..pos + 1)];

From 842518ccb7e76e2c569db72ff79968ca80882bc0 Mon Sep 17 00:00:00 2001
From: eh <correia.eh@gmail.com>
Date: Thu, 22 Jun 2023 17:48:02 -0400
Subject: [PATCH 090/967] Theme: port of Zed's OneDark and OneLight themes
 (#7250)

---
 runtime/themes/zed_onedark.toml  | 110 +++++++++++++++++++++++++++++++
 runtime/themes/zed_onelight.toml |  55 ++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 runtime/themes/zed_onedark.toml
 create mode 100644 runtime/themes/zed_onelight.toml

diff --git a/runtime/themes/zed_onedark.toml b/runtime/themes/zed_onedark.toml
new file mode 100644
index 000000000..5fda576f3
--- /dev/null
+++ b/runtime/themes/zed_onedark.toml
@@ -0,0 +1,110 @@
+# Author : Eric Correia <correia.eh@gmail.com>
+
+"attribute" = { fg = "yellow" }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"constant" = { fg = "yellow" }
+"constant.numeric" = { fg = "orange" }
+"constant.builtin" = { fg = "orange" }
+"constant.builtin.boolean" = { fg = "yellow" }
+"constant.character.escape" = { fg = "orange" }
+"constructor" = { fg = "blue" }
+"function" = { fg = "blue" }
+"function.builtin" = { fg = "blue" }
+"function.macro" = { fg = "purple" }
+"keyword" = { fg = "purple" }
+"keyword.control" = { fg = "purple" }
+"keyword.control.import" = { fg = "purple" }
+"keyword.directive" = { fg = "purple" }
+"label" = { fg = "ui-text" }
+"namespace" = { fg = "ui-text" }
+"operator" = { fg = "ui-text" }
+"keyword.operator" = { fg = "purple" }
+"special" = { fg = "blue" }
+"string" = { fg = "green" }
+"type" = { fg = "cyan" }
+"variable.builtin" = { fg = "orange" }
+"variable.parameter" = { fg = "ui-text" }
+"variable.other.member" = { fg = "red" }
+
+"markup.heading" = { fg = "red" }
+"markup.raw.inline" = { fg = "green" }
+"markup.bold" = { fg = "orange", modifiers = ["bold"] }
+"markup.italic" = { fg = "purple", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.list" = { fg = "red" }
+"markup.quote" = { fg = "yellow" }
+"markup.link.url" = { fg = "cyan", modifiers = ["underlined"]}
+"markup.link.text" = { fg = "purple" }
+
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
+"diagnostic.info".underline = { color = "blue", style = "curl" } 
+"diagnostic.hint".underline = { color = "green", style = "curl" } 
+"diagnostic.warning".underline = { color = "yellow", style = "curl" } 
+"diagnostic.error".underline = { color = "red", style = "curl" } 
+"info" = { fg = "blue", modifiers = ["bold"] }
+"hint" = { fg = "green", modifiers = ["bold"] }
+"warning" = { fg = "yellow", modifiers = ["bold"] }
+"error" = { fg = "red", modifiers = ["bold"] }
+
+"ui.background" = { bg = "ui-text-reversed" }
+"ui.virtual" = { fg = "faint-gray" }
+"ui.virtual.indent-guide" = { fg = "faint-gray" }
+"ui.virtual.whitespace" = { fg = "light-gray" }
+"ui.virtual.ruler" = { bg = "gray" }
+"ui.virtual.inlay-hint" = { fg = "light-gray" }
+
+"ui.cursor" = { fg = "white", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]}
+
+"ui.selection" = { bg = "faint-gray" }
+"ui.selection.primary" = { bg = "gray" }
+"ui.cursorline.primary" = { bg = "light-black" }
+
+"ui.highlight" = { bg = "gray" }
+"ui.highlight.frameline" = { bg = "#97202a" }
+
+"ui.linenr" = { fg = "linenr" }
+"ui.linenr.selected" = { fg = "ui-text" }
+
+"ui.statusline" = { fg = "white", bg = "light-black" }
+"ui.statusline.inactive" = { fg = "light-gray", bg = "light-black" }
+"ui.statusline.normal" = { fg = "light-black", bg = "blue" }
+"ui.statusline.insert" = { fg = "light-black", bg = "green" }
+"ui.statusline.select" = { fg = "light-black", bg = "purple" }
+
+"ui.text" = { fg = "ui-text" }
+"ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
+
+"ui.help" = { fg = "white", bg = "gray" }
+"ui.popup" = { bg = "gray" }
+"ui.window" = { fg = "gray" }
+"ui.menu" = { fg = "ui-text", bg = "gray" }
+"ui.menu.selected" = { fg = "ui-text-reversed", bg = "blue" }
+"ui.menu.scroll" = { fg = "ui-text", bg = "light-gray" }
+
+"ui.debug" = { fg = "red" }
+
+[palette]
+
+yellow = "#dac18c"
+blue = "#7ca8dd"
+red = "#bd7476"
+purple = "#9d74b9"
+green = "#a0b783"
+orange = "#b4926e" 
+cyan = "#7eb2be"
+light-black = "#2e323a"
+gray = "#363f4c"
+light-gray = "#5c606b"
+faint-gray = "#3B4048"
+linenr = "#4B5263"
+
+white = "#a8adb7"
+black = "#292c33"
+# black and white are used for a lot of the UI text
+ui-text = "#a8adb7" #white
+ui-text-reversed = "#292c33" #black
diff --git a/runtime/themes/zed_onelight.toml b/runtime/themes/zed_onelight.toml
new file mode 100644
index 000000000..2b54cd5be
--- /dev/null
+++ b/runtime/themes/zed_onelight.toml
@@ -0,0 +1,55 @@
+# Author : Eric Correia <correia.eh@gmail.com>
+
+inherits = "zed_onedark"
+
+"attribute" = { fg = "green" }
+"constant" = { fg = "green" }
+"constant.numeric" = { fg = "gold" }
+"constant.builtin" = { fg = "gold" }
+"constant.builtin.boolean" = { fg = "green" }
+"variable.builtin" = { fg = "gold" }
+"variable.other.member" = { fg = "orange" }
+
+"markup.heading" = { fg = "orange" }
+"markup.list" = { fg = "orange" }
+"markup.quote" = { fg = "green" }
+
+"ui.cursor" = { fg = "dark-blue", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "dark-blue", modifiers = ["reversed"] }
+
+"ui.cursorline.primary" = { bg = "faint-gray" }
+
+"ui.statusline" = { fg = "black", bg = "gray" }
+"ui.statusline.inactive" = { fg = "white", bg = "light-black" }
+"ui.statusline.normal" = { fg = "white", bg = "blue" }
+"ui.statusline.insert" = { fg = "white", bg = "green" }
+"ui.statusline.select" = { fg = "white", bg = "purple" }
+
+"ui.text.focus" = { fg = "ui-text", bg = "gray", modifiers = ["bold"] }
+
+"ui.help" = { fg = "black", bg = "dark-gray" }
+"ui.popup" = { bg = "dark-gray" }
+"ui.window" = { fg = "dark-gray" }
+
+[palette]
+
+yellow = "#dac18c"
+blue = "#5185b5"
+red = "#bd7476"
+dark-blue = "#607bdb"
+orange = "#ca7667"
+purple = "#a160ac"
+green = "#739d60"
+gold = "#a8763c"
+cyan = "#4b80b2"
+light-black = "#2e323a"
+gray = "#dcdcdd"
+dark-gray = "#ebebec"
+light-gray = "#a6a6aa"
+faint-gray = "#efefef"
+linenr = "#4B5263"
+
+black = "#404248"
+white = "#fafafa"
+ui-text = "#404248"
+ui-text-reversed = "#fafafa"

From 2c5288dafb88ae2a12d3589b79a525932f48b6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Fri, 23 Jun 2023 00:19:40 +0200
Subject: [PATCH 091/967] Replace MATLAB grammar (#7388)

---
 book/src/generated/lang-support.md     |   2 +-
 languages.toml                         |   2 +-
 runtime/queries/matlab/context.scm     |  41 ++++++
 runtime/queries/matlab/folds.scm       |  11 ++
 runtime/queries/matlab/highlights.scm  | 182 ++++++++++++++-----------
 runtime/queries/matlab/indents.scm     |  23 ++++
 runtime/queries/matlab/injections.scm  |   2 +
 runtime/queries/matlab/locals.scm      |  19 +++
 runtime/queries/matlab/textobjects.scm |   9 ++
 9 files changed, 213 insertions(+), 78 deletions(-)
 create mode 100644 runtime/queries/matlab/context.scm
 create mode 100644 runtime/queries/matlab/folds.scm
 create mode 100644 runtime/queries/matlab/indents.scm
 create mode 100644 runtime/queries/matlab/injections.scm
 create mode 100644 runtime/queries/matlab/locals.scm
 create mode 100644 runtime/queries/matlab/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index e2f627347..c3eb0f96a 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -88,7 +88,7 @@
 | markdoc | ✓ |  |  | `markdoc-ls` |
 | markdown | ✓ |  |  | `marksman` |
 | markdown.inline | ✓ |  |  |  |
-| matlab | ✓ |  |  |  |
+| matlab | ✓ | ✓ | ✓ |  |
 | mermaid | ✓ |  |  |  |
 | meson | ✓ |  | ✓ |  |
 | mint |  |  |  | `mint` |
diff --git a/languages.toml b/languages.toml
index 66250383f..a61e2e740 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2285,7 +2285,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "matlab"
-source = { git = "https://github.com/mstanciu552/tree-sitter-matlab", rev = "2d5d3d5193718a86477d4335aba5b34e79147326" }
+source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "5a047c1572792ae943b51af7cf9307097b2fcce0" }
 
 [[language]]
 name = "ponylang"
diff --git a/runtime/queries/matlab/context.scm b/runtime/queries/matlab/context.scm
new file mode 100644
index 000000000..725c10ca0
--- /dev/null
+++ b/runtime/queries/matlab/context.scm
@@ -0,0 +1,41 @@
+(function_definition
+  (block (_) @context.end)
+) @context
+
+(while_statement
+  (block (_) @context.end)
+) @context
+
+(for_statement
+  (block (_) @context.end)
+) @context
+
+(if_statement
+  (block (_) @context.end)
+) @context
+
+(elseif_clause
+  (block (_) @context.end)
+) @context
+
+(else_clause
+  (block (_) @context.end)
+) @context
+
+(switch_statement) @context
+
+(case_clause
+  (block (_) @context.end)
+) @context
+
+(otherwise_clause
+  (block (_) @context.end)
+) @context
+
+(try_statement
+  "try"
+  (block (_) @context.end) @context
+  "end")
+(catch_clause
+  "catch"
+  (block (_) @context.end) @context)
diff --git a/runtime/queries/matlab/folds.scm b/runtime/queries/matlab/folds.scm
new file mode 100644
index 000000000..dad9ea177
--- /dev/null
+++ b/runtime/queries/matlab/folds.scm
@@ -0,0 +1,11 @@
+[(if_statement)
+ (for_statement)
+ (while_statement)
+ (switch_statement)
+ (try_statement)
+ (function_definition)
+ (class_definition)
+ (enumeration)
+ (events)
+ (methods)
+ (properties)] @fold
diff --git a/runtime/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
index c0e23e917..bc4c5069e 100644
--- a/runtime/queries/matlab/highlights.scm
+++ b/runtime/queries/matlab/highlights.scm
@@ -1,97 +1,127 @@
-  ; highlights.scm
+; Constants
 
-function_keyword: (function_keyword) @keyword.function
+(events (identifier) @constant)
+(attribute (identifier) @constant)
 
-(function_definition
-function_name: (identifier) @function
-(end) @function)
+"~" @constant.builtin
 
-(parameter_list (identifier) @variable.parameter)
+; Fields/Properties
 
-[
-    "if"
-    "elseif"
-    "else"
-    "switch"
-    "case"
-    "otherwise"
-] @keyword.control.conditional
+(superclass "." (identifier) @variable.other.member)
+(property_name "." (identifier) @variable.other.member)
+(property name: (identifier) @variable.other.member)
 
-(if_statement (end) @keyword.control.conditional)
-(switch_statement (end) @keyword.control.conditional)
+; Types
 
-["for" "while"] @keyword.control.repeat
-(for_statement (end) @keyword.control.repeat)
-(while_statement (end) @keyword.control.repeat)
+(class_definition name: (identifier) @keyword.storage.type)
+(attributes (identifier) @constant)
+(enum . (identifier) @type.enum.variant)
 
-["try" "catch"] @keyword.control.exception
-(try_statement (end) @keyword.control.exception)
+; Functions
 
-(function_definition end: (end) @keyword)
+(function_definition
+  "function" @keyword.function
+  name: (identifier) @function
+  [ "end" "endfunction" ]? @keyword.function)
 
-["return" "break" "continue"] @keyword.return
+(function_signature name: (identifier) @function)
+(function_call name: (identifier) @function)
+(handle_operator (identifier) @function)
+(validation_functions (identifier) @function)
+(command (command_name) @function.macro)
+(command_argument) @string
+(return_statement) @keyword.control.return
 
-(
-(identifier) @constant.builtin
-(#any-of? @constant.builtin "true" "false")
-)
+; Assignments
 
-(
-    (identifier) @constant.builtin
-    (#eq? @constant.builtin "end")
-)
+(assignment left: (_) @variable)
+(multioutput_variable (_) @variable)
 
-;; Punctuations
+; Parameters
 
-[";" ","] @punctuation.special
-(argument_list "," @punctuation.delimiter)
-(vector_definition ["," ";"] @punctuation.delimiter)
-(cell_definition ["," ";"] @punctuation.delimiter)
-":" @punctuation.delimiter
-(parameter_list "," @punctuation.delimiter)
-(return_value "," @punctuation.delimiter)
+(function_arguments (identifier) @variable.parameter)
 
-; ;; Brackets
+; Operators
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
-] @punctuation.bracket
-
-;; Operators
-"=" @operator
-(operation [ ">"
-            "<"
-            "=="
-            "<="
-            ">="
-            "=<"
-            "=>"
-            "~="
-            "*"
-            ".*"
-            "/"
-            "\\"
-            "./"
-            "^"
-            ".^"
-            "+"] @operator)
-
-;; boolean operator
-[
-    "&&"
-    "||"
+  "+"
+  ".+"
+  "-"
+  ".*"
+  "*"
+  ".*"
+  "/"
+  "./"
+  "\\"
+  ".\\"
+  "^"
+  ".^"
+  "'"
+  ".'"
+  "|"
+  "&"
+  "?"
+  "@"
+  "<"
+  "<="
+  ">"
+  ">="
+  "=="
+  "~="
+  "="
+  "&&"
+  "||"
+  ":"
 ] @operator
 
-;; Number
-(number) @constant.numeric
+; Conditionals
+
+(if_statement [ "if" "end" ] @keyword.control.conditional)
+(elseif_clause "elseif" @keyword.control.conditional)
+(else_clause "else" @keyword.control.conditional)
+(switch_statement [ "switch" "end" ] @keyword.control.conditional)
+(case_clause "case" @keyword.control.conditional)
+(otherwise_clause "otherwise" @keyword.control.conditional)
+(break_statement) @keyword.control.conditional
+
+; Repeats
+
+(for_statement [ "for" "parfor" "end" ] @keyword.control.repeat)
+(while_statement [ "while" "end" ] @keyword.control.repeat)
+(continue_statement) @keyword.control.repeat
+
+; Exceptions
 
-;; String
+(try_statement [ "try" "end" ] @keyword.control.exception)
+(catch_clause "catch" @keyword.control.exception)
+
+; Punctuation
+
+[ ";" "," "." ] @punctuation.delimiter
+[ "(" ")" "[" "]" "{" "}" ] @punctuation.bracket
+
+; Literals
+
+(escape_sequence) @constant.character.escape
+(formatting_sequence) @constant.character.escape
 (string) @string
+(number) @constant.numeric.float
+(boolean) @constant.builtin.boolean
 
-;; Comment
-(comment) @comment
+; Comments
+
+[ (comment) (line_continuation) ] @comment.line
+
+; Keywords
+
+"classdef" @keyword.storage.type
+[
+  "arguments"
+  "end"
+  "enumeration"
+  "events"
+  "global"
+  "methods"
+  "persistent"
+  "properties"
+] @keyword
diff --git a/runtime/queries/matlab/indents.scm b/runtime/queries/matlab/indents.scm
new file mode 100644
index 000000000..b2a8e55dd
--- /dev/null
+++ b/runtime/queries/matlab/indents.scm
@@ -0,0 +1,23 @@
+[
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (switch_statement)
+  (try_statement)
+  (function_definition)
+  (class_definition)
+  (enumeration)
+  (events)
+  (methods)
+  (properties)
+] @indent
+
+[
+  (elseif_clause)
+  (else_clause)
+  (case_clause)
+  (otherwise_clause)
+  (catch_clause)
+] @indent @extend
+
+[ "end" ] @outdent
diff --git a/runtime/queries/matlab/injections.scm b/runtime/queries/matlab/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/runtime/queries/matlab/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/matlab/locals.scm b/runtime/queries/matlab/locals.scm
new file mode 100644
index 000000000..d0589a1db
--- /dev/null
+++ b/runtime/queries/matlab/locals.scm
@@ -0,0 +1,19 @@
+(function_definition name: (identifier) @local.definition ?) @local.scope
+(function_arguments (identifier)* @local.definition)
+
+(lambda (arguments (identifier) @local.definition)) @local.scope
+
+(assignment left: ((function_call
+                     name: (identifier) @local.definition)))
+(assignment left: ((field_expression . [(function_call
+                                          name: (identifier) @local.definition)
+                                        (identifier) @local.definition])))
+(assignment left: (_) @local.definition)
+(assignment (multioutput_variable (_) @local.definition))
+
+(iterator . (identifier) @local.definition)
+(global_operator (identifier) @local.definition)
+(persistent_operator (identifier) @local.definition)
+(catch_clause (identifier) @local.definition)
+
+(identifier) @local.reference
diff --git a/runtime/queries/matlab/textobjects.scm b/runtime/queries/matlab/textobjects.scm
new file mode 100644
index 000000000..d94a6653b
--- /dev/null
+++ b/runtime/queries/matlab/textobjects.scm
@@ -0,0 +1,9 @@
+(arguments ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+(function_arguments ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(lambda expression: (_) @function.inside) @function.around
+(function_definition (block) @function.inside) @function.around
+
+(class_definition) @class.inside @class.around
+
+(comment) @comment.inside @comment.around

From 93ac70684437b2da4708a8e20c60ac31052138b3 Mon Sep 17 00:00:00 2001
From: Scott Driggers <github@msd3.io>
Date: Fri, 23 Jun 2023 10:36:02 -0400
Subject: [PATCH 092/967] Allow any indent size from 1 to 16 (#7429)

---
 helix-core/src/indent.rs | 51 +++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index db780ed97..3aede6b0b 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -19,6 +19,10 @@ pub enum IndentStyle {
     Spaces(u8),
 }
 
+// 16 spaces
+const INDENTS: &str = "                ";
+const MAX_INDENT: u8 = 16;
+
 impl IndentStyle {
     /// Creates an `IndentStyle` from an indentation string.
     ///
@@ -27,10 +31,10 @@ impl IndentStyle {
     #[inline]
     pub fn from_str(indent: &str) -> Self {
         // XXX: do we care about validating the input more than this?  Probably not...?
-        debug_assert!(!indent.is_empty() && indent.len() <= 8);
+        debug_assert!(!indent.is_empty() && indent.len() <= MAX_INDENT as usize);
 
         if indent.starts_with(' ') {
-            IndentStyle::Spaces(indent.len() as u8)
+            IndentStyle::Spaces(indent.len().clamp(1, MAX_INDENT as usize) as u8)
         } else {
             IndentStyle::Tabs
         }
@@ -40,20 +44,13 @@ impl IndentStyle {
     pub fn as_str(&self) -> &'static str {
         match *self {
             IndentStyle::Tabs => "\t",
-            IndentStyle::Spaces(1) => " ",
-            IndentStyle::Spaces(2) => "  ",
-            IndentStyle::Spaces(3) => "   ",
-            IndentStyle::Spaces(4) => "    ",
-            IndentStyle::Spaces(5) => "     ",
-            IndentStyle::Spaces(6) => "      ",
-            IndentStyle::Spaces(7) => "       ",
-            IndentStyle::Spaces(8) => "        ",
-
-            // Unsupported indentation style.  This should never happen,
-            // but just in case fall back to two spaces.
             IndentStyle::Spaces(n) => {
-                debug_assert!(n > 0 && n <= 8); // Always triggers. `debug_panic!()` wanted.
-                "  "
+                // Unsupported indentation style.  This should never happen,
+                debug_assert!(n > 0 && n <= MAX_INDENT);
+
+                // Either way, clamp to the nearest supported value
+                let closest_n = n.clamp(1, MAX_INDENT) as usize;
+                &INDENTS[0..closest_n]
             }
         }
     }
@@ -75,9 +72,9 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
     // Build a histogram of the indentation *increases* between
     // subsequent lines, ignoring lines that are all whitespace.
     //
-    // Index 0 is for tabs, the rest are 1-8 spaces.
-    let histogram: [usize; 9] = {
-        let mut histogram = [0; 9];
+    // Index 0 is for tabs, the rest are 1-MAX_INDENT spaces.
+    let histogram: [usize; MAX_INDENT as usize + 1] = {
+        let mut histogram = [0; MAX_INDENT as usize + 1];
         let mut prev_line_is_tabs = false;
         let mut prev_line_leading_count = 0usize;
 
@@ -136,7 +133,7 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
                     histogram[0] += 1;
                 } else {
                     let amount = leading_count - prev_line_leading_count;
-                    if amount <= 8 {
+                    if amount <= MAX_INDENT as usize {
                         histogram[amount] += 1;
                     }
                 }
@@ -797,4 +794,20 @@ mod test {
             3
         );
     }
+
+    #[test]
+    fn test_large_indent_level() {
+        let tab_width = 16;
+        let indent_width = 16;
+        let line = Rope::from("                fn new"); // 16 spaces
+        assert_eq!(
+            indent_level_for_line(line.slice(..), tab_width, indent_width),
+            1
+        );
+        let line = Rope::from("                                fn new"); // 32 spaces
+        assert_eq!(
+            indent_level_for_line(line.slice(..), tab_width, indent_width),
+            2
+        );
+    }
 }

From 08c0a23b7915d4d4b5b30e6cd120fc638b5b6155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Sat, 24 Jun 2023 15:20:42 +0200
Subject: [PATCH 093/967] highlight(matlab): Bumps tree-sitter-matlab commit.
 (#7442)

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

diff --git a/languages.toml b/languages.toml
index a61e2e740..25093bfb0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2285,7 +2285,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "matlab"
-source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "5a047c1572792ae943b51af7cf9307097b2fcce0" }
+source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "b09c27e42732c59321604a15163480ebb4f82f1c" }
 
 [[language]]
 name = "ponylang"

From 6c6923c39eae8b176d4deb7779ab19dcebb326ea Mon Sep 17 00:00:00 2001
From: Branch Vincent <branchevincent@gmail.com>
Date: Sat, 24 Jun 2023 06:27:49 -0700
Subject: [PATCH 094/967] feat(toml): highlight table headers (#7441)

---
 runtime/queries/toml/highlights.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/toml/highlights.scm b/runtime/queries/toml/highlights.scm
index 3c4425f8c..e0a3d6a1b 100644
--- a/runtime/queries/toml/highlights.scm
+++ b/runtime/queries/toml/highlights.scm
@@ -1,10 +1,23 @@
 ; Properties
 ;-----------
 
-[
+(table [
   (bare_key)
+  (dotted_key)
   (quoted_key)
-] @variable.other.member
+] @type)
+
+(table_array_element [
+  (bare_key)
+  (dotted_key)
+  (quoted_key)
+] @type)
+
+(pair [
+  (bare_key)
+  (dotted_key)
+  (quoted_key)
+] @variable.other.member)
 
 ; Literals
 ;---------

From d491e234f4eb4d8c3869f44ab71fedf022dc463e Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 20 Jun 2023 21:35:12 +0200
Subject: [PATCH 095/967] map positions through changes in O(N)

---
 helix-core/src/selection.rs   | 95 ++++++++++++++++++++++-------------
 helix-core/src/transaction.rs | 77 +++++++++++++++++-----------
 helix-lsp/src/lib.rs          |  8 ++-
 helix-view/src/document.rs    | 21 +++++---
 4 files changed, 129 insertions(+), 72 deletions(-)

diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 9e366c337..0539c9f68 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -161,34 +161,35 @@ impl Range {
         self.from() <= pos && pos < self.to()
     }
 
-    /// Map a range through a set of changes. Returns a new range representing the same position
-    /// after the changes are applied.
-    pub fn map(self, changes: &ChangeSet) -> Self {
+    /// Map a range through a set of changes. Returns a new range representing
+    /// the same position after the changes are applied. Note that this
+    /// function runs in O(N) (N is number of changes) and can therefore
+    /// cause performance problems if run for a large number of ranges as the
+    /// complexity is then O(MN) (for multicuror M=N usually). Instead use
+    /// [Selection::map] or [ChangeSet::update_positions] instead
+    pub fn map(mut self, changes: &ChangeSet) -> Self {
         use std::cmp::Ordering;
-        let (anchor, head) = match self.anchor.cmp(&self.head) {
-            Ordering::Equal => (
-                changes.map_pos(self.anchor, Assoc::After),
-                changes.map_pos(self.head, Assoc::After),
-            ),
-            Ordering::Less => (
-                changes.map_pos(self.anchor, Assoc::After),
-                changes.map_pos(self.head, Assoc::Before),
-            ),
-            Ordering::Greater => (
-                changes.map_pos(self.anchor, Assoc::Before),
-                changes.map_pos(self.head, Assoc::After),
-            ),
-        };
-
-        // We want to return a new `Range` with `horiz == None` every time,
-        // even if the anchor and head haven't changed, because we don't
-        // know if the *visual* position hasn't changed due to
-        // character-width or grapheme changes earlier in the text.
-        Self {
-            anchor,
-            head,
-            old_visual_position: None,
+        if changes.is_empty() {
+            return self;
         }
+
+        let positions_to_map = match self.anchor.cmp(&self.head) {
+            Ordering::Equal => [
+                (&mut self.anchor, Assoc::After),
+                (&mut self.head, Assoc::After),
+            ],
+            Ordering::Less => [
+                (&mut self.anchor, Assoc::After),
+                (&mut self.head, Assoc::Before),
+            ],
+            Ordering::Greater => [
+                (&mut self.head, Assoc::After),
+                (&mut self.anchor, Assoc::Before),
+            ],
+        };
+        changes.update_positions(positions_to_map.into_iter());
+        self.old_visual_position = None;
+        self
     }
 
     /// Extend the range to cover at least `from` `to`.
@@ -450,18 +451,44 @@ impl Selection {
 
     /// Map selections over a set of changes. Useful for adjusting the selection position after
     /// applying changes to a document.
-    pub fn map(self, changes: &ChangeSet) -> Self {
+    pub fn map(mut self, changes: &ChangeSet) -> Self {
         if changes.is_empty() {
             return self;
         }
+        self = self.map_no_normalize(changes);
+        // TODO: only normalize if needed (any ranges out of order)
+        self = self.normalize();
 
-        Self::new(
-            self.ranges
-                .into_iter()
-                .map(|range| range.map(changes))
-                .collect(),
-            self.primary_index,
-        )
+        self
+    }
+
+    /// Map selections over a set of changes. Useful for adjusting the selection position after
+    /// applying changes to a document. Doesn't normalize the selection
+    pub fn map_no_normalize(mut self, changes: &ChangeSet) -> Self {
+        if changes.is_empty() {
+            return self;
+        }
+
+        let positions_to_map = self.ranges.iter_mut().flat_map(|range| {
+            use std::cmp::Ordering;
+            range.old_visual_position = None;
+            match range.anchor.cmp(&range.head) {
+                Ordering::Equal => [
+                    (&mut range.anchor, Assoc::After),
+                    (&mut range.head, Assoc::After),
+                ],
+                Ordering::Less => [
+                    (&mut range.anchor, Assoc::After),
+                    (&mut range.head, Assoc::Before),
+                ],
+                Ordering::Greater => [
+                    (&mut range.head, Assoc::After),
+                    (&mut range.anchor, Assoc::Before),
+                ],
+            }
+        });
+        changes.update_positions(positions_to_map);
+        self
     }
 
     pub fn ranges(&self) -> &[Range] {
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index f4f94b540..53e53c234 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -1,7 +1,7 @@
 use smallvec::SmallVec;
 
 use crate::{Range, Rope, Selection, Tendril};
-use std::borrow::Cow;
+use std::{borrow::Cow, iter::once};
 
 /// (from, to, replacement)
 pub type Change = (usize, usize, Option<Tendril>);
@@ -326,17 +326,33 @@ impl ChangeSet {
         self.changes.is_empty() || self.changes == [Operation::Retain(self.len)]
     }
 
-    /// Map a position through the changes.
+    /// Map a *sorted* list of positions through the changes.
     ///
-    /// `assoc` indicates which size to associate the position with. `Before` will keep the
-    /// position close to the character before, and will place it before insertions over that
-    /// range, or at that point. `After` will move it forward, placing it at the end of such
-    /// insertions.
-    pub fn map_pos(&self, pos: usize, assoc: Assoc) -> usize {
+    /// This is equivalent to updating each position with `map_pos`:
+    ///
+    /// ``` no-compile
+    /// for (pos, assoc) in positions {
+    ///     *pos = changes.map_pos(*pos, assoc);
+    /// }
+    /// ```
+    /// However this function is significantly faster running in `O(N+M)` instead of `O(NM)`
+    pub fn update_positions<'a>(&self, positions: impl Iterator<Item = (&'a mut usize, Assoc)>) {
         use Operation::*;
+
+        let mut positions = positions.peekable();
+        macro_rules! map {
+            ($map: expr) => {
+                loop {
+                    let Some((pos, assoc)) = positions.peek_mut() else { return; };
+                    let Some(new_pos) = $map(**pos, *assoc) else { break; };
+                    **pos = new_pos;
+                    positions.next();
+                }
+            };
+        }
+
         let mut old_pos = 0;
         let mut new_pos = 0;
-
         let mut iter = self.changes.iter().peekable();
 
         while let Some(change) = iter.next() {
@@ -348,16 +364,12 @@ impl ChangeSet {
 
             match change {
                 Retain(_) => {
-                    if old_end > pos {
-                        return new_pos + (pos - old_pos);
-                    }
+                    map!(|pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)));
                     new_pos += len;
                 }
                 Delete(_) => {
                     // in range
-                    if old_end > pos {
-                        return new_pos;
-                    }
+                    map!(|pos, _| (old_end > pos).then_some(new_pos));
                 }
                 Insert(s) => {
                     let ins = s.chars().count();
@@ -368,26 +380,26 @@ impl ChangeSet {
 
                         old_end = old_pos + len;
                         // in range of replaced text
-                        if old_end > pos {
+                        map!(|pos, assoc| (old_end > pos).then(|| {
                             // at point or tracking before
                             if pos == old_pos || assoc == Assoc::Before {
-                                return new_pos;
+                                new_pos
                             } else {
                                 // place to end of insert
-                                return new_pos + ins;
+                                new_pos + ins
                             }
-                        }
+                        }));
                     } else {
                         // at insert point
-                        if old_pos == pos {
+                        map!(|pos, assoc| (old_pos == pos).then(|| {
                             // return position before inserted text
                             if assoc == Assoc::Before {
-                                return new_pos;
+                                new_pos
                             } else {
                                 // after text
-                                return new_pos + ins;
+                                new_pos + ins
                             }
-                        }
+                        }));
                     }
 
                     new_pos += ins;
@@ -395,14 +407,21 @@ impl ChangeSet {
             }
             old_pos = old_end;
         }
+        map!(|pos, _| (old_pos == pos).then_some(new_pos));
+        let out_of_bounds: Vec<_> = positions.collect();
 
-        if pos > old_pos {
-            panic!(
-                "Position {} is out of range for changeset len {}!",
-                pos, old_pos
-            )
-        }
-        new_pos
+        panic!("Positions {out_of_bounds:?} are out of range for changeset len {old_pos}!",)
+    }
+
+    /// Map a position through the changes.
+    ///
+    /// `assoc` indicates which side to associate the position with. `Before` will keep the
+    /// position close to the character before, and will place it before insertions over that
+    /// range, or at that point. `After` will move it forward, placing it at the end of such
+    /// insertions.
+    pub fn map_pos(&self, mut pos: usize, assoc: Assoc) -> usize {
+        self.update_positions(once((&mut pos, assoc)));
+        pos
     }
 
     pub fn changes_iter(&self) -> ChangeIterator {
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index d053dbf9c..277a4c28b 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -377,7 +377,7 @@ pub mod util {
         .expect("transaction must be valid for primary selection");
         let removed_text = text.slice(removed_start..removed_end);
 
-        let (transaction, selection) = Transaction::change_by_selection_ignore_overlapping(
+        let (transaction, mut selection) = Transaction::change_by_selection_ignore_overlapping(
             doc,
             selection,
             |range| {
@@ -420,6 +420,11 @@ pub mod util {
             return transaction;
         }
 
+        // Don't normalize to avoid merging/reording selections which would
+        // break the association between tabstops and selections. Most ranges
+        // will be replaced by tabstops anyways and the final selection will be
+        // normalized anyways
+        selection = selection.map_no_normalize(changes);
         let mut mapped_selection = SmallVec::with_capacity(selection.len());
         let mut mapped_primary_idx = 0;
         let primary_range = selection.primary();
@@ -428,7 +433,6 @@ pub mod util {
                 mapped_primary_idx = mapped_selection.len()
             }
 
-            let range = range.map(changes);
             let tabstops = tabstops.first().filter(|tabstops| !tabstops.is_empty());
             let Some(tabstops) = tabstops else{
                 // no tabstop normal mapping
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 52b2dfc0c..4140c105a 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1121,21 +1121,28 @@ impl Document {
 
             let changes = transaction.changes();
 
+            changes.update_positions(
+                self.diagnostics
+                    .iter_mut()
+                    .map(|diagnostic| (&mut diagnostic.range.start, Assoc::After)),
+            );
+            changes.update_positions(
+                self.diagnostics
+                    .iter_mut()
+                    .map(|diagnostic| (&mut diagnostic.range.end, Assoc::After)),
+            );
             // map state.diagnostics over changes::map_pos too
             for diagnostic in &mut self.diagnostics {
-                diagnostic.range.start = changes.map_pos(diagnostic.range.start, Assoc::After);
-                diagnostic.range.end = changes.map_pos(diagnostic.range.end, Assoc::After);
                 diagnostic.line = self.text.char_to_line(diagnostic.range.start);
             }
-            self.diagnostics
-                .sort_unstable_by_key(|diagnostic| diagnostic.range);
 
             // 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) {
-                    for inline in data.iter_mut() {
-                        inline.char_idx = changes.map_pos(inline.char_idx, Assoc::After);
-                    }
+                    changes.update_positions(
+                        data.iter_mut()
+                            .map(|diagnostic| (&mut diagnostic.char_idx, Assoc::After)),
+                    );
                 }
             };
 

From b33516fb16df93572ac4ddec1d4079282a2b4b5a Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 22 Jun 2023 23:37:39 +0200
Subject: [PATCH 096/967] move normalize fastpath into normalize function

---
 helix-core/src/selection.rs | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 0539c9f68..9104c2099 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -451,15 +451,8 @@ impl Selection {
 
     /// Map selections over a set of changes. Useful for adjusting the selection position after
     /// applying changes to a document.
-    pub fn map(mut self, changes: &ChangeSet) -> Self {
-        if changes.is_empty() {
-            return self;
-        }
-        self = self.map_no_normalize(changes);
-        // TODO: only normalize if needed (any ranges out of order)
-        self = self.normalize();
-
-        self
+    pub fn map(self, changes: &ChangeSet) -> Self {
+        self.map_no_normalize(changes).normalize()
     }
 
     /// Map selections over a set of changes. Useful for adjusting the selection position after
@@ -524,6 +517,9 @@ impl Selection {
 
     /// Normalizes a `Selection`.
     fn normalize(mut self) -> Self {
+        if self.len() < 2 {
+            return self;
+        }
         let mut primary = self.ranges[self.primary_index];
         self.ranges.sort_unstable_by_key(Range::from);
 
@@ -588,17 +584,12 @@ impl Selection {
         assert!(!ranges.is_empty());
         debug_assert!(primary_index < ranges.len());
 
-        let mut selection = Self {
+        let selection = Self {
             ranges,
             primary_index,
         };
 
-        if selection.ranges.len() > 1 {
-            // TODO: only normalize if needed (any ranges out of order)
-            selection = selection.normalize();
-        }
-
-        selection
+        selection.normalize()
     }
 
     /// Takes a closure and maps each `Range` over the closure.

From 8d39a81aa88a813c6a3e1734e5cb3c05fd723839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 26 Jun 2023 22:20:20 +0900
Subject: [PATCH 097/967] fix: Regression from
 d491e234f4eb4d8c3869f44ab71fedf022dc463e

---
 helix-view/src/document.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 4140c105a..afcd3bff9 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1136,6 +1136,9 @@ impl Document {
                 diagnostic.line = self.text.char_to_line(diagnostic.range.start);
             }
 
+            self.diagnostics
+                .sort_unstable_by_key(|diagnostic| diagnostic.range);
+
             // 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) {

From 636c91c76b2855a4ac58b3a030a9e45f88eb7502 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 26 Jun 2023 10:17:04 -0500
Subject: [PATCH 098/967] Mark buffers created from stdin as modified (#7431)

This resolves some confusing behavior where a scratch document created
by piping into hx is discarded when navigating away from that document.

We discard any scratch documents that are not modified and the original
`Editor::new_file_from_stdin` would create unmodified documents. We
refactor this function to create an empty document first and then to
apply the text from stdin as a change.
---
 helix-view/src/document.rs | 105 ++++++++++++++++++++++++++++---------
 helix-view/src/editor.rs   |  21 ++++++--
 2 files changed, 95 insertions(+), 31 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index afcd3bff9..d78d30d8e 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -397,33 +397,11 @@ pub fn from_reader<R: std::io::Read + ?Sized>(
     let mut buf_out = [0u8; BUF_SIZE];
     let mut builder = RopeBuilder::new();
 
-    // By default, the encoding of the text is auto-detected by
-    // `encoding_rs` for_bom, and if it fails, from `chardetng`
-    // crate which requires sample data from the reader.
-    // As a manual override to this auto-detection is possible, the
-    // same data is read into `buf` to ensure symmetry in the upcoming
-    // loop.
-    let (encoding, has_bom, mut decoder, mut slice, mut is_empty) = {
-        let read = reader.read(&mut buf)?;
-        let is_empty = read == 0;
-        let (encoding, has_bom) = encoding
-            .map(|encoding| (encoding, false))
-            .or_else(|| {
-                encoding::Encoding::for_bom(&buf).map(|(encoding, _bom_size)| (encoding, true))
-            })
-            .unwrap_or_else(|| {
-                let mut encoding_detector = chardetng::EncodingDetector::new();
-                encoding_detector.feed(&buf, is_empty);
-                (encoding_detector.guess(None, true), false)
-            });
-
-        let decoder = encoding.new_decoder();
+    let (encoding, has_bom, mut decoder, read) =
+        read_and_detect_encoding(reader, encoding, &mut buf)?;
 
-        // If the amount of bytes read from the reader is less than
-        // `buf.len()`, it is undesirable to read the bytes afterwards.
-        let slice = &buf[..read];
-        (encoding, has_bom, decoder, slice, is_empty)
-    };
+    let mut slice = &buf[..read];
+    let mut is_empty = read == 0;
 
     // `RopeBuilder::append()` expects a `&str`, so this is the "real"
     // output buffer. When decoding, the number of bytes in the output
@@ -493,6 +471,81 @@ pub fn from_reader<R: std::io::Read + ?Sized>(
     Ok((rope, encoding, has_bom))
 }
 
+pub fn read_to_string<R: std::io::Read + ?Sized>(
+    reader: &mut R,
+    encoding: Option<&'static Encoding>,
+) -> Result<(String, &'static Encoding, bool), Error> {
+    let mut buf = [0u8; BUF_SIZE];
+
+    let (encoding, has_bom, mut decoder, read) =
+        read_and_detect_encoding(reader, encoding, &mut buf)?;
+
+    let mut slice = &buf[..read];
+    let mut is_empty = read == 0;
+    let mut buf_string = String::with_capacity(buf.len());
+
+    loop {
+        let mut total_read = 0usize;
+
+        loop {
+            let (result, read, ..) =
+                decoder.decode_to_string(&slice[total_read..], &mut buf_string, is_empty);
+
+            total_read += read;
+
+            match result {
+                encoding::CoderResult::InputEmpty => {
+                    debug_assert_eq!(slice.len(), total_read);
+                    break;
+                }
+                encoding::CoderResult::OutputFull => {
+                    debug_assert!(slice.len() > total_read);
+                    buf_string.reserve(buf.len())
+                }
+            }
+        }
+
+        if is_empty {
+            debug_assert_eq!(reader.read(&mut buf)?, 0);
+            break;
+        }
+
+        let read = reader.read(&mut buf)?;
+        slice = &buf[..read];
+        is_empty = read == 0;
+    }
+    Ok((buf_string, encoding, has_bom))
+}
+
+/// Reads the first chunk from a Reader into the given buffer
+/// and detects the encoding.
+///
+/// By default, the encoding of the text is auto-detected by
+/// `encoding_rs` for_bom, and if it fails, from `chardetng`
+/// crate which requires sample data from the reader.
+/// As a manual override to this auto-detection is possible, the
+/// same data is read into `buf` to ensure symmetry in the upcoming
+/// loop.
+fn read_and_detect_encoding<R: std::io::Read + ?Sized>(
+    reader: &mut R,
+    encoding: Option<&'static Encoding>,
+    buf: &mut [u8],
+) -> Result<(&'static Encoding, bool, encoding::Decoder, usize), Error> {
+    let read = reader.read(buf)?;
+    let is_empty = read == 0;
+    let (encoding, has_bom) = encoding
+        .map(|encoding| (encoding, false))
+        .or_else(|| encoding::Encoding::for_bom(buf).map(|(encoding, _bom_size)| (encoding, true)))
+        .unwrap_or_else(|| {
+            let mut encoding_detector = chardetng::EncodingDetector::new();
+            encoding_detector.feed(buf, is_empty);
+            (encoding_detector.guess(None, true), false)
+        });
+    let decoder = encoding.new_decoder();
+
+    Ok((encoding, has_bom, decoder, read))
+}
+
 // The documentation and implementation of this function should be up-to-date with
 // its sibling function, `from_reader()`.
 //
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 1a884c324..61d148d32 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1386,11 +1386,22 @@ impl Editor {
     }
 
     pub fn new_file_from_stdin(&mut self, action: Action) -> Result<DocumentId, Error> {
-        let (rope, encoding, has_bom) = crate::document::from_reader(&mut stdin(), None)?;
-        Ok(self.new_file_from_document(
-            action,
-            Document::from(rope, Some((encoding, has_bom)), self.config.clone()),
-        ))
+        let (stdin, encoding, has_bom) = crate::document::read_to_string(&mut stdin(), None)?;
+        let doc = Document::from(
+            helix_core::Rope::default(),
+            Some((encoding, has_bom)),
+            self.config.clone(),
+        );
+        let doc_id = self.new_file_from_document(action, doc);
+        let doc = doc_mut!(self, &doc_id);
+        let view = view_mut!(self);
+        doc.ensure_view_init(view.id);
+        let transaction =
+            helix_core::Transaction::insert(doc.text(), doc.selection(view.id), stdin.into())
+                .with_selection(Selection::point(0));
+        doc.apply(&transaction, view.id);
+        doc.append_changes_to_history(view);
+        Ok(doc_id)
     }
 
     // ??? possible use for integration tests

From ad04b9125d20367094cd2a4b6f5467b2ae5be420 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:08:46 +0900
Subject: [PATCH 099/967] build(deps): bump gix from 0.46.0 to 0.47.0 (#7460)

Bumps [gix](https://github.com/Byron/gitoxide) from 0.46.0 to 0.47.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.46.0...gix-v0.47.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           | 178 +++++++++++++++++++++++--------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 98 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6db4c393..0ff931bde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -486,9 +486,9 @@ dependencies = [
 
 [[package]]
 name = "gix"
-version = "0.46.0"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99368b48a2f68c3fdc26e62c6425bdc4baeb4f30a4f24eb2e0904d29a2ba97ab"
+checksum = "10f5281c55e0a7415877d91a15fae4a10ec7444615d64d78e48c07f20bcfcd9b"
 dependencies = [
  "gix-actor",
  "gix-attributes",
@@ -518,6 +518,7 @@ dependencies = [
  "gix-revision",
  "gix-sec",
  "gix-tempfile",
+ "gix-trace",
  "gix-traverse",
  "gix-url",
  "gix-utils",
@@ -533,9 +534,9 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fe73f9f6be1afbf1bd5be919a9636fa560e2f14d42262a934423ed6760cd838"
+checksum = "b70d0d809ee387113df810ab4ebe585a076e35ae6ed59b5b280072146955a3ff"
 dependencies = [
  "bstr",
  "btoi",
@@ -547,9 +548,9 @@ dependencies = [
 
 [[package]]
 name = "gix-attributes"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b79590ac382f80d87e06416f5fcac6fee5d83dcb152a00ed0bdbaa988acc31"
+checksum = "03d7006cc5a508514207154046e18c3c39d98ba98f865ada83b6f3f3886543bb"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -564,36 +565,36 @@ dependencies = [
 
 [[package]]
 name = "gix-bitmap"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc02feb20ad313d52a450852f2005c2205d24f851e74d82b7807cbe12c371667"
+checksum = "311e2fa997be6560c564b070c5da2d56d038b645a94e1e5796d5d85a350da33c"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7acf3bc6c4b91e8fb260086daf5e105ea3a6d913f5fd3318137f7e309d6e540"
+checksum = "39db5ed0fc0a2e9b1b8265993f7efdbc30379dec268f3b91b7af0c2de4672fdd"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-command"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6141b70cfb21255223e42f3379855037cbbe8673b58dd8318d2f09b516fad1"
+checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb"
 dependencies = [
  "bstr",
 ]
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8490ae1b3d55c47e6a71d247c082304a2f79f8d0332c1a2f5693d42a2021a09"
+checksum = "0e498e98d0b477d6a1c1608bee39db201e7a38873460a130a97ce88b4d95b6e1"
 dependencies = [
  "bstr",
  "gix-chunk",
@@ -605,9 +606,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f310120ae1ba8f0ca52fb22876ce9bad5b15c8ffb3eb7302e4b64a3b9f681c"
+checksum = "33b32541232a2c626849df7843e05b50cb43ac38a4f675abbe2f661874fc1e9d"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -627,9 +628,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f216df1c33e6e1555923eff0096858a879e8aaadd35b5d788641e4e8064c892"
+checksum = "4783caa23062f86acfd1bc9e72c62250923d1673171ce1a524d9486f8a4556a8"
 dependencies = [
  "bitflags 2.3.2",
  "bstr",
@@ -640,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "gix-credentials"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f89fea8acd28f5ef8fa5042146f1637afd4d834bc8f13439d8fd1e5aca0d65"
+checksum = "7dcec518a8db5b2e342ea7a2e785f46fd176b1b689ddd3f43052701bf3fa8ee3"
 dependencies = [
  "bstr",
  "gix-command",
@@ -656,9 +657,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc164145670e9130a60a21670d9b6f0f4f8de04e5dd256c51fa5a0340c625902"
+checksum = "0213f923d63c2c7d10799c1977f42df38ec586ebbf1d14fd00dfa363ac994c2b"
 dependencies = [
  "bstr",
  "itoa",
@@ -668,9 +669,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.30.1"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9029ad0083cc286a4bd2f5b3bf66bb66398abc26f2731a2824cd5edfc41a0e33"
+checksum = "5049dd5a60d5608912da0ab184f35064901f192f4adf737716789715faffa080"
 dependencies = [
  "gix-hash",
  "gix-object",
@@ -680,9 +681,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aba9c6c0d1f2b2efe65581de73de4305004612d49c83773e783202a7ef204f46"
+checksum = "c14865cb9c6eb817d6a8d53595f1051239d2d31feae7a5e5b2f00910c94a8eb4"
 dependencies = [
  "bstr",
  "dunce",
@@ -695,13 +696,14 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8c493409bf6060d408eec9bbdd1b12ea351266b50012e2a522f75dfc7b8314"
+checksum = "ae82dfceec06c034728c530399ee449f97b1e542e191247c52c169ca6af1fd89"
 dependencies = [
  "crc32fast",
  "flate2",
  "gix-hash",
+ "gix-trace",
  "libc",
  "once_cell",
  "prodash",
@@ -712,18 +714,18 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30da8997008adb87f94e15beb7ee229f8a48e97af585a584bfee4a5a1880aab5"
+checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496"
 dependencies = [
  "gix-features",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e"
+checksum = "f45cd7ab22faf154db0a9f5a8011ba9cda8b298b61b7299f43a21bbaf0b3f208"
 dependencies = [
  "bitflags 2.3.2",
  "bstr",
@@ -733,9 +735,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee181c85d3955f54c4426e6bfaeeada4428692e1a39b8788c2ac7785fc301dd8"
+checksum = "a0dd58cdbe7ffa4032fc111864c80d5f8cecd9a2c9736c97ae7e5be834188272"
 dependencies = [
  "hex",
  "thiserror",
@@ -743,9 +745,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd259bd0d96e6153e357a8cdaca76c48e103fd34208b6c0ce77b1ad995834bd2"
+checksum = "2cfd7f4ea905c13579565e3c264ca2c4103d192bd5fce2300c5a884cf1977d61"
 dependencies = [
  "gix-hash",
  "hashbrown 0.13.2",
@@ -754,9 +756,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ignore"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6f7f101a0ccce808dbf7008ba131dede94e20257e7bde7a44cbb2f8c775625"
+checksum = "27e82dec6975012b710837c6cd56353c3111d2308e016118bfc59275fcc8b5d0"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -766,9 +768,9 @@ dependencies = [
 
 [[package]]
 name = "gix-index"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0380cdab7863e67966eee4aed32856c864c20b077e026b637af6bb3a9281b4"
+checksum = "2ef2fa392d351e62ac3a6309146f61880abfbe0c07474e075d3b2ac78a6834a5"
 dependencies = [
  "bitflags 2.3.2",
  "bstr",
@@ -788,9 +790,9 @@ dependencies = [
 
 [[package]]
 name = "gix-lock"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec5d5e6f07316d3553aa7425e3ecd935ec29882556021fe1696297a448af8d2"
+checksum = "328f50aad713ab606caeaf834459ef915ccdfbb9133ac6cd54616d601aa9249f"
 dependencies = [
  "gix-tempfile",
  "gix-utils",
@@ -799,39 +801,42 @@ dependencies = [
 
 [[package]]
 name = "gix-mailmap"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4653701922c920e009f1bc4309feaff14882ade017770788f9a150928da3fa6a"
+checksum = "d0bef8d360a6a9fc5a6d872471588d8ca7db77b940e48ff20c3b4706ad5f481d"
 dependencies = [
  "bstr",
  "gix-actor",
+ "gix-date",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-negotiate"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c"
+checksum = "b626aafb9f4088058f1baa5d2029b2191820c84f6c81e43535ba70bfdc7b7d56"
 dependencies = [
  "bitflags 2.3.2",
  "gix-commitgraph",
+ "gix-date",
  "gix-hash",
  "gix-object",
- "gix-revision",
+ "gix-revwalk",
  "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-object"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8926c8f51c44dec3e709cb5dbc93deb9e8d4064c43c9efc54c158dcdfe8446c7"
+checksum = "255e477ae4cc8d10778238f011e6125b01cc0e7067dc8df87acd67a428a81f20"
 dependencies = [
  "bstr",
  "btoi",
  "gix-actor",
+ "gix-date",
  "gix-features",
  "gix-hash",
  "gix-validate",
@@ -844,11 +849,12 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d98eaba4f649fed17250651c4ddfaf997c80a30f5ee4b47ac9bc18ffe3eb16"
+checksum = "6b73469f145d1e6afbcfd0ab6499a366fbbcb958c2999d41d283d6c7b94024b9"
 dependencies = [
  "arc-swap",
+ "gix-date",
  "gix-features",
  "gix-hash",
  "gix-object",
@@ -862,9 +868,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e9e228f18cd87e7596e687b38619b5e4caebc678644ae6bb3d842598166d72"
+checksum = "a1f3bcd1aaa72aea7163b147d2bde2480a01eadefc774a479d38f29920f7f1c8"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -884,11 +890,12 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1226f2e50adeb4d76c754c1856c06f13a24cad1624801653fbf09b869e5b808"
+checksum = "4ea2a19d82dd55e5fad1d606b8a1ad2f7a804e10caa2efbb169cd37e0a07ede0"
 dependencies = [
  "bstr",
+ "gix-trace",
  "home",
  "once_cell",
  "thiserror",
@@ -896,9 +903,9 @@ dependencies = [
 
 [[package]]
 name = "gix-prompt"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e15fe57fa48572b7d3bf465d6a2a0351cd3c55cba74fd5f0b9c23689f9c1a31e"
+checksum = "8dfd363fd89a40c1e7bff9c9c1b136cd2002480f724b0c627c1bc771cd5480ec"
 dependencies = [
  "gix-command",
  "gix-config-value",
@@ -909,9 +916,9 @@ dependencies = [
 
 [[package]]
 name = "gix-quote"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d59489bff95b06dcdabe763b7266d3dc0a628cac1ac1caf65a7ca0a43eeae0"
+checksum = "3874de636c2526de26a3405b8024b23ef1a327bebf4845d770d00d48700b6a40"
 dependencies = [
  "bstr",
  "btoi",
@@ -920,11 +927,12 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebdd999256f4ce8a5eefa89999879c159c263f3493a951d62aa5ce42c0397e1c"
+checksum = "9b6c74873a9d8ff5d1310f2325f09164c15a91402ab5cde4d479ae12ff55ed69"
 dependencies = [
  "gix-actor",
+ "gix-date",
  "gix-features",
  "gix-fs",
  "gix-hash",
@@ -940,9 +948,9 @@ dependencies = [
 
 [[package]]
 name = "gix-refspec"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72bfd622abc86dd8ad1ec51b9eb77b4f1a766b94e3a1b87cf4a022c5b5570cf4"
+checksum = "ca1bc6c40bad62570683d642fcb04e977433ac8f76b674860ef7b1483c1f8990"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -954,9 +962,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.15.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5044f56cd7a487ce9b034cbe0252ae0b6b47ff56ca3dabd79bc30214d0932cd7"
+checksum = "f3751d6643d731fc5829d2f43ca049f4333c968f30908220ba0783c9dfe5010c"
 dependencies = [
  "bstr",
  "gix-date",
@@ -969,11 +977,12 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc2623ba8747914f151f5e12b65adac576ab459dbed5f50a36c7a3e9cbf2d3ca"
+checksum = "144995229c6e5788b1c7386f8a3f7146ace3745c9a6b56cef9123a7d83b110c5"
 dependencies = [
  "gix-commitgraph",
+ "gix-date",
  "gix-hash",
  "gix-hashtable",
  "gix-object",
@@ -983,9 +992,9 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b7b38b766eb95dcc5350a9c450030b69892c0902fa35f4a6d0809273bd9dae"
+checksum = "47f09860e2ddc7b13119e410c46d8e9f870acc7933fb53ae65817af83a8c9f80"
 dependencies = [
  "bitflags 2.3.2",
  "gix-path",
@@ -995,9 +1004,9 @@ dependencies = [
 
 [[package]]
 name = "gix-tempfile"
-version = "6.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3785cb010e9dc5c446dfbf02bc1119fc17d3a48a27c029efcb3a3c32953eb10"
+checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2"
 dependencies = [
  "gix-fs",
  "libc",
@@ -1008,13 +1017,20 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "gix-trace"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff8a60073500f4d6edd181432ee11394d843db7dcf05756aa137a1233b1cbf6"
+
 [[package]]
 name = "gix-traverse"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8673546506391a10fdfd4e48c8e0f3ec92355cf1fac787d2e714c7d45e301ede"
+checksum = "c3f6bba1686bfbc7e0e93d4932bc6e14d479c9c9524f7c8d65b25d2a9446a99e"
 dependencies = [
  "gix-commitgraph",
+ "gix-date",
  "gix-hash",
  "gix-hashtable",
  "gix-object",
@@ -1025,9 +1041,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1663df25ac42047a2547618d2a6979a26f478073f6306997429235d2cd4c863"
+checksum = "ff1f984816338039b151a9f5dae6100e1e51e438cf61242ea8136fedc574d825"
 dependencies = [
  "bstr",
  "gix-features",
@@ -1039,18 +1055,18 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbcfcb150c7ef553d76988467d223254045bdcad0dc6724890f32fbe96415da5"
+checksum = "1ca284c260845bc0724050aec59c7a596407678342614cdf5a1d69e044f29a36"
 dependencies = [
  "fastrand",
 ]
 
 [[package]]
 name = "gix-validate"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ea5845b506c7728b9d89f4227cc369a5fc5a1d5b26c3add0f0d323413a3a60"
+checksum = "8d092b594c8af00a3a31fe526d363ee8a51a6f29d8496cdb991ed2f01ec0ec13"
 dependencies = [
  "bstr",
  "thiserror",
@@ -1058,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b32a0e7ed52577bfb050f5350bdee2741d1b08a9ed02a2f2df6effe353896ca"
+checksum = "4ee22549d6723189366235e1c6959ccdac73b58197cdbb437684eaa2169edcb9"
 dependencies = [
  "bstr",
  "filetime",
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 4ac0f25e8..81b37da53 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
 parking_lot = "0.12"
 arc-swap = { version = "1.6.0" }
 
-gix = { version = "0.46.0", default-features = false , optional = true }
+gix = { version = "0.47.0", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From dcad5cddd1bc9624d65bcbb89486c3e00766d9bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:08:58 +0900
Subject: [PATCH 100/967] build(deps): bump toml from 0.7.4 to 0.7.5 (#7461)

Bumps [toml](https://github.com/toml-rs/toml) from 0.7.4 to 0.7.5.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.7.4...toml-v0.7.5)

---
updated-dependencies:
- dependency-name: toml
  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 | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ff931bde..753d1960c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -331,6 +331,12 @@ dependencies = [
  "encoding_rs",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+
 [[package]]
 name = "errno"
 version = "0.3.1"
@@ -1455,12 +1461,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.9.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
+ "equivalent",
+ "hashbrown 0.14.0",
 ]
 
 [[package]]
@@ -1920,9 +1926,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
 dependencies = [
  "serde",
 ]
@@ -2235,9 +2241,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2247,18 +2253,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.9"
+version = "0.19.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
+checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
 dependencies = [
  "indexmap",
  "serde",

From b68b3608a6772fd6740fb7e7ccc623a1a1579b17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:09:27 +0900
Subject: [PATCH 101/967] build(deps): bump serde_json from 1.0.97 to 1.0.99
 (#7462)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.97 to 1.0.99.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.97...v1.0.99)

---
updated-dependencies:
- dependency-name: serde_json
  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 753d1960c..9cd9405d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1904,9 +1904,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.97"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
+checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
 dependencies = [
  "itoa",
  "ryu",

From d8f9b901ddb1d91bf3ade66cf091e93b5cab6e49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:37:22 +0200
Subject: [PATCH 102/967] build(deps): bump libc from 0.2.146 to 0.2.147
 (#7463)

Bumps [libc](https://github.com/rust-lang/libc) from 0.2.146 to 0.2.147.
- [Release notes](https://github.com/rust-lang/libc/releases)
- [Commits](https://github.com/rust-lang/libc/compare/0.2.146...0.2.147)

---
updated-dependencies:
- dependency-name: libc
  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-term/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9cd9405d0..c6c6dcef0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1537,9 +1537,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 55885a9f2..0f65799cb 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -68,7 +68,7 @@ grep-searcher = "0.1.11"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.146"
+libc = "0.2.147"
 
 [build-dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }

From 4a2337d828c6c2fa7c0e46052e4c8a62dbd4737d Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 28 Jun 2023 16:35:31 +0200
Subject: [PATCH 103/967] correctly map unsorted positions (#7471)

* correctly map unsorted positions

* Fix typo

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-core/src/transaction.rs | 130 ++++++++++++++++++++++++----------
 helix-view/src/document.rs    |   2 +-
 2 files changed, 95 insertions(+), 37 deletions(-)

diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 53e53c234..9d2a3e5c4 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -326,7 +326,7 @@ impl ChangeSet {
         self.changes.is_empty() || self.changes == [Operation::Retain(self.len)]
     }
 
-    /// Map a *sorted* list of positions through the changes.
+    /// Map a (mostly) *sorted* list of positions through the changes.
     ///
     /// This is equivalent to updating each position with `map_pos`:
     ///
@@ -335,27 +335,63 @@ impl ChangeSet {
     ///     *pos = changes.map_pos(*pos, assoc);
     /// }
     /// ```
-    /// However this function is significantly faster running in `O(N+M)` instead of `O(NM)`
+    /// However this function is significantly faster for sorted lists running
+    /// in `O(N+M)` instead of `O(NM)`. This function also handles unsorted/
+    /// partially sorted lists. However, in that case worst case complexity is
+    /// again `O(MN)`.  For lists that are often/mostly sorted (like the end of diagnostic ranges)
+    /// performance is usally close to `O(N + M)`
     pub fn update_positions<'a>(&self, positions: impl Iterator<Item = (&'a mut usize, Assoc)>) {
         use Operation::*;
 
         let mut positions = positions.peekable();
-        macro_rules! map {
-            ($map: expr) => {
-                loop {
-                    let Some((pos, assoc)) = positions.peek_mut() else { return; };
-                    let Some(new_pos) = $map(**pos, *assoc) else { break; };
-                    **pos = new_pos;
-                    positions.next();
-                }
-            };
-        }
 
         let mut old_pos = 0;
         let mut new_pos = 0;
-        let mut iter = self.changes.iter().peekable();
+        let mut iter = self.changes.iter().enumerate().peekable();
+
+        'outer: loop {
+            macro_rules! map {
+                ($map: expr, $i: expr) => {
+                    loop {
+                        let Some((pos, assoc)) = positions.peek_mut() else { return; };
+                        if **pos < old_pos {
+                            // Positions are not sorted, revert to the last Operation that
+                            // contains this position and continue iterating from there.
+                            // We can unwrap here since `pos` can not be negative
+                            // (unsigned integer) and iterating backwards to the start
+                            // should always move us back to the start
+                            for (i, change) in self.changes[..$i].iter().enumerate().rev() {
+                                match change {
+                                    Retain(i) => {
+                                        old_pos -= i;
+                                        new_pos -= i;
+                                    }
+                                    Delete(i) => {
+                                        old_pos -= i;
+                                    }
+                                    Insert(ins) => {
+                                        new_pos -= ins.chars().count();
+                                    }
+                                }
+                                if old_pos <= **pos {
+                                    iter = self.changes[i..].iter().enumerate().peekable();
+                                }
+                            }
+                            debug_assert!(old_pos <= **pos, "Reverse Iter across changeset works");
+                            continue 'outer;
+                        }
+                        let Some(new_pos) = $map(**pos, *assoc) else { break; };
+                        **pos = new_pos;
+                        positions.next();
+                    }
+                };
+            }
+
+            let Some((i, change)) = iter.next() else {
+                map!(|pos, _| (old_pos == pos).then_some(new_pos), self.changes.len());
+                break;
+            };
 
-        while let Some(change) = iter.next() {
             let len = match change {
                 Delete(i) | Retain(i) => *i,
                 Insert(_) => 0,
@@ -364,42 +400,51 @@ impl ChangeSet {
 
             match change {
                 Retain(_) => {
-                    map!(|pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)));
+                    map!(
+                        |pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)),
+                        i
+                    );
                     new_pos += len;
                 }
                 Delete(_) => {
                     // in range
-                    map!(|pos, _| (old_end > pos).then_some(new_pos));
+                    map!(|pos, _| (old_end > pos).then_some(new_pos), i);
                 }
                 Insert(s) => {
                     let ins = s.chars().count();
 
                     // a subsequent delete means a replace, consume it
-                    if let Some(Delete(len)) = iter.peek() {
+                    if let Some((_, Delete(len))) = iter.peek() {
                         iter.next();
 
                         old_end = old_pos + len;
                         // in range of replaced text
-                        map!(|pos, assoc| (old_end > pos).then(|| {
-                            // at point or tracking before
-                            if pos == old_pos || assoc == Assoc::Before {
-                                new_pos
-                            } else {
-                                // place to end of insert
-                                new_pos + ins
-                            }
-                        }));
+                        map!(
+                            |pos, assoc| (old_end > pos).then(|| {
+                                // at point or tracking before
+                                if pos == old_pos || assoc == Assoc::Before {
+                                    new_pos
+                                } else {
+                                    // place to end of insert
+                                    new_pos + ins
+                                }
+                            }),
+                            i
+                        );
                     } else {
                         // at insert point
-                        map!(|pos, assoc| (old_pos == pos).then(|| {
-                            // return position before inserted text
-                            if assoc == Assoc::Before {
-                                new_pos
-                            } else {
-                                // after text
-                                new_pos + ins
-                            }
-                        }));
+                        map!(
+                            |pos, assoc| (old_pos == pos).then(|| {
+                                // return position before inserted text
+                                if assoc == Assoc::Before {
+                                    new_pos
+                                } else {
+                                    // after text
+                                    new_pos + ins
+                                }
+                            }),
+                            i
+                        );
                     }
 
                     new_pos += ins;
@@ -407,7 +452,6 @@ impl ChangeSet {
             }
             old_pos = old_end;
         }
-        map!(|pos, _| (old_pos == pos).then_some(new_pos));
         let out_of_bounds: Vec<_> = positions.collect();
 
         panic!("Positions {out_of_bounds:?} are out of range for changeset len {old_pos}!",)
@@ -822,6 +866,20 @@ mod test {
         };
         assert_eq!(cs.map_pos(2, Assoc::Before), 2);
         assert_eq!(cs.map_pos(2, Assoc::After), 2);
+        // unsorted selection
+        let cs = ChangeSet {
+            changes: vec![
+                Insert("ab".into()),
+                Delete(2),
+                Insert("cd".into()),
+                Delete(2),
+            ],
+            len: 4,
+            len_after: 4,
+        };
+        let mut positions = [4, 2];
+        cs.update_positions(positions.iter_mut().map(|pos| (pos, Assoc::After)));
+        assert_eq!(positions, [4, 2]);
     }
 
     #[test]
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index d78d30d8e..b08370f9f 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1197,7 +1197,7 @@ impl Document {
                 if let Some(data) = Rc::get_mut(annotations) {
                     changes.update_positions(
                         data.iter_mut()
-                            .map(|diagnostic| (&mut diagnostic.char_idx, Assoc::After)),
+                            .map(|annotation| (&mut annotation.char_idx, Assoc::After)),
                     );
                 }
             };

From d3f8e0592bd577489369e5bd00cddf159f107a24 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 28 Jun 2023 15:59:13 -0500
Subject: [PATCH 104/967] LSP: Discard publishDiagnostic from uninitialized
 servers (#7467)

The spec explicitly disallows publishDiagnostic to be sent before
the initialize response:

> ... the server is not allowed to send any requests or notifications to
> the client until it has responded with an InitializeResult ...

(https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize)

But if a non-compliant server sends this we currently panic because we
'.expect()' the server capabilities to be known to fetch the position
encoding. Instead of panicking we can discard the notification and log
the non-compliant behavior.
---
 helix-term/src/application.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 7e9684827..b0f9e3ac5 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -746,7 +746,12 @@ impl Application {
                                 return;
                             }
                         };
-                        let offset_encoding = language_server!().offset_encoding();
+                        let language_server = language_server!();
+                        if !language_server.is_initialized() {
+                            log::error!("Discarding publishDiagnostic notification sent by an uninitialized server: {}", language_server.name());
+                            return;
+                        }
+                        let offset_encoding = language_server.offset_encoding();
                         let doc = self.editor.document_by_path_mut(&path).filter(|doc| {
                             if let Some(version) = params.version {
                                 if version != doc.version() {

From 4fab60030fbf5b44d770618336f21897226db4cd Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 29 Jun 2023 10:24:13 -0500
Subject: [PATCH 105/967] LSP: Use negotiated position encoding for workspace
 edits (#7469)

Previously this was hard-coded to UTF-8 but we might have negotiated
another position encoding.
---
 helix-term/src/application.rs | 39 ++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index b0f9e3ac5..e1a622f9d 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1047,20 +1047,31 @@ impl Application {
                         Ok(serde_json::Value::Null)
                     }
                     Ok(MethodCall::ApplyWorkspaceEdit(params)) => {
-                        let res = apply_workspace_edit(
-                            &mut self.editor,
-                            helix_lsp::OffsetEncoding::Utf8,
-                            &params.edit,
-                        );
-
-                        Ok(json!(lsp::ApplyWorkspaceEditResponse {
-                            applied: res.is_ok(),
-                            failure_reason: res.as_ref().err().map(|err| err.kind.to_string()),
-                            failed_change: res
-                                .as_ref()
-                                .err()
-                                .map(|err| err.failed_change_idx as u32),
-                        }))
+                        let language_server = language_server!();
+                        if language_server.is_initialized() {
+                            let offset_encoding = language_server.offset_encoding();
+                            let res = apply_workspace_edit(
+                                &mut self.editor,
+                                offset_encoding,
+                                &params.edit,
+                            );
+
+                            Ok(json!(lsp::ApplyWorkspaceEditResponse {
+                                applied: res.is_ok(),
+                                failure_reason: res.as_ref().err().map(|err| err.kind.to_string()),
+                                failed_change: res
+                                    .as_ref()
+                                    .err()
+                                    .map(|err| err.failed_change_idx as u32),
+                            }))
+                        } else {
+                            Err(helix_lsp::jsonrpc::Error {
+                                code: helix_lsp::jsonrpc::ErrorCode::InvalidRequest,
+                                message: "Server must be initialized to request workspace edits"
+                                    .to_string(),
+                                data: None,
+                            })
+                        }
                     }
                     Ok(MethodCall::WorkspaceFolders) => {
                         Ok(json!(&*language_server!().workspace_folders().await))

From b745fb255195b874b61b5bd92244c8a7b0bb7d46 Mon Sep 17 00:00:00 2001
From: gobraves <gobraves@users.noreply.github.com>
Date: Thu, 29 Jun 2023 23:25:07 +0800
Subject: [PATCH 106/967] update OneDarker theme to use light-gray for inlay
 hints. (#7433)

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

diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
index 7169fd025..88b2871ab 100644
--- a/runtime/themes/onedarker.toml
+++ b/runtime/themes/onedarker.toml
@@ -57,6 +57,7 @@
 "ui.virtual.indent-guide" = { fg = "faint-gray" }
 "ui.virtual.whitespace" = { fg = "light-gray" }
 "ui.virtual.ruler" = { bg = "gray" }
+"ui.virtual.inlay-hint" = { fg = "light-gray" }
 
 "ui.cursor" = { fg = "white", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }

From e0bb032f0e6dcc9b84e571c345928fba4054855e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 29 Jun 2023 10:25:23 -0500
Subject: [PATCH 107/967] LSP: Forcefully shutdown uninitialized servers
 (#7449)

The LSP spec has this to say about initialize:

> Until the server has responded to the `initialize` request with an
> `InitializeResult`, the client must not send any additional requests
> or notifications to the server.

(https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize)

The spec is not really explicit about how to handle this scenario.
Before a client sends the 'initialize' request we are allowed to send an
'exit' notification, but after 'initialize' we can't send any requests
(like shutdown) or notifications (like exit). So my intepretation is
that we should forcefully close the server in this state.

This matches the behavior of Neovim's built-in LSP client:
https://github.com/neovim/neovim/blob/5ceb2238d3685255cd517ca87fd7edae9ed88811/runtime/lua/vim/lsp.lua#L1610-L1628
---
 helix-lsp/src/transport.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/helix-lsp/src/transport.rs b/helix-lsp/src/transport.rs
index 8c38c1773..9fdd30aa0 100644
--- a/helix-lsp/src/transport.rs
+++ b/helix-lsp/src/transport.rs
@@ -353,6 +353,11 @@ impl Transport {
             }
         }
 
+        fn is_shutdown(payload: &Payload) -> bool {
+            use lsp_types::request::{Request, Shutdown};
+            matches!(payload, Payload::Request { value: jsonrpc::MethodCall { method, .. }, .. } if method == Shutdown::METHOD)
+        }
+
         // TODO: events that use capabilities need to do the right thing
 
         loop {
@@ -391,7 +396,10 @@ impl Transport {
                 }
                 msg = client_rx.recv() => {
                     if let Some(msg) = msg {
-                        if is_pending && !is_initialize(&msg) {
+                        if is_pending && is_shutdown(&msg) {
+                            log::info!("Language server not initialized, shutting down");
+                            break;
+                        } else if is_pending && !is_initialize(&msg) {
                             // ignore notifications
                             if let Payload::Notification(_) = msg {
                                 continue;

From 78505e01496e2af3b229b3ac2e9337f4776272b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Fri, 30 Jun 2023 17:06:34 +0200
Subject: [PATCH 108/967] Update tree-sitter-matlab (#7491)

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

diff --git a/languages.toml b/languages.toml
index 25093bfb0..66f2ca31e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2285,7 +2285,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "matlab"
-source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "b09c27e42732c59321604a15163480ebb4f82f1c" }
+source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "d7b24aaaf3e4814d073517d072727319d2b5ffc3" }
 
 [[language]]
 name = "ponylang"

From 9546e0c0a79eb92d5d8e1dc4489490c9db562070 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Fri, 30 Jun 2023 17:09:42 +0200
Subject: [PATCH 109/967] docs: align content with parent paragraph (#7488)

---
 book/src/install.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/book/src/install.md b/book/src/install.md
index f7ffa42f9..4c3ccab3b 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -175,19 +175,19 @@ RUSTFLAGS="-C target-feature=-crt-static"
 
 1. Clone the repository:
 
-```sh
-git clone https://github.com/helix-editor/helix
-cd helix
-```
+   ```sh
+   git clone https://github.com/helix-editor/helix
+   cd helix
+   ```
 
 2. Compile from source:
 
-```sh
-cargo install --path helix-term --locked
-```
+   ```sh
+   cargo install --path helix-term --locked
+   ```
 
-This command will create the `hx` executable and construct the tree-sitter
-grammars in the local `runtime` folder.
+   This command will create the `hx` executable and construct the tree-sitter
+   grammars in the local `runtime` folder.
 
 > 💡 Tree-sitter grammars can be fetched and compiled if not pre-packaged. Fetch
 > grammars with `hx --grammar fetch` and compile them with

From aec1b997dda74b5cef8d24e5ecd3f94a0fc9f979 Mon Sep 17 00:00:00 2001
From: Chris Heyes <22148308+hazeycode@users.noreply.github.com>
Date: Fri, 30 Jun 2023 22:56:39 +0100
Subject: [PATCH 110/967] Add .cppm file type to cpp language configuration
 (#7492)

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

diff --git a/languages.toml b/languages.toml
index 66f2ca31e..0c92df4e7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -342,7 +342,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd
 name = "cpp"
 scope = "source.cpp"
 injection-regex = "cpp"
-file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh"]
+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm"]
 roots = []
 comment-token = "//"
 language-servers = [ "clangd" ]

From a9849ebee41a8cb884a9351d36ebd399adb4111e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Sat, 1 Jul 2023 00:39:17 +0200
Subject: [PATCH 111/967] highlight(matlab): Fix string's single-quote's color
 (#7493)

---
 runtime/queries/matlab/highlights.scm | 67 ++++++++++++++-------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/runtime/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
index bc4c5069e..875cba509 100644
--- a/runtime/queries/matlab/highlights.scm
+++ b/runtime/queries/matlab/highlights.scm
@@ -41,39 +41,6 @@
 
 (function_arguments (identifier) @variable.parameter)
 
-; Operators
-
-[
-  "+"
-  ".+"
-  "-"
-  ".*"
-  "*"
-  ".*"
-  "/"
-  "./"
-  "\\"
-  ".\\"
-  "^"
-  ".^"
-  "'"
-  ".'"
-  "|"
-  "&"
-  "?"
-  "@"
-  "<"
-  "<="
-  ">"
-  ">="
-  "=="
-  "~="
-  "="
-  "&&"
-  "||"
-  ":"
-] @operator
-
 ; Conditionals
 
 (if_statement [ "if" "end" ] @keyword.control.conditional)
@@ -106,12 +73,46 @@
 (formatting_sequence) @constant.character.escape
 (string) @string
 (number) @constant.numeric.float
+(unary_operator ["+" "-"] @constant.numeric.float)
 (boolean) @constant.builtin.boolean
 
 ; Comments
 
 [ (comment) (line_continuation) ] @comment.line
 
+; Operators
+
+[
+  "+"
+  ".+"
+  "-"
+  ".*"
+  "*"
+  ".*"
+  "/"
+  "./"
+  "\\"
+  ".\\"
+  "^"
+  ".^"
+  "'"
+  ".'"
+  "|"
+  "&"
+  "?"
+  "@"
+  "<"
+  "<="
+  ">"
+  ">="
+  "=="
+  "~="
+  "="
+  "&&"
+  "||"
+  ":"
+] @operator
+
 ; Keywords
 
 "classdef" @keyword.storage.type

From 457b38939526434fa2ec07ceb2264bac3e4575af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Mon, 3 Jul 2023 16:43:17 +0200
Subject: [PATCH 112/967] highlight(matlab): Many bug fixes and improvements
 (#7511)

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

diff --git a/languages.toml b/languages.toml
index 0c92df4e7..612e1c0ab 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2285,7 +2285,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "matlab"
-source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "d7b24aaaf3e4814d073517d072727319d2b5ffc3" }
+source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "4029fa791ddadd555c6a371a4e882ef1735d868c" }
 
 [[language]]
 name = "ponylang"

From d908a6ed19b528bfeb2b9f0709201e0e67ef95da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 02:13:39 +0200
Subject: [PATCH 113/967] build(deps): bump tokio from 1.28.2 to 1.29.1 (#7528)

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

diff --git a/Cargo.lock b/Cargo.lock
index c6c6dcef0..9c55784b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -88,6 +97,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide 0.7.1",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -416,7 +440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
 ]
 
 [[package]]
@@ -490,6 +514,12 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
 [[package]]
 name = "gix"
 version = "0.47.0"
@@ -1625,6 +1655,15 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.6"
@@ -1675,6 +1714,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.18.0"
@@ -1841,6 +1889,12 @@ dependencies = [
  "str_indices",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
 [[package]]
 name = "rustix"
 version = "0.37.15"
@@ -2200,11 +2254,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.2"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
  "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 5143236de..b4abeb8ac 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -24,7 +24,7 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.28", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.29", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
 which = "4.4"
 parking_lot = "0.12.1"

From 83e59197ac248f680ca7c5fa56e131ac01a1c0af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 02:13:58 +0200
Subject: [PATCH 114/967] build(deps): bump indoc from 2.0.1 to 2.0.2 (#7529)

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

diff --git a/Cargo.lock b/Cargo.lock
index 9c55784b3..e52bab834 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1501,9 +1501,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690"
+checksum = "761cde40c27e2a9877f8c928fd248b7eec9dd48623dd514b256858ca593fbba7"
 
 [[package]]
 name = "instant"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 1b3d75ebc..c16afea47 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -50,4 +50,4 @@ textwrap = "0.16.0"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
-indoc = "2.0.1"
+indoc = "2.0.2"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 0f65799cb..e5ba64446 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -75,5 +75,5 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.10"
-indoc = "2.0.1"
+indoc = "2.0.2"
 tempfile = "3.6.0"

From 9840422281dd76a1c576e6ee155abfa4ac94783a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 02:14:52 +0200
Subject: [PATCH 115/967] build(deps): bump bitflags from 2.3.2 to 2.3.3
 (#7530)

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

diff --git a/Cargo.lock b/Cargo.lock
index e52bab834..744dcfbfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -120,9 +120,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
 
 [[package]]
 name = "bstr"
@@ -668,7 +668,7 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4783caa23062f86acfd1bc9e72c62250923d1673171ce1a524d9486f8a4556a8"
 dependencies = [
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "bstr",
  "gix-path",
  "libc",
@@ -763,7 +763,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f45cd7ab22faf154db0a9f5a8011ba9cda8b298b61b7299f43a21bbaf0b3f208"
 dependencies = [
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "bstr",
  "gix-features",
  "gix-path",
@@ -808,7 +808,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ef2fa392d351e62ac3a6309146f61880abfbe0c07474e075d3b2ac78a6834a5"
 dependencies = [
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "bstr",
  "btoi",
  "filetime",
@@ -853,7 +853,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b626aafb9f4088058f1baa5d2029b2191820c84f6c81e43535ba70bfdc7b7d56"
 dependencies = [
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "gix-commitgraph",
  "gix-date",
  "gix-hash",
@@ -1032,7 +1032,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47f09860e2ddc7b13119e410c46d8e9f870acc7933fb53ae65817af83a8c9f80"
 dependencies = [
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "gix-path",
  "libc",
  "windows",
@@ -1212,7 +1212,7 @@ version = "0.6.0"
 dependencies = [
  "ahash 0.8.3",
  "arc-swap",
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "chrono",
  "dunce",
  "encoding_rs",
@@ -1340,7 +1340,7 @@ dependencies = [
 name = "helix-tui"
 version = "0.6.0"
 dependencies = [
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "cassowary",
  "crossterm",
  "helix-core",
@@ -1373,7 +1373,7 @@ version = "0.6.0"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.3.2",
+ "bitflags 2.3.3",
  "chardetng",
  "clipboard-win",
  "crossterm",

From c091f9a37c5a312f4c7997e5b87fc26e98525e09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 19:57:54 -0500
Subject: [PATCH 116/967] build(deps): bump serde from 1.0.164 to 1.0.166
 (#7527)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.164 to 1.0.166.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.164...v1.0.166)

---
updated-dependencies:
- dependency-name: serde
  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 | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 744dcfbfc..cafbd7f88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -305,7 +305,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.15",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -322,7 +322,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -1772,9 +1772,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
 dependencies = [
  "unicode-ident",
 ]
@@ -1807,9 +1807,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
 dependencies = [
  "proc-macro2",
 ]
@@ -1938,22 +1938,22 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.164"
+version = "1.0.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -1975,7 +1975,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -2117,9 +2117,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2186,7 +2186,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -2280,7 +2280,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.23",
 ]
 
 [[package]]

From 57e538d07b15c7ac33a0469f1ca05981704ee5af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 03:06:16 +0200
Subject: [PATCH 117/967] build(deps): bump gix from 0.47.0 to 0.48.0 (#7531)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 161 +++++++++++++++++++++++--------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 86 insertions(+), 77 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cafbd7f88..6bc11b245 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -412,6 +412,12 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
 [[package]]
 name = "fern"
 version = "0.6.2"
@@ -522,9 +528,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f5281c55e0a7415877d91a15fae4a10ec7444615d64d78e48c07f20bcfcd9b"
+checksum = "c1e74cea676de7f53a79f3c0365812b11f6814b81e671b8ee4abae6ca09c7881"
 dependencies = [
  "gix-actor",
  "gix-attributes",
@@ -570,9 +576,9 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b70d0d809ee387113df810ab4ebe585a076e35ae6ed59b5b280072146955a3ff"
+checksum = "1969b77b9ee4cc1755c841987ec6f7622aaca95e952bcafb76973ae59d1b8716"
 dependencies = [
  "bstr",
  "btoi",
@@ -584,9 +590,9 @@ dependencies = [
 
 [[package]]
 name = "gix-attributes"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d7006cc5a508514207154046e18c3c39d98ba98f865ada83b6f3f3886543bb"
+checksum = "e3772b0129dcd1fc73e985bbd08a1482d082097d2915cb1ee31ce8092b8e4434"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -628,23 +634,23 @@ dependencies = [
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e498e98d0b477d6a1c1608bee39db201e7a38873460a130a97ce88b4d95b6e1"
+checksum = "ed42baa50075d41c1a0931074ce1a97c5797c7c6fe7591d9f1f2dcd448532c26"
 dependencies = [
  "bstr",
  "gix-chunk",
  "gix-features",
  "gix-hash",
- "memmap2",
+ "memmap2 0.7.1",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-config"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b32541232a2c626849df7843e05b50cb43ac38a4f675abbe2f661874fc1e9d"
+checksum = "817688c7005a716d9363e267913526adea402dabd947f4ba63842d10cc5132af"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -664,9 +670,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4783caa23062f86acfd1bc9e72c62250923d1673171ce1a524d9486f8a4556a8"
+checksum = "83960be5e99266bcf55dae5a24731bbd39f643bfb68f27e939d6b06836b5b87d"
 dependencies = [
  "bitflags 2.3.3",
  "bstr",
@@ -677,9 +683,9 @@ dependencies = [
 
 [[package]]
 name = "gix-credentials"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dcec518a8db5b2e342ea7a2e785f46fd176b1b689ddd3f43052701bf3fa8ee3"
+checksum = "75a75565e0e6e7f80cfa4eb1b05cc448c6846ddd48dcf413a28875fbc11ee9af"
 dependencies = [
  "bstr",
  "gix-command",
@@ -693,9 +699,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0213f923d63c2c7d10799c1977f42df38ec586ebbf1d14fd00dfa363ac994c2b"
+checksum = "8e9a04a1d2387c955ec91059d56b673000dd24f3c07cad08ed253e36381782bf"
 dependencies = [
  "bstr",
  "itoa",
@@ -705,9 +711,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5049dd5a60d5608912da0ab184f35064901f192f4adf737716789715faffa080"
+checksum = "aaf5d9b9b521b284ebe53ee69eee33341835ec70edc314f36b2100ea81396121"
 dependencies = [
  "gix-hash",
  "gix-object",
@@ -717,9 +723,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c14865cb9c6eb817d6a8d53595f1051239d2d31feae7a5e5b2f00910c94a8eb4"
+checksum = "272aad20dc63dedba76615373dd8885fb5aebe4795e5b5b0aa2a24e63c82085c"
 dependencies = [
  "bstr",
  "dunce",
@@ -732,9 +738,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae82dfceec06c034728c530399ee449f97b1e542e191247c52c169ca6af1fd89"
+checksum = "06142d8cff5d17509399b04052b64d2f9b3a311d5cff0b1a32b220f62cd0d595"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -759,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "gix-glob"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f45cd7ab22faf154db0a9f5a8011ba9cda8b298b61b7299f43a21bbaf0b3f208"
+checksum = "c18bdff83143d61e7d60da6183b87542a870d026b2a2d0b30170b8e9c0cd321a"
 dependencies = [
  "bitflags 2.3.3",
  "bstr",
@@ -781,20 +787,20 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfd7f4ea905c13579565e3c264ca2c4103d192bd5fce2300c5a884cf1977d61"
+checksum = "9e133bc56d938eaec1c675af7c681a51de9662b0ada779f45607b967a10da77a"
 dependencies = [
  "gix-hash",
- "hashbrown 0.13.2",
+ "hashbrown 0.14.0",
  "parking_lot",
 ]
 
 [[package]]
 name = "gix-ignore"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27e82dec6975012b710837c6cd56353c3111d2308e016118bfc59275fcc8b5d0"
+checksum = "ca801f2d0535210f77b33e2c067d565aedecacc82f1b3dbce26da1388ebc4634"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -804,9 +810,9 @@ dependencies = [
 
 [[package]]
 name = "gix-index"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef2fa392d351e62ac3a6309146f61880abfbe0c07474e075d3b2ac78a6834a5"
+checksum = "68099abdf6ee50ae3c897e8b05de96871cbe54d52a37cdf559101f911b883562"
 dependencies = [
  "bitflags 2.3.3",
  "bstr",
@@ -819,7 +825,7 @@ dependencies = [
  "gix-object",
  "gix-traverse",
  "itoa",
- "memmap2",
+ "memmap2 0.7.1",
  "smallvec",
  "thiserror",
 ]
@@ -837,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "gix-mailmap"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0bef8d360a6a9fc5a6d872471588d8ca7db77b940e48ff20c3b4706ad5f481d"
+checksum = "1787e3c37fc43b1f7c0e3be6196c6837b3ba5f869190dfeaa444b816f0a7f34b"
 dependencies = [
  "bstr",
  "gix-actor",
@@ -849,9 +855,9 @@ dependencies = [
 
 [[package]]
 name = "gix-negotiate"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b626aafb9f4088058f1baa5d2029b2191820c84f6c81e43535ba70bfdc7b7d56"
+checksum = "4e7bce64d4452dd609f44d04b14b29da2e0ad2c45fcdf4ce1472a5f5f8ec21c2"
 dependencies = [
  "bitflags 2.3.3",
  "gix-commitgraph",
@@ -865,9 +871,9 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "255e477ae4cc8d10778238f011e6125b01cc0e7067dc8df87acd67a428a81f20"
+checksum = "a953f3d7ffad16734aa3ab1d05807972c80e339d1bd9dde03e0198716b99e2a6"
 dependencies = [
  "bstr",
  "btoi",
@@ -885,9 +891,9 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.48.0"
+version = "0.49.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b73469f145d1e6afbcfd0ab6499a366fbbcb958c2999d41d283d6c7b94024b9"
+checksum = "f6418cff00ecc2713b58c8e04bff30dda808fbba1a080e7248b299d069894a01"
 dependencies = [
  "arc-swap",
  "gix-date",
@@ -904,9 +910,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.38.0"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f3bcd1aaa72aea7163b147d2bde2480a01eadefc774a479d38f29920f7f1c8"
+checksum = "414935138d90043ea5898de7a93f02c2558e52652492719470e203ef26a8fd0a"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -918,7 +924,7 @@ dependencies = [
  "gix-path",
  "gix-tempfile",
  "gix-traverse",
- "memmap2",
+ "memmap2 0.7.1",
  "parking_lot",
  "smallvec",
  "thiserror",
@@ -926,9 +932,9 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea2a19d82dd55e5fad1d606b8a1ad2f7a804e10caa2efbb169cd37e0a07ede0"
+checksum = "dfca182d2575ded2ed38280f1ebf75cd5d3790b77e0872de07854cf085821fbe"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -963,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.31.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6c74873a9d8ff5d1310f2325f09164c15a91402ab5cde4d479ae12ff55ed69"
+checksum = "39453f4e5f23cddc2e6e4cca2ba20adfdbec29379e3ca829714dfe98ae068ccd"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -977,16 +983,16 @@ dependencies = [
  "gix-path",
  "gix-tempfile",
  "gix-validate",
- "memmap2",
+ "memmap2 0.7.1",
  "nom",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-refspec"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca1bc6c40bad62570683d642fcb04e977433ac8f76b674860ef7b1483c1f8990"
+checksum = "b8e76ff1f82fba295a121e31ab02f69642994e532c45c0c899aa393f4b740302"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -998,9 +1004,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3751d6643d731fc5829d2f43ca049f4333c968f30908220ba0783c9dfe5010c"
+checksum = "237428a7d3978e8572964e1e45d984027c2acc94df47e594baa6c4b0da7c9922"
 dependencies = [
  "bstr",
  "gix-date",
@@ -1013,9 +1019,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144995229c6e5788b1c7386f8a3f7146ace3745c9a6b56cef9123a7d83b110c5"
+checksum = "028d50fcaf8326a8f79a359490d9ca9fb4e2b51ac9ac86503560d0bcc888d2eb"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1028,9 +1034,9 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f09860e2ddc7b13119e410c46d8e9f870acc7933fb53ae65817af83a8c9f80"
+checksum = "ede298863db2a0574a14070991710551e76d1f47c9783b62d4fcbca17f56371c"
 dependencies = [
  "bitflags 2.3.3",
  "gix-path",
@@ -1055,15 +1061,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff8a60073500f4d6edd181432ee11394d843db7dcf05756aa137a1233b1cbf6"
+checksum = "103eac621617be3ebe0605c9065ca51a223279a23218aaf67d10daa6e452f663"
 
 [[package]]
 name = "gix-traverse"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f6bba1686bfbc7e0e93d4932bc6e14d479c9c9524f7c8d65b25d2a9446a99e"
+checksum = "e3cdfd54598db4fae57d5ae6f52958422b2d13382d2745796bfe5c8015ffa86e"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1077,9 +1083,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff1f984816338039b151a9f5dae6100e1e51e438cf61242ea8136fedc574d825"
+checksum = "beaede6dbc83f408b19adfd95bb52f1dbf01fb8862c3faf6c6243e2e67fcdfa1"
 dependencies = [
  "bstr",
  "gix-features",
@@ -1091,11 +1097,11 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca284c260845bc0724050aec59c7a596407678342614cdf5a1d69e044f29a36"
+checksum = "7058c94f4164fcf5b8457d35f6d8f6e1007f9f7f938c9c7684a7e01d23c6ddde"
 dependencies = [
- "fastrand",
+ "fastrand 2.0.0",
 ]
 
 [[package]]
@@ -1110,9 +1116,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee22549d6723189366235e1c6959ccdac73b58197cdbb437684eaa2169edcb9"
+checksum = "c1363b9aa66b9e14412ac04e1f759827203f491729d92172535a8ce6cde02efa"
 dependencies = [
  "bstr",
  "filetime",
@@ -1178,7 +1184,7 @@ dependencies = [
  "encoding_rs_io",
  "grep-matcher",
  "log",
- "memmap2",
+ "memmap2 0.5.10",
 ]
 
 [[package]]
@@ -1190,12 +1196,6 @@ dependencies = [
  "ahash 0.7.6",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.0"
@@ -1640,6 +1640,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "memmap2"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -2134,7 +2143,7 @@ checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
 dependencies = [
  "autocfg",
  "cfg-if",
- "fastrand",
+ "fastrand 1.9.0",
  "redox_syscall 0.3.5",
  "rustix",
  "windows-sys 0.48.0",
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 81b37da53..5ddadad3b 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
 parking_lot = "0.12"
 arc-swap = { version = "1.6.0" }
 
-gix = { version = "0.47.0", default-features = false , optional = true }
+gix = { version = "0.48.0", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From 9ccca81305ed091c5635418a9363fddc5e4b575d Mon Sep 17 00:00:00 2001
From: zer0-x <65136727+zer0-x@users.noreply.github.com>
Date: Wed, 5 Jul 2023 18:50:16 +0300
Subject: [PATCH 118/967] book: Rename Arch Linux's repository from `community`
 to `extra` (#7543)

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

diff --git a/book/src/install.md b/book/src/install.md
index 4c3ccab3b..748a8ee97 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -6,7 +6,7 @@
 - [Linux](#linux)
   - [Ubuntu](#ubuntu)
   - [Fedora/RHEL](#fedorarhel)
-  - [Arch Linux community](#arch-linux-community)
+  - [Arch Linux extra](#arch-linux-extra)
   - [NixOS](#nixos)
   - [Flatpak](#flatpak)
   - [AppImage](#appimage)
@@ -70,9 +70,9 @@ sudo dnf copr enable varlad/helix
 sudo dnf install helix
 ```
 
-### Arch Linux community
+### Arch Linux extra
 
-Releases are available in the `community` repository:
+Releases are available in the `extra` repository:
 
 ```sh
 sudo pacman -S helix

From 3fb430257e8ae8ca7535025d6895a75665ecf8d4 Mon Sep 17 00:00:00 2001
From: Erin van der Veen <erin.vanderveen@tweag.io>
Date: Thu, 6 Jul 2023 18:53:10 +0200
Subject: [PATCH 119/967] Update Nickel grammar (#7551)

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

diff --git a/languages.toml b/languages.toml
index 612e1c0ab..5cada2b6f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -664,7 +664,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "nickel"
-source = { git = "https://github.com/nickel-lang/tree-sitter-nickel", rev = "3a794388773f2424a97b2186828aa3fac4c66ce6" }
+source = { git = "https://github.com/nickel-lang/tree-sitter-nickel", rev = "e1d9337864d209898a08c26b8cd4c2dd14c15148" }
 
 [[language]]
 name = "nix"

From dc50263ed049f5eb4cec013c269e83e7395f40c2 Mon Sep 17 00:00:00 2001
From: Tom Taylor <t-taylor@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:20:48 +0100
Subject: [PATCH 120/967] Fix incorrect gutter bail message (#7534)

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

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 61d148d32..f5ed7b8f6 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -611,7 +611,9 @@ impl std::str::FromStr for GutterType {
             "spacer" => Ok(Self::Spacer),
             "line-numbers" => Ok(Self::LineNumbers),
             "diff" => Ok(Self::Diff),
-            _ => anyhow::bail!("Gutter type can only be `diagnostics` or `line-numbers`."),
+            _ => anyhow::bail!(
+                "Gutter type can only be `diagnostics`, `spacer`, `line-numbers` or `diff`."
+            ),
         }
     }
 }

From 618620b36907bb2cbe29cd0e737efad9f651a00d Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 7 Jul 2023 23:46:34 +0200
Subject: [PATCH 121/967] use redraw handle for debouncing LSP messages (#7538)

---
 helix-term/src/application.rs | 13 +------------
 helix-view/src/editor.rs      |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index e1a622f9d..4c86a19f7 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -34,7 +34,6 @@ use std::{
     io::{stdin, stdout},
     path::Path,
     sync::Arc,
-    time::{Duration, Instant},
 };
 
 use anyhow::{Context, Error};
@@ -45,8 +44,6 @@ use {signal_hook::consts::signal, signal_hook_tokio::Signals};
 #[cfg(windows)]
 type Signals = futures_util::stream::Empty<()>;
 
-const LSP_DEADLINE: Duration = Duration::from_millis(16);
-
 #[cfg(not(feature = "integration"))]
 use tui::backend::CrosstermBackend;
 
@@ -76,7 +73,6 @@ pub struct Application {
     signals: Signals,
     jobs: Jobs,
     lsp_progress: LspProgressMap,
-    last_render: Instant,
 }
 
 #[cfg(feature = "integration")]
@@ -253,7 +249,6 @@ impl Application {
             signals,
             jobs: Jobs::new(),
             lsp_progress: LspProgressMap::new(),
-            last_render: Instant::now(),
         };
 
         Ok(app)
@@ -300,7 +295,6 @@ impl Application {
         S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
     {
         self.render().await;
-        self.last_render = Instant::now();
 
         loop {
             if !self.event_loop_until_idle(input_stream).await {
@@ -609,12 +603,7 @@ impl Application {
             EditorEvent::LanguageServerMessage((id, call)) => {
                 self.handle_language_server_message(call, id).await;
                 // limit render calls for fast language server messages
-                let last = self.editor.language_servers.incoming.is_empty();
-
-                if last || self.last_render.elapsed() > LSP_DEADLINE {
-                    self.render().await;
-                    self.last_render = Instant::now();
-                }
+                self.editor.redraw_handle.0.notify_one();
             }
             EditorEvent::DebuggerEvent(payload) => {
                 let needs_render = self.editor.handle_debugger_message(payload).await;
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index f5ed7b8f6..630ea5cf9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1705,7 +1705,7 @@ impl Editor {
                 _ = self.redraw_handle.0.notified() => {
                     if  !self.needs_redraw{
                         self.needs_redraw = true;
-                        let timeout = Instant::now() + Duration::from_millis(96);
+                        let timeout = Instant::now() + Duration::from_millis(33);
                         if timeout < self.idle_timer.deadline(){
                             self.idle_timer.as_mut().reset(timeout)
                         }

From 507dd5086093f48e666c99fb509b31721f366df2 Mon Sep 17 00:00:00 2001
From: Alberto Romero <aromeronavia@gmail.com>
Date: Sat, 8 Jul 2023 10:12:28 -0600
Subject: [PATCH 122/967] Add filename completer for shell prompt (#7569)

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

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1bd736523..10b336ce3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5401,7 +5401,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
         cx,
         prompt,
         Some('|'),
-        ui::completers::none,
+        ui::completers::filename,
         move |cx, input: &str, event: PromptEvent| {
             if event != PromptEvent::Validate {
                 return;

From 1698992de6a601e65a0598ed132cab5419f7e578 Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Sun, 9 Jul 2023 16:35:07 +0200
Subject: [PATCH 123/967] Fix `:log-open` when `--log` is specified (#7573)

---
 helix-loader/src/lib.rs | 44 ++++++++++++++++++++++++++---------------
 helix-term/src/main.rs  | 24 ++++++----------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index ad4ad899d..c51c9c7de 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -11,21 +11,20 @@ static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
 
 static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
 
-pub fn initialize_config_file(specified_file: Option<PathBuf>) {
-    let config_file = specified_file.unwrap_or_else(|| {
-        let config_dir = config_dir();
-
-        if !config_dir.exists() {
-            std::fs::create_dir_all(&config_dir).ok();
-        }
+static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
 
-        config_dir.join("config.toml")
-    });
-
-    // We should only initialize this value once.
+pub fn initialize_config_file(specified_file: Option<PathBuf>) {
+    let config_file = specified_file.unwrap_or_else(default_config_file);
+    ensure_parent_dir(&config_file);
     CONFIG_FILE.set(config_file).ok();
 }
 
+pub fn initialize_log_file(specified_file: Option<PathBuf>) {
+    let log_file = specified_file.unwrap_or_else(default_log_file);
+    ensure_parent_dir(&log_file);
+    LOG_FILE.set(log_file).ok();
+}
+
 /// A list of runtime directories from highest to lowest priority
 ///
 /// The priority is:
@@ -122,10 +121,11 @@ pub fn cache_dir() -> PathBuf {
 }
 
 pub fn config_file() -> PathBuf {
-    CONFIG_FILE
-        .get()
-        .map(|path| path.to_path_buf())
-        .unwrap_or_else(|| config_dir().join("config.toml"))
+    CONFIG_FILE.get().map(|path| path.to_path_buf()).unwrap()
+}
+
+pub fn log_file() -> PathBuf {
+    LOG_FILE.get().map(|path| path.to_path_buf()).unwrap()
 }
 
 pub fn workspace_config_file() -> PathBuf {
@@ -136,7 +136,7 @@ pub fn lang_config_file() -> PathBuf {
     config_dir().join("languages.toml")
 }
 
-pub fn log_file() -> PathBuf {
+pub fn default_log_file() -> PathBuf {
     cache_dir().join("helix.log")
 }
 
@@ -227,6 +227,18 @@ pub fn find_workspace() -> (PathBuf, bool) {
     (current_dir, true)
 }
 
+fn default_config_file() -> PathBuf {
+    config_dir().join("config.toml")
+}
+
+fn ensure_parent_dir(path: &Path) {
+    if let Some(parent) = path.parent() {
+        if !parent.exists() {
+            std::fs::create_dir_all(parent).ok();
+        }
+    }
+}
+
 #[cfg(test)]
 mod merge_toml_tests {
     use std::str;
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 73513bf39..97e962e0d 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -4,9 +4,8 @@ use helix_loader::VERSION_AND_GIT_HASH;
 use helix_term::application::Application;
 use helix_term::args::Args;
 use helix_term::config::{Config, ConfigLoadError};
-use std::path::PathBuf;
 
-fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
+fn setup_logging(verbosity: u64) -> Result<()> {
     let mut base_config = fern::Dispatch::new();
 
     base_config = match verbosity {
@@ -27,7 +26,7 @@ fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
                 message
             ))
         })
-        .chain(fern::log_file(logpath)?);
+        .chain(fern::log_file(helix_loader::log_file())?);
 
     base_config.chain(file_config).apply()?;
 
@@ -41,12 +40,6 @@ fn main() -> Result<()> {
 
 #[tokio::main]
 async fn main_impl() -> Result<i32> {
-    let logpath = helix_loader::log_file();
-    let parent = logpath.parent().unwrap();
-    if !parent.exists() {
-        std::fs::create_dir_all(parent).ok();
-    }
-
     let help = format!(
         "\
 {} {}
@@ -78,7 +71,7 @@ FLAGS:
         VERSION_AND_GIT_HASH,
         env!("CARGO_PKG_AUTHORS"),
         env!("CARGO_PKG_DESCRIPTION"),
-        logpath.display(),
+        helix_loader::default_log_file().display(),
     );
 
     let args = Args::parse_args().context("could not parse arguments")?;
@@ -116,15 +109,10 @@ FLAGS:
         return Ok(0);
     }
 
-    let logpath = args.log_file.as_ref().cloned().unwrap_or(logpath);
-    setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
-
-    let config_dir = helix_loader::config_dir();
-    if !config_dir.exists() {
-        std::fs::create_dir_all(&config_dir).ok();
-    }
-
     helix_loader::initialize_config_file(args.config_file.clone());
+    helix_loader::initialize_log_file(args.log_file.clone());
+
+    setup_logging(args.verbosity).context("failed to initialize logging")?;
 
     let config = match Config::load_default() {
         Ok(config) => config,

From 828c7432e363c46cd9202cdb973a67f0421d2c0f Mon Sep 17 00:00:00 2001
From: Ryan Fowler <ryan.fowler19@gmail.com>
Date: Sun, 9 Jul 2023 07:38:50 -0700
Subject: [PATCH 124/967] Implement the wa! command (#7577)

---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index a3949960f..ce28a3ca6 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -24,6 +24,7 @@
 | `:write-quit`, `:wq`, `:x` | Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt) |
 | `:write-quit!`, `:wq!`, `:x!` | Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt) |
 | `:write-all`, `:wa` | Write changes from all buffers to disk. |
+| `:write-all!`, `:wa!` | Forcefully write changes from all buffers to disk creating necessary subdirectories. |
 | `:write-quit-all`, `:wqa`, `:xa` | Write changes from all buffers to disk and close all views. |
 | `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes). |
 | `:quit-all`, `:qa` | Close all views. |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 5198e5bdf..94cc33f0d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -739,6 +739,18 @@ fn write_all(
     write_all_impl(cx, false, true)
 }
 
+fn force_write_all(
+    cx: &mut compositor::Context,
+    _args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    write_all_impl(cx, true, true)
+}
+
 fn write_all_quit(
     cx: &mut compositor::Context,
     _args: &[Cow<str>],
@@ -2444,6 +2456,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: write_all,
             signature: CommandSignature::none(),
         },
+        TypableCommand {
+            name: "write-all!",
+            aliases: &["wa!"],
+            doc: "Forcefully write changes from all buffers to disk creating necessary subdirectories.",
+            fun: force_write_all,
+            signature: CommandSignature::none(),
+        },
         TypableCommand {
             name: "write-quit-all",
             aliases: &["wqa", "xa"],

From 550192826bd6ec1598ed209c84a78955b1b53bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Sun, 9 Jul 2023 17:08:29 +0200
Subject: [PATCH 125/967] highlight(matlab): Better UTF-8 handling. (#7532)

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

diff --git a/languages.toml b/languages.toml
index 5cada2b6f..261391579 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2285,7 +2285,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "matlab"
-source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "4029fa791ddadd555c6a371a4e882ef1735d868c" }
+source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "676117eafa64afedc8380a921a77cd9f2244bc6b" }
 
 [[language]]
 name = "ponylang"

From 28452e1f2a63fe4806078da0f854d01506fc0c0c Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Sun, 9 Jul 2023 18:30:43 +0200
Subject: [PATCH 126/967] Initialize log and config files right after parsing
 arguments (#7585)

---
 helix-term/src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 97e962e0d..542d18e6a 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -76,6 +76,9 @@ FLAGS:
 
     let args = Args::parse_args().context("could not parse arguments")?;
 
+    helix_loader::initialize_config_file(args.config_file.clone());
+    helix_loader::initialize_log_file(args.log_file.clone());
+
     // Help has a higher priority and should be handled separately.
     if args.display_help {
         print!("{}", help);
@@ -109,9 +112,6 @@ FLAGS:
         return Ok(0);
     }
 
-    helix_loader::initialize_config_file(args.config_file.clone());
-    helix_loader::initialize_log_file(args.log_file.clone());
-
     setup_logging(args.verbosity).context("failed to initialize logging")?;
 
     let config = match Config::load_default() {

From 607b426e269b17f4ad32dca9c612c4a9f8541766 Mon Sep 17 00:00:00 2001
From: Gammut <metaskopia@gmail.com>
Date: Sun, 9 Jul 2023 11:35:32 -0500
Subject: [PATCH 127/967] Refactor queries for ecma based languages (#7207)

---
 languages.toml                              |   3 -
 runtime/queries/_javascript/highlights.scm  |  36 +++++
 runtime/queries/_javascript/locals.scm      |  14 ++
 runtime/queries/_javascript/tags.scm        |  88 +++++++++++++
 runtime/queries/_jsx/highlights.scm         |  55 ++++++++
 runtime/queries/_jsx/indents.scm            |   7 +
 runtime/queries/_typescript/highlights.scm  | 139 ++++++++++++++++++++
 runtime/queries/_typescript/indents.scm     |   5 +
 runtime/queries/_typescript/locals.scm      |  16 +++
 runtime/queries/_typescript/tags.scm        |  23 ++++
 runtime/queries/_typescript/textobjects.scm |   6 +
 runtime/queries/ecma/README.md              |  14 ++
 runtime/queries/ecma/highlights.scm         |   9 +-
 runtime/queries/ecma/locals.scm             |  20 ++-
 runtime/queries/javascript/highlights.scm   |  39 +-----
 runtime/queries/javascript/indents.scm      |   4 +-
 runtime/queries/javascript/injections.scm   |   4 +-
 runtime/queries/javascript/locals.scm       |   4 +-
 runtime/queries/javascript/tags.scm         |  89 +------------
 runtime/queries/javascript/textobjects.scm  |   4 +-
 runtime/queries/jsx/highlights.scm          |  38 +-----
 runtime/queries/jsx/indents.scm             |  10 +-
 runtime/queries/jsx/injections.scm          |   4 +-
 runtime/queries/jsx/locals.scm              |   4 +-
 runtime/queries/jsx/tags.scm                |   3 +
 runtime/queries/jsx/textobjects.scm         |   4 +-
 runtime/queries/tsx/highlights.scm          |   4 +-
 runtime/queries/tsx/indents.scm             |   4 +-
 runtime/queries/tsx/injections.scm          |   4 +-
 runtime/queries/tsx/locals.scm              |   3 +
 runtime/queries/tsx/tags.scm                |   3 +
 runtime/queries/tsx/textobjects.scm         |   4 +-
 runtime/queries/typescript/highlights.scm   |  83 +-----------
 runtime/queries/typescript/indents.scm      |   8 +-
 runtime/queries/typescript/injections.scm   |   4 +-
 runtime/queries/typescript/locals.scm       |   5 +-
 runtime/queries/typescript/tags.scm         |  24 +---
 runtime/queries/typescript/textobjects.scm  |   9 +-
 38 files changed, 492 insertions(+), 305 deletions(-)
 create mode 100644 runtime/queries/_javascript/highlights.scm
 create mode 100644 runtime/queries/_javascript/locals.scm
 create mode 100644 runtime/queries/_javascript/tags.scm
 create mode 100644 runtime/queries/_jsx/highlights.scm
 create mode 100644 runtime/queries/_jsx/indents.scm
 create mode 100644 runtime/queries/_typescript/highlights.scm
 create mode 100644 runtime/queries/_typescript/indents.scm
 create mode 100644 runtime/queries/_typescript/locals.scm
 create mode 100644 runtime/queries/_typescript/tags.scm
 create mode 100644 runtime/queries/_typescript/textobjects.scm
 create mode 100644 runtime/queries/ecma/README.md
 create mode 100644 runtime/queries/jsx/tags.scm
 create mode 100644 runtime/queries/tsx/locals.scm
 create mode 100644 runtime/queries/tsx/tags.scm

diff --git a/languages.toml b/languages.toml
index 261391579..482a25110 100644
--- a/languages.toml
+++ b/languages.toml
@@ -524,7 +524,6 @@ file-types = ["js", "mjs", "cjs"]
 shebangs = ["node"]
 roots = []
 comment-token = "//"
-# TODO: highlights-params
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -564,7 +563,6 @@ file-types = ["ts", "mts", "cts"]
 language-id = "typescript"
 shebangs = []
 roots = []
-# TODO: highlights-params
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -579,7 +577,6 @@ injection-regex = "(tsx)" # |typescript
 language-id = "typescriptreact"
 file-types = ["tsx"]
 roots = []
-# TODO: highlights-params
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
diff --git a/runtime/queries/_javascript/highlights.scm b/runtime/queries/_javascript/highlights.scm
new file mode 100644
index 000000000..8b0bbb94f
--- /dev/null
+++ b/runtime/queries/_javascript/highlights.scm
@@ -0,0 +1,36 @@
+; Function and method parameters
+;-------------------------------
+
+; Javascript and Typescript Treesitter grammars deviate when defining the
+; tree structure for parameters, so we need to address them in each specific
+; language instead of ecma.
+
+; (p)
+(formal_parameters 
+  (identifier) @variable.parameter)
+
+; (...p)
+(formal_parameters
+  (rest_pattern
+    (identifier) @variable.parameter))
+
+; ({ p })
+(formal_parameters
+  (object_pattern
+    (shorthand_property_identifier_pattern) @variable.parameter))
+
+; ({ a: p })
+(formal_parameters
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @variable.parameter)))
+
+; ([ p ])
+(formal_parameters
+  (array_pattern
+    (identifier) @variable.parameter))
+
+; (p = 1)
+(formal_parameters
+  (assignment_pattern
+    left: (identifier) @variable.parameter))
diff --git a/runtime/queries/_javascript/locals.scm b/runtime/queries/_javascript/locals.scm
new file mode 100644
index 000000000..943566167
--- /dev/null
+++ b/runtime/queries/_javascript/locals.scm
@@ -0,0 +1,14 @@
+; Definitions
+;------------
+; Javascript and Typescript Treesitter grammars deviate when defining the
+; tree structure for parameters, so we need to address them in each specific
+; language instead of ecma.
+
+; (i)
+(formal_parameters 
+  (identifier) @local.definition)
+
+; (i = 1)
+(formal_parameters 
+  (assignment_pattern
+    left: (identifier) @local.definition))
diff --git a/runtime/queries/_javascript/tags.scm b/runtime/queries/_javascript/tags.scm
new file mode 100644
index 000000000..a7bbd311a
--- /dev/null
+++ b/runtime/queries/_javascript/tags.scm
@@ -0,0 +1,88 @@
+(
+  (comment)* @doc
+  .
+  (method_definition
+    name: (property_identifier) @name) @definition.method
+  (#not-eq? @name "constructor")
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.method)
+)
+
+(
+  (comment)* @doc
+  .
+  [
+    (class
+      name: (_) @name)
+    (class_declaration
+      name: (_) @name)
+  ] @definition.class
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.class)
+)
+
+(
+  (comment)* @doc
+  .
+  [
+    (function
+      name: (identifier) @name)
+    (function_declaration
+      name: (identifier) @name)
+    (generator_function
+      name: (identifier) @name)
+    (generator_function_declaration
+      name: (identifier) @name)
+  ] @definition.function
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.function)
+)
+
+(
+  (comment)* @doc
+  .
+  (lexical_declaration
+    (variable_declarator
+      name: (identifier) @name
+      value: [(arrow_function) (function)]) @definition.function)
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.function)
+)
+
+(
+  (comment)* @doc
+  .
+  (variable_declaration
+    (variable_declarator
+      name: (identifier) @name
+      value: [(arrow_function) (function)]) @definition.function)
+  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
+  (#select-adjacent! @doc @definition.function)
+)
+
+(assignment_expression
+  left: [
+    (identifier) @name
+    (member_expression
+      property: (property_identifier) @name)
+  ]
+  right: [(arrow_function) (function)]
+) @definition.function
+
+(pair
+  key: (property_identifier) @name
+  value: [(arrow_function) (function)]) @definition.function
+
+(
+  (call_expression
+    function: (identifier) @name) @reference.call
+  (#not-match? @name "^(require)$")
+)
+
+(call_expression
+  function: (member_expression
+    property: (property_identifier) @name)
+  arguments: (_) @reference.call)
+
+(new_expression
+  constructor: (_) @name) @reference.class
diff --git a/runtime/queries/_jsx/highlights.scm b/runtime/queries/_jsx/highlights.scm
new file mode 100644
index 000000000..00641cded
--- /dev/null
+++ b/runtime/queries/_jsx/highlights.scm
@@ -0,0 +1,55 @@
+; Opening elements
+; ----------------
+
+(jsx_opening_element ((identifier) @constructor
+ (#match? @constructor "^[A-Z]")))
+
+; Handle the dot operator effectively - <My.Component>
+(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+
+(jsx_opening_element (identifier) @tag)
+
+; Closing elements
+; ----------------
+
+(jsx_closing_element ((identifier) @constructor
+ (#match? @constructor "^[A-Z]")))
+
+; Handle the dot operator effectively - </My.Component>
+(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+
+(jsx_closing_element (identifier) @tag)
+
+; Self-closing elements
+; ---------------------
+
+(jsx_self_closing_element ((identifier) @constructor
+ (#match? @constructor "^[A-Z]")))
+
+; Handle the dot operator effectively - <My.Component />
+(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+
+(jsx_self_closing_element (identifier) @tag)
+
+; Attributes
+; ----------
+
+(jsx_attribute (property_identifier) @variable.other.member)
+
+; Punctuation
+; -----------
+
+; Handle attribute delimiter
+(jsx_attribute "=" @punctuation.delimiter)
+
+; <Component>
+(jsx_opening_element ["<" ">"] @punctuation.bracket)
+
+; </Component>
+(jsx_closing_element ["<" "/" ">"] @punctuation.bracket)
+
+; <Component />
+(jsx_self_closing_element ["<" "/" ">"] @punctuation.bracket)
+
+; <> ... </>
+(jsx_fragment ["<" "/" ">"] @punctuation.bracket)
diff --git a/runtime/queries/_jsx/indents.scm b/runtime/queries/_jsx/indents.scm
new file mode 100644
index 000000000..4731856cf
--- /dev/null
+++ b/runtime/queries/_jsx/indents.scm
@@ -0,0 +1,7 @@
+[
+  (jsx_fragment)
+  (jsx_element)
+  (jsx_self_closing_element)
+] @indent
+
+(parenthesized_expression) @indent
diff --git a/runtime/queries/_typescript/highlights.scm b/runtime/queries/_typescript/highlights.scm
new file mode 100644
index 000000000..02f3aab77
--- /dev/null
+++ b/runtime/queries/_typescript/highlights.scm
@@ -0,0 +1,139 @@
+; Namespaces
+; ----------
+
+(internal_module
+  [((identifier) @namespace) ((nested_identifier (identifier) @namespace))])
+
+(ambient_declaration "global" @namespace)
+
+; Parameters
+; ----------
+; Javascript and Typescript Treesitter grammars deviate when defining the
+; tree structure for parameters, so we need to address them in each specific
+; language instead of ecma.
+
+; (p: t)
+; (p: t = 1)
+(required_parameter 
+  (identifier) @variable.parameter)
+
+; (...p: t)
+(required_parameter
+  (rest_pattern
+    (identifier) @variable.parameter))
+
+; ({ p }: { p: t })
+(required_parameter
+  (object_pattern
+    (shorthand_property_identifier_pattern) @variable.parameter))
+
+; ({ a: p }: { a: t })
+(required_parameter
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @variable.parameter)))
+
+; ([ p ]: t[])
+(required_parameter
+  (array_pattern
+    (identifier) @variable.parameter))
+
+; (p?: t)
+; (p?: t = 1) // Invalid but still posible to hihglight.
+(optional_parameter 
+  (identifier) @variable.parameter)
+
+; (...p?: t) // Invalid but still posible to hihglight.
+(optional_parameter
+  (rest_pattern
+    (identifier) @variable.parameter))
+
+; ({ p }: { p?: t})
+(optional_parameter
+  (object_pattern
+    (shorthand_property_identifier_pattern) @variable.parameter))
+
+; ({ a: p }: { a?: t })
+(optional_parameter
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @variable.parameter)))
+
+; ([ p ]?: t[]) // Invalid but still posible to hihglight.
+(optional_parameter
+  (array_pattern
+    (identifier) @variable.parameter))
+
+; Punctuation
+; -----------
+
+[
+  ":"
+] @punctuation.delimiter
+
+(optional_parameter "?" @punctuation.special)
+(property_signature "?" @punctuation.special)
+
+(conditional_type ["?" ":"] @operator)
+
+; Keywords
+; --------
+
+[
+  "abstract"
+  "declare"
+  "export"
+  "infer"
+  "implements"
+  "keyof"
+  "namespace"
+  "override"
+] @keyword
+
+[
+  "type"
+  "interface"
+  "enum"
+] @keyword.storage.type
+
+[
+  "public"
+  "private"
+  "protected"
+  "readonly"
+] @keyword.storage.modifier
+
+; Types
+; -----
+
+(type_identifier) @type
+(predefined_type) @type.builtin
+
+; Type arguments and parameters
+; -----------------------------
+
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(type_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+; Literals
+; --------
+
+[
+  (template_literal_type)
+] @string
+
+; Tokens
+; ------
+
+(template_type
+  "${" @punctuation.special
+  "}" @punctuation.special) @embedded
diff --git a/runtime/queries/_typescript/indents.scm b/runtime/queries/_typescript/indents.scm
new file mode 100644
index 000000000..90dbc85bf
--- /dev/null
+++ b/runtime/queries/_typescript/indents.scm
@@ -0,0 +1,5 @@
+[
+  (enum_declaration) 
+  (interface_declaration)
+  (object_type)
+] @indent
diff --git a/runtime/queries/_typescript/locals.scm b/runtime/queries/_typescript/locals.scm
new file mode 100644
index 000000000..fe13f21d3
--- /dev/null
+++ b/runtime/queries/_typescript/locals.scm
@@ -0,0 +1,16 @@
+; Definitions
+;------------
+
+; Javascript and Typescript Treesitter grammars deviate when defining the
+; tree structure for parameters, so we need to address them in each specific
+; language instead of ecma.
+
+; (i: t)
+; (i: t = 1)
+(required_parameter
+  (identifier) @local.definition)
+
+; (i?: t)
+; (i?: t = 1) // Invalid but still posible to hihglight.
+(optional_parameter
+  (identifier) @local.definition)
diff --git a/runtime/queries/_typescript/tags.scm b/runtime/queries/_typescript/tags.scm
new file mode 100644
index 000000000..ccae934e7
--- /dev/null
+++ b/runtime/queries/_typescript/tags.scm
@@ -0,0 +1,23 @@
+(function_signature
+  name: (identifier) @name) @definition.function
+
+(method_signature
+  name: (property_identifier) @name) @definition.method
+
+(abstract_method_signature
+  name: (property_identifier) @name) @definition.method
+
+(abstract_class_declaration
+  name: (type_identifier) @name) @definition.class
+
+(module
+  name: (identifier) @name) @definition.module
+
+(interface_declaration
+  name: (type_identifier) @name) @definition.interface
+
+(type_annotation
+  (type_identifier) @name) @reference.type
+
+(new_expression
+  constructor: (identifier) @name) @reference.class
diff --git a/runtime/queries/_typescript/textobjects.scm b/runtime/queries/_typescript/textobjects.scm
new file mode 100644
index 000000000..c248aeade
--- /dev/null
+++ b/runtime/queries/_typescript/textobjects.scm
@@ -0,0 +1,6 @@
+[
+  (interface_declaration 
+    body:(_) @class.inside)
+  (type_alias_declaration 
+    value: (_) @class.inside)
+] @class.around
diff --git a/runtime/queries/ecma/README.md b/runtime/queries/ecma/README.md
new file mode 100644
index 000000000..b891f24bb
--- /dev/null
+++ b/runtime/queries/ecma/README.md
@@ -0,0 +1,14 @@
+# Inheritance model for ecma-based languages
+
+Ecma-based languages share many traits. Because of this we want to share as many queries as possible while avoiding nested inheritance that can make query behaviour unpredictable due to unexpected precedence.
+
+To achieve that, there are "public" and "private" versions for javascript, jsx, and typescript query files, that share the same name, but the "private" version name starts with an underscore (with the exception of ecma, that already exists as a sort of base "private" language). This allows the "private" versions to host the specific queries of the language excluding any `; inherits` statement, in order to make them safe to be inherited by the "public" version of the same language and other languages as well. The tsx language doesn't have a "private" version given that currently it doesn't need to be inherited by other languages.
+
+| Language   | Inherits from           |
+| ---------- | ----------------------- |
+| javascript | _javascript, ecma       |
+| jsx        | _jsx, _javascript, ecma |
+| typescript | _typescript, ecma       |
+| tsx        | _jsx, _typescript, ecma |
+
+If you intend to add queries to any of the ecma-based languages above, make sure you add them to the correct private language they belong to, so that other languages down the line can benefit from them.
diff --git a/runtime/queries/ecma/highlights.scm b/runtime/queries/ecma/highlights.scm
index 7285ab960..ddbe938fe 100644
--- a/runtime/queries/ecma/highlights.scm
+++ b/runtime/queries/ecma/highlights.scm
@@ -46,8 +46,15 @@
 (assignment_expression
   left: (identifier) @function
   right: [(function) (arrow_function)])
-  
 
+; Function and method parameters
+;-------------------------------
+
+; Arrow function parameters in the form `p => ...` are supported by both
+; javascript and typescript grammars without conflicts.
+(arrow_function
+  parameter: (identifier) @variable.parameter)
+  
 ; Function and method calls
 ;--------------------------
 
diff --git a/runtime/queries/ecma/locals.scm b/runtime/queries/ecma/locals.scm
index cc5f2e14f..df8eb0d39 100644
--- a/runtime/queries/ecma/locals.scm
+++ b/runtime/queries/ecma/locals.scm
@@ -12,14 +12,28 @@
 ; Definitions
 ;------------
 
-(pattern/identifier) @local.definition
+; ...i
+(rest_pattern
+  (identifier) @local.definition)
+
+; { i }
+(object_pattern
+  (shorthand_property_identifier_pattern) @local.definition)
 
-(pattern/rest_pattern 
+; { a: i }
+(object_pattern
+  (pair_pattern
+    value: (identifier) @local.definition))
+
+; [ i ]
+(array_pattern
   (identifier) @local.definition)
-  
+
+; i => ...
 (arrow_function
   parameter: (identifier) @local.definition)
 
+; const/let/var i = ...
 (variable_declarator
   name: (identifier) @local.definition)
 
diff --git a/runtime/queries/javascript/highlights.scm b/runtime/queries/javascript/highlights.scm
index 588434799..2a40b3723 100644
--- a/runtime/queries/javascript/highlights.scm
+++ b/runtime/queries/javascript/highlights.scm
@@ -1,38 +1,3 @@
-; Function and method parameters
-;-------------------------------
+; See runtime/queries/ecma/README.md for more info.
 
-; (p) => ...
-(formal_parameters 
-  (identifier) @variable.parameter)
-
-; (...p) => ...
-(formal_parameters
-  (rest_pattern
-    (identifier) @variable.parameter))
-
-; ({ p }) => ...
-(formal_parameters
-  (object_pattern
-    (shorthand_property_identifier_pattern) @variable.parameter))
-
-; ({ a: p }) => ...
-(formal_parameters
-  (object_pattern
-    (pair_pattern
-      value: (identifier) @variable.parameter)))
-
-; ([ p ]) => ...
-(formal_parameters
-  (array_pattern
-    (identifier) @variable.parameter))
-
-; (p = 1) => ...
-(formal_parameters
-  (assignment_pattern
-    left: (identifier) @variable.parameter))
-
-; p => ...
-(arrow_function
-  parameter: (identifier) @variable.parameter)
-
-; inherits: ecma
+; inherits: _javascript,ecma
diff --git a/runtime/queries/javascript/indents.scm b/runtime/queries/javascript/indents.scm
index 04328f099..2a40b3723 100644
--- a/runtime/queries/javascript/indents.scm
+++ b/runtime/queries/javascript/indents.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _javascript,ecma
diff --git a/runtime/queries/javascript/injections.scm b/runtime/queries/javascript/injections.scm
index 04328f099..2a40b3723 100644
--- a/runtime/queries/javascript/injections.scm
+++ b/runtime/queries/javascript/injections.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _javascript,ecma
diff --git a/runtime/queries/javascript/locals.scm b/runtime/queries/javascript/locals.scm
index 04328f099..2a40b3723 100644
--- a/runtime/queries/javascript/locals.scm
+++ b/runtime/queries/javascript/locals.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _javascript,ecma
diff --git a/runtime/queries/javascript/tags.scm b/runtime/queries/javascript/tags.scm
index a7bbd311a..2a40b3723 100644
--- a/runtime/queries/javascript/tags.scm
+++ b/runtime/queries/javascript/tags.scm
@@ -1,88 +1,3 @@
-(
-  (comment)* @doc
-  .
-  (method_definition
-    name: (property_identifier) @name) @definition.method
-  (#not-eq? @name "constructor")
-  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
-  (#select-adjacent! @doc @definition.method)
-)
+; See runtime/queries/ecma/README.md for more info.
 
-(
-  (comment)* @doc
-  .
-  [
-    (class
-      name: (_) @name)
-    (class_declaration
-      name: (_) @name)
-  ] @definition.class
-  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
-  (#select-adjacent! @doc @definition.class)
-)
-
-(
-  (comment)* @doc
-  .
-  [
-    (function
-      name: (identifier) @name)
-    (function_declaration
-      name: (identifier) @name)
-    (generator_function
-      name: (identifier) @name)
-    (generator_function_declaration
-      name: (identifier) @name)
-  ] @definition.function
-  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
-  (#select-adjacent! @doc @definition.function)
-)
-
-(
-  (comment)* @doc
-  .
-  (lexical_declaration
-    (variable_declarator
-      name: (identifier) @name
-      value: [(arrow_function) (function)]) @definition.function)
-  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
-  (#select-adjacent! @doc @definition.function)
-)
-
-(
-  (comment)* @doc
-  .
-  (variable_declaration
-    (variable_declarator
-      name: (identifier) @name
-      value: [(arrow_function) (function)]) @definition.function)
-  (#strip! @doc "^[\\s\\*/]+|^[\\s\\*/]$")
-  (#select-adjacent! @doc @definition.function)
-)
-
-(assignment_expression
-  left: [
-    (identifier) @name
-    (member_expression
-      property: (property_identifier) @name)
-  ]
-  right: [(arrow_function) (function)]
-) @definition.function
-
-(pair
-  key: (property_identifier) @name
-  value: [(arrow_function) (function)]) @definition.function
-
-(
-  (call_expression
-    function: (identifier) @name) @reference.call
-  (#not-match? @name "^(require)$")
-)
-
-(call_expression
-  function: (member_expression
-    property: (property_identifier) @name)
-  arguments: (_) @reference.call)
-
-(new_expression
-  constructor: (_) @name) @reference.class
+; inherits: _javascript,ecma
diff --git a/runtime/queries/javascript/textobjects.scm b/runtime/queries/javascript/textobjects.scm
index 04328f099..2a40b3723 100644
--- a/runtime/queries/javascript/textobjects.scm
+++ b/runtime/queries/javascript/textobjects.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _javascript,ecma
diff --git a/runtime/queries/jsx/highlights.scm b/runtime/queries/jsx/highlights.scm
index a1eb2d0ed..eb2b1b1a4 100644
--- a/runtime/queries/jsx/highlights.scm
+++ b/runtime/queries/jsx/highlights.scm
@@ -1,37 +1,3 @@
-; Highlight component names differently
-(jsx_opening_element ((identifier) @constructor
- (#match? @constructor "^[A-Z]")))
+; See runtime/queries/ecma/README.md for more info.
 
-; Handle the dot operator effectively - <My.Component>
-(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
-; Highlight brackets differently
-(jsx_opening_element ["<" ">"] @punctuation.bracket)
-
-(jsx_closing_element ((identifier) @constructor
- (#match? @constructor "^[A-Z]")))
-
-; Handle the dot operator effectively - </My.Component>
-(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
-; Highlight brackets differently
-(jsx_closing_element ["<" "/" ">"] @punctuation.bracket)
-
-(jsx_self_closing_element ((identifier) @constructor
- (#match? @constructor "^[A-Z]")))
-
-; Handle the dot operator effectively - <My.Component />
-(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
-; Highlight brackets differently
-(jsx_self_closing_element ["<" "/" ">"] @punctuation.bracket)
-
-; Handle attribute delimiter
-(jsx_attribute "=" @punctuation.delimiter)
-
-(jsx_opening_element (identifier) @tag)
-(jsx_closing_element (identifier) @tag)
-(jsx_self_closing_element (identifier) @tag)
-(jsx_attribute (property_identifier) @variable.other.member)
-
-; inherits: ecma
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/indents.scm b/runtime/queries/jsx/indents.scm
index 6cb82545e..eb2b1b1a4 100644
--- a/runtime/queries/jsx/indents.scm
+++ b/runtime/queries/jsx/indents.scm
@@ -1,9 +1,3 @@
-[
-  (jsx_fragment)
-  (jsx_element)
-  (jsx_self_closing_element)
-] @indent
+; See runtime/queries/ecma/README.md for more info.
 
-(parenthesized_expression) @indent
-
-; inherits: ecma
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/injections.scm b/runtime/queries/jsx/injections.scm
index 04328f099..eb2b1b1a4 100644
--- a/runtime/queries/jsx/injections.scm
+++ b/runtime/queries/jsx/injections.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/locals.scm b/runtime/queries/jsx/locals.scm
index 04328f099..eb2b1b1a4 100644
--- a/runtime/queries/jsx/locals.scm
+++ b/runtime/queries/jsx/locals.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/tags.scm b/runtime/queries/jsx/tags.scm
new file mode 100644
index 000000000..eb2b1b1a4
--- /dev/null
+++ b/runtime/queries/jsx/tags.scm
@@ -0,0 +1,3 @@
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/textobjects.scm b/runtime/queries/jsx/textobjects.scm
index 04328f099..eb2b1b1a4 100644
--- a/runtime/queries/jsx/textobjects.scm
+++ b/runtime/queries/jsx/textobjects.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/tsx/highlights.scm b/runtime/queries/tsx/highlights.scm
index 100c7cc7a..721c56c74 100644
--- a/runtime/queries/tsx/highlights.scm
+++ b/runtime/queries/tsx/highlights.scm
@@ -1 +1,3 @@
-; inherits: jsx,typescript
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_typescript,ecma
diff --git a/runtime/queries/tsx/indents.scm b/runtime/queries/tsx/indents.scm
index 07391231c..721c56c74 100644
--- a/runtime/queries/tsx/indents.scm
+++ b/runtime/queries/tsx/indents.scm
@@ -1 +1,3 @@
-; inherits: typescript,jsx
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_typescript,ecma
diff --git a/runtime/queries/tsx/injections.scm b/runtime/queries/tsx/injections.scm
index 1b61e36da..721c56c74 100644
--- a/runtime/queries/tsx/injections.scm
+++ b/runtime/queries/tsx/injections.scm
@@ -1 +1,3 @@
-; inherits: typescript
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_typescript,ecma
diff --git a/runtime/queries/tsx/locals.scm b/runtime/queries/tsx/locals.scm
new file mode 100644
index 000000000..721c56c74
--- /dev/null
+++ b/runtime/queries/tsx/locals.scm
@@ -0,0 +1,3 @@
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_typescript,ecma
diff --git a/runtime/queries/tsx/tags.scm b/runtime/queries/tsx/tags.scm
new file mode 100644
index 000000000..721c56c74
--- /dev/null
+++ b/runtime/queries/tsx/tags.scm
@@ -0,0 +1,3 @@
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_typescript,ecma
diff --git a/runtime/queries/tsx/textobjects.scm b/runtime/queries/tsx/textobjects.scm
index 07391231c..721c56c74 100644
--- a/runtime/queries/tsx/textobjects.scm
+++ b/runtime/queries/tsx/textobjects.scm
@@ -1 +1,3 @@
-; inherits: typescript,jsx
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_typescript,ecma
diff --git a/runtime/queries/typescript/highlights.scm b/runtime/queries/typescript/highlights.scm
index 3ab9c7466..5b8c8f244 100644
--- a/runtime/queries/typescript/highlights.scm
+++ b/runtime/queries/typescript/highlights.scm
@@ -1,82 +1,3 @@
-; Namespaces
+; See runtime/queries/ecma/README.md for more info.
 
-(internal_module
-  [((identifier) @namespace) ((nested_identifier (identifier) @namespace))])
-
-(ambient_declaration "global" @namespace)
-
-; Variables
-
-(required_parameter (identifier) @variable.parameter)
-(optional_parameter (identifier) @variable.parameter)
-
-; Punctuation
-
-[
-  ":"
-] @punctuation.delimiter
-
-(optional_parameter "?" @punctuation.special)
-(property_signature "?" @punctuation.special)
-
-(conditional_type ["?" ":"] @operator)
-
-; Keywords
-
-[
-  "abstract"
-  "declare"
-  "export"
-  "infer"
-  "implements"
-  "keyof"
-  "namespace"
-  "override"
-] @keyword
-
-[
-  "type"
-  "interface"
-  "enum"
-] @keyword.storage.type
-
-[
-  "public"
-  "private"
-  "protected"
-  "readonly"
-] @keyword.storage.modifier
-
-; Types
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-(type_arguments
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
-
-(type_parameters
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
-
-((identifier) @type
- (#match? @type "^[A-Z]"))
-
-; Literals
-
-[
-  (template_literal_type)
-] @string
-
-; Tokens
-
-(template_type
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-; inherits: ecma
+; inherits: _typescript,ecma
diff --git a/runtime/queries/typescript/indents.scm b/runtime/queries/typescript/indents.scm
index 34db2741d..5b8c8f244 100644
--- a/runtime/queries/typescript/indents.scm
+++ b/runtime/queries/typescript/indents.scm
@@ -1,7 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
 
-[
-  (enum_declaration) 
-  (interface_declaration)
-  (object_type)
-] @indent
+; inherits: _typescript,ecma
diff --git a/runtime/queries/typescript/injections.scm b/runtime/queries/typescript/injections.scm
index 04328f099..5b8c8f244 100644
--- a/runtime/queries/typescript/injections.scm
+++ b/runtime/queries/typescript/injections.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _typescript,ecma
diff --git a/runtime/queries/typescript/locals.scm b/runtime/queries/typescript/locals.scm
index aa6d6ffdb..5b8c8f244 100644
--- a/runtime/queries/typescript/locals.scm
+++ b/runtime/queries/typescript/locals.scm
@@ -1,2 +1,3 @@
-(required_parameter (identifier) @local.definition)
-(optional_parameter (identifier) @local.definition)
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _typescript,ecma
diff --git a/runtime/queries/typescript/tags.scm b/runtime/queries/typescript/tags.scm
index ccae934e7..5b8c8f244 100644
--- a/runtime/queries/typescript/tags.scm
+++ b/runtime/queries/typescript/tags.scm
@@ -1,23 +1,3 @@
-(function_signature
-  name: (identifier) @name) @definition.function
+; See runtime/queries/ecma/README.md for more info.
 
-(method_signature
-  name: (property_identifier) @name) @definition.method
-
-(abstract_method_signature
-  name: (property_identifier) @name) @definition.method
-
-(abstract_class_declaration
-  name: (type_identifier) @name) @definition.class
-
-(module
-  name: (identifier) @name) @definition.module
-
-(interface_declaration
-  name: (type_identifier) @name) @definition.interface
-
-(type_annotation
-  (type_identifier) @name) @reference.type
-
-(new_expression
-  constructor: (identifier) @name) @reference.class
+; inherits: _typescript,ecma
diff --git a/runtime/queries/typescript/textobjects.scm b/runtime/queries/typescript/textobjects.scm
index 57be8b5f4..5b8c8f244 100644
--- a/runtime/queries/typescript/textobjects.scm
+++ b/runtime/queries/typescript/textobjects.scm
@@ -1,8 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
 
-[
-  (interface_declaration 
-    body:(_) @class.inside)
-  (type_alias_declaration 
-    value: (_) @class.inside)
-] @class.around
+; inherits: _typescript,ecma

From c33795e770808f11c975f30848067ce1c7ee85be Mon Sep 17 00:00:00 2001
From: Sharpened Blade <sharpenedblade@proton.me>
Date: Sun, 9 Jul 2023 22:06:30 +0530
Subject: [PATCH 128/967] Update the Nord theme to follow the Nord style guide
 (#7490)

---
 runtime/themes/nord.toml | 271 +++++++++++++++++++++++----------------
 1 file changed, 159 insertions(+), 112 deletions(-)

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index f38ede547..c490aa7ce 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -1,133 +1,180 @@
-# Author : RayGervais<raygervais@hotmail.ca>
+# Nord (Dark Ambiance) port for Helix (https://helix-editor.com/)
+# https://docs.helix-editor.com/themes.html
+# https://www.nordtheme.com/docs/colors-and-palettes
 
-"ui.linenr.selected" = "nord4"
-"ui.cursorline.primary" = { bg = "nord1" }
-"ui.text.focus" = { fg = "nord8", modifiers = ["bold"] }
-"ui.menu" = { fg = "nord6", bg = "nord1" }
-"ui.menu.selected" = { fg = "nord8", bg = "nord2" }
-"ui.virtual.ruler" = { bg = "nord1" }
-
-"info" = "nord8"
-"hint" = "nord8"
+## SYNTAX HIGHLIGHTING
 
-# Polar Night
-# nord0 - background color
-"ui.background" = { bg = "nord0" }
-
-"ui.statusline.inactive" = { fg = "nord8", bg = "nord1" }
-"ui.statusline.normal" = { fg = "nord0", bg = "nord8" }
-"ui.statusline.insert" = { fg = "nord0", bg = "nord13" }
-"ui.statusline.select" = { fg = "nord0", bg = "nord15" }
+# Constants
+"constant" = "nord4" 
+"constant.builtin" = "nord9"
+"constant.builtin.boolean" = "nord9"
+"constant.builtin.character" = "nord15"
+"constant.character.escape" = "nord13"
+"constant.macro" = "nord9"
+"constant.numeric" = "nord15"
+"constructor" = "nord8"
 
+# Diagnostics
+"diagnostic" = "nord13"
+"diagnostic.error" = "nord11"
+"error" = "nord11"
+"diagnostic.hint" = "nord10"
+"hint" = "nord10"
+"diagnostic.info" = "nord8"
+"info" = "nord8"
+"diagnostic.warning" = "nord13"
+"warning" = "nord13"
 
-# nord1 - status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "nord4", bg = "nord1" }
-"ui.popup" = { bg = "nord1" }
-"ui.window" = { bg = "nord1" }
-"ui.help" = { bg = "nord1", fg = "nord4" }
+# Diffs
+"diff.delta" = "nord13"
+"diff.minus" = "nord11"
+"diff.plus" = "nord14"
 
-# nord2 - active line, highlighting
-"ui.selection" = { bg = "nord2" }
-"ui.cursor.match" = { bg = "nord2" }
+# Functions
+"function" = "nord8"
+"function.builtin" = "nord7"
+"function.method" = "nord8"
+"function.macro" = "nord9"
+"function.special" = "nord9"
+
+# Git
+"git.delta.moved" = "nord12"
+
+# Keywords
+"keyword" = "nord9"
+"keyword.control.conditional" = "nord9"
+"keyword.control.exception" = "nord9"
+"keyword.control.repeat" = "nord9"
+"keyword.directive" = "nord9"
+"keyword.function" = "nord9"
+"keyword.operator" = "nord9"
+"keyword.return" = "nord9"
+"keyword.storage.modifier" = "nord9"
+"keyword.storage.type" = "nord7"
+
+# Punctuation
+"punctuation" = "nord6"
+"punctuation.bracket" = "nord6"
+"punctuation.delimiter" = "nord6"
+"punctuation.special" = "nord9"
 
-# nord3 - comments, invisible/non-printable characters
-"comment" = { fg = "nord3_bright", modifiers = ["italic"] }
-"ui.linenr" = "nord3_bright"
-"ui.virtual.whitespace" = "nord3_bright"
-"ui.virtual.inlay-hint" = { fg = "nord3_bright" }
+# Strings
+"string" = "nord14"
+"string.escape" = "nord13"
+"string.regex" = "nord13"
+"string.special" = "nord13"
 
+# Types
+"type" = "nord4"
+"type.builtin" = "nord7"
 
-# Snow Storm
-# nord4 - cursor, variables, constants, attributes, fields
-"ui.cursor.primary" = { fg = "nord4", modifiers = ["reversed"] }
-"attribute" = "nord4"
+# Variables
 "variable" = "nord4"
-"constant" = "nord4"
-"variable.builtin" = "nord4"
-"constant.builtin" = "nord4"
-"namespace" = "nord4"
-
-# nord5 - subtle UI text
-
-# nord6 - base text, punctuation
-"ui.text" = "nord6"
-"punctuation" = "nord6"
+"variable.builint" = "nord9"
+"variable.other.member" = "nord4"
+"variable.parameter" = "nord8"
+"attribute" = "nord4"
 
-# Frost
-# nord7 - classes, types, primitives
-"type" = "nord7"
-"type.builtin" = "nord7"
+# Misc.
 "label" = "nord7"
-
-# nord8 - declaration, methods, routines
-"constructor" = "nord8"
-"function" = "nord8"
-"function.macro" = "nord8"
-"function.builtin" = "nord8"
-
-# nord9 - operator, tags, units, punctuations
-"punctuation.delimiter" = "nord9"
+"namespace" = "nord4"
 "operator" = "nord9"
-"variable.other.member" = "nord9"
+"special" = "nord4"
+"tag" = "nord4"
+"comment" = { fg = "nord3_bright", modifiers = ["italic"] }
 
-# nord10 - keywords, special
-"keyword" = "nord10"
-"keyword.directive" = "nord10"
-"variable.parameter" = "nord10"
+## EDITOR UI COLORS
 
-# Aurora
-# nord11 - error
-"error" = "nord11"
+"ui.background" = { bg = "nord0" }
+"ui.text" = "nord4"
+"ui.window" = "nord1"
 
-# nord12 - annotations, decorators
-"special" = "nord12"
-"module" = "nord12"
+# Debug
+"ui.debug.active" = "nord13"
+"ui.debug.breakpoint" = "nord11"
 
-# nord13 - warnings, escape characters, regex
-"warning" = "nord13"
-"constant.character.escape" = "nord13"
+# Popus and menus
+"ui.menu" = { bg = "nord1" }
+"ui.menu.scroll" = { fg = "nord4", bg = "nord3" }
+"ui.menu.selected" = { fg = "nord8", bg = "nord2" }
+"ui.popup" = { bg = "nord1" }
+"ui.popup.info" = { bg = "nord1" }
+"ui.help" = { bg = "nord1" }
 
-# nord14 - strings
-"string" = "nord14"
+# Gutter
+"ui.gutter" = "nord5"
+"ui.linenr" = "nord3"
+"ui.linenr.selected" = "nord5"
 
-# nord15 - integer, floating point
-"constant.numeric" = "nord15"
+# Cursor
+"ui.cursor" = { fg = "nord4", modifiers = [ "reversed" ] }
+"ui.cursorcolumn.primary" = { bg = "nord1" }
+"ui.cursorline.primary" = { bg = "nord1" }
 
-# markup
-"markup.heading" = "nord8"
-"markup.list" = "nord9"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.text" = "nord8"
-"markup.raw" = "nord7"
-
-# lsp diagnostics
-"diagnostic.error" = { underline = { color = "nord11", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }
-"diagnostic.info" = { underline = { color = "nord8", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "nord8", style = "curl" } }
-
-# vcs
-"diff.plus" = "nord14"
-"diff.delta" = "nord12"
-"diff.minus" = "nord11"
+"ui.selection" = { bg = "nord2" }
+"ui.highlight" = { fg = "nord8", bg = "nord2" }
+
+# Statusline
+"ui.statusline" = {  bg = "nord1" }
+"ui.statusline.inactive" = { fg = "nord8", bg = "nord1" }
+"ui.statusline.insert" = { fg = "nord1", bg = "nord6" }
+"ui.statusline.normal" = { fg = "nord1", bg = "nord8" }
+"ui.statusline.select" = { fg = "nord1", bg = "nord7" }
+"ui.statusline.separator" = "nord3"
+
+# Virtual/invisable text
+"ui.virtual.indent-guide" = "nord3"
+"ui.virtual.inlay-hint" = { fg = "nord3", modifiers = ["italic"] }
+"ui.virtual.ruler" = "nord3"
+"ui.virtual.whitespace" = "nord3"
+"ui.virtual.wrap" = "nord3"
+
+# Bufferline
+"ui.bufferline" = { fg = "nord5", bg = "nord1" }
+"ui.bufferline.active" = { fg = "nord6", bg = "nord2", underline = { color = "nord8", style = "line" }, modifiers = [ "italic" ] }
 
 [palette]
-nord0 = "#2e3440"
-nord1 = "#3b4252"
-nord2 = "#434c5e"
-# we use a brighter nord3 based on discussion here:
-# https://github.com/arcticicestudio/nord/issues/94
-nord3_bright = "#616e88"
-nord4 = "#d8dee9"
-nord6 = "#eceff4"
-nord7 = "#8fbcbb"
-nord8 = "#88c0d0"
-nord9 = "#81a1c1"
-nord10 = "#5e81ac"
-nord11 = "#bf616a"
-nord12 = "#d08770"
-nord13 = "#ebcb8b"
-nord14 = "#a3be8c"
-nord15 = "#b48ead"
+# Polar Night is made up of four darker colors that are commonly used for base elements like backgrounds or text color in bright ambiance designs.
+#
+# The origin color or the Polar Night palette
+nord0 = "#2e3440" 
+# A brighter shade color based on nord0
+nord1 = "#3B4252" 
+# An even more brighter shade color of nord0
+nord2 = "#434C5E" 
+# The brightest shade color based on nord0
+nord3 = "#4C566A" 
+# 10% brighter for comments, see https://github.com/nordtheme/nord/issues/94
+nord3_bright = "#616e88" 
+
+# Snow Storm is made up of three bright colors that are commonly used for text colors or base UI elements in bright ambiance designs.
+# The origin color or the Snow Storm palette
+nord4 = "#D8DEE9" 
+# A brighter shade color of nord4
+nord5 = "#E5E9F0" 
+# The brightest shade color based on nord4
+nord6 = "#ECEFF4" 
+
+# Frost can be described as the heart palette of Nord, a group of four bluish colors that are commonly used for primary UI component and text highlighting and essential code syntax elements.
+#
+# A calm and highly contrasted color reminiscent of frozen polar water
+nord7 = "#8FBCBB" 
+# The bright and shiny primary accent color reminiscent of pure and clear ice
+nord8 = "#88C0D0" 
+# A more darkened and less saturated color reminiscent of arctic waters
+nord9 = "#81A1C1" 
+# A dark and intensive color reminiscent of the deep arctic ocean
+ nord10 = "#5E81AC" 
+
+# Aurora consists of five colorful components reminiscent of the "Aurora borealis", sometimes referred to as polar lights or northern lights.
+#
+# Red
+nord11 = "#BF616A" 
+# Orange
+nord12 = "#D08770" 
+# Yellow
+nord13 = "#EBCB8B" 
+# Green
+nord14 = "#A3BE8C" 
+# Purple
+nord15 = "#B48EAD" 

From 7c338429f845315fb276ff482f91b94b3102dbd8 Mon Sep 17 00:00:00 2001
From: Borys Lykah <lykahb@fastmail.com>
Date: Sun, 9 Jul 2023 11:17:01 -0600
Subject: [PATCH 129/967] Add language support for persistent library syntax
 (#7261)

---
 book/src/generated/lang-support.md            |  1 +
 languages.toml                                | 12 ++++++
 runtime/queries/haskell-persistent/folds.scm  |  3 ++
 .../queries/haskell-persistent/highlights.scm | 37 +++++++++++++++++++
 runtime/queries/haskell-persistent/locals.scm |  1 +
 runtime/queries/haskell/injections.scm        |  8 ++++
 6 files changed, 62 insertions(+)
 create mode 100644 runtime/queries/haskell-persistent/folds.scm
 create mode 100644 runtime/queries/haskell-persistent/highlights.scm
 create mode 100644 runtime/queries/haskell-persistent/locals.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c3eb0f96a..b53911503 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -59,6 +59,7 @@
 | graphql | ✓ |  |  |  |
 | hare | ✓ |  |  |  |
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
+| haskell-persistent | ✓ |  |  |  |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
 | hosts | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 482a25110..e8f6a7a6b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -955,6 +955,18 @@ indent = { tab-width = 2, unit = "  " }
 name = "haskell"
 source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "98fc7f59049aeb713ab9b72a8ff25dcaaef81087" }
 
+[[language]]
+name = "haskell-persistent"
+scope = "source.persistentmodels"
+file-types = ["persistentmodels"]
+roots = []
+comment-token = "--"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "haskell-persistent"
+source = { git = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent", rev = "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d" }
+
 [[language]]
 name = "purescript"
 scope = "source.purescript"
diff --git a/runtime/queries/haskell-persistent/folds.scm b/runtime/queries/haskell-persistent/folds.scm
new file mode 100644
index 000000000..ac04ad4a1
--- /dev/null
+++ b/runtime/queries/haskell-persistent/folds.scm
@@ -0,0 +1,3 @@
+[
+ (entity_definition)
+] @fold
diff --git a/runtime/queries/haskell-persistent/highlights.scm b/runtime/queries/haskell-persistent/highlights.scm
new file mode 100644
index 000000000..d6358578d
--- /dev/null
+++ b/runtime/queries/haskell-persistent/highlights.scm
@@ -0,0 +1,37 @@
+;; ----------------------------------------------------------------------------
+;; Literals and comments
+
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
+(char) @constant.character
+(string) @string
+(attribute_name) @attribute
+(attribute_exclamation_mark) @attribute
+
+(con_unit) @constant.builtin ; unit, as in ()
+
+(comment) @comment
+
+;; ----------------------------------------------------------------------------
+;; Keywords, operators, includes
+
+[
+  "Id"
+  "Primary"
+  "Foreign"
+  "deriving"
+] @keyword
+
+"=" @operator
+
+;; ----------------------------------------------------------------------------
+;; Functions and variables
+
+(variable) @variable
+
+;; ----------------------------------------------------------------------------
+;; Types
+
+(type) @type
+
+(constructor) @constructor
diff --git a/runtime/queries/haskell-persistent/locals.scm b/runtime/queries/haskell-persistent/locals.scm
new file mode 100644
index 000000000..3ffb01a17
--- /dev/null
+++ b/runtime/queries/haskell-persistent/locals.scm
@@ -0,0 +1 @@
+(fields (variable)) @local.definition
diff --git a/runtime/queries/haskell/injections.scm b/runtime/queries/haskell/injections.scm
index 788b8b8c6..5ee3478ba 100644
--- a/runtime/queries/haskell/injections.scm
+++ b/runtime/queries/haskell/injections.scm
@@ -1,6 +1,14 @@
 ((comment) @injection.content
  (#set! injection.language "comment"))
 
+(quasiquote
+ (quoter) @_quoter
+ ((quasiquote_body) @injection.content
+  (#match? @_quoter "(persistWith|persistLowerCase|persistUpperCase)")
+  (#set! injection.language "haskell-persistent")
+ )
+)
+
 (quasiquote
  (quoter) @injection.language
  (quasiquote_body) @injection.content)

From 9a324f337a2705e68035a356ad6b626ee4c6669b Mon Sep 17 00:00:00 2001
From: Em Zhan <zqianem@gmail.com>
Date: Sun, 9 Jul 2023 12:20:38 -0500
Subject: [PATCH 130/967] docs: Update mdBook theme and improve maintainability
 (#7524)

---
 .ignore                      |   3 -
 book/book.toml               |   1 +
 book/custom.css              | 231 ++++++++++++
 book/theme/book.js           | 660 -----------------------------------
 book/theme/css/chrome.css    | 499 --------------------------
 book/theme/css/general.css   | 233 -------------
 book/theme/css/print.css     |  54 ---
 book/theme/css/variables.css | 411 ----------------------
 book/theme/highlight.css     |  56 ---
 book/theme/highlight.js      |   6 -
 book/theme/index.hbs         | 105 ++++--
 11 files changed, 301 insertions(+), 1958 deletions(-)
 create mode 100644 book/custom.css
 delete mode 100644 book/theme/book.js
 delete mode 100644 book/theme/css/chrome.css
 delete mode 100644 book/theme/css/general.css
 delete mode 100644 book/theme/css/print.css
 delete mode 100644 book/theme/css/variables.css
 delete mode 100644 book/theme/highlight.css
 delete mode 100644 book/theme/highlight.js

diff --git a/.ignore b/.ignore
index 865856b43..0c4493ee8 100644
--- a/.ignore
+++ b/.ignore
@@ -1,5 +1,2 @@
 # Things that we don't want ripgrep to search that we do want in git
 # https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#automatic-filtering
-
-# Minified JS vendored from mdbook
-book/theme/highlight.js
diff --git a/book/book.toml b/book/book.toml
index f68dece81..4db5365e7 100644
--- a/book/book.toml
+++ b/book/book.toml
@@ -10,3 +10,4 @@ default-theme = "colibri"
 preferred-dark-theme = "colibri"
 git-repository-url = "https://github.com/helix-editor/helix"
 edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"
+additional-css = ["custom.css"]
diff --git a/book/custom.css b/book/custom.css
new file mode 100644
index 000000000..0e812090e
--- /dev/null
+++ b/book/custom.css
@@ -0,0 +1,231 @@
+html {
+  font-family: "Inter", sans-serif;
+}
+
+.sidebar .sidebar-scrollbox {
+  padding: 0;
+}
+
+.chapter {
+  margin: 0.25rem 0;
+}
+
+.chapter li.chapter-item {
+  line-height: initial;
+  margin: 0;
+  padding: 1rem 1.5rem;
+}
+
+.chapter .section li.chapter-item {
+  line-height: inherit;
+  padding: .5rem .5rem 0 .5rem;
+}
+
+.content {
+  overflow-y: auto;
+  padding: 0 15px;
+  padding-bottom: 50px;
+}
+
+/* 2 1.75 1.5 1.25 1 .875 */
+.content h1 { font-size: 2em }
+.content h2 { font-size: 1.75em }
+.content h3 { font-size: 1.5em }
+.content h4 { font-size: 1.25em }
+.content h5 { font-size: 1em }
+.content h6 { font-size: .875em }
+
+.content h1,
+.content h2,
+.content h3,
+.content h4 {
+  font-weight: 500;
+  margin-top: 1.275em;
+  margin-bottom: .875em;
+}
+
+.content p,
+.content ol,
+.content ul,
+.content table {
+  margin-top: 0;
+  margin-bottom: .875em;
+}
+
+.content ul li {
+  margin-bottom: .25rem;
+}
+
+.content ul {
+  list-style-type: square;
+}
+
+.content ul ul,
+.content ol ul {
+  margin-bottom: .5rem;
+}
+
+.content li p {
+  margin-bottom: .5em;
+}
+
+blockquote {
+  margin: 1.5rem 0;
+  padding: 1rem 1.5rem;
+  color: var(--fg);
+  opacity: .9;
+  background-color: var(--quote-bg);
+  border-left: 4px solid var(--quote-border);
+  border-top: none;
+  border-bottom: none;
+}
+
+blockquote *:last-child {
+  margin-bottom: 0;
+}
+
+table {
+  width: 100%;
+}
+
+table thead th {
+  padding: .75rem;
+  text-align: left;
+  font-weight: 500;
+  line-height: 1.5;
+  width: auto;
+}
+
+table td {
+  padding: .75rem;
+  border: none;
+}
+
+table thead tr {
+  border: none;
+  border-bottom: 2px var(--table-border-color) solid;
+}
+
+table tbody tr {
+  border-bottom: 1px var(--table-border-line) solid;
+}
+
+table tbody tr:nth-child(2n) {
+  background: unset;
+}
+
+pre code.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 1em;
+}
+
+code.hljs {
+  padding: 3px 5px;
+}
+
+.colibri {
+  --bg: #3b224c;
+  --fg: #bcbdd0;
+  --heading-fg: #fff;
+
+  --sidebar-bg: #281733;
+  --sidebar-fg: #c8c9db;
+  --sidebar-non-existent: #505274;
+  --sidebar-active: #a4a0e8;
+  --sidebar-spacer: #2d334f;
+
+  --scrollbar: var(--sidebar-fg);
+
+  --icons: #737480;
+  --icons-hover: #b7b9cc;
+
+  /* --links: #a4a0e8; */
+  --links: #ECCDBA;
+
+  --inline-code-color: hsl(48.7, 7.8%, 70%);
+
+  --theme-popup-bg: #161923;
+  --theme-popup-border: #737480;
+  --theme-hover: rgba(0, 0, 0, .2);
+
+  --quote-bg: #281733;
+  --quote-border: hsl(226, 15%, 22%);
+
+  --table-border-color: hsl(226, 23%, 76%);
+  --table-header-bg: hsla(226, 23%, 31%, 0);
+  --table-alternate-bg: hsl(226, 23%, 14%);
+  --table-border-line: hsla(201deg, 20%, 92%, 0.2);
+
+  --searchbar-border-color: #aaa;
+  --searchbar-bg: #aeaec6;
+  --searchbar-fg: #000;
+  --searchbar-shadow-color: #aaa;
+  --searchresults-header-fg: #5f5f71;
+  --searchresults-border-color: #5c5c68;
+  --searchresults-li-bg: #242430;
+  --search-mark-bg: #acff5;
+}
+
+.colibri .content .header {
+  color: #fff;
+}
+
+/* highlight.js theme, :where() is used to avoid increasing specificity */
+
+:where(.colibri) .hljs {
+  background: #2f1e2e;
+  color: #a39e9b;
+}
+
+:where(.colibri) .hljs-comment,
+:where(.colibri) .hljs-quote {
+  color: #8d8687;
+}
+
+:where(.colibri) .hljs-link,
+:where(.colibri) .hljs-meta,
+:where(.colibri) .hljs-name,
+:where(.colibri) .hljs-regexp,
+:where(.colibri) .hljs-selector-class,
+:where(.colibri) .hljs-selector-id,
+:where(.colibri) .hljs-tag,
+:where(.colibri) .hljs-template-variable,
+:where(.colibri) .hljs-variable {
+  color: #ef6155;
+}
+
+:where(.colibri) .hljs-built_in,
+:where(.colibri) .hljs-deletion,
+:where(.colibri) .hljs-literal,
+:where(.colibri) .hljs-number,
+:where(.colibri) .hljs-params,
+:where(.colibri) .hljs-type {
+  color: #f99b15;
+}
+
+:where(.colibri) .hljs-attribute,
+:where(.colibri) .hljs-section,
+:where(.colibri) .hljs-title {
+  color: #fec418;
+}
+
+:where(.colibri) .hljs-addition,
+:where(.colibri) .hljs-bullet,
+:where(.colibri) .hljs-string,
+:where(.colibri) .hljs-symbol {
+  color: #48b685;
+}
+
+:where(.colibri) .hljs-keyword,
+:where(.colibri) .hljs-selector-tag {
+  color: #815ba4;
+}
+
+:where(.colibri) .hljs-emphasis {
+  font-style: italic;
+}
+
+:where(.colibri) .hljs-strong {
+  font-weight: 700;
+}
diff --git a/book/theme/book.js b/book/theme/book.js
deleted file mode 100644
index 407361838..000000000
--- a/book/theme/book.js
+++ /dev/null
@@ -1,660 +0,0 @@
-"use strict";
-
-// Fix back button cache problem
-window.onunload = function () { };
-
-// Global variable, shared between modules
-function playground_text(playground) {
-    let code_block = playground.querySelector("code");
-
-    if (window.ace && code_block.classList.contains("editable")) {
-        let editor = window.ace.edit(code_block);
-        return editor.getValue();
-    } else {
-        return code_block.textContent;
-    }
-}
-
-(function codeSnippets() {
-    function fetch_with_timeout(url, options, timeout = 6000) {
-        return Promise.race([
-            fetch(url, options),
-            new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout))
-        ]);
-    }
-
-    var playgrounds = Array.from(document.querySelectorAll(".playground"));
-    if (playgrounds.length > 0) {
-        fetch_with_timeout("https://play.rust-lang.org/meta/crates", {
-            headers: {
-                'Content-Type': "application/json",
-            },
-            method: 'POST',
-            mode: 'cors',
-        })
-        .then(response => response.json())
-        .then(response => {
-            // get list of crates available in the rust playground
-            let playground_crates = response.crates.map(item => item["id"]);
-            playgrounds.forEach(block => handle_crate_list_update(block, playground_crates));
-        });
-    }
-
-    function handle_crate_list_update(playground_block, playground_crates) {
-        // update the play buttons after receiving the response
-        update_play_button(playground_block, playground_crates);
-
-        // and install on change listener to dynamically update ACE editors
-        if (window.ace) {
-            let code_block = playground_block.querySelector("code");
-            if (code_block.classList.contains("editable")) {
-                let editor = window.ace.edit(code_block);
-                editor.addEventListener("change", function (e) {
-                    update_play_button(playground_block, playground_crates);
-                });
-                // add Ctrl-Enter command to execute rust code
-                editor.commands.addCommand({
-                    name: "run",
-                    bindKey: {
-                        win: "Ctrl-Enter",
-                        mac: "Ctrl-Enter"
-                    },
-                    exec: _editor => run_rust_code(playground_block)
-                });
-            }
-        }
-    }
-
-    // updates the visibility of play button based on `no_run` class and
-    // used crates vs ones available on http://play.rust-lang.org
-    function update_play_button(pre_block, playground_crates) {
-        var play_button = pre_block.querySelector(".play-button");
-
-        // skip if code is `no_run`
-        if (pre_block.querySelector('code').classList.contains("no_run")) {
-            play_button.classList.add("hidden");
-            return;
-        }
-
-        // get list of `extern crate`'s from snippet
-        var txt = playground_text(pre_block);
-        var re = /extern\s+crate\s+([a-zA-Z_0-9]+)\s*;/g;
-        var snippet_crates = [];
-        var item;
-        while (item = re.exec(txt)) {
-            snippet_crates.push(item[1]);
-        }
-
-        // check if all used crates are available on play.rust-lang.org
-        var all_available = snippet_crates.every(function (elem) {
-            return playground_crates.indexOf(elem) > -1;
-        });
-
-        if (all_available) {
-            play_button.classList.remove("hidden");
-        } else {
-            play_button.classList.add("hidden");
-        }
-    }
-
-    function run_rust_code(code_block) {
-        var result_block = code_block.querySelector(".result");
-        if (!result_block) {
-            result_block = document.createElement('code');
-            result_block.className = 'result hljs language-bash';
-
-            code_block.append(result_block);
-        }
-
-        let text = playground_text(code_block);
-        let classes = code_block.querySelector('code').classList;
-        let has_2018 = classes.contains("edition2018");
-        let edition = has_2018 ? "2018" : "2015";
-
-        var params = {
-            version: "stable",
-            optimize: "0",
-            code: text,
-            edition: edition
-        };
-
-        if (text.indexOf("#![feature") !== -1) {
-            params.version = "nightly";
-        }
-
-        result_block.innerText = "Running...";
-
-        fetch_with_timeout("https://play.rust-lang.org/evaluate.json", {
-            headers: {
-                'Content-Type': "application/json",
-            },
-            method: 'POST',
-            mode: 'cors',
-            body: JSON.stringify(params)
-        })
-        .then(response => response.json())
-        .then(response => result_block.innerText = response.result)
-        .catch(error => result_block.innerText = "Playground Communication: " + error.message);
-    }
-
-    // Syntax highlighting Configuration
-    hljs.configure({
-        tabReplace: '    ', // 4 spaces
-        languages: [],      // Languages used for auto-detection
-    });
-
-    let code_nodes = Array
-        .from(document.querySelectorAll('code'))
-        // Don't highlight `inline code` blocks in headers.
-        .filter(function (node) {return !node.parentElement.classList.contains("header"); });
-
-    if (window.ace) {
-        // language-rust class needs to be removed for editable
-        // blocks or highlightjs will capture events
-        Array
-            .from(document.querySelectorAll('code.editable'))
-            .forEach(function (block) { block.classList.remove('language-rust'); });
-
-        Array
-            .from(document.querySelectorAll('code:not(.editable)'))
-            .forEach(function (block) { hljs.highlightBlock(block); });
-    } else {
-        code_nodes.forEach(function (block) { hljs.highlightBlock(block); });
-    }
-
-    // Adding the hljs class gives code blocks the color css
-    // even if highlighting doesn't apply
-    code_nodes.forEach(function (block) { block.classList.add('hljs'); });
-
-    Array.from(document.querySelectorAll("code.language-rust")).forEach(function (block) {
-
-        var lines = Array.from(block.querySelectorAll('.boring'));
-        // If no lines were hidden, return
-        if (!lines.length) { return; }
-        block.classList.add("hide-boring");
-
-        var buttons = document.createElement('div');
-        buttons.className = 'buttons';
-        buttons.innerHTML = "<button class=\"fa fa-eye\" title=\"Show hidden lines\" aria-label=\"Show hidden lines\"></button>";
-
-        // add expand button
-        var pre_block = block.parentNode;
-        pre_block.insertBefore(buttons, pre_block.firstChild);
-
-        pre_block.querySelector('.buttons').addEventListener('click', function (e) {
-            if (e.target.classList.contains('fa-eye')) {
-                e.target.classList.remove('fa-eye');
-                e.target.classList.add('fa-eye-slash');
-                e.target.title = 'Hide lines';
-                e.target.setAttribute('aria-label', e.target.title);
-
-                block.classList.remove('hide-boring');
-            } else if (e.target.classList.contains('fa-eye-slash')) {
-                e.target.classList.remove('fa-eye-slash');
-                e.target.classList.add('fa-eye');
-                e.target.title = 'Show hidden lines';
-                e.target.setAttribute('aria-label', e.target.title);
-
-                block.classList.add('hide-boring');
-            }
-        });
-    });
-
-    if (window.playground_copyable) {
-        Array.from(document.querySelectorAll('pre code')).forEach(function (block) {
-            var pre_block = block.parentNode;
-            if (!pre_block.classList.contains('playground')) {
-                var buttons = pre_block.querySelector(".buttons");
-                if (!buttons) {
-                    buttons = document.createElement('div');
-                    buttons.className = 'buttons';
-                    pre_block.insertBefore(buttons, pre_block.firstChild);
-                }
-
-                var clipButton = document.createElement('button');
-                clipButton.className = 'fa fa-copy clip-button';
-                clipButton.title = 'Copy to clipboard';
-                clipButton.setAttribute('aria-label', clipButton.title);
-                clipButton.innerHTML = '<i class=\"tooltiptext\"></i>';
-
-                buttons.insertBefore(clipButton, buttons.firstChild);
-            }
-        });
-    }
-
-    // Process playground code blocks
-    Array.from(document.querySelectorAll(".playground")).forEach(function (pre_block) {
-        // Add play button
-        var buttons = pre_block.querySelector(".buttons");
-        if (!buttons) {
-            buttons = document.createElement('div');
-            buttons.className = 'buttons';
-            pre_block.insertBefore(buttons, pre_block.firstChild);
-        }
-
-        var runCodeButton = document.createElement('button');
-        runCodeButton.className = 'fa fa-play play-button';
-        runCodeButton.hidden = true;
-        runCodeButton.title = 'Run this code';
-        runCodeButton.setAttribute('aria-label', runCodeButton.title);
-
-        buttons.insertBefore(runCodeButton, buttons.firstChild);
-        runCodeButton.addEventListener('click', function (e) {
-            run_rust_code(pre_block);
-        });
-
-        if (window.playground_copyable) {
-            var copyCodeClipboardButton = document.createElement('button');
-            copyCodeClipboardButton.className = 'fa fa-copy clip-button';
-            copyCodeClipboardButton.innerHTML = '<i class="tooltiptext"></i>';
-            copyCodeClipboardButton.title = 'Copy to clipboard';
-            copyCodeClipboardButton.setAttribute('aria-label', copyCodeClipboardButton.title);
-
-            buttons.insertBefore(copyCodeClipboardButton, buttons.firstChild);
-        }
-
-        let code_block = pre_block.querySelector("code");
-        if (window.ace && code_block.classList.contains("editable")) {
-            var undoChangesButton = document.createElement('button');
-            undoChangesButton.className = 'fa fa-history reset-button';
-            undoChangesButton.title = 'Undo changes';
-            undoChangesButton.setAttribute('aria-label', undoChangesButton.title);
-
-            buttons.insertBefore(undoChangesButton, buttons.firstChild);
-
-            undoChangesButton.addEventListener('click', function () {
-                let editor = window.ace.edit(code_block);
-                editor.setValue(editor.originalCode);
-                editor.clearSelection();
-            });
-        }
-    });
-})();
-
-(function themes() {
-    var html = document.querySelector('html');
-    var themeToggleButton = document.getElementById('theme-toggle');
-    var themePopup = document.getElementById('theme-list');
-    var themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
-    var stylesheets = {
-        ayuHighlight: document.querySelector("[href$='ayu-highlight.css']"),
-        tomorrowNight: document.querySelector("[href$='tomorrow-night.css']"),
-        highlight: document.querySelector("[href$='highlight.css']"),
-    };
-
-    function showThemes() {
-        themePopup.style.display = 'block';
-        themeToggleButton.setAttribute('aria-expanded', true);
-        themePopup.querySelector("button#" + get_theme()).focus();
-    }
-
-    function hideThemes() {
-        themePopup.style.display = 'none';
-        themeToggleButton.setAttribute('aria-expanded', false);
-        themeToggleButton.focus();
-    }
-
-    function get_theme() {
-        var theme;
-        try { theme = localStorage.getItem('mdbook-theme'); } catch (e) { }
-        if (theme === null || theme === undefined) {
-            return default_theme;
-        } else {
-            return theme;
-        }
-    }
-
-    function set_theme(theme, store = true) {
-        let ace_theme;
-
-        if (theme == 'coal' || theme == 'navy') {
-            stylesheets.ayuHighlight.disabled = true;
-            stylesheets.tomorrowNight.disabled = false;
-            stylesheets.highlight.disabled = true;
-
-            ace_theme = "ace/theme/tomorrow_night";
-        } else if (theme == 'ayu') {
-            stylesheets.ayuHighlight.disabled = false;
-            stylesheets.tomorrowNight.disabled = true;
-            stylesheets.highlight.disabled = true;
-            ace_theme = "ace/theme/tomorrow_night";
-        } else {
-            stylesheets.ayuHighlight.disabled = true;
-            stylesheets.tomorrowNight.disabled = true;
-            stylesheets.highlight.disabled = false;
-            ace_theme = "ace/theme/dawn";
-        }
-
-        setTimeout(function () {
-            themeColorMetaTag.content = getComputedStyle(document.body).backgroundColor;
-        }, 1);
-
-        if (window.ace && window.editors) {
-            window.editors.forEach(function (editor) {
-                editor.setTheme(ace_theme);
-            });
-        }
-
-        var previousTheme = get_theme();
-
-        if (store) {
-            try { localStorage.setItem('mdbook-theme', theme); } catch (e) { }
-        }
-
-        html.classList.remove(previousTheme);
-        html.classList.add(theme);
-    }
-
-    // Set theme
-    var theme = get_theme();
-
-    set_theme(theme, false);
-
-    themeToggleButton.addEventListener('click', function () {
-        if (themePopup.style.display === 'block') {
-            hideThemes();
-        } else {
-            showThemes();
-        }
-    });
-
-    themePopup.addEventListener('click', function (e) {
-        var theme = e.target.id || e.target.parentElement.id;
-        set_theme(theme);
-    });
-
-    themePopup.addEventListener('focusout', function(e) {
-        // e.relatedTarget is null in Safari and Firefox on macOS (see workaround below)
-        if (!!e.relatedTarget && !themeToggleButton.contains(e.relatedTarget) && !themePopup.contains(e.relatedTarget)) {
-            hideThemes();
-        }
-    });
-
-    // Should not be needed, but it works around an issue on macOS & iOS: https://github.com/rust-lang/mdBook/issues/628
-    document.addEventListener('click', function(e) {
-        if (themePopup.style.display === 'block' && !themeToggleButton.contains(e.target) && !themePopup.contains(e.target)) {
-            hideThemes();
-        }
-    });
-
-    document.addEventListener('keydown', function (e) {
-        if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
-        if (!themePopup.contains(e.target)) { return; }
-
-        switch (e.key) {
-            case 'Escape':
-                e.preventDefault();
-                hideThemes();
-                break;
-            case 'ArrowUp':
-                e.preventDefault();
-                var li = document.activeElement.parentElement;
-                if (li && li.previousElementSibling) {
-                    li.previousElementSibling.querySelector('button').focus();
-                }
-                break;
-            case 'ArrowDown':
-                e.preventDefault();
-                var li = document.activeElement.parentElement;
-                if (li && li.nextElementSibling) {
-                    li.nextElementSibling.querySelector('button').focus();
-                }
-                break;
-            case 'Home':
-                e.preventDefault();
-                themePopup.querySelector('li:first-child button').focus();
-                break;
-            case 'End':
-                e.preventDefault();
-                themePopup.querySelector('li:last-child button').focus();
-                break;
-        }
-    });
-})();
-
-(function sidebar() {
-    var html = document.querySelector("html");
-    var sidebar = document.getElementById("sidebar");
-    var sidebarLinks = document.querySelectorAll('#sidebar a');
-    var sidebarToggleButton = document.getElementById("sidebar-toggle");
-    var sidebarResizeHandle = document.getElementById("sidebar-resize-handle");
-    var firstContact = null;
-
-    function showSidebar() {
-        html.classList.remove('sidebar-hidden')
-        html.classList.add('sidebar-visible');
-        Array.from(sidebarLinks).forEach(function (link) {
-            link.setAttribute('tabIndex', 0);
-        });
-        sidebarToggleButton.setAttribute('aria-expanded', true);
-        sidebar.setAttribute('aria-hidden', false);
-        try { localStorage.setItem('mdbook-sidebar', 'visible'); } catch (e) { }
-    }
-
-
-    var sidebarAnchorToggles = document.querySelectorAll('#sidebar a.toggle');
-
-    function toggleSection(ev) {
-        ev.currentTarget.parentElement.classList.toggle('expanded');
-    }
-
-    Array.from(sidebarAnchorToggles).forEach(function (el) {
-        el.addEventListener('click', toggleSection);
-    });
-
-    function hideSidebar() {
-        html.classList.remove('sidebar-visible')
-        html.classList.add('sidebar-hidden');
-        Array.from(sidebarLinks).forEach(function (link) {
-            link.setAttribute('tabIndex', -1);
-        });
-        sidebarToggleButton.setAttribute('aria-expanded', false);
-        sidebar.setAttribute('aria-hidden', true);
-        try { localStorage.setItem('mdbook-sidebar', 'hidden'); } catch (e) { }
-    }
-
-    // Toggle sidebar
-    sidebarToggleButton.addEventListener('click', function sidebarToggle() {
-        if (html.classList.contains("sidebar-hidden")) {
-            var current_width = parseInt(
-                document.documentElement.style.getPropertyValue('--sidebar-width'), 10);
-            if (current_width < 150) {
-                document.documentElement.style.setProperty('--sidebar-width', '150px');
-            }
-            showSidebar();
-        } else if (html.classList.contains("sidebar-visible")) {
-            hideSidebar();
-        } else {
-            if (getComputedStyle(sidebar)['transform'] === 'none') {
-                hideSidebar();
-            } else {
-                showSidebar();
-            }
-        }
-    });
-
-    sidebarResizeHandle.addEventListener('mousedown', initResize, false);
-
-    function initResize(e) {
-        window.addEventListener('mousemove', resize, false);
-        window.addEventListener('mouseup', stopResize, false);
-        html.classList.add('sidebar-resizing');
-    }
-    function resize(e) {
-        var pos = (e.clientX - sidebar.offsetLeft);
-        if (pos < 20) {
-            hideSidebar();
-        } else {
-            if (html.classList.contains("sidebar-hidden")) {
-                showSidebar();
-            }
-            pos = Math.min(pos, window.innerWidth - 100);
-            document.documentElement.style.setProperty('--sidebar-width', pos + 'px');
-        }
-    }
-    //on mouseup remove windows functions mousemove & mouseup
-    function stopResize(e) {
-        html.classList.remove('sidebar-resizing');
-        window.removeEventListener('mousemove', resize, false);
-        window.removeEventListener('mouseup', stopResize, false);
-    }
-
-    document.addEventListener('touchstart', function (e) {
-        firstContact = {
-            x: e.touches[0].clientX,
-            time: Date.now()
-        };
-    }, { passive: true });
-
-    document.addEventListener('touchmove', function (e) {
-        if (!firstContact)
-            return;
-
-        var curX = e.touches[0].clientX;
-        var xDiff = curX - firstContact.x,
-            tDiff = Date.now() - firstContact.time;
-
-        if (tDiff < 250 && Math.abs(xDiff) >= 150) {
-            if (xDiff >= 0 && firstContact.x < Math.min(document.body.clientWidth * 0.25, 300))
-                showSidebar();
-            else if (xDiff < 0 && curX < 300)
-                hideSidebar();
-
-            firstContact = null;
-        }
-    }, { passive: true });
-
-    // Scroll sidebar to current active section
-    var activeSection = document.getElementById("sidebar").querySelector(".active");
-    if (activeSection) {
-        // https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView
-        activeSection.scrollIntoView({ block: 'center' });
-    }
-})();
-
-(function chapterNavigation() {
-    document.addEventListener('keydown', function (e) {
-        if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
-        if (window.search && window.search.hasFocus()) { return; }
-
-        switch (e.key) {
-            case 'ArrowRight':
-                e.preventDefault();
-                var nextButton = document.querySelector('.nav-chapters.next');
-                if (nextButton) {
-                    window.location.href = nextButton.href;
-                }
-                break;
-            case 'ArrowLeft':
-                e.preventDefault();
-                var previousButton = document.querySelector('.nav-chapters.previous');
-                if (previousButton) {
-                    window.location.href = previousButton.href;
-                }
-                break;
-        }
-    });
-})();
-
-(function clipboard() {
-    var clipButtons = document.querySelectorAll('.clip-button');
-
-    function hideTooltip(elem) {
-        elem.firstChild.innerText = "";
-        elem.className = 'fa fa-copy clip-button';
-    }
-
-    function showTooltip(elem, msg) {
-        elem.firstChild.innerText = msg;
-        elem.className = 'fa fa-copy tooltipped';
-    }
-
-    var clipboardSnippets = new ClipboardJS('.clip-button', {
-        text: function (trigger) {
-            hideTooltip(trigger);
-            let playground = trigger.closest("pre");
-            return playground_text(playground);
-        }
-    });
-
-    Array.from(clipButtons).forEach(function (clipButton) {
-        clipButton.addEventListener('mouseout', function (e) {
-            hideTooltip(e.currentTarget);
-        });
-    });
-
-    clipboardSnippets.on('success', function (e) {
-        e.clearSelection();
-        showTooltip(e.trigger, "Copied!");
-    });
-
-    clipboardSnippets.on('error', function (e) {
-        showTooltip(e.trigger, "Clipboard error!");
-    });
-})();
-
-(function scrollToTop () {
-    var menuTitle = document.querySelector('.menu-title');
-
-    menuTitle.addEventListener('click', function () {
-        document.scrollingElement.scrollTo({ top: 0, behavior: 'smooth' });
-    });
-})();
-
-(function controlMenu() {
-    var menu = document.getElementById('menu-bar');
-
-    (function controlPosition() {
-        var scrollTop = document.scrollingElement.scrollTop;
-        var prevScrollTop = scrollTop;
-        var minMenuY = -menu.clientHeight - 50;
-        // When the script loads, the page can be at any scroll (e.g. if you reforesh it).
-        menu.style.top = scrollTop + 'px';
-        // Same as parseInt(menu.style.top.slice(0, -2), but faster
-        var topCache = menu.style.top.slice(0, -2);
-        menu.classList.remove('sticky');
-        var stickyCache = false; // Same as menu.classList.contains('sticky'), but faster
-        document.addEventListener('scroll', function () {
-            scrollTop = Math.max(document.scrollingElement.scrollTop, 0);
-            // `null` means that it doesn't need to be updated
-            var nextSticky = null;
-            var nextTop = null;
-            var scrollDown = scrollTop > prevScrollTop;
-            var menuPosAbsoluteY = topCache - scrollTop;
-            if (scrollDown) {
-                nextSticky = false;
-                if (menuPosAbsoluteY > 0) {
-                    nextTop = prevScrollTop;
-                }
-            } else {
-                if (menuPosAbsoluteY > 0) {
-                    nextSticky = true;
-                } else if (menuPosAbsoluteY < minMenuY) {
-                    nextTop = prevScrollTop + minMenuY;
-                }
-            }
-            if (nextSticky === true && stickyCache === false) {
-                menu.classList.add('sticky');
-                stickyCache = true;
-            } else if (nextSticky === false && stickyCache === true) {
-                menu.classList.remove('sticky');
-                stickyCache = false;
-            }
-            if (nextTop !== null) {
-                menu.style.top = nextTop + 'px';
-                topCache = nextTop;
-            }
-            prevScrollTop = scrollTop;
-        }, { passive: true });
-    })();
-    (function controlBorder() {
-        menu.classList.remove('bordered');
-        document.addEventListener('scroll', function () {
-            if (menu.offsetTop === 0) {
-                menu.classList.remove('bordered');
-            } else {
-                menu.classList.add('bordered');
-            }
-        }, { passive: true });
-    })();
-})();
diff --git a/book/theme/css/chrome.css b/book/theme/css/chrome.css
deleted file mode 100644
index 4e0513178..000000000
--- a/book/theme/css/chrome.css
+++ /dev/null
@@ -1,499 +0,0 @@
-/* CSS for UI elements (a.k.a. chrome) */
-
-@import 'variables.css';
-
-::-webkit-scrollbar {
-    background: var(--bg);
-}
-::-webkit-scrollbar-thumb {
-    background: var(--scrollbar);
-}
-html {
-    scrollbar-color: var(--scrollbar) var(--bg);
-}
-#searchresults a,
-.content a:link,
-a:visited,
-a > .hljs {
-    color: var(--links);
-}
-.content a:hover {
-    text-decoration: underline;
-}
-
-/* Menu Bar */
-
-#menu-bar,
-#menu-bar-hover-placeholder {
-    z-index: 101;
-    margin: auto calc(0px - var(--page-padding));
-}
-#menu-bar {
-    position: relative;
-    display: flex;
-    flex-wrap: wrap;
-    background-color: var(--bg);
-    border-bottom-color: var(--bg);
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-}
-#menu-bar.sticky,
-.js #menu-bar-hover-placeholder:hover + #menu-bar,
-.js #menu-bar:hover,
-.js.sidebar-visible #menu-bar {
-    position: -webkit-sticky;
-    position: sticky;
-    top: 0 !important;
-}
-#menu-bar-hover-placeholder {
-    position: sticky;
-    position: -webkit-sticky;
-    top: 0;
-    height: var(--menu-bar-height);
-}
-#menu-bar.bordered {
-    border-bottom-color: var(--table-border-color);
-}
-#menu-bar i, #menu-bar .icon-button {
-    position: relative;
-    padding: 0 8px;
-    z-index: 10;
-    line-height: var(--menu-bar-height);
-    cursor: pointer;
-    transition: color 0.5s;
-}
-@media only screen and (max-width: 420px) {
-    #menu-bar i, #menu-bar .icon-button {
-        padding: 0 5px;
-    }
-}
-
-.icon-button {
-    border: none;
-    background: none;
-    padding: 0;
-    color: inherit;
-}
-.icon-button i {
-    margin: 0;
-}
-
-.right-buttons {
-    margin: 0 15px;
-}
-.right-buttons a {
-    text-decoration: none;
-}
-
-.left-buttons {
-    display: flex;
-    margin: 0 5px;
-}
-.no-js .left-buttons {
-    display: none;
-}
-
-.menu-title {
-    display: inline-block;
-    font-weight: 200;
-    font-size: 2.4rem;
-    line-height: var(--menu-bar-height);
-    text-align: center;
-    margin: 0;
-    flex: 1;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.js .menu-title {
-    cursor: pointer;
-}
-
-.menu-bar,
-.menu-bar:visited,
-.nav-chapters,
-.nav-chapters:visited,
-.mobile-nav-chapters,
-.mobile-nav-chapters:visited,
-.menu-bar .icon-button,
-.menu-bar a i {
-    color: var(--icons);
-}
-
-.menu-bar i:hover,
-.menu-bar .icon-button:hover,
-.nav-chapters:hover,
-.mobile-nav-chapters i:hover {
-    color: var(--icons-hover);
-}
-
-/* Nav Icons */
-
-.nav-chapters {
-    font-size: 2.5em;
-    text-align: center;
-    text-decoration: none;
-
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    margin: 0;
-    max-width: 150px;
-    min-width: 90px;
-
-    display: flex;
-    justify-content: center;
-    align-content: center;
-    flex-direction: column;
-
-    transition: color 0.5s, background-color 0.5s;
-}
-
-.nav-chapters:hover {
-    text-decoration: none;
-    background-color: var(--theme-hover);
-    transition: background-color 0.15s, color 0.15s;
-}
-
-.nav-wrapper {
-    margin-top: 50px;
-    display: none;
-}
-
-.mobile-nav-chapters {
-    font-size: 2.5em;
-    text-align: center;
-    text-decoration: none;
-    width: 90px;
-    border-radius: 5px;
-    background-color: var(--sidebar-bg);
-}
-
-.previous {
-    float: left;
-}
-
-.next {
-    float: right;
-    right: var(--page-padding);
-}
-
-@media only screen and (max-width: 1080px) {
-    .nav-wide-wrapper { display: none; }
-    .nav-wrapper { display: block; }
-}
-
-@media only screen and (max-width: 1380px) {
-    .sidebar-visible .nav-wide-wrapper { display: none; }
-    .sidebar-visible .nav-wrapper { display: block; }
-}
-
-/* Inline code */
-
-:not(pre) > .hljs {
-    display: inline;
-    padding: 0.1em 0.3em;
-    border-radius: 3px;
-}
-
-:not(pre):not(a):not(td):not(p) > .hljs {
-    color: var(--inline-code-color);
-    overflow-x: initial;
-}
-
-a:hover > .hljs {
-    text-decoration: underline;
-}
-
-pre {
-    position: relative;
-}
-pre > .buttons {
-    position: absolute;
-    z-index: 100;
-    right: 5px;
-    top: 5px;
-
-    color: var(--sidebar-fg);
-    cursor: pointer;
-}
-pre > .buttons :hover {
-    color: var(--sidebar-active);
-}
-pre > .buttons i {
-    margin-left: 8px;
-}
-pre > .buttons button {
-    color: inherit;
-    background: transparent;
-    border: none;
-    cursor: inherit;
-}
-pre > .result {
-    margin-top: 10px;
-}
-
-/* Search */
-
-#searchresults a {
-    text-decoration: none;
-}
-
-mark {
-    border-radius: 2px;
-    padding: 0 3px 1px 3px;
-    margin: 0 -3px -1px -3px;
-    background-color: var(--search-mark-bg);
-    transition: background-color 300ms linear;
-    cursor: pointer;
-}
-
-mark.fade-out {
-    background-color: rgba(0,0,0,0) !important;
-    cursor: auto;
-}
-
-.searchbar-outer {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: var(--content-max-width);
-}
-
-#searchbar {
-    width: 100%;
-    margin: 5px auto 0px auto;
-    padding: 10px 16px;
-    transition: box-shadow 300ms ease-in-out;
-    border: 1px solid var(--searchbar-border-color);
-    border-radius: 3px;
-    background-color: var(--searchbar-bg);
-    color: var(--searchbar-fg);
-}
-#searchbar:focus,
-#searchbar.active {
-    box-shadow: 0 0 3px var(--searchbar-shadow-color);
-}
-
-.searchresults-header {
-    font-weight: bold;
-    font-size: 1em;
-    padding: 18px 0 0 5px;
-    color: var(--searchresults-header-fg);
-}
-
-.searchresults-outer {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: var(--content-max-width);
-    border-bottom: 1px dashed var(--searchresults-border-color);
-}
-
-ul#searchresults {
-    list-style: none;
-    padding-left: 20px;
-}
-ul#searchresults li {
-    margin: 10px 0px;
-    padding: 2px;
-    border-radius: 2px;
-}
-ul#searchresults li.focus {
-    background-color: var(--searchresults-li-bg);
-}
-ul#searchresults span.teaser {
-    display: block;
-    clear: both;
-    margin: 5px 0 0 20px;
-    font-size: 0.8em;
-}
-ul#searchresults span.teaser em {
-    font-weight: bold;
-    font-style: normal;
-}
-
-/* Sidebar */
-
-.sidebar {
-    position: fixed;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    width: var(--sidebar-width);
-    font-size: 0.875em;
-    box-sizing: border-box;
-    -webkit-overflow-scrolling: touch;
-    overscroll-behavior-y: contain;
-    background-color: var(--sidebar-bg);
-    color: var(--sidebar-fg);
-}
-.sidebar-resizing {
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-.js:not(.sidebar-resizing) .sidebar {
-    transition: transform 0.3s; /* Animation: slide away */
-}
-.sidebar code {
-    line-height: 2em;
-}
-.sidebar .sidebar-scrollbox {
-    overflow-y: auto;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-.sidebar .sidebar-resize-handle {
-    position: absolute;
-    cursor: col-resize;
-    width: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-}
-.js .sidebar .sidebar-resize-handle {
-    cursor: col-resize;
-    width: 5px;
-}
-.sidebar-hidden .sidebar {
-    transform: translateX(calc(0px - var(--sidebar-width)));
-}
-.sidebar::-webkit-scrollbar {
-    background: var(--sidebar-bg);
-}
-.sidebar::-webkit-scrollbar-thumb {
-    background: var(--scrollbar);
-}
-
-.sidebar-visible .page-wrapper {
-    transform: translateX(var(--sidebar-width));
-}
-@media only screen and (min-width: 620px) {
-    .sidebar-visible .page-wrapper {
-        transform: none;
-        margin-left: var(--sidebar-width);
-    }
-}
-
-.chapter {
-    list-style: none outside none;
-    padding-left: 0;
-    margin: .25rem 0;
-}
-
-.chapter ol {
-    width: 100%;
-}
-
-.chapter li {
-    display: flex;
-    color: var(--sidebar-non-existent);
-}
-.chapter li a {
-    display: block;
-    text-decoration: none;
-    color: var(--sidebar-fg);
-}
-
-.chapter li a:hover {
-    color: var(--sidebar-active);
-}
-
-.chapter li a.active {
-    color: var(--sidebar-active);
-}
-
-.chapter li > a.toggle {
-    cursor: pointer;
-    display: block;
-    margin-left: auto;
-    padding: 0 10px;
-    user-select: none;
-    opacity: 0.68;
-}
-
-.chapter li > a.toggle div {
-    transition: transform 0.5s;
-}
-
-/* collapse the section */
-.chapter li:not(.expanded) + li > ol {
-    display: none;
-}
-
-.chapter li.chapter-item {
-    padding: 1rem 1.5rem;
-}
-
-.chapter .section li.chapter-item {
-    padding: .5rem .5rem 0 .5rem;
-}
-
-.chapter li.expanded > a.toggle div {
-    transform: rotate(90deg);
-}
-
-.spacer {
-    width: 100%;
-    height: 3px;
-    margin: 5px 0px;
-}
-.chapter .spacer {
-    background-color: var(--sidebar-spacer);
-}
-
-@media (-moz-touch-enabled: 1), (pointer: coarse) {
-    .chapter li a { padding: 5px 0; }
-    .spacer { margin: 10px 0; }
-}
-
-.section {
-    list-style: none outside none;
-    padding-left: 2rem;
-    line-height: 1.9em;
-}
-
-/* Theme Menu Popup */
-
-.theme-popup {
-    position: absolute;
-    left: 10px;
-    top: var(--menu-bar-height);
-    z-index: 1000;
-    border-radius: 4px;
-    font-size: 0.7em;
-    color: var(--fg);
-    background: var(--theme-popup-bg);
-    border: 1px solid var(--theme-popup-border);
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    display: none;
-}
-.theme-popup .default {
-    color: var(--icons);
-}
-.theme-popup .theme {
-    width: 100%;
-    border: 0;
-    margin: 0;
-    padding: 2px 10px;
-    line-height: 25px;
-    white-space: nowrap;
-    text-align: left;
-    cursor: pointer;
-    color: inherit;
-    background: inherit;
-    font-size: inherit;
-}
-.theme-popup .theme:hover {
-    background-color: var(--theme-hover);
-}
-.theme-popup .theme:hover:first-child,
-.theme-popup .theme:hover:last-child {
-    border-top-left-radius: inherit;
-    border-top-right-radius: inherit;
-}
diff --git a/book/theme/css/general.css b/book/theme/css/general.css
deleted file mode 100644
index 9b280d08a..000000000
--- a/book/theme/css/general.css
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Base styles and content styles */
-
-@import 'variables.css';
-
-:root {
-    /* Browser default font-size is 16px, this way 1 rem = 10px */
-    font-size: 62.5%;
-}
-
-/* TODO: replace with self hosted fonts */
-
-html {
-    font-family: "Inter", sans-serif;
-    color: var(--fg);
-    background-color: var(--bg);
-    text-size-adjust: none;
-}
-
-/* @supports (font-variation-settings: normal) { */
-/*   html { font-family: 'Inter var', sans-serif; } */
-/* } */
-
-body {
-    margin: 0;
-    font-size: 1.6rem;
-    overflow-x: hidden;
-}
-
-code {
-    font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace !important;
-    font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */
-}
-
-/* Don't change font size in headers. */
-h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
-    font-size: unset;
-}
-
-.left { float: left; }
-.right { float: right; }
-.boring { opacity: 0.6; }
-.hide-boring .boring { display: none; }
-.hidden { display: none !important; }
-
-h2, h3 { margin-top: 2.5em; }
-h4, h5 { margin-top: 2em; }
-
-.header + .header h3,
-.header + .header h4,
-.header + .header h5 {
-    margin-top: 1em;
-}
-
-h1:target::before,
-h2:target::before,
-h3:target::before,
-h4:target::before,
-h5:target::before,
-h6:target::before {
-    display: inline-block;
-    content: "»";
-    margin-left: -30px;
-    width: 30px;
-}
-
-/* This is broken on Safari as of version 14, but is fixed
-   in Safari Technology Preview 117 which I think will be Safari 14.2.
-   https://bugs.webkit.org/show_bug.cgi?id=218076
-*/
-:target {
-    scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
-}
-
-.page {
-    outline: 0;
-    padding: 0 var(--page-padding);
-    margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
-}
-.page-wrapper {
-    box-sizing: border-box;
-}
-.js:not(.sidebar-resizing) .page-wrapper {
-    transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
-}
-
-.content {
-    overflow-y: auto;
-    padding: 0 15px;
-    padding-bottom: 50px;
-}
-.content main {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: var(--content-max-width);
-}
-
-
-/* 2 1.75 1.5 1.25 1 .875 */
-
-.content h1 { font-size: 2em }
-.content h2 { font-size: 1.75em }
-.content h3 { font-size: 1.5em }
-.content h4 { font-size: 1.25em }
-.content h5 { font-size: 1em }
-.content h6 { font-size: .875em }
-
-.content h1, .content h2, .content h3, .content h4 {
-    font-weight: 500;
-    margin-top: 1.275em;
-    margin-bottom: .875em;
-}
-.content p, .content ol, .content ul, .content table {
-    margin-top: 0;
-    margin-bottom: .875em;
-}
-
-.content ul li {
-margin-bottom: .25rem;
-}
-.content ul {
-    list-style-type: square;
-}
-.content ul ul, .content ol ul {
-    margin-bottom: .5rem;
-}
-.content li p {
-    margin-bottom: .5em;
-}
-
-.content p { line-height: 1.45em; }
-.content ol { line-height: 1.45em; }
-.content ul { line-height: 1.45em; }
-.content a { text-decoration: none; }
-.content a:hover { text-decoration: underline; }
-.content img { max-width: 100%; }
-.content .header:link,
-.content .header:visited {
-    color: var(--fg);
-    color: var(--heading-fg);
-}
-.content .header:link,
-.content .header:visited:hover {
-    text-decoration: none;
-}
-
-table {
-    margin: 0 auto;
-    border-collapse: collapse;
-    width: 100%;
-}
-table td {
-    padding: .75rem;
-    width: auto;
-}
-table thead {
-    background: var(--table-header-bg);
-}
-table thead td {
-    font-weight: 700;
-    border: none;
-}
-table thead th {
-    padding: .75rem;
-    text-align: left;
-    font-weight: 500;
-    line-height: 1.5;
-    width: auto;
-}
-table thead tr {
-    border-bottom: 2px var(--table-border-color) solid;
-}
-table tbody tr {
-    border-bottom: 1px var(--table-border-line) solid;
-}
-/* Alternate background colors for rows */
-table tbody tr:nth-child(2n) {
-    /* background: var(--table-alternate-bg); */
-}
-
-
-blockquote {
-    margin: 1.5rem 0;
-    padding: 1rem 1.5rem;
-    color: var(--fg);
-    opacity: .9;
-    background-color: var(--quote-bg);
-    border-left: 4px solid var(--quote-border);
-}
-blockquote *:last-child {
-  margin-bottom: 0;
-}
-
-
-:not(.footnote-definition) + .footnote-definition,
-.footnote-definition + :not(.footnote-definition) {
-    margin-top: 2em;
-}
-.footnote-definition {
-    font-size: 0.9em;
-    margin: 0.5em 0;
-}
-.footnote-definition p {
-    display: inline;
-}
-
-.tooltiptext {
-    position: absolute;
-    visibility: hidden;
-    color: #fff;
-    background-color: #333;
-    transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */
-    left: -8px; /* Half of the width of the icon */
-    top: -35px;
-    font-size: 0.8em;
-    text-align: center;
-    border-radius: 6px;
-    padding: 5px 8px;
-    margin: 5px;
-    z-index: 1000;
-}
-.tooltipped .tooltiptext {
-    visibility: visible;
-}
-
-.chapter li.part-title {
-    color: var(--sidebar-fg);
-    margin: 5px 0px;
-    font-weight: bold;
-}
-
-.result-no-output {
-    font-style: italic;
-}
diff --git a/book/theme/css/print.css b/book/theme/css/print.css
deleted file mode 100644
index 5e690f755..000000000
--- a/book/theme/css/print.css
+++ /dev/null
@@ -1,54 +0,0 @@
-
-#sidebar,
-#menu-bar,
-.nav-chapters,
-.mobile-nav-chapters {
-    display: none;
-}
-
-#page-wrapper.page-wrapper {
-    transform: none;
-    margin-left: 0px;
-    overflow-y: initial;
-}
-
-#content {
-    max-width: none;
-    margin: 0;
-    padding: 0;
-}
-
-.page {
-    overflow-y: initial;
-}
-
-code {
-    background-color: #666666;
-    border-radius: 5px;
-
-    /* Force background to be printed in Chrome */
-    -webkit-print-color-adjust: exact;
-}
-
-pre > .buttons {
-    z-index: 2;
-}
-
-a, a:visited, a:active, a:hover {
-    color: #4183c4;
-    text-decoration: none;
-}
-
-h1, h2, h3, h4, h5, h6 {
-    page-break-inside: avoid;
-    page-break-after: avoid;
-}
-
-pre, code {
-    page-break-inside: avoid;
-    white-space: pre-wrap;
-}
-
-.fa {
-    display: none !important;
-}
diff --git a/book/theme/css/variables.css b/book/theme/css/variables.css
deleted file mode 100644
index 5d0978cc3..000000000
--- a/book/theme/css/variables.css
+++ /dev/null
@@ -1,411 +0,0 @@
-
-/* Globals */
-
-:root {
-    --sidebar-width: 300px;
-    --page-padding: 15px;
-    --content-max-width: 750px;
-    --menu-bar-height: 50px;
-}
-
-/* Themes */
-
-.ayu {
-    --bg: hsl(210, 25%, 8%);
-    --fg: #c5c5c5;
-
-    --sidebar-bg: #14191f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existent: #5c6773;
-    --sidebar-active: #ffb454;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #0096cf;
-
-    --inline-code-color: #ffb454;
-
-    --theme-popup-bg: #14191f;
-    --theme-popup-border: #5c6773;
-    --theme-hover: #191f26;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --table-border-color: hsl(210, 25%, 13%);
-    --table-header-bg: hsl(210, 25%, 28%);
-    --table-alternate-bg: hsl(210, 25%, 11%);
-
-    --searchbar-border-color: #848484;
-    --searchbar-bg: #424242;
-    --searchbar-fg: #fff;
-    --searchbar-shadow-color: #d4c89f;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #252932;
-    --search-mark-bg: #e3b171;
-    --hljs-background: #191f26;
-    --hljs-color: #e6e1cf;
-    --hljs-quote: #5c6773;
-    --hljs-variable: #ff7733;
-    --hljs-type: #ffee99;
-    --hljs-title: #b8cc52;
-    --hljs-symbol: #ffb454;
-    --hljs-selector-tag: #ff7733;
-    --hljs-selector-tag: #36a3d9;
-    --hljs-selector-tag: #00568d;
-    --hljs-selector-tag: #91b362;
-    --hljs-selector-tag: #d96c75;
-}
-
-.coal {
-    --bg: hsl(200, 7%, 8%);
-    --fg: #98a3ad;
-
-    --sidebar-bg: #292c2f;
-    --sidebar-fg: #a1adb8;
-    --sidebar-non-existent: #505254;
-    --sidebar-active: #3473ad;
-    --sidebar-spacer: #393939;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #43484d;
-    --icons-hover: #b3c0cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #141617;
-    --theme-popup-border: #43484d;
-    --theme-hover: #1f2124;
-
-    --quote-bg: hsl(234, 21%, 18%);
-    --quote-border: hsl(234, 21%, 23%);
-
-    --table-border-color: hsl(200, 7%, 13%);
-    --table-header-bg: hsl(200, 7%, 28%);
-    --table-alternate-bg: hsl(200, 7%, 11%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #b7b7b7;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #98a3ad;
-    --searchresults-li-bg: #2b2b2f;
-    --search-mark-bg: #355c7d;
-    --hljs-background: #969896;
-    --hljs-color: #cc6666;
-    --hljs-quote: #de935f;
-    --hljs-variable: #f0c674;
-    --hljs-type: #b5bd68;
-    --hljs-title: #8abeb7;
-    --hljs-symbol: #81a2be;
-    --hljs-selector-tag: #b294bb;
-    --hljs-selector-tag: #1d1f21;
-    --hljs-selector-tag: #c5c8c6;
-    --hljs-selector-tag: #718c00;
-    --hljs-selector-tag: #c82829;
-}
-
-.light {
-    --bg: hsl(0, 0%, 100%);
-    --fg: hsl(0, 0%, 0%);
-
-    --sidebar-bg: #fafafa;
-    --sidebar-fg: hsl(0, 0%, 0%);
-    --sidebar-non-existent: #aaaaaa;
-    --sidebar-active: #1f1fff;
-    --sidebar-spacer: #f4f4f4;
-
-    --scrollbar: #8F8F8F;
-
-    --icons: #747474;
-    --icons-hover: #000000;
-
-    --links: #20609f;
-
-    --inline-code-color: #301900;
-
-    --theme-popup-bg: #fafafa;
-    --theme-popup-border: #cccccc;
-    --theme-hover: #e6e6e6;
-
-    --quote-bg: hsl(197, 37%, 96%);
-    --quote-border: hsl(197, 37%, 91%);
-
-    --table-border-color: hsl(0, 0%, 95%);
-    --table-header-bg: hsl(0, 0%, 80%);
-    --table-alternate-bg: hsl(0, 0%, 97%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #e4f2fe;
-    --search-mark-bg: #a2cff5;
-    --hljs-background: #f6f7f6;
-    --hljs-color: #000;
-    --hljs-quote: #575757;
-    --hljs-variable: #d70025;
-    --hljs-type: #b21e00;
-    --hljs-title: #0030f2;
-    --hljs-symbol: #008200;
-    --hljs-selector-tag: #9d00ec;
-}
-
-.navy {
-    --bg: hsl(226, 23%, 11%);
-    --fg: #bcbdd0;
-
-    --sidebar-bg: #282d3f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existent: #505274;
-    --sidebar-active: #2b79a2;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #161923;
-    --theme-popup-border: #737480;
-    --theme-hover: #282e40;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --table-border-color: hsl(226, 23%, 16%);
-    --table-header-bg: hsl(226, 23%, 31%);
-    --table-alternate-bg: hsl(226, 23%, 14%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #aeaec6;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #5f5f71;
-    --searchresults-border-color: #5c5c68;
-    --searchresults-li-bg: #242430;
-    --search-mark-bg: #a2cff5;
-
-    --hljs-background: #969896;
-    --hljs-color: #cc6666;
-    --hljs-quote: #de935f;
-    --hljs-variable: #f0c674;
-    --hljs-type: #b5bd68;
-    --hljs-title: #8abeb7;
-    --hljs-symbol: #81a2be;
-    --hljs-selector-tag: #b294bb;
-    --hljs-selector-tag: #1d1f21;
-    --hljs-selector-tag: #c5c8c6;
-    --hljs-selector-tag: #718c00;
-    --hljs-selector-tag: #c82829;
-}
-
-.rust {
-    --bg: hsl(60, 9%, 87%);
-    --fg: #262625;
-
-    --sidebar-bg: #3b2e2a;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existent: #505254;
-    --sidebar-active: #e69f67;
-    --sidebar-spacer: #45373a;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #262625;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #6e6b5e;
-
-    --theme-popup-bg: #e1e1db;
-    --theme-popup-border: #b38f6b;
-    --theme-hover: #99908a;
-
-    --quote-bg: hsl(60, 5%, 75%);
-    --quote-border: hsl(60, 5%, 70%);
-
-    --table-border-color: hsl(60, 9%, 82%);
-    --table-header-bg: #b3a497;
-    --table-alternate-bg: hsl(60, 9%, 84%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #dec2a2;
-    --search-mark-bg: #e69f67;
-    --hljs-background: #f6f7f6;
-    --hljs-color: #000;
-    --hljs-quote: #575757;
-    --hljs-variable: #d70025;
-    --hljs-type: #b21e00;
-    --hljs-title: #0030f2;
-    --hljs-symbol: #008200;
-    --hljs-selector-tag: #9d00ec;
-}
-
-@media (prefers-color-scheme: dark) {
-    .light.no-js {
-        --bg: hsl(200, 7%, 8%);
-        --fg: #98a3ad;
-
-        --sidebar-bg: #292c2f;
-        --sidebar-fg: #a1adb8;
-        --sidebar-non-existent: #505254;
-        --sidebar-active: #3473ad;
-        --sidebar-spacer: #393939;
-
-        --scrollbar: var(--sidebar-fg);
-
-        --icons: #43484d;
-        --icons-hover: #b3c0cc;
-
-        --links: #2b79a2;
-
-        --inline-code-color: #c5c8c6;
-
-        --theme-popup-bg: #141617;
-        --theme-popup-border: #43484d;
-        --theme-hover: #1f2124;
-
-        --quote-bg: hsl(234, 21%, 18%);
-        --quote-border: hsl(234, 21%, 23%);
-
-        --table-border-color: hsl(200, 7%, 13%);
-        --table-header-bg: hsl(200, 7%, 28%);
-        --table-alternate-bg: hsl(200, 7%, 11%);
-
-        --searchbar-border-color: #aaa;
-        --searchbar-bg: #b7b7b7;
-        --searchbar-fg: #000;
-        --searchbar-shadow-color: #aaa;
-        --searchresults-header-fg: #666;
-        --searchresults-border-color: #98a3ad;
-        --searchresults-li-bg: #2b2b2f;
-        --search-mark-bg: #355c7d;
-    }
-}
-
-.colibri {
-    --bg: #3b224c;
-    --fg: #bcbdd0;
-    --heading-fg: #fff;
-
-    --sidebar-bg: #281733;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existent: #505274;
-    --sidebar-active: #a4a0e8;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    /* --links: #a4a0e8; */
-    --links: #ECCDBA;
-
-    --inline-code-color: hsl(48.7, 7.8%, 70%);
-
-    --theme-popup-bg: #161923;
-    --theme-popup-border: #737480;
-    --theme-hover: rgba(0,0,0, .2);
-
-    --quote-bg: #281733;
-    --quote-border: hsl(226, 15%, 22%);
-
-    --table-border-color: hsl(226, 23%, 76%);
-    --table-header-bg: hsla(226, 23%, 31%, 0);
-    --table-alternate-bg: hsl(226, 23%, 14%);
-    --table-border-line: hsla(201deg, 20%, 92%, 0.2);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #aeaec6;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #5f5f71;
-    --searchresults-border-color: #5c5c68;
-    --searchresults-li-bg: #242430;
-    --search-mark-bg: #acff5;
-    --hljs-background: #2f1e2e;
-    --hljs-color: #a39e9b;
-    --hljs-quote: #8d8687;
-    --hljs-variable: #ef6155;
-    --hljs-type: #f99b15;
-    --hljs-title: #fec418;
-    --hljs-symbol: #48b685;
-    --hljs-selector-tag: #815ba4;
-}
-
-.colibri {
-/*
-    --bg: #ffffff;
-    --fg: #452859;
-    --fg: #5a5977;
-    --heading-fg: #281733;
-
-    --sidebar-bg: #281733;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existent: #505274;
-    --sidebar-active: #a4a0e8;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #6F44F0;
-
-    --inline-code-color: #a39e9b;
-
-    --theme-popup-bg: #161923;
-    --theme-popup-border: #737480;
-    --theme-hover: rgba(0,0,0, .2);
-
-    --quote-bg: rgba(0, 0, 0, 0);
-    --quote-border: hsl(226, 15%, 75%);
-
-    --table-border-color: #5a5977;
-    --table-border-color: hsl(201deg 10% 67%);
-    --table-header-bg: hsl(0, 0%, 100%);
-    --table-alternate-bg: hsl(0, 0%, 97%);
-    --table-border-line: hsl(201deg, 20%, 92%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #aeaec6;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #5f5f71;
-    --searchresults-border-color: #5c5c68;
-    --searchresults-li-bg: #242430;
-    --search-mark-bg: #a2cff5;
-    --hljs-background: #TODO;
-    --hljs-color: #TODO;
-    --hljs-quote: #TODO;
-    --hljs-variable: #TODO;
-    --hljs-type: #TODO;
-    --hljs-title: #TODO;
-    --hljs-symbol: #TODO;
-    --hljs-selector-tag: #TODO;
-*/
-}
diff --git a/book/theme/highlight.css b/book/theme/highlight.css
deleted file mode 100644
index a2db0500a..000000000
--- a/book/theme/highlight.css
+++ /dev/null
@@ -1,56 +0,0 @@
-pre code.hljs {
- display:block;
- overflow-x:auto;
- padding:1em
-}
-code.hljs {
- padding:3px 5px
-}
-.hljs {
- background: var(--hljs-background);
- color: var(--hljs-color);
-}
-.hljs-comment,
-.hljs-quote {
- color: var(--hljs-quote)
-}
-.hljs-link,
-.hljs-meta,
-.hljs-name,
-.hljs-regexp,
-.hljs-selector-class,
-.hljs-selector-id,
-.hljs-tag,
-.hljs-template-variable,
-.hljs-variable {
- color: var(--hljs-variable)
-}
-.hljs-built_in,
-.hljs-deletion,
-.hljs-literal,
-.hljs-number,
-.hljs-params,
-.hljs-type {
- color: var(--hljs-type)
-}
-.hljs-attribute,
-.hljs-section,
-.hljs-title {
- color: var(--hljs-title)
-}
-.hljs-addition,
-.hljs-bullet,
-.hljs-string,
-.hljs-symbol {
- color: var(--hljs-symbol)
-}
-.hljs-keyword,
-.hljs-selector-tag {
- color: var(--hljs-selector-tag)
-}
-.hljs-emphasis {
- font-style:italic
-}
-.hljs-strong {
- font-weight:700
-}
diff --git a/book/theme/highlight.js b/book/theme/highlight.js
deleted file mode 100644
index 180385b70..000000000
--- a/book/theme/highlight.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
-  Highlight.js 10.1.1 (93fd0d73)
-  License: BSD-3-Clause
-  Copyright (c) 2006-2020, Ivan Sagalaev
-*/
-var hljs=function(){"use strict";function e(n){Object.freeze(n);var t="function"==typeof n;return Object.getOwnPropertyNames(n).forEach((function(r){!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r])})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}ignoreMatch(){this.ignore=!0}}function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function d(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var g=l();if(s+=t(r.substring(i,g[0].offset)),i=g[0].offset,g===e){o.reverse().forEach(u);do{d(g.splice(0,1)[0]),g=l()}while(g===e&&g.length&&g[0].offset===i);o.reverse().forEach(c)}else"start"===g[0].event?o.push(g[0].node):o.pop(),d(g.splice(0,1)[0])}return s+t(r.substr(i))}});const s="</span>",o=e=>!!e.kind;class l{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!o(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){o(e)&&(this.buffer+=s)}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class c{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{c._collapse(e)}))}}class u extends c{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new l(this,this.options).value()}finalize(){return!0}}function d(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",h={begin:"\\\\[\\s\\S]",relevance:0},f={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[h]},p={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[h]},b={begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},m=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(b),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},v=m("//","$"),x=m("/\\*","\\*/"),E=m("#","$");var _=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>d(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:h,APOS_STRING_MODE:f,QUOTE_STRING_MODE:p,PHRASAL_WORDS_MODE:b,COMMENT:m,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:x,HASH_COMMENT_MODE:E,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[h,{begin:/\[/,end:/\]/,relevance:0,contains:[h]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),N="of and for in not or if then".split(" ");function w(e,n){return n?+n:function(e){return N.includes(e.toLowerCase())}(e)?0:1}const R=t,y=r,{nodeStream:k,mergeStreams:O}=i,M=Symbol("nomatch");return function(t){var a=[],i={},s={},o=[],l=!0,c=/(^(<[^>]+>|\t|)+|\n)/gm,g="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:u};function p(e){return f.noHighlightRe.test(e)}function b(e,n,t,r){var a={code:n,language:e};S("before:highlight",a);var i=a.result?a.result:m(a.language,a.code,t,r);return i.code=a.code,S("after:highlight",i),i}function m(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function u(){null!=y.subLanguage?function(){if(""!==A){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void O.addText(A);e=m(y.subLanguage,A,!0,k[y.subLanguage]),k[y.subLanguage]=e.top}else e=v(A,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(I+=e.relevance),O.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void O.addText(A);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(A),t="";for(;n;){t+=A.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;O.addText(t),t="",I+=a,O.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(A)}t+=A.substr(e),O.addText(t)}(),A=""}function h(e){return e.className&&O.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(A+=e[0],1):(L=!0,0)}var b={};function x(t,r){var i=r&&r[0];if(A+=t,null==i)return u(),0;if("begin"===b.type&&"end"===r.type&&b.index===r.index&&""===i){if(A+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=b.rule,n}return 1}if(b=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?A+=t:(r.excludeBegin&&(A+=t),u(),r.returnBegin||r.excludeBegin||(A=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return M;var i=y;i.skip?A+=t:(i.returnEnd||i.excludeEnd||(A+=t),u(),i.excludeEnd&&(A=t));do{y.className&&O.closeNode(),y.skip||y.subLanguage||(I+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==M)return s}if("illegal"===r.type&&""===i)return 1;if(B>1e5&&B>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return A+=i,i.length}var E=T(e);if(!E)throw console.error(g.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=d(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(+l[1]+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;const t=n.exec(e);return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&(this.regexIndex=0)),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,w(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=d(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),N="",y=s||_,k={},O=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>O.openNode(e))}();var A="",I=0,S=0,B=0,L=!1;try{for(y.matcher.considerAll();;){B++,L?L=!1:(y.matcher.lastIndex=S,y.matcher.considerAll());const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(S,e.index),e);S=e.index+n}return x(o.substr(S)),O.closeAllNodes(),O.finalize(),N=O.toHTML(),{relevance:I,value:N,language:e,illegal:!1,emitter:O,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(S-100,S+100),mode:n.mode},sofar:N,relevance:0,value:R(o),emitter:O};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:O,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(T).filter(I).forEach((function(n){var a=m(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(c,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function E(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=T(t[1]);return r||(console.warn(g.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||T(e))}(e);if(p(t))return;S("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"):n=e;const r=n.textContent,a=t?b(t,r,!0):v(r),i=k(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=O(i,k(e),r)}a.value=x(a.value),S("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const N=()=>{if(!N.called){N.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,E)}};function T(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function A(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function I(e){var n=T(e);return n&&!n.disableAutodetect}function S(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:b,highlightAuto:v,fixMarkup:x,highlightBlock:E,configure:function(e){f=y(f,e)},initHighlighting:N,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",N,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&A(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:T,registerAliases:A,requireLanguage:function(e){var n=T(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:I,inherit:y,addPlugin:function(e){o.push(e)}}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.1.1";for(const n in _)"object"==typeof _[n]&&e(_[n]);return Object.assign(t,_),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);hljs.registerLanguage("php",function(){"use strict";return function(e){var r={begin:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},t={className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:'b"',end:'"'},{begin:"b'",end:"'"},e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i={keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield",literal:"false null true",built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass"};return{aliases:["php","php3","php4","php5","php6","php7"],case_insensitive:!0,keywords:i,contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t]}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0,keywords:"__halt_compiler"}),{className:"string",begin:/<<<['"]?\w+['"]?$/,end:/^\w+;?$/,contains:[e.BACKSLASH_ESCAPE,{className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]}]},t,{className:"keyword",begin:/\$this\b/},r,{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:i,contains:["self",r,e.C_BLOCK_COMMENT_MODE,a,n]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";",contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},a,n]}}}());hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{$pattern:"[a-z/_]+",literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n]},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^",end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number",begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}],illegal:"[^\\s\\}]"}}}());hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i=e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},t=e.inherit(s,{illegal:/\n/}),l={className:"subst",begin:"{",end:"}",keywords:n},r=e.inherit(l,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,r]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]},g=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]});l.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],r.contains=[g,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var d={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},i]},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"],keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0,contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{begin:"\x3c!--|--\x3e"},{begin:"</?",end:">"}]}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},d,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta",begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{className:"meta-string",begin:/"/,end:/"/}]},{beginKeywords:"new return throw await else",relevance:0},{className:"function",begin:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{begin:e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[d,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}}());hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst",begin:/\\\(/,end:"\\)",keywords:i,contains:[]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/,end:/"/}]},r={className:"number",begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return t.contains=[r],{name:"Swift",keywords:i,contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},r,{className:"function",beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin:/</,end:/>/},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:i,contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}],illegal:/\[|%/},{className:"class",beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta",begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b"},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("makefile",function(){"use strict";return function(e){var i={className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},a={className:"variable",begin:/\$\([\w-]+\s/,end:/\)/,keywords:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},contains:[i]},r={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},s={className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{name:"Makefile",aliases:["mk","mak"],keywords:{$pattern:/[\w-]+/,keyword:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath"},contains:[e.HASH_COMMENT_MODE,i,n,a,r,{className:"meta",begin:/^\.PHONY:/,end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},s]}}}());hljs.registerLanguage("css",function(){"use strict";return function(e){var n={begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";",endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":",excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{begin:/[\w-]+\(/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/},{begin:/\(/,end:/\)/,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}]}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/,contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",illegal:/:/,returnBegin:!0,contains:[{className:"keyword",begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/,className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\\(",end:"\\)"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$\(\(/,end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());hljs.registerLanguage("c-like",function(){"use strict";return function(e){function t(e){return"(?:"+e+")?"}var n="(decltype\\(auto\\)|"+t("[a-zA-Z_]\\w*::")+"[a-zA-Z_]\\w*"+t("<.*?>")+")",r={className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},a={className:"string",variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",end:"'",illegal:"."},e.END_SAME_AS_BEGIN({begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},i={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(a,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},o={className:"title",begin:t("[a-zA-Z_]\\w*::")+e.IDENT_RE,relevance:0},c=t("[a-zA-Z_]\\w*::")+e.IDENT_RE+"\\s*\\(",l={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},d=[r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,a],_={variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],keywords:l,contains:d.concat([{begin:/\(/,end:/\)/,keywords:l,contains:d.concat(["self"]),relevance:0}]),relevance:0},u={className:"function",begin:"("+n+"[\\*&\\s]+)+"+c,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:l,illegal:/[^\w\s\*&:<>]/,contains:[{begin:"decltype\\(auto\\)",keywords:l,relevance:0},{begin:c,returnBegin:!0,contains:[o],relevance:0},{className:"params",begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:["self",e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r]}]},r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:l,disableAutodetect:!0,illegal:"</",contains:[].concat(_,u,d,[s,{begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",end:">",keywords:l,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:l},{className:"class",beginKeywords:"class struct",end:/[{;:]/,contains:[{begin:/</,end:/>/,contains:["self"]},e.TITLE_MODE]}]),exports:{preprocessor:s,strings:a,keywords:l}}}}());hljs.registerLanguage("coffeescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((e=>n=>!e.includes(n))(["var","const","let","function","static"])).join(" "),literal:n.concat(["yes","no","on","off"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},i="[A-Za-z$_][0-9A-Za-z$_]*",s={className:"subst",begin:/#\{/,end:/}/,keywords:t},o=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,s]},{begin:/"/,end:/"/,contains:[r.BACKSLASH_ESCAPE,s]}]},{className:"regexp",variants:[{begin:"///",end:"///",contains:[s,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)",relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+i},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{begin:"```",end:"```"},{begin:"`",end:"`"}]}];s.contains=o;var c=r.inherit(r.TITLE_MODE,{begin:i}),l={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:t,contains:["self"].concat(o)}]};return{name:"CoffeeScript",aliases:["coffee","cson","iced"],keywords:t,illegal:/\/\*/,contains:o.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{className:"function",begin:"^\\s*"+i+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[c,l]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[l]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[c]},c]},{begin:i+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(",end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());hljs.registerLanguage("d",function(){"use strict";return function(e){var a={$pattern:e.UNDERSCORE_IDENT_RE,keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={className:"number",begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",begin:"#(line)",end:"$",relevance:5},{className:"keyword",begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}}());hljs.registerLanguage("properties",function(){"use strict";return function(e){var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",s={end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+"+t,returnBegin:!0,contains:[{className:"attr",begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",endsParent:!0,relevance:0}],starts:s},{begin:a+t,returnBegin:!0,relevance:0,contains:[{className:"meta",begin:a,endsParent:!0,relevance:0}],starts:s},{className:"attr",relevance:0,begin:a+n+"$"}]}}}());hljs.registerLanguage("http",function(){"use strict";return function(e){var n="HTTP/[0-9\\.]+";return{name:"HTTP",aliases:["https"],illegal:"\\S",contains:[{begin:"^"+n,end:"$",contains:[{className:"number",begin:"\\b\\d{3}\\b"}]},{begin:"^[A-Z]+ (.*?) "+n+"$",returnBegin:!0,end:"$",contains:[{className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{begin:n},{className:"keyword",begin:"[A-Z]+"}]},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,illegal:"\\n|\\s|=",starts:{end:"$",relevance:0}},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}]}}}());hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",end:"\\)",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());hljs.registerLanguage("handlebars",function(){"use strict";function e(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}}());hljs.registerLanguage("rust",function(){"use strict";return function(e){var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?",keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:t},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),e.inherit(e.QUOTE_STRING_MODE,{begin:/b?"/,illegal:null}),{className:"string",variants:[{begin:/r(#*)"(.|\n)*?"\1(?!#)/},{begin:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{className:"symbol",begin:/'[a-zA-Z_][a-zA-Z0-9_]*/},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+n}],relevance:0},{className:"function",beginKeywords:"fn",end:"(\\(|<)",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"#\\!?\\[",end:"\\]",contains:[{className:"meta-string",begin:/"/,end:/"/}]},{className:"class",beginKeywords:"type",end:";",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"\\S"},{className:"class",beginKeywords:"trait enum struct union",end:"{",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"[\\w\\d]"},{begin:e.IDENT_RE+"::",keywords:{built_in:t}},{begin:"->"}]}}}());hljs.registerLanguage("cpp",function(){"use strict";return function(e){var t=e.getLanguage("c-like").rawDefinition();return t.disableAutodetect=!1,t.name="C++",t.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],t}}());hljs.registerLanguage("ini",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(...n){return n.map(n=>e(n)).join("")}return function(a){var s={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}]},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"],relevance:0},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map(n=>e(n)).join("|")+")";return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}());hljs.registerLanguage("objectivec",function(){"use strict";return function(e){var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,keyword:"@interface @class @protocol @implementation"};return{name:"Objective-C",aliases:["mm","objc","obj-c"],keywords:{$pattern:n,keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},illegal:"</",contains:[{className:"built_in",begin:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",variants:[{begin:'@"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]}]},{className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)",excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}());hljs.registerLanguage("apache",function(){"use strict";return function(e){var n={className:"number",begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"</?",end:">",contains:[n,{className:"number",begin:":\\d{1,5}"},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute",begin:/\w+/,relevance:0,keywords:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"},contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable",begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number",begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]}}],illegal:/\S/}}}());hljs.registerLanguage("java",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(e){return a("(",e,")?")}function a(...n){return n.map(n=>e(n)).join("")}function s(...n){return"("+n.map(n=>e(n)).join("|")+")"}return function(e){var t="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",i={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/\(/,end:/\)/,contains:["self"]}]},r=e=>a("[",e,"]+([",e,"_]*[",e,"]+)?"),c={className:"number",variants:[{begin:`\\b(0[bB]${r("01")})[lL]?`},{begin:`\\b(0${r("0-7")})[dDfFlL]?`},{begin:a(/\b0[xX]/,s(a(r("a-fA-F0-9"),/\./,r("a-fA-F0-9")),a(r("a-fA-F0-9"),/\.?/),a(/\./,r("a-fA-F0-9"))),/([pP][+-]?(\d+))?/,/[fFdDlL]?/)},{begin:a(/\b/,s(a(/\d*\./,r("\\d")),r("\\d")),/[eE][+-]?[\d]+[dDfF]?/)},{begin:a(/\b/,r(/\d/),n(/\.?/),n(r(/\d/)),/[dDfFlL]?/)}],relevance:0};return{name:"Java",aliases:["jsp"],keywords:t,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"function",begin:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:t,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:t,relevance:0,contains:[i,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},c,i]}}}());hljs.registerLanguage("x86asm",function(){"use strict";return function(s){return{name:"Intel x86 Assembly",case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},contains:[s.COMMENT(";","$",{relevance:0}),{className:"number",variants:[{begin:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{begin:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{begin:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{begin:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QUOTE_STRING_MODE,{className:"string",variants:[{begin:"'",end:"[^\\\\]'"},{begin:"`",end:"[^\\\\]`"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{begin:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{className:"subst",begin:"%[0-9]+",relevance:0},{className:"subst",begin:"%!S+",relevance:0},{className:"meta",begin:/^\s*\.[\w_-]+/}]}}}());hljs.registerLanguage("kotlin",function(){"use strict";return function(e){var n={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string",variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'",illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta",begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,end:/\)/,contains:[e.inherit(t,{className:"meta-string"})]}]},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,contains:[]}]},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,c,{className:"keyword",begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$",returnBegin:!0,excludeEnd:!0,keywords:n,illegal:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/,endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class",beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0,illegal:"extends implements",contains:[{beginKeywords:"public protected internal private constructor"},e.UNDERSCORE_TITLE_MODE,{className:"type",begin:/</,end:/>/,excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/,excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env",end:"$",illegal:"\n"},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0}]}}}());hljs.registerLanguage("armasm",function(){"use strict";return function(s){const e={variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0}),s.COMMENT("[;@]","$",{relevance:0}),s.C_LINE_COMMENT_MODE,s.C_BLOCK_COMMENT_MODE]};return{name:"ARM Assembly",case_insensitive:!0,aliases:["arm"],keywords:{$pattern:"\\.?"+s.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},contains:[{className:"keyword",begin:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?(?=\\s)"},e,s.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"[#$=]?0x[0-9a-f]+"},{begin:"[#$=]?0b[01]+"},{begin:"[#$=]\\d+"},{begin:"\\b\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{begin:"[=#]\\w+"}],relevance:0}]}}}());hljs.registerLanguage("go",function(){"use strict";return function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{name:"Go",aliases:["golang"],keywords:n,illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",variants:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{begin:"`",end:"`"}]},{className:"number",variants:[{begin:e.C_NUMBER_RE+"[i]",relevance:1},e.C_NUMBER_MODE]},{begin:/:=/},{className:"function",beginKeywords:"func",end:"\\s*(\\{|$)",excludeEnd:!0,contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,illegal:/["']/}]}]}}}());hljs.registerLanguage("diff",function(){"use strict";return function(e){return{name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!",end:"$"}]}}}());hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());hljs.registerLanguage("scala",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:"\\${",end:"}"}]},a={className:"string",variants:[{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:'"""',end:'"""',relevance:10},{begin:'[a-z]+"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n]},{className:"string",begin:'[a-z]+"""',end:'"""',contains:[n],relevance:10}]},s={className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},t={className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},i={className:"class",beginKeywords:"class object trait type",end:/[:={\[\n;]/,excludeEnd:!0,contains:[{beginKeywords:"extends with",relevance:10},{begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},t]},l={className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[t]};return{name:"Scala",keywords:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"symbol",begin:"'\\w[\\w\\d_]*(?!')"},s,l,i,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());hljs.registerLanguage("julia",function(){"use strict";return function(e){var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},a={keywords:t,illegal:/<\//},n={className:"subst",begin:/\$\(/,end:/\)/,keywords:t},o={className:"variable",begin:"\\$"+r},i={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],variants:[{begin:/\w*"""/,end:/"""\w*/,relevance:10},{begin:/\w*"/,end:/"\w*/}]},l={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],begin:"`",end:"`"},s={className:"meta",begin:"@"+r};return a.name="Julia",a.contains=[{className:"number",begin:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,s,{className:"comment",variants:[{begin:"#=",end:"=#",relevance:10},{begin:"#",end:"$"}]},e.HASH_COMMENT_MODE,{className:"keyword",begin:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{begin:/<:/}],n.contains=a.contains,a}}());hljs.registerLanguage("php-template",function(){"use strict";return function(n){return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0})]}]}}}());hljs.registerLanguage("scss",function(){"use strict";return function(e){var t={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={className:"number",begin:"#[0-9A-Fa-f]+"};return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0,illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{className:"selector-tag",begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{className:"selector-pseudo",begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{className:"selector-pseudo",begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},t,{className:"attribute",begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",illegal:"[^\\s]"},{begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{begin:":",end:";",contains:[t,i,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0,keywords:"and or not only",contains:[{begin:"@[a-z-]+",className:"keyword"},t,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,i,e.CSS_NUMBER_MODE]}]}}}());hljs.registerLanguage("r",function(){"use strict";return function(e){var n="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{name:"R",contains:[e.HASH_COMMENT_MODE,{begin:n,keywords:{$pattern:n,keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{className:"number",begin:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{className:"number",begin:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{className:"number",begin:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{className:"number",begin:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{className:"number",begin:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{begin:"`",end:"`",relevance:0},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]}]}}}());hljs.registerLanguage("sql",function(){"use strict";return function(e){var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0,illegal:/[<>{}*]/,contains:[{beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/,keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:"`",end:"`"},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}());hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.getLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());hljs.registerLanguage("python-repl",function(){"use strict";return function(n){return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]}}}());hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());hljs.registerLanguage("javascript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);function s(e){return r("(?=",e,")")}function r(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(t){var i="[A-Za-z$_][0-9A-Za-z$_]*",c={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/},o={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.join(" "),literal:n.join(" "),built_in:a.join(" ")},l={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:t.C_NUMBER_RE+"n?"}],relevance:0},E={className:"subst",begin:"\\$\\{",end:"\\}",keywords:o,contains:[]},d={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},g={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"css"}},u={className:"string",begin:"`",end:"`",contains:[t.BACKSLASH_ESCAPE,E]};E.contains=[t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,l,t.REGEXP_MODE];var b=E.contains.concat([{begin:/\(/,end:/\)/,contains:["self"].concat(E.contains,[t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE])},t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE]),_={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:b};return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:o,contains:[t.SHEBANG({binary:"node",relevance:5}),{className:"meta",relevance:10,begin:/^\s*['"]use (strict|asm)['"]/},t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,t.C_LINE_COMMENT_MODE,t.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",end:"\\}",relevance:0},{className:"variable",begin:i+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]}),t.C_BLOCK_COMMENT_MODE,l,{begin:r(/[{,\n]\s*/,s(r(/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,i+"\\s*:"))),relevance:0,contains:[{className:"attr",begin:i+s("\\s*:"),relevance:0}]},{begin:"("+t.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[t.C_LINE_COMMENT_MODE,t.C_BLOCK_COMMENT_MODE,t.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+t.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:t.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:o,contains:b}]}]},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{begin:"<>",end:"</>"},{begin:c.begin,end:c.end}],subLanguage:"xml",contains:[{begin:c.begin,end:c.end,skip:!0,contains:["self"]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[t.inherit(t.TITLE_MODE,{begin:i}),_],illegal:/\[|%/},{begin:/\$[(.]/},t.METHOD_GUARD,{className:"class",beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends"},t.UNDERSCORE_TITLE_MODE]},{beginKeywords:"constructor",end:/\{/,excludeEnd:!0},{begin:"(get|set)\\s+(?="+i+"\\()",end:/{/,keywords:"get set",contains:[t.inherit(t.TITLE_MODE,{begin:i}),{begin:/\(\)/},_]}],illegal:/#(?!!)/}}}());hljs.registerLanguage("typescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "),literal:n.join(" "),built_in:a.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ")},s={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},i={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:r.C_NUMBER_RE+"n?"}],relevance:0},o={className:"subst",begin:"\\$\\{",end:"\\}",keywords:t,contains:[]},c={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"xml"}},l={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"css"}},E={className:"string",begin:"`",end:"`",contains:[r.BACKSLASH_ESCAPE,o]};o.contains=[r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,i,r.REGEXP_MODE];var d={begin:"\\(",end:/\)/,keywords:t,contains:["self",r.QUOTE_STRING_MODE,r.APOS_STRING_MODE,r.NUMBER_MODE]},u={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,s,d]};return{name:"TypeScript",aliases:["ts"],keywords:t,contains:[r.SHEBANG(),{className:"meta",begin:/^\s*['"]use strict['"]/},r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,i,{begin:"("+r.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,r.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+r.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:r.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:d.contains}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/[\{;]/,excludeEnd:!0,keywords:t,contains:["self",r.inherit(r.TITLE_MODE,{begin:"[A-Za-z$_][0-9A-Za-z$_]*"}),u],illegal:/%/,relevance:0},{beginKeywords:"constructor",end:/[\{;]/,excludeEnd:!0,contains:["self",u]},{begin:/module\./,keywords:{built_in:"module"},relevance:0},{beginKeywords:"module",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",end:/\{/,excludeEnd:!0,keywords:"interface extends"},{begin:/\$[(.]/},{begin:"\\."+r.IDENT_RE,relevance:0},s,d]}}}());hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());hljs.registerLanguage("less",function(){"use strict";return function(e){var n="([\\w-]+|@{[\\w-]+})",a=[],s=[],t=function(e){return{className:"string",begin:"~?"+e+".*?"+e}},r=function(e,n,a){return{className:e,begin:n,relevance:a}},i={begin:"\\(",end:"\\)",contains:s,relevance:0};s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t("'"),t('"'),e.CSS_NUMBER_MODE,{begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",excludeEnd:!0}},r("number","#[0-9A-Fa-f]+\\b"),i,r("variable","@@?[\\w-]+",10),r("variable","@{[\\w-]+}"),r("built_in","~?`[^`]*?`"),{className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0},{className:"meta",begin:"!important"});var c=s.concat({begin:"{",end:"}",contains:a}),l={beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"}].concat(s)},o={begin:n+"\\s*:",returnBegin:!0,end:"[;}]",relevance:0,contains:[{className:"attribute",begin:n,end:":",excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s}}]},g={className:"keyword",begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{end:"[;{}]",returnEnd:!0,contains:s,relevance:0}},d={className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:c}},b={variants:[{begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:n,end:"{"}],returnBegin:!0,returnEnd:!0,illegal:"[<='$\"]",relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,l,r("keyword","all\\b"),r("variable","@{[\\w-]+}"),r("selector-tag",n+"%?",0),r("selector-id","#"+n),r("selector-class","\\."+n,0),r("selector-tag","&",0),{className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"\\(",end:"\\)",contains:c},{begin:"!important"}]};return a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,d,o,b),{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:a}}}());hljs.registerLanguage("lua",function(){"use strict";return function(e){var t={begin:"\\[=*\\[",end:"\\]=*\\]",contains:["self"]},a=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[","\\]=*\\]",{contains:[t],relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},contains:a.concat([{className:"function",beginKeywords:"function",end:"\\)",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params",begin:"\\(",endsWithParent:!0,contains:a}].concat(a)},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\[=*\\[",end:"\\]=*\\]",contains:[t],relevance:5}])}}}());
diff --git a/book/theme/index.hbs b/book/theme/index.hbs
index 6e0cce0aa..ed27410f6 100644
--- a/book/theme/index.hbs
+++ b/book/theme/index.hbs
@@ -15,7 +15,6 @@
         <!-- Custom HTML head -->
         {{> head}}
 
-        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
         <meta name="description" content="{{ description }}">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="theme-color" content="#ffffff" />
@@ -53,18 +52,19 @@
 
         {{#if mathjax_support}}
         <!-- MathJax -->
-        <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
         {{/if}}
     </head>
     <body>
+    <div id="body-container">
         <!-- Provide site root to javascript -->
-        <script type="text/javascript">
+        <script>
             var path_to_root = "{{ path_to_root }}";
             var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
         </script>
 
         <!-- Work around some values being stored in localStorage wrapped in quotes -->
-        <script type="text/javascript">
+        <script>
             try {
                 var theme = localStorage.getItem('mdbook-theme');
                 var sidebar = localStorage.getItem('mdbook-sidebar');
@@ -80,7 +80,7 @@
         </script>
 
         <!-- Set the theme before any content is loaded, prevents flash -->
-        <script type="text/javascript">
+        <script>
             var theme;
             try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
             if (theme === null || theme === undefined) { theme = default_theme; }
@@ -92,12 +92,14 @@
         </script>
 
         <!-- Hide / unhide sidebar before it is displayed -->
-        <script type="text/javascript">
+        <script>
             var html = document.querySelector('html');
-            var sidebar = 'hidden';
+            var sidebar = null;
             if (document.body.clientWidth >= 1080) {
                 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
                 sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
             }
             html.classList.remove('sidebar-visible');
             html.classList.add("sidebar-" + sidebar);
@@ -110,12 +112,34 @@
             <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
         </nav>
 
+        <!-- Track and set sidebar scroll position -->
+        <script>
+            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
+            sidebarScrollbox.addEventListener('click', function(e) {
+                if (e.target.tagName === 'A') {
+                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
+                }
+            }, { passive: true });
+            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
+            sessionStorage.removeItem('sidebar-scroll');
+            if (sidebarScrollTop) {
+                // preserve sidebar scroll position when navigating via links within sidebar
+                sidebarScrollbox.scrollTop = sidebarScrollTop;
+            } else {
+                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
+                var activeSection = document.querySelector('#sidebar .active');
+                if (activeSection) {
+                    activeSection.scrollIntoView({ block: 'center' });
+                }
+            }
+        </script>
+
         <div id="page-wrapper" class="page-wrapper">
 
             <div class="page">
                 {{> header}}
                 <div id="menu-bar-hover-placeholder"></div>
-                <div id="menu-bar" class="menu-bar sticky bordered">
+                <div id="menu-bar" class="menu-bar sticky">
                     <div class="left-buttons">
                         <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
                             <i class="fa fa-bars"></i>
@@ -124,12 +148,12 @@
                             <i class="fa fa-paint-brush"></i>
                         </button>
                         <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                            <li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="rust">{{ theme_option "Rust" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="coal">{{ theme_option "Coal" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="navy">{{ theme_option "Navy" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="ayu">{{ theme_option "Ayu" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="colibri">{{ theme_option "Colibri" }}</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="colibri">Colibri</button></li>
                         </ul>
                         {{#if search_enabled}}
                         <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
@@ -151,13 +175,19 @@
                             <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
                         </a>
                         {{/if}}
+                        {{#if git_repository_edit_url}}
+                        <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
+                            <i id="git-edit-button" class="fa fa-edit"></i>
+                        </a>
+                        {{/if}}
+
                     </div>
                 </div>
 
                 {{#if search_enabled}}
                 <div id="search-wrapper" class="hidden">
                     <form id="searchbar-outer" class="searchbar-outer">
-                        <input type="search" name="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
+                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
                     </form>
                     <div id="searchresults-outer" class="searchresults-outer hidden">
                         <div id="searchresults-header" class="searchresults-header"></div>
@@ -168,7 +198,7 @@
                 {{/if}}
 
                 <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
-                <script type="text/javascript">
+                <script>
                     document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
                     document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
                     Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
@@ -216,10 +246,12 @@
 
         </div>
 
-        {{#if livereload}}
+        {{#if live_reload_endpoint}}
         <!-- Livereload script (if served using the cli tool) -->
-        <script type="text/javascript">
-            var socket = new WebSocket("{{{livereload}}}");
+        <script>
+            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
+            const socket = new WebSocket(wsAddress);
             socket.onmessage = function (event) {
                 if (event.data === "reload") {
                     socket.close();
@@ -235,7 +267,7 @@
 
         {{#if google_analytics}}
         <!-- Google Analytics Tag -->
-        <script type="text/javascript">
+        <script>
             var localAddrs = ["localhost", "127.0.0.1", ""];
 
             // make sure we don't activate google analytics if the developer is
@@ -253,43 +285,43 @@
         {{/if}}
 
         {{#if playground_line_numbers}}
-        <script type="text/javascript">
+        <script>
             window.playground_line_numbers = true;
         </script>
         {{/if}}
 
         {{#if playground_copyable}}
-        <script type="text/javascript">
+        <script>
             window.playground_copyable = true;
         </script>
         {{/if}}
 
         {{#if playground_js}}
-        <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ path_to_root }}ace.js"></script>
+        <script src="{{ path_to_root }}editor.js"></script>
+        <script src="{{ path_to_root }}mode-rust.js"></script>
+        <script src="{{ path_to_root }}theme-dawn.js"></script>
+        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
         {{/if}}
 
         {{#if search_js}}
-        <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+        <script src="{{ path_to_root }}mark.min.js"></script>
+        <script src="{{ path_to_root }}searcher.js"></script>
         {{/if}}
 
-        <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ path_to_root }}clipboard.min.js"></script>
+        <script src="{{ path_to_root }}highlight.js"></script>
+        <script src="{{ path_to_root }}book.js"></script>
 
         <!-- Custom JS scripts -->
         {{#each additional_js}}
-        <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>
+        <script src="{{ ../path_to_root }}{{this}}"></script>
         {{/each}}
 
         {{#if is_print}}
         {{#if mathjax_support}}
-        <script type="text/javascript">
+        <script>
         window.addEventListener('load', function() {
             MathJax.Hub.Register.StartupHook('End', function() {
                 window.setTimeout(window.print, 100);
@@ -297,7 +329,7 @@
         });
         </script>
         {{else}}
-        <script type="text/javascript">
+        <script>
         window.addEventListener('load', function() {
             window.setTimeout(window.print, 100);
         });
@@ -305,5 +337,6 @@
         {{/if}}
         {{/if}}
 
+    </div>
     </body>
 </html>

From c1488267e59a341ece2a8bb274e66127dca72088 Mon Sep 17 00:00:00 2001
From: Gabriel Hansson <gabrielhansson00@gmail.com>
Date: Sun, 9 Jul 2023 22:50:24 +0200
Subject: [PATCH 131/967] (Updated) Apply motion API refinements (#6078)

* _apply_motion generalization where possible

API encourages users to not forget setting `editor.last_motion` when
applying a motion. But also not setting `last_motion` without applying a
motion first.

* (rename) will_find_char -> find_char

method name makes it sound like it would be returning a boolean.

* use _apply_motion in find_char

Feature that falls out from this is that repetitions of t,T,f,F are
saved with the context extention/move and count. (Not defaulting to extend
by 1 count).

* Finalize apply_motion API

last_motion is now a private field and can only be set by calling
Editor.apply_motion(). Removing need (and possibility) of writing:

`motion(editor); editor.last_motion = motion`

Now it's just: `editor.apply_motion(motion)`

* editor.last_message: rm Box wrap around Arc

* Use pre-existing `Direction` rather than custom `SearchDirection`.

* `LastMotion` type alias for `Option<Arc<dyn Fn(&mut Editor)>>`

* Take motion rather than cloning it.

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

* last_motion as Option<Motion>.

* Use `Box` over `Arc` for `last_motion`.

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-term/src/commands.rs | 68 ++++++++++++++++----------------------
 helix-view/src/editor.rs   | 30 +++++++++--------
 2 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 10b336ce3..b90f418a6 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -34,7 +34,7 @@ use helix_core::{
 use helix_view::{
     clipboard::ClipboardType,
     document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
-    editor::{Action, CompleteAction, Motion},
+    editor::{Action, CompleteAction},
     info::Info,
     input::KeyEvent,
     keyboard::KeyCode,
@@ -1099,8 +1099,7 @@ where
             .transform(|range| move_fn(text, range, count, behavior));
         doc.set_selection(view.id, selection);
     };
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion)
 }
 
 fn goto_prev_paragraph(cx: &mut Context) {
@@ -1240,10 +1239,7 @@ fn extend_next_long_word_end(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_long_word_end)
 }
 
-fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
-where
-    F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
-{
+fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bool) {
     // TODO: count is reset to 1 before next key so we move it into the closure here.
     // Would be nice to carry over.
     let count = cx.count();
@@ -1275,11 +1271,18 @@ where
             } => ch,
             _ => return,
         };
+        let motion = move |editor: &mut Editor| {
+            match direction {
+                Direction::Forward => {
+                    find_char_impl(editor, &find_next_char_impl, inclusive, extend, ch, count)
+                }
+                Direction::Backward => {
+                    find_char_impl(editor, &find_prev_char_impl, inclusive, extend, ch, count)
+                }
+            };
+        };
 
-        find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
-        cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
-            find_char_impl(editor, &search_fn, inclusive, extend, ch, 1);
-        })));
+        cx.editor.apply_motion(motion);
     })
 }
 
@@ -1358,46 +1361,39 @@ fn find_prev_char_impl(
 }
 
 fn find_till_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, false, false)
+    find_char(cx, Direction::Forward, false, false);
 }
 
 fn find_next_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, true, false)
+    find_char(cx, Direction::Forward, true, false)
 }
 
 fn extend_till_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, false, true)
+    find_char(cx, Direction::Forward, false, true)
 }
 
 fn extend_next_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, true, true)
+    find_char(cx, Direction::Forward, true, true)
 }
 
 fn till_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, false, false)
+    find_char(cx, Direction::Backward, false, false)
 }
 
 fn find_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, true, false)
+    find_char(cx, Direction::Backward, true, false)
 }
 
 fn extend_till_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, false, true)
+    find_char(cx, Direction::Backward, false, true)
 }
 
 fn extend_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, true, true)
+    find_char(cx, Direction::Backward, true, true)
 }
 
 fn repeat_last_motion(cx: &mut Context) {
-    let count = cx.count();
-    let last_motion = cx.editor.last_motion.take();
-    if let Some(m) = &last_motion {
-        for _ in 0..count {
-            m.run(cx.editor);
-        }
-        cx.editor.last_motion = last_motion;
-    }
+    cx.editor.repeat_last_motion(cx.count())
 }
 
 fn replace(cx: &mut Context) {
@@ -3248,8 +3244,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
 
         doc.set_selection(view.id, selection)
     };
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion);
 }
 
 /// Returns the [Range] for a [Hunk] in the given text.
@@ -4584,8 +4579,7 @@ fn expand_selection(cx: &mut Context) {
             }
         }
     };
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion);
 }
 
 fn shrink_selection(cx: &mut Context) {
@@ -4609,8 +4603,7 @@ fn shrink_selection(cx: &mut Context) {
             doc.set_selection(view.id, selection);
         }
     };
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion);
 }
 
 fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4628,8 +4621,7 @@ where
             doc.set_selection(view.id, selection);
         }
     };
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion);
 }
 
 fn select_next_sibling(cx: &mut Context) {
@@ -4912,8 +4904,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
             editor.set_status("Syntax-tree is not available in current buffer");
         }
     };
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion);
 }
 
 fn goto_next_function(cx: &mut Context) {
@@ -5034,8 +5025,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
                 });
                 doc.set_selection(view.id, selection);
             };
-            textobject(cx.editor);
-            cx.editor.last_motion = Some(Motion(Box::new(textobject)));
+            cx.editor.apply_motion(textobject);
         }
     });
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 630ea5cf9..affe87dd2 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -834,18 +834,6 @@ impl Default for SearchConfig {
     }
 }
 
-pub struct Motion(pub Box<dyn Fn(&mut Editor)>);
-impl Motion {
-    pub fn run(&self, e: &mut Editor) {
-        (self.0)(e)
-    }
-}
-impl std::fmt::Debug for Motion {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("motion")
-    }
-}
-
 #[derive(Debug, Clone, Default)]
 pub struct Breakpoint {
     pub id: Option<usize>,
@@ -910,8 +898,7 @@ pub struct Editor {
     pub auto_pairs: Option<AutoPairs>,
 
     pub idle_timer: Pin<Box<Sleep>>,
-    pub last_motion: Option<Motion>,
-
+    last_motion: Option<Motion>,
     pub last_completion: Option<CompleteAction>,
 
     pub exit_code: i32,
@@ -945,6 +932,8 @@ pub struct Editor {
     pub completion_request_handle: Option<oneshot::Sender<()>>,
 }
 
+pub type Motion = Box<dyn Fn(&mut Editor)>;
+
 pub type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
 
 #[derive(Debug)]
@@ -1051,6 +1040,19 @@ impl Editor {
         }
     }
 
+    pub fn apply_motion<F: Fn(&mut Self) + 'static>(&mut self, motion: F) {
+        motion(self);
+        self.last_motion = Some(Box::new(motion));
+    }
+
+    pub fn repeat_last_motion(&mut self, count: usize) {
+        if let Some(motion) = self.last_motion.take() {
+            for _ in 0..count {
+                motion(self);
+            }
+            self.last_motion = Some(motion);
+        }
+    }
     /// Current editing mode for the [`Editor`].
     pub fn mode(&self) -> Mode {
         self.mode

From f68956a3069a09057415e984b070caab137e9317 Mon Sep 17 00:00:00 2001
From: Queyrouzec <Queyrouzec@gmail.com>
Date: Sun, 9 Jul 2023 21:29:20 -0500
Subject: [PATCH 132/967] Update dart commit in languages.toml (#7576)

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

diff --git a/languages.toml b/languages.toml
index e8f6a7a6b..c06c20567 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1233,7 +1233,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "dart"
-source = { git = "https://github.com/UserNobody14/tree-sitter-dart", rev = "2d7f66651c9319c1a0e4dda226cc2628fbb66528" }
+source = { git = "https://github.com/UserNobody14/tree-sitter-dart", rev = "e398400a0b785af3cf571f5a57eccab242f0cdf9" }
 
 [[language]]
 name = "scala"

From 66a0b64853395b89da6e91ba09fbc46ff469a47c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:25:09 +0900
Subject: [PATCH 133/967] build(deps): bump thiserror from 1.0.40 to 1.0.43
 (#7593)

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 6bc11b245..a6f9c3c91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2180,18 +2180,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
 dependencies = [
  "proc-macro2",
  "quote",

From 62b2b6360dc366392a51735139413e036757104d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:25:18 +0900
Subject: [PATCH 134/967] build(deps): bump toml from 0.7.5 to 0.7.6 (#7594)

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 a6f9c3c91..d01970d38 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2305,9 +2305,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2326,9 +2326,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.11"
+version = "0.19.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
+checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
 dependencies = [
  "indexmap",
  "serde",

From 57babd94566b99ab1e4bc89646bd41d272f8fa21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:25:32 +0900
Subject: [PATCH 135/967] build(deps): bump serde from 1.0.166 to 1.0.171
 (#7595)

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

diff --git a/Cargo.lock b/Cargo.lock
index d01970d38..80c5cd8bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -305,7 +305,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -322,7 +322,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -1947,22 +1947,22 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.166"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.166"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -1984,7 +1984,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -2126,9 +2126,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.23"
+version = "2.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
+checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2195,7 +2195,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -2289,7 +2289,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]

From 1790097d59cc131fe774998caa1e63e302426e90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:25:44 +0900
Subject: [PATCH 136/967] build(deps): bump regex from 1.8.4 to 1.9.1 (#7596)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80c5cd8bd..09ee37a8b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,7 +132,7 @@ checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
 dependencies = [
  "memchr",
  "once_cell",
- "regex-automata",
+ "regex-automata 0.1.10",
  "serde",
 ]
 
@@ -1861,13 +1861,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
  "aho-corasick 1.0.1",
  "memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.3.2",
+ "regex-syntax 0.7.3",
 ]
 
 [[package]]
@@ -1876,6 +1877,17 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
+[[package]]
+name = "regex-automata"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
+dependencies = [
+ "aho-corasick 1.0.1",
+ "memchr",
+ "regex-syntax 0.7.3",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@@ -1884,9 +1896,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
 
 [[package]]
 name = "ropey"

From ac57e93583dfb3383389e03e74797ea7154ef545 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:26:00 +0900
Subject: [PATCH 137/967] build(deps): bump smallvec from 1.10.0 to 1.11.0
 (#7597)

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

diff --git a/Cargo.lock b/Cargo.lock
index 09ee37a8b..8317b0d4c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2076,9 +2076,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "smartstring"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index c16afea47..42b2edcfc 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -18,7 +18,7 @@ integration = []
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
-smallvec = "1.10"
+smallvec = "1.11"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"
 unicode-width = "0.1"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index e5ba64446..e3f561d34 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -74,6 +74,6 @@ libc = "0.2.147"
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 [dev-dependencies]
-smallvec = "1.10"
+smallvec = "1.11"
 indoc = "2.0.2"
 tempfile = "3.6.0"

From 541d2b76d6e5d4518e1a9d903a39738a5c08b228 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:27:13 +0900
Subject: [PATCH 138/967] build(deps): bump serde_json from 1.0.99 to 1.0.100
 (#7598)

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 8317b0d4c..1a18a4ddc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1979,9 +1979,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
+checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
 dependencies = [
  "itoa",
  "ryu",

From 1adb19464f002926e1042027b41acef4c81585f6 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 11 Jul 2023 14:26:11 +0200
Subject: [PATCH 139/967] search buffer contents during global search (#5652)

---
 helix-core/src/lib.rs         |  2 ++
 helix-core/src/rope_reader.rs | 37 +++++++++++++++++++++++++
 helix-term/src/commands.rs    | 51 ++++++++++++++++++++++++++---------
 3 files changed, 77 insertions(+), 13 deletions(-)
 create mode 100644 helix-core/src/rope_reader.rs

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 03fbdedfa..e1b5a1a12 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -41,7 +41,9 @@ pub use helix_loader::find_workspace;
 pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
     line.chars().position(|ch| !ch.is_whitespace())
 }
+mod rope_reader;
 
+pub use rope_reader::RopeReader;
 pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
 
 // pub use tendril::StrTendril as Tendril;
diff --git a/helix-core/src/rope_reader.rs b/helix-core/src/rope_reader.rs
new file mode 100644
index 000000000..20ed7bac1
--- /dev/null
+++ b/helix-core/src/rope_reader.rs
@@ -0,0 +1,37 @@
+use std::io;
+
+use ropey::iter::Chunks;
+use ropey::RopeSlice;
+
+pub struct RopeReader<'a> {
+    current_chunk: &'a [u8],
+    chunks: Chunks<'a>,
+}
+
+impl<'a> RopeReader<'a> {
+    pub fn new(rope: RopeSlice<'a>) -> RopeReader<'a> {
+        RopeReader {
+            current_chunk: &[],
+            chunks: rope.chunks(),
+        }
+    }
+}
+
+impl io::Read for RopeReader<'_> {
+    fn read(&mut self, mut buf: &mut [u8]) -> io::Result<usize> {
+        let buf_len = buf.len();
+        loop {
+            let read_bytes = self.current_chunk.read(buf)?;
+            buf = &mut buf[read_bytes..];
+            if buf.is_empty() {
+                return Ok(buf_len);
+            }
+
+            if let Some(next_chunk) = self.chunks.next() {
+                self.current_chunk = next_chunk.as_bytes();
+            } else {
+                return Ok(buf_len - buf.len());
+            }
+        }
+    }
+}
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b90f418a6..ae715887e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -29,7 +29,7 @@ use helix_core::{
     tree_sitter::Node,
     unicode::width::UnicodeWidthChar,
     visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
-    RopeSlice, Selection, SmallVec, Tendril, Transaction,
+    RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
 };
 use helix_view::{
     clipboard::ClipboardType,
@@ -2062,11 +2062,16 @@ fn global_search(cx: &mut Context) {
                 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
                 .collect()
         },
-        move |_editor, regex, event| {
+        move |editor, regex, event| {
             if event != PromptEvent::Validate {
                 return;
             }
 
+            let documents: Vec<_> = editor
+                .documents()
+                .map(|doc| (doc.path(), doc.text()))
+                .collect();
+
             if let Ok(matcher) = RegexMatcherBuilder::new()
                 .case_smart(smart_case)
                 .build(regex.as_str())
@@ -2099,6 +2104,7 @@ fn global_search(cx: &mut Context) {
                         let mut searcher = searcher.clone();
                         let matcher = matcher.clone();
                         let all_matches_sx = all_matches_sx.clone();
+                        let documents = &documents;
                         Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
                             let entry = match entry {
                                 Ok(entry) => entry,
@@ -2111,17 +2117,36 @@ fn global_search(cx: &mut Context) {
                                 _ => return WalkState::Continue,
                             };
 
-                            let result = searcher.search_path(
-                                &matcher,
-                                entry.path(),
-                                sinks::UTF8(|line_num, _| {
-                                    all_matches_sx
-                                        .send(FileResult::new(entry.path(), line_num as usize - 1))
-                                        .unwrap();
-
-                                    Ok(true)
-                                }),
-                            );
+                            let sink = sinks::UTF8(|line_num, _| {
+                                all_matches_sx
+                                    .send(FileResult::new(entry.path(), line_num as usize - 1))
+                                    .unwrap();
+
+                                Ok(true)
+                            });
+                            let doc = documents.iter().find(|&(doc_path, _)| {
+                                doc_path.map_or(false, |doc_path| doc_path == entry.path())
+                            });
+
+                            let result = if let Some((_, doc)) = doc {
+                                // there is already a buffer for this file
+                                // search the buffer instead of the file because it's faster
+                                // and captures new edits without requireing a save
+                                if searcher.multi_line_with_matcher(&matcher) {
+                                    // in this case a continous buffer is required
+                                    // convert the rope to a string
+                                    let text = doc.to_string();
+                                    searcher.search_slice(&matcher, text.as_bytes(), sink)
+                                } else {
+                                    searcher.search_reader(
+                                        &matcher,
+                                        RopeReader::new(doc.slice(..)),
+                                        sink,
+                                    )
+                                }
+                            } else {
+                                searcher.search_path(&matcher, entry.path(), sink)
+                            };
 
                             if let Err(err) = result {
                                 log::error!(

From 8afc0282f28e73cf78d1bd7b11d78fd853ae2036 Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Tue, 11 Jul 2023 19:51:04 +0200
Subject: [PATCH 140/967] Fix crash when cwd is deleted (#7185)

---
 Cargo.lock                       |  1 +
 helix-core/src/path.rs           |  8 +++---
 helix-loader/Cargo.toml          |  1 +
 helix-loader/src/lib.rs          | 44 ++++++++++++++++++++++++++++++--
 helix-lsp/src/lib.rs             |  2 +-
 helix-term/src/application.rs    |  2 +-
 helix-term/src/commands.rs       | 23 ++++++++++++++---
 helix-term/src/commands/dap.rs   |  2 +-
 helix-term/src/commands/lsp.rs   |  2 +-
 helix-term/src/commands/typed.rs | 18 +++++++------
 helix-term/src/ui/mod.rs         |  2 +-
 11 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a18a4ddc..68d5727f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1260,6 +1260,7 @@ version = "0.6.0"
 dependencies = [
  "anyhow",
  "cc",
+ "dunce",
  "etcetera",
  "libloading",
  "log",
diff --git a/helix-core/src/path.rs b/helix-core/src/path.rs
index efa46c46e..85c602555 100644
--- a/helix-core/src/path.rs
+++ b/helix-core/src/path.rs
@@ -88,7 +88,7 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
 pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
     let path = expand_tilde(path);
     let path = if path.is_relative() {
-        std::env::current_dir().map(|current_dir| current_dir.join(path))?
+        helix_loader::current_working_dir().join(path)
     } else {
         path
     };
@@ -99,9 +99,7 @@ pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
 pub fn get_relative_path(path: &Path) -> PathBuf {
     let path = PathBuf::from(path);
     let path = if path.is_absolute() {
-        let cwdir = std::env::current_dir()
-            .map(|path| get_normalized_path(&path))
-            .expect("couldn't determine current directory");
+        let cwdir = get_normalized_path(&helix_loader::current_working_dir());
         get_normalized_path(&path)
             .strip_prefix(cwdir)
             .map(PathBuf::from)
@@ -142,7 +140,7 @@ pub fn get_relative_path(path: &Path) -> PathBuf {
 /// ```
 ///
 pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {
-    let cwd = std::env::current_dir().unwrap_or_default();
+    let cwd = helix_loader::current_working_dir();
     let path = path
         .as_ref()
         .strip_prefix(cwd)
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 3e7fc2e78..903d36c06 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -29,6 +29,7 @@ which = "4.4"
 cc = { version = "1" }
 threadpool = { version = "1.0" }
 tempfile = "3.6.0"
+dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 libloading = "0.8"
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index c51c9c7de..7ff4cada7 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -3,9 +3,12 @@ pub mod grammar;
 
 use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
 use std::path::{Path, PathBuf};
+use std::sync::RwLock;
 
 pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
 
+static CWD: RwLock<Option<PathBuf>> = RwLock::new(None);
+
 static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
     once_cell::sync::Lazy::new(prioritize_runtime_dirs);
 
@@ -13,6 +16,31 @@ static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCe
 
 static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
 
+// Get the current working directory.
+// This information is managed internally as the call to std::env::current_dir
+// might fail if the cwd has been deleted.
+pub fn current_working_dir() -> PathBuf {
+    if let Some(path) = &*CWD.read().unwrap() {
+        return path.clone();
+    }
+
+    let path = std::env::current_dir()
+        .and_then(dunce::canonicalize)
+        .expect("Couldn't determine current working directory");
+    let mut cwd = CWD.write().unwrap();
+    *cwd = Some(path.clone());
+
+    path
+}
+
+pub fn set_current_working_dir(path: PathBuf) -> std::io::Result<()> {
+    let path = dunce::canonicalize(path)?;
+    std::env::set_current_dir(path.clone())?;
+    let mut cwd = CWD.write().unwrap();
+    *cwd = Some(path);
+    Ok(())
+}
+
 pub fn initialize_config_file(specified_file: Option<PathBuf>) {
     let config_file = specified_file.unwrap_or_else(default_config_file);
     ensure_parent_dir(&config_file);
@@ -217,7 +245,7 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
 /// If no workspace was found returns (CWD, true).
 /// Otherwise (workspace, false) is returned
 pub fn find_workspace() -> (PathBuf, bool) {
-    let current_dir = std::env::current_dir().expect("unable to determine current directory");
+    let current_dir = current_working_dir();
     for ancestor in current_dir.ancestors() {
         if ancestor.join(".git").exists() || ancestor.join(".helix").exists() {
             return (ancestor.to_owned(), false);
@@ -243,9 +271,21 @@ fn ensure_parent_dir(path: &Path) {
 mod merge_toml_tests {
     use std::str;
 
-    use super::merge_toml_values;
+    use super::{current_working_dir, merge_toml_values, set_current_working_dir};
     use toml::Value;
 
+    #[test]
+    fn current_dir_is_set() {
+        let new_path = dunce::canonicalize(std::env::temp_dir()).unwrap();
+        let cwd = current_working_dir();
+        assert_ne!(cwd, new_path);
+
+        set_current_working_dir(new_path.clone()).expect("Couldn't set new path");
+
+        let cwd = current_working_dir();
+        assert_eq!(cwd, new_path);
+    }
+
     #[test]
     fn language_toml_map_merges() {
         const USER: &str = r#"
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 277a4c28b..95c61086e 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -931,7 +931,7 @@ pub fn find_lsp_workspace(
     let mut file = if file.is_absolute() {
         file.to_path_buf()
     } else {
-        let current_dir = std::env::current_dir().expect("unable to determine current directory");
+        let current_dir = helix_loader::current_working_dir();
         current_dir.join(file)
     };
     file = path::get_normalized_path(&file);
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 4c86a19f7..546a57a9b 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -163,7 +163,7 @@ impl Application {
         } else if !args.files.is_empty() {
             let first = &args.files[0].0; // we know it's not empty
             if first.is_dir() {
-                std::env::set_current_dir(first).context("set current dir")?;
+                helix_loader::set_current_working_dir(first.clone())?;
                 editor.new_file(Action::VerticalSplit);
                 let picker = ui::file_picker(".".into(), &config.load().editor);
                 compositor.push(Box::new(overlaid(picker)));
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ae715887e..47b1a1754 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2080,8 +2080,12 @@ fn global_search(cx: &mut Context) {
                     .binary_detection(BinaryDetection::quit(b'\x00'))
                     .build();
 
-                let search_root = std::env::current_dir()
-                    .expect("Global search error: Failed to get current dir");
+                let search_root = helix_loader::current_working_dir();
+                if !search_root.exists() {
+                    editor.set_error("Current working directory does not exist");
+                    return;
+                }
+
                 let dedup_symlinks = file_picker_config.deduplicate_links;
                 let absolute_root = search_root
                     .canonicalize()
@@ -2173,7 +2177,9 @@ fn global_search(cx: &mut Context) {
         let call: job::Callback = Callback::EditorCompositor(Box::new(
             move |editor: &mut Editor, compositor: &mut Compositor| {
                 if all_matches.is_empty() {
-                    editor.set_status("No matches found");
+                    if !editor.is_err() {
+                        editor.set_status("No matches found");
+                    }
                     return;
                 }
 
@@ -2518,6 +2524,10 @@ fn append_mode(cx: &mut Context) {
 
 fn file_picker(cx: &mut Context) {
     let root = find_workspace().0;
+    if !root.exists() {
+        cx.editor.set_error("Workspace directory does not exist");
+        return;
+    }
     let picker = ui::file_picker(root, &cx.editor.config());
     cx.push_layer(Box::new(overlaid(picker)));
 }
@@ -2539,7 +2549,12 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
     cx.push_layer(Box::new(overlaid(picker)));
 }
 fn file_picker_in_current_directory(cx: &mut Context) {
-    let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("./"));
+    let cwd = helix_loader::current_working_dir();
+    if !cwd.exists() {
+        cx.editor
+            .set_error("Current working directory does not exist");
+        return;
+    }
     let picker = ui::file_picker(cwd, &cx.editor.config());
     cx.push_layer(Box::new(overlaid(picker)));
 }
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index 70a5ec212..e26dc08dc 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -217,7 +217,7 @@ pub fn dap_start_impl(
         }
     }
 
-    args.insert("cwd", to_value(std::env::current_dir().unwrap())?);
+    args.insert("cwd", to_value(helix_loader::current_working_dir())?);
 
     let args = to_value(args).unwrap();
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 55153648a..145bddd0f 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1033,7 +1033,7 @@ fn goto_impl(
     locations: Vec<lsp::Location>,
     offset_encoding: OffsetEncoding,
 ) {
-    let cwdir = std::env::current_dir().unwrap_or_default();
+    let cwdir = helix_loader::current_working_dir();
 
     match locations.as_slice() {
         [location] => {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 94cc33f0d..dfc71dfdc 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1093,14 +1093,11 @@ fn change_current_directory(
             .as_ref(),
     );
 
-    if let Err(e) = std::env::set_current_dir(dir) {
-        bail!("Couldn't change the current working directory: {}", e);
-    }
+    helix_loader::set_current_working_dir(dir)?;
 
-    let cwd = std::env::current_dir().context("Couldn't get the new working directory")?;
     cx.editor.set_status(format!(
         "Current working directory is now {}",
-        cwd.display()
+        helix_loader::current_working_dir().display()
     ));
     Ok(())
 }
@@ -1114,9 +1111,14 @@ fn show_current_directory(
         return Ok(());
     }
 
-    let cwd = std::env::current_dir().context("Couldn't get the new working directory")?;
-    cx.editor
-        .set_status(format!("Current working directory is {}", cwd.display()));
+    let cwd = helix_loader::current_working_dir();
+    let message = format!("Current working directory is {}", cwd.display());
+
+    if cwd.exists() {
+        cx.editor.set_status(message);
+    } else {
+        cx.editor.set_error(format!("{} (deleted)", message));
+    }
     Ok(())
 }
 
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 155f24356..3359155d5 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -472,7 +472,7 @@ pub mod completers {
                 match path.parent() {
                     Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
                     // Path::new("h")'s parent is Some("")...
-                    _ => std::env::current_dir().expect("couldn't determine current directory"),
+                    _ => helix_loader::current_working_dir(),
                 }
             };
 

From 9893a1fbcc4bf4cd5c44c0bd8ff5ecbc2a908e31 Mon Sep 17 00:00:00 2001
From: Tudyx <56633664+Tudyx@users.noreply.github.com>
Date: Tue, 11 Jul 2023 21:01:48 +0200
Subject: [PATCH 141/967] Auto indent change if selection is linewise (#7316)

---
 helix-term/src/commands.rs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 47b1a1754..42ce57774 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2342,10 +2342,25 @@ enum Operation {
     Change,
 }
 
+fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
+    selection.ranges().iter().all(|range| {
+        let text = text.slice(..);
+        if range.slice(text).len_lines() < 2 {
+            return false;
+        }
+        // If the start of the selection is at the start of a line and the end at the end of a line.
+        let (start_line, end_line) = range.line_range(text);
+        let start = text.line_to_char(start_line);
+        let end = text.line_to_char((end_line + 1).min(text.len_lines()));
+        start == range.from() && end == range.to()
+    })
+}
+
 fn delete_selection_impl(cx: &mut Context, op: Operation) {
     let (view, doc) = current!(cx.editor);
 
     let selection = doc.selection(view.id);
+    let only_whole_lines = selection_is_linewise(selection, doc.text());
 
     if cx.register != Some('_') {
         // first yank the selection
@@ -2366,7 +2381,11 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
             exit_select_mode(cx);
         }
         Operation::Change => {
-            enter_insert_mode(cx);
+            if only_whole_lines {
+                open_above(cx);
+            } else {
+                enter_insert_mode(cx);
+            }
         }
     }
 }

From 9259c526062f7e80e7d43c6d2e5ae97e9cf0487a Mon Sep 17 00:00:00 2001
From: Jorge Santiago <jsantiago12tone@gmail.com>
Date: Wed, 12 Jul 2023 01:40:36 -0300
Subject: [PATCH 142/967] Add shebang for nushell files (#7606)

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

diff --git a/languages.toml b/languages.toml
index c06c20567..d09c303a5 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1668,6 +1668,7 @@ name = "nu"
 scope = "source.nu"
 injection-regex = "nu"
 file-types = ["nu"]
+shebangs = ["nu"]
 roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }

From a5f7190614342ddff3bbab8cc456c3c28d66d325 Mon Sep 17 00:00:00 2001
From: Arian Dehghani <ArianDehghani@protonmail.com>
Date: Tue, 11 Jul 2023 21:40:58 -0700
Subject: [PATCH 143/967] Register systemd files as ini (#7592)

---
 languages.toml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index d09c303a5..418250b46 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2234,7 +2234,26 @@ grammar = "bash"
 [[language]]
 name = "ini"
 scope = "source.ini"
-file-types = ["ini"]
+file-types = [
+  "ini",
+  # Systemd unit files
+  "service",
+  "automount",
+  "device",
+  "mount",
+  "path",
+  "service",
+  "slice",
+  "socket",
+  "swap",
+  "target",
+  "timer",
+  # Podman quadlets
+  "container",
+  "volume",
+  "kube",
+  "network"
+]
 injection-regex = "ini"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }

From e86bb64b63856d85808ff4d484413dc3398fdc9c Mon Sep 17 00:00:00 2001
From: Karim Mk <73954836+mkblast@users.noreply.github.com>
Date: Wed, 12 Jul 2023 20:18:47 +0100
Subject: [PATCH 144/967] Change dark_plus inlay-hints colors to more pleasant
 colors (#7611)

* Changing code_dark inlay-hints colors.

* Using dark_plus_experimental inlay hints is better ;)
---
 runtime/themes/dark_plus.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 9f4d8b87e..c94bd587f 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -89,7 +89,7 @@
 "ui.virtual.whitespace" = { fg = "dark_gray" }
 "ui.virtual.ruler" = { bg = "borders" }
 "ui.virtual.indent-guide" = { fg = "dark_gray4" }
-"ui.virtual.inlay-hint" = { fg = "white", bg = "#444444" }
+"ui.virtual.inlay-hint" = { fg = "dark_gray5"}
 
 "warning" = { fg = "gold2" }
 "error" = { fg = "red" }
@@ -114,6 +114,7 @@ dark_gray = "#858585"
 dark_gray2 = "#1e1e1e"
 dark_gray3 = "#282828"
 dark_gray4 = "#404040"
+dark_gray5 = "#8b949e"
 blue = "#007acc"
 blue2 = "#569CD6"
 blue3 = "#6796E6"

From 0e0501c510148e7bfa99778c4d561c186c1155bb Mon Sep 17 00:00:00 2001
From: Jonathan <jonagn@gmail.com>
Date: Thu, 13 Jul 2023 06:01:17 +0300
Subject: [PATCH 145/967] Fix piping to Helix on macOS (#5468)

---
 Cargo.lock                    | 12 ++++++++++++
 helix-term/Cargo.toml         |  3 +++
 helix-term/src/application.rs |  5 -----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 68d5727f7..ebc8cd0ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -263,6 +263,7 @@ checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
 dependencies = [
  "bitflags 1.3.2",
  "crossterm_winapi",
+ "filedescriptor",
  "futures-core",
  "libc",
  "mio",
@@ -427,6 +428,17 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "filedescriptor"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
+dependencies = [
+ "libc",
+ "thiserror",
+ "winapi",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.21"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index e3f561d34..3576f6846 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -70,6 +70,9 @@ grep-searcher = "0.1.11"
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
 libc = "0.2.147"
 
+[target.'cfg(target_os = "macos")'.dependencies]
+crossterm = { version = "0.26", features = ["event-stream", "use-dev-tty"] }
+
 [build-dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 546a57a9b..b8950ae0b 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -211,11 +211,6 @@ impl Application {
             }
         } else if stdin().is_tty() || cfg!(feature = "integration") {
             editor.new_file(Action::VerticalSplit);
-        } else if cfg!(target_os = "macos") {
-            // On Linux and Windows, we allow the output of a command to be piped into the new buffer.
-            // This doesn't currently work on macOS because of the following issue:
-            //   https://github.com/crossterm-rs/crossterm/issues/500
-            anyhow::bail!("Piping into helix-term is currently not supported on macOS");
         } else {
             editor
                 .new_file_from_stdin(Action::VerticalSplit)

From 9551e4e11136542869a872a1a104b88e7308a3f0 Mon Sep 17 00:00:00 2001
From: Nick Saika <n@nesv.ca>
Date: Wed, 12 Jul 2023 23:01:48 -0400
Subject: [PATCH 146/967] runtime/themes: Add "naysayer" theme (#7570)

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

diff --git a/runtime/themes/naysayer.toml b/runtime/themes/naysayer.toml
new file mode 100644
index 000000000..8922b3e22
--- /dev/null
+++ b/runtime/themes/naysayer.toml
@@ -0,0 +1,91 @@
+# Author: Nick Saika <n@nesv.ca>
+#
+# This theme is a port of naysayer-theme.el:
+#    https://github.com/nickav/naysayer-theme.el
+
+"ui.background" = { bg = "bg" }
+"ui.text" = "text"
+"ui.linenr" = { bg = "bg", fg = "line-fg" }
+"ui.linenr.selected" = { bg = "highlight-line", fg = "line-fg" }
+"ui.selection" = { bg = "selection" }
+"ui.cursorline" = { bg = "highlight-line" }
+"ui.statusline" = { fg = "bg", bg = "text" }
+"ui.statusline.inactive" = { fg = "text", bg = "bg" }
+"ui.virtual" = "indent"
+"ui.virtual.ruler" = { bg = "line-fg" }
+"ui.cursor.match" = { bg = "cyan" }
+"ui.cursor" = { bg = "white" }
+"ui.debug" = { fg = "orange" }
+"ui.highlight.frameline" = { bg = "#da8581" }
+"ui.help" = { fg = "text", bg = "bg" }
+"ui.popup" = { fg = "text", bg = "bg" }
+"ui.menu" = { fg = "text", bg = "bg" }
+"ui.menu.selected" = { fg = "text", bg = "bg" }
+"ui.window" = { bg = "bg" }
+"diagnostic.error" = { bg = "error", fg = "text", modifiers = ["bold"] }
+"diagnostic.warning" = { bg = "warning", fg = "text", modifiers = ["bold"] }
+"diagnostic.hint" = { bg = "cyan", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "text", bg = "bg" }
+"ui.bufferline.active" = { fg = "text", bg = "bg" }
+"ui.gutter.selected" = { bg = "highlight-line", modifiers = ["bold"] }
+"ui.highlight" = { bg = "highlight-line" }
+
+# Scopes: Syntax Highlighting.
+"attribute" = "text"
+"type" = "text"
+"type.builtin" = "builtin"
+"constructor" = "functions"
+"constant" = "constants"
+"constant.builtin" = "builtin"
+"constant.builtin.boolean" = "builtin"
+"constant.character" = "text"
+"constant.numeric" = "numbers"
+"string" = "strings"
+"comment" = "comments"
+"variable" = "variables"
+"variable.builtin" = "builtin"
+"punctuation" = "punctuation"
+"keyword" = "keywords"
+"function" = "functions"
+"function.method" = "methods"
+"function.builtin" = "builtin"
+"function.macro" = "macros"
+"function.special" = "macros"
+"tag.builtin" = "builtin"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"diff.plus" = { fg = "green" }
+"diff.minus" = { fg = "red" }
+"diff.delta" = { fg = "blue" }
+
+[palette]
+bg = "#062329"
+text = "#d1b897"
+builtin = "#ffffff"
+selection = "#0000ff"
+comments = "#44b340"
+punctuation = "#8cde94"
+keywords = "#ffffff"
+variables = "#c1d1e3"
+functions = "#ffffff"
+methods = "#c1d1e3"
+strings = "#2ec90c"
+constants = "#7ad0c6"
+macros = "#8cde94"
+numbers = "#7ad0c6"
+white = "#ffffff"
+error = "#ff0000"
+warning = "#ffaa00"
+highlight-line = "#0b3335"
+line-fg = "#126367"
+indent = "#aaaaaa"
+
+yellow = "#e6db74"
+orange = "#fd971f"
+red = "#f92672"
+magenta = "#fd5ff0"
+blue = "#66d9ef"
+green = "#a6e22e"
+cyan = "#a1efe4"
+violet = "#a381ff"

From 843ae971209d41b88b66d282979ed76303ec5e34 Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Thu, 13 Jul 2023 15:01:44 +0200
Subject: [PATCH 147/967] enhanced `surround_replace` to provide visual
 feedback (#7588)

---
 helix-term/src/commands.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 42ce57774..58c172968 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5174,11 +5174,18 @@ fn surround_replace(cx: &mut Context) {
             }
         };
 
+        let selection = selection.clone();
+        let ranges: SmallVec<[Range; 1]> = change_pos.iter().map(|&p| Range::point(p)).collect();
+        doc.set_selection(
+            view.id,
+            Selection::new(ranges, selection.primary_index() * 2),
+        );
+
         cx.on_next_key(move |cx, event| {
             let (view, doc) = current!(cx.editor);
             let to = match event.char() {
                 Some(to) => to,
-                None => return,
+                None => return doc.set_selection(view.id, selection),
             };
             let (open, close) = surround::get_pair(to);
             let transaction = Transaction::change(
@@ -5189,6 +5196,7 @@ fn surround_replace(cx: &mut Context) {
                     (pos, pos + 1, Some(t))
                 }),
             );
+            doc.set_selection(view.id, selection);
             doc.apply(&transaction, view.id);
             exit_select_mode(cx);
         });

From bc4f08febf87c4d498971153715e30a39c61d511 Mon Sep 17 00:00:00 2001
From: Jeppe Christiansen <jeppech@users.noreply.github.com>
Date: Fri, 14 Jul 2023 04:42:07 +0200
Subject: [PATCH 148/967] Update Typescript, TSX and Svelte grammar, to latest
 tag (#6874)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml                             |  6 +++---
 runtime/queries/_typescript/highlights.scm |  1 +
 runtime/queries/svelte/injections.scm      | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 418250b46..c1315d96e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -568,7 +568,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "typescript"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", subpath = "typescript" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "typescript" }
 
 [[language]]
 name = "tsx"
@@ -582,7 +582,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "tsx"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", subpath = "tsx" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "tsx" }
 
 [[language]]
 name = "css"
@@ -912,7 +912,7 @@ language-servers = [ "svelteserver" ]
 
 [[grammar]]
 name = "svelte"
-source = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "349a5984513b4a4a9e143a6e746120c6ff6cf6ed" }
+source = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "be7f2e7db1fc19f0852265ec60923fc058380739" }
 
 [[language]]
 name = "vue"
diff --git a/runtime/queries/_typescript/highlights.scm b/runtime/queries/_typescript/highlights.scm
index 02f3aab77..a83b43475 100644
--- a/runtime/queries/_typescript/highlights.scm
+++ b/runtime/queries/_typescript/highlights.scm
@@ -88,6 +88,7 @@
   "keyof"
   "namespace"
   "override"
+  "satisfies"
 ] @keyword
 
 [
diff --git a/runtime/queries/svelte/injections.scm b/runtime/queries/svelte/injections.scm
index 04e860cf0..65a6e0e41 100644
--- a/runtime/queries/svelte/injections.scm
+++ b/runtime/queries/svelte/injections.scm
@@ -4,6 +4,16 @@
   (raw_text) @injection.content)
   (#set! injection.language "css"))
 
+((style_element
+    (start_tag
+      (attribute
+        (attribute_name) @_attr
+        (quoted_attribute_value (attribute_value) @_lang)))
+    (raw_text) @injection.content)
+  (#eq? @_attr "lang")
+  (#match? @_lang "scss")
+  (#set! injection.language "scss"))
+
 ((attribute
    (attribute_name) @_attr
    (quoted_attribute_value (attribute_value) @css))

From 2cb00bcbc4c82afd6da7f61d85b38830230fc526 Mon Sep 17 00:00:00 2001
From: Erasin Wang <erasinoo@gmail.com>
Date: Fri, 14 Jul 2023 20:56:28 +0800
Subject: [PATCH 149/967] Support inlay-hints for svelteserver. (#7622)

---
 book/src/generated/lang-support.md |  2 +-
 languages.toml                     | 20 +++++++++++++++++++-
 runtime/queries/svelte/indents.scm | 18 ++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/svelte/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index b53911503..65ebe3d38 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -141,7 +141,7 @@
 | sql | ✓ |  |  |  |
 | sshclientconfig | ✓ |  |  |  |
 | starlark | ✓ | ✓ |  |  |
-| svelte | ✓ |  |  | `svelteserver` |
+| svelte | ✓ |  | ✓ | `svelteserver` |
 | sway | ✓ | ✓ | ✓ | `forc` |
 | swift | ✓ |  |  | `sourcekit-lsp` |
 | t32 | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index c1315d96e..9402ff24e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -62,7 +62,6 @@ slint-lsp = { command = "slint-lsp", args = [] }
 solargraph = { command = "solargraph", args = ["stdio"] }
 solc = { command = "solc", args = ["--lsp"] }
 sourcekit-lsp = { command = "sourcekit-lsp" }
-svelteserver = { command = "svelteserver", args = ["--stdio"] }
 svlangserver = { command = "svlangserver", args = [] }
 swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
 taplo = { command = "taplo", args = ["lsp", "stdio"] }
@@ -140,6 +139,25 @@ includeInlayParameterNameHintsWhenArgumentMatchesName = true
 includeInlayPropertyDeclarationTypeHints = true
 includeInlayVariableTypeHints = true
 
+[language-server.svelteserver]
+command = "svelteserver"
+args = ["--stdio"]
+
+[language-server.svelteserver.config.configuration.typescript]
+inlayHints.parameterTypes.enabled = true
+inlayHints.variableTypes.enabled = true
+inlayHints.propertyDeclarationTypes.enabled = true
+inlayHints.functionLikeReturnTypes.enabled = true
+inlayHints.enumMemberValues.enabled = true
+inlayHints.parameterNames.enabled = "all"
+
+[language-server.svelteserver.config.configuration.javascript]
+inlayHints.parameterTypes.enabled = true
+inlayHints.variableTypes.enabled = true
+inlayHints.propertyDeclarationTypes.enabled = true
+inlayHints.functionLikeReturnTypes.enabled = true
+inlayHints.enumMemberValues.enabled = true
+inlayHints.parameterNames.enabled = "all"
 
 [[language]]
 name = "rust"
diff --git a/runtime/queries/svelte/indents.scm b/runtime/queries/svelte/indents.scm
new file mode 100644
index 000000000..d0408d61a
--- /dev/null
+++ b/runtime/queries/svelte/indents.scm
@@ -0,0 +1,18 @@
+[
+  (element)
+  (if_statement)
+  (each_statement)
+  (await_statement)
+  (script_element)
+  (style_element)
+] @indent
+
+[
+  (end_tag)
+  (else_statement)
+  (if_end_expr)
+  (each_end_expr)
+  (await_end_expr)
+  ">"
+  "/>"
+] @outdent
\ No newline at end of file

From ab819ede9a39e00bac0bc87a97e51d1ae7f94575 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:05:49 +0300
Subject: [PATCH 150/967] docs(install): add how to install helix from snap
 (#7625)

---
 book/src/install.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/book/src/install.md b/book/src/install.md
index 748a8ee97..d270ed7a1 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -9,6 +9,7 @@
   - [Arch Linux extra](#arch-linux-extra)
   - [NixOS](#nixos)
   - [Flatpak](#flatpak)
+  - [Snap](#snap)
   - [AppImage](#appimage)
 - [macOS](#macos)
   - [Homebrew Core](#homebrew-core)
@@ -104,6 +105,23 @@ flatpak install flathub com.helix_editor.Helix
 flatpak run com.helix_editor.Helix
 ```
 
+### Snap
+
+Helix is available on [Snapcraft](https://snapcraft.io/helix) and can be installed with:
+
+```sh
+snap install --classic helix
+```
+
+This will install Helix as `/snap/bin/helix` (so make sure `/snap/bin` is in your `PATH`), which is not the preferred invocation (`hx`).
+As a workaround you can manually alias the command globally with:
+
+```sh
+snap alias helix hx
+```
+
+Or, otherwise, just alias in your shell's config.
+
 ### AppImage
 
 Install Helix using the Linux [AppImage](https://appimage.org/) format.

From 86bf0e00fe2ae70a176fb8fc90749bced8f6d7bd Mon Sep 17 00:00:00 2001
From: Michael Goodness <mike@opsgoodness.net>
Date: Fri, 14 Jul 2023 11:57:36 -0500
Subject: [PATCH 151/967] feat: add Brewfile to Ruby file-types (#7629)

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

diff --git a/languages.toml b/languages.toml
index 9402ff24e..2732546fb 100644
--- a/languages.toml
+++ b/languages.toml
@@ -700,7 +700,7 @@ source = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "1b69
 name = "ruby"
 scope = "source.ruby"
 injection-regex = "ruby"
-file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile", "rabl", "jbuilder", "jb", "Podfile", "podspec", "Vagrantfile"]
+file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile", "rabl", "jbuilder", "jb", "Podfile", "podspec", "Vagrantfile", "Brewfile"]
 shebangs = ["ruby"]
 roots = []
 comment-token = "#"

From 2ace6032e7de46893ee87d1a2ac425b9057fa061 Mon Sep 17 00:00:00 2001
From: kaashyapan <25821867+kaashyapan@users.noreply.github.com>
Date: Sun, 16 Jul 2023 02:28:17 +0530
Subject: [PATCH 152/967] Add fsharp language support (#7619)

---
 book/src/generated/lang-support.md    |   1 +
 languages.toml                        |  16 +++
 runtime/queries/fsharp/highlights.scm | 196 ++++++++++++++++++++++++++
 3 files changed, 213 insertions(+)
 create mode 100644 runtime/queries/fsharp/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 65ebe3d38..403932c79 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -43,6 +43,7 @@
 | fish | ✓ | ✓ | ✓ |  |
 | forth | ✓ |  |  | `forth-lsp` |
 | fortran | ✓ |  | ✓ | `fortls` |
+| fsharp | ✓ |  |  | `fsautocomplete` |
 | gdscript | ✓ | ✓ | ✓ |  |
 | git-attributes | ✓ |  |  |  |
 | git-commit | ✓ | ✓ |  |  |
diff --git a/languages.toml b/languages.toml
index 2732546fb..233eb2f86 100644
--- a/languages.toml
+++ b/languages.toml
@@ -26,6 +26,7 @@ erlang-ls = { command = "erlang_ls" }
 forc = { command = "forc", args = ["lsp"] }
 forth-lsp = { command = "forth-lsp" }
 fortls = { command = "fortls", args = ["--lowercase_intrinsics"] }
+fsharp-ls = { command = "fsautocomplete", config = { AutomaticWorkspaceInit = true } }
 gleam = { command = "gleam", args = ["lsp"] }
 haskell-language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }
 idris2-lsp = { command = "idris2-lsp" }
@@ -2661,6 +2662,21 @@ indent = { tab-width = 3, unit = "   " }
 name = "forth"
 source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "304ed77beb113e37af38b20ff14e3c37bf350d10" }
 
+[[language]]
+name = "fsharp"
+scope = "source.fs"
+roots = ["sln", "fsproj"]
+injection-regex = "fsharp"
+file-types = ["fs", "fsx"]
+comment-token = "//"
+indent = { tab-width = 4, unit = "    " }
+auto-format = true
+language-servers = ["fsharp-ls"]
+
+[[grammar]]
+name = "fsharp"
+source = { git = "https://github.com/kaashyapan/tree-sitter-fsharp", rev = "1b5a315e003024db6181744f1d25b8f525732665" }
+
 [[language]]
 name = "t32"
 scope = "source.t32"
diff --git a/runtime/queries/fsharp/highlights.scm b/runtime/queries/fsharp/highlights.scm
new file mode 100644
index 000000000..68b70ba7d
--- /dev/null
+++ b/runtime/queries/fsharp/highlights.scm
@@ -0,0 +1,196 @@
+;; ----------------------------------------------------------------------------
+;; Literals and comments
+
+[
+  (line_comment)
+  (block_comment)
+  (block_comment_content)
+] @comment
+
+
+;; ----------------------------------------------------------------------------
+;; Punctuation
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+  "[|"
+  "|]"
+  "[<"
+  ">]"
+] @punctuation.bracket
+
+[
+  "," 
+  ";"
+] @punctuation.delimiter
+
+[
+  "|" 
+  "="
+  ">"
+  "<"
+  "-"
+  "~"
+  (infix_op)
+  (prefix_op)
+  (symbolic_op)
+] @operator
+
+
+
+(attribute) @attribute
+
+[
+  "if"
+  "then"
+  "else"
+  "elif"
+  "when"
+  "match"
+  "match!"
+  "and"
+  "or"
+  "&&"
+  "||"
+  "then"
+] @keyword.control.conditional
+
+[
+  "return"
+  "return!"
+] @keyword.control.return
+
+[
+  "for"
+  "while"
+] @keyword.control.return
+
+
+[
+  "open"
+  "#r"
+  "#load"
+] @keyword.control.import
+
+[
+  "abstract"
+  "delegate"
+  "static"
+  "inline"
+  "internal"
+  "mutable"
+  "override"
+  "private"
+  "public"
+  "rec"
+] @keyword.storage.modifier
+
+[
+  "enum"
+  "let"
+  "let!"
+  "member"
+  "module"
+  "namespace"
+  "type"
+] @keyword.storage
+
+[
+  "as"
+  "assert"
+  "begin"
+  "default"
+  "do"
+  "do!"
+  "done"
+  "downcast"
+  "downto"
+  "end"
+  "event"
+  "field"
+  "finally"
+  "fun"
+  "function"
+  "get"
+  "global"
+  "inherit"
+  "interface"
+  "lazy"
+  "new"
+  "not"
+  "null"
+  "of"
+  "param"
+  "property"
+  "set"
+  "struct"
+  "try"
+  "upcast"
+  "use"
+  "use!"
+  "val"
+  "with"
+  "yield"
+  "yield!"
+] @keyword
+
+[
+ "true"
+ "false"
+ "unit"
+ ] @constant.builtin
+
+[
+ (type)
+ (const)
+] @constant
+
+[
+ (union_type_case)
+ (rules (rule (identifier_pattern)))
+] @type.enum
+
+(fsi_directive_decl (string) @namespace)
+
+[
+  (import_decl (long_identifier))
+  (named_module (long_identifier))  
+  (namespace (long_identifier))  
+  (named_module 
+    name: (long_identifier) )
+  (namespace 
+    name: (long_identifier) )
+] @namespace
+
+
+(dot_expression
+  base: (long_identifier_or_op) @variable.other.member
+  field: (long_identifier_or_op) @function)
+
+[
+ ;;(value_declaration_left (identifier_pattern) ) 
+ (function_declaration_left (identifier) ) 
+ (call_expression (long_identifier_or_op (long_identifier)))
+ ;;(application_expression (long_identifier_or_op (long_identifier)))
+] @function
+
+[
+  (string)
+  (triple_quoted_string)
+] @string
+
+[
+  (int)
+  (int16)
+  (int32)
+  (int64)
+  (float)
+  (decimal)
+] @constant.numeric
+
+

From 79a8fd6249970f9eebde46569681ec6e47349b00 Mon Sep 17 00:00:00 2001
From: Doug Kelkhoff <18220321+dgkf@users.noreply.github.com>
Date: Sat, 15 Jul 2023 19:48:09 -0400
Subject: [PATCH 153/967] Add a more file types for R (#7633)

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

diff --git a/languages.toml b/languages.toml
index 233eb2f86..a13e35b4e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -716,7 +716,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-ruby", rev = "206c7
 name = "bash"
 scope = "source.bash"
 injection-regex = "(shell|bash|zsh|sh)"
-file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", ".zlogin", ".zlogout", ".zprofile", ".zshrc", ".zimrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc", ".bash_aliases"]
+file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", ".zlogin", ".zlogout", ".zprofile", ".zshrc", ".zimrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc", ".bash_aliases", "Renviron", ".Renviron"]
 shebangs = ["sh", "bash", "dash", "zsh"]
 roots = []
 comment-token = "#"
@@ -757,7 +757,7 @@ source = { git = "https://github.com/gbprod/tree-sitter-twig", rev = "807b293fec
 name = "latex"
 scope = "source.tex"
 injection-regex = "tex"
-file-types = ["tex", "sty", "cls"]
+file-types = ["tex", "sty", "cls", "Rd"]
 roots = []
 comment-token = "%"
 language-servers = [ "texlab" ]
@@ -1325,7 +1325,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-rebase", rev
 name = "regex"
 scope = "source.regex"
 injection-regex = "regex"
-file-types = ["regex"]
+file-types = ["regex", ".Rbuildignore"]
 roots = []
 
 [[grammar]]
@@ -1556,7 +1556,7 @@ source = { git = "https://github.com/Hubro/tree-sitter-robot", rev = "f1142bfaa6
 name = "r"
 scope = "source.r"
 injection-regex = "(r|R)"
-file-types = ["r", "R"]
+file-types = ["r", "R", ".Rprofile", "Rprofile.site"]
 shebangs = ["r", "R"]
 roots = []
 comment-token = "#"

From 2d5ff9ec8ff3d054973cc9198312e577863e693f Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 13 Jul 2023 23:36:47 +0200
Subject: [PATCH 154/967] fix crash when encountering overlapping injections

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

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index f43b03ade..550621526 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1136,6 +1136,7 @@ impl Syntax {
                     RopeProvider(source_slice),
                 );
                 let mut injections = Vec::new();
+                let mut last_injection_end = 0;
                 for mat in matches {
                     let (injection_capture, content_node, included_children) = layer
                         .config
@@ -1155,6 +1156,10 @@ impl Syntax {
                                 intersect_ranges(&layer.ranges, &[content_node], included_children);
 
                             if !ranges.is_empty() {
+                                if content_node.start_byte() < last_injection_end {
+                                    continue;
+                                }
+                                last_injection_end = content_node.end_byte();
                                 injections.push((config, ranges));
                             }
                         }

From 68a98ac36bc0b45c65992cd5c9bea34facd3483e Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 14 Jul 2023 00:55:12 +0200
Subject: [PATCH 155/967] use a single query for injections

In the past we used two separate queries for combined and normal injections. There was no real reason for this (except historical/slightly easier implementation). Instead, we now use a single query and simply check if an injection corresponds to a combined injection or not.
---
 helix-core/src/syntax.rs | 102 +++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 59 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 550621526..73d3f7387 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1135,6 +1135,10 @@ impl Syntax {
                     layer.tree().root_node(),
                     RopeProvider(source_slice),
                 );
+                let mut combined_injections = vec![
+                    (None, Vec::new(), IncludedChildren::default());
+                    layer.config.combined_injections_patterns.len()
+                ];
                 let mut injections = Vec::new();
                 let mut last_injection_end = 0;
                 for mat in matches {
@@ -1142,6 +1146,27 @@ impl Syntax {
                         .config
                         .injection_for_match(&layer.config.injections_query, &mat, source_slice);
 
+                    // in case this is a combined injection save it for more processing later
+                    if let Some(combined_injection_idx) = layer
+                        .config
+                        .combined_injections_patterns
+                        .iter()
+                        .position(|&pattern| pattern == mat.pattern_index)
+                    {
+                        let entry = &mut combined_injections[combined_injection_idx];
+                        if injection_capture.is_some() {
+                            entry.0 = injection_capture;
+                        }
+                        if let Some(content_node) = content_node {
+                            if content_node.start_byte() >= last_injection_end {
+                                entry.1.push(content_node);
+                                last_injection_end = content_node.end_byte();
+                            }
+                        }
+                        entry.2 = included_children;
+                        continue;
+                    }
+
                     // Explicitly remove this match so that none of its other captures will remain
                     // in the stream of captures.
                     mat.remove();
@@ -1166,43 +1191,13 @@ impl Syntax {
                     }
                 }
 
-                // Process combined injections.
-                if let Some(combined_injections_query) = &layer.config.combined_injections_query {
-                    let mut injections_by_pattern_index =
-                        vec![
-                            (None, Vec::new(), IncludedChildren::default());
-                            combined_injections_query.pattern_count()
-                        ];
-                    let matches = cursor.matches(
-                        combined_injections_query,
-                        layer.tree().root_node(),
-                        RopeProvider(source_slice),
-                    );
-                    for mat in matches {
-                        let entry = &mut injections_by_pattern_index[mat.pattern_index];
-                        let (injection_capture, content_node, included_children) = layer
-                            .config
-                            .injection_for_match(combined_injections_query, &mat, source_slice);
-                        if injection_capture.is_some() {
-                            entry.0 = injection_capture;
-                        }
-                        if let Some(content_node) = content_node {
-                            entry.1.push(content_node);
-                        }
-                        entry.2 = included_children;
-                    }
-                    for (lang_name, content_nodes, included_children) in injections_by_pattern_index
-                    {
-                        if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
-                            if let Some(config) = (injection_callback)(&lang_name) {
-                                let ranges = intersect_ranges(
-                                    &layer.ranges,
-                                    &content_nodes,
-                                    included_children,
-                                );
-                                if !ranges.is_empty() {
-                                    injections.push((config, ranges));
-                                }
+                for (lang_name, content_nodes, included_children) in combined_injections {
+                    if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
+                        if let Some(config) = (injection_callback)(&lang_name) {
+                            let ranges =
+                                intersect_ranges(&layer.ranges, &content_nodes, included_children);
+                            if !ranges.is_empty() {
+                                injections.push((config, ranges));
                             }
                         }
                     }
@@ -1565,7 +1560,7 @@ pub struct HighlightConfiguration {
     pub language: Grammar,
     pub query: Query,
     injections_query: Query,
-    combined_injections_query: Option<Query>,
+    combined_injections_patterns: Vec<usize>,
     highlights_pattern_index: usize,
     highlight_indices: ArcSwap<Vec<Option<Highlight>>>,
     non_local_variable_patterns: Vec<bool>,
@@ -1681,26 +1676,15 @@ impl HighlightConfiguration {
             }
         }
 
-        let mut injections_query = Query::new(language, injection_query)?;
-
-        // Construct a separate query just for dealing with the 'combined injections'.
-        // Disable the combined injection patterns in the main query.
-        let mut combined_injections_query = Query::new(language, injection_query)?;
-        let mut has_combined_queries = false;
-        for pattern_index in 0..injections_query.pattern_count() {
-            let settings = injections_query.property_settings(pattern_index);
-            if settings.iter().any(|s| &*s.key == "injection.combined") {
-                has_combined_queries = true;
-                injections_query.disable_pattern(pattern_index);
-            } else {
-                combined_injections_query.disable_pattern(pattern_index);
-            }
-        }
-        let combined_injections_query = if has_combined_queries {
-            Some(combined_injections_query)
-        } else {
-            None
-        };
+        let injections_query = Query::new(language, injection_query)?;
+        let combined_injections_patterns = (0..injections_query.pattern_count())
+            .filter(|&i| {
+                injections_query
+                    .property_settings(i)
+                    .iter()
+                    .any(|s| &*s.key == "injection.combined")
+            })
+            .collect();
 
         // Find all of the highlighting patterns that are disabled for nodes that
         // have been identified as local variables.
@@ -1749,7 +1733,7 @@ impl HighlightConfiguration {
             language,
             query,
             injections_query,
-            combined_injections_query,
+            combined_injections_patterns,
             highlights_pattern_index,
             highlight_indices,
             non_local_variable_patterns,

From 8f1c6456f391e9590d80e4e7c34283040d13a726 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 17 Jul 2023 07:09:07 +0200
Subject: [PATCH 156/967] Clear statusline while prompt is visible (#7646)

---
 helix-term/src/ui/prompt.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index a9ccfb737..4f383bf56 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -356,6 +356,7 @@ impl Prompt {
         let completion_color = theme.get("ui.menu");
         let selected_color = theme.get("ui.menu.selected");
         let suggestion_color = theme.get("ui.text.inactive");
+        let background = theme.get("ui.background");
         // completion
 
         let max_len = self
@@ -451,6 +452,7 @@ impl Prompt {
         }
 
         let line = area.height - 1;
+        surface.clear_with(area.clip_top(line), background);
         // render buffer text
         surface.set_string(area.x, area.y + line, &self.prompt, prompt_color);
 

From ad2061bab65682a2c46b51701dac0c88237f3da4 Mon Sep 17 00:00:00 2001
From: Jake Langford <jake@twilsoft.uk>
Date: Mon, 17 Jul 2023 06:09:19 +0100
Subject: [PATCH 157/967] Update my name README.md (#7656)

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

diff --git a/README.md b/README.md
index cba52a7a1..227e1c91f 100644
--- a/README.md
+++ b/README.md
@@ -61,4 +61,4 @@ Discuss the project on the community [Matrix Space](https://matrix.to/#/#helix-c
 
 # Credits
 
-Thanks to [@JakeHL](https://github.com/JakeHL) for designing the logo!
+Thanks to [@jakenvac](https://github.com/jakenvac) for designing the logo!

From e7f60611acbfc6b22867240a166fcb7169843ee0 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 17 Jul 2023 01:09:38 -0400
Subject: [PATCH 158/967] switch to
 https://github.com/tree-sitter-perl/tree-sitter-perl (#7644)

---
 book/src/generated/lang-support.md   |   2 +-
 languages.toml                       |   2 +-
 runtime/queries/perl/fold.scm        |  19 +++
 runtime/queries/perl/highlights.scm  | 229 +++++++++------------------
 runtime/queries/perl/indents.scm     |  15 --
 runtime/queries/perl/injections.scm  |   2 +-
 runtime/queries/perl/textobjects.scm |  17 --
 7 files changed, 96 insertions(+), 190 deletions(-)
 create mode 100644 runtime/queries/perl/fold.scm
 delete mode 100644 runtime/queries/perl/indents.scm
 delete mode 100644 runtime/queries/perl/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 403932c79..8941f735f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -109,7 +109,7 @@
 | pascal | ✓ | ✓ |  | `pasls` |
 | passwd | ✓ |  |  |  |
 | pem | ✓ |  |  |  |
-| perl | ✓ | ✓ | ✓ | `perlnavigator` |
+| perl | ✓ |  |  | `perlnavigator` |
 | php | ✓ | ✓ | ✓ | `intelephense` |
 | po | ✓ | ✓ |  |  |
 | ponylang | ✓ | ✓ | ✓ |  |
diff --git a/languages.toml b/languages.toml
index a13e35b4e..7f7742963 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1112,7 +1112,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "perl"
-source = { git = "https://github.com/ganezdragon/tree-sitter-perl", rev = "0ac2c6da562c7a2c26ed7e8691d4a590f7e8b90a" }
+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "ed21ecbcc128a6688770ebafd3ef68a1c9bc1ea9" }
 
 [[language]]
 name = "racket"
diff --git a/runtime/queries/perl/fold.scm b/runtime/queries/perl/fold.scm
new file mode 100644
index 000000000..17fd114be
--- /dev/null
+++ b/runtime/queries/perl/fold.scm
@@ -0,0 +1,19 @@
+(comment) @fold
+(pod) @fold
+
+; fold the block-typed package statements only
+(package_statement (block)) @fold
+
+[(subroutine_declaration_statement)
+ (conditional_statement)
+ (loop_statement)
+ (for_statement)
+ (cstyle_for_statement)
+ (block_statement)
+ (phaser_statement)] @fold
+
+(anonymous_subroutine_expression) @fold
+
+; perhaps folks want to fold these too?
+[(anonymous_array_expression)
+ (anonymous_hash_expression)] @fold
diff --git a/runtime/queries/perl/highlights.scm b/runtime/queries/perl/highlights.scm
index b6f042917..961ff5ea3 100644
--- a/runtime/queries/perl/highlights.scm
+++ b/runtime/queries/perl/highlights.scm
@@ -1,181 +1,100 @@
-; Variables
-(variable_declaration
-  .
-  (scope) @keyword)
 [
-(single_var_declaration)
-(scalar_variable)
-(array_variable)
-(hash_variable)
-(hash_variable)
-] @variable
-
+  "use" "no" "require" "package"
+] @keyword.control.import
 
 [
-(package_name)
-(special_scalar_variable)
-(special_array_variable)
-(special_hash_variable)
-(special_literal)
-(super)
-] @constant
-
-(
-  [
-  (package_name)
-  (super)
-  ]
-  .
-  ("::" @operator)
-)
-
-(comments) @comment
-(pod_statement) @comment.block.documentation
+  "sub"
+] @keyword.function
 
 [
-(use_no_statement)
-(use_no_feature_statement)
-(use_no_if_statement)
-(use_no_version)
-(use_constant_statement)
-(use_parent_statement)
-] @keyword
-
-(use_constant_statement
-  constant: (identifier) @constant)
+  "if" "elsif" "else" "unless"
+] @keyword.control.conditional
 
 [
-"require"
-] @keyword
-
-(method_invocation
-  .
-  (identifier) @variable)
-
-(method_invocation
-  (arrow_operator)
-  .
-  (identifier) @function)
-(method_invocation
-  function_name: (identifier) @function)
-(named_block_statement
-  function_name: (identifier) @function)
-
-(call_expression
-  function_name: (identifier) @function)
-(function_definition
-  name: (identifier) @function)
-[
-(function)
-(map)
-(grep)
-(bless)
-] @function
+  "while" "until"
+  "for" "foreach"
+  "do"
+] @keyword.control.repeat
 
 [
-"return"
-"sub"
-"package"
-"BEGIN"
-"END"
-] @keyword.function
+  "my" "our" "local"
+] @keyword.storage.modifier
 
 [
-"("
-")"
-"["
-"]"
-"{"
-"}"
-] @punctuation.bracket
-(standard_input_to_variable) @punctuation.bracket
+  "last" "next" "redo" "goto" "return"
+] @keyword.control.return
 
 [
-"=~"
-"or"
-"="
-"=="
-"+"
-"-"
-"."
-"//"
-"||"
-(arrow_operator)
-(hash_arrow_operator)
-(array_dereference)
-(hash_dereference)
-(to_reference)
-(type_glob)
-(hash_access_variable)
-(ternary_expression)
-(ternary_expression_in_hash)
-] @operator
+  "undef"
+] @constant.builtin
 
-[
-(regex_option)
-(regex_option_for_substitution)
-(regex_option_for_transliteration)
-] @variable.parameter
-
-(type_glob
-  (identifier) @variable)
-(
-  (scalar_variable)
-  .
-  ("->" @operator))
+(phaser_statement phase: _ @keyword.directive)
 
 [
-(word_list_qw)
-(command_qx_quoted)
-(string_single_quoted)
-(string_double_quoted)
-(string_qq_quoted)
-(bareword)
-(transliteration_tr_or_y)
-] @string
+  "or" "and"
+  "eq" "ne" "cmp" "lt" "le" "ge" "gt"
+  "isa"
+] @keyword.operator
 
-[
-(regex_pattern_qr) 
-(patter_matcher_m)
-(substitution_pattern_s)
-] @string.regexp
+(comment) @comment
 
-(escape_sequence) @string.special
+(eof_marker) @keyword.directive
+(data_section) @comment
 
-[
-","
-(semi_colon)
-(start_delimiter)
-(end_delimiter)
-(ellipsis_statement)
-] @punctuation.delimiter
+(pod) @comment.block.documentation
 
-[
-(integer)
-(floating_point)
-(scientific_notation)
-(hexadecimal)
-] @constant.numeric
+(number) @constant.numeric
+(version) @constant
 
-[
-; (if_statement)
-(unless_statement)
-(if_simple_statement)
-(unless_simple_statement)
-] @keyword.control.conditional
+(string_literal) @string
+(interpolated_string_literal) @string
+(quoted_word_list) @string
+(command_string) @string
+[(heredoc_token) (command_heredoc_token)] @string.special
+(heredoc_content) @string
+(heredoc_end) @string.special
+[(escape_sequence) (escaped_delimiter)] @constant.character.escape
 
-[
-"if"
-"elsif"
-"else"
-] @keyword.control.conditional 
+[(quoted_regexp) (match_regexp)] @string.regexp
+
+(autoquoted_bareword _?) @string.special
+
+[(scalar) (arraylen)] @variable
+(scalar_deref_expression ["->" "$" "*"] @variable)
+(array) @variable
+(array_deref_expression ["->" "@" "*"] @variable)
+(hash) @variable
+(hash_deref_expression ["->" "%" "*"] @variable)
+
+(array_element_expression [array:(_) "->" "[" "]"] @variable)
+(slice_expression [array:(_) "->" "[" "]"] @variable)
+(keyval_expression [array:(_) "->" "[" "]"] @variable)
+
+(hash_element_expression [hash:(_) "->" "{" "}"] @variable)
+(slice_expression [hash:(_) "->" "[" "]"] @variable)
+(keyval_expression [hash:(_) "->" "[" "]"] @variable)
+
+(hash_element_expression key: (bareword) @string.special)
+
+(use_statement (package) @type)
+(package_statement (package) @type)
+(require_expression (bareword) @type)
+
+(subroutine_declaration_statement name: (_) @function)
+(attrlist (attribute) @attribute)
+
+(goto_expression (label) @label)
+(loopex_expression (label) @label)
+
+(statement_label label: _ @label)
 
-(foreach_statement) @keyword.control.repeat
-(foreach_statement
-  .
-  (scope) @keyword)
+(relational_expression operator: "isa" right: (bareword) @type)
 
-(function_attribute) @label
+(function_call_expression (function) @function)
+(method_call_expression (method) @function.method)
+(method_call_expression invocant: (bareword) @type)
 
-(function_signature) @type
+(func0op_call_expression function: _ @function.builtin)
+(func1op_call_expression function: _ @function.builtin)
 
+(function) @function
diff --git a/runtime/queries/perl/indents.scm b/runtime/queries/perl/indents.scm
deleted file mode 100644
index 5ae34f5e9..000000000
--- a/runtime/queries/perl/indents.scm
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  (function)
-  (identifier)
-  (method_invocation)
-  (if_statement)
-  (unless_statement)
-  (if_simple_statement)
-  (unless_simple_statement)
-  (variable_declaration)
-  (block)
-  (list_item)
-  (word_list_qw)
-] @indent
-
-"}" @outdent
diff --git a/runtime/queries/perl/injections.scm b/runtime/queries/perl/injections.scm
index cab5f53d5..321c90add 100644
--- a/runtime/queries/perl/injections.scm
+++ b/runtime/queries/perl/injections.scm
@@ -1,2 +1,2 @@
-((comments) @injection.content
+((comment) @injection.content
  (#set! injection.language "comment"))
diff --git a/runtime/queries/perl/textobjects.scm b/runtime/queries/perl/textobjects.scm
deleted file mode 100644
index 972b87745..000000000
--- a/runtime/queries/perl/textobjects.scm
+++ /dev/null
@@ -1,17 +0,0 @@
-(function_definition 
-  (identifier) (_) @function.inside) @function.around
-
-(anonymous_function 
-  (_) @function.inside) @function.around
-
-(argument 
-  (_) @parameter.inside)
-
-[
-  (comments)
-  (pod_statement)
-] @comment.inside
-
-(comments)+ @comment.around
-
-(pod_statement) @comment.around

From 2fa576b1778ce203286f42d02cf92a50a4d81374 Mon Sep 17 00:00:00 2001
From: "J. Brock" <joseph.brock@protonmail.com>
Date: Mon, 17 Jul 2023 10:09:30 -0400
Subject: [PATCH 159/967] Remove snap aliasing instructions (#7657)

The helix snap now gets aliased to hx by default at installation time,
so manual aliasing should no longer be required.

Signed-off-by: Joseph Brock <joseph.brock@protonmail.com>
---
 book/src/install.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/book/src/install.md b/book/src/install.md
index d270ed7a1..9c052917c 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -113,14 +113,7 @@ Helix is available on [Snapcraft](https://snapcraft.io/helix) and can be install
 snap install --classic helix
 ```
 
-This will install Helix as `/snap/bin/helix` (so make sure `/snap/bin` is in your `PATH`), which is not the preferred invocation (`hx`).
-As a workaround you can manually alias the command globally with:
-
-```sh
-snap alias helix hx
-```
-
-Or, otherwise, just alias in your shell's config.
+This will install Helix as both `/snap/bin/helix` and `/snap/bin/hx`, so make sure `/snap/bin` is in your `PATH`.
 
 ### AppImage
 

From 6d4fd77315f63992ab6080d9c3febe90bc25d1d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:48:58 +0900
Subject: [PATCH 160/967] build(deps): bump serde_json from 1.0.100 to 1.0.103
 (#7661)

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 ebc8cd0ae..e1b75c42b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1992,9 +1992,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.100"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
 dependencies = [
  "itoa",
  "ryu",

From 1478a0d3a6285906b217dfaf09229b629765291c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:49:03 +0900
Subject: [PATCH 161/967] build(deps): bump anyhow from 1.0.71 to 1.0.72
 (#7662)

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 e1b75c42b..8af4de9d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,9 +81,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
 [[package]]
 name = "arc-swap"

From b87858b7b45de7e30f212e6039dc7eb4c64ead16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:49:11 +0900
Subject: [PATCH 162/967] build(deps): bump indoc from 2.0.2 to 2.0.3 (#7663)

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

diff --git a/Cargo.lock b/Cargo.lock
index 8af4de9d0..9642094fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1514,9 +1514,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.2"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761cde40c27e2a9877f8c928fd248b7eec9dd48623dd514b256858ca593fbba7"
+checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
 
 [[package]]
 name = "instant"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 42b2edcfc..895ee5bcf 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -50,4 +50,4 @@ textwrap = "0.16.0"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
-indoc = "2.0.2"
+indoc = "2.0.3"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 3576f6846..52893e317 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -78,5 +78,5 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.11"
-indoc = "2.0.2"
+indoc = "2.0.3"
 tempfile = "3.6.0"

From b47519ab11591b525132c5a13e464875b0c4f796 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:49:19 +0900
Subject: [PATCH 163/967] build(deps): bump signal-hook from 0.3.15 to 0.3.16
 (#7664)

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 9642094fb..a26bdfcad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2029,9 +2029,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
+checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3"
 dependencies = [
  "libc",
  "signal-hook-registry",

From 579f68b52d2d95bb28b52133c0a41ffaa3da644a Mon Sep 17 00:00:00 2001
From: Christian Holman <chrisholm2@yahoo.com>
Date: Wed, 19 Jul 2023 03:05:32 +0100
Subject: [PATCH 164/967] allow for higher F keys to be used (#7672)

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

diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index d8832adce..5566a265b 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -379,7 +379,7 @@ impl std::str::FromStr for KeyEvent {
             function if function.len() > 1 && function.starts_with('F') => {
                 let function: String = function.chars().skip(1).collect();
                 let function = str::parse::<u8>(&function)?;
-                (function > 0 && function < 13)
+                (function > 0 && function < 25)
                     .then_some(KeyCode::F(function))
                     .ok_or_else(|| anyhow!("Invalid function key '{}'", function))?
             }
@@ -682,7 +682,7 @@ mod test {
 
     #[test]
     fn parsing_nonsensical_keys_fails() {
-        assert!(str::parse::<KeyEvent>("F13").is_err());
+        assert!(str::parse::<KeyEvent>("F25").is_err());
         assert!(str::parse::<KeyEvent>("F0").is_err());
         assert!(str::parse::<KeyEvent>("aaa").is_err());
         assert!(str::parse::<KeyEvent>("S-S-a").is_err());

From d52b790379ffc5646409a9972e0a4e70bcc8a981 Mon Sep 17 00:00:00 2001
From: Thales Ramos <70434673+thlsrms@users.noreply.github.com>
Date: Wed, 19 Jul 2023 04:14:28 +0200
Subject: [PATCH 165/967] Add Kaolin Dark, Light and Valley Dark themes (#7151)

Add some missing keys

Inherit themes from kaolin-dark and override diverging keys
---
 runtime/themes/kaolin-dark.toml        | 108 +++++++++++++++++++++++++
 runtime/themes/kaolin-light.toml       |  60 ++++++++++++++
 runtime/themes/kaolin-valley-dark.toml |  73 +++++++++++++++++
 3 files changed, 241 insertions(+)
 create mode 100644 runtime/themes/kaolin-dark.toml
 create mode 100644 runtime/themes/kaolin-light.toml
 create mode 100644 runtime/themes/kaolin-valley-dark.toml

diff --git a/runtime/themes/kaolin-dark.toml b/runtime/themes/kaolin-dark.toml
new file mode 100644
index 000000000..b8188f769
--- /dev/null
+++ b/runtime/themes/kaolin-dark.toml
@@ -0,0 +1,108 @@
+# Author : thlsrms <thlsrmsdev@gmail.com>
+
+# Original author: kaolin-dark by Ogden Webb: github.com/ogdenwebb/emacs-kaolin-themes
+# Kaolin Dark Theme - A dark jade theme inspired by Sierra.vim : github.com/AlessandroYorba/Sierra
+
+"attribute" = "constant"
+"keyword" = { fg = "hint" }
+"keyword.directive" = "info"
+"namespace" = "constant"
+"punctuation" = "fg0"
+"punctuation.delimiter" = "fg0"
+"operator" = "fg0"
+"special" = "constant"
+"variable.other.member" = { fg = "violet7", modifiers = ["italic"] }
+"variable" = "ultramarine4_dark"
+"variable.builtin" = "hint"
+"variable.parameter" = "ultramarine4_dark"
+"type" = "type"
+"type.builtin" = "info"
+"constructor" = { fg = "type" }
+"function" = { fg = "info" }
+"function.macro" = "constant"
+"function.builtin" = "selection0"
+"tag" = "#7aaaa5"
+"comment" = { fg = "gray0", modifiers = ["italic"] }
+"constant" = { fg = "constant" }
+"constant.builtin" = { fg = "info" }
+"string" = "hint"
+"constant.numeric" = "info"
+"constant.character.escape" = { fg = "hint", modifiers = ["bold"] }
+"label" = "constant"
+"module" = "info"
+
+"diff.plus" = "green0"
+"diff.delta" = "warn"
+"diff.minus" = "error"
+
+"warning" = "warn"
+"error" = "error"
+"info" = "info"
+"hint" = "hint"
+
+"diagnostic.error" = { underline = { style = "curl", color = "error" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "warn" } }
+"diagnostic.info" = { underline = { style = "curl", color = "info" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "hint" } }
+
+"ui.background" = { bg = "bg0" }
+"ui.linenr" = { fg = "gray0" }
+"ui.linenr.selected" = { fg = "gray1", modifiers = ["bold"] }
+"ui.cursorline" = { bg = "bg1" }
+"ui.cursorline.secondary" = { bg = "bg2" }
+"ui.cursorcolumn.primary" = { bg = "bg1" }
+"ui.cursorcolumn.secondary" = { bg = "bg2" }
+"ui.statusline" = { fg = "info", bg = "bg1" }
+"ui.statusline.normal" = { fg = "hint", bg = "bg1", modifiers = ["reversed", "bold"] }
+"ui.statusline.insert" = { fg = "green0", bg = "bg1", modifiers = ["reversed", "bold"] }
+"ui.statusline.select" = { fg = "ultramarine4_dark", bg = "bg1", modifiers = ["reversed", "bold"] }
+"ui.statusline.inactive" = { fg = "gray0", bg = "bg1" }
+"ui.popup" = { bg = "bg1" }
+"ui.window" = { fg= "bg1", bg = "bg0" }
+"ui.help" = { bg = "bg1", fg = "fg0" }
+"ui.text" = { fg = "fg1" }
+"ui.text.focus" = { fg = "selection0" }
+"ui.selection" = { bg = "selection1" }
+"ui.selection.primary" = { bg = "selection1" }
+"ui.cursor.primary" = { modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "bg1", bg = "ultramarine4_dark" }
+"ui.menu" = { fg = "fg0", bg = "bg1" }
+"ui.menu.selected" = { fg = "selection0", bg = "bg2", modifiers = ["bold"] }
+"ui.virtual.wrap" = "bg2"
+"ui.virtual.whitespace" = "fg1"
+"ui.virtual.indent-guide" = "bg2"
+"ui.virtual.ruler" = { bg = "bg1" }
+"ui.virtual.inlay-hint" = "gray1"
+"ui.virtual.inlay-hint.parameter" = { fg = "gray1", modifiers = ["dim"] }
+"ui.virtual.inlay-hint.type" = { fg = "gray1", modifiers = ["dim"] }
+"ui.debug.breakpoint" = "error"
+"ui.debug.active" = "warn"
+
+"markup.heading" = "info"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "warn", underline = { style = "line" } }
+"markup.link.text" = "selection0"
+"markup.raw" = "selection0"
+
+[palette]
+# kaolin-dark palette
+bg0 = "#18181b" # black1
+bg1 = "#222225" # black2
+bg2 = "#303035" # black4
+fg0 = "#e6e6e8" # white1
+fg1 = "#adadb9" # whiet4
+gray0 = "#545c5e" # gray3
+gray1 = "#919a9c" # gray9
+green0 = "#6fb593" # spring-green3
+selection0 = "#68f3ca" # aquamarine3
+selection1 = "#2e403b" # aquamarine6
+type = "#cd9575" # vermilion4
+hint = "#4d9391" # teal1
+info = "#80bcb6" # teal4
+warn = "#dbac66" # orange1
+error = "#cd5c60" # red1
+constant = "#ab98b5" # purple4
+ultramarine4_dark = "#968cc7"
+violet7 = "#766884"
diff --git a/runtime/themes/kaolin-light.toml b/runtime/themes/kaolin-light.toml
new file mode 100644
index 000000000..293fc5546
--- /dev/null
+++ b/runtime/themes/kaolin-light.toml
@@ -0,0 +1,60 @@
+# Author : thlsrms <thlsrmsdev@gmail.com>
+
+# Original author: kaolin-dark by Ogden Webb: github.com/ogdenwebb/emacs-kaolin-themes
+# Kaolin Light Theme - Light variant of the original Kaolin Dark Theme
+
+inherits = "kaolin-dark"
+
+"keyword.directive" = "selection0"
+"special" = "ultramarine1"
+"variable.other.member" = { fg = "constant", modifiers = ["italic"] }
+"variable" = "ultramarine1"
+"variable.parameter" = "constant"
+"type.builtin" = "selection0"
+"function" = { fg = "selection0" }
+"function.builtin" = "ultramarine1"
+"tag" = { fg = "hint", modifiers = ["italic"] }
+"constant.builtin" = { fg = "selection0" }
+"string" = "green0"
+"constant.numeric" = "selection0"
+"module" = "selection0"
+
+"ui.linenr.selected" = { fg = "green1", modifiers = ["bold"] }
+"ui.statusline" = { fg = "selection0", bg = "bg1" }
+"ui.statusline.normal" = { fg = "hint", bg = "bg1", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "warn", bg = "bg1", modifiers = ["reversed", "bold"] }
+"ui.statusline.select" = { fg = "constant", bg = "bg1", modifiers = ["reversed", "bold"] }
+"ui.text" = { fg = "fg0" }
+"ui.text.focus" = { fg = "green1", modifiers = ["bold"] }
+"ui.cursor.match" = { fg = "fg1", bg = "gray0" }
+"ui.menu.selected" = { fg = "green1", bg = "bg2", modifiers = ["bold"] }
+"ui.virtual.wrap" = "fg1"
+"ui.virtual.indent-guide" = "fg1"
+"ui.virtual.inlay-hint" = "gray0"
+"ui.virtual.inlay-hint.parameter" = { fg = "gray0", modifiers = ["italic"] }
+"ui.virtual.inlay-hint.type" = { fg = "gray0", modifiers = ["italic"] }
+
+"markup.heading" = { fg = "ultramarine1", modifiers = ["bold"] }
+"markup.link.url" = { fg = "info", underline = { style = "line" } }
+"markup.link.text" = "info"
+"markup.raw" = "constant"
+
+[palette]
+# kaolin-light palette
+bg0  = "#edeeeb" # kaolin-light-bg1
+bg1  = "#dfe1dc" # kaolin-light-bg2
+bg2  = "#d1d4cd" # kaolin-light-bg3
+fg0 = "#383e3f" # gray1
+fg1 = "#bebec4" # white4
+gray0 = "#7c878a" # gray7
+green0 = "#39854c" # erin2
+green1 = "#18a318" # green2
+selection0 = "#4c7a90" # azure4
+selection1 = "#d3e4f0" # azure9
+type = "#e36b3f" # vermilion3
+hint = "#13665f" # teal2
+info = "#3b84cc" # azure1
+warn = "#dbac66" # orange1
+error = "#e84c58" # red3
+constant = "#845A84" # magenta4
+ultramarine1 = "#6d46e3" # ultramarine1
diff --git a/runtime/themes/kaolin-valley-dark.toml b/runtime/themes/kaolin-valley-dark.toml
new file mode 100644
index 000000000..a71707330
--- /dev/null
+++ b/runtime/themes/kaolin-valley-dark.toml
@@ -0,0 +1,73 @@
+# Author : thlsrms <thlsrmsdev@gmail.com>
+
+# Original author: kaolin-valley-dark by Ogden Webb: github.com/ogdenwebb/emacs-kaolin-themes
+# Kaolin Valley Dark Theme - Colorful Kaolin theme with brown background
+
+inherits = "kaolin-dark"
+
+"attribute" = "fg1"
+"keyword" = { fg = "teal3" }
+"keyword.directive" = "green0"
+"operator" = "teal3"
+"special" = "ultramarine3"
+"variable.other.member" = { fg = "selection0", modifiers = ["italic"] }
+"variable" = "constant"
+"variable.builtin" = "teal3"
+"variable.parameter" = "constant"
+"type.builtin" = "aquamarine3"
+"function" = { fg = "valley-dark-fn" }
+"function.macro" = "valley-dark-fn"
+"function.builtin" = "aquamarine3"
+"tag" = "green0"
+"constant.builtin" = { fg = "aquamarine3" }
+"string" = "fg1"
+"constant.numeric" = "aquamarine3"
+"constant.character.escape" = "fg1"
+"label" = "ultramarine3"
+"module" = "green0"
+
+"diff.delta" = "type"
+
+"ui.linenr.selected" = { fg = "warn", modifiers = ["bold"] }
+"ui.statusline" = { fg = "fg0", bg = "bg1" }
+"ui.statusline.normal" = { fg = "warn", bg = "bg1", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "hint", bg = "bg1", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "constant", bg = "bg1", modifiers = ["bold"] }
+"ui.text.focus" = { fg = "selection0", bg = "bg1" }
+"ui.cursor.match" = { fg = "bg0", bg = "selection0" }
+"ui.menu" = { fg = "fg1", bg = "bg1" }
+"ui.menu.selected" = { fg = "selection0", bg = "bg1", modifiers = ["bold"] }
+"ui.virtual.wrap" = "gray1"
+"ui.virtual.whitespace" = "gray1"
+"ui.virtual.indent-guide" = "gray1"
+"ui.virtual.ruler" = { bg = "bg2" }
+"ui.virtual.inlay-hint" = "gray0"
+"ui.virtual.inlay-hint.parameter" = { fg = "gray0", modifiers = ["italic"] }
+"ui.virtual.inlay-hint.type" = { fg = "gray0", modifiers = ["italic"] }
+
+"markup.heading" = "type"
+"markup.link.url" = { fg = "constant", modifiers = ["underlined"] }
+"markup.link.text" = "valley-dark-fn"
+
+[palette]
+# kaolin-valley-dark palette
+bg0 = "#262221" # valley-dark-bg1
+bg1 = "#2e2a29" # valley-dark-bg2
+bg2 = "#383030" # valley-dark-bg4
+fg0 = "#eee6d3" # amber9
+fg1 = "#cea2ca" # magenta3
+gray0 = "#635c4a" # valley-dark-comment
+gray1 = "#52413f" # brown2
+green0 = "#91f368" # harlequin3
+selection0 = "#ee7042" # vermilion3
+selection1 = "#402e2e" # red6
+type = "#eed891" # amber3
+hint = "#6bd9db" # cyan3
+info = "#41b0f3" # capri3
+warn = "#cfb05f" # amber1
+error = "#e84c58" # red3
+constant = "#ef6787" # crimson3
+valley-dark-fn = "#7ed7e6"
+teal3 = "#49bdb0"
+aquamarine3 = "#53e6b5"
+ultramarine3 = "#9587dd"

From 8977123f25baba838d2d16f8a40e78563c4ebf4a Mon Sep 17 00:00:00 2001
From: sigmaSd <bedisnbiba@gmail.com>
Date: Fri, 21 Jul 2023 20:50:08 +0100
Subject: [PATCH 166/967] feat: resolve code action (#7677)

---
 helix-lsp/src/client.rs        | 29 +++++++++++++++++++++++++++--
 helix-term/src/commands/lsp.rs | 15 ++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index a3711317a..92ab03db7 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -7,8 +7,9 @@ use crate::{
 use helix_core::{find_workspace, path, syntax::LanguageServerFeature, ChangeSet, Rope};
 use helix_loader::{self, VERSION_AND_GIT_HASH};
 use lsp::{
-    notification::DidChangeWorkspaceFolders, DidChangeWorkspaceFoldersParams, OneOf,
-    PositionEncodingKind, WorkspaceFolder, WorkspaceFoldersChangeEvent,
+    notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
+    DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, WorkspaceFolder,
+    WorkspaceFoldersChangeEvent,
 };
 use lsp_types as lsp;
 use parking_lot::Mutex;
@@ -609,6 +610,12 @@ impl Client {
                                 .collect(),
                             },
                         }),
+                        is_preferred_support: Some(true),
+                        disabled_support: Some(true),
+                        data_support: Some(true),
+                        resolve_support: Some(CodeActionCapabilityResolveSupport {
+                            properties: vec!["edit".to_owned(), "command".to_owned()],
+                        }),
                         ..Default::default()
                     }),
                     publish_diagnostics: Some(lsp::PublishDiagnosticsClientCapabilities {
@@ -954,6 +961,24 @@ impl Client {
         Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
     }
 
+    pub fn resolve_code_action(
+        &self,
+        code_action: lsp::CodeAction,
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support resolving code action.
+        match capabilities.completion_provider {
+            Some(lsp::CompletionOptions {
+                resolve_provider: Some(true),
+                ..
+            }) => (),
+            _ => return None,
+        }
+
+        Some(self.call::<lsp::request::CodeActionResolveRequest>(code_action))
+    }
+
     pub fn text_document_signature_help(
         &self,
         text_document: lsp::TextDocumentIdentifier,
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 145bddd0f..1f5921180 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -743,7 +743,20 @@ pub fn code_action(cx: &mut Context) {
                     }
                     lsp::CodeActionOrCommand::CodeAction(code_action) => {
                         log::debug!("code action: {:?}", code_action);
-                        if let Some(ref workspace_edit) = code_action.edit {
+                        // we support lsp "codeAction/resolve" for `edit` and `command` fields
+                        let mut resolved_code_action = None;
+                        if code_action.edit.is_none() || code_action.command.is_none() {
+                            if let Some(future) = language_server.resolve_code_action(code_action.clone()) {
+                                if let Ok(response) = helix_lsp::block_on(future) {
+                                    if let Ok(code_action) = serde_json::from_value::<CodeAction>(response) {
+                                        resolved_code_action = Some(code_action);
+                                    }
+                                }
+                            }
+                        }
+                        let resolved_code_action = resolved_code_action.as_ref().unwrap_or(code_action);
+
+                        if let Some(ref workspace_edit) = resolved_code_action.edit {
                             log::debug!("edit: {:?}", workspace_edit);
                             let _ = apply_workspace_edit(editor, offset_encoding, workspace_edit);
                         }

From 5c41f22c2a20a1b8a91ddd6397686bd752591ffc Mon Sep 17 00:00:00 2001
From: Ryan Fowler <ryan.fowler19@gmail.com>
Date: Fri, 21 Jul 2023 15:21:21 -0700
Subject: [PATCH 167/967] Add support for LSP DidChangeWatchedFiles (#7665)

* Add initial support for LSP DidChangeWatchedFiles

* Move file event Handler to helix-lsp

* Simplify file event handling

* Refactor file event handling

* Block on future within LSP file event handler

* Fully qualify uses of the file_event::Handler type

* Rename ops field to options

* Revert newline removal from helix-view/Cargo.toml

* Ensure file event Handler is cleaned up when lsp client is shutdown
---
 Cargo.lock                       |  30 ++---
 helix-lsp/Cargo.toml             |   1 +
 helix-lsp/src/client.rs          |  13 +++
 helix-lsp/src/file_event.rs      | 193 +++++++++++++++++++++++++++++++
 helix-lsp/src/lib.rs             |  11 ++
 helix-term/src/application.rs    |  70 +++++++++--
 helix-term/src/commands/typed.rs |  15 ++-
 helix-view/src/editor.rs         |  21 +++-
 8 files changed, 325 insertions(+), 29 deletions(-)
 create mode 100644 helix-lsp/src/file_event.rs

diff --git a/Cargo.lock b/Cargo.lock
index a26bdfcad..85848f9bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -51,9 +51,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
 dependencies = [
  "memchr",
 ]
@@ -126,13 +126,12 @@ checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
 
 [[package]]
 name = "bstr"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
- "once_cell",
- "regex-automata 0.1.10",
+ "regex-automata",
  "serde",
 ]
 
@@ -1149,11 +1148,11 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick 1.0.2",
  "bstr",
  "fnv",
  "log",
@@ -1292,6 +1291,7 @@ dependencies = [
  "anyhow",
  "futures-executor",
  "futures-util",
+ "globset",
  "helix-core",
  "helix-loader",
  "helix-parsec",
@@ -1878,25 +1878,19 @@ version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
- "aho-corasick 1.0.1",
+ "aho-corasick 1.0.2",
  "memchr",
- "regex-automata 0.3.2",
+ "regex-automata",
  "regex-syntax 0.7.3",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
 [[package]]
 name = "regex-automata"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
 dependencies = [
- "aho-corasick 1.0.1",
+ "aho-corasick 1.0.2",
  "memchr",
  "regex-syntax 0.7.3",
 ]
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index b4abeb8ac..33c63e0a0 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -19,6 +19,7 @@ helix-parsec = { version = "0.6", path = "../helix-parsec" }
 anyhow = "1.0"
 futures-executor = "0.3"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
+globset = "0.4.11"
 log = "0.4"
 lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 92ab03db7..ed9a2f830 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -544,6 +544,10 @@ impl Client {
                         normalizes_line_endings: Some(false),
                         change_annotation_support: None,
                     }),
+                    did_change_watched_files: Some(lsp::DidChangeWatchedFilesClientCapabilities {
+                        dynamic_registration: Some(true),
+                        relative_pattern_support: Some(false),
+                    }),
                     ..Default::default()
                 }),
                 text_document: Some(lsp::TextDocumentClientCapabilities {
@@ -1453,4 +1457,13 @@ impl Client {
 
         Some(self.call::<lsp::request::ExecuteCommand>(params))
     }
+
+    pub fn did_change_watched_files(
+        &self,
+        changes: Vec<lsp::FileEvent>,
+    ) -> impl Future<Output = std::result::Result<(), Error>> {
+        self.notify::<lsp::notification::DidChangeWatchedFiles>(lsp::DidChangeWatchedFilesParams {
+            changes,
+        })
+    }
 }
diff --git a/helix-lsp/src/file_event.rs b/helix-lsp/src/file_event.rs
new file mode 100644
index 000000000..26a27c98b
--- /dev/null
+++ b/helix-lsp/src/file_event.rs
@@ -0,0 +1,193 @@
+use std::{collections::HashMap, path::PathBuf, sync::Weak};
+
+use globset::{GlobBuilder, GlobSetBuilder};
+use tokio::sync::mpsc;
+
+use crate::{lsp, Client};
+
+enum Event {
+    FileChanged {
+        path: PathBuf,
+    },
+    Register {
+        client_id: usize,
+        client: Weak<Client>,
+        registration_id: String,
+        options: lsp::DidChangeWatchedFilesRegistrationOptions,
+    },
+    Unregister {
+        client_id: usize,
+        registration_id: String,
+    },
+    RemoveClient {
+        client_id: usize,
+    },
+}
+
+#[derive(Default)]
+struct ClientState {
+    client: Weak<Client>,
+    registered: HashMap<String, globset::GlobSet>,
+}
+
+/// The Handler uses a dedicated tokio task to respond to file change events by
+/// forwarding changes to LSPs that have registered for notifications with a
+/// matching glob.
+///
+/// When an LSP registers for the DidChangeWatchedFiles notification, the
+/// Handler is notified by sending the registration details in addition to a
+/// weak reference to the LSP client. This is done so that the Handler can have
+/// access to the client without preventing the client from being dropped if it
+/// is closed and the Handler isn't properly notified.
+#[derive(Clone, Debug)]
+pub struct Handler {
+    tx: mpsc::UnboundedSender<Event>,
+}
+
+impl Default for Handler {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Handler {
+    pub fn new() -> Self {
+        let (tx, rx) = mpsc::unbounded_channel();
+        tokio::spawn(Self::run(rx));
+        Self { tx }
+    }
+
+    pub fn register(
+        &self,
+        client_id: usize,
+        client: Weak<Client>,
+        registration_id: String,
+        options: lsp::DidChangeWatchedFilesRegistrationOptions,
+    ) {
+        let _ = self.tx.send(Event::Register {
+            client_id,
+            client,
+            registration_id,
+            options,
+        });
+    }
+
+    pub fn unregister(&self, client_id: usize, registration_id: String) {
+        let _ = self.tx.send(Event::Unregister {
+            client_id,
+            registration_id,
+        });
+    }
+
+    pub fn file_changed(&self, path: PathBuf) {
+        let _ = self.tx.send(Event::FileChanged { path });
+    }
+
+    pub fn remove_client(&self, client_id: usize) {
+        let _ = self.tx.send(Event::RemoveClient { client_id });
+    }
+
+    async fn run(mut rx: mpsc::UnboundedReceiver<Event>) {
+        let mut state: HashMap<usize, ClientState> = HashMap::new();
+        while let Some(event) = rx.recv().await {
+            match event {
+                Event::FileChanged { path } => {
+                    log::debug!("Received file event for {:?}", &path);
+
+                    state.retain(|id, client_state| {
+                        if !client_state
+                            .registered
+                            .values()
+                            .any(|glob| glob.is_match(&path))
+                        {
+                            return true;
+                        }
+                        let Some(client) = client_state.client.upgrade() else {
+                            log::warn!("LSP client was dropped: {id}");
+                            return false;
+                        };
+                        let Ok(uri) = lsp::Url::from_file_path(&path) else {
+                            return true;
+                        };
+                        log::debug!(
+                            "Sending didChangeWatchedFiles notification to client '{}'",
+                            client.name()
+                        );
+                        if let Err(err) = crate::block_on(client
+                            .did_change_watched_files(vec![lsp::FileEvent {
+                                uri,
+                                // We currently always send the CHANGED state
+                                // since we don't actually have more context at
+                                // the moment.
+                                typ: lsp::FileChangeType::CHANGED,
+                            }]))
+                        {
+                            log::warn!("Failed to send didChangeWatchedFiles notification to client: {err}");
+                        }
+                        true
+                    });
+                }
+                Event::Register {
+                    client_id,
+                    client,
+                    registration_id,
+                    options: ops,
+                } => {
+                    log::debug!(
+                        "Registering didChangeWatchedFiles for client '{}' with id '{}'",
+                        client_id,
+                        registration_id
+                    );
+
+                    let mut entry = state.entry(client_id).or_insert_with(ClientState::default);
+                    entry.client = client;
+
+                    let mut builder = GlobSetBuilder::new();
+                    for watcher in ops.watchers {
+                        if let lsp::GlobPattern::String(pattern) = watcher.glob_pattern {
+                            if let Ok(glob) = GlobBuilder::new(&pattern).build() {
+                                builder.add(glob);
+                            }
+                        }
+                    }
+                    match builder.build() {
+                        Ok(globset) => {
+                            entry.registered.insert(registration_id, globset);
+                        }
+                        Err(err) => {
+                            // Remove any old state for that registration id and
+                            // remove the entire client if it's now empty.
+                            entry.registered.remove(&registration_id);
+                            if entry.registered.is_empty() {
+                                state.remove(&client_id);
+                            }
+                            log::warn!(
+                                "Unable to build globset for LSP didChangeWatchedFiles {err}"
+                            )
+                        }
+                    }
+                }
+                Event::Unregister {
+                    client_id,
+                    registration_id,
+                } => {
+                    log::debug!(
+                        "Unregistering didChangeWatchedFiles with id '{}' for client '{}'",
+                        registration_id,
+                        client_id
+                    );
+                    if let Some(client_state) = state.get_mut(&client_id) {
+                        client_state.registered.remove(&registration_id);
+                        if client_state.registered.is_empty() {
+                            state.remove(&client_id);
+                        }
+                    }
+                }
+                Event::RemoveClient { client_id } => {
+                    log::debug!("Removing LSP client: {client_id}");
+                    state.remove(&client_id);
+                }
+            }
+        }
+    }
+}
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 95c61086e..90f0c3fd7 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -1,4 +1,5 @@
 mod client;
+pub mod file_event;
 pub mod jsonrpc;
 pub mod snippet;
 mod transport;
@@ -547,6 +548,7 @@ pub enum MethodCall {
     WorkspaceFolders,
     WorkspaceConfiguration(lsp::ConfigurationParams),
     RegisterCapability(lsp::RegistrationParams),
+    UnregisterCapability(lsp::UnregistrationParams),
 }
 
 impl MethodCall {
@@ -570,6 +572,10 @@ impl MethodCall {
                 let params: lsp::RegistrationParams = params.parse()?;
                 Self::RegisterCapability(params)
             }
+            lsp::request::UnregisterCapability::METHOD => {
+                let params: lsp::UnregistrationParams = params.parse()?;
+                Self::UnregisterCapability(params)
+            }
             _ => {
                 return Err(Error::Unhandled);
             }
@@ -629,6 +635,7 @@ pub struct Registry {
     syn_loader: Arc<helix_core::syntax::Loader>,
     counter: usize,
     pub incoming: SelectAll<UnboundedReceiverStream<(usize, Call)>>,
+    pub file_event_handler: file_event::Handler,
 }
 
 impl Registry {
@@ -638,6 +645,7 @@ impl Registry {
             syn_loader,
             counter: 0,
             incoming: SelectAll::new(),
+            file_event_handler: file_event::Handler::new(),
         }
     }
 
@@ -650,6 +658,7 @@ impl Registry {
     }
 
     pub fn remove_by_id(&mut self, id: usize) {
+        self.file_event_handler.remove_client(id);
         self.inner.retain(|_, language_servers| {
             language_servers.retain(|ls| id != ls.id());
             !language_servers.is_empty()
@@ -715,6 +724,7 @@ impl Registry {
                         .unwrap();
 
                     for old_client in old_clients {
+                        self.file_event_handler.remove_client(old_client.id());
                         tokio::spawn(async move {
                             let _ = old_client.force_shutdown().await;
                         });
@@ -731,6 +741,7 @@ impl Registry {
     pub fn stop(&mut self, name: &str) {
         if let Some(clients) = self.inner.remove(name) {
             for client in clients {
+                self.file_event_handler.remove_client(client.id());
                 tokio::spawn(async move {
                     let _ = client.force_shutdown().await;
                 });
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index b8950ae0b..dc4611989 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -5,7 +5,11 @@ use helix_core::{
     path::get_relative_path,
     pos_at_coords, syntax, Selection,
 };
-use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
+use helix_lsp::{
+    lsp::{self, notification::Notification},
+    util::lsp_pos_to_pos,
+    LspProgressMap,
+};
 use helix_view::{
     align_view,
     document::DocumentSavedEventResult,
@@ -1080,17 +1084,65 @@ impl Application {
                             .collect();
                         Ok(json!(result))
                     }
-                    Ok(MethodCall::RegisterCapability(_params)) => {
-                        log::warn!("Ignoring a client/registerCapability request because dynamic capability registration is not enabled. Please report this upstream to the language server");
-                        // Language Servers based on the `vscode-languageserver-node` library often send
-                        // client/registerCapability even though we do not enable dynamic registration
-                        // for any capabilities. We should send a MethodNotFound JSONRPC error in this
-                        // case but that rejects the registration promise in the server which causes an
-                        // exit. So we work around this by ignoring the request and sending back an OK
-                        // response.
+                    Ok(MethodCall::RegisterCapability(params)) => {
+                        if let Some(client) = self
+                            .editor
+                            .language_servers
+                            .iter_clients()
+                            .find(|client| client.id() == server_id)
+                        {
+                            for reg in params.registrations {
+                                match reg.method.as_str() {
+                                    lsp::notification::DidChangeWatchedFiles::METHOD => {
+                                        let Some(options) = reg.register_options else {
+                                            continue;
+                                        };
+                                        let ops: lsp::DidChangeWatchedFilesRegistrationOptions =
+                                            match serde_json::from_value(options) {
+                                                Ok(ops) => ops,
+                                                Err(err) => {
+                                                    log::warn!("Failed to deserialize DidChangeWatchedFilesRegistrationOptions: {err}");
+                                                    continue;
+                                                }
+                                            };
+                                        self.editor.language_servers.file_event_handler.register(
+                                            client.id(),
+                                            Arc::downgrade(client),
+                                            reg.id,
+                                            ops,
+                                        )
+                                    }
+                                    _ => {
+                                        // Language Servers based on the `vscode-languageserver-node` library often send
+                                        // client/registerCapability even though we do not enable dynamic registration
+                                        // for most capabilities. We should send a MethodNotFound JSONRPC error in this
+                                        // case but that rejects the registration promise in the server which causes an
+                                        // exit. So we work around this by ignoring the request and sending back an OK
+                                        // response.
+                                        log::warn!("Ignoring a client/registerCapability request because dynamic capability registration is not enabled. Please report this upstream to the language server");
+                                    }
+                                }
+                            }
+                        }
 
                         Ok(serde_json::Value::Null)
                     }
+                    Ok(MethodCall::UnregisterCapability(params)) => {
+                        for unreg in params.unregisterations {
+                            match unreg.method.as_str() {
+                                lsp::notification::DidChangeWatchedFiles::METHOD => {
+                                    self.editor
+                                        .language_servers
+                                        .file_event_handler
+                                        .unregister(server_id, unreg.id);
+                                }
+                                _ => {
+                                    log::warn!("Received unregistration request for unsupported method: {}", unreg.method);
+                                }
+                            }
+                        }
+                        Ok(serde_json::Value::Null)
+                    }
                 };
 
                 tokio::spawn(language_server!().reply(id, reply));
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index dfc71dfdc..063658c60 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1283,7 +1283,14 @@ fn reload(
     doc.reload(view, &cx.editor.diff_providers, redraw_handle)
         .map(|_| {
             view.ensure_cursor_in_view(doc, scrolloff);
-        })
+        })?;
+    if let Some(path) = doc.path() {
+        cx.editor
+            .language_servers
+            .file_event_handler
+            .file_changed(path.clone());
+    }
+    Ok(())
 }
 
 fn reload_all(
@@ -1324,6 +1331,12 @@ fn reload_all(
 
         let redraw_handle = cx.editor.redraw_handle.clone();
         doc.reload(view, &cx.editor.diff_providers, redraw_handle)?;
+        if let Some(path) = doc.path() {
+            cx.editor
+                .language_servers
+                .file_event_handler
+                .file_changed(path.clone());
+        }
 
         for view_id in view_ids {
             let view = view_mut!(cx.editor, view_id);
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index affe87dd2..20469ae94 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1535,7 +1535,18 @@ impl Editor {
 
         let path = path.map(|path| path.into());
         let doc = doc_mut!(self, &doc_id);
-        let future = doc.save(path, force)?;
+        let doc_save_future = doc.save(path, force)?;
+
+        // When a file is written to, notify the file event handler.
+        // Note: This can be removed once proper file watching is implemented.
+        let handler = self.language_servers.file_event_handler.clone();
+        let future = async move {
+            let res = doc_save_future.await;
+            if let Ok(event) = &res {
+                handler.file_changed(event.path.clone());
+            }
+            res
+        };
 
         use futures_util::stream;
 
@@ -1671,6 +1682,14 @@ impl Editor {
         &self,
         timeout: Option<u64>,
     ) -> Result<(), tokio::time::error::Elapsed> {
+        // Remove all language servers from the file event handler.
+        // Note: this is non-blocking.
+        for client in self.language_servers.iter_clients() {
+            self.language_servers
+                .file_event_handler
+                .remove_client(client.id());
+        }
+
         tokio::time::timeout(
             Duration::from_millis(timeout.unwrap_or(3000)),
             future::join_all(

From 505213d41b5a4807431f623fae53180e06d867a7 Mon Sep 17 00:00:00 2001
From: Jonas Tepe <9396911+jtepe@users.noreply.github.com>
Date: Sat, 22 Jul 2023 16:31:24 +0200
Subject: [PATCH 168/967] Drop mut from variable to silence linter (#7704)

---
 helix-lsp/src/file_event.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-lsp/src/file_event.rs b/helix-lsp/src/file_event.rs
index 26a27c98b..93457fa55 100644
--- a/helix-lsp/src/file_event.rs
+++ b/helix-lsp/src/file_event.rs
@@ -139,7 +139,7 @@ impl Handler {
                         registration_id
                     );
 
-                    let mut entry = state.entry(client_id).or_insert_with(ClientState::default);
+                    let entry = state.entry(client_id).or_insert_with(ClientState::default);
                     entry.client = client;
 
                     let mut builder = GlobSetBuilder::new();

From 48d57dad471a0cb8b26aa93edc379f38b813ad72 Mon Sep 17 00:00:00 2001
From: Ravi Shekhar Jethani <rsjethani@gmail.com>
Date: Sun, 23 Jul 2023 09:45:13 +0200
Subject: [PATCH 169/967] Fix selection highlighting in remaining gruvbox
 derived themes (#7717)

---
 runtime/themes/gruvbox_dark_hard.toml | 2 --
 runtime/themes/gruvbox_light.toml     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/runtime/themes/gruvbox_dark_hard.toml b/runtime/themes/gruvbox_dark_hard.toml
index d0d42bcde..1e2fd9e93 100644
--- a/runtime/themes/gruvbox_dark_hard.toml
+++ b/runtime/themes/gruvbox_dark_hard.toml
@@ -4,8 +4,6 @@
 
 inherits = "gruvbox"
 
-"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
-"ui.selection.primary" = { bg = "bg4", modifiers = ["reversed"] }
 "ui.cursor.primary" = { modifiers = ["reversed"] }
 "ui.cursor.match" = { bg = "bg2" }
 
diff --git a/runtime/themes/gruvbox_light.toml b/runtime/themes/gruvbox_light.toml
index 749df1101..59ce99011 100644
--- a/runtime/themes/gruvbox_light.toml
+++ b/runtime/themes/gruvbox_light.toml
@@ -4,8 +4,6 @@
 
 inherits = "gruvbox"
 
-"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
-"ui.selection.primary" = { bg = "bg4", modifiers = ["reversed"] }
 "ui.cursor.primary" = { modifiers = ["reversed"] }
 "ui.cursor.match" = { bg = "bg2" }
 

From 5ec126d3e27dcfe2544396b664cbad04611ad7eb Mon Sep 17 00:00:00 2001
From: sigmaSd <bedisnbiba@gmail.com>
Date: Mon, 24 Jul 2023 14:51:35 +0100
Subject: [PATCH 170/967] Fix docs for default statusline config (#7720)

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

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 1b94ae856..da1d1bf6e 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -89,9 +89,9 @@ The `[editor.statusline]` key takes the following sub-keys:
 
 | Key           | Description | Default |
 | ---           | ---         | ---     |
-| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
+| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "file-modification-indicator"]` |
 | `center`      | A list of elements aligned to the middle of the statusline | `[]` |
-| `right`       | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
+| `right`       | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "register", "position", "file-encoding"]` |
 | `separator`   | The character used to separate elements in the statusline | `"│"` |
 | `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
 | `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |

From 46251a14111c5fafb7354ee805a9a04ca1d79813 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 03:03:03 +0200
Subject: [PATCH 171/967] build(deps): bump tempfile from 3.6.0 to 3.7.0
 (#7726)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 52 ++++++++++++++++++++---------------------
 helix-loader/Cargo.toml |  2 +-
 helix-term/Cargo.toml   |  2 +-
 helix-vcs/Cargo.toml    |  2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 85848f9bb..952cd4572 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -403,15 +403,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.0"
@@ -963,7 +954,7 @@ dependencies = [
  "gix-command",
  "gix-config-value",
  "parking_lot",
- "rustix",
+ "rustix 0.37.15",
  "thiserror",
 ]
 
@@ -1112,7 +1103,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7058c94f4164fcf5b8457d35f6d8f6e1007f9f7f938c9c7684a7e01d23c6ddde"
 dependencies = [
- "fastrand 2.0.0",
+ "fastrand",
 ]
 
 [[package]]
@@ -1518,15 +1509,6 @@ version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "io-close"
 version = "0.3.7"
@@ -1609,6 +1591,12 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+
 [[package]]
 name = "lock_api"
 version = "0.4.9"
@@ -1933,7 +1921,20 @@ dependencies = [
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.3.4",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.3",
  "windows-sys 0.48.0",
 ]
 
@@ -2156,15 +2157,14 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.6.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
 dependencies = [
- "autocfg",
  "cfg-if",
- "fastrand 1.9.0",
+ "fastrand",
  "redox_syscall 0.3.5",
- "rustix",
+ "rustix 0.38.4",
  "windows-sys 0.48.0",
 ]
 
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 903d36c06..80265d30e 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -28,7 +28,7 @@ which = "4.4"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.6.0"
+tempfile = "3.7.0"
 dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 52893e317..30ac60b82 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -79,4 +79,4 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.11"
 indoc = "2.0.3"
-tempfile = "3.6.0"
+tempfile = "3.7.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 5ddadad3b..9f3cc7c89 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -27,4 +27,4 @@ log = "0.4"
 git = ["gix"]
 
 [dev-dependencies]
-tempfile = "3.6"
\ No newline at end of file
+tempfile = "3.7"
\ No newline at end of file

From 7295340119767ae9093b7dd692a797d1db196ef7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 03:03:16 +0200
Subject: [PATCH 172/967] build(deps): bump serde from 1.0.171 to 1.0.175
 (#7727)

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 952cd4572..11bab8a21 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1967,18 +1967,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.171"
+version = "1.0.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
+checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.171"
+version = "1.0.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
+checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
 dependencies = [
  "proc-macro2",
  "quote",

From 00dc2051085b16e43c6be2bcd01478cee1238efc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 03:03:50 +0200
Subject: [PATCH 173/967] build(deps): bump thiserror from 1.0.43 to 1.0.44
 (#7730)

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 11bab8a21..f79491084 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2199,18 +2199,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
  "proc-macro2",
  "quote",

From b266628c17efad2b572364fea50144669c4c385b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 03:04:01 +0200
Subject: [PATCH 174/967] build(deps): bump signal-hook from 0.3.16 to 0.3.17
 (#7728)

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 f79491084..8c8bce2a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2024,9 +2024,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
 dependencies = [
  "libc",
  "signal-hook-registry",

From a188282b37cd89e5d892493fa142497a2b723a58 Mon Sep 17 00:00:00 2001
From: Federico Stra <stra.federico@gmail.com>
Date: Tue, 25 Jul 2023 23:55:02 +0200
Subject: [PATCH 175/967] Update soft-wrap indicator in gruvbox themes (#7736)

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

diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index c357e26c2..6025852c5 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -61,6 +61,7 @@
 "ui.virtual.whitespace" = "bg2"
 "ui.virtual.ruler" = { bg = "bg1" }
 "ui.virtual.inlay-hint" = { fg = "gray1" }
+"ui.virtual.wrap" = { fg = "bg2" }
 
 "diagnostic.warning" = { underline = { color = "orange1", style = "curl" } }
 "diagnostic.error" = { underline = { color = "red1", style = "curl" } }

From 75239a938f654d681ddb679ad68ae6469c026d5b Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 26 Jul 2023 06:56:02 +0900
Subject: [PATCH 176/967] fix incorrect predicate in comment highlights (#7732)

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

diff --git a/runtime/queries/comment/highlights.scm b/runtime/queries/comment/highlights.scm
index 3b25531a8..6255d2858 100644
--- a/runtime/queries/comment/highlights.scm
+++ b/runtime/queries/comment/highlights.scm
@@ -28,10 +28,10 @@
 
 ; Error level tags
 ((tag (name) @error)
- (match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
+ (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
 
 ("text" @error
- (match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
+ (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
 
 (tag
  (name) @ui.text

From 5a5289701429c2d7019d11d2184833745865063f Mon Sep 17 00:00:00 2001
From: saltlakrits <48454031+saltlakrits@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:31:35 +0200
Subject: [PATCH 177/967] Update everforest_dark.toml to add missing color
 definitions (#7739)

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

diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 6903d1e54..25a491345 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -138,3 +138,7 @@ purple = "#d699b6"
 grey0 = "#7a8478"
 grey1 = "#859289"
 grey2 = "#9da9a0"
+
+statusline1 = "#a7c080"
+statusline2 = "#d3c6aa"
+statusline3 = "#e67e80"

From dea6894f92b23d6c94196e590efa01c491b5d6b2 Mon Sep 17 00:00:00 2001
From: eh <correia.eh@gmail.com>
Date: Wed, 26 Jul 2023 16:33:10 -0400
Subject: [PATCH 178/967] Theme Pop-Dark: Increase Diagnostics clarity (#7702)

---
 runtime/themes/pop-dark.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml
index 6393dd730..54db3d1b1 100644
--- a/runtime/themes/pop-dark.toml
+++ b/runtime/themes/pop-dark.toml
@@ -4,10 +4,10 @@
 # Version: 1.0
 # This theme is based on Nathaniel Webb's VSCodePopTheme <https://github.com/ArtisanByteCrafter/VSCodePopTheme>
 
-info = { fg = 'yellowH', bg = 'brownD' }
-hint = { fg = 'brownD', bg = 'yellowH', modifiers = ['bold'] }
-warning = { fg = 'brownD', bg = 'orangeW', modifiers = ['bold'] }
-error = { fg = 'brownD', bg = 'redE', modifiers = ['bold'] }
+info = { fg = 'brownD' }
+hint = { fg = 'yellowH', modifiers = ['bold'] }
+warning = { fg = 'orangeW', modifiers = ['bold'] }
+error = { fg = 'redE', modifiers = ['bold'] }
 'diagnostic.info'.underline = { color = 'yellowH', style = 'curl' } 
 'diagnostic.hint'.underline = { color = 'yellowH', style = 'curl' } 
 'diagnostic.warning'.underline = { color = 'orangeW', style = 'curl' } 

From 6a431afc4e650efd2eca4afdf1122b3896e43ee3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 26 Jul 2023 21:48:16 -0500
Subject: [PATCH 179/967] Save an undo checkpoint before accepting completion
 (#7747)

---
 helix-term/src/ui/completion.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 1ebcd192c..c7f9250d5 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -292,6 +292,8 @@ impl Completion {
                     };
                     // if more text was entered, remove it
                     doc.restore(view, &savepoint, true);
+                    // save an undo checkpoint before the completion
+                    doc.append_changes_to_history(view);
                     let transaction = item_to_transaction(
                         doc,
                         view.id,

From 0dc3753eb2a1af296f5faffaf9c3d29bceb5a37f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 25 Jul 2023 14:20:33 -0500
Subject: [PATCH 180/967] Syntax-highlight regex prompts

We can use tree-sitter-regex highlighting in prompts for entering
regexes, like `search` or `global_search`. The `highlighted_code_block`
function from the markdown component makes this a very small change.

This could be improved in the future by leaving the parsed syntax tree
on the prompt, allowing incremental updates. Prompt lines are usually so
short though and tree-sitter-regex is rather small and uncomplicated,
so that improvement probably wouldn't make a big difference.
---
 helix-term/src/ui/mod.rs    |  3 ++-
 helix-term/src/ui/prompt.rs | 45 +++++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 3359155d5..8ca1b131f 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -151,7 +151,8 @@ pub fn regex_prompt(
                 }
             }
         },
-    );
+    )
+    .with_language("regex", std::sync::Arc::clone(&cx.editor.syn_loader));
     // Calculate initial completion
     prompt.recalculate_completion(cx.editor);
     // prompt
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 4f383bf56..f376b9c9c 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -1,7 +1,9 @@
 use crate::compositor::{Component, Compositor, Context, Event, EventResult};
 use crate::{alt, ctrl, key, shift, ui};
+use helix_core::syntax;
 use helix_view::input::KeyEvent;
 use helix_view::keyboard::KeyCode;
+use std::sync::Arc;
 use std::{borrow::Cow, ops::RangeFrom};
 use tui::buffer::Buffer as Surface;
 use tui::widgets::{Block, Borders, Widget};
@@ -32,6 +34,7 @@ pub struct Prompt {
     callback_fn: CallbackFn,
     pub doc_fn: DocFn,
     next_char_handler: Option<PromptCharHandler>,
+    language: Option<(&'static str, Arc<syntax::Loader>)>,
 }
 
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -83,6 +86,7 @@ impl Prompt {
             callback_fn: Box::new(callback_fn),
             doc_fn: Box::new(|_| None),
             next_char_handler: None,
+            language: None,
         }
     }
 
@@ -94,6 +98,11 @@ impl Prompt {
         self
     }
 
+    pub fn with_language(mut self, language: &'static str, loader: Arc<syntax::Loader>) -> Self {
+        self.language = Some((language, loader));
+        self
+    }
+
     pub fn line(&self) -> &String {
         &self.line
     }
@@ -456,30 +465,28 @@ impl Prompt {
         // render buffer text
         surface.set_string(area.x, area.y + line, &self.prompt, prompt_color);
 
-        let (input, is_suggestion): (Cow<str>, bool) = if self.line.is_empty() {
-            // latest value in the register list
-            match self
+        let line_area = area.clip_left(self.prompt.len() as u16).clip_top(line);
+        if self.line.is_empty() {
+            // Show the most recently entered value as a suggestion.
+            if let Some(suggestion) = self
                 .history_register
                 .and_then(|reg| cx.editor.registers.last(reg))
-                .map(|entry| entry.into())
             {
-                Some(value) => (value, true),
-                None => (Cow::from(""), false),
+                surface.set_string(line_area.x, line_area.y, suggestion, suggestion_color);
             }
+        } else if let Some((language, loader)) = self.language.as_ref() {
+            let mut text: ui::text::Text = crate::ui::markdown::highlighted_code_block(
+                self.line.clone(),
+                language,
+                Some(&cx.editor.theme),
+                loader.clone(),
+                None,
+            )
+            .into();
+            text.render(line_area, surface, cx);
         } else {
-            (self.line.as_str().into(), false)
-        };
-
-        surface.set_string(
-            area.x + self.prompt.len() as u16,
-            area.y + line,
-            &input,
-            if is_suggestion {
-                suggestion_color
-            } else {
-                prompt_color
-            },
-        );
+            surface.set_string(line_area.x, line_area.y, self.line.clone(), prompt_color);
+        }
     }
 }
 

From f0b877e2588306882f71eaad45a3f3e604885a34 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 25 Jul 2023 16:11:11 -0500
Subject: [PATCH 181/967] Tune regex highlights for usage in prompts

Since regex is almost always injected into other languages,
`pattern_character`s will inherit the highlight for the structure that
injects them (for example `/foo/` in JavaScript or `~r/foo/` in Elixir).
This removes the string highlight when used in the prompt.

We also add `ERROR` node highlighting so that errors in regex syntax
appear in the prompt. This resolves a TODO in the `regex_prompt`
function about highlighting errors in the regex.
---
 helix-term/src/ui/mod.rs             | 3 ---
 runtime/queries/regex/highlights.scm | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 8ca1b131f..215794e3c 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -142,9 +142,6 @@ pub fn regex_prompt(
                                 };
 
                                 cx.jobs.callback(callback);
-                            } else {
-                                // Update
-                                // TODO: mark command line as error
                             }
                         }
                     }
diff --git a/runtime/queries/regex/highlights.scm b/runtime/queries/regex/highlights.scm
index cad08f409..302cc6b31 100644
--- a/runtime/queries/regex/highlights.scm
+++ b/runtime/queries/regex/highlights.scm
@@ -50,4 +50,4 @@
   ])
 
 (class_character) @constant.character
-(pattern_character) @string
+(ERROR) @error

From 98ef05d768d287fef2eb790e0a8a6e9a72832e00 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 25 Jul 2023 13:15:36 -0500
Subject: [PATCH 182/967] Prefer RopeSlice to &Rope in helix_core::syntax

Pascal and I discussed this and we think it's generally better to
take a 'RopeSlice' rather than a '&Rope'. The code block rendering
function in the markdown component module is a good example for how
this can be useful: we can remove an allocation of a rope and instead
directly turn a '&str' into a 'RopeSlice' which is very cheap.

A change to prefer 'RopeSlice' to '&Rope' whenever the rope isn't
modified would be nice, but it would be a very large diff (around 500+
500-). Starting off with just the syntax functions seems like a nice
middle-ground, and we can remove a Rope allocation because of it.

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 helix-core/src/history.rs     |  4 ++--
 helix-core/src/syntax.rs      | 29 ++++++++++++++++-------------
 helix-core/src/transaction.rs | 13 +++++++------
 helix-core/tests/indent.rs    |  4 ++--
 helix-term/src/ui/markdown.rs |  8 ++++----
 helix-term/src/ui/picker.rs   |  6 +++---
 helix-view/src/document.rs    | 18 +++++++++++-------
 7 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index 1aac38d93..28d6dd6ec 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -72,8 +72,8 @@ impl Default for History {
             revisions: vec![Revision {
                 parent: 0,
                 last_child: None,
-                transaction: Transaction::from(ChangeSet::new(&Rope::new())),
-                inversion: Transaction::from(ChangeSet::new(&Rope::new())),
+                transaction: Transaction::from(ChangeSet::new("".into())),
+                inversion: Transaction::from(ChangeSet::new("".into())),
                 timestamp: Instant::now(),
             }],
             current: 0,
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 73d3f7387..79fb52a79 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -4,7 +4,7 @@ use crate::{
     diagnostic::Severity,
     regex::Regex,
     transaction::{ChangeSet, Operation},
-    Rope, RopeSlice, Tendril,
+    RopeSlice, Tendril,
 };
 
 use ahash::RandomState;
@@ -818,7 +818,10 @@ impl Loader {
         // TODO: content_regex handling conflict resolution
     }
 
-    pub fn language_config_for_shebang(&self, source: &Rope) -> Option<Arc<LanguageConfiguration>> {
+    pub fn language_config_for_shebang(
+        &self,
+        source: RopeSlice,
+    ) -> Option<Arc<LanguageConfiguration>> {
         let line = Cow::from(source.line(0));
         static SHEBANG_REGEX: Lazy<Regex> =
             Lazy::new(|| Regex::new(&["^", SHEBANG].concat()).unwrap());
@@ -928,7 +931,7 @@ fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<st
 
 impl Syntax {
     pub fn new(
-        source: &Rope,
+        source: RopeSlice,
         config: Arc<HighlightConfiguration>,
         loader: Arc<Loader>,
     ) -> Option<Self> {
@@ -967,8 +970,8 @@ impl Syntax {
 
     pub fn update(
         &mut self,
-        old_source: &Rope,
-        source: &Rope,
+        old_source: RopeSlice,
+        source: RopeSlice,
         changeset: &ChangeSet,
     ) -> Result<(), Error> {
         let mut queue = VecDeque::new();
@@ -1387,7 +1390,7 @@ impl LanguageLayer {
         self.tree.as_ref().unwrap()
     }
 
-    fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {
+    fn parse(&mut self, parser: &mut Parser, source: RopeSlice) -> Result<(), Error> {
         parser
             .set_included_ranges(&self.ranges)
             .map_err(|_| Error::InvalidRanges)?;
@@ -1418,7 +1421,7 @@ impl LanguageLayer {
 }
 
 pub(crate) fn generate_edits(
-    old_text: &Rope,
+    old_text: RopeSlice,
     changeset: &ChangeSet,
 ) -> Vec<tree_sitter::InputEdit> {
     use Operation::*;
@@ -1434,7 +1437,7 @@ pub(crate) fn generate_edits(
 
     // TODO; this is a lot easier with Change instead of Operation.
 
-    fn point_at_pos(text: &Rope, pos: usize) -> (usize, Point) {
+    fn point_at_pos(text: RopeSlice, pos: usize) -> (usize, Point) {
         let byte = text.char_to_byte(pos); // <- attempted to index past end
         let line = text.char_to_line(pos);
         let line_start_byte = text.line_to_byte(line);
@@ -2529,7 +2532,7 @@ mod test {
         let mut cursor = QueryCursor::new();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();
-        let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
+        let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
 
         let root = syntax.tree().root_node();
         let mut test = |capture, range| {
@@ -2603,7 +2606,7 @@ mod test {
             fn main() {}
         ",
         );
-        let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
+        let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
         let tree = syntax.tree();
         let root = tree.root_node();
         assert_eq!(root.kind(), "source_file");
@@ -2630,7 +2633,7 @@ mod test {
             &doc,
             vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
         );
-        let edits = generate_edits(&doc, transaction.changes());
+        let edits = generate_edits(doc.slice(..), transaction.changes());
         // transaction.apply(&mut state);
 
         assert_eq!(
@@ -2659,7 +2662,7 @@ mod test {
         let mut doc = Rope::from("fn test() {}");
         let transaction =
             Transaction::change(&doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
-        let edits = generate_edits(&doc, transaction.changes());
+        let edits = generate_edits(doc.slice(..), transaction.changes());
         transaction.apply(&mut doc);
 
         assert_eq!(doc, "fn test(a: u32) {}");
@@ -2693,7 +2696,7 @@ mod test {
         let language = get_language(language_name).unwrap();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();
-        let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
+        let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
 
         let root = syntax
             .tree()
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 9d2a3e5c4..fec62578b 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -1,3 +1,4 @@
+use ropey::RopeSlice;
 use smallvec::SmallVec;
 
 use crate::{Range, Rope, Selection, Tendril};
@@ -42,7 +43,7 @@ impl ChangeSet {
     }
 
     #[must_use]
-    pub fn new(doc: &Rope) -> Self {
+    pub fn new(doc: RopeSlice) -> Self {
         let len = doc.len_chars();
         Self {
             changes: Vec::new(),
@@ -485,7 +486,7 @@ impl Transaction {
     /// Create a new, empty transaction.
     pub fn new(doc: &Rope) -> Self {
         Self {
-            changes: ChangeSet::new(doc),
+            changes: ChangeSet::new(doc.slice(..)),
             selection: None,
         }
     }
@@ -946,9 +947,9 @@ mod test {
     #[test]
     fn combine_with_empty() {
         let empty = Rope::from("");
-        let a = ChangeSet::new(&empty);
+        let a = ChangeSet::new(empty.slice(..));
 
-        let mut b = ChangeSet::new(&empty);
+        let mut b = ChangeSet::new(empty.slice(..));
         b.insert("a".into());
 
         let changes = a.compose(b);
@@ -962,9 +963,9 @@ mod test {
         const TEST_CASE: &str = "Hello, これはヘリックスエディターです！";
 
         let empty = Rope::from("");
-        let a = ChangeSet::new(&empty);
+        let a = ChangeSet::new(empty.slice(..));
 
-        let mut b = ChangeSet::new(&empty);
+        let mut b = ChangeSet::new(empty.slice(..));
         b.insert(TEST_CASE.into());
 
         let changes = a.compose(b);
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index 409706bb9..1dec99894 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -72,9 +72,9 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
 
     let language_config = loader.language_config_for_scope(lang_scope).unwrap();
     let highlight_config = language_config.highlight_config(&[]).unwrap();
-    let syntax = Syntax::new(&doc, highlight_config, std::sync::Arc::new(loader)).unwrap();
-    let indent_query = language_config.indent_query().unwrap();
     let text = doc.slice(..);
+    let syntax = Syntax::new(text, highlight_config, std::sync::Arc::new(loader)).unwrap();
+    let indent_query = language_config.indent_query().unwrap();
 
     for i in 0..doc.len_lines() {
         let line = text.line(i);
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index def64434a..cb2abf68c 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -10,7 +10,7 @@ use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
 
 use helix_core::{
     syntax::{self, HighlightEvent, InjectionLanguageMarker, Syntax},
-    Rope,
+    RopeSlice,
 };
 use helix_view::{
     graphics::{Margin, Rect, Style},
@@ -45,13 +45,13 @@ pub fn highlighted_code_block<'a>(
         None => return styled_multiline_text(text, code_style),
     };
 
-    let rope = Rope::from(text.as_ref());
+    let ropeslice = RopeSlice::from(text);
     let syntax = config_loader
         .language_configuration_for_injection_string(&InjectionLanguageMarker::Name(
             language.into(),
         ))
         .and_then(|config| config.highlight_config(theme.scopes()))
-        .and_then(|config| Syntax::new(&rope, config, Arc::clone(&config_loader)));
+        .and_then(|config| Syntax::new(ropeslice, config, Arc::clone(&config_loader)));
 
     let syntax = match syntax {
         Some(s) => s,
@@ -59,7 +59,7 @@ pub fn highlighted_code_block<'a>(
     };
 
     let highlight_iter = syntax
-        .highlight_iter(rope.slice(..), None, None)
+        .highlight_iter(ropeslice, None, None)
         .map(|e| e.unwrap());
     let highlight_iter: Box<dyn Iterator<Item = HighlightEvent>> =
         if let Some(spans) = additional_highlight_spans {
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 13746cfc8..4605e2f18 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -453,9 +453,9 @@ impl<T: Item + 'static> Picker<T> {
                 let text = doc.text().clone();
                 let loader = cx.editor.syn_loader.clone();
                 let job = tokio::task::spawn_blocking(move || {
-                    let syntax = language_config
-                        .highlight_config(&loader.scopes())
-                        .and_then(|highlight_config| Syntax::new(&text, highlight_config, loader));
+                    let syntax = language_config.highlight_config(&loader.scopes()).and_then(
+                        |highlight_config| Syntax::new(text.slice(..), highlight_config, loader),
+                    );
                     let callback = move |editor: &mut Editor, compositor: &mut Compositor| {
                         let Some(syntax) = syntax else {
                             log::info!("highlighting picker item failed");
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index b08370f9f..af7e3a7e8 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -642,7 +642,7 @@ impl Document {
     ) -> Self {
         let (encoding, has_bom) = encoding_with_bom_info.unwrap_or((encoding::UTF_8, false));
         let line_ending = config.load().default_line_ending.into();
-        let changes = ChangeSet::new(&text);
+        let changes = ChangeSet::new(text.slice(..));
         let old_state = None;
 
         Self {
@@ -938,7 +938,7 @@ impl Document {
     ) -> Option<Arc<helix_core::syntax::LanguageConfiguration>> {
         config_loader
             .language_config_for_file_name(self.path.as_ref()?)
-            .or_else(|| config_loader.language_config_for_shebang(self.text()))
+            .or_else(|| config_loader.language_config_for_shebang(self.text().slice(..)))
     }
 
     /// Detect the indentation used in the file, or otherwise defaults to the language indentation
@@ -1030,7 +1030,7 @@ impl Document {
     ) {
         if let (Some(language_config), Some(loader)) = (language_config, loader) {
             if let Some(highlight_config) = language_config.highlight_config(&loader.scopes()) {
-                self.syntax = Syntax::new(&self.text, highlight_config, loader);
+                self.syntax = Syntax::new(self.text.slice(..), highlight_config, loader);
             }
 
             self.language = Some(language_config);
@@ -1165,7 +1165,11 @@ impl Document {
             // update tree-sitter syntax tree
             if let Some(syntax) = &mut self.syntax {
                 // TODO: no unwrap
-                let res = syntax.update(&old_doc, &self.text, transaction.changes());
+                let res = syntax.update(
+                    old_doc.slice(..),
+                    self.text.slice(..),
+                    transaction.changes(),
+                );
                 if res.is_err() {
                     log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
                     self.syntax = None;
@@ -1288,7 +1292,7 @@ impl Document {
 
         if success {
             // reset changeset to fix len
-            self.changes = ChangeSet::new(self.text());
+            self.changes = ChangeSet::new(self.text().slice(..));
             // Sync with changes with the jumplist selections.
             view.sync_changes(self);
         }
@@ -1371,7 +1375,7 @@ impl Document {
         }
         if success {
             // reset changeset to fix len
-            self.changes = ChangeSet::new(self.text());
+            self.changes = ChangeSet::new(self.text().slice(..));
             // Sync with changes with the jumplist selections.
             view.sync_changes(self);
         }
@@ -1394,7 +1398,7 @@ impl Document {
             return;
         }
 
-        let new_changeset = ChangeSet::new(self.text());
+        let new_changeset = ChangeSet::new(self.text().slice(..));
         let changes = std::mem::replace(&mut self.changes, new_changeset);
         // Instead of doing this messy merge we could always commit, and based on transaction
         // annotations either add a new layer or compose into the previous one.

From 953073a679dfe8ae4aff86e8a9bff680d14a5523 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 26 Jul 2023 10:26:56 -0500
Subject: [PATCH 183/967] highlighted_code_block: Take input text as &str

This removes a handful of allocations for functions calling into the
function, which is nice because the prompt may call this function on
every keypress.
---
 helix-term/src/ui/lsp.rs      | 4 ++--
 helix-term/src/ui/markdown.rs | 6 +++---
 helix-term/src/ui/prompt.rs   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/ui/lsp.rs b/helix-term/src/ui/lsp.rs
index 44050aa12..880df6d8e 100644
--- a/helix-term/src/ui/lsp.rs
+++ b/helix-term/src/ui/lsp.rs
@@ -62,7 +62,7 @@ impl Component for SignatureHelp {
         });
 
         let sig_text = crate::ui::markdown::highlighted_code_block(
-            self.signature.clone(),
+            &self.signature,
             &self.language,
             Some(&cx.editor.theme),
             Arc::clone(&self.config_loader),
@@ -109,7 +109,7 @@ impl Component for SignatureHelp {
         let max_text_width = (viewport.0 - PADDING).min(120);
 
         let signature_text = crate::ui::markdown::highlighted_code_block(
-            self.signature.clone(),
+            &self.signature,
             &self.language,
             None,
             Arc::clone(&self.config_loader),
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index cb2abf68c..1433381d5 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -17,7 +17,7 @@ use helix_view::{
     Theme,
 };
 
-fn styled_multiline_text<'a>(text: String, style: Style) -> Text<'a> {
+fn styled_multiline_text<'a>(text: &str, style: Style) -> Text<'a> {
     let spans: Vec<_> = text
         .lines()
         .map(|line| Span::styled(line.to_string(), style))
@@ -27,7 +27,7 @@ fn styled_multiline_text<'a>(text: String, style: Style) -> Text<'a> {
 }
 
 pub fn highlighted_code_block<'a>(
-    text: String,
+    text: &str,
     language: &str,
     theme: Option<&Theme>,
     config_loader: Arc<syntax::Loader>,
@@ -267,7 +267,7 @@ impl Markdown {
                             CodeBlockKind::Indented => "",
                         };
                         let tui_text = highlighted_code_block(
-                            text.to_string(),
+                            &text,
                             language,
                             theme,
                             Arc::clone(&self.config_loader),
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index f376b9c9c..1352f4937 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -476,7 +476,7 @@ impl Prompt {
             }
         } else if let Some((language, loader)) = self.language.as_ref() {
             let mut text: ui::text::Text = crate::ui::markdown::highlighted_code_block(
-                self.line.clone(),
+                &self.line,
                 language,
                 Some(&cx.editor.theme),
                 loader.clone(),

From 262a595e5343c5afd0f2570859b63ebf4c12b0fa Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 27 Jul 2023 04:50:40 +0200
Subject: [PATCH 184/967] pin TS to unreleased git revision to fix freezes
 (#7737)

---
 Cargo.lock              | 3 +--
 Cargo.toml              | 3 +++
 helix-core/Cargo.toml   | 2 +-
 helix-loader/Cargo.toml | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c8bce2a1..75bdbc9b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2359,8 +2359,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter"
 version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=7d4b0110a9e92161d247a051018ee42b0513e98d#7d4b0110a9e92161d247a051018ee42b0513e98d"
 dependencies = [
  "cc",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index c63518897..1d10dd9b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,3 +32,6 @@ inherits = "test"
 package.helix-core.opt-level = 2
 package.helix-tui.opt-level = 2
 package.helix-term.opt-level = 2
+
+[workspace.dependencies]
+tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "7d4b0110a9e92161d247a051018ee42b0513e98d" }
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 895ee5bcf..f45d97b8e 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -25,7 +25,7 @@ unicode-width = "0.1"
 unicode-general-category = "0.6"
 # slab = "0.4.2"
 slotmap = "1.0"
-tree-sitter = "0.20"
+tree-sitter.workspace = true
 once_cell = "1.18"
 arc-swap = "1"
 regex = "1"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 80265d30e..55f8422bc 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -18,7 +18,7 @@ anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.7"
 etcetera = "0.8"
-tree-sitter = "0.20"
+tree-sitter.workspace = true
 once_cell = "1.18"
 log = "0.4"
 which = "4.4"

From 8a28f3059398eec7b5496bb1088b4d9870e6eb7e Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Thu, 27 Jul 2023 04:57:19 +0200
Subject: [PATCH 185/967] Reformat with nightly rustfmt for better let-else
 formatting (#7721)

---
 helix-core/src/match_brackets.rs |  8 ++++++--
 helix-core/src/transaction.rs    |  5 ++++-
 helix-loader/build.rs            |  8 ++++++--
 helix-lsp/src/lib.rs             |  2 +-
 helix-term/src/commands/lsp.rs   | 20 ++++++++++++++------
 helix-term/src/commands/typed.rs |  5 ++---
 helix-term/src/ui/completion.rs  | 16 +++++++++++++---
 helix-term/src/ui/picker.rs      | 11 +++++++----
 8 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index 7fda6d7e5..f6d9885e4 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -106,12 +106,16 @@ fn find_pair(
         for close in
             iter::successors(node.next_sibling(), |node| node.next_sibling()).take(MATCH_LIMIT)
         {
-            let Some(open) = as_close_pair(doc, &close) else { continue; };
+            let Some(open) = as_close_pair(doc, &close) else {
+                continue;
+            };
             if find_pair_end(doc, Some(node), open, Backward).is_some() {
                 return doc.try_byte_to_char(close.start_byte()).ok();
             }
         }
-        let Some(parent) = node.parent() else { break; };
+        let Some(parent) = node.parent() else {
+            break;
+        };
         node = parent;
     }
     let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index fec62578b..1cea69116 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -389,7 +389,10 @@ impl ChangeSet {
             }
 
             let Some((i, change)) = iter.next() else {
-                map!(|pos, _| (old_pos == pos).then_some(new_pos), self.changes.len());
+                map!(
+                    |pos, _| (old_pos == pos).then_some(new_pos),
+                    self.changes.len()
+                );
                 break;
             };
 
diff --git a/helix-loader/build.rs b/helix-loader/build.rs
index 63548a0c8..74ba2a2be 100644
--- a/helix-loader/build.rs
+++ b/helix-loader/build.rs
@@ -40,7 +40,9 @@ fn main() {
         .ok()
         .filter(|output| output.status.success())
         .and_then(|x| String::from_utf8(x.stdout).ok())
-    else{ return; };
+    else {
+        return;
+    };
     // If heads starts pointing at something else (different branch)
     // we need to return
     let head = Path::new(&git_dir).join("HEAD");
@@ -55,7 +57,9 @@ fn main() {
         .ok()
         .filter(|output| output.status.success())
         .and_then(|x| String::from_utf8(x.stdout).ok())
-    else{ return; };
+    else {
+        return;
+    };
     let head_ref = Path::new(&git_dir).join(head_ref);
     if head_ref.exists() {
         println!("cargo:rerun-if-changed={}", head_ref.display());
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 90f0c3fd7..d29a21440 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -435,7 +435,7 @@ pub mod util {
             }
 
             let tabstops = tabstops.first().filter(|tabstops| !tabstops.is_empty());
-            let Some(tabstops) = tabstops else{
+            let Some(tabstops) = tabstops else {
                 // no tabstop normal mapping
                 mapped_selection.push(range);
                 continue;
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 1f5921180..17f936cd6 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -730,7 +730,8 @@ pub fn code_action(cx: &mut Context) {
 
                 // always present here
                 let action = action.unwrap();
-                let Some(language_server) = editor.language_server_by_id(action.language_server_id) else {
+                let Some(language_server) = editor.language_server_by_id(action.language_server_id)
+                else {
                     editor.set_error("Language Server disappeared");
                     return;
                 };
@@ -746,15 +747,20 @@ pub fn code_action(cx: &mut Context) {
                         // we support lsp "codeAction/resolve" for `edit` and `command` fields
                         let mut resolved_code_action = None;
                         if code_action.edit.is_none() || code_action.command.is_none() {
-                            if let Some(future) = language_server.resolve_code_action(code_action.clone()) {
+                            if let Some(future) =
+                                language_server.resolve_code_action(code_action.clone())
+                            {
                                 if let Ok(response) = helix_lsp::block_on(future) {
-                                    if let Ok(code_action) = serde_json::from_value::<CodeAction>(response) {
+                                    if let Ok(code_action) =
+                                        serde_json::from_value::<CodeAction>(response)
+                                    {
                                         resolved_code_action = Some(code_action);
                                     }
                                 }
                             }
                         }
-                        let resolved_code_action = resolved_code_action.as_ref().unwrap_or(code_action);
+                        let resolved_code_action =
+                            resolved_code_action.as_ref().unwrap_or(code_action);
 
                         if let Some(ref workspace_edit) = resolved_code_action.edit {
                             log::debug!("edit: {:?}", workspace_edit);
@@ -1186,7 +1192,8 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
         // Do not show the message if signature help was invoked
         // automatically on backspace, trigger characters, etc.
         if invoked == SignatureHelpInvoked::Manual {
-            cx.editor.set_error("No configured language server supports signature-help");
+            cx.editor
+                .set_error("No configured language server supports signature-help");
         }
         return;
     };
@@ -1411,7 +1418,8 @@ pub fn rename_symbol(cx: &mut Context) {
                     .language_servers_with_feature(LanguageServerFeature::RenameSymbol)
                     .find(|ls| language_server_id.map_or(true, |id| id == ls.id()))
                 else {
-                    cx.editor.set_error("No configured language server supports symbol renaming");
+                    cx.editor
+                        .set_error("No configured language server supports symbol renaming");
                     return;
                 };
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 063658c60..175f8bc61 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1385,9 +1385,8 @@ fn lsp_workspace_command(
                 .map(|options| (ls.id(), options))
         })
     else {
-        cx.editor.set_status(
-             "No active language servers for this document support workspace commands",
-        );
+        cx.editor
+            .set_status("No active language servers for this document support workspace commands");
         return Ok(());
     };
 
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index c7f9250d5..e06147224 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -144,7 +144,9 @@ impl Completion {
                         }
                     };
 
-                    let Some(range) = util::lsp_range_to_range(doc.text(), edit.range, offset_encoding) else{
+                    let Some(range) =
+                        util::lsp_range_to_range(doc.text(), edit.range, offset_encoding)
+                    else {
                         return Transaction::new(doc.text());
                     };
 
@@ -413,10 +415,18 @@ impl Completion {
             _ => return false,
         };
 
-        let Some(language_server) = cx.editor.language_server_by_id(current_item.language_server_id) else { return false; };
+        let Some(language_server) = cx
+            .editor
+            .language_server_by_id(current_item.language_server_id)
+        else {
+            return false;
+        };
 
         // This method should not block the compositor so we handle the response asynchronously.
-        let Some(future) = language_server.resolve_completion_item(current_item.item.clone()) else { return false; };
+        let Some(future) = language_server.resolve_completion_item(current_item.item.clone())
+        else {
+            return false;
+        };
 
         cx.callback(
             future,
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 4605e2f18..f80bc512f 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -432,7 +432,7 @@ impl<T: Item + 'static> Picker<T> {
 
     fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult {
         let Some((current_file, _)) = self.current_file(cx.editor) else {
-            return EventResult::Consumed(None)
+            return EventResult::Consumed(None);
         };
 
         // Try to find a document in the cache
@@ -459,11 +459,14 @@ impl<T: Item + 'static> Picker<T> {
                     let callback = move |editor: &mut Editor, compositor: &mut Compositor| {
                         let Some(syntax) = syntax else {
                             log::info!("highlighting picker item failed");
-                            return
+                            return;
                         };
-                        let Some(Overlay { content: picker, .. }) = compositor.find::<Overlay<Self>>() else {
+                        let Some(Overlay {
+                            content: picker, ..
+                        }) = compositor.find::<Overlay<Self>>()
+                        else {
                             log::info!("picker closed before syntax highlighting finished");
-                            return
+                            return;
                         };
                         // Try to find a document in the cache
                         let doc = match current_file {

From d6856cfeec14305b3405a6aee90c73c80b41e48f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 27 Jul 2023 23:30:26 -0500
Subject: [PATCH 186/967] Refactor Nix flake to use crane (#7763)

This resolves a build issue with nci/dream2nix and git dependencies.
We can keep most of the helix-specific parts of the flake, we just need
to switch from configuring nci to calling craneLib functions.

We also switch to flake-utils from flake-parts:

* Using rust-overlay with flake-parts directly is unergonomic
  (see https://github.com/hercules-ci/flake-parts/discussions/83).
* Removing flake-parts reduces the overall dependencies: rust-overlay
  already depends on flake-utils.
---
 flake.lock | 243 +++++------------------------------------
 flake.nix  | 310 +++++++++++++++++++++++++++++------------------------
 2 files changed, 192 insertions(+), 361 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8046f3590..b90a7f201 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,110 +1,29 @@
 {
   "nodes": {
     "crane": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1681175776,
-        "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "445a3d222947632b5593112bb817850e8a9cf737",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "ref": "v0.12.1",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "dream2nix": {
       "inputs": {
-        "all-cabal-json": [
-          "nci"
-        ],
-        "crane": "crane",
-        "devshell": [
-          "nci"
-        ],
-        "drv-parts": "drv-parts",
         "flake-compat": "flake-compat",
-        "flake-parts": [
-          "nci",
-          "parts"
-        ],
-        "flake-utils-pre-commit": [
-          "nci"
-        ],
-        "ghc-utils": [
-          "nci"
-        ],
-        "gomod2nix": [
-          "nci"
-        ],
-        "mach-nix": [
-          "nci"
-        ],
-        "nix-pypi-fetcher": [
-          "nci"
+        "flake-utils": [
+          "flake-utils"
         ],
         "nixpkgs": [
-          "nci",
           "nixpkgs"
         ],
-        "nixpkgsV1": "nixpkgsV1",
-        "poetry2nix": [
-          "nci"
-        ],
-        "pre-commit-hooks": [
-          "nci"
-        ],
-        "pruned-racket-catalog": [
-          "nci"
-        ]
-      },
-      "locked": {
-        "lastModified": 1683212002,
-        "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=",
-        "owner": "nix-community",
-        "repo": "dream2nix",
-        "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "dream2nix",
-        "type": "github"
-      }
-    },
-    "drv-parts": {
-      "inputs": {
-        "flake-compat": [
-          "nci",
-          "dream2nix",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "nci",
-          "dream2nix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "nci",
-          "dream2nix",
-          "nixpkgs"
+        "rust-overlay": [
+          "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1680698112,
-        "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=",
-        "owner": "davhau",
-        "repo": "drv-parts",
-        "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201",
+        "lastModified": 1688772518,
+        "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
         "type": "github"
       },
       "original": {
-        "owner": "davhau",
-        "repo": "drv-parts",
+        "owner": "ipetkov",
+        "repo": "crane",
         "type": "github"
       }
     },
@@ -129,11 +48,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -142,55 +61,13 @@
         "type": "github"
       }
     },
-    "mk-naked-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1681286841,
-        "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
-        "owner": "yusdacra",
-        "repo": "mk-naked-shell",
-        "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yusdacra",
-        "repo": "mk-naked-shell",
-        "type": "github"
-      }
-    },
-    "nci": {
-      "inputs": {
-        "dream2nix": "dream2nix",
-        "mk-naked-shell": "mk-naked-shell",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "parts": "parts",
-        "rust-overlay": [
-          "rust-overlay"
-        ]
-      },
-      "locked": {
-        "lastModified": 1683699050,
-        "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=",
-        "owner": "yusdacra",
-        "repo": "nix-cargo-integration",
-        "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yusdacra",
-        "repo": "nix-cargo-integration",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1683408522,
-        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
+        "lastModified": 1690272529,
+        "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
+        "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
         "type": "github"
       },
       "original": {
@@ -200,99 +77,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1682879489,
-        "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgsV1": {
-      "locked": {
-        "lastModified": 1678500271,
-        "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-22.11",
-        "type": "indirect"
-      }
-    },
-    "parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nci",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1683560683,
-        "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1683560683,
-        "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "nci": "nci",
+        "crane": "crane",
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
-        "parts": "parts_2",
         "rust-overlay": "rust-overlay"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1683771545,
-        "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=",
+        "lastModified": 1690424156,
+        "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed",
+        "rev": "f335a0213504c7e6481c359dc1009be9cf34432c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 81f0a05c9..fc9d8c443 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,166 +3,190 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
     };
-    nci = {
-      url = "github:yusdacra/nix-cargo-integration";
-      inputs.nixpkgs.follows = "nixpkgs";
+    crane = {
+      url = "github:ipetkov/crane";
       inputs.rust-overlay.follows = "rust-overlay";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-    parts.url = "github:hercules-ci/flake-parts";
   };
 
-  outputs = inp: let
-    mkRootPath = rel:
-      builtins.path {
-        path = "${toString ./.}/${rel}";
-        name = rel;
+  outputs = {
+    self,
+    nixpkgs,
+    crane,
+    flake-utils,
+    rust-overlay,
+    ...
+  }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [(import rust-overlay)];
       };
-    filteredSource = let
-      pathsToIgnore = [
-        ".envrc"
-        ".ignore"
-        ".github"
-        ".gitignore"
-        "logo.svg"
-        "logo_dark.svg"
-        "logo_light.svg"
-        "rust-toolchain.toml"
-        "rustfmt.toml"
-        "runtime"
-        "screenshot.png"
-        "book"
-        "contrib"
-        "docs"
-        "README.md"
-        "CHANGELOG.md"
-        "shell.nix"
-        "default.nix"
-        "grammars.nix"
-        "flake.nix"
-        "flake.lock"
-      ];
-      ignorePaths = path: type: let
-        inherit (inp.nixpkgs) lib;
-        # split the nix store path into its components
-        components = lib.splitString "/" path;
-        # drop off the `/nix/hash-source` section from the path
-        relPathComponents = lib.drop 4 components;
-        # reassemble the path components
-        relPath = lib.concatStringsSep "/" relPathComponents;
-      in
-        lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
-    in
-      builtins.path {
-        name = "helix-source";
-        path = toString ./.;
-        # filter out unnecessary paths
-        filter = ignorePaths;
-      };
-  in
-    inp.parts.lib.mkFlake {inputs = inp;} {
-      imports = [inp.nci.flakeModule inp.parts.flakeModules.easyOverlay];
-      systems = [
-        "x86_64-linux"
-        "x86_64-darwin"
-        "aarch64-linux"
-        "aarch64-darwin"
-        "i686-linux"
-      ];
-      perSystem = {
-        config,
-        pkgs,
-        lib,
-        ...
-      }: let
-        makeOverridableHelix = old: config: let
-          grammars = pkgs.callPackage ./grammars.nix config;
-          runtimeDir = pkgs.runCommand "helix-runtime" {} ''
-            mkdir -p $out
-            ln -s ${mkRootPath "runtime"}/* $out
-            rm -r $out/grammars
-            ln -s ${grammars} $out/grammars
-          '';
-          helix-wrapped =
-            pkgs.runCommand
-            old.name
-            {
-              inherit (old) pname version;
-              meta = old.meta or {};
-              passthru =
-                (old.passthru or {})
-                // {
-                  unwrapped = old;
-                };
-              nativeBuildInputs = [pkgs.makeWrapper];
-              makeWrapperArgs = config.makeWrapperArgs or [];
-            }
-            ''
-              cp -rs --no-preserve=mode,ownership ${old} $out
-              wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
-            '';
+      mkRootPath = rel:
+        builtins.path {
+          path = "${toString ./.}/${rel}";
+          name = rel;
+        };
+      filteredSource = let
+        pathsToIgnore = [
+          ".envrc"
+          ".ignore"
+          ".github"
+          ".gitignore"
+          "logo.svg"
+          "logo_dark.svg"
+          "logo_light.svg"
+          "rust-toolchain.toml"
+          "rustfmt.toml"
+          "runtime"
+          "screenshot.png"
+          "book"
+          "contrib"
+          "docs"
+          "README.md"
+          "CHANGELOG.md"
+          "shell.nix"
+          "default.nix"
+          "grammars.nix"
+          "flake.nix"
+          "flake.lock"
+        ];
+        ignorePaths = path: type: let
+          inherit (nixpkgs) lib;
+          # split the nix store path into its components
+          components = lib.splitString "/" path;
+          # drop off the `/nix/hash-source` section from the path
+          relPathComponents = lib.drop 4 components;
+          # reassemble the path components
+          relPath = lib.concatStringsSep "/" relPathComponents;
         in
-          helix-wrapped
-          // {
-            override = makeOverridableHelix old;
+          lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
+      in
+        builtins.path {
+          name = "helix-source";
+          path = toString ./.;
+          # filter out unnecessary paths
+          filter = ignorePaths;
+        };
+      makeOverridableHelix = old: config: let
+        grammars = pkgs.callPackage ./grammars.nix config;
+        runtimeDir = pkgs.runCommand "helix-runtime" {} ''
+          mkdir -p $out
+          ln -s ${mkRootPath "runtime"}/* $out
+          rm -r $out/grammars
+          ln -s ${grammars} $out/grammars
+        '';
+        helix-wrapped =
+          pkgs.runCommand
+          old.name
+          {
+            inherit (old) pname version;
+            meta = old.meta or {};
             passthru =
-              helix-wrapped.passthru
+              (old.passthru or {})
               // {
-                wrapper = old: makeOverridableHelix old config;
+                unwrapped = old;
               };
-          };
-        stdenv =
-          if pkgs.stdenv.isLinux
-          then pkgs.stdenv
-          else pkgs.clangStdenv;
-        rustFlagsEnv =
-          if stdenv.isLinux
-          then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
-          else "$RUSTFLAGS";
-      in {
-        nci.projects."helix-project".relPath = "";
-        nci.crates."helix-term" = {
-          overrides = {
-            add-meta.override = _: {meta.mainProgram = "hx";};
-            add-inputs.overrideAttrs = prev: {
-              buildInputs = (prev.buildInputs or []) ++ [stdenv.cc.cc.lib];
-            };
-            disable-grammar-builds = {
-              # disable fetching and building of tree-sitter grammars in the helix-term build.rs
-              HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
+            nativeBuildInputs = [pkgs.makeWrapper];
+            makeWrapperArgs = config.makeWrapperArgs or [];
+          }
+          ''
+            cp -rs --no-preserve=mode,ownership ${old} $out
+            wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
+          '';
+      in
+        helix-wrapped
+        // {
+          override = makeOverridableHelix old;
+          passthru =
+            helix-wrapped.passthru
+            // {
+              wrapper = old: makeOverridableHelix old config;
             };
-            disable-tests = {checkPhase = ":";};
-            set-stdenv.override = _: {inherit stdenv;};
-            set-filtered-src.override = _: {src = filteredSource;};
-          };
         };
+      stdenv =
+        if pkgs.stdenv.isLinux
+        then pkgs.stdenv
+        else pkgs.clangStdenv;
+      rustFlagsEnv =
+        if stdenv.isLinux
+        then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
+        else "$RUSTFLAGS";
+      rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+      craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
+      commonArgs =
+        {
+          inherit stdenv;
+          src = filteredSource;
+          # disable fetching and building of tree-sitter grammars in the helix-term build.rs
+          HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
+          buildInputs = [stdenv.cc.cc.lib];
+          # disable tests
+          doCheck = false;
+          meta.mainProgram = "hx";
+        }
+        // craneLib.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
+      cargoArtifacts = craneLib.buildDepsOnly commonArgs;
+    in {
+      packages = {
+        helix-unwrapped = craneLib.buildPackage (commonArgs
+          // {
+            inherit cargoArtifacts;
+          });
+        helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
+        default = self.packages.${system}.helix;
+      };
 
-        packages.helix-unwrapped = config.nci.outputs."helix-term".packages.release;
-        packages.helix-unwrapped-dev = config.nci.outputs."helix-term".packages.dev;
-        packages.helix = makeOverridableHelix config.packages.helix-unwrapped {};
-        packages.helix-dev = makeOverridableHelix config.packages.helix-unwrapped-dev {};
-        packages.default = config.packages.helix;
+      checks = {
+        # Build the crate itself
+        inherit (self.packages.${system}) helix;
 
-        overlayAttrs = {
-          inherit (config.packages) helix;
-        };
+        clippy = craneLib.cargoClippy (commonArgs
+          // {
+            inherit cargoArtifacts;
+            cargoClippyExtraArgs = "--all-targets -- --deny warnings";
+          });
 
-        devShells.default = config.nci.outputs."helix-project".devShell.overrideAttrs (old: {
-          nativeBuildInputs =
-            (old.nativeBuildInputs or [])
-            ++ (with pkgs; [lld_13 cargo-flamegraph rust-analyzer])
-            ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
-            ++ (lib.optional stdenv.isLinux pkgs.lldb)
-            ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
-          shellHook = ''
-            export HELIX_RUNTIME="$PWD/runtime"
-            export RUST_BACKTRACE="1"
-            export RUSTFLAGS="${rustFlagsEnv}"
-          '';
-        });
+        fmt = craneLib.cargoFmt commonArgs;
+
+        doc = craneLib.cargoDoc (commonArgs
+          // {
+            inherit cargoArtifacts;
+          });
+
+        test = craneLib.cargoTest (commonArgs
+          // {
+            inherit cargoArtifacts;
+          });
+      };
+
+      devShells.default = pkgs.mkShell {
+        inputsFrom = builtins.attrValues self.checks.${system};
+        nativeBuildInputs = with pkgs;
+          [lld_13 cargo-flamegraph rust-analyzer]
+          ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
+          ++ (lib.optional stdenv.isLinux pkgs.lldb)
+          ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
+        shellHook = ''
+          export HELIX_RUNTIME="$PWD/runtime"
+          export RUST_BACKTRACE="1"
+          export RUSTFLAGS="${rustFlagsEnv}"
+        '';
+      };
+    })
+    // {
+      overlays.default = final: prev: {
+        inherit (self.packages.${final.system}) helix;
       };
     };
 

From 9a4890f62bd907a37ee79e1a3690c75fc80e9724 Mon Sep 17 00:00:00 2001
From: Jummit <jummit@web.de>
Date: Fri, 28 Jul 2023 17:13:51 +0100
Subject: [PATCH 187/967] Add wren support (#7765)

---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 12 +++++
 runtime/queries/wren/highlights.scm  | 80 ++++++++++++++++++++++++++++
 runtime/queries/wren/textobjects.scm | 12 +++++
 4 files changed, 105 insertions(+)
 create mode 100644 runtime/queries/wren/highlights.scm
 create mode 100644 runtime/queries/wren/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 8941f735f..ee7caf999 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -167,6 +167,7 @@
 | webc | ✓ |  |  |  |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
 | wit | ✓ |  | ✓ |  |
+| wren | ✓ | ✓ |  |  |
 | xit | ✓ |  |  |  |
 | xml | ✓ |  | ✓ |  |
 | yaml | ✓ |  | ✓ | `yaml-language-server` |
diff --git a/languages.toml b/languages.toml
index 7f7742963..2f7e034ba 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2698,3 +2698,15 @@ file-types = ["webc"]
 roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "html"
+
+[[grammar]]
+name = "wren"
+source = { git = "https://git.sr.ht/~jummit/tree-sitter-wren", rev = "7f576e8ccadac226f6a37cbefe95be3fee9f0a66"}
+
+[[language]]
+name = "wren"
+scope = "source.wren"
+injection-regex = "wren"
+file-types = ["wren"]
+roots = []
+indent = { tab-width = 2, unit = "  "}
diff --git a/runtime/queries/wren/highlights.scm b/runtime/queries/wren/highlights.scm
new file mode 100644
index 000000000..5454ce25b
--- /dev/null
+++ b/runtime/queries/wren/highlights.scm
@@ -0,0 +1,80 @@
+((identifier) @variable.builtin
+ (#match? @variable.builtin "^(Bool|Class|Fiber|Fn|List|Map|Null|Num|Object|Range|Sequence|String|System)$"))
+
+(call_expression
+  (identifier) @function)
+
+(method_definition
+  (identifier) @function.method)
+
+((parameter) @variable.parameter)
+
+(comment) @comment
+(string) @string
+(raw_string) @string
+(number) @constant.numeric.integer
+(identifier) @variable
+(null) @constant.builtin
+(boolean) @constant.builtin.boolean
+
+(if_statement
+[
+  "if"
+  "else"
+] @keyword.control.conditional)
+
+(for_statement
+[
+  "for"
+  "in"
+] @keyword.control.repeat)
+
+(while_statement
+[
+  "while"
+] @keyword.control.repeat)
+
+[
+  (break_statement)
+  (continue_statement)
+  (return_statement)
+] @keyword.control.return
+
+(class_definition
+"is"
+@keyword)
+
+[
+  "import"
+  "for"
+  "as"
+] @keyword.control.import
+
+[
+  "is"
+] @keyword
+
+(operator) @operator
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+["," "."] @punctuation.delimiter
+
+[
+  "class"
+  "var"
+] @keyword.storage.type
+
+[
+  "static"
+] @keyword.storage.modifier
+
+(constructor
+  ["construct"] @constructor)
diff --git a/runtime/queries/wren/textobjects.scm b/runtime/queries/wren/textobjects.scm
new file mode 100644
index 000000000..248981240
--- /dev/null
+++ b/runtime/queries/wren/textobjects.scm
@@ -0,0 +1,12 @@
+(class_definition
+  (class_body) @class.inside) @class.around
+
+(method_definition
+  body: (_) @function.inside) @function.around
+
+(parameter_list
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(comment) @comment.inside
+
+(comment)+ @comment.around

From 224fd5fa29e43c5b2543ab791de5f46abe1ae8a7 Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Fri, 28 Jul 2023 23:01:06 +0200
Subject: [PATCH 188/967] feat: update prql parser (#7771)

---
 languages.toml                      |  2 +-
 runtime/queries/prql/highlights.scm | 31 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/languages.toml b/languages.toml
index 2f7e034ba..54ce05b5f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2460,7 +2460,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "prql"
-source = { git = "https://github.com/PRQL/tree-sitter-prql", rev = "3f27cac466f030ee7d985d91eba5470e01dd21ea" }
+source = { git = "https://github.com/PRQL/tree-sitter-prql", rev = "09e158cd3650581c0af4c49c2e5b10c4834c8646" }
 
 [[language]]
 name = "po"
diff --git a/runtime/queries/prql/highlights.scm b/runtime/queries/prql/highlights.scm
index 5cfedee48..8b67487b2 100644
--- a/runtime/queries/prql/highlights.scm
+++ b/runtime/queries/prql/highlights.scm
@@ -9,7 +9,7 @@
   (keyword_window)
   (keyword_join)
   (keyword_select)
-  (keyword_switch)
+  (keyword_case)
   (keyword_append)
   (keyword_remove)
   (keyword_intersect)
@@ -19,6 +19,7 @@
   (keyword_let)
   (keyword_prql)
   (keyword_from_text)
+  (keyword_loop)
 ] @keyword
 
 (literal) @string
@@ -33,8 +34,6 @@ alias: (identifier) @variable.other.member
 
 (comment) @comment
 
-(keyword_func) @keyword.function
-
 (function_call
   (identifier) @function)
 
@@ -50,21 +49,25 @@ alias: (identifier) @variable.other.member
   "!="
   ">="
   ">"
-  "->"
+  "&&"
+  "||"
+  "//"
+  "~="
   (bang)
 ] @operator
 
 [
   "("
   ")"
-  "["
-  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 [
   ","
   "."
   (pipe)
+  "->"
 ] @punctuation.delimiter
 
 (literal
@@ -87,6 +90,15 @@ alias: (identifier) @variable.other.member
   (keyword_sum)
   (keyword_stddev)
   (keyword_count)
+  (keyword_lag)
+  (keyword_lead)
+  (keyword_first)
+  (keyword_last)
+  (keyword_rank)
+  (keyword_row_number)
+  (keyword_round)
+  (keyword_all)
+  (keyword_map)
 ] @function
 
 [
@@ -119,13 +131,8 @@ alias: (identifier) @variable.other.member
   (keyword_false)
 ] @constant.builtin.boolean
 
-[
- (keyword_and)
- (keyword_or)
-] @keyword.operator
-
 (function_definition
-  (keyword_func)
+  (keyword_let)
   name: (identifier) @function)
 
 (parameter

From 13e7edab19793e76840cbed1cc5b50266b88ed5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20S=2E=20Szczygie=C5=82?=
 <mateuszszczygiel95@gmail.com>
Date: Sat, 29 Jul 2023 18:57:33 +0200
Subject: [PATCH 189/967] Register .gltf file type for JSON (#7781)

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

diff --git a/languages.toml b/languages.toml
index 54ce05b5f..91fc05870 100644
--- a/languages.toml
+++ b/languages.toml
@@ -310,7 +310,7 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 scope = "source.json"
 injection-regex = "json"
-file-types = ["json", "jsonc", "arb", "ipynb", "geojson"]
+file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf"]
 roots = []
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true

From d5571968faf498f2bf12e18835755377d22e13a4 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 30 Jul 2023 10:53:42 -0400
Subject: [PATCH 190/967] add new theme based on the default vim dark theme
 (#7785)

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

diff --git a/runtime/themes/vim_dark_high_contrast.toml b/runtime/themes/vim_dark_high_contrast.toml
new file mode 100644
index 000000000..ecd6942b5
--- /dev/null
+++ b/runtime/themes/vim_dark_high_contrast.toml
@@ -0,0 +1,72 @@
+"ui.background" = { bg = "black" }
+"ui.cursor" = { fg = "green", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "light-cyan", bg = "dark-cyan" }
+"ui.cursor.primary" = { fg = "light-green", modifiers = ["reversed"] }
+"ui.menu" = { bg = "dark-white" }
+"ui.menu.selected" = { fg = "yellow" }
+"ui.popup" = { bg = "dark-white" }
+"ui.selection" = { bg = "dark-white" }
+"ui.statusline" = { fg = "light-magenta", bg = "dark-magenta" }
+"ui.statusline.normal" = { fg = "black", bg = "light-yellow" }
+"ui.statusline.insert" = { fg = "black", bg = "light-cyan" }
+"ui.statusline.select" = { fg = "black", bg = "yellow" }
+"ui.text" = { fg = "default" }
+"ui.text.info" = { bg = "dark-white" }
+"ui.text.focus" = { fg = "yellow" }
+"ui.virtual.wrap" = { fg = "dark-blue" }
+"ui.virtual.indent-guide" = { fg = "dark-blue" }
+"ui.window" = { bg = "dark-white" }
+
+"diagnostic.error" = { bg = "dark-red" }
+"diagnostic.warning" = { bg = "dark-yellow" }
+"diagnostic.hint" = { bg = "dark-cyan" }
+"diagnostic.info" = { bg = "dark-white" }
+"warning" = { fg = "yellow", bg = "dark-yellow" }
+"error" = { fg = "red", bg = "dark-red" }
+"info" = { fg = "default", bg = "dark-white" }
+"hint" = { fg = "cyan", bg = "dark-cyan" }
+
+"type" = "green"
+"constructor" = "light-cyan"
+"constant" = "red"
+"constant.character.escape" = "magenta"
+"string" = "red"
+"comment" = "light-black"
+"comment.documentation" = "magenta"
+"label" = "green"
+"keyword" = "yellow"
+"keyword.directive" = "magenta"
+"function" = "light-cyan"
+"function.macro" = "magenta"
+"special" = "cyan"
+
+"diff.plus" = "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
+
+[palette]
+black = "#000000"
+red = "#ed5f74"
+green = "#1ea672"
+yellow = "#d97917"
+blue = "#688ef1"
+magenta = "#c96ed0"
+cyan = "#3a97d4"
+white = "#e3e8ee"
+light-black = "#697386"
+light-red = "#fbb5b2"
+light-green = "#85d996"
+light-yellow = "#efc078"
+light-blue = "#9fcdff"
+light-magenta = "#f0b4e4"
+light-cyan = "#7fd3ed"
+light-white = "#ffffff"
+dark-black = "#000000"
+dark-red = "#742833"
+dark-green = "#00643c"
+dark-yellow = "#6e3500"
+dark-blue = "#2c4074"
+dark-magenta = "#602864"
+dark-cyan = "#144c71"
+dark-white = "#3e4043"
+default = "#c1c9d2"

From 57952c46a4f3bf75d0b9940c2c42399980416523 Mon Sep 17 00:00:00 2001
From: lydiandy <lydiandylin@gmail.com>
Date: Mon, 31 Jul 2023 07:04:55 +0800
Subject: [PATCH 191/967] replace new lsp for vlang (#7760)

* fix vlang grammar fetch and build fail

* update highlights.scm for v-analyzer

* Update languages.toml

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

* Update runtime/queries/v/highlights.scm

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

* update scm for new lsp

* gen doc lang-support.md

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md |   2 +-
 languages.toml                     |   4 +-
 runtime/queries/v/highlights.scm   | 136 ++++++++++++++++++-----------
 runtime/queries/v/indents.scm      |   5 +-
 runtime/queries/v/textobjects.scm  |   6 +-
 5 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ee7caf999..4b19c4b80 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -156,7 +156,7 @@
 | typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | ungrammar | ✓ |  |  |  |
 | uxntal | ✓ |  |  |  |
-| v | ✓ | ✓ | ✓ | `v` |
+| v | ✓ | ✓ | ✓ | `v-analyzer` |
 | vala | ✓ |  |  | `vala-language-server` |
 | verilog | ✓ | ✓ |  | `svlangserver` |
 | vhdl | ✓ |  |  | `vhdl_ls` |
diff --git a/languages.toml b/languages.toml
index 91fc05870..b6278730e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -70,7 +70,7 @@ terraform-ls = { command = "terraform-ls", args = ["serve"] }
 texlab = { command = "texlab" }
 vala-language-server = { command = "vala-language-server" }
 vhdl_ls = { command = "vhdl_ls", args = [] }
-vlang-language-server = { command = "v", args = ["ls"] }
+vlang-language-server = { command = "v-analyzer" }
 vscode-css-language-server = { command = "vscode-css-language-server", args = ["--stdio"], config = { "provideFormatter" = true }}
 vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
 vscode-json-language-server =  { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true } }
@@ -1826,7 +1826,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
 name = "v"
-source = { git = "https://github.com/vlang/vls", subpath = "tree_sitter_v", rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6" }
+source = {git = "https://github.com/v-analyzer/v-analyzer", subpath = "tree_sitter_v", rev = "e14fdf6e661b10edccc744102e4ccf0b187aa8ad"}
 
 [[language]]
 name = "verilog"
diff --git a/runtime/queries/v/highlights.scm b/runtime/queries/v/highlights.scm
index e014b77d9..fbaf70882 100644
--- a/runtime/queries/v/highlights.scm
+++ b/runtime/queries/v/highlights.scm
@@ -1,83 +1,112 @@
+(comment) @comment
+
+(module_clause
+ (identifier) @namespace)
+
+(import_path
+ (import_name) @namespace)
+
+(import_alias
+ (import_name) @namespace)
+
+(enum_fetch
+ (reference_expression) @constant)
+
+(enum_field_definition
+ (identifier) @constant)
+
+(global_var_definition
+ (identifier) @constant)
+
+(compile_time_if_expression
+ condition: (reference_expression) @constant)
+
+(compile_time_if_expression
+ condition: (binary_expression
+              left: (reference_expression) @constant
+              right: (reference_expression) @constant))
+
+(compile_time_if_expression
+ condition: (binary_expression
+              left: (reference_expression) @constant
+              right: (unary_expression (reference_expression) @constant)))
+
+(label_reference) @label
+
 (parameter_declaration
-  name: (identifier) @variable.parameter)
+ name: (identifier) @variable.parameter)
+(receiver
+ name: (identifier) @variable.parameter)
 (function_declaration
-  name: (identifier) @function)
+ name: (identifier) @function)
 (function_declaration
-  receiver: (parameter_list)
-  name: (identifier) @function.method)
+ receiver: (receiver)
+ name: (identifier) @function.method)
+(interface_method_definition
+ name: (identifier) @function.method)
 
 (call_expression
-  function: (identifier) @function)
-(call_expression
-  function: (selector_expression
-    field: (identifier) @function.method))
+ name: (selector_expression
+  field: (reference_expression) @function.method))
 
-(field_identifier) @variable.other.member
-(selector_expression
-  operand: (identifier) @variable
-  field: (identifier) @variable.other.member)
+(call_expression
+ name: (reference_expression) @function)
 
-(int_literal) @constant.numeric.integer
+(struct_declaration
+ name: (identifier) @type)
 
-(attribute_declaration) @attribute
-(comment) @comment
-[
-  (c_string_literal)
-  (raw_string_literal)
-  (interpreted_string_literal)
-  (string_interpolation)
-  (rune_literal)
-] @string
+(enum_declaration
+ name: (identifier) @type)
 
-(escape_sequence) @constant.character.escape
+(interface_declaration
+ name: (identifier) @type)
 
-[
-  (pointer_type)
-  (array_type)
-] @type
+(type_declaration
+ name: (identifier) @type)
 
-(const_spec name: (identifier) @constant)
-(global_var_type_initializer name: (identifier) @constant)
-(global_var_spec name: (identifier) @constant)
-((identifier) @constant (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+(struct_field_declaration
+ name: (identifier) @variable.other.member)
 
+(field_name) @variable.other.member
 
-[
-  (generic_type)
-  (type_identifier)
-] @constructor 
+(selector_expression
+ field: (reference_expression) @variable.other.member)
 
-(builtin_type) @type.builtin
+(int_literal) @constant.numeric.integer
+(escape_sequence) @constant.character.escape
 
 [
- (true)
- (false)
-] @constant.builtin.boolean
+ (c_string_literal)
+ (raw_string_literal)
+ (interpreted_string_literal)
+ (string_interpolation)
+ (rune_literal)
+] @string
 
+(string_interpolation
+ (braced_interpolation_opening) @punctuation.bracket
+ (interpolated_expression) @embedded
+ (braced_interpolation_closing) @punctuation.bracket)
 
-[
-  (module_identifier)
-  (import_path)
-] @namespace
+(attribute) @attribute
 
 [
-  (pseudo_comptime_identifier)
-  (label_name)
-] @label
+ (type_reference_expression)
+ ] @type
 
 [
-  (identifier)
-] @variable
-
+ (true)
+ (false)
+] @constant.builtin.boolean
 
 [
   "pub"
   "assert"
-  "go"
   "asm"
   "defer"
   "unsafe"
   "sql"
+  (nil)
   (none)
 ] @keyword
 
@@ -105,12 +134,17 @@
   "lock"
   "rlock"
   "spawn"
+  "break"
+  "continue"
+  "go"
 ] @keyword.control
 
 [
   "if"
+  "$if"
   "select"
   "else"
+  "$else"
   "match"
 ] @keyword.control.conditional
 
@@ -155,7 +189,7 @@
  "]"
 ] @punctuation.bracket
 
-(array) @punctuation.bracket
+(array_creation) @punctuation.bracket
 
 [
  "++"
diff --git a/runtime/queries/v/indents.scm b/runtime/queries/v/indents.scm
index 5573d4897..21dae30f5 100644
--- a/runtime/queries/v/indents.scm
+++ b/runtime/queries/v/indents.scm
@@ -3,11 +3,10 @@
   (function_declaration)
   (if_expression)
   (match_expression)
-  (expression_case)
-  (default_case)
   (for_statement)
   (unsafe_expression)
-  (short_var_declaration)
+  (var_declaration)
+  (const_declaration)
 ] @indent
 
 [
diff --git a/runtime/queries/v/textobjects.scm b/runtime/queries/v/textobjects.scm
index 40eb101fe..5015af17e 100644
--- a/runtime/queries/v/textobjects.scm
+++ b/runtime/queries/v/textobjects.scm
@@ -6,7 +6,7 @@
    body: (block)? @test.inside) @test.around
  (#match? @_name "^test"))
 
-(fn_literal
+(function_literal
   body: (block)? @function.inside) @function.around
 
 (parameter_list
@@ -17,9 +17,9 @@
     ((_) @parameter.inside) @parameter.around))
 
 (struct_declaration
-  (struct_field_declaration_list) @class.inside) @class.around
+    (struct_field_declaration) @class.inside) @class.around
 
-(struct_field_declaration_list
+(struct_field_declaration
   ((_) @parameter.inside) @parameter.around)
 
 (comment) @comment.inside

From 5eb1a25d8a0aeb202358b5b5a3b44bb5f43eced6 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Jul 2023 16:30:42 -0500
Subject: [PATCH 192/967] Refactor Registers to take Editor

This sets up a new Registers type that will allow us to expand support
for special registers. (See the child commits.)

We start simple with the regular (`Vec<String>`) registers and the
simplest special register, the black hole. In the child commits we
will expand these match arms with more special registers.

The upcoming special registers will need a few things that aren't
possible with the current Registers type in helix-core:

* Access to the `Editor`. This is only necessary when reading from
  registers, so the `&Editor` parameter is only added to
  `Registers::read`.
* Returning owned values. Registers in helix-core returns references
  to the values backed by the `Vec<String>` but future special registers
  will need to return owned values. We refactor the return value of the
  read operations to give `Cow<str>`s and iterators over those.
* Returning a `Result` for write/push functions. This will be used by
  the clipboard special registers.
---
 helix-view/src/lib.rs      |   1 +
 helix-view/src/register.rs | 136 +++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100644 helix-view/src/register.rs

diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index c3f67345b..6a68e7d6f 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -15,6 +15,7 @@ pub mod base64;
 pub mod info;
 pub mod input;
 pub mod keyboard;
+pub mod register;
 pub mod theme;
 pub mod tree;
 pub mod view;
diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
new file mode 100644
index 000000000..ca495ada4
--- /dev/null
+++ b/helix-view/src/register.rs
@@ -0,0 +1,136 @@
+use std::{borrow::Cow, collections::HashMap, iter};
+
+use anyhow::Result;
+
+use crate::Editor;
+
+/// A key-value store for saving sets of values.
+///
+/// Each register corresponds to a `char`. Most chars can be used to store any set of
+/// values but a few chars are "special registers". Special registers have unique
+/// behaviors when read or written to:
+///
+/// * Black hole (`_`): all values read and written are discarded
+#[derive(Debug, Default)]
+pub struct Registers {
+    inner: HashMap<char, Vec<String>>,
+}
+
+impl Registers {
+    pub fn read<'a>(&'a self, name: char, _editor: &'a Editor) -> Option<RegisterValues<'a>> {
+        match name {
+            '_' => Some(RegisterValues::new(iter::empty())),
+            _ => self
+                .inner
+                .get(&name)
+                .map(|values| RegisterValues::new(values.iter().map(Cow::from))),
+        }
+    }
+
+    pub fn write(&mut self, name: char, values: Vec<String>) -> Result<()> {
+        match name {
+            '_' => Ok(()),
+            _ => {
+                self.inner.insert(name, values);
+                Ok(())
+            }
+        }
+    }
+
+    pub fn push(&mut self, name: char, value: String) -> Result<()> {
+        match name {
+            '_' => Ok(()),
+            _ => {
+                self.inner.entry(name).or_insert_with(Vec::new).push(value);
+                Ok(())
+            }
+        }
+    }
+
+    pub fn first<'a>(&'a self, name: char, editor: &'a Editor) -> Option<Cow<'a, str>> {
+        self.read(name, editor).and_then(|mut values| values.next())
+    }
+
+    pub fn last<'a>(&'a self, name: char, editor: &'a Editor) -> Option<Cow<'a, str>> {
+        self.read(name, editor).and_then(|values| values.last())
+    }
+
+    pub fn iter_preview(&self) -> impl Iterator<Item = (char, &str)> {
+        self.inner
+            .iter()
+            .map(|(name, values)| {
+                let preview = values
+                    .first()
+                    .and_then(|s| s.lines().next())
+                    .unwrap_or("<empty>");
+
+                (*name, preview)
+            })
+            .chain([('_', "<empty>")].iter().copied())
+    }
+
+    pub fn clear(&mut self) {
+        self.inner.clear()
+    }
+
+    pub fn remove(&mut self, name: char) -> bool {
+        match name {
+            '_' => false,
+            _ => self.inner.remove(&name).is_some(),
+        }
+    }
+}
+
+// This is a wrapper of an iterator that is both double ended and exact size,
+// and can return either owned or borrowed values. Regular registers can
+// return borrowed values while some special registers need to return owned
+// values.
+pub struct RegisterValues<'a> {
+    iter: Box<dyn DoubleEndedExactSizeIterator<Item = Cow<'a, str>> + 'a>,
+}
+
+impl<'a> RegisterValues<'a> {
+    fn new(
+        iter: impl DoubleEndedIterator<Item = Cow<'a, str>>
+            + ExactSizeIterator<Item = Cow<'a, str>>
+            + 'a,
+    ) -> Self {
+        Self {
+            iter: Box::new(iter),
+        }
+    }
+}
+
+impl<'a> Iterator for RegisterValues<'a> {
+    type Item = Cow<'a, str>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next()
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl<'a> DoubleEndedIterator for RegisterValues<'a> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.iter.next_back()
+    }
+}
+
+impl<'a> ExactSizeIterator for RegisterValues<'a> {
+    fn len(&self) -> usize {
+        self.iter.len()
+    }
+}
+
+// Each RegisterValues iterator is both double ended and exact size. We can't
+// type RegisterValues as `Box<dyn DoubleEndedIterator + ExactSizeIterator>`
+// because only one non-auto trait is allowed in trait objects. So we need to
+// create a new trait that covers both. `RegisterValues` wraps that type so that
+// trait only needs to live in this module and not be imported for all register
+// callsites.
+trait DoubleEndedExactSizeIterator: DoubleEndedIterator + ExactSizeIterator {}
+
+impl<I: DoubleEndedIterator + ExactSizeIterator> DoubleEndedExactSizeIterator for I {}

From da2afe7353066743e30592f03a7a55f24df4dd5c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Jul 2023 16:43:16 -0500
Subject: [PATCH 193/967] Add '#' and '.' special registers

These come from Kakoune:

* '#' is the selection index register. It's read-only and produces the
  selection index numbers, 1-indexed.
* '.' is the selection contents register. It is also read-only and
  mirrors the contents of the current selections when read.

We switch the iterators returned from Selection's `fragments` and
`slices` methods to ExactSizeIterators because:

* The selection contents register can simply return the fragments
  iterator.
* ExactSizeIterator is already implemented for iterators over Vecs, so
  it's essentially free.
* The `len` method can be useful on its own.
---
 helix-core/src/selection.rs | 12 ++++++++++--
 helix-view/src/register.rs  | 32 +++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 9104c2099..c44685eea 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -630,11 +630,19 @@ impl Selection {
         self.transform(|range| Range::point(range.cursor(text)))
     }
 
-    pub fn fragments<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = Cow<str>> + 'a {
+    pub fn fragments<'a>(
+        &'a self,
+        text: RopeSlice<'a>,
+    ) -> impl DoubleEndedIterator<Item = Cow<'a, str>> + ExactSizeIterator<Item = Cow<str>> + 'a
+    {
         self.ranges.iter().map(move |range| range.fragment(text))
     }
 
-    pub fn slices<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = RopeSlice> + 'a {
+    pub fn slices<'a>(
+        &'a self,
+        text: RopeSlice<'a>,
+    ) -> impl DoubleEndedIterator<Item = RopeSlice<'a>> + ExactSizeIterator<Item = RopeSlice<'a>> + 'a
+    {
         self.ranges.iter().map(move |range| range.slice(text))
     }
 
diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
index ca495ada4..892d396f3 100644
--- a/helix-view/src/register.rs
+++ b/helix-view/src/register.rs
@@ -11,15 +11,31 @@ use crate::Editor;
 /// behaviors when read or written to:
 ///
 /// * Black hole (`_`): all values read and written are discarded
+/// * Selection indices (`#`): index number of each selection starting at 1
+/// * Selection contents (`.`)
 #[derive(Debug, Default)]
 pub struct Registers {
     inner: HashMap<char, Vec<String>>,
 }
 
 impl Registers {
-    pub fn read<'a>(&'a self, name: char, _editor: &'a Editor) -> Option<RegisterValues<'a>> {
+    pub fn read<'a>(&'a self, name: char, editor: &'a Editor) -> Option<RegisterValues<'a>> {
         match name {
             '_' => Some(RegisterValues::new(iter::empty())),
+            '#' => {
+                let (view, doc) = current_ref!(editor);
+                let selections = doc.selection(view.id).len();
+                // ExactSizeIterator is implemented for Range<usize> but
+                // not RangeInclusive<usize>.
+                Some(RegisterValues::new(
+                    (0..selections).map(|i| (i + 1).to_string().into()),
+                ))
+            }
+            '.' => {
+                let (view, doc) = current_ref!(editor);
+                let text = doc.text().slice(..);
+                Some(RegisterValues::new(doc.selection(view.id).fragments(text)))
+            }
             _ => self
                 .inner
                 .get(&name)
@@ -30,6 +46,7 @@ impl Registers {
     pub fn write(&mut self, name: char, values: Vec<String>) -> Result<()> {
         match name {
             '_' => Ok(()),
+            '#' | '.' => Err(anyhow::anyhow!("Register {name} does not support writing")),
             _ => {
                 self.inner.insert(name, values);
                 Ok(())
@@ -40,6 +57,7 @@ impl Registers {
     pub fn push(&mut self, name: char, value: String) -> Result<()> {
         match name {
             '_' => Ok(()),
+            '#' | '.' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
             _ => {
                 self.inner.entry(name).or_insert_with(Vec::new).push(value);
                 Ok(())
@@ -66,7 +84,15 @@ impl Registers {
 
                 (*name, preview)
             })
-            .chain([('_', "<empty>")].iter().copied())
+            .chain(
+                [
+                    ('_', "<empty>"),
+                    ('#', "<selection indices>"),
+                    ('.', "<selection contents>"),
+                ]
+                .iter()
+                .copied(),
+            )
     }
 
     pub fn clear(&mut self) {
@@ -75,7 +101,7 @@ impl Registers {
 
     pub fn remove(&mut self, name: char) -> bool {
         match name {
-            '_' => false,
+            '_' | '#' | '.' => false,
             _ => self.inner.remove(&name).is_some(),
         }
     }

From 32d071a39207b9f1c1753692e93aff45fcdf12c0 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Jul 2023 17:04:14 -0500
Subject: [PATCH 194/967] Add the '%' (current filename) register

This register also comes from Kakoune. It's read-only and produces the
current document's name, defaulting to the scratch buffer name
constant.

(Also see PR5577.)

Co-authored-by: Ivan Tham <pickfire@riseup.net>
---
 helix-view/src/register.rs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
index 892d396f3..14fd3f7fa 100644
--- a/helix-view/src/register.rs
+++ b/helix-view/src/register.rs
@@ -2,7 +2,7 @@ use std::{borrow::Cow, collections::HashMap, iter};
 
 use anyhow::Result;
 
-use crate::Editor;
+use crate::{document::SCRATCH_BUFFER_NAME, Editor};
 
 /// A key-value store for saving sets of values.
 ///
@@ -13,6 +13,7 @@ use crate::Editor;
 /// * Black hole (`_`): all values read and written are discarded
 /// * Selection indices (`#`): index number of each selection starting at 1
 /// * Selection contents (`.`)
+/// * Document path (`%`): filename of the current buffer
 #[derive(Debug, Default)]
 pub struct Registers {
     inner: HashMap<char, Vec<String>>,
@@ -36,6 +37,17 @@ impl Registers {
                 let text = doc.text().slice(..);
                 Some(RegisterValues::new(doc.selection(view.id).fragments(text)))
             }
+            '%' => {
+                let doc = doc!(editor);
+
+                let path = doc
+                    .path()
+                    .as_ref()
+                    .map(|p| p.to_string_lossy())
+                    .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
+
+                Some(RegisterValues::new(iter::once(path)))
+            }
             _ => self
                 .inner
                 .get(&name)
@@ -46,7 +58,7 @@ impl Registers {
     pub fn write(&mut self, name: char, values: Vec<String>) -> Result<()> {
         match name {
             '_' => Ok(()),
-            '#' | '.' => Err(anyhow::anyhow!("Register {name} does not support writing")),
+            '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support writing")),
             _ => {
                 self.inner.insert(name, values);
                 Ok(())
@@ -57,7 +69,7 @@ impl Registers {
     pub fn push(&mut self, name: char, value: String) -> Result<()> {
         match name {
             '_' => Ok(()),
-            '#' | '.' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
+            '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
             _ => {
                 self.inner.entry(name).or_insert_with(Vec::new).push(value);
                 Ok(())
@@ -89,6 +101,7 @@ impl Registers {
                     ('_', "<empty>"),
                     ('#', "<selection indices>"),
                     ('.', "<selection contents>"),
+                    ('%', "<document path>"),
                 ]
                 .iter()
                 .copied(),
@@ -101,7 +114,7 @@ impl Registers {
 
     pub fn remove(&mut self, name: char) -> bool {
         match name {
-            '_' | '#' | '.' => false,
+            '_' | '#' | '.' | '%' => false,
             _ => self.inner.remove(&name).is_some(),
         }
     }

From 0f19f282cfa49d441f58a8e2540a6b24efe1b769 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Jul 2023 17:17:04 -0500
Subject: [PATCH 195/967] Add system & primary clipboards as special registers

These special registers join and copy the values to the clipboards with
'*' corresponding to the system clipboard and '+' to the primary as
they are in Vim. This also uses the trick from PR6889 to save the values
in the register and re-use them without joining into one value when
pasting a value which was yanked and not changed.

These registers are not implemented in Kakoune but Kakoune also does
not have a built-in clipboard integration.

Co-authored-by: CcydtN <51289140+CcydtN@users.noreply.github.com>
Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 helix-view/src/register.rs | 148 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 146 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
index 14fd3f7fa..e82051dd5 100644
--- a/helix-view/src/register.rs
+++ b/helix-view/src/register.rs
@@ -1,8 +1,13 @@
 use std::{borrow::Cow, collections::HashMap, iter};
 
 use anyhow::Result;
+use helix_core::NATIVE_LINE_ENDING;
 
-use crate::{document::SCRATCH_BUFFER_NAME, Editor};
+use crate::{
+    clipboard::{get_clipboard_provider, ClipboardProvider, ClipboardType},
+    document::SCRATCH_BUFFER_NAME,
+    Editor,
+};
 
 /// A key-value store for saving sets of values.
 ///
@@ -14,9 +19,21 @@ use crate::{document::SCRATCH_BUFFER_NAME, Editor};
 /// * Selection indices (`#`): index number of each selection starting at 1
 /// * Selection contents (`.`)
 /// * Document path (`%`): filename of the current buffer
-#[derive(Debug, Default)]
+/// * System clipboard (`*`)
+/// * Primary clipboard (`+`)
+#[derive(Debug)]
 pub struct Registers {
     inner: HashMap<char, Vec<String>>,
+    clipboard_provider: Box<dyn ClipboardProvider>,
+}
+
+impl Default for Registers {
+    fn default() -> Self {
+        Self {
+            inner: Default::default(),
+            clipboard_provider: get_clipboard_provider(),
+        }
+    }
 }
 
 impl Registers {
@@ -48,6 +65,15 @@ impl Registers {
 
                 Some(RegisterValues::new(iter::once(path)))
             }
+            '*' | '+' => Some(read_from_clipboard(
+                self.clipboard_provider.as_ref(),
+                self.inner.get(&name),
+                match name {
+                    '*' => ClipboardType::Clipboard,
+                    '+' => ClipboardType::Selection,
+                    _ => unreachable!(),
+                },
+            )),
             _ => self
                 .inner
                 .get(&name)
@@ -59,6 +85,18 @@ impl Registers {
         match name {
             '_' => Ok(()),
             '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support writing")),
+            '*' | '+' => {
+                self.clipboard_provider.set_contents(
+                    values.join(NATIVE_LINE_ENDING.as_str()),
+                    match name {
+                        '*' => ClipboardType::Clipboard,
+                        '+' => ClipboardType::Selection,
+                        _ => unreachable!(),
+                    },
+                )?;
+                self.inner.insert(name, values);
+                Ok(())
+            }
             _ => {
                 self.inner.insert(name, values);
                 Ok(())
@@ -70,6 +108,27 @@ impl Registers {
         match name {
             '_' => Ok(()),
             '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
+            '*' | '+' => {
+                let clipboard_type = match name {
+                    '*' => ClipboardType::Clipboard,
+                    '+' => ClipboardType::Selection,
+                    _ => unreachable!(),
+                };
+                let contents = self.clipboard_provider.get_contents(clipboard_type)?;
+                let saved_values = self.inner.entry(name).or_insert_with(Vec::new);
+
+                if !contents_are_saved(saved_values, &contents) {
+                    anyhow::bail!("Failed to push to register {name}: clipboard does not match register contents");
+                }
+
+                saved_values.push(value);
+                self.clipboard_provider.set_contents(
+                    saved_values.join(NATIVE_LINE_ENDING.as_str()),
+                    clipboard_type,
+                )?;
+
+                Ok(())
+            }
             _ => {
                 self.inner.entry(name).or_insert_with(Vec::new).push(value);
                 Ok(())
@@ -88,6 +147,7 @@ impl Registers {
     pub fn iter_preview(&self) -> impl Iterator<Item = (char, &str)> {
         self.inner
             .iter()
+            .filter(|(name, _)| !matches!(name, '*' | '+'))
             .map(|(name, values)| {
                 let preview = values
                     .first()
@@ -102,6 +162,8 @@ impl Registers {
                     ('#', "<selection indices>"),
                     ('.', "<selection contents>"),
                     ('%', "<document path>"),
+                    ('*', "<system clipboard>"),
+                    ('+', "<primary clipboard>"),
                 ]
                 .iter()
                 .copied(),
@@ -109,15 +171,97 @@ impl Registers {
     }
 
     pub fn clear(&mut self) {
+        self.clear_clipboard(ClipboardType::Clipboard);
+        self.clear_clipboard(ClipboardType::Selection);
         self.inner.clear()
     }
 
     pub fn remove(&mut self, name: char) -> bool {
         match name {
+            '*' | '+' => {
+                self.clear_clipboard(match name {
+                    '*' => ClipboardType::Clipboard,
+                    '+' => ClipboardType::Selection,
+                    _ => unreachable!(),
+                });
+                self.inner.remove(&name);
+
+                true
+            }
             '_' | '#' | '.' | '%' => false,
             _ => self.inner.remove(&name).is_some(),
         }
     }
+
+    fn clear_clipboard(&mut self, clipboard_type: ClipboardType) {
+        if let Err(err) = self
+            .clipboard_provider
+            .set_contents("".into(), clipboard_type)
+        {
+            log::error!(
+                "Failed to clear {} clipboard: {err}",
+                match clipboard_type {
+                    ClipboardType::Clipboard => "system",
+                    ClipboardType::Selection => "primary",
+                }
+            )
+        }
+    }
+}
+
+fn read_from_clipboard<'a>(
+    provider: &dyn ClipboardProvider,
+    saved_values: Option<&'a Vec<String>>,
+    clipboard_type: ClipboardType,
+) -> RegisterValues<'a> {
+    match provider.get_contents(clipboard_type) {
+        Ok(contents) => {
+            // If we're pasting the same values that we just yanked, re-use
+            // the saved values. This allows pasting multiple selections
+            // even when yanked to a clipboard.
+            let Some(values) = saved_values else { return RegisterValues::new(iter::once(contents.into())) };
+
+            if contents_are_saved(values, &contents) {
+                RegisterValues::new(values.iter().map(Cow::from))
+            } else {
+                RegisterValues::new(iter::once(contents.into()))
+            }
+        }
+        Err(err) => {
+            log::error!(
+                "Failed to read {} clipboard: {err}",
+                match clipboard_type {
+                    ClipboardType::Clipboard => "system",
+                    ClipboardType::Selection => "primary",
+                }
+            );
+
+            RegisterValues::new(iter::empty())
+        }
+    }
+}
+
+fn contents_are_saved(saved_values: &[String], mut contents: &str) -> bool {
+    let line_ending = NATIVE_LINE_ENDING.as_str();
+    let mut values = saved_values.iter();
+
+    match values.next() {
+        Some(first) if contents.starts_with(first) => {
+            contents = &contents[first.len()..];
+        }
+        None if contents.is_empty() => return true,
+        _ => return false,
+    }
+
+    for value in values {
+        if contents.starts_with(line_ending) && contents[line_ending.len()..].starts_with(value) {
+            contents = &contents[line_ending.len() + value.len()..];
+        } else {
+            return false;
+        }
+    }
+
+    true
 }
 
 // This is a wrapper of an iterator that is both double ended and exact size,

From baceb02a090fe711ad772d855635bc590826fa53 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Jul 2023 18:48:29 -0500
Subject: [PATCH 196/967] Use refactored Registers type

This is an unfortunately noisy change: we need to update virtually all
callsites that access the registers. For reads this means passing in the
Editor and for writes this means handling potential failure when we
can't write to a clipboard register.
---
 helix-core/src/lib.rs            |   1 -
 helix-core/src/register.rs       |  89 -------------------
 helix-term/src/commands.rs       | 148 +++++++++++++++++--------------
 helix-term/src/commands/typed.rs |  13 ++-
 helix-term/src/ui/prompt.rs      |  56 ++++++------
 helix-view/src/editor.rs         |   2 +-
 helix-view/src/info.rs           |  15 +---
 7 files changed, 118 insertions(+), 206 deletions(-)
 delete mode 100644 helix-core/src/register.rs

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index e1b5a1a12..9a512eae8 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -18,7 +18,6 @@ pub mod movement;
 pub mod object;
 pub mod path;
 mod position;
-pub mod register;
 pub mod search;
 pub mod selection;
 pub mod shellwords;
diff --git a/helix-core/src/register.rs b/helix-core/src/register.rs
deleted file mode 100644
index df68a7594..000000000
--- a/helix-core/src/register.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use std::collections::HashMap;
-
-#[derive(Debug)]
-pub struct Register {
-    name: char,
-    values: Vec<String>,
-}
-
-impl Register {
-    pub const fn new(name: char) -> Self {
-        Self {
-            name,
-            values: Vec::new(),
-        }
-    }
-
-    pub fn new_with_values(name: char, values: Vec<String>) -> Self {
-        Self { name, values }
-    }
-
-    pub const fn name(&self) -> char {
-        self.name
-    }
-
-    pub fn read(&self) -> &[String] {
-        &self.values
-    }
-
-    pub fn write(&mut self, values: Vec<String>) {
-        self.values = values;
-    }
-
-    pub fn push(&mut self, value: String) {
-        self.values.push(value);
-    }
-}
-
-/// Currently just wraps a `HashMap` of `Register`s
-#[derive(Debug, Default)]
-pub struct Registers {
-    inner: HashMap<char, Register>,
-}
-
-impl Registers {
-    pub fn get(&self, name: char) -> Option<&Register> {
-        self.inner.get(&name)
-    }
-
-    pub fn read(&self, name: char) -> Option<&[String]> {
-        self.get(name).map(|reg| reg.read())
-    }
-
-    pub fn write(&mut self, name: char, values: Vec<String>) {
-        if name != '_' {
-            self.inner
-                .insert(name, Register::new_with_values(name, values));
-        }
-    }
-
-    pub fn push(&mut self, name: char, value: String) {
-        if name != '_' {
-            if let Some(r) = self.inner.get_mut(&name) {
-                r.push(value);
-            } else {
-                self.write(name, vec![value]);
-            }
-        }
-    }
-
-    pub fn first(&self, name: char) -> Option<&String> {
-        self.read(name).and_then(|entries| entries.first())
-    }
-
-    pub fn last(&self, name: char) -> Option<&String> {
-        self.read(name).and_then(|entries| entries.last())
-    }
-
-    pub fn inner(&self) -> &HashMap<char, Register> {
-        &self.inner
-    }
-
-    pub fn clear(&mut self) {
-        self.inner.clear();
-    }
-
-    pub fn remove(&mut self, name: char) -> Option<Register> {
-        self.inner.remove(&name)
-    }
-}
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 58c172968..d9ea580d5 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1847,11 +1847,11 @@ fn search_impl(
 
 fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
     let mut items = reg
-        .and_then(|reg| cx.editor.registers.get(reg))
-        .map_or(Vec::new(), |reg| reg.read().iter().take(200).collect());
+        .and_then(|reg| cx.editor.registers.read(reg, cx.editor))
+        .map_or(Vec::new(), |reg| reg.take(200).collect());
     items.sort_unstable();
     items.dedup();
-    items.into_iter().cloned().collect()
+    items.into_iter().map(|value| value.to_string()).collect()
 }
 
 fn search(cx: &mut Context) {
@@ -1910,9 +1910,8 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
     let count = cx.count();
     let config = cx.editor.config();
     let scrolloff = config.scrolloff;
-    let (_, doc) = current!(cx.editor);
-    let registers = &cx.editor.registers;
-    if let Some(query) = registers.read('/').and_then(|query| query.last()) {
+    if let Some(query) = cx.editor.registers.last('/', cx.editor) {
+        let doc = doc!(cx.editor);
         let contents = doc.text().slice(..).to_string();
         let search_config = &config.search;
         let case_insensitive = if search_config.smart_case {
@@ -1921,7 +1920,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
             false
         };
         let wrap_around = search_config.wrap_around;
-        if let Ok(regex) = RegexBuilder::new(query)
+        if let Ok(regex) = RegexBuilder::new(&query)
             .case_insensitive(case_insensitive)
             .multi_line(true)
             .build()
@@ -1974,12 +1973,14 @@ fn search_selection(cx: &mut Context) {
         .join("|");
 
     let msg = format!("register '{}' set to '{}'", '/', &regex);
-    cx.editor.registers.push('/', regex);
-    cx.editor.set_status(msg);
+    match cx.editor.registers.push('/', regex) {
+        Ok(_) => cx.editor.set_status(msg),
+        Err(err) => cx.editor.set_error(err.to_string()),
+    }
 }
 
 fn make_search_word_bounded(cx: &mut Context) {
-    let regex = match cx.editor.registers.last('/') {
+    let regex = match cx.editor.registers.last('/', cx.editor) {
         Some(regex) => regex,
         None => return,
     };
@@ -1997,14 +1998,16 @@ fn make_search_word_bounded(cx: &mut Context) {
     if !start_anchored {
         new_regex.push_str("\\b");
     }
-    new_regex.push_str(regex);
+    new_regex.push_str(&regex);
     if !end_anchored {
         new_regex.push_str("\\b");
     }
 
     let msg = format!("register '{}' set to '{}'", '/', &new_regex);
-    cx.editor.registers.push('/', new_regex);
-    cx.editor.set_status(msg);
+    match cx.editor.registers.push('/', new_regex) {
+        Ok(_) => cx.editor.set_status(msg),
+        Err(err) => cx.editor.set_error(err.to_string()),
+    }
 }
 
 fn global_search(cx: &mut Context) {
@@ -2367,7 +2370,10 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
         let text = doc.text().slice(..);
         let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
         let reg_name = cx.register.unwrap_or('"');
-        cx.editor.registers.write(reg_name, values);
+        if let Err(err) = cx.editor.registers.write(reg_name, values) {
+            cx.editor.set_error(err.to_string());
+            return;
+        }
     };
 
     // then delete
@@ -3758,18 +3764,16 @@ fn yank(cx: &mut Context) {
         .fragments(text)
         .map(Cow::into_owned)
         .collect();
+    let selections = values.len();
+    let register = cx.register.unwrap_or('"');
 
-    let msg = format!(
-        "yanked {} selection(s) to register {}",
-        values.len(),
-        cx.register.unwrap_or('"')
-    );
-
-    cx.editor
-        .registers
-        .write(cx.register.unwrap_or('"'), values);
+    match cx.editor.registers.write(register, values) {
+        Ok(_) => cx.editor.set_status(format!(
+            "yanked {selections} selection(s) to register {register}",
+        )),
+        Err(err) => cx.editor.set_error(err.to_string()),
+    }
 
-    cx.editor.set_status(msg);
     exit_select_mode(cx);
 }
 
@@ -3778,6 +3782,7 @@ fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
     let text = doc.text().slice(..);
 
     let selection = doc.selection(view.id);
+    let selections = selection.len();
     let joined = selection
         .fragments(text)
         .fold(String::new(), |mut acc, fragment| {
@@ -3788,14 +3793,12 @@ fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
             acc
         });
 
-    let msg = format!(
-        "joined and yanked {} selection(s) to register {}",
-        selection.len(),
-        register,
-    );
-
-    editor.registers.write(register, vec![joined]);
-    editor.set_status(msg);
+    match editor.registers.write(register, vec![joined]) {
+        Ok(_) => editor.set_status(format!(
+            "joined and yanked {selections} selection(s) to register {register}",
+        )),
+        Err(err) => editor.set_error(err.to_string()),
+    }
 }
 
 fn yank_joined(cx: &mut Context) {
@@ -4040,34 +4043,34 @@ fn paste_primary_clipboard_before(cx: &mut Context) {
 fn replace_with_yanked(cx: &mut Context) {
     let count = cx.count();
     let reg_name = cx.register.unwrap_or('"');
-    let (view, doc) = current!(cx.editor);
-    let registers = &mut cx.editor.registers;
-
-    if let Some(values) = registers.read(reg_name) {
-        if !values.is_empty() {
-            let repeat = std::iter::repeat(
-                values
-                    .last()
-                    .map(|value| Tendril::from(&value.repeat(count)))
-                    .unwrap(),
-            );
-            let mut values = values
-                .iter()
-                .map(|value| Tendril::from(&value.repeat(count)))
-                .chain(repeat);
-            let selection = doc.selection(view.id);
-            let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
-                if !range.is_empty() {
-                    (range.from(), range.to(), Some(values.next().unwrap()))
-                } else {
-                    (range.from(), range.to(), None)
-                }
-            });
 
-            doc.apply(&transaction, view.id);
-            exit_select_mode(cx);
+    let Some(values) = cx.editor.registers
+        .read(reg_name, cx.editor)
+        .filter(|values| values.len() > 0) else { return };
+    let values: Vec<_> = values.map(|value| value.to_string()).collect();
+
+    let (view, doc) = current!(cx.editor);
+    let repeat = std::iter::repeat(
+        values
+            .last()
+            .map(|value| Tendril::from(&value.repeat(count)))
+            .unwrap(),
+    );
+    let mut values = values
+        .iter()
+        .map(|value| Tendril::from(&value.repeat(count)))
+        .chain(repeat);
+    let selection = doc.selection(view.id);
+    let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
+        if !range.is_empty() {
+            (range.from(), range.to(), Some(values.next().unwrap()))
+        } else {
+            (range.from(), range.to(), None)
         }
-    }
+    });
+
+    doc.apply(&transaction, view.id);
+    exit_select_mode(cx);
 }
 
 fn replace_selections_with_clipboard_impl(
@@ -4109,12 +4112,12 @@ fn replace_selections_with_primary_clipboard(cx: &mut Context) {
 fn paste(cx: &mut Context, pos: Paste) {
     let count = cx.count();
     let reg_name = cx.register.unwrap_or('"');
-    let (view, doc) = current!(cx.editor);
-    let registers = &mut cx.editor.registers;
 
-    if let Some(values) = registers.read(reg_name) {
-        paste_impl(values, doc, view, pos, count, cx.editor.mode);
-    }
+    let Some(values) = cx.editor.registers.read(reg_name, cx.editor) else { return };
+    let values: Vec<_> = values.map(|value| value.to_string()).collect();
+
+    let (view, doc) = current!(cx.editor);
+    paste_impl(&values, doc, view, pos, count, cx.editor.mode);
 }
 
 fn paste_after(cx: &mut Context) {
@@ -5593,9 +5596,12 @@ fn record_macro(cx: &mut Context) {
                 }
             })
             .collect::<String>();
-        cx.editor.registers.write(reg, vec![s]);
-        cx.editor
-            .set_status(format!("Recorded to register [{}]", reg));
+        match cx.editor.registers.write(reg, vec![s]) {
+            Ok(_) => cx
+                .editor
+                .set_status(format!("Recorded to register [{}]", reg)),
+            Err(err) => cx.editor.set_error(err.to_string()),
+        }
     } else {
         let reg = cx.register.take().unwrap_or('@');
         cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5615,8 +5621,14 @@ fn replay_macro(cx: &mut Context) {
         return;
     }
 
-    let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
-        match helix_view::input::parse_macro(keys_str) {
+    let keys: Vec<KeyEvent> = if let Some(keys) = cx
+        .editor
+        .registers
+        .read(reg, cx.editor)
+        .filter(|values| values.len() == 1)
+        .map(|mut values| values.next().unwrap())
+    {
+        match helix_view::input::parse_macro(&keys) {
             Ok(keys) => keys,
             Err(err) => {
                 cx.editor.set_error(format!("Invalid macro: {}", err));
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 175f8bc61..28759b3f9 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2285,13 +2285,12 @@ fn clear_register(
         format!("Invalid register {}", args[0])
     );
     let register = args[0].chars().next().unwrap_or_default();
-    match cx.editor.registers.remove(register) {
-        Some(_) => cx
-            .editor
-            .set_status(format!("Register {} cleared", register)),
-        None => cx
-            .editor
-            .set_error(format!("Register {} not found", register)),
+    if cx.editor.registers.remove(register) {
+        cx.editor
+            .set_status(format!("Register {} cleared", register));
+    } else {
+        cx.editor
+            .set_error(format!("Register {} not found", register));
     }
     Ok(())
 }
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 1352f4937..8dc2906a8 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -306,8 +306,8 @@ impl Prompt {
         direction: CompletionDirection,
     ) {
         (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
-        let values = match cx.editor.registers.read(register) {
-            Some(values) if !values.is_empty() => values,
+        let mut values = match cx.editor.registers.read(register, cx.editor) {
+            Some(values) if values.len() > 0 => values,
             _ => return,
         };
 
@@ -315,13 +315,16 @@ impl Prompt {
 
         let index = match direction {
             CompletionDirection::Forward => self.history_pos.map_or(0, |i| i + 1),
-            CompletionDirection::Backward => {
-                self.history_pos.unwrap_or(values.len()).saturating_sub(1)
-            }
+            CompletionDirection::Backward => self
+                .history_pos
+                .unwrap_or_else(|| values.len())
+                .saturating_sub(1),
         }
         .min(end);
 
-        self.line = values[index].clone();
+        self.line = values.nth(index).unwrap().to_string();
+        // Appease the borrow checker.
+        drop(values);
 
         self.history_pos = Some(index);
 
@@ -470,7 +473,7 @@ impl Prompt {
             // Show the most recently entered value as a suggestion.
             if let Some(suggestion) = self
                 .history_register
-                .and_then(|reg| cx.editor.registers.last(reg))
+                .and_then(|reg| cx.editor.registers.last(reg, cx.editor))
             {
                 surface.set_string(line_area.x, line_area.y, suggestion, suggestion_color);
             }
@@ -567,25 +570,29 @@ impl Component for Prompt {
                 } else {
                     let last_item = self
                         .history_register
-                        .and_then(|reg| cx.editor.registers.last(reg).cloned())
-                        .map(|entry| entry.into())
-                        .unwrap_or_else(|| Cow::from(""));
+                        .and_then(|reg| cx.editor.registers.last(reg, cx.editor))
+                        .map(|entry| entry.to_string())
+                        .unwrap_or_else(|| String::from(""));
 
                     // handle executing with last command in history if nothing entered
-                    let input: Cow<str> = if self.line.is_empty() {
-                        last_item
+                    let input = if self.line.is_empty() {
+                        &last_item
                     } else {
                         if last_item != self.line {
                             // store in history
                             if let Some(register) = self.history_register {
-                                cx.editor.registers.push(register, self.line.clone());
+                                if let Err(err) =
+                                    cx.editor.registers.push(register, self.line.clone())
+                                {
+                                    cx.editor.set_error(err.to_string());
+                                }
                             };
                         }
 
-                        self.line.as_str().into()
+                        &self.line
                     };
 
-                    (self.callback_fn)(cx, &input, PromptEvent::Validate);
+                    (self.callback_fn)(cx, input, PromptEvent::Validate);
 
                     return close_fn;
                 }
@@ -617,25 +624,16 @@ impl Component for Prompt {
                 self.completion = cx
                     .editor
                     .registers
-                    .inner()
-                    .iter()
-                    .map(|(ch, reg)| {
-                        let content = reg
-                            .read()
-                            .get(0)
-                            .and_then(|s| s.lines().next().to_owned())
-                            .unwrap_or_default();
-                        (0.., format!("{} {}", ch, &content).into())
-                    })
+                    .iter_preview()
+                    .map(|(ch, preview)| (0.., format!("{} {}", ch, &preview).into()))
                     .collect();
                 self.next_char_handler = Some(Box::new(|prompt, c, context| {
                     prompt.insert_str(
-                        context
+                        &context
                             .editor
                             .registers
-                            .read(c)
-                            .and_then(|r| r.first())
-                            .map_or("", |r| r.as_str()),
+                            .first(c, context.editor)
+                            .unwrap_or_default(),
                         context.editor,
                     );
                 }));
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 20469ae94..1824ebf75 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -5,6 +5,7 @@ use crate::{
     graphics::{CursorKind, Rect},
     info::Info,
     input::KeyEvent,
+    register::Registers,
     theme::{self, Theme},
     tree::{self, Tree},
     view::ViewPosition,
@@ -40,7 +41,6 @@ use tokio::{
 use anyhow::{anyhow, bail, Error};
 
 pub use helix_core::diagnostic::Severity;
-pub use helix_core::register::Registers;
 use helix_core::{
     auto_pairs::AutoPairs,
     syntax::{self, AutoPairConfig, SoftWrap},
diff --git a/helix-view/src/info.rs b/helix-view/src/info.rs
index 1503e855e..ca783fef5 100644
--- a/helix-view/src/info.rs
+++ b/helix-view/src/info.rs
@@ -1,4 +1,5 @@
-use helix_core::{register::Registers, unicode::width::UnicodeWidthStr};
+use crate::register::Registers;
+use helix_core::unicode::width::UnicodeWidthStr;
 use std::fmt::Write;
 
 #[derive(Debug)]
@@ -56,16 +57,8 @@ impl Info {
 
     pub fn from_registers(registers: &Registers) -> Self {
         let body: Vec<_> = registers
-            .inner()
-            .iter()
-            .map(|(ch, reg)| {
-                let content = reg
-                    .read()
-                    .get(0)
-                    .and_then(|s| s.lines().next())
-                    .unwrap_or_default();
-                (ch.to_string(), content)
-            })
+            .iter_preview()
+            .map(|(ch, preview)| (ch.to_string(), preview))
             .collect();
 
         let mut infobox = Self::new("Registers", &body);

From a23b70182c5c714fb6210be7e6d4f4e3b15b0e8f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Jul 2023 19:09:26 -0500
Subject: [PATCH 197/967] commands: Allow using selected register where
 hardcoded

These snippets use hardcoded registers but it can be useful to be able
to specify a register for these commands.
---
 helix-term/src/commands.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d9ea580d5..329b7ab75 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1908,9 +1908,10 @@ fn searcher(cx: &mut Context, direction: Direction) {
 
 fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
     let count = cx.count();
+    let register = cx.register.unwrap_or('/');
     let config = cx.editor.config();
     let scrolloff = config.scrolloff;
-    if let Some(query) = cx.editor.registers.last('/', cx.editor) {
+    if let Some(query) = cx.editor.registers.last(register, cx.editor) {
         let doc = doc!(cx.editor);
         let contents = doc.text().slice(..).to_string();
         let search_config = &config.search;
@@ -1960,6 +1961,7 @@ fn extend_search_prev(cx: &mut Context) {
 }
 
 fn search_selection(cx: &mut Context) {
+    let register = cx.register.unwrap_or('/');
     let (view, doc) = current!(cx.editor);
     let contents = doc.text().slice(..);
 
@@ -1972,15 +1974,16 @@ fn search_selection(cx: &mut Context) {
         .collect::<Vec<_>>()
         .join("|");
 
-    let msg = format!("register '{}' set to '{}'", '/', &regex);
-    match cx.editor.registers.push('/', regex) {
+    let msg = format!("register '{}' set to '{}'", register, &regex);
+    match cx.editor.registers.push(register, regex) {
         Ok(_) => cx.editor.set_status(msg),
         Err(err) => cx.editor.set_error(err.to_string()),
     }
 }
 
 fn make_search_word_bounded(cx: &mut Context) {
-    let regex = match cx.editor.registers.last('/', cx.editor) {
+    let register = cx.register.unwrap_or('/');
+    let regex = match cx.editor.registers.last(register, cx.editor) {
         Some(regex) => regex,
         None => return,
     };
@@ -2003,8 +2006,8 @@ fn make_search_word_bounded(cx: &mut Context) {
         new_regex.push_str("\\b");
     }
 
-    let msg = format!("register '{}' set to '{}'", '/', &new_regex);
-    match cx.editor.registers.push('/', new_regex) {
+    let msg = format!("register '{}' set to '{}'", register, &new_regex);
+    match cx.editor.registers.push(register, new_regex) {
         Ok(_) => cx.editor.set_status(msg),
         Err(err) => cx.editor.set_error(err.to_string()),
     }

From 86a1f0177ca734e0ce66f4e55c41eda306f1adbb Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 6 May 2023 13:31:58 -0500
Subject: [PATCH 198/967] book: Document default and special registers

---
 book/src/usage.md | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/book/src/usage.md b/book/src/usage.md
index 3c48e3065..e392e5e67 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -37,19 +37,35 @@ If a register is selected before invoking a change or delete command, the select
 - `"hc` - Store the selection in register `h` and then change it (delete and enter insert mode).
 - `"md` - Store the selection in register `m` and delete it.
 
-### Special registers
+### Default registers
+
+Commands that use registers, like yank (`y`), use a default register if none is specified.
+These registers are used as defaults:
 
 | Register character | Contains              |
 | ---                | ---                   |
 | `/`                | Last search           |
 | `:`                | Last executed command |
 | `"`                | Last yanked text      |
-| `_`                | Black hole            |
+| `@`                | Last recorded macro   |
 
-The system clipboard is not directly supported by a special register. Instead, special commands and keybindings are provided. Refer to the
-[key map](keymap.md#space-mode) for more details.
+### Special registers
 
-The black hole register is a no-op register, meaning that no data will be read or written to it.
+Some registers have special behavior when read from and written to.
+
+| Register character | When read              | When written             |
+| ---                | ---                    | ---                      |
+| `_`                | No values are returned | All values are discarded |
+| `#`                | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
+| `.`                | Contents of the current selections | This register is not writable |
+| `%`                | Name of the current file | This register is not writable |
+| `*`                | Reads from the system clipboard | Joins and yanks to the system clipboard |
+| `+`                | Reads from the primary clipboard | Joins and yanks to the primary clipboard |
+
+When yanking multiple selections to the clipboard registers, the selections
+are joined with newlines. Pasting from these registers will paste multiple
+selections if the clipboard was last yanked to by the Helix session. Otherwise
+the clipboard contents are pasted as one selection.
 
 ## Surround
 

From 2d838d729cca26a718e3536e8d75c60396420dbd Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Jul 2023 19:06:13 -0500
Subject: [PATCH 199/967] Preview the latest value for regular registers

This fixes a discrepancy between regular registers which are used for
yanking multiple values (for example via `"ay`) and regular registers
that store a history of values (for example `"a*`).

Previously, the preview shown in `select_register`'s infobox would show
the oldest value in history. It's intuitive and useful to see the most
recent value pushed to the history though.

We cannot simply switch the preview line from `values.first()`
to `values.last()`: that would fix the preview for registers
used for history but break the preview for registers used to yank
multiple values. We could push to the beginning of the values with
`Registers::push` but this is wasteful from a performance perspective.
Instead we can have `Registers::read` return an iterator that
returns elements in the reverse order and reverse the values in
`Register::write`. This effectively means that `push` adds elements to
the beginning of the register's values. For the sake of the preview, we
can switch to `values.last()` and that is then correct for both usage-
styles. This also needs a change to call-sites that read the latest
history value to switch from `last` to `first`.
---
 helix-term/src/commands.rs  |  4 ++--
 helix-term/src/ui/prompt.rs |  6 +++---
 helix-view/src/register.rs  | 30 +++++++++++++++++++-----------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 329b7ab75..6f10848ac 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1911,7 +1911,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
     let register = cx.register.unwrap_or('/');
     let config = cx.editor.config();
     let scrolloff = config.scrolloff;
-    if let Some(query) = cx.editor.registers.last(register, cx.editor) {
+    if let Some(query) = cx.editor.registers.first(register, cx.editor) {
         let doc = doc!(cx.editor);
         let contents = doc.text().slice(..).to_string();
         let search_config = &config.search;
@@ -1983,7 +1983,7 @@ fn search_selection(cx: &mut Context) {
 
 fn make_search_word_bounded(cx: &mut Context) {
     let register = cx.register.unwrap_or('/');
-    let regex = match cx.editor.registers.last(register, cx.editor) {
+    let regex = match cx.editor.registers.first(register, cx.editor) {
         Some(regex) => regex,
         None => return,
     };
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 8dc2906a8..702a6e671 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -307,7 +307,7 @@ impl Prompt {
     ) {
         (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
         let mut values = match cx.editor.registers.read(register, cx.editor) {
-            Some(values) if values.len() > 0 => values,
+            Some(values) if values.len() > 0 => values.rev(),
             _ => return,
         };
 
@@ -473,7 +473,7 @@ impl Prompt {
             // Show the most recently entered value as a suggestion.
             if let Some(suggestion) = self
                 .history_register
-                .and_then(|reg| cx.editor.registers.last(reg, cx.editor))
+                .and_then(|reg| cx.editor.registers.first(reg, cx.editor))
             {
                 surface.set_string(line_area.x, line_area.y, suggestion, suggestion_color);
             }
@@ -570,7 +570,7 @@ impl Component for Prompt {
                 } else {
                     let last_item = self
                         .history_register
-                        .and_then(|reg| cx.editor.registers.last(reg, cx.editor))
+                        .and_then(|reg| cx.editor.registers.first(reg, cx.editor))
                         .map(|entry| entry.to_string())
                         .unwrap_or_else(|| String::from(""));
 
diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
index e82051dd5..61912378e 100644
--- a/helix-view/src/register.rs
+++ b/helix-view/src/register.rs
@@ -23,6 +23,10 @@ use crate::{
 /// * Primary clipboard (`+`)
 #[derive(Debug)]
 pub struct Registers {
+    /// The mapping of register to values.
+    /// Values are stored in reverse order when inserted with `Registers::write`.
+    /// The order is reversed again in `Registers::read`. This allows us to
+    /// efficiently prepend new values in `Registers::push`.
     inner: HashMap<char, Vec<String>>,
     clipboard_provider: Box<dyn ClipboardProvider>,
 }
@@ -77,11 +81,11 @@ impl Registers {
             _ => self
                 .inner
                 .get(&name)
-                .map(|values| RegisterValues::new(values.iter().map(Cow::from))),
+                .map(|values| RegisterValues::new(values.iter().map(Cow::from).rev())),
         }
     }
 
-    pub fn write(&mut self, name: char, values: Vec<String>) -> Result<()> {
+    pub fn write(&mut self, name: char, mut values: Vec<String>) -> Result<()> {
         match name {
             '_' => Ok(()),
             '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support writing")),
@@ -94,17 +98,19 @@ impl Registers {
                         _ => unreachable!(),
                     },
                 )?;
+                values.reverse();
                 self.inner.insert(name, values);
                 Ok(())
             }
             _ => {
+                values.reverse();
                 self.inner.insert(name, values);
                 Ok(())
             }
         }
     }
 
-    pub fn push(&mut self, name: char, value: String) -> Result<()> {
+    pub fn push(&mut self, name: char, mut value: String) -> Result<()> {
         match name {
             '_' => Ok(()),
             '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
@@ -121,11 +127,13 @@ impl Registers {
                     anyhow::bail!("Failed to push to register {name}: clipboard does not match register contents");
                 }
 
-                saved_values.push(value);
-                self.clipboard_provider.set_contents(
-                    saved_values.join(NATIVE_LINE_ENDING.as_str()),
-                    clipboard_type,
-                )?;
+                saved_values.push(value.clone());
+                if !contents.is_empty() {
+                    value.push_str(NATIVE_LINE_ENDING.as_str());
+                }
+                value.push_str(&contents);
+                self.clipboard_provider
+                    .set_contents(value, clipboard_type)?;
 
                 Ok(())
             }
@@ -150,7 +158,7 @@ impl Registers {
             .filter(|(name, _)| !matches!(name, '*' | '+'))
             .map(|(name, values)| {
                 let preview = values
-                    .first()
+                    .last()
                     .and_then(|s| s.lines().next())
                     .unwrap_or("<empty>");
 
@@ -222,7 +230,7 @@ fn read_from_clipboard<'a>(
             let Some(values) = saved_values else { return RegisterValues::new(iter::once(contents.into())) };
 
             if contents_are_saved(values, &contents) {
-                RegisterValues::new(values.iter().map(Cow::from))
+                RegisterValues::new(values.iter().map(Cow::from).rev())
             } else {
                 RegisterValues::new(iter::once(contents.into()))
             }
@@ -243,7 +251,7 @@ fn read_from_clipboard<'a>(
 
 fn contents_are_saved(saved_values: &[String], mut contents: &str) -> bool {
     let line_ending = NATIVE_LINE_ENDING.as_str();
-    let mut values = saved_values.iter();
+    let mut values = saved_values.iter().rev();
 
     match values.next() {
         Some(first) if contents.starts_with(first) => {

From 4555a6b4332b48384d4bccfef527d26060c34037 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 11 Jul 2023 10:23:49 -0500
Subject: [PATCH 200/967] Reimplement clipboard commands in terms of special
 regs

Since the clipboard provider now lives on the Registers type, we want
to eliminate it from the Editor. We can do that and clean up the
commands that interact with the clipboard by calling regular yank,
paste and replace impls on the clipboard special registers.

Eventually the clipboard commands could be removed once macro keybinding
is supported.
---
 helix-term/src/commands.rs       | 227 +++++++++----------------------
 helix-term/src/commands/typed.rs |  55 +++-----
 helix-view/src/editor.rs         |   4 -
 helix-view/src/register.rs       |   4 +
 4 files changed, 89 insertions(+), 201 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 6f10848ac..21e2933fe 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -32,7 +32,6 @@ use helix_core::{
     RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
 };
 use helix_view::{
-    clipboard::ClipboardType,
     document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
     editor::{Action, CompleteAction},
     info::Info,
@@ -3759,7 +3758,12 @@ fn commit_undo_checkpoint(cx: &mut Context) {
 // Yank / Paste
 
 fn yank(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
+    yank_impl(cx.editor, cx.register.unwrap_or('"'));
+    exit_select_mode(cx);
+}
+
+fn yank_impl(editor: &mut Editor, register: char) {
+    let (view, doc) = current!(editor);
     let text = doc.text().slice(..);
 
     let values: Vec<String> = doc
@@ -3768,16 +3772,14 @@ fn yank(cx: &mut Context) {
         .map(Cow::into_owned)
         .collect();
     let selections = values.len();
-    let register = cx.register.unwrap_or('"');
 
-    match cx.editor.registers.write(register, values) {
-        Ok(_) => cx.editor.set_status(format!(
-            "yanked {selections} selection(s) to register {register}",
+    match editor.registers.write(register, values) {
+        Ok(_) => editor.set_status(format!(
+            "yanked {selections} selection{} to register {register}",
+            if selections == 1 { "" } else { "s" }
         )),
-        Err(err) => cx.editor.set_error(err.to_string()),
+        Err(err) => editor.set_error(err.to_string()),
     }
-
-    exit_select_mode(cx);
 }
 
 fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
@@ -3798,100 +3800,50 @@ fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
 
     match editor.registers.write(register, vec![joined]) {
         Ok(_) => editor.set_status(format!(
-            "joined and yanked {selections} selection(s) to register {register}",
+            "joined and yanked {selections} selection{} to register {register}",
+            if selections == 1 { "" } else { "s" }
         )),
         Err(err) => editor.set_error(err.to_string()),
     }
 }
 
 fn yank_joined(cx: &mut Context) {
-    let line_ending = doc!(cx.editor).line_ending;
-    let register = cx.register.unwrap_or('"');
-    yank_joined_impl(cx.editor, line_ending.as_str(), register);
+    let separator = doc!(cx.editor).line_ending.as_str();
+    yank_joined_impl(cx.editor, separator, cx.register.unwrap_or('"'));
     exit_select_mode(cx);
 }
 
-fn yank_joined_to_clipboard_impl(
-    editor: &mut Editor,
-    separator: &str,
-    clipboard_type: ClipboardType,
-) -> anyhow::Result<()> {
-    let (view, doc) = current!(editor);
-    let text = doc.text().slice(..);
-
-    let values: Vec<String> = doc
-        .selection(view.id)
-        .fragments(text)
-        .map(Cow::into_owned)
-        .collect();
-
-    let clipboard_text = match clipboard_type {
-        ClipboardType::Clipboard => "system clipboard",
-        ClipboardType::Selection => "primary clipboard",
-    };
-
-    let msg = format!(
-        "joined and yanked {} selection(s) to {}",
-        values.len(),
-        clipboard_text,
-    );
-
-    let joined = values.join(separator);
-
-    editor
-        .clipboard_provider
-        .set_contents(joined, clipboard_type)
-        .context("Couldn't set system clipboard content")?;
-
-    editor.set_status(msg);
-
-    Ok(())
+fn yank_joined_to_clipboard(cx: &mut Context) {
+    let line_ending = doc!(cx.editor).line_ending;
+    yank_joined_impl(cx.editor, line_ending.as_str(), '*');
+    exit_select_mode(cx);
 }
 
-fn yank_joined_to_clipboard(cx: &mut Context) {
+fn yank_joined_to_primary_clipboard(cx: &mut Context) {
     let line_ending = doc!(cx.editor).line_ending;
-    let _ =
-        yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
+    yank_joined_impl(cx.editor, line_ending.as_str(), '+');
     exit_select_mode(cx);
 }
 
-fn yank_main_selection_to_clipboard_impl(
-    editor: &mut Editor,
-    clipboard_type: ClipboardType,
-) -> anyhow::Result<()> {
+fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
     let (view, doc) = current!(editor);
     let text = doc.text().slice(..);
 
-    let message_text = match clipboard_type {
-        ClipboardType::Clipboard => "yanked main selection to system clipboard",
-        ClipboardType::Selection => "yanked main selection to primary clipboard",
-    };
-
-    let value = doc.selection(view.id).primary().fragment(text);
+    let selection = doc.selection(view.id).primary().fragment(text).to_string();
 
-    if let Err(e) = editor
-        .clipboard_provider
-        .set_contents(value.into_owned(), clipboard_type)
-    {
-        bail!("Couldn't set system clipboard content: {}", e);
+    match editor.registers.write(register, vec![selection]) {
+        Ok(_) => editor.set_status(format!("yanked primary selection to register {register}",)),
+        Err(err) => editor.set_error(err.to_string()),
     }
-
-    editor.set_status(message_text);
-    Ok(())
 }
 
 fn yank_main_selection_to_clipboard(cx: &mut Context) {
-    let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
-}
-
-fn yank_joined_to_primary_clipboard(cx: &mut Context) {
-    let line_ending = doc!(cx.editor).line_ending;
-    let _ =
-        yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Selection);
+    yank_primary_selection_impl(cx.editor, '*');
+    exit_select_mode(cx);
 }
 
 fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
-    let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
+    yank_primary_selection_impl(cx.editor, '+');
     exit_select_mode(cx);
 }
 
@@ -3991,68 +3943,34 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
     paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
 }
 
-fn paste_clipboard_impl(
-    editor: &mut Editor,
-    action: Paste,
-    clipboard_type: ClipboardType,
-    count: usize,
-) -> anyhow::Result<()> {
-    let (view, doc) = current!(editor);
-    match editor.clipboard_provider.get_contents(clipboard_type) {
-        Ok(contents) => {
-            paste_impl(&[contents], doc, view, action, count, editor.mode);
-            Ok(())
-        }
-        Err(e) => Err(e.context("Couldn't get system clipboard contents")),
-    }
-}
-
 fn paste_clipboard_after(cx: &mut Context) {
-    let _ = paste_clipboard_impl(
-        cx.editor,
-        Paste::After,
-        ClipboardType::Clipboard,
-        cx.count(),
-    );
+    paste(cx.editor, '*', Paste::After, cx.count());
 }
 
 fn paste_clipboard_before(cx: &mut Context) {
-    let _ = paste_clipboard_impl(
-        cx.editor,
-        Paste::Before,
-        ClipboardType::Clipboard,
-        cx.count(),
-    );
+    paste(cx.editor, '*', Paste::Before, cx.count());
 }
 
 fn paste_primary_clipboard_after(cx: &mut Context) {
-    let _ = paste_clipboard_impl(
-        cx.editor,
-        Paste::After,
-        ClipboardType::Selection,
-        cx.count(),
-    );
+    paste(cx.editor, '+', Paste::After, cx.count());
 }
 
 fn paste_primary_clipboard_before(cx: &mut Context) {
-    let _ = paste_clipboard_impl(
-        cx.editor,
-        Paste::Before,
-        ClipboardType::Selection,
-        cx.count(),
-    );
+    paste(cx.editor, '+', Paste::Before, cx.count());
 }
 
 fn replace_with_yanked(cx: &mut Context) {
-    let count = cx.count();
-    let reg_name = cx.register.unwrap_or('"');
+    replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
+    exit_select_mode(cx);
+}
 
-    let Some(values) = cx.editor.registers
-        .read(reg_name, cx.editor)
+fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
+    let Some(values) = editor.registers
+        .read(register, editor)
         .filter(|values| values.len() > 0) else { return };
     let values: Vec<_> = values.map(|value| value.to_string()).collect();
 
-    let (view, doc) = current!(cx.editor);
+    let (view, doc) = current!(editor);
     let repeat = std::iter::repeat(
         values
             .last()
@@ -4073,62 +3991,40 @@ fn replace_with_yanked(cx: &mut Context) {
     });
 
     doc.apply(&transaction, view.id);
-    exit_select_mode(cx);
-}
-
-fn replace_selections_with_clipboard_impl(
-    cx: &mut Context,
-    clipboard_type: ClipboardType,
-) -> anyhow::Result<()> {
-    let count = cx.count();
-    let (view, doc) = current!(cx.editor);
-
-    match cx.editor.clipboard_provider.get_contents(clipboard_type) {
-        Ok(contents) => {
-            let selection = doc.selection(view.id);
-            let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
-                (
-                    range.from(),
-                    range.to(),
-                    Some(contents.repeat(count).as_str().into()),
-                )
-            });
-
-            doc.apply(&transaction, view.id);
-            doc.append_changes_to_history(view);
-        }
-        Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
-    }
-
-    exit_select_mode(cx);
-    Ok(())
 }
 
 fn replace_selections_with_clipboard(cx: &mut Context) {
-    let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
+    replace_with_yanked_impl(cx.editor, '*', cx.count());
 }
 
 fn replace_selections_with_primary_clipboard(cx: &mut Context) {
-    let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
+    replace_with_yanked_impl(cx.editor, '+', cx.count());
 }
 
-fn paste(cx: &mut Context, pos: Paste) {
-    let count = cx.count();
-    let reg_name = cx.register.unwrap_or('"');
-
-    let Some(values) = cx.editor.registers.read(reg_name, cx.editor) else { return };
+fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
+    let Some(values) = editor.registers.read(register, editor) else { return };
     let values: Vec<_> = values.map(|value| value.to_string()).collect();
 
-    let (view, doc) = current!(cx.editor);
-    paste_impl(&values, doc, view, pos, count, cx.editor.mode);
+    let (view, doc) = current!(editor);
+    paste_impl(&values, doc, view, pos, count, editor.mode);
 }
 
 fn paste_after(cx: &mut Context) {
-    paste(cx, Paste::After)
+    paste(
+        cx.editor,
+        cx.register.unwrap_or('"'),
+        Paste::After,
+        cx.count(),
+    );
 }
 
 fn paste_before(cx: &mut Context) {
-    paste(cx, Paste::Before)
+    paste(
+        cx.editor,
+        cx.register.unwrap_or('"'),
+        Paste::Before,
+        cx.count(),
+    );
 }
 
 fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4885,7 +4781,12 @@ fn insert_register(cx: &mut Context) {
         if let Some(ch) = event.char() {
             cx.editor.autoinfo = None;
             cx.register = Some(ch);
-            paste(cx, Paste::Cursor);
+            paste(
+                cx.editor,
+                cx.register.unwrap_or('"'),
+                Paste::Cursor,
+                cx.count(),
+            );
         }
     })
 }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 28759b3f9..67640f797 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -904,7 +904,8 @@ fn yank_main_selection_to_clipboard(
         return Ok(());
     }
 
-    yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard)
+    yank_primary_selection_impl(cx.editor, '*');
+    Ok(())
 }
 
 fn yank_joined(
@@ -938,7 +939,8 @@ fn yank_joined_to_clipboard(
     let doc = doc!(cx.editor);
     let default_sep = Cow::Borrowed(doc.line_ending.as_str());
     let separator = args.first().unwrap_or(&default_sep);
-    yank_joined_to_clipboard_impl(cx.editor, separator, ClipboardType::Clipboard)
+    yank_joined_impl(cx.editor, separator, '*');
+    Ok(())
 }
 
 fn yank_main_selection_to_primary_clipboard(
@@ -950,7 +952,8 @@ fn yank_main_selection_to_primary_clipboard(
         return Ok(());
     }
 
-    yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection)
+    yank_primary_selection_impl(cx.editor, '+');
+    Ok(())
 }
 
 fn yank_joined_to_primary_clipboard(
@@ -965,7 +968,8 @@ fn yank_joined_to_primary_clipboard(
     let doc = doc!(cx.editor);
     let default_sep = Cow::Borrowed(doc.line_ending.as_str());
     let separator = args.first().unwrap_or(&default_sep);
-    yank_joined_to_clipboard_impl(cx.editor, separator, ClipboardType::Selection)
+    yank_joined_impl(cx.editor, separator, '+');
+    Ok(())
 }
 
 fn paste_clipboard_after(
@@ -977,7 +981,8 @@ fn paste_clipboard_after(
         return Ok(());
     }
 
-    paste_clipboard_impl(cx.editor, Paste::After, ClipboardType::Clipboard, 1)
+    paste(cx.editor, '*', Paste::After, 1);
+    Ok(())
 }
 
 fn paste_clipboard_before(
@@ -989,7 +994,8 @@ fn paste_clipboard_before(
         return Ok(());
     }
 
-    paste_clipboard_impl(cx.editor, Paste::Before, ClipboardType::Clipboard, 1)
+    paste(cx.editor, '*', Paste::Before, 1);
+    Ok(())
 }
 
 fn paste_primary_clipboard_after(
@@ -1001,7 +1007,8 @@ fn paste_primary_clipboard_after(
         return Ok(());
     }
 
-    paste_clipboard_impl(cx.editor, Paste::After, ClipboardType::Selection, 1)
+    paste(cx.editor, '+', Paste::After, 1);
+    Ok(())
 }
 
 fn paste_primary_clipboard_before(
@@ -1013,30 +1020,8 @@ fn paste_primary_clipboard_before(
         return Ok(());
     }
 
-    paste_clipboard_impl(cx.editor, Paste::Before, ClipboardType::Selection, 1)
-}
-
-fn replace_selections_with_clipboard_impl(
-    cx: &mut compositor::Context,
-    clipboard_type: ClipboardType,
-) -> anyhow::Result<()> {
-    let scrolloff = cx.editor.config().scrolloff;
-    let (view, doc) = current!(cx.editor);
-
-    match cx.editor.clipboard_provider.get_contents(clipboard_type) {
-        Ok(contents) => {
-            let selection = doc.selection(view.id);
-            let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
-                (range.from(), range.to(), Some(contents.as_str().into()))
-            });
-
-            doc.apply(&transaction, view.id);
-            doc.append_changes_to_history(view);
-            view.ensure_cursor_in_view(doc, scrolloff);
-            Ok(())
-        }
-        Err(e) => Err(e.context("Couldn't get system clipboard contents")),
-    }
+    paste(cx.editor, '+', Paste::Before, 1);
+    Ok(())
 }
 
 fn replace_selections_with_clipboard(
@@ -1048,7 +1033,8 @@ fn replace_selections_with_clipboard(
         return Ok(());
     }
 
-    replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard)
+    replace_with_yanked_impl(cx.editor, '*', 1);
+    Ok(())
 }
 
 fn replace_selections_with_primary_clipboard(
@@ -1060,7 +1046,8 @@ fn replace_selections_with_primary_clipboard(
         return Ok(());
     }
 
-    replace_selections_with_clipboard_impl(cx, ClipboardType::Selection)
+    replace_with_yanked_impl(cx.editor, '+', 1);
+    Ok(())
 }
 
 fn show_clipboard_provider(
@@ -1073,7 +1060,7 @@ fn show_clipboard_provider(
     }
 
     cx.editor
-        .set_status(cx.editor.clipboard_provider.name().to_string());
+        .set_status(cx.editor.registers.clipboard_provider_name().to_string());
     Ok(())
 }
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 1824ebf75..4ea1c49f5 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,6 +1,5 @@
 use crate::{
     align_view,
-    clipboard::{get_clipboard_provider, ClipboardProvider},
     document::{DocumentSavedEventFuture, DocumentSavedEventResult, Mode, SavePoint},
     graphics::{CursorKind, Rect},
     info::Info,
@@ -875,8 +874,6 @@ pub struct Editor {
     pub debugger_events: SelectAll<UnboundedReceiverStream<dap::Payload>>,
     pub breakpoints: HashMap<PathBuf, Vec<Breakpoint>>,
 
-    pub clipboard_provider: Box<dyn ClipboardProvider>,
-
     pub syn_loader: Arc<syntax::Loader>,
     pub theme_loader: Arc<theme::Loader>,
     /// last_theme is used for theme previews. We store the current theme here,
@@ -1023,7 +1020,6 @@ impl Editor {
             last_theme: None,
             last_selection: None,
             registers: Registers::default(),
-            clipboard_provider: get_clipboard_provider(),
             status_msg: None,
             autoinfo: None,
             idle_timer: Box::pin(sleep(conf.idle_timeout)),
diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
index 61912378e..3d1849a6f 100644
--- a/helix-view/src/register.rs
+++ b/helix-view/src/register.rs
@@ -215,6 +215,10 @@ impl Registers {
             )
         }
     }
+
+    pub fn clipboard_provider_name(&self) -> Cow<str> {
+        self.clipboard_provider.name()
+    }
 }
 
 fn read_from_clipboard<'a>(

From d4f9716fbc36bc20848b7be0b65551495fa52952 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 11 Jul 2023 11:15:38 -0500
Subject: [PATCH 201/967] Add yank_to_clipboard commands, bind to `<space>y` by
 default

The clipboard special registers are able to retain multiple selections
and also join the value when copying it to the clipboard. So by default
we should yank regularly to the '*' and '+' registers. That will have
the same behavior for the clipboards but will allow pasting multiple
selections if the clipboard doesn't change between yanks.
---
 book/src/keymap.md               |  2 +-
 helix-term/src/commands.rs       | 12 ++++++++++++
 helix-term/src/keymap/default.rs |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 153f3b648..5dc467f28 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -291,7 +291,7 @@ This layer is a kludge of mappings, mostly pickers.
 | `w`     | Enter [window mode](#window-mode)                                       | N/A                                        |
 | `p`     | Paste system clipboard after selections                                 | `paste_clipboard_after`                    |
 | `P`     | Paste system clipboard before selections                                | `paste_clipboard_before`                   |
-| `y`     | Join and yank selections to clipboard                                   | `yank_joined_to_clipboard`                 |
+| `y`     | Yank selections to clipboard                                            | `yank_to_clipboard`                        |
 | `Y`     | Yank main selection to clipboard                                        | `yank_main_selection_to_clipboard`         |
 | `R`     | Replace selections by clipboard contents                                | `replace_selections_with_clipboard`        |
 | `/`     | Global search in workspace folder                                       | `global_search`                            |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 21e2933fe..bf60ad71a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -375,6 +375,8 @@ impl MappableCommand {
         later, "Move forward in history",
         commit_undo_checkpoint, "Commit changes to new checkpoint",
         yank, "Yank selection",
+        yank_to_clipboard, "Yank selections to clipboard",
+        yank_to_primary_clipboard, "Yank selections to primary clipboard",
         yank_joined, "Join and yank selections",
         yank_joined_to_clipboard, "Join and yank selections to clipboard",
         yank_main_selection_to_clipboard, "Yank main selection to clipboard",
@@ -3762,6 +3764,16 @@ fn yank(cx: &mut Context) {
     exit_select_mode(cx);
 }
 
+fn yank_to_clipboard(cx: &mut Context) {
+    yank_impl(cx.editor, '*');
+    exit_select_mode(cx);
+}
+
+fn yank_to_primary_clipboard(cx: &mut Context) {
+    yank_impl(cx.editor, '+');
+    exit_select_mode(cx);
+}
+
 fn yank_impl(editor: &mut Editor, register: char) {
     let (view, doc) = current!(editor);
     let text = doc.text().slice(..);
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index c84c616c6..379833525 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -265,7 +265,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
                     "C-v" | "v" => vsplit_new,
                 },
             },
-            "y" => yank_joined_to_clipboard,
+            "y" => yank_to_clipboard,
             "Y" => yank_main_selection_to_clipboard,
             "p" => paste_clipboard_after,
             "P" => paste_clipboard_before,

From 0eea76c415efa9eb31a8eb2e67fc7f359b53e0b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 02:28:25 +0200
Subject: [PATCH 202/967] build(deps): bump globset from 0.4.11 to 0.4.12
 (#7795)

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 75bdbc9b1..39f2c7688 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1139,9 +1139,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
+checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006"
 dependencies = [
  "aho-corasick 1.0.2",
  "bstr",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 33c63e0a0..bcf54654a 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -19,7 +19,7 @@ helix-parsec = { version = "0.6", path = "../helix-parsec" }
 anyhow = "1.0"
 futures-executor = "0.3"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
-globset = "0.4.11"
+globset = "0.4.12"
 log = "0.4"
 lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }

From 99413558b9366bb65d3fc500138a80d004e06d59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 02:28:44 +0200
Subject: [PATCH 203/967] build(deps): bump serde_json from 1.0.103 to 1.0.104
 (#7793)

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 39f2c7688..330575820 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1987,9 +1987,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
 dependencies = [
  "itoa",
  "ryu",

From 1d702ea191e9bf84566ea0008755d1ab53d19265 Mon Sep 17 00:00:00 2001
From: Zoey Hewll <Zoybean@users.noreply.github.com>
Date: Tue, 1 Aug 2023 21:21:46 +0800
Subject: [PATCH 204/967] update yanked dependency (#7800)

---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 330575820..c4a02780b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1413,9 +1413,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "hex"
@@ -1525,7 +1525,7 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi 0.3.2",
  "libc",
  "windows-sys 0.48.0",
 ]

From 93acb538121cab36712f40f26fa287df93817de5 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 16 Aug 2022 21:28:41 -0400
Subject: [PATCH 205/967] add node boundary movement

---
 helix-core/src/movement.rs                 |  81 ++++++++-
 helix-term/src/commands.rs                 |  44 +++++
 helix-term/src/keymap/default.rs           |   5 +
 helix-term/tests/test/commands.rs          |   1 +
 helix-term/tests/test/commands/movement.rs | 199 +++++++++++++++++++++
 5 files changed, 329 insertions(+), 1 deletion(-)
 create mode 100644 helix-term/tests/test/commands/movement.rs

diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index 2b29f36de..6c4f3f535 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -16,7 +16,7 @@ use crate::{
     syntax::LanguageConfiguration,
     text_annotations::TextAnnotations,
     textobject::TextObject,
-    visual_offset_from_block, Range, RopeSlice,
+    visual_offset_from_block, Range, RopeSlice, Selection, Syntax,
 };
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -556,6 +556,85 @@ pub fn goto_treesitter_object(
     last_range
 }
 
+fn find_parent_start(mut node: Node) -> Option<Node> {
+    let start = node.start_byte();
+
+    while node.start_byte() >= start || !node.is_named() {
+        node = node.parent()?;
+    }
+
+    Some(node)
+}
+
+pub fn move_parent_node_end(
+    syntax: &Syntax,
+    text: RopeSlice,
+    selection: Selection,
+    dir: Direction,
+    movement: Movement,
+) -> Selection {
+    let tree = syntax.tree();
+
+    selection.transform(|range| {
+        let start_from = text.char_to_byte(range.from());
+        let start_to = text.char_to_byte(range.to());
+
+        let mut node = match tree
+            .root_node()
+            .named_descendant_for_byte_range(start_from, start_to)
+        {
+            Some(node) => node,
+            None => {
+                log::debug!(
+                    "no descendant found for byte range: {} - {}",
+                    start_from,
+                    start_to
+                );
+                return range;
+            }
+        };
+
+        let mut end_head = match dir {
+            // moving forward, we always want to move one past the end of the
+            // current node, so use the end byte of the current node, which is an exclusive
+            // end of the range
+            Direction::Forward => text.byte_to_char(node.end_byte()),
+
+            // moving backward, we want the cursor to land on the start char of
+            // the current node, or if it is already at the start of a node, to traverse up to
+            // the parent
+            Direction::Backward => {
+                let end_head = text.byte_to_char(node.start_byte());
+
+                // if we're already on the beginning, look up to the parent
+                if end_head == range.cursor(text) {
+                    node = find_parent_start(node).unwrap_or(node);
+                    text.byte_to_char(node.start_byte())
+                } else {
+                    end_head
+                }
+            }
+        };
+
+        if movement == Movement::Move {
+            // preserve direction of original range
+            if range.direction() == Direction::Forward {
+                Range::new(end_head, end_head + 1)
+            } else {
+                Range::new(end_head + 1, end_head)
+            }
+        } else {
+            // if we end up with a forward range, then adjust it to be one past
+            // where we want
+            if end_head >= range.anchor {
+                end_head += 1;
+            }
+
+            Range::new(range.anchor, end_head)
+        }
+    })
+}
+
 #[cfg(test)]
 mod test {
     use ropey::Rope;
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index bf60ad71a..fc01eec79 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -247,6 +247,8 @@ impl MappableCommand {
         move_prev_long_word_start, "Move to start of previous long word",
         move_next_long_word_end, "Move to end of next long word",
         move_prev_long_word_end, "Move to end of previous long word",
+        move_parent_node_end, "Move to end of the parent node",
+        move_parent_node_start, "Move to beginning of the parent node",
         extend_next_word_start, "Extend to start of next word",
         extend_prev_word_start, "Extend to start of previous word",
         extend_next_word_end, "Extend to end of next word",
@@ -255,6 +257,8 @@ impl MappableCommand {
         extend_prev_long_word_start, "Extend to start of previous long word",
         extend_next_long_word_end, "Extend to end of next long word",
         extend_prev_long_word_end, "Extend to end of prev long word",
+        extend_parent_node_end, "Extend to end of the parent node",
+        extend_parent_node_start, "Extend to beginning of the parent node",
         find_till_char, "Move till next occurrence of char",
         find_next_char, "Move to next occurrence of char",
         extend_till_char, "Extend till next occurrence of char",
@@ -4605,6 +4609,46 @@ fn select_prev_sibling(cx: &mut Context) {
     select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
 }
 
+fn move_node_bound_impl(cx: &mut Context, dir: Direction, movement: Movement) {
+    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 = movement::move_parent_node_end(
+                syntax,
+                text,
+                current_selection.clone(),
+                dir,
+                movement,
+            );
+
+            doc.set_selection(view.id, selection);
+        }
+    };
+
+    motion(cx.editor);
+    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+}
+
+pub fn move_parent_node_end(cx: &mut Context) {
+    move_node_bound_impl(cx, Direction::Forward, Movement::Move)
+}
+
+pub fn move_parent_node_start(cx: &mut Context) {
+    move_node_bound_impl(cx, Direction::Backward, Movement::Move)
+}
+
+pub fn extend_parent_node_end(cx: &mut Context) {
+    move_node_bound_impl(cx, Direction::Forward, Movement::Extend)
+}
+
+pub fn extend_parent_node_start(cx: &mut Context) {
+    move_node_bound_impl(cx, Direction::Backward, Movement::Extend)
+}
+
 fn match_brackets(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let is_select = cx.editor.mode == Mode::Select;
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 379833525..419e376ff 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -88,6 +88,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
         "A-i" | "A-down" => shrink_selection,
         "A-p" | "A-left" => select_prev_sibling,
         "A-n" | "A-right" => select_next_sibling,
+        "A-e" => move_parent_node_end,
+        "A-b" => move_parent_node_start,
 
         "%" => select_all,
         "x" => extend_line_below,
@@ -336,6 +338,9 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
         "B" => extend_prev_long_word_start,
         "E" => extend_next_long_word_end,
 
+        "A-e" => extend_parent_node_end,
+        "A-b" => extend_parent_node_start,
+
         "n" => extend_search_next,
         "N" => extend_search_prev,
 
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index b13c37bcd..b3e135510 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -2,6 +2,7 @@ use helix_term::application::Application;
 
 use super::*;
 
+mod movement;
 mod write;
 
 #[tokio::test(flavor = "multi_thread")]
diff --git a/helix-term/tests/test/commands/movement.rs b/helix-term/tests/test/commands/movement.rs
new file mode 100644
index 000000000..03dc7ba9c
--- /dev/null
+++ b/helix-term/tests/test/commands/movement.rs
@@ -0,0 +1,199 @@
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_move_parent_node_end() -> anyhow::Result<()> {
+    let tests = vec![
+        // single cursor stays single cursor, first goes to end of current
+        // node, then parent
+        (
+            helpers::platform_line(indoc! {r##"
+                fn foo() {
+                    let result = if true {
+                        "yes"
+                    } else {
+                        "no#["|]#
+                    }
+                }
+            "##}),
+            "<A-e>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"#[\n|]#
+                    }
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"#[\n|]#
+                    }
+                }
+            "}),
+            "<A-e>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"
+                    }#[\n|]#
+                }
+            "}),
+        ),
+        // select mode extends
+        (
+            helpers::platform_line(indoc! {r##"
+                fn foo() {
+                    let result = if true {
+                        "yes"
+                    } else {
+                        #["no"|]#
+                    }
+                }
+            "##}),
+            "v<A-e><A-e>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        #[\"no\"
+                    }\n|]#
+                }
+            "}),
+        ),
+    ];
+
+    for test in tests {
+        test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_move_parent_node_start() -> anyhow::Result<()> {
+    let tests = vec![
+        // single cursor stays single cursor, first goes to end of current
+        // node, then parent
+        (
+            helpers::platform_line(indoc! {r##"
+                fn foo() {
+                    let result = if true {
+                        "yes"
+                    } else {
+                        "no#["|]#
+                    }
+                }
+            "##}),
+            "<A-b>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        #[\"|]#no\"
+                    }
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"#[\n|]#
+                    }
+                }
+            "}),
+            "<A-b>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else #[{|]#
+                        \"no\"
+                    }
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else #[{|]#
+                        \"no\"
+                    }
+                }
+            "}),
+            "<A-b>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } #[e|]#lse {
+                        \"no\"
+                    }
+                }
+            "}),
+        ),
+        // select mode extends
+        (
+            helpers::platform_line(indoc! {r##"
+                fn foo() {
+                    let result = if true {
+                        "yes"
+                    } else {
+                        #["no"|]#
+                    }
+                }
+            "##}),
+            "v<A-b><A-b>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else #[|{
+                        ]#\"no\"
+                    }
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                fn foo() {
+                    let result = if true {
+                        "yes"
+                    } else {
+                        #["no"|]#
+                    }
+                }
+            "##}),
+            "v<A-b><A-b><A-b>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } #[|else {
+                        ]#\"no\"
+                    }
+                }
+            "}),
+        ),
+    ];
+
+    for test in tests {
+        test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
+    }
+
+    Ok(())
+}

From 15e07d4db893aec7b9e117c1f88400a68ba98ae2 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sat, 8 Oct 2022 18:14:49 -0400
Subject: [PATCH 206/967] feat: smart_tab

Implement `smart_tab`, which optionally makes the tab key run the
`move_parent_node_start` command when the cursor has non- whitespace to
its left.
---
 book/src/configuration.md                  |   8 +
 helix-term/src/application.rs              |   9 +-
 helix-term/src/commands.rs                 |  38 +++-
 helix-term/src/config.rs                   |   1 +
 helix-term/src/keymap/default.rs           |   3 +-
 helix-term/src/ui/menu.rs                  |  17 +-
 helix-term/tests/test/commands/movement.rs | 253 +++++++++++++++++++++
 helix-view/src/editor.rs                   |  19 ++
 8 files changed, 338 insertions(+), 10 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index da1d1bf6e..4c152bf4d 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -347,3 +347,11 @@ max-wrap = 25 # increase value to reduce forced mid-word wrapping
 max-indent-retain = 0
 wrap-indicator = ""  # set wrap-indicator to "" to hide it
 ```
+
+### `[editor.smart-tab]` Section
+
+
+| Key        | Description | Default |
+|------------|-------------|---------|
+| `enable` | If set to true, then when the cursor is in a position with non-whitespace to its left, instead of inserting a tab, it will run `move_parent_node_end`. If there is only whitespace to the left, then it inserts a tab as normal. With the default bindings, to explicitly insert a tab character, press Shift-tab. | `true` |
+| `supersede-menu` | Normally, when a menu is on screen, such as when auto complete is triggered, the tab key is bound to cycling through the items. This means when menus are on screen, one cannot use the tab key to trigger the `smart-tab` command. If this option is set to true, the `smart-tab` command always takes precedence, which means one cannot use the tab key to cycle through menu items. One of the other bindings must be used instead, such as arrow keys or `C-n`/`C-p`. | `false` |
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index dc4611989..a97ae5033 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -33,12 +33,9 @@ use crate::{
 };
 
 use log::{debug, error, warn};
-use std::{
-    collections::btree_map::Entry,
-    io::{stdin, stdout},
-    path::Path,
-    sync::Arc,
-};
+#[cfg(not(feature = "integration"))]
+use std::io::stdout;
+use std::{collections::btree_map::Entry, io::stdin, path::Path, sync::Arc};
 
 use anyhow::{Context, Error};
 
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index fc01eec79..7fb17ed8e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -365,6 +365,7 @@ impl MappableCommand {
         extend_to_line_end, "Extend to line end",
         extend_to_line_end_newline, "Extend to line end",
         signature_help, "Show signature help",
+        smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
         insert_tab, "Insert tab char",
         insert_newline, "Insert newline char",
         delete_char_backward, "Delete previous char",
@@ -2521,6 +2522,10 @@ fn insert_mode(cx: &mut Context) {
         .transform(|range| Range::new(range.to(), range.from()));
 
     doc.set_selection(view.id, selection);
+
+    // [TODO] temporary workaround until we're not using the idle timer to
+    //        trigger auto completions any more
+    cx.editor.clear_idle_timer();
 }
 
 // inserts at the end of each selection
@@ -3444,6 +3449,7 @@ pub mod insert {
     }
 
     use helix_core::auto_pairs;
+    use helix_view::editor::SmartTabConfig;
 
     pub fn insert_char(cx: &mut Context, c: char) {
         let (view, doc) = current_ref!(cx.editor);
@@ -3469,6 +3475,31 @@ pub mod insert {
         }
     }
 
+    pub fn smart_tab(cx: &mut Context) {
+        let (view, doc) = current_ref!(cx.editor);
+        let view_id = view.id;
+
+        if matches!(
+            cx.editor.config().smart_tab,
+            Some(SmartTabConfig { enable: true, .. })
+        ) {
+            let cursors_after_whitespace = doc.selection(view_id).ranges().iter().all(|range| {
+                let cursor = range.cursor(doc.text().slice(..));
+                let current_line_num = doc.text().char_to_line(cursor);
+                let current_line_start = doc.text().line_to_char(current_line_num);
+                let left = doc.text().slice(current_line_start..cursor);
+                left.chars().all(|c| c.is_whitespace())
+            });
+
+            if !cursors_after_whitespace {
+                move_parent_node_end(cx);
+                return;
+            }
+        }
+
+        insert_tab(cx);
+    }
+
     pub fn insert_tab(cx: &mut Context) {
         let (view, doc) = current!(cx.editor);
         // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -4626,11 +4657,14 @@ fn move_node_bound_impl(cx: &mut Context, dir: Direction, movement: Movement) {
             );
 
             doc.set_selection(view.id, selection);
+
+            // [TODO] temporary workaround until we're not using the idle timer to
+            //        trigger auto completions any more
+            editor.clear_idle_timer();
         }
     };
 
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion);
 }
 
 pub fn move_parent_node_end(cx: &mut Context) {
diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs
index f37b03ec7..bcba8d8e1 100644
--- a/helix-term/src/config.rs
+++ b/helix-term/src/config.rs
@@ -109,6 +109,7 @@ impl Config {
                     )?,
                 }
             }
+
             // these are just two io errors return the one for the global config
             (Err(err), Err(_)) => return Err(err),
         };
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 419e376ff..763ed4ae7 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -373,7 +373,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
         "C-h" | "backspace" | "S-backspace" => delete_char_backward,
         "C-d" | "del" => delete_char_forward,
         "C-j" | "ret" => insert_newline,
-        "tab" => insert_tab,
+        "tab" => smart_tab,
+        "S-tab" => insert_tab,
 
         "up" => move_visual_line_up,
         "down" => move_visual_line_down,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index bdad2e408..c73e7bed2 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -11,7 +11,7 @@ pub use tui::widgets::{Cell, Row};
 use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
 use fuzzy_matcher::FuzzyMatcher;
 
-use helix_view::{graphics::Rect, Editor};
+use helix_view::{editor::SmartTabConfig, graphics::Rect, Editor};
 use tui::layout::Constraint;
 
 pub trait Item {
@@ -247,6 +247,21 @@ impl<T: Item + 'static> Component for Menu<T> {
             compositor.pop();
         }));
 
+        // Ignore tab key when supertab is turned on in order not to interfere
+        // with it. (Is there a better way to do this?)
+        if (event == key!(Tab) || event == shift!(Tab))
+            && cx.editor.config().auto_completion
+            && matches!(
+                cx.editor.config().smart_tab,
+                Some(SmartTabConfig {
+                    enable: true,
+                    supersede_menu: true,
+                })
+            )
+        {
+            return EventResult::Ignored(None);
+        }
+
         match event {
             // esc or ctrl-c aborts the completion and closes the menu
             key!(Esc) | ctrl!('c') => {
diff --git a/helix-term/tests/test/commands/movement.rs b/helix-term/tests/test/commands/movement.rs
index 03dc7ba9c..5be68837c 100644
--- a/helix-term/tests/test/commands/movement.rs
+++ b/helix-term/tests/test/commands/movement.rs
@@ -197,3 +197,256 @@ async fn test_move_parent_node_start() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
+    let tests = vec![
+        // single cursor stays single cursor, first goes to end of current
+        // node, then parent
+        (
+            helpers::platform_line(indoc! {r##"
+                fn foo() {
+                    let result = if true {
+                        "yes"
+                    } else {
+                        "no#["|]#
+                    }
+                }
+            "##}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"#[|\n]#
+                    }
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"#[\n|]#
+                    }
+                }
+            "}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"
+                    }#[|\n]#
+                }
+            "}),
+        ),
+        // appending to the end of a line should still look at the current
+        // line, not the next one
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no#[\"|]#
+                    }
+                }
+            "}),
+            "a<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"
+                    }#[\n|]#
+                }
+            "}),
+        ),
+        // before cursor is all whitespace, so insert tab
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        #[\"no\"|]#
+                    }
+                }
+            "}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                            #[|\"no\"]#
+                    }
+                }
+            "}),
+        ),
+        // if selection spans multiple lines, it should still only look at the
+        // line on which the head is
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        #[\"yes\"
+                    } else {
+                        \"no\"|]#
+                    }
+                }
+            "}),
+            "a<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    } else {
+                        \"no\"
+                    }#[\n|]#
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        #[\"yes\"
+                    } else {
+                        \"no\"|]#
+                    }
+                }
+            "}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                            #[|\"yes\"
+                    } else {
+                        \"no\"]#
+                    }
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    #[l|]#et result = if true {
+                        #(\"yes\"
+                    } else {
+                        \"no\"|)#
+                    }
+                }
+            "}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                        #[|l]#et result = if true {
+                            #(|\"yes\"
+                    } else {
+                        \"no\")#
+                    }
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"#[\n|]#
+                    } else {
+                        \"no\"#(\n|)#
+                    }
+                }
+            "}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    }#[| ]#else {
+                        \"no\"
+                    }#(|\n)#
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        #[\"yes\"|]#
+                    } else {
+                        #(\"no\"|)#
+                    }
+                }
+            "}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                            #[|\"yes\"]#
+                    } else {
+                            #(|\"no\")#
+                    }
+                }
+            "}),
+        ),
+        // if any cursors are not preceded by all whitespace, then do the
+        // smart_tab action
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        #[\"yes\"\n|]#
+                    } else {
+                        \"no#(\"\n|)#
+                    }
+                }
+            "}),
+            "i<tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        \"yes\"
+                    }#[| ]#else {
+                        \"no\"
+                    }#(|\n)#
+                }
+            "}),
+        ),
+        // Ctrl-tab always inserts a tab
+        (
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                        #[\"yes\"\n|]#
+                    } else {
+                        \"no#(\"\n|)#
+                    }
+                }
+            "}),
+            "i<S-tab>",
+            helpers::platform_line(indoc! {"\
+                fn foo() {
+                    let result = if true {
+                            #[|\"yes\"\n]#
+                    } else {
+                        \"no    #(|\"\n)#
+                    }
+                }
+            "}),
+        ),
+    ];
+
+    for test in tests {
+        test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
+    }
+
+    Ok(())
+}
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 4ea1c49f5..2152ff9bb 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -287,6 +287,24 @@ pub struct Config {
     pub workspace_lsp_roots: Vec<PathBuf>,
     /// Which line ending to choose for new documents. Defaults to `native`. i.e. `crlf` on Windows, otherwise `lf`.
     pub default_line_ending: LineEndingConfig,
+    /// Enables smart tab
+    pub smart_tab: Option<SmartTabConfig>,
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
+#[serde(rename_all = "kebab-case", default)]
+pub struct SmartTabConfig {
+    pub enable: bool,
+    pub supersede_menu: bool,
+}
+
+impl Default for SmartTabConfig {
+    fn default() -> Self {
+        SmartTabConfig {
+            enable: true,
+            supersede_menu: false,
+        }
+    }
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -820,6 +838,7 @@ impl Default for Config {
             completion_replace: false,
             workspace_lsp_roots: Vec::new(),
             default_line_ending: LineEndingConfig::default(),
+            smart_tab: Some(SmartTabConfig::default()),
         }
     }
 }

From 325692a154b4190fe75c964c5704d54924165f0e Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy@zelinskie.com>
Date: Wed, 2 Aug 2023 20:12:31 +0200
Subject: [PATCH 207/967] languages: add protobuf language servers (#7796)

* languages: add bufls protobuf language server

* languages: add pbkit protobuf language server
---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 4b19c4b80..62a1d4b9a 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -115,7 +115,7 @@
 | ponylang | ✓ | ✓ | ✓ |  |
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
-| protobuf | ✓ |  | ✓ |  |
+| protobuf | ✓ |  | ✓ | `bufls`, `pb` |
 | prql | ✓ |  |  |  |
 | purescript | ✓ |  |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `pylsp` |
diff --git a/languages.toml b/languages.toml
index b6278730e..7e48301ac 100644
--- a/languages.toml
+++ b/languages.toml
@@ -7,6 +7,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" }
+bufls = { command = "bufls", args = ["serve"] }
 cairo-language-server = { command = "cairo-language-server", args = [] }
 cl-lsp = { command = "cl-lsp", args = [ "stdio" ] }
 clangd = { command = "clangd" }
@@ -48,6 +49,7 @@ ols = { command = "ols", args = [] }
 omnisharp = { command = "OmniSharp", args = [ "--languageserver" ] }
 openscad-lsp = { command = "openscad-lsp", args = ["--stdio"] }
 pasls = { command = "pasls", args = [] }
+pbkit = { command = "pb", args = [ "lsp" ] }
 perlnavigator = { command = "perlnavigator", args= ["--stdio"] }
 prisma-language-server = { command = "prisma-language-server", args = ["--stdio"] }
 purescript-language-server = { command = "purescript-language-server", args = ["--stdio"] }
@@ -258,6 +260,7 @@ name = "protobuf"
 scope = "source.proto"
 injection-regex = "protobuf"
 file-types = ["proto"]
+language-servers = [ "bufls", "pbkit" ]
 roots = []
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }

From bc737404e8ad462b4101987730f4a76658d132ad Mon Sep 17 00:00:00 2001
From: voroskoi <60064214+voroskoi@users.noreply.github.com>
Date: Wed, 2 Aug 2023 21:22:28 +0200
Subject: [PATCH 208/967] Update tree-sitter-zig (#7803)

---
 languages.toml                      | 2 +-
 runtime/queries/zig/highlights.scm  | 7 +++++--
 runtime/queries/zig/textobjects.scm | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/languages.toml b/languages.toml
index 7e48301ac..4fe024203 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1039,7 +1039,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "zig"
-source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "8d3224c3bd0890fe08358886ebf54fca2ed448a6" }
+source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4c3f426ec61695d7617415fff97029bd" }
 
 [[language]]
 name = "prolog"
diff --git a/runtime/queries/zig/highlights.scm b/runtime/queries/zig/highlights.scm
index e2e79518c..d6b1f95a2 100644
--- a/runtime/queries/zig/highlights.scm
+++ b/runtime/queries/zig/highlights.scm
@@ -14,7 +14,7 @@
     field_access: (IDENTIFIER)
     parameter: (IDENTIFIER)
   ] @type
-  (#match? @type "^[A-Z]([a-z]+[A-Za-z0-9]*)*$")
+  (#match? @type "^[A-Z]([a-z]+[A-Za-z0-9]*)+$")
 )
 
 ;; assume camelCase is a function
@@ -122,8 +122,11 @@ field_constant: (IDENTIFIER) @constant
 ] @keyword.operator
 
 [
-  "struct"
   "enum"
+] @type.enum
+
+[
+  "struct"
   "union"
   "packed"
   "opaque"
diff --git a/runtime/queries/zig/textobjects.scm b/runtime/queries/zig/textobjects.scm
index 67528943c..5c4ebd862 100644
--- a/runtime/queries/zig/textobjects.scm
+++ b/runtime/queries/zig/textobjects.scm
@@ -1,4 +1,4 @@
-(TopLevelDecl (FnProto)
+(Decl (FnProto)
   (_) @function.inside) @function.around
 
 (TestDecl (_) @test.inside) @test.around
@@ -6,10 +6,10 @@
 ; matches all of: struct, enum, union
 ; this unfortunately cannot be split up because
 ; of the way struct "container" types are defined
-(TopLevelDecl (VarDecl (ErrorUnionExpr (SuffixExpr (ContainerDecl
+(Decl (VarDecl (ErrorUnionExpr (SuffixExpr (ContainerDecl
     (_) @class.inside))))) @class.around
 
-(TopLevelDecl (VarDecl (ErrorUnionExpr (SuffixExpr (ErrorSetDecl
+(Decl (VarDecl (ErrorUnionExpr (SuffixExpr (ErrorSetDecl
     (_) @class.inside))))) @class.around
 
 (ParamDeclList

From 5535ba8b7d63c78d5d02e2537d02baabc2ee6222 Mon Sep 17 00:00:00 2001
From: Austin L Wolfgram <austinwolfy@gmail.com>
Date: Fri, 4 Aug 2023 04:33:30 -0400
Subject: [PATCH 209/967] fix range formatting error message typo (#7823)

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

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7fb17ed8e..e06225593 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4178,7 +4178,7 @@ fn format_selections(cx: &mut Context) {
         })
     else {
         cx.editor
-            .set_error("No configured language server does not support range formatting");
+            .set_error("No configured language server supports range formatting");
         return;
     };
 

From d5af4ae6b39d7c39b139aaa22cb867b49a38f735 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Aug 2023 22:44:04 +0900
Subject: [PATCH 210/967] build(deps): bump serde from 1.0.175 to 1.0.180
 (#7794)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.175 to 1.0.180.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.175...v1.0.180)

---
updated-dependencies:
- dependency-name: serde
  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 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c4a02780b..9a7dee720 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -305,7 +305,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.25",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -322,7 +322,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -1967,22 +1967,22 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.175"
+version = "1.0.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"
+checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.175"
+version = "1.0.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
+checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -2004,7 +2004,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -2146,9 +2146,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.25"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2214,7 +2214,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -2308,7 +2308,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.25",
+ "syn 2.0.28",
 ]
 
 [[package]]

From 286e44050d838adcf6ff1b2bdb82653a5420cd45 Mon Sep 17 00:00:00 2001
From: "J. Brock" <joseph.brock@protonmail.com>
Date: Fri, 4 Aug 2023 10:19:26 -0400
Subject: [PATCH 211/967] Bump the version of Hare's grammar (#7784)

---
 languages.toml                      | 2 +-
 runtime/queries/hare/highlights.scm | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 4fe024203..c51d65062 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1724,7 +1724,7 @@ indent = { tab-width = 8, unit = "\t" }
 
 [[grammar]]
 name = "hare"
-source = { git = "https://git.sr.ht/~ecmma/tree-sitter-hare", rev = "bc26a6a949f2e0d98b7bfc437d459b250900a165" }
+source = { git = "https://git.sr.ht/~ecmma/tree-sitter-hare", rev = "2495958aaf3f93581c87ec020164255e80655331" }
 
 [[language]]
 name = "devicetree"
diff --git a/runtime/queries/hare/highlights.scm b/runtime/queries/hare/highlights.scm
index cd3c1d0a0..4b9731488 100644
--- a/runtime/queries/hare/highlights.scm
+++ b/runtime/queries/hare/highlights.scm
@@ -36,7 +36,10 @@
   "break"
 ] @keyword.control.repeat
 
-"return" @keyword.control.return
+[
+  "return"
+  "yield"
+] @keyword.control.return
 
 [
   "abort"

From 5a51036bc1e0b5b0bffa599dd2caf171d6924546 Mon Sep 17 00:00:00 2001
From: Christoph Sax <xasc@users.noreply.github.com>
Date: Fri, 4 Aug 2023 16:20:12 +0200
Subject: [PATCH 212/967] Update t32 language queries to version 2.2.1 (#7811)

Version 2.2.1 of the grammar adds extended support for HLL (C, C++,..)
expressions. Quite a few node types were added, renamed or removed in
the process.

This change brings the highlight queries in sync with the ones found in
the repository of the grammar. The highlighting tests "look" okay after
updating the queries.

Recently, Codeberg had some reliability issues. That is why the language
is now using the mirror repository on GitLab as source instead.

Co-authored-by: Christoph Sax <christoph.sax@mailbox.org>
---
 languages.toml                     |   2 +-
 runtime/queries/t32/highlights.scm | 134 +++++++++++++++++++++++------
 2 files changed, 109 insertions(+), 27 deletions(-)

diff --git a/languages.toml b/languages.toml
index c51d65062..a58e5b5f1 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2691,7 +2691,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "t32"
-source = { git = "https://codeberg.org/xasc/tree-sitter-t32", rev = "1dd98248b01e4a3933c1b85b58bab0875e2ba437" }
+source = { git = "https://gitlab.com/xasc/tree-sitter-t32", rev = "6da5e3cbabd376b566d04282005e52ffe67ef74a" }
 
 [[language]]
 name = "webc"
diff --git a/runtime/queries/t32/highlights.scm b/runtime/queries/t32/highlights.scm
index c3bba8143..8a29cee21 100644
--- a/runtime/queries/t32/highlights.scm
+++ b/runtime/queries/t32/highlights.scm
@@ -1,3 +1,28 @@
+; Operators in command and conditional HLL expressions
+(hll_comma_expression
+  "," @operator)
+
+(hll_conditional_expression
+  [
+   "?"
+   ":"
+] @operator)
+
+
+; Keywords, punctuation and operators
+[
+  "enum"
+  "struct"
+  "union"
+] @keyword.storage.type
+
+"sizeof" @keyword.operator
+
+[
+  "const"
+  "volatile"
+] @keyword.storage.modifier
+
 [
   "="
   "^^"
@@ -28,49 +53,89 @@
   "&"
   "->"
   "*"
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "|="
+  "&="
+  "^="
+  ">>="
+  "<<="
+  "--"
+  "++"
 ] @operator
 
 [
- "("
- ")"
- "{"
- "}"
- "["
- "]"
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
 ] @punctuation.bracket
 
 [
   ","
   "."
-  ";"
 ] @punctuation.delimiter
 
-; Constants
+
+; Strings and others literal types
+(access_class) @constant.builtin
+
 [
-  (access_class)
   (address)
   (bitmask)
   (file_handle)
-  (frequency)
-  (time)
-] @constant.builtin
+  (integer)
+  (hll_number_literal)
+] @constant.numeric.integer
 
 [
   (float)
+  (frequency)
   (percentage)
+  (time)
 ] @constant.numeric.float
 
-(integer) @constant.numeric.integer
-
-(character) @constant.character
+[
+  (string)
+  (hll_string_literal)
+] @string
 
-; Strings
-(string) @string
+(hll_escape_sequence) @constant.character.escape
 
 (path) @string.special.path
-
 (symbol) @string.special.symbol
 
+[
+  (character)
+  (hll_char_literal)
+] @constant.character
+
+
+; Types in HLL expressions
+[
+  (hll_type_identifier)
+  (hll_type_descriptor)
+] @type
+
+(hll_type_qualifier) @keyword.storage.modifier
+
+(hll_primitive_type) @type.builtin
+
+
+; HLL call expressions
+(hll_call_expression
+  function: (hll_field_expression
+    field: (hll_field_identifier) @function))
+
+(hll_call_expression
+  function: (identifier) @function)
+
+
 ; Returns
 (
   (command_expression
@@ -83,11 +148,13 @@
   (#match? @keyword.return "^[rR][eE][tT][uU][rR][nN]$")
 )
 
+
 ; Subroutine calls
 (subroutine_call_expression
   command: (identifier) @keyword
   subroutine: (identifier) @function)
 
+
 ; Subroutine blocks
 (subroutine_block
   command: (identifier) @keyword
@@ -97,15 +164,17 @@
   label: (identifier) @function
   (block))
 
+
 ; Parameter declarations
 (parameter_declaration
   command: (identifier) @keyword
   (identifier)? @constant.builtin
   macro: (macro) @variable.parameter)
 
+
 ; Variables, constants and labels
-(macro) @variable
-(internal_c_variable) @variable
+(macro) @variable.builtin
+(trace32_hll_variable) @variable.builtin
 
 (
   (command_expression
@@ -116,17 +185,28 @@
 (labeled_expression
   label: (identifier) @label)
 
+(option_expression
+  (identifier) @constant.builtin)
+
+(format_expression
+  (identifier) @constant.builtin)
+
 (
- (argument_list (identifier) @constant.builtin)
- (#match? @constant.builtin "^[%/][a-zA-Z][a-zA-Z0-9.]*$")
+  (argument_list (identifier) @constant.builtin)
+  (#match? @constant.builtin "^[%/][a-zA-Z][a-zA-Z0-9.]*$")
 )
 (argument_list
-  (identifier) @constant)
+  (identifier) @constant.builtin)
+
 
 ; Commands
 (command_expression command: (identifier) @keyword)
 (macro_definition command: (identifier) @keyword)
 
+(call_expression
+  function: (identifier) @function.builtin)
+
+
 ; Control flow
 (if_block
   command: (identifier) @keyword.control.conditional.if)
@@ -138,8 +218,10 @@
 (repeat_block
   command: (identifier) @keyword.control.loop)
 
-(call_expression
-  function: (identifier) @function)
 
-(type_identifier) @type
+; HLL variables
+(identifier) @variable
+(hll_field_identifier) @variable.other.member
+
+
 (comment) @comment

From f19793c2f86dea8e7af8570563e2dd5a8da9fefb Mon Sep 17 00:00:00 2001
From: Jummit <jummit@web.de>
Date: Fri, 4 Aug 2023 15:25:36 +0100
Subject: [PATCH 213/967] Improve wren support (#7819)

---
 book/src/generated/lang-support.md   |  2 +-
 languages.toml                       |  2 +-
 runtime/queries/wren/highlights.scm  | 10 ++++++----
 runtime/queries/wren/indents.scm     | 29 ++++++++++++++++++++++++++++
 runtime/queries/wren/injections.scm  |  3 +++
 runtime/queries/wren/locals.scm      | 21 ++++++++++++++++++++
 runtime/queries/wren/textobjects.scm |  4 ++++
 7 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 runtime/queries/wren/indents.scm
 create mode 100644 runtime/queries/wren/injections.scm
 create mode 100644 runtime/queries/wren/locals.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 62a1d4b9a..22689c9c6 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -167,7 +167,7 @@
 | webc | ✓ |  |  |  |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
 | wit | ✓ |  | ✓ |  |
-| wren | ✓ | ✓ |  |  |
+| wren | ✓ | ✓ | ✓ |  |
 | xit | ✓ |  |  |  |
 | xml | ✓ |  | ✓ |  |
 | yaml | ✓ |  | ✓ | `yaml-language-server` |
diff --git a/languages.toml b/languages.toml
index a58e5b5f1..967bbea72 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2704,7 +2704,7 @@ grammar = "html"
 
 [[grammar]]
 name = "wren"
-source = { git = "https://git.sr.ht/~jummit/tree-sitter-wren", rev = "7f576e8ccadac226f6a37cbefe95be3fee9f0a66"}
+source = { git = "https://git.sr.ht/~jummit/tree-sitter-wren", rev = "793d58266924e6efcc40e411663393e9d72bec87"}
 
 [[language]]
 name = "wren"
diff --git a/runtime/queries/wren/highlights.scm b/runtime/queries/wren/highlights.scm
index 5454ce25b..c37bc3bc5 100644
--- a/runtime/queries/wren/highlights.scm
+++ b/runtime/queries/wren/highlights.scm
@@ -1,11 +1,11 @@
-((identifier) @variable.builtin
+((name) @variable.builtin
  (#match? @variable.builtin "^(Bool|Class|Fiber|Fn|List|Map|Null|Num|Object|Range|Sequence|String|System)$"))
 
 (call_expression
-  (identifier) @function)
+  (name) @function)
 
 (method_definition
-  (identifier) @function.method)
+  (name) @function.method)
 
 ((parameter) @variable.parameter)
 
@@ -13,7 +13,9 @@
 (string) @string
 (raw_string) @string
 (number) @constant.numeric.integer
-(identifier) @variable
+(name) @variable
+(field) @variable
+(static_field) @variable
 (null) @constant.builtin
 (boolean) @constant.builtin.boolean
 
diff --git a/runtime/queries/wren/indents.scm b/runtime/queries/wren/indents.scm
new file mode 100644
index 000000000..ff64a7e27
--- /dev/null
+++ b/runtime/queries/wren/indents.scm
@@ -0,0 +1,29 @@
+[
+	(list)
+	(map)
+	(call_body)
+	(parameter_list)
+	(call_expression)
+	(getter_definition)
+	(setter_definition)
+	(prefix_operator_definition)
+	(subscript_operator_definition)
+	(subscript_setter_definition)
+	(infix_operator_definition)
+	(method_definition)
+	(constructor)
+	(static_method_definition)
+	(static_getter_definition)
+	(attribute)
+	(conditional)
+	(class_body)
+	(if_statement)
+	(for_statement)
+	(while_statement)
+] @indent
+
+[
+	"}"
+	"]"
+	")"
+] @outdent
diff --git a/runtime/queries/wren/injections.scm b/runtime/queries/wren/injections.scm
new file mode 100644
index 000000000..fca94d58f
--- /dev/null
+++ b/runtime/queries/wren/injections.scm
@@ -0,0 +1,3 @@
+((comment) @injection.content
+ (#set! injection.language "comment")
+ (#set! injection.include-children))
diff --git a/runtime/queries/wren/locals.scm b/runtime/queries/wren/locals.scm
new file mode 100644
index 000000000..38f39d913
--- /dev/null
+++ b/runtime/queries/wren/locals.scm
@@ -0,0 +1,21 @@
+[
+	(method_definition)
+] @local.scope
+
+(name) @local.reference
+(field) @local.reference
+(static_field) @local.reference
+
+(for_statement
+	loop_variable: (name) @local.definition)
+
+(variable_definition
+	name: (name) @local.definition)
+
+(assignment
+	left: (field) @local.definition)
+
+(assignment
+	left: (static_field) @local.definition)
+
+(parameter) @local.definition
diff --git a/runtime/queries/wren/textobjects.scm b/runtime/queries/wren/textobjects.scm
index 248981240..486b5b48c 100644
--- a/runtime/queries/wren/textobjects.scm
+++ b/runtime/queries/wren/textobjects.scm
@@ -1,6 +1,10 @@
 (class_definition
   (class_body) @class.inside) @class.around
 
+(call_expression
+  (call_body
+    (_) @function.inside) @function.around)
+
 (method_definition
   body: (_) @function.inside) @function.around
 

From 80d2599f9c846260328aacd148da99d613f4ef32 Mon Sep 17 00:00:00 2001
From: Mohamed Imrane Chehabi <38333092+mohamedimrane@users.noreply.github.com>
Date: Fri, 4 Aug 2023 23:24:50 +0100
Subject: [PATCH 214/967] Add new moon theme to default themes (#7834)

* Add new moon theme to default themes

* Remove .DS_Store
---
 runtime/themes/new_moon.toml | 124 +++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 runtime/themes/new_moon.toml

diff --git a/runtime/themes/new_moon.toml b/runtime/themes/new_moon.toml
new file mode 100644
index 000000000..4f878c7e0
--- /dev/null
+++ b/runtime/themes/new_moon.toml
@@ -0,0 +1,124 @@
+
+"namespace" = { fg = "blue" }
+"module" = { fg = "blue" }
+
+"type" = { fg = "blue" }
+"type.builtin" = { fg = "blue" }
+"type.enum.variant" = { fg = "blue" } # or aqua
+"constructor" = { fg = "blue" }
+"variable.other.member" = { fg = "red" }
+
+"keyword" = { fg = "light_yellow" }
+"keyword.directive" = { fg = "light_yellow" }
+"keyword.control" = { fg = "light_yellow" }
+"label" = { fg = "blue" }
+"tag" = "blue"
+
+"special" = { fg = "lightest" } # or beige
+"operator" = { fg = "beige" }
+
+"punctuation" = { fg = "text" }
+"punctuation.delimiter" = { fg = "text" }
+
+"variable" = { fg = "red" }
+"variable.parameter" = { fg = "red" }
+"variable.builtin" = { fg = "blue" }
+"constant" = { fg = "purple" }
+"constant.builtin" = { fg = "purple" }
+
+"function" = { fg = "lightest" }
+"function.builtin" = { fg = "lightest" }
+"function.macro" = { fg = "blue" }
+"attribute" = { fg = "yellow" }
+
+"comment" = { fg = "medium" }
+
+"string" = { fg = "green" }
+"constant.character" = { fg = "green" }
+"string.regexp" = { fg = "orange" }
+"constant.numeric" = { fg = "orange" }
+"constant.character.escape" = { fg = "aqua" }
+
+"markup.heading" = { fg = "blue", modifiers = ["bold"] }
+"markup.list" = "aqua"
+"markup.bold" = { fg = "blue", modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { modifiers = ["underlined"] }
+"markup.link.text" = "orange"
+"markup.quote" = "green"
+"markup.raw" = "orange"
+
+"diff.plus" = { fg = "green" }
+"diff.delta" = { fg = "blue" }
+"diff.minus" = { fg = "red" }
+
+"ui.background" = { fg = "light", bg = "darkest" }
+
+"ui.window" = { bg = "widget" }
+"ui.popup" = { fg = "beige", bg = "widget" }
+"ui.help" = { fg = "text", bg = "widget" }
+"ui.menu" = { fg = "text", bg = "widget" }
+"ui.menu.selected" = { bg = "darker_blue" }
+
+"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] }
+"ui.cursor.match" = { bg = "#3a3d41", modifiers = ["underlined"] }
+
+"ui.selection" = { bg = "#3a3d41" }
+"ui.selection.primary" = { bg = "darkest_blue" }
+
+"ui.linenr" = { fg = "dark_gray_virtual" }
+"ui.linenr.selected" = { fg = "light_gray_virtual" }
+
+"ui.cursorline.primary" = { bg = "active_line" }
+"ui.statusline" = { fg = "white", bg = "darker_blue" }
+# "ui.statusline.inactive" = { fg = "white", bg = "blue" }
+# "ui.statusline.insert" = { fg = "white", bg = "yellow" }
+# "ui.statusline.select" = { fg = "white", bg = "magenta" }
+
+"ui.bufferline" = { fg = "text", bg = "widget" }
+"ui.bufferline.active" = { fg = "white", bg = "darker_blue" }
+"ui.bufferline.background" = { bg = "darkest" }
+
+"ui.text" = { fg = "text" }
+"ui.text.focus" = { fg = "lightest" }
+
+"ui.virtual.whitespace" = { fg = "dark_gray_virtual" }
+"ui.virtual.ruler" = { bg = "borders" }
+"ui.virtual.indent-guide" = { fg = "dark_gray_virtual" }
+"ui.virtual.inlay-hint" = { fg = "dark_gray_virtual"}
+
+"warning" = { fg = "yellow" }
+"error" = { fg = "red" }
+"info" = { fg = "blue" }
+"hint" = { fg = "light_gray" }
+
+"diagnostic.error".underline = { color = "red", style = "curl" }
+"diagnostic".underline = { color = "yellow", style = "curl" }
+
+[palette]
+darkest = "#2d2d2d"
+medium = "#777c85"
+light = "#b3b9c5"
+lightest = "#ffffff"
+red = "#f2777a"
+orange = "#fca369"
+yellow = "#ffd479"
+light_yellow = "#ffeea6"
+green = "#92d192"
+blue = "#6ab0f3"
+darker_blue = "#007acc"
+darkest_blue= "#264f78"
+aqua = "#76d4d6"
+purple = "#e1a6f2"
+beige = "#ac8d58"
+light_gray = "#eeeeee"
+dark_gray_virtual = "#606060"
+light_gray_virtual = "#909090"
+active_line = "#252525"
+
+text = "#d4d4d4"
+cursor = "#a6a6a6"
+widget = "#252526"
+borders = "#323232"

From 1d189820a150eb38c55d419ad6dd350321d4c8ee Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Mon, 7 Aug 2023 16:48:54 +0300
Subject: [PATCH 215/967] feat(indent): add basic java indentation queries
 (#7844)

---
 book/src/generated/lang-support.md |  2 +-
 languages.toml                     |  2 +-
 runtime/queries/java/indents.scm   | 35 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/java/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 22689c9c6..cb3a6f55d 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -69,7 +69,7 @@
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
 | ini | ✓ |  |  |  |
-| java | ✓ | ✓ |  | `jdtls` |
+| java | ✓ | ✓ | ✓ | `jdtls` |
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
diff --git a/languages.toml b/languages.toml
index 967bbea72..d35b835e3 100644
--- a/languages.toml
+++ b/languages.toml
@@ -833,7 +833,7 @@ injection-regex = "java"
 file-types = ["java"]
 roots = ["pom.xml", "build.gradle", "build.gradle.kts"]
 language-servers = [ "jdtls" ]
-indent = { tab-width = 4, unit = "    " }
+indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "java"
diff --git a/runtime/queries/java/indents.scm b/runtime/queries/java/indents.scm
new file mode 100644
index 000000000..76e218619
--- /dev/null
+++ b/runtime/queries/java/indents.scm
@@ -0,0 +1,35 @@
+[
+  (class_body)
+  (enum_body)
+  (interface_body)
+  (constructor_body)
+  (annotation_type_body)
+  (module_body)
+  (block)
+  (switch_block)
+  (array_initializer)
+  (argument_list)
+  (formal_parameters)
+  (annotation_argument_list)
+  (element_value_array_initializer)
+] @indent
+
+[
+  "}"
+  ")"
+  "]"
+] @outdent
+
+; Single statement after if/while/for without brackets
+(if_statement
+  consequence: (_) @indent
+  (#not-kind-eq? @indent "block")
+  (#set! "scope" "all"))
+(while_statement
+  body: (_) @indent
+  (#not-kind-eq? @indent "block")
+  (#set! "scope" "all"))
+(for_statement
+  (_) @indent
+  (#not-kind-eq? @indent "block")
+  (#set! "scope" "all"))

From 979933b514868bf0111aff90e06775e91d6864a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 7 Aug 2023 23:45:27 +0900
Subject: [PATCH 216/967] Update tree-sitter-scheme

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

diff --git a/languages.toml b/languages.toml
index d35b835e3..64af1b19d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1807,14 +1807,14 @@ source = { git = "https://github.com/metio/tree-sitter-ssh-client-config", rev =
 name = "scheme"
 scope = "source.scheme"
 injection-regex = "scheme"
-file-types = ["ss"] # "scm",
+file-types = ["ss", "scm"]
 roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "scheme"
-source = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "c0741320bfca6b7b5b7a13b5171275951e96a842" }
+source = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af3af6c9356b936f8a515a1e449c32e804c2b1a8" }
 
 [[language]]
 name = "v"

From 57071513a8be3f9a19f9f841dad0ff7d351d533e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 7 Aug 2023 23:45:36 +0900
Subject: [PATCH 217/967] Only use tsq for tsq files

This makes our highlight files more plain but it correctly highlights
scheme :/
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 64af1b19d..01ad4cb18 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1053,7 +1053,7 @@ language-servers = [ "swipl" ]
 [[language]]
 name = "tsq"
 scope = "source.tsq"
-file-types = ["scm"]
+file-types = ["tsq"]
 roots = []
 comment-token = ";"
 injection-regex = "tsq"

From 86fc2031976e50dc341de1b2e6b979943df006cc Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 7 Aug 2023 13:16:05 -0500
Subject: [PATCH 218/967] CI: Remove the aarch64 appimage build steps from
 release (#7832)

The steps mistakenly produce a x86_64 appimage and call it aarch64.
linuxdeploy doesn't currently support producing aarch64 appimages so
we should just remove these steps for aarch64-linux.
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b509ff9e0..785a5a4df 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -160,7 +160,7 @@ jobs:
 
       - name: Build AppImage
         shell: bash
-        if: matrix.build == 'aarch64-linux' || matrix.build == 'x86_64-linux'
+        if: matrix.build == 'x86_64-linux'
         run: |
           # Required as of 22.x https://github.com/AppImage/AppImageKit/wiki/FUSE
           sudo add-apt-repository universe
@@ -263,7 +263,7 @@ jobs:
               mv bins-$platform/hx$exe $pkgname
               chmod +x $pkgname/hx$exe
 
-              if [[ "$platform" = "aarch64-linux" || "$platform" = "x86_64-linux" ]]; then
+              if [[ "$platform" = "x86_64-linux" ]]; then
                   mv bins-$platform/helix-*.AppImage* dist/
               fi
 

From d6c799fb3026425d1eb0cd71130e2b17d315829f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 7 Aug 2023 13:27:16 -0500
Subject: [PATCH 219/967] Update tree-sitter-git-commit (#7831)

This fixes a problem parsing the "On branch _branch_" part of the
commit comment when the branch contains a slash.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 01ad4cb18..0c3c6a7fa 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1296,7 +1296,7 @@ text-width = 72
 
 [[grammar]]
 name = "git-commit"
-source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev = "db88cffa3952dd2328b741af5d0fc69bdb76704f" }
+source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev = "6f193a66e9aa872760823dff020960c6cedc37b3" }
 
 [[language]]
 name = "diff"

From 7af37bb3b96104b82e56d0072ca0d9a7b226c141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Gajd=C5=AF=C5=A1ek?= <gajdusek.petr@centrum.cz>
Date: Mon, 7 Aug 2023 20:27:35 +0200
Subject: [PATCH 220/967] Add tree-sitter textobjects queries for bash (#7764)

This implements function, (calling) argument and comment captures for use
in the textobject selections in bash.

This also updates the generated docs after adding the textobjects for bash.
---
 book/src/generated/lang-support.md   | 2 +-
 runtime/queries/bash/textobjects.scm | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/bash/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index cb3a6f55d..28c421f4f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -2,7 +2,7 @@
 | --- | --- | --- | --- | --- |
 | astro | ✓ |  |  |  |
 | awk | ✓ | ✓ |  | `awk-language-server` |
-| bash | ✓ |  | ✓ | `bash-language-server` |
+| bash | ✓ | ✓ | ✓ | `bash-language-server` |
 | bass | ✓ |  |  | `bass` |
 | beancount | ✓ |  |  |  |
 | bibtex | ✓ |  |  | `texlab` |
diff --git a/runtime/queries/bash/textobjects.scm b/runtime/queries/bash/textobjects.scm
new file mode 100644
index 000000000..59983b30c
--- /dev/null
+++ b/runtime/queries/bash/textobjects.scm
@@ -0,0 +1,9 @@
+(function_definition
+  body: (_) @function.inside) @function.around
+
+(command
+  argument: (_) @parameter.inside)
+
+(comment) @comment.inside
+
+(comment)+ @comment.around

From 7cda5b85920f875052438791f01246a408ee490e Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Mon, 7 Aug 2023 22:07:56 +0300
Subject: [PATCH 221/967] build(tree-sitter): update javascript, typescript and
 tsx (#7852)

* build(tree-sitter): update javascript, typescript and tsx

* update revision of tree-sitter parsers for these languages.
* rename `?.` to `optional_chain`, introduced in tree-sitter/tree-sitter-javascript@186f2adbf790552b354a9ba712341c7d48bdbccd.

* fix(highlight): change jsx queries to match latest tree-sitter

Latest tree-sitter/tree-sitter-javascript@bb1f97b643b77fc1f082d621bf533b4b14cf0c3 added some breaking changes that broke highlighting.
* Remove some queries with `nested_identifier`.
* Remove deprecated `jsx_fragment` from indent query.
* Count `</` and `/>` as a single token.
---
 languages.toml                      |  6 +++---
 runtime/queries/_jsx/highlights.scm | 18 +++---------------
 runtime/queries/_jsx/indents.scm    |  1 -
 runtime/queries/ecma/highlights.scm |  2 +-
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/languages.toml b/languages.toml
index 0c3c6a7fa..c9a863ef0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -563,7 +563,7 @@ args = { program = "{0}" }
 
 [[grammar]]
 name = "javascript"
-source = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "4a95461c4761c624f2263725aca79eeaefd36cad" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-javascript", rev = "f772967f7b7bc7c28f845be2420a38472b16a8ee" }
 
 [[language]]
 name = "jsx"
@@ -590,7 +590,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "typescript"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "typescript" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf", subpath = "typescript" }
 
 [[language]]
 name = "tsx"
@@ -604,7 +604,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "tsx"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "tsx" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf", subpath = "tsx" }
 
 [[language]]
 name = "css"
diff --git a/runtime/queries/_jsx/highlights.scm b/runtime/queries/_jsx/highlights.scm
index 00641cded..853254e5b 100644
--- a/runtime/queries/_jsx/highlights.scm
+++ b/runtime/queries/_jsx/highlights.scm
@@ -4,9 +4,6 @@
 (jsx_opening_element ((identifier) @constructor
  (#match? @constructor "^[A-Z]")))
 
-; Handle the dot operator effectively - <My.Component>
-(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
 (jsx_opening_element (identifier) @tag)
 
 ; Closing elements
@@ -15,9 +12,6 @@
 (jsx_closing_element ((identifier) @constructor
  (#match? @constructor "^[A-Z]")))
 
-; Handle the dot operator effectively - </My.Component>
-(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
 (jsx_closing_element (identifier) @tag)
 
 ; Self-closing elements
@@ -26,9 +20,6 @@
 (jsx_self_closing_element ((identifier) @constructor
  (#match? @constructor "^[A-Z]")))
 
-; Handle the dot operator effectively - <My.Component />
-(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
 (jsx_self_closing_element (identifier) @tag)
 
 ; Attributes
@@ -39,17 +30,14 @@
 ; Punctuation
 ; -----------
 
-; Handle attribute delimiter
+; Handle attribute delimiter (<Component color="red"/>)
 (jsx_attribute "=" @punctuation.delimiter)
 
 ; <Component>
 (jsx_opening_element ["<" ">"] @punctuation.bracket)
 
 ; </Component>
-(jsx_closing_element ["<" "/" ">"] @punctuation.bracket)
+(jsx_closing_element ["</" ">"] @punctuation.bracket)
 
 ; <Component />
-(jsx_self_closing_element ["<" "/" ">"] @punctuation.bracket)
-
-; <> ... </>
-(jsx_fragment ["<" "/" ">"] @punctuation.bracket)
+(jsx_self_closing_element ["<" "/>"] @punctuation.braket)
diff --git a/runtime/queries/_jsx/indents.scm b/runtime/queries/_jsx/indents.scm
index 4731856cf..0609aa39a 100644
--- a/runtime/queries/_jsx/indents.scm
+++ b/runtime/queries/_jsx/indents.scm
@@ -1,5 +1,4 @@
 [
-  (jsx_fragment)
   (jsx_element)
   (jsx_self_closing_element)
 ] @indent
diff --git a/runtime/queries/ecma/highlights.scm b/runtime/queries/ecma/highlights.scm
index ddbe938fe..07f7dfeda 100644
--- a/runtime/queries/ecma/highlights.scm
+++ b/runtime/queries/ecma/highlights.scm
@@ -109,7 +109,7 @@
 
 [
   ";"
-  "?."
+  (optional_chain) ; ?.
   "."
   ","
 ] @punctuation.delimiter

From c7e9e94f007e04836d134cd3e53f71c38b7ba1ec Mon Sep 17 00:00:00 2001
From: Anshul Dalal <83179501+ArchUsr64@users.noreply.github.com>
Date: Tue, 8 Aug 2023 05:43:10 +0530
Subject: [PATCH 222/967] Skip rendering gutters when gutter width exceeds view
 width (#7821)

---
 helix-term/src/ui/editor.rs | 21 ++++++++++++---------
 helix-view/src/view.rs      | 10 ++++++++--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 5b5cda935..aa159d40d 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -163,15 +163,18 @@ impl EditorView {
             Box::new(highlights)
         };
 
-        Self::render_gutter(
-            editor,
-            doc,
-            view,
-            view.area,
-            theme,
-            is_focused,
-            &mut line_decorations,
-        );
+        let gutter_overflow = view.gutter_offset(doc) == 0;
+        if !gutter_overflow {
+            Self::render_gutter(
+                editor,
+                doc,
+                view,
+                view.area,
+                theme,
+                is_focused,
+                &mut line_decorations,
+            );
+        }
 
         if is_focused {
             let cursor = doc
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index ee6fc1275..e5e2641a8 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -187,11 +187,17 @@ impl View {
     }
 
     pub fn gutter_offset(&self, doc: &Document) -> u16 {
-        self.gutters
+        let total_width = self
+            .gutters
             .layout
             .iter()
             .map(|gutter| gutter.width(self, doc) as u16)
-            .sum()
+            .sum();
+        if total_width < self.area.width {
+            total_width
+        } else {
+            0
+        }
     }
 
     //

From a7a145ad3d78dc0b9f7c2ea289e07d60d9b51d30 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 7 Aug 2023 21:06:51 -0400
Subject: [PATCH 223/967] Center the picker preview selection using visual
 lines (#7837)

this way the preview always shows the selection even if lines were
wrapped
---
 helix-term/src/ui/picker.rs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index f80bc512f..5ee4c407a 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -27,7 +27,7 @@ use std::{collections::HashMap, io::Read, path::PathBuf};
 
 use crate::ui::{Prompt, PromptEvent};
 use helix_core::{
-    movement::Direction, text_annotations::TextAnnotations,
+    char_idx_at_visual_offset, movement::Direction, text_annotations::TextAnnotations,
     unicode::segmentation::UnicodeSegmentation, Position, Syntax,
 };
 use helix_view::{
@@ -690,20 +690,20 @@ impl<T: Item + 'static> Picker<T> {
                 }
             };
 
-            // align to middle
-            let first_line = range
-                .map(|(start, end)| {
-                    let height = end.saturating_sub(start) + 1;
-                    let middle = start + (height.saturating_sub(1) / 2);
-                    middle.saturating_sub(inner.height as usize / 2).min(start)
-                })
-                .unwrap_or(0);
-
-            let offset = ViewPosition {
-                anchor: doc.text().line_to_char(first_line),
-                horizontal_offset: 0,
-                vertical_offset: 0,
-            };
+            let mut offset = ViewPosition::default();
+            if let Some(range) = range {
+                let text_fmt = doc.text_format(inner.width, None);
+                let annotations = TextAnnotations::default();
+                (offset.anchor, offset.vertical_offset) = char_idx_at_visual_offset(
+                    doc.text().slice(..),
+                    doc.text().line_to_char(range.0),
+                    // align to middle
+                    -(inner.height as isize / 2),
+                    0,
+                    &text_fmt,
+                    &annotations,
+                );
+            }
 
             let mut highlights = EditorView::doc_syntax_highlights(
                 doc,

From fcbac485f885d90f6341d7acaf75157a01d81892 Mon Sep 17 00:00:00 2001
From: Connortsui20 <87130162+Connortsui20@users.noreply.github.com>
Date: Tue, 8 Aug 2023 08:51:34 -0400
Subject: [PATCH 224/967] Show whether file readonly in statusline (#7740)

---
 Cargo.lock                       |  1 +
 book/src/configuration.md        |  3 ++-
 helix-term/src/commands/typed.rs |  2 +-
 helix-term/src/ui/statusline.rs  | 14 +++++++++++++
 helix-view/Cargo.toml            |  1 +
 helix-view/src/document.rs       | 35 ++++++++++++++++++++++++++++++++
 helix-view/src/editor.rs         |  4 ++++
 7 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a7dee720..128d8825f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1392,6 +1392,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
+ "rustix 0.38.4",
  "serde",
  "serde_json",
  "slotmap",
diff --git a/book/src/configuration.md b/book/src/configuration.md
index 4c152bf4d..eb2cf473c 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -89,7 +89,7 @@ The `[editor.statusline]` key takes the following sub-keys:
 
 | Key           | Description | Default |
 | ---           | ---         | ---     |
-| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "file-modification-indicator"]` |
+| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "file-modification-indicator"]` |
 | `center`      | A list of elements aligned to the middle of the statusline | `[]` |
 | `right`       | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "register", "position", "file-encoding"]` |
 | `separator`   | The character used to separate elements in the statusline | `"│"` |
@@ -108,6 +108,7 @@ The following statusline elements can be configured:
 | `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 |
 | `file-line-ending` | The file line endings (CRLF or LF) |
+| `read-only-indicator` | An indicator that shows `[readonly]` when a file cannot be written |
 | `total-line-numbers` | The total line numbers of the opened file |
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 67640f797..5bb9c6c41 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -672,7 +672,7 @@ pub fn write_all_impl(
             }
             if doc.path().is_none() {
                 if write_scratch {
-                    errors.push("cannot write a buffer without a filename\n");
+                    errors.push("cannot write a buffer without a filename");
                 }
                 return None;
             }
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 61fca609b..52dd49f9e 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -145,6 +145,7 @@ where
         helix_view::editor::StatusLineElement::FileModificationIndicator => {
             render_file_modification_indicator
         }
+        helix_view::editor::StatusLineElement::ReadOnlyIndicator => render_read_only_indicator,
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
         helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
         helix_view::editor::StatusLineElement::FileType => render_file_type,
@@ -442,6 +443,19 @@ where
     write(context, title, None);
 }
 
+fn render_read_only_indicator<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let title = if context.doc.readonly {
+        " [readonly] "
+    } else {
+        ""
+    }
+    .to_string();
+    write(context, title, None);
+}
+
 fn render_file_base_name<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 203b5dad3..b66739a4a 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -51,6 +51,7 @@ clipboard-win = { version = "4.5", features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
+rustix = { version = "0.38", features = ["fs"] }
 
 [dev-dependencies]
 helix-tui = { path = "../helix-tui" }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index af7e3a7e8..7602c9c79 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -185,6 +185,8 @@ pub struct Document {
 
     // when document was used for most-recent-used buffer picker
     pub focused_at: std::time::Instant,
+
+    pub readonly: bool,
 }
 
 /// Inlay hints for a single `(Document, View)` combo.
@@ -673,6 +675,7 @@ impl Document {
             config,
             version_control_head: None,
             focused_at: std::time::Instant::now(),
+            readonly: false,
         }
     }
 
@@ -955,6 +958,33 @@ impl Document {
         }
     }
 
+    #[cfg(unix)]
+    // Detect if the file is readonly and change the readonly field if necessary (unix only)
+    pub fn detect_readonly(&mut self) {
+        use rustix::fs::{access, Access};
+        // Allows setting the flag for files the user cannot modify, like root files
+        self.readonly = match &self.path {
+            None => false,
+            Some(p) => access(p, Access::WRITE_OK).is_err(),
+        };
+    }
+
+    #[cfg(not(unix))]
+    // Detect if the file is readonly and change the readonly field if necessary (non-unix os)
+    pub fn detect_readonly(&mut self) {
+        // TODO Use the Windows' function `CreateFileW` to check if a file is readonly
+        // Discussion: https://github.com/helix-editor/helix/pull/7740#issuecomment-1656806459
+        // Vim implementation: https://github.com/vim/vim/blob/4c0089d696b8d1d5dc40568f25ea5738fa5bbffb/src/os_win32.c#L7665
+        // Windows binding: https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Storage/FileSystem/fn.CreateFileW.html
+        self.readonly = match &self.path {
+            None => false,
+            Some(p) => match std::fs::metadata(p) {
+                Err(_) => false,
+                Ok(metadata) => metadata.permissions().readonly(),
+            },
+        };
+    }
+
     /// Reload the document from its path.
     pub fn reload(
         &mut self,
@@ -969,6 +999,9 @@ impl Document {
             .ok_or_else(|| anyhow!("can't find file to reload from {:?}", self.display_name()))?
             .to_owned();
 
+        // Once we have a valid path we check if its readonly status has changed
+        self.detect_readonly();
+
         let mut file = std::fs::File::open(&path)?;
         let (rope, ..) = from_reader(&mut file, Some(encoding))?;
 
@@ -1018,6 +1051,8 @@ impl Document {
         // and error out when document is saved
         self.path = path;
 
+        self.detect_readonly();
+
         Ok(())
     }
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 2152ff9bb..113102b6b 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -421,6 +421,7 @@ impl Default for StatusLineConfig {
                 E::Mode,
                 E::Spinner,
                 E::FileName,
+                E::ReadOnlyIndicator,
                 E::FileModificationIndicator,
             ],
             center: vec![],
@@ -473,6 +474,9 @@ pub enum StatusLineElement {
     // The file modification indicator
     FileModificationIndicator,
 
+    /// An indicator that shows `"[readonly]"` when a file cannot be written
+    ReadOnlyIndicator,
+
     /// The file encoding
     FileEncoding,
 

From c1c71bb90edf8fe43584bb103e72bd0e81d36100 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Aug 2023 14:52:44 +0200
Subject: [PATCH 225/967] build(deps): bump serde from 1.0.180 to 1.0.183
 (#7860)

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 128d8825f..6f99b61d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1968,18 +1968,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.180"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.180"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
 dependencies = [
  "proc-macro2",
  "quote",

From aa4d84a0b30fbe93882508c6d9dc8ca4c95341d0 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Tue, 8 Aug 2023 16:17:29 +0300
Subject: [PATCH 226/967] Align view for background buffer  opened with
 `alt-ret` (#7691)

* fix(picker): `alt-ret' changes cursor pos of current file, not new one

Closes #7673

* fix other pickers

* symbol pickers
* diagnostick pickers

This is done using the already patched `jump_to_location` method.

* fix global and jumplist pickers

* use `view` as old_id; make `align_view` method of `Action`

* test(picker): basic <alt-ret> functionality

* fix: picker integrational test

* fix nit

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-term/src/commands.rs      | 19 ++++----
 helix-term/src/commands/lsp.rs  | 77 +++++++++----------------------
 helix-term/tests/integration.rs |  1 +
 helix-term/tests/test/picker.rs | 80 +++++++++++++++++++++++++++++++++
 helix-view/src/editor.rs        |  7 +++
 5 files changed, 121 insertions(+), 63 deletions(-)
 create mode 100644 helix-term/tests/test/picker.rs

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e06225593..8be0f83a8 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2199,8 +2199,8 @@ fn global_search(cx: &mut Context) {
                     all_matches,
                     current_path,
                     move |cx, FileResult { path, line_num }, action| {
-                        match cx.editor.open(path, action) {
-                            Ok(_) => {}
+                        let doc = match cx.editor.open(path, action) {
+                            Ok(id) => doc_mut!(cx.editor, &id),
                             Err(e) => {
                                 cx.editor.set_error(format!(
                                     "Failed to open file '{}': {}",
@@ -2209,10 +2209,9 @@ fn global_search(cx: &mut Context) {
                                 ));
                                 return;
                             }
-                        }
-
+                        };
                         let line_num = *line_num;
-                        let (view, doc) = current!(cx.editor);
+                        let view = view_mut!(cx.editor);
                         let text = doc.text();
                         if line_num >= text.len_lines() {
                             cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
@@ -2222,7 +2221,9 @@ fn global_search(cx: &mut Context) {
                         let end = text.line_to_char((line_num + 1).min(text.len_lines()));
 
                         doc.set_selection(view.id, Selection::single(start, end));
-                        align_view(doc, view, Align::Center);
+                        if action.align_view(view, doc.id()){
+                            align_view(doc, view, Align::Center);
+                        }
                     }).with_preview(|_editor, FileResult { path, line_num }| {
                         Some((path.clone().into(), Some((*line_num, *line_num))))
                     });
@@ -2742,9 +2743,11 @@ fn jumplist_picker(cx: &mut Context) {
         |cx, meta, action| {
             cx.editor.switch(meta.id, action);
             let config = cx.editor.config();
-            let (view, doc) = current!(cx.editor);
+            let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
             doc.set_selection(view.id, meta.selection.clone());
-            view.ensure_cursor_in_view_center(doc, config.scrolloff);
+            if action.align_view(view, doc.id()) {
+                view.ensure_cursor_in_view_center(doc, config.scrolloff);
+            }
         },
     )
     .with_preview(|editor, meta| {
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 17f936cd6..57be1267c 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -195,7 +195,6 @@ fn location_to_file_location(location: &lsp::Location) -> FileLocation {
     (path.into(), line)
 }
 
-// TODO: share with symbol picker(symbol.location)
 fn jump_to_location(
     editor: &mut Editor,
     location: &lsp::Location,
@@ -213,15 +212,16 @@ fn jump_to_location(
             return;
         }
     };
-    match editor.open(&path, action) {
-        Ok(_) => (),
+
+    let doc = match editor.open(&path, action) {
+        Ok(id) => doc_mut!(editor, &id),
         Err(err) => {
             let err = format!("failed to open path: {:?}: {:?}", location.uri, err);
             editor.set_error(err);
             return;
         }
-    }
-    let (view, doc) = current!(editor);
+    };
+    let view = view_mut!(editor);
     // TODO: convert inside server
     let new_range =
         if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {
@@ -233,45 +233,22 @@ fn jump_to_location(
     // we flip the range so that the cursor sits on the start of the symbol
     // (for example start of the function).
     doc.set_selection(view.id, Selection::single(new_range.head, new_range.anchor));
-    align_view(doc, view, Align::Center);
+    if action.align_view(view, doc.id()) {
+        align_view(doc, view, Align::Center);
+    }
 }
 
 type SymbolPicker = Picker<SymbolInformationItem>;
 
 fn sym_picker(symbols: Vec<SymbolInformationItem>, current_path: Option<lsp::Url>) -> SymbolPicker {
     // TODO: drop current_path comparison and instead use workspace: bool flag?
-    Picker::new(symbols, current_path.clone(), move |cx, item, action| {
-        let (view, doc) = current!(cx.editor);
-        push_jump(view, doc);
-
-        if current_path.as_ref() != Some(&item.symbol.location.uri) {
-            let uri = &item.symbol.location.uri;
-            let path = match uri.to_file_path() {
-                Ok(path) => path,
-                Err(_) => {
-                    let err = format!("unable to convert URI to filepath: {}", uri);
-                    cx.editor.set_error(err);
-                    return;
-                }
-            };
-            if let Err(err) = cx.editor.open(&path, action) {
-                let err = format!("failed to open document: {}: {}", uri, err);
-                log::error!("{}", err);
-                cx.editor.set_error(err);
-                return;
-            }
-        }
-
-        let (view, doc) = current!(cx.editor);
-
-        if let Some(range) =
-            lsp_range_to_range(doc.text(), item.symbol.location.range, item.offset_encoding)
-        {
-            // we flip the range so that the cursor sits on the start of the symbol
-            // (for example start of the function).
-            doc.set_selection(view.id, Selection::single(range.head, range.anchor));
-            align_view(doc, view, Align::Center);
-        }
+    Picker::new(symbols, current_path, move |cx, item, action| {
+        jump_to_location(
+            cx.editor,
+            &item.symbol.location,
+            item.offset_encoding,
+            action,
+        );
     })
     .with_preview(move |_editor, item| Some(location_to_file_location(&item.symbol.location)))
     .truncate_start(false)
@@ -286,7 +263,7 @@ enum DiagnosticsFormat {
 fn diag_picker(
     cx: &Context,
     diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
-    current_path: Option<lsp::Url>,
+    _current_path: Option<lsp::Url>,
     format: DiagnosticsFormat,
 ) -> Picker<PickerDiagnostic> {
     // TODO: drop current_path comparison and instead use workspace: bool flag?
@@ -324,22 +301,12 @@ fn diag_picker(
                   offset_encoding,
               },
               action| {
-            if current_path.as_ref() == Some(url) {
-                let (view, doc) = current!(cx.editor);
-                push_jump(view, doc);
-            } else {
-                let path = url.to_file_path().unwrap();
-                cx.editor.open(&path, action).expect("editor.open failed");
-            }
-
-            let (view, doc) = current!(cx.editor);
-
-            if let Some(range) = lsp_range_to_range(doc.text(), diag.range, *offset_encoding) {
-                // we flip the range so that the cursor sits on the start of the symbol
-                // (for example start of the function).
-                doc.set_selection(view.id, Selection::single(range.head, range.anchor));
-                align_view(doc, view, Align::Center);
-            }
+            jump_to_location(
+                cx.editor,
+                &lsp::Location::new(url.clone(), diag.range),
+                *offset_encoding,
+                action,
+            )
         },
     )
     .with_preview(move |_editor, PickerDiagnostic { url, diag, .. }| {
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index d77eefed0..a62f00660 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -19,6 +19,7 @@ mod test {
     mod auto_pairs;
     mod commands;
     mod movement;
+    mod picker;
     mod prompt;
     mod splits;
 }
diff --git a/helix-term/tests/test/picker.rs b/helix-term/tests/test/picker.rs
new file mode 100644
index 000000000..f6d1aa258
--- /dev/null
+++ b/helix-term/tests/test/picker.rs
@@ -0,0 +1,80 @@
+use std::fs;
+
+use helix_core::{path::get_canonicalized_path, Range};
+use helix_loader::{current_working_dir, set_current_working_dir};
+use helix_view::{current_ref, editor::Action};
+use tempfile::{Builder, TempDir};
+
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_picker_alt_ret() -> anyhow::Result<()> {
+    // Create two files, open the first and run a global search for a word
+    // from the second file. Press <alt-ret> to have helix open the second file in the
+    // new buffer, but not change focus. Then check whether the word is highlighted
+    // correctly and the view of the first file has not changed.
+    let tmp_dir = TempDir::new()?;
+    set_current_working_dir(tmp_dir.path().into())?;
+
+    let mut app = AppBuilder::new().build()?;
+
+    log::debug!(
+        "set current working directory to {:?}",
+        current_working_dir()
+    );
+
+    // Add prefix so helix doesn't hide these files in a picker
+    let files = [
+        Builder::new().prefix("1").tempfile_in(&tmp_dir)?,
+        Builder::new().prefix("2").tempfile_in(&tmp_dir)?,
+    ];
+    let paths = files
+        .iter()
+        .map(|f| get_canonicalized_path(f.path()).unwrap())
+        .collect::<Vec<_>>();
+
+    fs::write(&paths[0], "1\n2\n3\n4")?;
+    fs::write(&paths[1], "first\nsecond")?;
+
+    log::debug!(
+        "created and wrote two temporary files: {:?} & {:?}",
+        paths[0],
+        paths[1]
+    );
+
+    // Manually open to save the offset, otherwise we won't be able to change the state in the Fn trait
+    app.editor.open(files[0].path(), Action::Replace)?;
+    let view_offset = current_ref!(app.editor).0.offset;
+
+    test_key_sequences(
+        &mut app,
+        vec![
+            (Some("<space>/"), None),
+            (Some("second<ret>"), None),
+            (
+                Some("<A-ret><esc>"),
+                Some(&|app| {
+                    let (view, doc) = current_ref!(app.editor);
+                    assert_eq!(doc.path().unwrap(), &paths[0]);
+                    let select_ranges = doc.selection(view.id).ranges();
+                    assert_eq!(select_ranges[0], Range::new(0, 1));
+                    assert_eq!(view.offset, view_offset);
+                }),
+            ),
+            (
+                Some(":buffer<minus>next<ret>"),
+                Some(&|app| {
+                    let (view, doc) = current_ref!(app.editor);
+                    assert_eq!(doc.path().unwrap(), &paths[1]);
+                    let select_ranges = doc.selection(view.id).ranges();
+                    assert_eq!(select_ranges.len(), 1);
+                    assert_eq!(select_ranges[0], Range::new(6, 12));
+                }),
+            ),
+        ],
+        false,
+    )
+    .await?;
+
+    Ok(())
+}
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 113102b6b..af00864a7 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -995,6 +995,13 @@ pub enum Action {
     VerticalSplit,
 }
 
+impl Action {
+    /// Whether to align the view to the cursor after executing this action
+    pub fn align_view(&self, view: &View, new_doc: DocumentId) -> bool {
+        !matches!((self, view.doc == new_doc), (Action::Load, false))
+    }
+}
+
 /// Error thrown on failed document closed
 pub enum CloseError {
     /// Document doesn't exist

From 942852b9338aa3ebdc5cc067a05e5d869d4c4643 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Aug 2023 15:19:40 +0200
Subject: [PATCH 227/967] build(deps): bump lsp-types from 0.94.0 to 0.94.1
 (#7861)

Bumps [lsp-types](https://github.com/gluon-lang/lsp-types) from 0.94.0 to 0.94.1.
- [Changelog](https://github.com/gluon-lang/lsp-types/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gluon-lang/lsp-types/compare/v0.94.0...v0.94.1)

---
updated-dependencies:
- dependency-name: lsp-types
  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 6f99b61d6..40be26017 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1616,9 +1616,9 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "lsp-types"
-version = "0.94.0"
+version = "0.94.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
+checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
 dependencies = [
  "bitflags 1.3.2",
  "serde",

From f7c0ca7e0c8f359380c522c2755fcadd328f8370 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Aug 2023 15:20:49 +0200
Subject: [PATCH 228/967] build(deps): bump tempfile from 3.7.0 to 3.7.1
 (#7862)

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.7.0 to 3.7.1.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.7.0...v3.7.1)

---
updated-dependencies:
- dependency-name: tempfile
  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-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 40be26017..36b104aa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2158,9 +2158,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.7.0"
+version = "3.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
+checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
 dependencies = [
  "cfg-if",
  "fastrand",
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 55f8422bc..e415cfe04 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -28,7 +28,7 @@ which = "4.4"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.7.0"
+tempfile = "3.7.1"
 dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 30ac60b82..d6b1692c4 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -79,4 +79,4 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.11"
 indoc = "2.0.3"
-tempfile = "3.7.0"
+tempfile = "3.7.1"

From 1c1df42cc08d35acb42c9ab596606f34c7f96613 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Aug 2023 15:21:16 +0200
Subject: [PATCH 229/967] build(deps): bump globset from 0.4.12 to 0.4.13
 (#7864)

Bumps [globset](https://github.com/BurntSushi/ripgrep) from 0.4.12 to 0.4.13.
- [Release notes](https://github.com/BurntSushi/ripgrep/releases)
- [Changelog](https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BurntSushi/ripgrep/compare/globset-0.4.12...globset-0.4.13)

---
updated-dependencies:
- dependency-name: globset
  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 36b104aa4..92bff3b12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1139,9 +1139,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006"
+checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
 dependencies = [
  "aho-corasick 1.0.2",
  "bstr",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index bcf54654a..922c8eead 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -19,7 +19,7 @@ helix-parsec = { version = "0.6", path = "../helix-parsec" }
 anyhow = "1.0"
 futures-executor = "0.3"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
-globset = "0.4.12"
+globset = "0.4.13"
 log = "0.4"
 lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }

From cefc33e3dfffd5136bcc9b77aea481e3b0de6ae9 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Tue, 8 Aug 2023 15:22:52 +0200
Subject: [PATCH 230/967] use AND operator when searching (#7839)

This makes search results less surprising, because it is how major web search engines behave
---
 book/book.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/book/book.toml b/book/book.toml
index 4db5365e7..335b27af6 100644
--- a/book/book.toml
+++ b/book/book.toml
@@ -11,3 +11,6 @@ preferred-dark-theme = "colibri"
 git-repository-url = "https://github.com/helix-editor/helix"
 edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"
 additional-css = ["custom.css"]
+
+[output.html.search]
+use-boolean-and = true

From f01ca107fbf28c5dd65e238f775d708d738953b8 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 8 Aug 2023 13:28:53 -0500
Subject: [PATCH 231/967] Detect non-existent files as non-readonly (#7875)

---
 helix-view/src/document.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 7602c9c79..3477608bd 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -965,7 +965,11 @@ impl Document {
         // Allows setting the flag for files the user cannot modify, like root files
         self.readonly = match &self.path {
             None => false,
-            Some(p) => access(p, Access::WRITE_OK).is_err(),
+            Some(p) => match access(p, Access::WRITE_OK) {
+                Ok(_) => false,
+                Err(err) if err.kind() == std::io::ErrorKind::NotFound => false,
+                Err(_) => true,
+            },
         };
     }
 
@@ -979,6 +983,7 @@ impl Document {
         self.readonly = match &self.path {
             None => false,
             Some(p) => match std::fs::metadata(p) {
+                Err(err) if err.kind() == std::io::ErrorKind::NotFound => false,
                 Err(_) => false,
                 Ok(metadata) => metadata.permissions().readonly(),
             },

From 294aa669a24ce10e5af32d2447f677bf6edd36d0 Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Tue, 8 Aug 2023 20:50:49 +0200
Subject: [PATCH 232/967] Add Unison support (#7724)

---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 23 +++++++++
 runtime/queries/unison/highlights.scm | 72 +++++++++++++++++++++++++++
 runtime/queries/unison/injections.scm |  1 +
 4 files changed, 97 insertions(+)
 create mode 100644 runtime/queries/unison/highlights.scm
 create mode 100644 runtime/queries/unison/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 28c421f4f..38d4d9e9f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -155,6 +155,7 @@
 | twig | ✓ |  |  |  |
 | typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | ungrammar | ✓ |  |  |  |
+| unison | ✓ |  |  |  |
 | uxntal | ✓ |  |  |  |
 | v | ✓ | ✓ | ✓ | `v-analyzer` |
 | vala | ✓ |  |  | `vala-language-server` |
diff --git a/languages.toml b/languages.toml
index c9a863ef0..465b505bc 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2713,3 +2713,26 @@ injection-regex = "wren"
 file-types = ["wren"]
 roots = []
 indent = { tab-width = 2, unit = "  "}
+
+[[language]]
+name = "unison"
+scope = "source.unison"
+injection-regex = "unison"
+file-types = ["u"]
+shebangs = []
+roots = []
+auto-format = false
+comment-token = "--"
+indent = { tab-width = 4, unit = "    " }
+
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+'`' = '`'
+
+[[grammar]]
+name = "unison"
+source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "98c4e8bc5c9f5989814a720457cf36963cf4043d" }
+
diff --git a/runtime/queries/unison/highlights.scm b/runtime/queries/unison/highlights.scm
new file mode 100644
index 000000000..8ec2b6ff2
--- /dev/null
+++ b/runtime/queries/unison/highlights.scm
@@ -0,0 +1,72 @@
+;; Primitives
+(comment) @comment
+(nat) @constant.numeric
+(unit) @constant.builtin
+(literal_char) @constant.character
+(literal_text) @string
+(literal_boolean) @constant.builtin.boolean
+
+;; Keywords
+[
+  (kw_forall)
+  (unique_kw)
+  (type_kw)
+  (kw_equals)
+  (do)
+] @keyword
+
+(kw_let) @keyword.function
+(type_kw) @keyword.storage.type
+(unique) @keyword.storage.modifier
+("use") @keyword.control.import
+
+
+[
+  (type_constructor)
+] @constructor
+
+[
+  (operator)
+  (pipe)
+  (arrow_symbol)
+  (">")
+  (or)
+  (bang)
+] @operator
+
+[
+  "if"
+  "else"
+  "then"
+  (match)
+  (with)
+  (cases)
+] @keyword.control.conditional
+
+(blank_pattern) @variable.builtin
+
+;; Types
+(record_field name: (wordy_id) @variable.other.member type: (wordy_id) @type)
+[
+  (type_name)
+  (type_signature)
+  (effect)
+] @type
+
+(term_definition) @variable
+
+;; Punctuation
+[
+  (type_signature_colon)
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
diff --git a/runtime/queries/unison/injections.scm b/runtime/queries/unison/injections.scm
new file mode 100644
index 000000000..4f0cc44c9
--- /dev/null
+++ b/runtime/queries/unison/injections.scm
@@ -0,0 +1 @@
+((doc_block) @injection.content (#set! injection.language "markdown"))

From 48eb0d47925586a9dadea577fad607776631b4ab Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Wed, 9 Aug 2023 03:56:55 +0200
Subject: [PATCH 233/967] Enhance :toggle to support cycling numbers (#7877)

---
 helix-term/src/commands/typed.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 5bb9c6c41..463bce259 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1856,14 +1856,29 @@ fn toggle_option(
                     .to_string(),
             )
         }
-        Value::Null | Value::Object(_) | Value::Array(_) | Value::Number(_) => {
+        Value::Number(ref value) => {
+            ensure!(
+                args.len() > 2,
+                "Bad arguments. For number configurations use: `:toggle key val1 val2 ...`",
+            );
+
+            Value::Number(
+                args[1..]
+                    .iter()
+                    .skip_while(|&e| value.to_string() != *e.to_string())
+                    .nth(1)
+                    .unwrap_or_else(|| &args[1])
+                    .parse()?,
+            )
+        }
+        Value::Null | Value::Object(_) | Value::Array(_) => {
             anyhow::bail!("Configuration {key} does not support toggle yet")
         }
     };
 
     let status = format!("'{key}' is now set to {value}");
     let config = serde_json::from_value(config)
-        .map_err(|_| anyhow::anyhow!("Could not parse field: `{:?}`", &args))?;
+        .map_err(|err| anyhow::anyhow!("Cannot parse `{:?}`, {}", &args, err))?;
 
     cx.editor
         .config_events

From 107763083405868f3679d8e12476ed0688896f87 Mon Sep 17 00:00:00 2001
From: Artemiy <artem-itf@yandex.ru>
Date: Wed, 9 Aug 2023 15:00:59 +0300
Subject: [PATCH 234/967] Update tree-sitter grammar for nu (#7873)

* Update tree-sitter grammar for nu

Change tree-sitter grammar for nushell to 'officially' maintained
by nushell project https://github.com/nushell/tree-sitter-nu. Update
to the latest version. Replace queries with supported

* Restore injection queries for nu

Restore injection.scm queries for nushell tree-sitter grammar
---
 languages.toml                    |   2 +-
 runtime/queries/nu/folds.scm      |   4 -
 runtime/queries/nu/highlights.scm | 320 ++++++++++++++++++++++++++----
 runtime/queries/nu/injections.scm |   2 +-
 runtime/queries/nu/locals.scm     |  13 --
 5 files changed, 278 insertions(+), 63 deletions(-)
 delete mode 100644 runtime/queries/nu/folds.scm
 delete mode 100644 runtime/queries/nu/locals.scm

diff --git a/languages.toml b/languages.toml
index 465b505bc..618b18c1d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1697,7 +1697,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "nu"
-source = { git = "https://github.com/LhKipp/tree-sitter-nu", rev = "eb95bdac3abd73ef47e53f19c63e74a31405ebd2" }
+source = { git = "https://github.com/nushell/tree-sitter-nu", rev = "98c11c491e3405c75affa1cf004097692da3dda2" }
 
 [[language]]
 name = "vala"
diff --git a/runtime/queries/nu/folds.scm b/runtime/queries/nu/folds.scm
deleted file mode 100644
index f6b5acb15..000000000
--- a/runtime/queries/nu/folds.scm
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  (function_definition)
-  (block)
-] @fold
diff --git a/runtime/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
index b643a63af..746c50251 100644
--- a/runtime/queries/nu/highlights.scm
+++ b/runtime/queries/nu/highlights.scm
@@ -1,55 +1,287 @@
-(string) @string
-(type) @type
-(value_path) @variable
-(comment) @comment
+;;; ---
+;;; keywords
+[
+    "def"
+    "def-env"
+    "alias"
+    "export-env"
+    "export"
+    "extern"
+    "module"
 
-(number_literal) @constant.numeric
-(range from: (number_literal) @constant.numeric)
-(range to: (number_literal) @constant.numeric)
+    "let"
+    "let-env"
+    "mut"
+    "const"
 
-(command cmd_name: (identifier) @function)
-(function_definition func_name: (identifier) @function)
+    "hide-env"
 
-[
-    (variable_declaration name: (identifier))
-    (parameter (identifier))
-    (flag (flag_name))
-    (flag (flag_shorthand_name))
-    (record_entry entry_name: (identifier))
-    (block_args block_param: (identifier))
-] @variable.other.member
-; (parameter (identifier) @variable.parameter) ; -- alternative highlighting group?
+    "source"
+    "source-env"
 
-(cmd_invocation) @embedded
+    "overlay"
+    "register"
 
+    "loop"
+    "while"
+    "error"
 
-((identifier) @constant
- (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+    "do"
+    "if"
+    "else"
+    "try"
+    "catch"
+    "match"
+
+    "break"
+    "continue"
+    "return"
 
-[
- "if"
- "else"
- "let"
- "def"
- "export"
 ] @keyword
 
+(hide_mod "hide" @keyword)
+(decl_use "use" @keyword)
+
+(ctrl_for
+    "for" @keyword
+    "in" @keyword
+)
+(overlay_list "list" @keyword.storage.modifier)
+(overlay_hide "hide" @keyword.storage.modifier)
+(overlay_new "new" @keyword.storage.modifier)
+(overlay_use
+    "use" @keyword.storage.modifier
+    "as" @keyword
+)
+(ctrl_error "make" @keyword.storage.modifier)
+
+;;; ---
+;;; literals
+(val_number) @constant.numeric
+(val_duration
+    unit: [
+        "ns" "µs" "us" "ms" "sec" "min" "hr" "day" "wk"
+    ] @variable.parameter
+)
+(val_filesize
+    unit: [
+        "b" "B"
+
+        "kb" "kB" "Kb" "KB"
+        "mb" "mB" "Mb" "MB"
+        "gb" "gB" "Gb" "GB"
+        "tb" "tB" "Tb" "TB"
+        "pb" "pB" "Pb" "PB"
+        "eb" "eB" "Eb" "EB"
+        "zb" "zB" "Zb" "ZB"
+
+        "kib" "kiB" "kIB" "kIb" "Kib" "KIb" "KIB"
+        "mib" "miB" "mIB" "mIb" "Mib" "MIb" "MIB"
+        "gib" "giB" "gIB" "gIb" "Gib" "GIb" "GIB"
+        "tib" "tiB" "tIB" "tIb" "Tib" "TIb" "TIB"
+        "pib" "piB" "pIB" "pIb" "Pib" "PIb" "PIB"
+        "eib" "eiB" "eIB" "eIb" "Eib" "EIb" "EIB"
+        "zib" "ziB" "zIB" "zIb" "Zib" "ZIb" "ZIB"
+    ] @variable.parameter
+)
+(val_binary
+    [
+       "0b"
+       "0o"
+       "0x"
+    ] @constant.numeric
+    "[" @punctuation.bracket
+    digit: [
+        "," @punctuation.delimiter
+        (hex_digit) @constant.number
+    ]
+    "]" @punctuation.bracket
+) @constant.numeric
+(val_bool) @constant.builtin
+(val_nothing) @constant.builtin
+(val_string) @string
+(val_date) @constant.number
+(inter_escape_sequence) @constant.character.escape
+(escape_sequence) @constant.character.escape
+(val_interpolated [
+    "$\""
+    "$\'"
+    "\""
+    "\'"
+] @string)
+(unescaped_interpolated_content) @string
+(escaped_interpolated_content) @string
+(expr_interpolated ["(" ")"] @variable.parameter)
+
+;;; ---
+;;; operators
+(expr_binary [
+    "+"
+    "-"
+    "*"
+    "/"
+    "mod"
+    "//"
+    "++"
+    "**"
+    "=="
+    "!="
+    "<"
+    "<="
+    ">"
+    ">="
+    "=~"
+    "!~"
+    "and"
+    "or"
+    "xor"
+    "bit-or"
+    "bit-xor"
+    "bit-and"
+    "bit-shl"
+    "bit-shr"
+    "in"
+    "not-in"
+    "starts-with"
+    "ends-with"
+] @operator )
+
+(where_command [
+    "+"
+    "-"
+    "*"
+    "/"
+    "mod"
+    "//"
+    "++"
+    "**"
+    "=="
+    "!="
+    "<"
+    "<="
+    ">"
+    ">="
+    "=~"
+    "!~"
+    "and"
+    "or"
+    "xor"
+    "bit-or"
+    "bit-xor"
+    "bit-and"
+    "bit-shl"
+    "bit-shr"
+    "in"
+    "not-in"
+    "starts-with"
+    "ends-with"
+] @operator)
+
+(assignment [
+    "="
+    "+="
+    "-="
+    "*="
+    "/="
+    "++="
+] @operator)
+
+(expr_unary ["not" "-"] @operator)
+
+(val_range [
+    ".."
+    "..="
+    "..<"
+] @operator)
+
+["=>" "=" "|"] @operator
+
 [
-  ; "/" Not making / an operator may lead to better highlighting?
-  "$"
-  "|"
-  "+"
-  "-"
-  "*"
-  "="
-  "!="
-  "&&"
-  "||"
-  "=="
-  ">"
-] @operator
-
-["."
- "," 
- ";" 
+    "o>"   "out>"
+    "e>"   "err>"
+    "e+o>" "err+out>"
+    "o+e>" "out+err>"
+] @special
+
+;;; ---
+;;; punctuation
+[
+    ","
+    ";"
 ] @punctuation.delimiter
+
+(param_short_flag "-" @punctuation.delimiter)
+(param_long_flag ["--"] @punctuation.delimiter)
+(long_flag ["--"] @punctuation.delimiter)
+(param_rest "..." @punctuation.delimiter)
+(param_type [":"] @punctuation.special)
+(param_value ["="] @punctuation.special)
+(param_cmd ["@"] @punctuation.special)
+(param_opt ["?"] @punctuation.special)
+
+[
+    "(" ")"
+    "{" "}"
+    "[" "]"
+] @punctuation.bracket
+
+(val_record
+  (record_entry ":" @punctuation.delimiter))
+;;; ---
+;;; identifiers
+(param_rest
+    name: (_) @variable.parameter)
+(param_opt
+    name: (_) @variable.parameter)
+(parameter
+    param_name: (_) @variable.parameter)
+(param_cmd
+    (cmd_identifier) @string)
+(param_long_flag) @variable.parameter
+(param_short_flag) @variable.parameter
+
+(short_flag) @variable.parameter
+(long_flag) @variable.parameter
+
+(scope_pattern [(wild_card) @function])
+
+(cmd_identifier) @function
+
+(command
+    "^" @punctuation.delimiter
+    head: (_) @function
+)
+
+"where" @function
+
+(path
+  ["." "?"] @punctuation.delimiter
+) @variable.parameter
+
+(val_variable 
+  "$" @variable.parameter
+  [
+   (identifier) @namespace
+   "in"
+   "nu"
+   "env"
+   "nothing"
+   ] @special
+)
+;;; ---
+;;; types
+(flat_type) @type.builtin
+(list_type
+    "list" @type.enum
+    ["<" ">"] @punctuation.bracket
+)
+(collection_type
+    ["record" "table"] @type.enum
+    "<" @punctuation.bracket
+    key: (_) @variable.parameter 
+    ["," ":"] @punctuation.delimiter
+    ">" @punctuation.bracket
+)
+
+(shebang) @comment
+(comment) @comment
diff --git a/runtime/queries/nu/injections.scm b/runtime/queries/nu/injections.scm
index 321c90add..30804d652 100644
--- a/runtime/queries/nu/injections.scm
+++ b/runtime/queries/nu/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+ (#set! injection.language "comment"))
\ No newline at end of file
diff --git a/runtime/queries/nu/locals.scm b/runtime/queries/nu/locals.scm
deleted file mode 100644
index 2a341f80e..000000000
--- a/runtime/queries/nu/locals.scm
+++ /dev/null
@@ -1,13 +0,0 @@
-; Scopes
-(function_definition) @scope
-
-; Definitions
-(variable_declaration 
-  name: (identifier) @definition.var)
-
-(function_definition
-  func_name: (identifier) @definition.function)
-
-; References
-(value_path) @reference
-(word) @reference

From cb9b08d6507d37fd1b11ab5b40a2f17e21846210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl?= <gael.lopes-da-silva@outlook.fr>
Date: Wed, 9 Aug 2023 14:02:30 +0200
Subject: [PATCH 235/967] Add new Yellowed theme to default themes (#7849)

* added new Yellowed theme to default themes

* syntax typo and missing color fix
---
 runtime/themes/yellowed.toml | 135 +++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 runtime/themes/yellowed.toml

diff --git a/runtime/themes/yellowed.toml b/runtime/themes/yellowed.toml
new file mode 100644
index 000000000..091b93eeb
--- /dev/null
+++ b/runtime/themes/yellowed.toml
@@ -0,0 +1,135 @@
+# author: Gael Lopes Da Silva
+# project: Yellowed
+# github: https://github.com/Gael-Lopes-Da-Silva/YellowedHelix
+
+"attribute"                       = { fg = "text" }
+"type"                            = { fg = "text" }
+"type.builtin"                    = { fg = "keywords" }
+"type.enum"                       = { fg = "keywords" }
+"constructor"                     = { fg = "text", modifiers = ["bold"] }
+"constant"                        = { fg = "text", modifiers = ["bold"] }
+"constant.builtin"                = { fg = "constants", modifiers = ["bold"] }
+"constant.character"              = { fg = "string" }
+"constant.character.escape"       = { fg = "constants", modifiers = ["bold"] }
+"constant.numeric"                = { fg = "keywords" }
+"string"                          = { fg = "string" }
+"string.regexp"                   = { fg = "constants" }
+"comment"                         = { fg = "comment" }
+"variable"                        = { fg = "text" }
+"variable.builtin"                = { fg = "keywords" }
+"variable.parameter"              = { fg = "text", modifiers = ["italic"] }
+"label"                           = { fg = "text" }
+"punctuation"                     = { fg = "text" }
+"punctuation.special"             = { fg = "constants", modifiers = ["bold"] }
+"keyword"                         = { fg = "keywords", modifiers = ["bold"] }
+"keyword.control"                 = { fg = "keywords" }
+"keyword.control.return"          = { fg = "keywords", modifiers = ["bold"] }
+"keyword.operator"                = { fg = "keywords" }
+"keyword.directive"               = { fg = "keywords" }
+"operator"                        = { fg = "keywords" }
+"function"                        = { fg = "text", modifiers = ["bold"] }
+"tag"                             = { fg = "keywords", modifiers = ["bold"] }
+"namespace"                       = { fg = "text" }
+"special"                         = { fg = "yellow" }
+
+"markup.heading.marker"           = { fg = "keywords", modifiers = ["bold"] }
+"markup.heading.1"                = { fg = "text", modifiers = ["bold"] }
+"markup.heading.2"                = { fg = "text", modifiers = ["bold"] }
+"markup.heading.3"                = { fg = "text", modifiers = ["bold"] }
+"markup.heading.4"                = { fg = "text", modifiers = ["bold"] }
+"markup.heading.5"                = { fg = "text", modifiers = ["bold"] }
+"markup.heading.6"                = { fg = "text", modifiers = ["bold"] }
+"markup.list"                     = { fg = "keywords", modifiers = ["bold"] }
+"markup.bold"                     = { modifiers = ["bold"] }
+"markup.italic"                   = { modifiers = ["italic"] }
+"markup.link.url"                 = { fg = "text", modifiers = ["underlined"] }
+"markup.link.text"                = { fg = "string" }
+"markup.quote"                    = { fg = "text" }
+"markup.raw"                      = { fg = "string" }
+
+"diff.plus"                       = { fg = "green" }
+"diff.minus"                      = { fg = "red" }
+"diff.delta"                      = { fg = "blue" }
+"diff.delta.moved"                = { fg = "gray" }
+
+"ui.background"                   = { bg = "dark_gray", fg = "text" }
+"ui.background.separator"         = { fg = "text" }
+"ui.cursor"                       = { bg = "yellow", fg = "black" }
+"ui.cursor.normal"                = { bg = "yellow", fg = "black" }
+"ui.cursor.insert"                = { bg = "yellow", fg = "black" }
+"ui.cursor.select"                = { bg = "yellow", fg = "black" }
+"ui.cursor.match"                 = { bg = "light_gray" }
+"ui.cursor.primary"               = { bg = "yellow", fg = "black" }
+"ui.cursor.primary.normal"        = { bg = "yellow", fg = "black" }
+"ui.cursor.primary.insert"        = { bg = "yellow", fg = "black" }
+"ui.cursor.primary.select"        = { bg = "yellow", fg = "black" }
+"ui.debug.breakpoint"             = { fg = "red" }
+"ui.debug.active"                 = { fg = "green" }
+"ui.gutter"                       = { fg = "light_gray" }
+"ui.gutter.selected"              = { fg = "light_gray" }
+"ui.highlight.frameline"          = { fg = "gray" }
+"ui.linenr"                       = { fg = "light_gray" }
+"ui.linenr.selected"              = { fg = "yellow" }
+"ui.statusline"                   = { fg = "text", bg = "gray" }
+"ui.statusline.inactive"          = { fg = "light_gray", bg = "gray" }
+"ui.statusline.normal"            = { bg = "light_gray" }
+"ui.statusline.insert"            = { bg = "green" }
+"ui.statusline.select"            = { bg = "purple" }
+"ui.statusline.separator"         = { fg = "dark_gray" }
+"ui.popup"                        = { bg = "menu", fg = "text" }
+"ui.popup.info"                   = { bg = "menu", fg = "text" }
+"ui.window"                       = { fg = "text" }
+"ui.help"                         = { fg = "text", bg = "menu" }
+"ui.text"                         = { fg = "text" }
+"ui.text.focus"                   = { bg = "gray" }
+"ui.text.inactive"                = { fg = "text" }
+"ui.text.info"                    = { fg = "text" }
+"ui.virtual.ruler"                = { bg = "light_gray" }
+"ui.virtual.whitespace"           = { fg = "light_gray" }
+"ui.virtual.indent-guide"         = { fg = "light_gray" }
+"ui.virtual.inlay-hint"           = { fg = "light_gray" }
+"ui.virtual.inlay-hint.parameter" = { fg = "light_gray" }
+"ui.virtual.inlay-hint.type"      = { fg = "light_gray" }
+"ui.virtual.wrap"                 = { fg = "light_gray" }
+"ui.menu"                         = { fg = "text", bg = "gray" }
+"ui.menu.selected"                = { fg = "text", bg = "light_gray", modifiers = ["bold"] }
+"ui.menu.scroll"                  = { fg = "light_gray", bg = "dark_gray" }
+"ui.selection"                    = { bg = "selection" }
+"ui.selection.primary"            = { bg = "selection" }
+"ui.highlight"                    = { bg = "light_gray" }
+"ui.cursorline.primary"           = { bg = "gray" }
+"ui.cursorline.secondary"         = { bg = "gray" }
+"ui.cursorcolumn.primary"         = { bg = "gray" }
+"ui.cursorcolumn.secondary"       = { bg = "gray" }
+
+"warning"                         = { fg = "warning" }
+"error"                           = { fg = "error" }
+"info"                            = { fg = "info" }
+"hint"                            = { fg = "hint" }
+
+"diagnostic.warning"              = { underline = { color = "warning", style = "curl" } }
+"diagnostic.error"                = { underline = { color = "error", style = "curl" } }
+"diagnostic.info"                 = { underline = { color = "info", style = "curl" } }
+"diagnostic.hint"                 = { underline = { color = "hint", style = "curl" } }
+
+[palette]
+# interface
+yellow      = "#ffd900"
+gray        = "#2a2a2a"
+dark_gray   = "#242424"
+light_gray  = "#545454"
+purple      = "#994c92"
+blue        = "#008DFF"
+menu        = "#202020"
+selection   = "#3f3f3f"
+
+# syntax
+text        = "#FFFFFF"
+comment     = "#6b6b6b"
+string      = "#378b1d"
+constants   = "#ff80f4"
+keywords    = "#ffd900"
+warning     = "#FF9C00"
+error       = "#FF0000"
+info        = "#0092FF"
+hint        = "#4DFF00"

From c0eae84073ccbf09955f546cbad889e7c1487984 Mon Sep 17 00:00:00 2001
From: Jan9103 <55753387+Jan9103@users.noreply.github.com>
Date: Wed, 9 Aug 2023 15:35:29 +0200
Subject: [PATCH 236/967] feat: add todo.txt tree-sitter (#7835)

---
 book/src/generated/lang-support.md     |  1 +
 languages.toml                         | 11 +++++++++++
 runtime/queries/todotxt/highlights.scm |  6 ++++++
 3 files changed, 18 insertions(+)
 create mode 100644 runtime/queries/todotxt/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 38d4d9e9f..572654bd0 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -149,6 +149,7 @@
 | tablegen | ✓ | ✓ | ✓ |  |
 | task | ✓ |  |  |  |
 | tfvars | ✓ |  | ✓ | `terraform-ls` |
+| todotxt | ✓ |  |  |  |
 | toml | ✓ |  |  | `taplo` |
 | tsq | ✓ |  |  |  |
 | tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
diff --git a/languages.toml b/languages.toml
index 618b18c1d..20be54953 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2736,3 +2736,14 @@ indent = { tab-width = 4, unit = "    " }
 name = "unison"
 source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "98c4e8bc5c9f5989814a720457cf36963cf4043d" }
 
+[[language]]
+name = "todotxt"
+scope = "text.todotxt"
+file-types = [{ suffix = ".todo.txt" }, "todotxt"]
+roots = []
+formatter = { command = "sort" }
+auto-format = true
+
+[[grammar]]
+name = "todotxt"
+source = { git = "https://github.com/arnarg/tree-sitter-todotxt", rev = "0207f6a4ab6aeafc4b091914d31d8235049a2578" }
diff --git a/runtime/queries/todotxt/highlights.scm b/runtime/queries/todotxt/highlights.scm
new file mode 100644
index 000000000..37f91b8a7
--- /dev/null
+++ b/runtime/queries/todotxt/highlights.scm
@@ -0,0 +1,6 @@
+(done_task) @comment
+(task (priority) @keyword)
+(task (date) @comment)
+(task (kv) @comment)
+(task (project) @string)
+(task (context) @type)

From 57f093d83641642ad5d4ba42ae59f03272efcfcc Mon Sep 17 00:00:00 2001
From: Ivan Isekeev <ivanisekeev0@gmail.com>
Date: Wed, 9 Aug 2023 20:26:58 +0600
Subject: [PATCH 237/967] Jinja language family syntax support (#7233)

* feat: add jinja language support

* feat: add nunjucks language support

* feat: add to lang support book jinja and nunjucks languages
---
 book/src/generated/lang-support.md      |  2 ++
 languages.toml                          | 22 ++++++++++++++++++++++
 runtime/queries/jinja/highlights.scm    |  7 +++++++
 runtime/queries/jinja/injections.scm    |  4 ++++
 runtime/queries/nunjucks/highlights.scm |  1 +
 runtime/queries/nunjucks/injections.scm |  1 +
 6 files changed, 37 insertions(+)
 create mode 100644 runtime/queries/jinja/highlights.scm
 create mode 100644 runtime/queries/jinja/injections.scm
 create mode 100644 runtime/queries/nunjucks/highlights.scm
 create mode 100644 runtime/queries/nunjucks/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 572654bd0..297f67af0 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -71,6 +71,7 @@
 | ini | ✓ |  |  |  |
 | java | ✓ | ✓ | ✓ | `jdtls` |
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
+| jinja | ✓ |  |  |  |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
 | jsonnet | ✓ |  |  | `jsonnet-language-server` |
@@ -100,6 +101,7 @@
 | nim | ✓ | ✓ | ✓ | `nimlangserver` |
 | nix | ✓ |  |  | `nil` |
 | nu | ✓ |  |  |  |
+| nunjucks | ✓ |  |  |  |
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
 | ocaml-interface | ✓ |  |  | `ocamllsp` |
 | odin | ✓ |  | ✓ | `ols` |
diff --git a/languages.toml b/languages.toml
index 20be54953..0e2178427 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2702,6 +2702,28 @@ roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "html"
 
+[[language]]
+name = "nunjucks"
+scope = "text.html.nunjucks"
+injection-regex = "nunjucks"
+file-types = ["njk"]
+roots = []
+indent = { tab-width = 2, unit = "  " }
+grammar = "jinja2"
+
+[[language]]
+name = "jinja"
+scope = "text.html.jinja"
+injection-regex = "jinja"
+file-types = ["jinja", "jinja2", "j2"]
+roots = []
+indent = { tab-width = 2, unit = "  " }
+grammar = "jinja2"
+
+[[grammar]]
+name = "jinja2"
+source = { git = "https://github.com/varpeti/tree-sitter-jinja2", rev = "a533cd3c33aea6acb0f9bf9a56f35dcfe6a8eb53" }
+
 [[grammar]]
 name = "wren"
 source = { git = "https://git.sr.ht/~jummit/tree-sitter-wren", rev = "793d58266924e6efcc40e411663393e9d72bec87"}
diff --git a/runtime/queries/jinja/highlights.scm b/runtime/queries/jinja/highlights.scm
new file mode 100644
index 000000000..3166ccbd9
--- /dev/null
+++ b/runtime/queries/jinja/highlights.scm
@@ -0,0 +1,7 @@
+(expression) @string
+(statement) @variable.builtin
+(keyword) @keyword
+(comment) @comment
+(identifier) @variable.parameter
+(operator) @operator
+(string) @string
\ No newline at end of file
diff --git a/runtime/queries/jinja/injections.scm b/runtime/queries/jinja/injections.scm
new file mode 100644
index 000000000..8599722e0
--- /dev/null
+++ b/runtime/queries/jinja/injections.scm
@@ -0,0 +1,4 @@
+((source_file) @injection.content
+ (#set! injection.combined)
+ (#set! injection.include-children)
+ (#set! injection.language "html"))
\ No newline at end of file
diff --git a/runtime/queries/nunjucks/highlights.scm b/runtime/queries/nunjucks/highlights.scm
new file mode 100644
index 000000000..d6bbc1970
--- /dev/null
+++ b/runtime/queries/nunjucks/highlights.scm
@@ -0,0 +1 @@
+; inherits: jinja
\ No newline at end of file
diff --git a/runtime/queries/nunjucks/injections.scm b/runtime/queries/nunjucks/injections.scm
new file mode 100644
index 000000000..d6bbc1970
--- /dev/null
+++ b/runtime/queries/nunjucks/injections.scm
@@ -0,0 +1 @@
+; inherits: jinja
\ No newline at end of file

From 7078e8400736dce923be44a4d26f136a22640f93 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 14 Apr 2023 11:00:15 -0400
Subject: [PATCH 238/967] Fix YAML auto indent

YAML indents queries are tweaked to fix auto indent behavior.

A new capture type `indent.always` is introduced to address use cases
where combining indent captures on a single line is desired.

Fixes #6661
---
 helix-core/src/indent.rs                | 252 +++++++-
 helix-term/src/commands.rs              |   8 +-
 helix-term/tests/integration.rs         |   1 +
 helix-term/tests/test/languages/go.rs   |  41 ++
 helix-term/tests/test/languages/mod.rs  |   4 +
 helix-term/tests/test/languages/yaml.rs | 819 ++++++++++++++++++++++++
 runtime/queries/yaml/indents.scm        |  36 +-
 7 files changed, 1130 insertions(+), 31 deletions(-)
 create mode 100644 helix-term/tests/test/languages/go.rs
 create mode 100644 helix-term/tests/test/languages/mod.rs
 create mode 100644 helix-term/tests/test/languages/yaml.rs

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 3aede6b0b..5360a8064 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -237,38 +237,58 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
 /// This is usually constructed in one of 2 ways:
 /// - Successively add indent captures to get the (added) indent from a single line
 /// - Successively add the indent results for each line
-#[derive(Default)]
+#[derive(Default, Debug, PartialEq, Eq, Clone)]
 pub struct Indentation {
     /// The total indent (the number of indent levels) is defined as max(0, indent-outdent).
     /// The string that this results in depends on the indent style (spaces or tabs, etc.)
     indent: usize,
+    indent_always: usize,
     outdent: usize,
+    outdent_always: usize,
 }
 impl Indentation {
     /// Add some other [Indentation] to this.
     /// The added indent should be the total added indent from one line
     fn add_line(&mut self, added: &Indentation) {
-        if added.indent > 0 && added.outdent == 0 {
-            self.indent += 1;
-        } else if added.outdent > 0 && added.indent == 0 {
-            self.outdent += 1;
-        }
+        self.indent += added.indent;
+        self.indent_always += added.indent_always;
+        self.outdent += added.outdent;
+        self.outdent_always += added.outdent_always;
     }
+
     /// Add an indent capture to this indent.
     /// All the captures that are added in this way should be on the same line.
     fn add_capture(&mut self, added: IndentCaptureType) {
         match added {
             IndentCaptureType::Indent => {
-                self.indent = 1;
+                if self.indent_always == 0 {
+                    self.indent = 1;
+                }
+            }
+            IndentCaptureType::IndentAlways => {
+                // any time we encounter an `indent.always` on the same line, we
+                // want to cancel out all regular indents
+                self.indent_always += 1;
+                self.indent = 0;
             }
             IndentCaptureType::Outdent => {
-                self.outdent = 1;
+                if self.outdent_always == 0 {
+                    self.outdent = 1;
+                }
+            }
+            IndentCaptureType::OutdentAlways => {
+                self.outdent_always += 1;
+                self.outdent = 0;
             }
         }
     }
+
     fn as_string(&self, indent_style: &IndentStyle) -> String {
-        let indent_level = if self.indent >= self.outdent {
-            self.indent - self.outdent
+        let indent = self.indent_always + self.indent;
+        let outdent = self.outdent_always + self.outdent;
+
+        let indent_level = if indent >= outdent {
+            indent - outdent
         } else {
             log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
             0
@@ -278,27 +298,32 @@ impl Indentation {
 }
 
 /// An indent definition which corresponds to a capture from the indent query
+#[derive(Debug)]
 struct IndentCapture {
     capture_type: IndentCaptureType,
     scope: IndentScope,
 }
-#[derive(Clone, Copy)]
+
+#[derive(Debug, Clone, Copy, PartialEq)]
 enum IndentCaptureType {
     Indent,
+    IndentAlways,
     Outdent,
+    OutdentAlways,
 }
+
 impl IndentCaptureType {
     fn default_scope(&self) -> IndentScope {
         match self {
-            IndentCaptureType::Indent => IndentScope::Tail,
-            IndentCaptureType::Outdent => IndentScope::All,
+            IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
+            IndentCaptureType::Outdent | IndentCaptureType::OutdentAlways => IndentScope::All,
         }
     }
 }
 /// This defines which part of a node an [IndentCapture] applies to.
 /// Each [IndentCaptureType] has a default scope, but the scope can be changed
 /// with `#set!` property declarations.
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 enum IndentScope {
     /// The indent applies to the whole node
     All,
@@ -308,6 +333,7 @@ enum IndentScope {
 
 /// A capture from the indent query which does not define an indent but extends
 /// the range of a node. This is used before the indent is calculated.
+#[derive(Debug)]
 enum ExtendCapture {
     Extend,
     PreventOnce,
@@ -316,6 +342,7 @@ enum ExtendCapture {
 /// The result of running a tree-sitter indent query. This stores for
 /// each node (identified by its ID) the relevant captures (already filtered
 /// by predicates).
+#[derive(Debug)]
 struct IndentQueryResult {
     indent_captures: HashMap<usize, Vec<IndentCapture>>,
     extend_captures: HashMap<usize, Vec<ExtendCapture>>,
@@ -334,6 +361,33 @@ fn query_indents(
     let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
     let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
     cursor.set_byte_range(range);
+
+    let get_node_start_line = |node: Node| {
+        let mut node_line = node.start_position().row;
+
+        // Adjust for the new line that will be inserted
+        if let Some((line, byte)) = new_line_break {
+            if node_line == line && node.start_byte() >= byte {
+                node_line += 1;
+            }
+        }
+
+        node_line
+    };
+
+    let get_node_end_line = |node: Node| {
+        let mut node_line = node.end_position().row;
+
+        // Adjust for the new line that will be inserted
+        if let Some((line, byte)) = new_line_break {
+            if node_line == line && node.end_byte() < byte {
+                node_line += 1;
+            }
+        }
+
+        node_line
+    };
+
     // Iterate over all captures from the query
     for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
         // Skip matches where not all custom predicates are fulfilled
@@ -360,21 +414,13 @@ fn query_indents(
                             Some(QueryPredicateArg::Capture(capt1)),
                             Some(QueryPredicateArg::Capture(capt2))
                         ) => {
-                            let get_line_num = |node: Node| {
-                                let mut node_line = node.start_position().row;
-                                // Adjust for the new line that will be inserted
-                                if let Some((line, byte)) = new_line_break {
-                                    if node_line==line && node.start_byte()>=byte {
-                                        node_line += 1;
-                                    }
-                                }
-                                node_line
-                            };
                             let n1 = m.nodes_for_capture_index(*capt1).next();
                             let n2 = m.nodes_for_capture_index(*capt2).next();
                             match (n1, n2) {
                                 (Some(n1), Some(n2)) => {
-                                    let same_line = get_line_num(n1)==get_line_num(n2);
+                                    let n1_line = get_node_start_line(n1);
+                                    let n2_line = get_node_start_line(n2);
+                                    let same_line = n1_line == n2_line;
                                     same_line==(pred.operator.as_ref()=="same-line?")
                                 }
                                 _ => true,
@@ -385,6 +431,23 @@ fn query_indents(
                         }
                     }
                 }
+                "one-line?" | "not-one-line?" => match pred.args.get(0) {
+                    Some(QueryPredicateArg::Capture(capture_idx)) => {
+                        let node = m.nodes_for_capture_index(*capture_idx).next();
+
+                        match node {
+                            Some(node) => {
+                                let (start_line, end_line) = (get_node_start_line(node), get_node_end_line(node));
+                                let one_line = end_line == start_line;
+                                one_line != (pred.operator.as_ref() == "not-one-line?")
+                            },
+                            _ => true,
+                        }
+                    }
+                    _ => {
+                        panic!("Invalid indent query: Arguments to \"not-kind-eq?\" must be a capture and a string");
+                    }
+                },
                 _ => {
                     panic!(
                         "Invalid indent query: Unknown predicate (\"{}\")",
@@ -399,7 +462,9 @@ fn query_indents(
             let capture_name = query.capture_names()[capture.index as usize].as_str();
             let capture_type = match capture_name {
                 "indent" => IndentCaptureType::Indent,
+                "indent.always" => IndentCaptureType::IndentAlways,
                 "outdent" => IndentCaptureType::Outdent,
+                "outdent.always" => IndentCaptureType::OutdentAlways,
                 "extend" => {
                     extend_captures
                         .entry(capture.node.id())
@@ -456,10 +521,15 @@ fn query_indents(
                 .push(indent_capture);
         }
     }
-    IndentQueryResult {
+
+    let result = IndentQueryResult {
         indent_captures,
         extend_captures,
-    }
+    };
+
+    log::trace!("indent result = {:?}", result);
+
+    result
 }
 
 /// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.
@@ -584,6 +654,7 @@ pub fn treesitter_indent_for_pos(
         .tree()
         .root_node()
         .descendant_for_byte_range(byte_pos, byte_pos)?;
+
     let (query_result, deepest_preceding) = {
         // The query range should intersect with all nodes directly preceding
         // the position of the indent query in case one of them is extended.
@@ -642,10 +713,12 @@ pub fn treesitter_indent_for_pos(
     // even if there are multiple "indent" nodes on the same line
     let mut indent_for_line = Indentation::default();
     let mut indent_for_line_below = Indentation::default();
+
     loop {
         // This can safely be unwrapped because `first_in_line` contains
         // one entry for each ancestor of the node (which is what we iterate over)
         let is_first = *first_in_line.last().unwrap();
+
         // Apply all indent definitions for this node
         if let Some(definitions) = indent_captures.get(&node.id()) {
             for definition in definitions {
@@ -667,6 +740,7 @@ pub fn treesitter_indent_for_pos(
         if let Some(parent) = node.parent() {
             let mut node_line = node.start_position().row;
             let mut parent_line = parent.start_position().row;
+
             if node_line == line && new_line {
                 // Also consider the line that will be inserted
                 if node.start_byte() >= byte_pos {
@@ -676,17 +750,20 @@ pub fn treesitter_indent_for_pos(
                     parent_line += 1;
                 }
             };
+
             if node_line != parent_line {
+                // Don't add indent for the line below the line of the query
                 if node_line < line + (new_line as usize) {
-                    // Don't add indent for the line below the line of the query
                     result.add_line(&indent_for_line_below);
                 }
+
                 if node_line == parent_line + 1 {
                     indent_for_line_below = indent_for_line;
                 } else {
                     result.add_line(&indent_for_line);
                     indent_for_line_below = Indentation::default();
                 }
+
                 indent_for_line = Indentation::default();
             }
 
@@ -700,6 +777,7 @@ pub fn treesitter_indent_for_pos(
             {
                 result.add_line(&indent_for_line_below);
             }
+
             result.add_line(&indent_for_line);
             break;
         }
@@ -810,4 +888,122 @@ mod test {
             2
         );
     }
+
+    #[test]
+    fn add_capture() {
+        let indent = || Indentation {
+            indent: 1,
+            ..Default::default()
+        };
+        let indent_always = || Indentation {
+            indent_always: 1,
+            ..Default::default()
+        };
+        let outdent = || Indentation {
+            outdent: 1,
+            ..Default::default()
+        };
+        let outdent_always = || Indentation {
+            outdent_always: 1,
+            ..Default::default()
+        };
+
+        let add_capture = |mut indent: Indentation, capture| {
+            indent.add_capture(capture);
+            indent
+        };
+
+        // adding an indent to no indent makes an indent
+        assert_eq!(
+            indent(),
+            add_capture(Indentation::default(), IndentCaptureType::Indent)
+        );
+        assert_eq!(
+            indent_always(),
+            add_capture(Indentation::default(), IndentCaptureType::IndentAlways)
+        );
+        assert_eq!(
+            outdent(),
+            add_capture(Indentation::default(), IndentCaptureType::Outdent)
+        );
+        assert_eq!(
+            outdent_always(),
+            add_capture(Indentation::default(), IndentCaptureType::OutdentAlways)
+        );
+
+        // adding an indent to an already indented has no effect
+        assert_eq!(indent(), add_capture(indent(), IndentCaptureType::Indent));
+        assert_eq!(
+            outdent(),
+            add_capture(outdent(), IndentCaptureType::Outdent)
+        );
+
+        // adding an always to a regular makes it always
+        assert_eq!(
+            indent_always(),
+            add_capture(indent(), IndentCaptureType::IndentAlways)
+        );
+        assert_eq!(
+            outdent_always(),
+            add_capture(outdent(), IndentCaptureType::OutdentAlways)
+        );
+
+        // adding an always to an always is additive
+        assert_eq!(
+            Indentation {
+                indent_always: 2,
+                ..Default::default()
+            },
+            add_capture(indent_always(), IndentCaptureType::IndentAlways)
+        );
+        assert_eq!(
+            Indentation {
+                outdent_always: 2,
+                ..Default::default()
+            },
+            add_capture(outdent_always(), IndentCaptureType::OutdentAlways)
+        );
+
+        // adding regular to always should be associative
+        assert_eq!(
+            Indentation {
+                indent_always: 1,
+                ..Default::default()
+            },
+            add_capture(
+                add_capture(indent(), IndentCaptureType::Indent),
+                IndentCaptureType::IndentAlways
+            )
+        );
+        assert_eq!(
+            Indentation {
+                indent_always: 1,
+                ..Default::default()
+            },
+            add_capture(
+                add_capture(indent(), IndentCaptureType::IndentAlways),
+                IndentCaptureType::Indent
+            )
+        );
+        assert_eq!(
+            Indentation {
+                outdent_always: 1,
+                ..Default::default()
+            },
+            add_capture(
+                add_capture(outdent(), IndentCaptureType::Outdent),
+                IndentCaptureType::OutdentAlways
+            )
+        );
+        assert_eq!(
+            Indentation {
+                outdent_always: 1,
+                ..Default::default()
+            },
+            add_capture(
+                add_capture(outdent(), IndentCaptureType::OutdentAlways),
+                IndentCaptureType::Outdent
+            )
+        );
+    }
 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8be0f83a8..61c647d0b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2999,6 +2999,7 @@ fn open(cx: &mut Context, open: Open) {
             Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
             Open::Above => range.from(),
         });
+
         let new_line = match open {
             // adjust position to the end of the line (next line - 1)
             Open::Below => cursor_line + 1,
@@ -3006,13 +3007,15 @@ fn open(cx: &mut Context, open: Open) {
             Open::Above => cursor_line,
         };
 
+        let line_num = new_line.saturating_sub(1);
+
         // Index to insert newlines after, as well as the char width
         // to use to compensate for those inserted newlines.
         let (line_end_index, line_end_offset_width) = if new_line == 0 {
             (0, 0)
         } else {
             (
-                line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
+                line_end_char_index(&text, line_num),
                 doc.line_ending.len_chars(),
             )
         };
@@ -3023,10 +3026,11 @@ fn open(cx: &mut Context, open: Open) {
             &doc.indent_style,
             doc.tab_width(),
             text,
-            new_line.saturating_sub(1),
+            line_num,
             line_end_index,
             cursor_line,
         );
+
         let indent_len = indent.len();
         let mut text = String::with_capacity(1 + indent_len);
         text.push_str(doc.line_ending.as_str());
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index a62f00660..9c0e6bbc7 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -18,6 +18,7 @@ mod test {
     mod auto_indent;
     mod auto_pairs;
     mod commands;
+    mod languages;
     mod movement;
     mod picker;
     mod prompt;
diff --git a/helix-term/tests/test/languages/go.rs b/helix-term/tests/test/languages/go.rs
new file mode 100644
index 000000000..7bb3651e6
--- /dev/null
+++ b/helix-term/tests/test/languages/go.rs
@@ -0,0 +1,41 @@
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn auto_indent() -> anyhow::Result<()> {
+    let app = || AppBuilder::new().with_file("foo.go", None);
+
+    let enter_tests = [
+        (
+            helpers::platform_line(indoc! {r##"
+                type Test struct {#[}|]#
+            "##}),
+            "i<ret>",
+            helpers::platform_line(indoc! {"\
+                type Test struct {
+                \t#[|\n]#
+                }
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                func main() {
+                \tswitch nil {#[}|]#
+                }
+             "}),
+            "i<ret>",
+            helpers::platform_line(indoc! {"\
+                func main() {
+                \tswitch nil {
+                \t\t#[|\n]#
+                \t}
+                }
+            "}),
+        ),
+    ];
+
+    for test in enter_tests {
+        test_with_config(app(), test).await?;
+    }
+
+    Ok(())
+}
diff --git a/helix-term/tests/test/languages/mod.rs b/helix-term/tests/test/languages/mod.rs
new file mode 100644
index 000000000..51c23db62
--- /dev/null
+++ b/helix-term/tests/test/languages/mod.rs
@@ -0,0 +1,4 @@
+use super::*;
+
+mod go;
+mod yaml;
diff --git a/helix-term/tests/test/languages/yaml.rs b/helix-term/tests/test/languages/yaml.rs
new file mode 100644
index 000000000..7669e8a27
--- /dev/null
+++ b/helix-term/tests/test/languages/yaml.rs
@@ -0,0 +1,819 @@
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn auto_indent() -> anyhow::Result<()> {
+    let app = || AppBuilder::new().with_file("foo.yaml", None);
+
+    let below_tests = [
+        (
+            helpers::platform_line(indoc! {r##"
+                #[t|]#op:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  #[\n|]#
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  b#[a|]#z: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  #[\n|]#
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  baz: foo
+                  bazi#[:|]#
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    #[\n|]#
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  baz: foo
+                  bazi:
+                    more: #[yes|]#
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    #[\n|]#
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: becaus#[e|]#
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                    #[\n|]#
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:#[\n|]#
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    #[\n|]#
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1#[\n|]#
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    #[\n|]#
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:#[\n|]#
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+                  #[\n|]#
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: |
+                    some
+                    multi
+                    line
+                    string#[\n|]#
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: |
+                    some
+                    multi
+                    line
+                    string
+                    #[\n|]#
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >
+                    some
+                    multi
+                    line#[\n|]#
+                    string
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >
+                    some
+                    multi
+                    line
+                    #[\n|]#
+                    string
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >#[\n|]#
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >
+                    #[\n|]#
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              - top:#[\n|]#
+                  baz: foo
+                  bax: foox
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+              - top:
+                  #[\n|]#
+                  baz: foo
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              - top:
+                  baz: foo#[\n|]#
+                  bax: foox
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+              - top:
+                  baz: foo
+                  #[\n|]#
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              - top:
+                  baz: foo
+                  bax: foox#[\n|]#
+                fook:
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+              - top:
+                  baz: foo
+                  bax: foox
+                  #[\n|]#
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              top:
+                baz:
+                  - one: two#[\n|]#
+                    three: four
+                  - top:
+                      baz: foo
+                      bax: foox
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+              top:
+                baz:
+                  - one: two
+                    #[\n|]#
+                    three: four
+                  - top:
+                      baz: foo
+                      bax: foox
+            "}),
+        ),
+        // yaml map without a key
+        (
+            helpers::platform_line(indoc! {"\
+              top:#[\n|]#
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+              top:
+                #[\n|]#
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              top#[:|]#
+              bottom: withvalue
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+              top:
+                #[\n|]#
+              bottom: withvalue
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              bottom: withvalue
+              top#[:|]#
+            "}),
+            "o",
+            helpers::platform_line(indoc! {"\
+              bottom: withvalue
+              top:
+                #[\n|]#
+            "}),
+        ),
+    ];
+
+    for test in below_tests {
+        test_with_config(app(), test).await?;
+    }
+
+    let above_tests = [
+        (
+            helpers::platform_line(indoc! {r##"
+                #[t|]#op:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                #[\n|]#
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  b#[a|]#z: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  #[\n|]#
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  baz: foo
+                  bazi#[:|]#
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  #[\n|]#
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  baz: foo
+                  bazi:
+                    more: #[yes|]#
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    #[\n|]#
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: becaus#[e|]#
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "##}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    #[\n|]#
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:#[\n|]#
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                    #[\n|]#
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1#[\n|]#
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    #[\n|]#
+                    - 1
+                    - 2
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                fook:#[\n|]#
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bazi:
+                    more: yes
+                    why: because
+                  quux:
+                    - 1
+                    - 2
+                  bax: foox
+                  #[\n|]#
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: |
+                    some
+                    multi
+                    line
+                    string#[\n|]#
+                fook:
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: |
+                    some
+                    multi
+                    line
+                    #[\n|]#
+                    string
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >
+                    some#[\n|]#
+                    multi
+                    line
+                    string
+                fook:
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >
+                    #[\n|]#
+                    some
+                    multi
+                    line
+                    string
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >
+                fook:#[\n|]#
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+                top:
+                  baz: foo
+                  bax: >
+                    #[\n|]#
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              - top:
+                  baz: foo#[\n|]#
+                  bax: foox
+                fook:
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+              - top:
+                  #[\n|]#
+                  baz: foo
+                  bax: foox
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              - top:
+                  baz: foo
+                  bax: foox
+                fook:#[\n|]#
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+              - top:
+                  baz: foo
+                  bax: foox
+                  #[\n|]#
+                fook:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              top:
+                baz:
+                  - one: two#[\n|]#
+                    three: four
+                  - top:
+                      baz: foo
+                      bax: foox
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+              top:
+                baz:
+                  #[\n|]#
+                  - one: two
+                    three: four
+                  - top:
+                      baz: foo
+                      bax: foox
+            "}),
+        ),
+        // yaml map without a key
+        (
+            helpers::platform_line(indoc! {"\
+              top:#[\n|]#
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+              #[\n|]#
+              top:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              bottom: withvalue
+              top#[:|]#
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+              bottom: withvalue
+              #[\n|]#
+              top:
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+              top:
+              bottom:#[ |]#withvalue
+            "}),
+            "O",
+            helpers::platform_line(indoc! {"\
+              top:
+                #[\n|]#
+              bottom: withvalue
+            "}),
+        ),
+    ];
+
+    for test in above_tests {
+        test_with_config(app(), test).await?;
+    }
+
+    let enter_tests = [
+        (
+            helpers::platform_line(indoc! {r##"
+                foo: #[b|]#ar
+            "##}),
+            "i<ret>",
+            helpers::platform_line(indoc! {"\
+                foo: 
+                  #[|b]#ar
+            "}),
+        ),
+        (
+            helpers::platform_line(indoc! {"\
+                foo:#[\n|]#
+            "}),
+            "i<ret>",
+            helpers::platform_line(indoc! {"\
+                foo:
+                  #[|\n]#
+            "}),
+        ),
+    ];
+
+    for test in enter_tests {
+        test_with_config(app(), test).await?;
+    }
+
+    Ok(())
+}
diff --git a/runtime/queries/yaml/indents.scm b/runtime/queries/yaml/indents.scm
index 70a00b695..87853eb6b 100644
--- a/runtime/queries/yaml/indents.scm
+++ b/runtime/queries/yaml/indents.scm
@@ -1,2 +1,36 @@
-(block_mapping_pair) @indent
+(block_scalar) @indent @extend
 
+; indent sequence items only if they span more than one line, e.g.
+;
+; - foo:
+;     bar: baz
+; - quux:
+;     bar: baz
+;
+; but not
+;
+; - foo
+; - bar
+; - baz
+((block_sequence_item) @item @indent.always @extend
+  (#not-one-line? @item))
+
+; map pair where without a key
+;
+; foo:
+((block_mapping_pair
+    key: (_) @key
+    !value
+  ) @indent.always @extend
+)
+
+; map pair where the key and value are on different lines
+;
+; foo:
+;   bar: baz
+((block_mapping_pair
+    key: (_) @key
+    value: (_) @val
+    (#not-same-line? @key @val)
+  ) @indent.always @extend
+)
\ No newline at end of file

From 929eb0c39e34f8046b5ec9ecfede4ec80b5e0c8a Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Wed, 19 Jul 2023 09:07:36 -0400
Subject: [PATCH 239/967] expand indents guide

---
 book/src/guides/indent.md | 347 +++++++++++++++++++++++++++++++++-----
 1 file changed, 304 insertions(+), 43 deletions(-)

diff --git a/book/src/guides/indent.md b/book/src/guides/indent.md
index b660d7857..0b0e3938d 100644
--- a/book/src/guides/indent.md
+++ b/book/src/guides/indent.md
@@ -1,76 +1,293 @@
 # Adding indent queries
 
-Helix uses tree-sitter to correctly indent new lines. This requires
-a tree-sitter grammar and an `indent.scm` query file placed in
-`runtime/queries/{language}/indents.scm`. The indentation for a line
-is calculated by traversing the syntax tree from the lowest node at the
-beginning of the new line. Each of these nodes contributes to the total
-indent when it is captured by the query (in what way depends on the name
-of the capture).
+Helix uses tree-sitter to correctly indent new lines. This requires a tree-
+sitter grammar and an `indent.scm` query file placed in `runtime/queries/
+{language}/indents.scm`. The indentation for a line is calculated by traversing
+the syntax tree from the lowest node at the beginning of the new line (see
+[Indent queries](#indent-queries)). Each of these nodes contributes to the total
+indent when it is captured by the query (in what way depends on the name of
+the capture.
 
 Note that it matters where these added indents begin. For example,
 multiple indent level increases that start on the same line only increase
-the total indent level by 1.
+the total indent level by 1. See [Capture types](#capture-types).
 
-## Scopes
+## Indent queries
 
-Added indents don't always apply to the whole node. For example, in most
-cases when a node should be indented, we actually only want everything
-except for its first line to be indented. For this, there are several
-scopes (more scopes may be added in the future if required):
+When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine
+the indent level for the new line, the query in `indents.scm` is run on the
+document. The starting position of the query is the end of the line above where
+a new line will be inserted.
 
-- `all`:
-This scope applies to the whole captured node. This is only different from
-`tail` when the captured node is the first node on its line.
+For `o`, the inserted line is the line below the cursor, so that starting
+position of the query is the end of the current line.
 
-- `tail`:
-This scope applies to everything except for the first line of the
-captured node.
+```rust
+fn need_hero(some_hero: Hero, life: Life) -> {
+    matches!(some_hero, Hero { // ←─────────────────╮
+        strong: true,//←╮  ↑  ↑                     │
+        fast: true,  // │  │  ╰── query start       │
+        sure: true,  // │  ╰───── cursor            ├─ traversal 
+        soon: true,  // ╰──────── new line inserted │  start node
+    }) &&            //                             │
+//  ↑                                               │
+//  ╰───────────────────────────────────────────────╯
+    some_hero > life
+}
+```
 
-Every capture type has a default scope which should do the right thing
-in most situations. When a different scope is required, this can be
-changed by using a `#set!` declaration anywhere in the pattern:
-```scm
-(assignment_expression
-  right: (_) @indent
-  (#set! "scope" "all"))
+For `O`, the newly inserted line is the *current* line, so the starting position
+of the query is the end of the line above the cursor.
+
+```rust
+fn need_hero(some_hero: Hero, life: Life) -> { // ←─╮
+    matches!(some_hero, Hero { // ←╮          ↑     │
+        strong: true,//    ↑   ╭───╯          │     │
+        fast: true,  //    │   │ query start ─╯     │
+        sure: true,  //    ╰───┼ cursor             ├─ traversal
+        soon: true,  //        ╰ new line inserted  │  start node
+    }) &&            //                             │
+    some_hero > life //                             │
+} // ←──────────────────────────────────────────────╯
 ```
 
-## Capture types
+From this starting node, the syntax tree is traversed up until the root node.
+Each indent capture is collected along the way, and then combined according to
+their [capture types](#capture-types) and [scopes](#scopes) to a final indent
+level for the line.
 
-- `@indent` (default scope `tail`):
-Increase the indent level by 1. Multiple occurrences in the same line
-don't stack. If there is at least one `@indent` and one `@outdent`
-capture on the same line, the indent level isn't changed at all.
+### Capture types
 
+- `@indent` (default scope `tail`):
+  Increase the indent level by 1. Multiple occurrences in the same line *do not*
+  stack. If there is at least one `@indent` and one `@outdent` capture on the
+  same line, the indent level isn't changed at all.
 - `@outdent` (default scope `all`):
-Decrease the indent level by 1. The same rules as for `@indent` apply.
-
+  Decrease the indent level by 1. The same rules as for `@indent` apply.
+- `@indent.always` (default scope `tail`):
+  Increase the indent level by 1. Multiple occurrences on the same line *do*
+  stack. The final indent level is `@indent.always` – `@outdent.always`. If
+  an `@indent` and an `@indent.always` are on the same line, the `@indent` is
+  ignored.
+- `@outdent.always` (default scope `all`):
+  Decrease the indent level by 1. The same rules as for `@indent.always` apply.
 - `@extend`:
-Extend the range of this node to the end of the line and to lines that
-are indented more than the line that this node starts on. This is useful
-for languages like Python, where for the purpose of indentation some nodes
-(like functions or classes) should also contain indented lines that follow them.
-
+  Extend the range of this node to the end of the line and to lines that are
+  indented more than the line that this node starts on. This is useful for
+  languages like Python, where for the purpose of indentation some nodes (like
+  functions or classes) should also contain indented lines that follow them.
 - `@extend.prevent-once`:
-Prevents the first extension of an ancestor of this node. For example, in Python
-a return expression always ends the block that it is in. Note that this only stops the
-extension of the next `@extend` capture. If multiple ancestors are captured,
-only the extension of the innermost one is prevented. All other ancestors are unaffected
-(regardless of whether the innermost ancestor would actually have been extended).
+  Prevents the first extension of an ancestor of this node. For example, in Python
+  a return expression always ends the block that it is in. Note that this only
+  stops the extension of the next `@extend` capture. If multiple ancestors are
+  captured, only the extension of the innermost one is prevented. All other
+  ancestors are unaffected (regardless of whether the innermost ancestor would
+  actually have been extended).
+
+#### `@indent` / `@outdent`
+
+Consider this example:
+
+```rust
+fn shout(things: Vec<Thing>) {
+    //                       ↑
+    //                       ├───────────────────────╮ indent level
+    //                    @indent                    ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
+    //                                               │
+    let it_all = |out| { things.filter(|thing| { //  │      1
+    //                 ↑                       ↑     │
+    //                 ├───────────────────────┼─────┼┄┄┄┄┄┄┄┄┄┄┄┄┄┄
+    //              @indent                 @indent  │
+    //                                               │      2
+        thing.can_do_with(out) //                    │
+    })}; //                                          ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
+  //↑↑↑                                              │      1
+} //╰┼┴──────────────────────────────────────────────┴┄┄┄┄┄┄┄┄┄┄┄┄┄┄
+// 3x @outdent
+```
+
+```scm
+((block) @indent)
+["}" ")"] @outdent
+```
+
+Note how on the second line, we have two blocks begin on the same line. In this
+case, since both captures occur on the same line, they are combined and only
+result in a net increase of 1. Also note that the closing `}`s are part of the
+`@indent` captures, but the 3 `@outdent`s also combine into 1 and result in that
+line losing one indent level.
+
+#### `@extend` / `@extend.prevent-once`
+
+For an example of where `@extend` can be useful, consider Python, which is
+whitespace-sensitive.
+
+```scm
+]
+  (parenthesized_expression)
+  (function_definition)
+  (class_definition)
+] @indent
+
+```
+
+```python
+class Hero:
+    def __init__(self, strong, fast, sure, soon):#  ←─╮
+        self.is_strong = strong #                     │
+        self.is_fast = fast     # ╭─── query start    │
+        self.is_sure = sure     # │ ╭─ cursor         │
+        self.is_soon = soon     # │ │                 │
+        #     ↑            ↑      │ │                 │
+        #     │            ╰──────╯ │                 │
+        #     ╰─────────────────────╯                 │
+        #                                             ├─ traversal
+    def need_hero(self, life):         #              │  start node
+        return (                       #              │
+            self.is_strong             #              │
+            and self.is_fast           #              │
+            and self.is_sure           #              │
+            and self.is_soon           #              │
+            and self > life            #              │
+        ) # ←─────────────────────────────────────────╯
+```
+
+Without braces to catch the scope of the function, the smallest descendant of
+the cursor on a line feed ends up being the entire inside of the class. Because
+of this, it will miss the entire function node and its indent capture, leading
+to an indent level one too small.
+
+To address this case, `@extend` tells helix to "extend" the captured node's span
+to the line feed and every consecutive line that has a greater indent level than
+the line of the node.
+
+```scm
+(parenthesized_expression) @indent
+
+]
+  (function_definition)
+  (class_definition)
+] @indent @extend
+
+```
+
+```python
+class Hero:
+    def __init__(self, strong, fast, sure, soon):#  ←─╮
+        self.is_strong = strong #                     │
+        self.is_fast = fast     # ╭─── query start    ├─ traversal
+        self.is_sure = sure     # │ ╭─ cursor         │  start node
+        self.is_soon = soon     # │ │ ←───────────────╯
+        #     ↑            ↑      │ │                 
+        #     │            ╰──────╯ │
+        #     ╰─────────────────────╯
+    def need_hero(self, life):
+        return (
+            self.is_strong
+            and self.is_fast
+            and self.is_sure
+            and self.is_soon
+            and self > life
+        )
+```
+
+Furthermore, there are some cases where extending to everything with a greater
+indent level may not be desirable. Consider the `need_hero` function above. If
+our cursor is on the last line of the returned expression.
 
+```python
+class Hero:
+    def __init__(self, strong, fast, sure, soon):
+        self.is_strong = strong
+        self.is_fast = fast
+        self.is_sure = sure
+        self.is_soon = soon
+
+    def need_hero(self, life):
+        return (
+            self.is_strong
+            and self.is_fast
+            and self.is_sure
+            and self.is_soon
+            and self > life
+        ) # ←─── cursor
+    #←────────── where cursor should go on new line
+```
+
+In Python, the are a few tokens that will always end a scope, such as a return
+statement. Since the scope ends, so should the indent level. But because the
+function span is extended to every line with a greater indent level, a new line
+would just continue on the same level. And an `@outdent` would not help us here
+either, since it would cause everything in the parentheses to become outdented
+as well.
+
+To help, we need to signal an end to the extension. We can do this with
+`@extend.prevent-once`.
+
+```scm
+(parenthesized_expression) @indent
+
+]
+  (function_definition)
+  (class_definition)
+] @indent @extend
+
+(return_statement) @extend.prevent-once
+```
+
+#### `@indent.always` / `@outdent.always`
+
+As mentioned before, normally if there is more than one `@indent` or `@outdent`
+capture on the same line, they are combined.
+
+Sometimes, there are cases when you may want to ensure that every indent capture
+is additive, regardless of how many occur on the same line. Consider this
+example in YAML.
+
+```yaml
+  - foo: bar
+# ↑ ↑
+# │ ╰─────────────── start of map
+# ╰───────────────── start of list element
+    baz: quux # ←─── cursor
+    # ←───────────── where the cursor should go on a new line
+    garply: waldo
+  - quux:
+      bar: baz
+    xyzzy: thud
+    fred: plugh
+```
+
+In YAML, you often have lists of maps. In these cases, the syntax is such that
+the list element and the map both start on the same line. But we really do want
+to start an indentation for each of these so that subsequent keys in the map
+hang over the list and align properly. This is where `@indent.always` helps.
+
+```scm
+((block_sequence_item) @item @indent.always @extend
+  (#not-one-line? @item))
+
+((block_mapping_pair
+    key: (_) @key
+    value: (_) @val
+    (#not-same-line? @key @val)
+  ) @indent.always @extend
+)
+```
 
 ## Predicates
 
 In some cases, an S-expression cannot express exactly what pattern should be matched.
 For that, tree-sitter allows for predicates to appear anywhere within a pattern,
 similar to how `#set!` declarations work:
+
 ```scm
 (some_kind
   (child_kind) @indent
   (#predicate? arg1 arg2 ...)
 )
 ```
+
 The number of arguments depends on the predicate that's used.
 Each argument is either a capture (`@name`) or a string (`"some string"`).
 The following predicates are supported by tree-sitter:
@@ -91,3 +308,47 @@ argument (a string).
 
 - `#same-line?`/`#not-same-line?`:
 The captures given by the 2 arguments must/must not start on the same line.
+
+- `#one-line?`/`#not-one-line?`:
+The captures given by the fist argument must/must span a total of one line.
+
+### Scopes
+
+Added indents don't always apply to the whole node. For example, in most
+cases when a node should be indented, we actually only want everything
+except for its first line to be indented. For this, there are several
+scopes (more scopes may be added in the future if required):
+
+- `tail`:
+This scope applies to everything except for the first line of the
+captured node.
+- `all`:
+This scope applies to the whole captured node. This is only different from
+`tail` when the captured node is the first node on its line.
+
+For example, imagine we have the following function
+
+```rust
+fn aha() { // ←─────────────────────────────────────╮
+  let take = "on me";  // ←──────────────╮  scope:  │
+  let take = "me on";             //     ├─ "tail"  ├─ (block) @indent
+  let ill = be_gone_days(1 || 2); //     │          │
+} // ←───────────────────────────────────┴──────────┴─ "}" @outdent
+                                         //                scope: "all"
+```
+
+We can write the following query with the `#set!` declaration:
+
+  ```scm
+  ((block) @indent
+   (#set! "scope" "tail"))
+  ("}" @outdent
+   (#set! "scope" "all"))
+  ```
+
+As we can see, the "tail" scope covers the node, except for the first line.
+Everything up to and including the closing brace gets an indent level of 1.
+Then, on the closing brace, we encounter an outdent with a scope of "all", which
+means the first line is included, and the indent level is cancelled out on this
+line. (Note these scopes are the defaults for `@indent` and `@outdent`—they are
+written explicitly for demonstration.)
\ No newline at end of file

From eab0d4fa4b5c3a98d94b90acf54fd22692148ce3 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Fri, 11 Aug 2023 13:10:05 +0200
Subject: [PATCH 240/967] Implement @align (and @anchor) indent query.

---
 helix-core/src/indent.rs | 188 +++++++++++++++++++++++++--------------
 1 file changed, 119 insertions(+), 69 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 5360a8064..6ccdc5952 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -1,13 +1,13 @@
-use std::collections::HashMap;
+use std::{borrow::Cow, collections::HashMap};
 
 use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
 
 use crate::{
     chars::{char_is_line_ending, char_is_whitespace},
-    graphemes::tab_width_at,
+    graphemes::{grapheme_width, tab_width_at},
     syntax::{LanguageConfiguration, RopeProvider, Syntax},
     tree_sitter::Node,
-    Rope, RopeSlice,
+    Rope, RopeGraphemes, RopeSlice,
 };
 
 /// Enum representing indentation style.
@@ -237,19 +237,33 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
 /// This is usually constructed in one of 2 ways:
 /// - Successively add indent captures to get the (added) indent from a single line
 /// - Successively add the indent results for each line
+/// The string that this indentation defines starts with the string contained in the align field (unless it is None), followed by:
+/// - max(0, indent - outdent) tabs, if tabs are used for indentation
+/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
 #[derive(Default, Debug, PartialEq, Eq, Clone)]
 pub struct Indentation {
-    /// The total indent (the number of indent levels) is defined as max(0, indent-outdent).
-    /// The string that this results in depends on the indent style (spaces or tabs, etc.)
     indent: usize,
     indent_always: usize,
     outdent: usize,
     outdent_always: usize,
+    /// The alignment, as a string containing only tabs & spaces. Storing this as a string instead of e.g.
+    /// the (visual) width ensures that the alignment is preserved even if the tab width changes.
+    align: Option<String>,
 }
+
 impl Indentation {
     /// Add some other [Indentation] to this.
-    /// The added indent should be the total added indent from one line
-    fn add_line(&mut self, added: &Indentation) {
+    /// The added indent should be the total added indent from one line.
+    /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).
+    fn add_line(&mut self, added: Indentation) {
+        // Align overrides the indent from outer scopes.
+        if self.align.is_some() {
+            return;
+        }
+        if added.align.is_some() {
+            self.align = added.align;
+            return;
+        }
         self.indent += added.indent;
         self.indent_always += added.indent_always;
         self.outdent += added.outdent;
@@ -280,10 +294,12 @@ impl Indentation {
                 self.outdent_always += 1;
                 self.outdent = 0;
             }
+            IndentCaptureType::Align(align) => {
+                self.align = Some(align);
+            }
         }
     }
-
-    fn as_string(&self, indent_style: &IndentStyle) -> String {
+    fn into_string(self, indent_style: &IndentStyle) -> String {
         let indent = self.indent_always + self.indent;
         let outdent = self.outdent_always + self.outdent;
 
@@ -293,7 +309,13 @@ impl Indentation {
             log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
             0
         };
-        indent_style.as_str().repeat(indent_level)
+        let mut indent_string = if let Some(align) = self.align {
+            align
+        } else {
+            String::new()
+        };
+        indent_string.push_str(&indent_style.as_str().repeat(indent_level));
+        indent_string
     }
 }
 
@@ -303,13 +325,14 @@ struct IndentCapture {
     capture_type: IndentCaptureType,
     scope: IndentScope,
 }
-
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 enum IndentCaptureType {
     Indent,
     IndentAlways,
     Outdent,
     OutdentAlways,
+    /// Alignment given as a string of whitespace
+    Align(String),
 }
 
 impl IndentCaptureType {
@@ -317,6 +340,7 @@ impl IndentCaptureType {
         match self {
             IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
             IndentCaptureType::Outdent | IndentCaptureType::OutdentAlways => IndentScope::All,
+            IndentCaptureType::Align(_) => IndentScope::All,
         }
     }
 }
@@ -348,46 +372,35 @@ struct IndentQueryResult {
     extend_captures: HashMap<usize, Vec<ExtendCapture>>,
 }
 
+fn get_node_start_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
+    let mut node_line = node.start_position().row;
+    // Adjust for the new line that will be inserted
+    if new_line_byte_pos.map_or(false, |pos| node.start_byte() >= pos) {
+        node_line += 1;
+    }
+    node_line
+}
+fn get_node_end_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
+    let mut node_line = node.end_position().row;
+    // Adjust for the new line that will be inserted (with a strict inequality since end_byte is exclusive)
+    if new_line_byte_pos.map_or(false, |pos| node.end_byte() > pos) {
+        node_line += 1;
+    }
+    node_line
+}
+
 fn query_indents(
     query: &Query,
     syntax: &Syntax,
     cursor: &mut QueryCursor,
     text: RopeSlice,
     range: std::ops::Range<usize>,
-    // Position of the (optional) newly inserted line break.
-    // Given as (line, byte_pos)
-    new_line_break: Option<(usize, usize)>,
+    new_line_byte_pos: Option<usize>,
 ) -> IndentQueryResult {
     let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
     let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
     cursor.set_byte_range(range);
 
-    let get_node_start_line = |node: Node| {
-        let mut node_line = node.start_position().row;
-
-        // Adjust for the new line that will be inserted
-        if let Some((line, byte)) = new_line_break {
-            if node_line == line && node.start_byte() >= byte {
-                node_line += 1;
-            }
-        }
-
-        node_line
-    };
-
-    let get_node_end_line = |node: Node| {
-        let mut node_line = node.end_position().row;
-
-        // Adjust for the new line that will be inserted
-        if let Some((line, byte)) = new_line_break {
-            if node_line == line && node.end_byte() < byte {
-                node_line += 1;
-            }
-        }
-
-        node_line
-    };
-
     // Iterate over all captures from the query
     for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
         // Skip matches where not all custom predicates are fulfilled
@@ -418,8 +431,8 @@ fn query_indents(
                             let n2 = m.nodes_for_capture_index(*capt2).next();
                             match (n1, n2) {
                                 (Some(n1), Some(n2)) => {
-                                    let n1_line = get_node_start_line(n1);
-                                    let n2_line = get_node_start_line(n2);
+                                    let n1_line = get_node_start_line(n1, new_line_byte_pos);
+                                    let n2_line = get_node_start_line(n2, new_line_byte_pos);
                                     let same_line = n1_line == n2_line;
                                     same_line==(pred.operator.as_ref()=="same-line?")
                                 }
@@ -437,7 +450,7 @@ fn query_indents(
 
                         match node {
                             Some(node) => {
-                                let (start_line, end_line) = (get_node_start_line(node), get_node_end_line(node));
+                                let (start_line, end_line) = (get_node_start_line(node,new_line_byte_pos), get_node_end_line(node, new_line_byte_pos));
                                 let one_line = end_line == start_line;
                                 one_line != (pred.operator.as_ref() == "not-one-line?")
                             },
@@ -458,6 +471,11 @@ fn query_indents(
         }) {
             continue;
         }
+        // A list of pairs (node_id, indent_capture) that are added by this match.
+        // They cannot be added to indent_captures immediately since they may depend on other captures (such as an @anchor).
+        let mut added_indent_captures: Vec<(usize, IndentCapture)> = Vec::new();
+        // The row/column position of the optional anchor in this query
+        let mut anchor: Option<tree_sitter::Node> = None;
         for capture in m.captures {
             let capture_name = query.capture_names()[capture.index as usize].as_str();
             let capture_type = match capture_name {
@@ -465,6 +483,16 @@ fn query_indents(
                 "indent.always" => IndentCaptureType::IndentAlways,
                 "outdent" => IndentCaptureType::Outdent,
                 "outdent.always" => IndentCaptureType::OutdentAlways,
+                // The alignment will be updated to the correct value at the end, when the anchor is known.
+                "align" => IndentCaptureType::Align(String::from("")),
+                "anchor" => {
+                    if anchor.is_some() {
+                        log::error!("Invalid indent query: Encountered more than one @anchor in the same match.")
+                    } else {
+                        anchor = Some(capture.node);
+                    }
+                    continue;
+                }
                 "extend" => {
                     extend_captures
                         .entry(capture.node.id())
@@ -514,11 +542,41 @@ fn query_indents(
                     }
                 }
             }
+            added_indent_captures.push((capture.node.id(), indent_capture))
+        }
+        for (node_id, mut capture) in added_indent_captures {
+            // Set the anchor for all align queries.
+            if let IndentCaptureType::Align(_) = capture.capture_type {
+                let anchor = match anchor {
+                    None => {
+                        log::error!(
+                            "Invalid indent query: @align requires an accompanying @anchor."
+                        );
+                        continue;
+                    }
+                    Some(anchor) => anchor,
+                };
+                // Create a string of tabs & spaces that should have the same width
+                // as the string that precedes the anchor (independent of the tab width).
+                let mut align = String::new();
+                for grapheme in RopeGraphemes::new(
+                    text.line(anchor.start_position().row)
+                        .byte_slice(0..anchor.start_position().column),
+                ) {
+                    if grapheme == "\t" {
+                        align.push('\t');
+                    } else {
+                        align.extend(
+                            std::iter::repeat(' ').take(grapheme_width(&Cow::from(grapheme))),
+                        );
+                    }
+                }
+                capture.capture_type = IndentCaptureType::Align(align);
+            }
             indent_captures
-                .entry(capture.node.id())
-                // Most entries only need to contain a single IndentCapture
+                .entry(node_id)
                 .or_insert_with(|| Vec::with_capacity(1))
-                .push(indent_capture);
+                .push(capture);
         }
     }
 
@@ -648,6 +706,7 @@ pub fn treesitter_indent_for_pos(
     new_line: bool,
 ) -> Option<String> {
     let byte_pos = text.char_to_byte(pos);
+    let new_line_byte_pos = new_line.then_some(byte_pos);
     // The innermost tree-sitter node which is considered for the indent
     // computation. It may change if some predeceding node is extended
     let mut node = syntax
@@ -685,13 +744,13 @@ pub fn treesitter_indent_for_pos(
                 &mut cursor,
                 text,
                 query_range,
-                new_line.then_some((line, byte_pos)),
+                new_line_byte_pos,
             );
             ts_parser.cursors.push(cursor);
             (query_result, deepest_preceding)
         })
     };
-    let indent_captures = query_result.indent_captures;
+    let mut indent_captures = query_result.indent_captures;
     let extend_captures = query_result.extend_captures;
 
     // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -719,8 +778,10 @@ pub fn treesitter_indent_for_pos(
         // one entry for each ancestor of the node (which is what we iterate over)
         let is_first = *first_in_line.last().unwrap();
 
-        // Apply all indent definitions for this node
-        if let Some(definitions) = indent_captures.get(&node.id()) {
+        // Apply all indent definitions for this node.
+        // Since we only iterate over each node once, we can remove the
+        // corresponding captures from the HashMap to avoid cloning them.
+        if let Some(definitions) = indent_captures.remove(&node.id()) {
             for definition in definitions {
                 match definition.scope {
                     IndentScope::All => {
@@ -738,29 +799,19 @@ pub fn treesitter_indent_for_pos(
         }
 
         if let Some(parent) = node.parent() {
-            let mut node_line = node.start_position().row;
-            let mut parent_line = parent.start_position().row;
-
-            if node_line == line && new_line {
-                // Also consider the line that will be inserted
-                if node.start_byte() >= byte_pos {
-                    node_line += 1;
-                }
-                if parent.start_byte() >= byte_pos {
-                    parent_line += 1;
-                }
-            };
+            let node_line = get_node_start_line(node, new_line_byte_pos);
+            let parent_line = get_node_start_line(parent, new_line_byte_pos);
 
             if node_line != parent_line {
                 // Don't add indent for the line below the line of the query
                 if node_line < line + (new_line as usize) {
-                    result.add_line(&indent_for_line_below);
+                    result.add_line(indent_for_line_below);
                 }
 
                 if node_line == parent_line + 1 {
                     indent_for_line_below = indent_for_line;
                 } else {
-                    result.add_line(&indent_for_line);
+                    result.add_line(indent_for_line);
                     indent_for_line_below = Indentation::default();
                 }
 
@@ -775,14 +826,13 @@ pub fn treesitter_indent_for_pos(
             if (node.start_position().row < line)
                 || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)
             {
-                result.add_line(&indent_for_line_below);
+                result.add_line(indent_for_line_below);
             }
-
-            result.add_line(&indent_for_line);
+            result.add_line(indent_for_line);
             break;
         }
     }
-    Some(result.as_string(indent_style))
+    Some(result.into_string(indent_style))
 }
 
 /// Returns the indentation for a new line.

From 36a59e4482120e66980b7f8f260a174b82b9415d Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Fri, 11 Aug 2023 12:24:37 +0200
Subject: [PATCH 241/967] Improve C, Rust & Python indent queries & add @align
 captures.

---
 runtime/queries/c/indents.scm      |  6 ++-
 runtime/queries/python/indents.scm |  9 ++++
 runtime/queries/rust/indents.scm   | 71 +++++++++++++++++++++++++++++-
 3 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/c/indents.scm b/runtime/queries/c/indents.scm
index 812867854..058d80316 100644
--- a/runtime/queries/c/indents.scm
+++ b/runtime/queries/c/indents.scm
@@ -5,7 +5,6 @@
   (enumerator_list)
   (parameter_list)
   (init_declarator)
-  (case_statement)
   (expression_statement)
 ] @indent
 
@@ -13,6 +12,7 @@
   "case"
   "}"
   "]"
+  ")"
 ] @outdent
 
 (if_statement
@@ -32,3 +32,7 @@
   (_) @indent
   (#not-kind-eq? @indent "compound_statement")
   (#set! "scope" "all"))
+
+(parameter_list
+  . (parameter_declaration) @anchor
+  (#set! "scope" "tail")) @align
diff --git a/runtime/queries/python/indents.scm b/runtime/queries/python/indents.scm
index 835b40d39..67bc76ad5 100644
--- a/runtime/queries/python/indents.scm
+++ b/runtime/queries/python/indents.scm
@@ -73,3 +73,12 @@
 (else_clause
   "else" @outdent)
 
+(parameters
+  .
+  (identifier) @anchor
+  (#set! "scope" "tail")) @align
+(argument_list
+  .
+  (_) @anchor
+  (#set! "scope" "tail")) @align
+
diff --git a/runtime/queries/rust/indents.scm b/runtime/queries/rust/indents.scm
index 5c2c70d0c..af2e05e3b 100644
--- a/runtime/queries/rust/indents.scm
+++ b/runtime/queries/rust/indents.scm
@@ -14,9 +14,11 @@
   (call_expression)
   (binary_expression)
   (field_expression)
+  (await_expression)
   (tuple_expression)
   (array_expression)
   (where_clause)
+  (type_cast_expression)
 
   (token_tree)
   (macro_definition)
@@ -48,10 +50,16 @@
   (#set! "scope" "all")
 )
 (let_declaration
+  "let" @expr-start
+  value: (_) @indent
+  alternative: (_)? @indent
+  (#not-same-line? @indent @expr-start)
+  (#set! "scope" "all")
+)
+(let_condition
   .
   (_) @expr-start
   value: (_) @indent
-  alternative: (_)? @indent
   (#not-same-line? @indent @expr-start)
   (#set! "scope" "all")
 )
@@ -69,6 +77,22 @@
   (#not-same-line? @indent @expr-start)
   (#set! "scope" "all")
 )
+(field_pattern
+  .
+  (_) @expr-start
+  pattern: (_) @indent
+  (#not-same-line? @indent @expr-start)
+  (#set! "scope" "all")
+)
+; Indent type aliases that span multiple lines, similar to
+; regular assignment expressions
+(type_item
+  .
+  (_) @expr-start
+  type: (_) @indent
+  (#not-same-line? @indent @expr-start)
+  (#set! "scope" "all")
+)
 
 ; Some field expressions where the left part is a multiline expression are not
 ; indented by cargo fmt.
@@ -77,5 +101,48 @@
 (field_expression
   value: (_) @val
   "." @outdent
-  (#match? @val "(\\A[^\\n\\r]+\\([\\t ]*(\\n|\\r).*)|(\\A[^\\n\\r]*\\{[\\t ]*(\\n|\\r))")
+  ; Check whether the first line ends with `(`, `{` or `[` (up to whitespace).
+  (#match? @val "(\\A[^\\n\\r]+(\\(|\\{|\\[)[\\t ]*(\\n|\\r))")
+)
+; Same as above, but with an additional `call_expression`. This is required since otherwise
+; the arguments of the function call won't be outdented.
+(call_expression
+  function: (field_expression
+    value: (_) @val
+    "." @outdent
+    (#match? @val "(\\A[^\\n\\r]+(\\(|\\{|\\[)[\\t ]*(\\n|\\r))")
+  )
+  arguments: (_) @outdent
+)
+
+
+; Indent if guards in patterns.
+; Since the tree-sitter grammar doesn't create a node for the if expression,
+; it's not possible to do this correctly in all cases. Indenting the tail of the
+; whole pattern whenever it contains an `if` only fails if the `if` appears after
+; the second line of the pattern (which should only rarely be the case)
+(match_pattern
+  .
+  (_) @expr-start
+  "if" @pattern-guard
+  (#not-same-line? @expr-start @pattern-guard)
+) @indent
+
+; Align closure parameters if they span more than one line
+(closure_parameters
+  "|"
+  .
+  (_) @anchor
+  (_) @expr-end
+  .
+  (#not-same-line? @anchor @expr-end)
+) @align
+
+(for_expression
+  "in" @in
+  .
+  (_) @indent
+  (#not-same-line? @in @indent)
+  (#set! "scope" "all")
 )
+  

From 155cedc5c839dafcef32310dc53bdc20ec976535 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Thu, 3 Aug 2023 15:24:46 +0200
Subject: [PATCH 242/967] Fix broken indentation that causes the indentation
 tests to fail. For some reason, `cargo fmt` does not change the indentation
 in these places (maybe it isn't sure about what the correct formatting should
 be).

---
 helix-term/src/commands/typed.rs | 1176 +++++++++++++++---------------
 helix-term/src/keymap.rs         |   28 +-
 2 files changed, 602 insertions(+), 602 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 463bce259..1c65fd54a 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2298,594 +2298,594 @@ fn clear_register(
 }
 
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
-        TypableCommand {
-            name: "quit",
-            aliases: &["q"],
-            doc: "Close the current view.",
-            fun: quit,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "quit!",
-            aliases: &["q!"],
-            doc: "Force close the current view, ignoring unsaved changes.",
-            fun: force_quit,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "open",
-            aliases: &["o"],
-            doc: "Open a file from disk into the current view.",
-            fun: open,
-            signature: CommandSignature::all(completers::filename),
-        },
-        TypableCommand {
-            name: "buffer-close",
-            aliases: &["bc", "bclose"],
-            doc: "Close the current buffer.",
-            fun: buffer_close,
-            signature: CommandSignature::all(completers::buffer),
-        },
-        TypableCommand {
-            name: "buffer-close!",
-            aliases: &["bc!", "bclose!"],
-            doc: "Close the current buffer forcefully, ignoring unsaved changes.",
-            fun: force_buffer_close,
-            signature: CommandSignature::all(completers::buffer)
-        },
-        TypableCommand {
-            name: "buffer-close-others",
-            aliases: &["bco", "bcloseother"],
-            doc: "Close all buffers but the currently focused one.",
-            fun: buffer_close_others,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "buffer-close-others!",
-            aliases: &["bco!", "bcloseother!"],
-            doc: "Force close all buffers but the currently focused one.",
-            fun: force_buffer_close_others,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "buffer-close-all",
-            aliases: &["bca", "bcloseall"],
-            doc: "Close all buffers without quitting.",
-            fun: buffer_close_all,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "buffer-close-all!",
-            aliases: &["bca!", "bcloseall!"],
-            doc: "Force close all buffers ignoring unsaved changes without quitting.",
-            fun: force_buffer_close_all,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "buffer-next",
-            aliases: &["bn", "bnext"],
-            doc: "Goto next buffer.",
-            fun: buffer_next,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "buffer-previous",
-            aliases: &["bp", "bprev"],
-            doc: "Goto previous buffer.",
-            fun: buffer_previous,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "write",
-            aliases: &["w"],
-            doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
-            fun: write,
-            signature: CommandSignature::positional(&[completers::filename]),
-        },
-        TypableCommand {
-            name: "write!",
-            aliases: &["w!"],
-            doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",
-            fun: force_write,
-            signature: CommandSignature::positional(&[completers::filename]),
-        },
-        TypableCommand {
-            name: "write-buffer-close",
-            aliases: &["wbc"],
-            doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",
-            fun: write_buffer_close,
-            signature: CommandSignature::positional(&[completers::filename]),
-        },
-        TypableCommand {
-            name: "write-buffer-close!",
-            aliases: &["wbc!"],
-            doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",
-            fun: force_write_buffer_close,
-            signature: CommandSignature::positional(&[completers::filename]),
-        },
-        TypableCommand {
-            name: "new",
-            aliases: &["n"],
-            doc: "Create a new scratch buffer.",
-            fun: new_file,
-            // TODO: This seems to complete with a filename, but doesn't use that filename to
-            //       set the path of the newly created buffer.
-            signature: CommandSignature::positional(&[completers::filename]),
-        },
-        TypableCommand {
-            name: "format",
-            aliases: &["fmt"],
-            doc: "Format the file using the LSP formatter.",
-            fun: format,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "indent-style",
-            aliases: &[],
-            doc: "Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.)",
-            fun: set_indent_style,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "line-ending",
-            aliases: &[],
-            #[cfg(not(feature = "unicode-lines"))]
-            doc: "Set the document's default line ending. Options: crlf, lf.",
-            #[cfg(feature = "unicode-lines")]
-            doc: "Set the document's default line ending. Options: crlf, lf, cr, ff, nel.",
-            fun: set_line_ending,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "earlier",
-            aliases: &["ear"],
-            doc: "Jump back to an earlier point in edit history. Accepts a number of steps or a time span.",
-            fun: earlier,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "later",
-            aliases: &["lat"],
-            doc: "Jump to a later point in edit history. Accepts a number of steps or a time span.",
-            fun: later,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "write-quit",
-            aliases: &["wq", "x"],
-            doc: "Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt)",
-            fun: write_quit,
-            signature: CommandSignature::positional(&[completers::filename]),
-        },
-        TypableCommand {
-            name: "write-quit!",
-            aliases: &["wq!", "x!"],
-            doc: "Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt)",
-            fun: force_write_quit,
-            signature: CommandSignature::positional(&[completers::filename]),
-        },
-        TypableCommand {
-            name: "write-all",
-            aliases: &["wa"],
-            doc: "Write changes from all buffers to disk.",
-            fun: write_all,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "write-all!",
-            aliases: &["wa!"],
-            doc: "Forcefully write changes from all buffers to disk creating necessary subdirectories.",
-            fun: force_write_all,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "write-quit-all",
-            aliases: &["wqa", "xa"],
-            doc: "Write changes from all buffers to disk and close all views.",
-            fun: write_all_quit,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "write-quit-all!",
-            aliases: &["wqa!", "xa!"],
-            doc: "Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes).",
-            fun: force_write_all_quit,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "quit-all",
-            aliases: &["qa"],
-            doc: "Close all views.",
-            fun: quit_all,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "quit-all!",
-            aliases: &["qa!"],
-            doc: "Force close all views ignoring unsaved changes.",
-            fun: force_quit_all,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "cquit",
-            aliases: &["cq"],
-            doc: "Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2).",
-            fun: cquit,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "cquit!",
-            aliases: &["cq!"],
-            doc: "Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2).",
-            fun: force_cquit,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "theme",
-            aliases: &[],
-            doc: "Change the editor theme (show current theme if no name specified).",
-            fun: theme,
-            signature: CommandSignature::positional(&[completers::theme]),
-        },
-        TypableCommand {
-            name: "yank-join",
-            aliases: &[],
-            doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
-            fun: yank_joined,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "clipboard-yank",
-            aliases: &[],
-            doc: "Yank main selection into system clipboard.",
-            fun: yank_main_selection_to_clipboard,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "clipboard-yank-join",
-            aliases: &[],
-            doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
-            fun: yank_joined_to_clipboard,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "primary-clipboard-yank",
-            aliases: &[],
-            doc: "Yank main selection into system primary clipboard.",
-            fun: yank_main_selection_to_primary_clipboard,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "primary-clipboard-yank-join",
-            aliases: &[],
-            doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
-            fun: yank_joined_to_primary_clipboard,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "clipboard-paste-after",
-            aliases: &[],
-            doc: "Paste system clipboard after selections.",
-            fun: paste_clipboard_after,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "clipboard-paste-before",
-            aliases: &[],
-            doc: "Paste system clipboard before selections.",
-            fun: paste_clipboard_before,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "clipboard-paste-replace",
-            aliases: &[],
-            doc: "Replace selections with content of system clipboard.",
-            fun: replace_selections_with_clipboard,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "primary-clipboard-paste-after",
-            aliases: &[],
-            doc: "Paste primary clipboard after selections.",
-            fun: paste_primary_clipboard_after,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "primary-clipboard-paste-before",
-            aliases: &[],
-            doc: "Paste primary clipboard before selections.",
-            fun: paste_primary_clipboard_before,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "primary-clipboard-paste-replace",
-            aliases: &[],
-            doc: "Replace selections with content of system primary clipboard.",
-            fun: replace_selections_with_primary_clipboard,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "show-clipboard-provider",
-            aliases: &[],
-            doc: "Show clipboard provider name in status bar.",
-            fun: show_clipboard_provider,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "change-current-directory",
-            aliases: &["cd"],
-            doc: "Change the current working directory.",
-            fun: change_current_directory,
-            signature: CommandSignature::positional(&[completers::directory]),
-        },
-        TypableCommand {
-            name: "show-directory",
-            aliases: &["pwd"],
-            doc: "Show the current working directory.",
-            fun: show_current_directory,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "encoding",
-            aliases: &[],
-            doc: "Set encoding. Based on `https://encoding.spec.whatwg.org`.",
-            fun: set_encoding,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "character-info",
-            aliases: &["char"],
-            doc: "Get info about the character under the primary cursor.",
-            fun: get_character_info,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "reload",
-            aliases: &["rl"],
-            doc: "Discard changes and reload from the source file.",
-            fun: reload,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "reload-all",
-            aliases: &["rla"],
-            doc: "Discard changes and reload all documents from the source files.",
-            fun: reload_all,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "update",
-            aliases: &["u"],
-            doc: "Write changes only if the file has been modified.",
-            fun: update,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "lsp-workspace-command",
-            aliases: &[],
-            doc: "Open workspace command picker",
-            fun: lsp_workspace_command,
-            signature: CommandSignature::positional(&[completers::lsp_workspace_command]),
-        },
-        TypableCommand {
-            name: "lsp-restart",
-            aliases: &[],
-            doc: "Restarts the language servers used by the current doc",
-            fun: lsp_restart,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "lsp-stop",
-            aliases: &[],
-            doc: "Stops the language servers that are used by the current doc",
-            fun: lsp_stop,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "tree-sitter-scopes",
-            aliases: &[],
-            doc: "Display tree sitter scopes, primarily for theming and development.",
-            fun: tree_sitter_scopes,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "debug-start",
-            aliases: &["dbg"],
-            doc: "Start a debug session from a given template with given parameters.",
-            fun: debug_start,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "debug-remote",
-            aliases: &["dbg-tcp"],
-            doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
-            fun: debug_remote,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "debug-eval",
-            aliases: &[],
-            doc: "Evaluate expression in current debug context.",
-            fun: debug_eval,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "vsplit",
-            aliases: &["vs"],
-            doc: "Open the file in a vertical split.",
-            fun: vsplit,
-            signature: CommandSignature::all(completers::filename)
-        },
-        TypableCommand {
-            name: "vsplit-new",
-            aliases: &["vnew"],
-            doc: "Open a scratch buffer in a vertical split.",
-            fun: vsplit_new,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "hsplit",
-            aliases: &["hs", "sp"],
-            doc: "Open the file in a horizontal split.",
-            fun: hsplit,
-            signature: CommandSignature::all(completers::filename)
-        },
-        TypableCommand {
-            name: "hsplit-new",
-            aliases: &["hnew"],
-            doc: "Open a scratch buffer in a horizontal split.",
-            fun: hsplit_new,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "tutor",
-            aliases: &[],
-            doc: "Open the tutorial.",
-            fun: tutor,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "goto",
-            aliases: &["g"],
-            doc: "Goto line number.",
-            fun: goto_line_number,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "set-language",
-            aliases: &["lang"],
-            doc: "Set the language of current buffer (show current language if no value specified).",
-            fun: language,
-            signature: CommandSignature::positional(&[completers::language]),
-        },
-        TypableCommand {
-            name: "set-option",
-            aliases: &["set"],
-            doc: "Set a config option at runtime.\nFor example to disable smart case search, use `:set search.smart-case false`.",
-            fun: set_option,
-            // TODO: Add support for completion of the options value(s), when appropriate.
-            signature: CommandSignature::positional(&[completers::setting]),
-        },
-        TypableCommand {
-            name: "toggle-option",
-            aliases: &["toggle"],
-            doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
-            fun: toggle_option,
-            signature: CommandSignature::positional(&[completers::setting]),
-        },
-        TypableCommand {
-            name: "get-option",
-            aliases: &["get"],
-            doc: "Get the current value of a config option.",
-            fun: get_option,
-            signature: CommandSignature::positional(&[completers::setting]),
-        },
-        TypableCommand {
-            name: "sort",
-            aliases: &[],
-            doc: "Sort ranges in selection.",
-            fun: sort,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "rsort",
-            aliases: &[],
-            doc: "Sort ranges in selection in reverse order.",
-            fun: sort_reverse,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "reflow",
-            aliases: &[],
-            doc: "Hard-wrap the current selection of lines to a given width.",
-            fun: reflow,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "tree-sitter-subtree",
-            aliases: &["ts-subtree"],
-            doc: "Display tree sitter subtree under cursor, primarily for debugging queries.",
-            fun: tree_sitter_subtree,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "config-reload",
-            aliases: &[],
-            doc: "Refresh user config.",
-            fun: refresh_config,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "config-open",
-            aliases: &[],
-            doc: "Open the user config.toml file.",
-            fun: open_config,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "config-open-workspace",
-            aliases: &[],
-            doc: "Open the workspace config.toml file.",
-            fun: open_workspace_config,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "log-open",
-            aliases: &[],
-            doc: "Open the helix log file.",
-            fun: open_log,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "insert-output",
-            aliases: &[],
-            doc: "Run shell command, inserting output before each selection.",
-            fun: insert_output,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "append-output",
-            aliases: &[],
-            doc: "Run shell command, appending output after each selection.",
-            fun: append_output,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "pipe",
-            aliases: &[],
-            doc: "Pipe each selection to the shell command.",
-            fun: pipe,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "pipe-to",
-            aliases: &[],
-            doc: "Pipe each selection to the shell command, ignoring output.",
-            fun: pipe_to,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "run-shell-command",
-            aliases: &["sh"],
-            doc: "Run a shell command",
-            fun: run_shell_command,
-            signature: CommandSignature::all(completers::filename)
-        },
-       TypableCommand {
-            name: "reset-diff-change",
-            aliases: &["diffget", "diffg"],
-            doc: "Reset the diff change at the cursor position.",
-            fun: reset_diff_change,
-            signature: CommandSignature::none(),
-        },
-        TypableCommand {
-            name: "clear-register",
-            aliases: &[],
-            doc: "Clear given register. If no argument is provided, clear all registers.",
-            fun: clear_register,
-            signature: CommandSignature::none(),
-        },
-    ];
+    TypableCommand {
+        name: "quit",
+        aliases: &["q"],
+        doc: "Close the current view.",
+        fun: quit,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "quit!",
+        aliases: &["q!"],
+        doc: "Force close the current view, ignoring unsaved changes.",
+        fun: force_quit,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "open",
+        aliases: &["o"],
+        doc: "Open a file from disk into the current view.",
+        fun: open,
+        signature: CommandSignature::all(completers::filename),
+    },
+    TypableCommand {
+        name: "buffer-close",
+        aliases: &["bc", "bclose"],
+        doc: "Close the current buffer.",
+        fun: buffer_close,
+        signature: CommandSignature::all(completers::buffer),
+    },
+    TypableCommand {
+        name: "buffer-close!",
+        aliases: &["bc!", "bclose!"],
+        doc: "Close the current buffer forcefully, ignoring unsaved changes.",
+        fun: force_buffer_close,
+        signature: CommandSignature::all(completers::buffer)
+    },
+    TypableCommand {
+        name: "buffer-close-others",
+        aliases: &["bco", "bcloseother"],
+        doc: "Close all buffers but the currently focused one.",
+        fun: buffer_close_others,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "buffer-close-others!",
+        aliases: &["bco!", "bcloseother!"],
+        doc: "Force close all buffers but the currently focused one.",
+        fun: force_buffer_close_others,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "buffer-close-all",
+        aliases: &["bca", "bcloseall"],
+        doc: "Close all buffers without quitting.",
+        fun: buffer_close_all,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "buffer-close-all!",
+        aliases: &["bca!", "bcloseall!"],
+        doc: "Force close all buffers ignoring unsaved changes without quitting.",
+        fun: force_buffer_close_all,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "buffer-next",
+        aliases: &["bn", "bnext"],
+        doc: "Goto next buffer.",
+        fun: buffer_next,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "buffer-previous",
+        aliases: &["bp", "bprev"],
+        doc: "Goto previous buffer.",
+        fun: buffer_previous,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "write",
+        aliases: &["w"],
+        doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
+        fun: write,
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
+    TypableCommand {
+        name: "write!",
+        aliases: &["w!"],
+        doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",
+        fun: force_write,
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
+    TypableCommand {
+        name: "write-buffer-close",
+        aliases: &["wbc"],
+        doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",
+        fun: write_buffer_close,
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
+    TypableCommand {
+        name: "write-buffer-close!",
+        aliases: &["wbc!"],
+        doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",
+        fun: force_write_buffer_close,
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
+    TypableCommand {
+        name: "new",
+        aliases: &["n"],
+        doc: "Create a new scratch buffer.",
+        fun: new_file,
+        // TODO: This seems to complete with a filename, but doesn't use that filename to
+        //       set the path of the newly created buffer.
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
+    TypableCommand {
+        name: "format",
+        aliases: &["fmt"],
+        doc: "Format the file using the LSP formatter.",
+        fun: format,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "indent-style",
+        aliases: &[],
+        doc: "Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.)",
+        fun: set_indent_style,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "line-ending",
+        aliases: &[],
+        #[cfg(not(feature = "unicode-lines"))]
+        doc: "Set the document's default line ending. Options: crlf, lf.",
+        #[cfg(feature = "unicode-lines")]
+        doc: "Set the document's default line ending. Options: crlf, lf, cr, ff, nel.",
+        fun: set_line_ending,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "earlier",
+        aliases: &["ear"],
+        doc: "Jump back to an earlier point in edit history. Accepts a number of steps or a time span.",
+        fun: earlier,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "later",
+        aliases: &["lat"],
+        doc: "Jump to a later point in edit history. Accepts a number of steps or a time span.",
+        fun: later,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "write-quit",
+        aliases: &["wq", "x"],
+        doc: "Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt)",
+        fun: write_quit,
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
+    TypableCommand {
+        name: "write-quit!",
+        aliases: &["wq!", "x!"],
+        doc: "Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt)",
+        fun: force_write_quit,
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
+    TypableCommand {
+        name: "write-all",
+        aliases: &["wa"],
+        doc: "Write changes from all buffers to disk.",
+        fun: write_all,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "write-all!",
+        aliases: &["wa!"],
+        doc: "Forcefully write changes from all buffers to disk creating necessary subdirectories.",
+        fun: force_write_all,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "write-quit-all",
+        aliases: &["wqa", "xa"],
+        doc: "Write changes from all buffers to disk and close all views.",
+        fun: write_all_quit,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "write-quit-all!",
+        aliases: &["wqa!", "xa!"],
+        doc: "Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes).",
+        fun: force_write_all_quit,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "quit-all",
+        aliases: &["qa"],
+        doc: "Close all views.",
+        fun: quit_all,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "quit-all!",
+        aliases: &["qa!"],
+        doc: "Force close all views ignoring unsaved changes.",
+        fun: force_quit_all,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "cquit",
+        aliases: &["cq"],
+        doc: "Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2).",
+        fun: cquit,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "cquit!",
+        aliases: &["cq!"],
+        doc: "Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2).",
+        fun: force_cquit,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "theme",
+        aliases: &[],
+        doc: "Change the editor theme (show current theme if no name specified).",
+        fun: theme,
+        signature: CommandSignature::positional(&[completers::theme]),
+    },
+    TypableCommand {
+        name: "yank-join",
+        aliases: &[],
+        doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
+        fun: yank_joined,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "clipboard-yank",
+        aliases: &[],
+        doc: "Yank main selection into system clipboard.",
+        fun: yank_main_selection_to_clipboard,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "clipboard-yank-join",
+        aliases: &[],
+        doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
+        fun: yank_joined_to_clipboard,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "primary-clipboard-yank",
+        aliases: &[],
+        doc: "Yank main selection into system primary clipboard.",
+        fun: yank_main_selection_to_primary_clipboard,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "primary-clipboard-yank-join",
+        aliases: &[],
+        doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
+        fun: yank_joined_to_primary_clipboard,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "clipboard-paste-after",
+        aliases: &[],
+        doc: "Paste system clipboard after selections.",
+        fun: paste_clipboard_after,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "clipboard-paste-before",
+        aliases: &[],
+        doc: "Paste system clipboard before selections.",
+        fun: paste_clipboard_before,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "clipboard-paste-replace",
+        aliases: &[],
+        doc: "Replace selections with content of system clipboard.",
+        fun: replace_selections_with_clipboard,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "primary-clipboard-paste-after",
+        aliases: &[],
+        doc: "Paste primary clipboard after selections.",
+        fun: paste_primary_clipboard_after,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "primary-clipboard-paste-before",
+        aliases: &[],
+        doc: "Paste primary clipboard before selections.",
+        fun: paste_primary_clipboard_before,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "primary-clipboard-paste-replace",
+        aliases: &[],
+        doc: "Replace selections with content of system primary clipboard.",
+        fun: replace_selections_with_primary_clipboard,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "show-clipboard-provider",
+        aliases: &[],
+        doc: "Show clipboard provider name in status bar.",
+        fun: show_clipboard_provider,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "change-current-directory",
+        aliases: &["cd"],
+        doc: "Change the current working directory.",
+        fun: change_current_directory,
+        signature: CommandSignature::positional(&[completers::directory]),
+    },
+    TypableCommand {
+        name: "show-directory",
+        aliases: &["pwd"],
+        doc: "Show the current working directory.",
+        fun: show_current_directory,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "encoding",
+        aliases: &[],
+        doc: "Set encoding. Based on `https://encoding.spec.whatwg.org`.",
+        fun: set_encoding,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "character-info",
+        aliases: &["char"],
+        doc: "Get info about the character under the primary cursor.",
+        fun: get_character_info,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "reload",
+        aliases: &["rl"],
+        doc: "Discard changes and reload from the source file.",
+        fun: reload,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "reload-all",
+        aliases: &["rla"],
+        doc: "Discard changes and reload all documents from the source files.",
+        fun: reload_all,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "update",
+        aliases: &["u"],
+        doc: "Write changes only if the file has been modified.",
+        fun: update,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "lsp-workspace-command",
+        aliases: &[],
+        doc: "Open workspace command picker",
+        fun: lsp_workspace_command,
+        signature: CommandSignature::positional(&[completers::lsp_workspace_command]),
+    },
+    TypableCommand {
+        name: "lsp-restart",
+        aliases: &[],
+        doc: "Restarts the language servers used by the current doc",
+        fun: lsp_restart,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "lsp-stop",
+        aliases: &[],
+        doc: "Stops the language servers that are used by the current doc",
+        fun: lsp_stop,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "tree-sitter-scopes",
+        aliases: &[],
+        doc: "Display tree sitter scopes, primarily for theming and development.",
+        fun: tree_sitter_scopes,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "debug-start",
+        aliases: &["dbg"],
+        doc: "Start a debug session from a given template with given parameters.",
+        fun: debug_start,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "debug-remote",
+        aliases: &["dbg-tcp"],
+        doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
+        fun: debug_remote,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "debug-eval",
+        aliases: &[],
+        doc: "Evaluate expression in current debug context.",
+        fun: debug_eval,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "vsplit",
+        aliases: &["vs"],
+        doc: "Open the file in a vertical split.",
+        fun: vsplit,
+        signature: CommandSignature::all(completers::filename)
+    },
+    TypableCommand {
+        name: "vsplit-new",
+        aliases: &["vnew"],
+        doc: "Open a scratch buffer in a vertical split.",
+        fun: vsplit_new,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "hsplit",
+        aliases: &["hs", "sp"],
+        doc: "Open the file in a horizontal split.",
+        fun: hsplit,
+        signature: CommandSignature::all(completers::filename)
+    },
+    TypableCommand {
+        name: "hsplit-new",
+        aliases: &["hnew"],
+        doc: "Open a scratch buffer in a horizontal split.",
+        fun: hsplit_new,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "tutor",
+        aliases: &[],
+        doc: "Open the tutorial.",
+        fun: tutor,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "goto",
+        aliases: &["g"],
+        doc: "Goto line number.",
+        fun: goto_line_number,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "set-language",
+        aliases: &["lang"],
+        doc: "Set the language of current buffer (show current language if no value specified).",
+        fun: language,
+        signature: CommandSignature::positional(&[completers::language]),
+    },
+    TypableCommand {
+        name: "set-option",
+        aliases: &["set"],
+        doc: "Set a config option at runtime.\nFor example to disable smart case search, use `:set search.smart-case false`.",
+        fun: set_option,
+        // TODO: Add support for completion of the options value(s), when appropriate.
+        signature: CommandSignature::positional(&[completers::setting]),
+    },
+    TypableCommand {
+        name: "toggle-option",
+        aliases: &["toggle"],
+        doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
+        fun: toggle_option,
+        signature: CommandSignature::positional(&[completers::setting]),
+    },
+    TypableCommand {
+        name: "get-option",
+        aliases: &["get"],
+        doc: "Get the current value of a config option.",
+        fun: get_option,
+        signature: CommandSignature::positional(&[completers::setting]),
+    },
+    TypableCommand {
+        name: "sort",
+        aliases: &[],
+        doc: "Sort ranges in selection.",
+        fun: sort,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "rsort",
+        aliases: &[],
+        doc: "Sort ranges in selection in reverse order.",
+        fun: sort_reverse,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "reflow",
+        aliases: &[],
+        doc: "Hard-wrap the current selection of lines to a given width.",
+        fun: reflow,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "tree-sitter-subtree",
+        aliases: &["ts-subtree"],
+        doc: "Display tree sitter subtree under cursor, primarily for debugging queries.",
+        fun: tree_sitter_subtree,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "config-reload",
+        aliases: &[],
+        doc: "Refresh user config.",
+        fun: refresh_config,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "config-open",
+        aliases: &[],
+        doc: "Open the user config.toml file.",
+        fun: open_config,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "config-open-workspace",
+        aliases: &[],
+        doc: "Open the workspace config.toml file.",
+        fun: open_workspace_config,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "log-open",
+        aliases: &[],
+        doc: "Open the helix log file.",
+        fun: open_log,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "insert-output",
+        aliases: &[],
+        doc: "Run shell command, inserting output before each selection.",
+        fun: insert_output,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "append-output",
+        aliases: &[],
+        doc: "Run shell command, appending output after each selection.",
+        fun: append_output,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "pipe",
+        aliases: &[],
+        doc: "Pipe each selection to the shell command.",
+        fun: pipe,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "pipe-to",
+        aliases: &[],
+        doc: "Pipe each selection to the shell command, ignoring output.",
+        fun: pipe_to,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "run-shell-command",
+        aliases: &["sh"],
+        doc: "Run a shell command",
+        fun: run_shell_command,
+        signature: CommandSignature::all(completers::filename)
+    },
+    TypableCommand {
+        name: "reset-diff-change",
+        aliases: &["diffget", "diffg"],
+        doc: "Reset the diff change at the cursor position.",
+        fun: reset_diff_change,
+        signature: CommandSignature::none(),
+    },
+    TypableCommand {
+        name: "clear-register",
+        aliases: &[],
+        doc: "Clear given register. If no argument is provided, clear all registers.",
+        fun: clear_register,
+        signature: CommandSignature::none(),
+    },
+];
 
 pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
     Lazy::new(|| {
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 5a72a35a5..598be55b5 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -401,14 +401,14 @@ mod tests {
     fn merge_partial_keys() {
         let keymap = hashmap! {
             Mode::Normal => keymap!({ "Normal mode"
-                    "i" => normal_mode,
-                    "无" => insert_mode,
-                    "z" => jump_backward,
-                    "g" => { "Merge into goto mode"
-                        "$" => goto_line_end,
-                        "g" => delete_char_forward,
-                    },
-                })
+                "i" => normal_mode,
+                "无" => insert_mode,
+                "z" => jump_backward,
+                "g" => { "Merge into goto mode"
+                    "$" => goto_line_end,
+                    "g" => delete_char_forward,
+                },
+            })
         };
         let mut merged_keyamp = default();
         merge_keys(&mut merged_keyamp, keymap.clone());
@@ -474,13 +474,13 @@ mod tests {
     fn order_should_be_set() {
         let keymap = hashmap! {
             Mode::Normal => keymap!({ "Normal mode"
-                    "space" => { ""
-                        "s" => { ""
-                            "v" => vsplit,
-                            "c" => hsplit,
-                        },
+                "space" => { ""
+                    "s" => { ""
+                        "v" => vsplit,
+                        "c" => hsplit,
                     },
-                })
+                },
+            })
         };
         let mut merged_keyamp = default();
         merge_keys(&mut merged_keyamp, keymap.clone());

From b315901cbb137fd1b2f79bb9c1f10a1bef5b7f38 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Fri, 11 Aug 2023 12:26:27 +0200
Subject: [PATCH 243/967] Run indentation tests on a part of the Helix source
 code. Add C++ indent test file.

---
 helix-core/tests/data/indent/cpp.cpp        |  48 ++++++
 helix-core/tests/data/indent/indent.rs      |   1 -
 helix-core/tests/data/indent/languages.toml |  13 ++
 helix-core/tests/indent.rs                  | 172 +++++++++++++++++---
 4 files changed, 211 insertions(+), 23 deletions(-)
 create mode 100644 helix-core/tests/data/indent/cpp.cpp
 delete mode 120000 helix-core/tests/data/indent/indent.rs

diff --git a/helix-core/tests/data/indent/cpp.cpp b/helix-core/tests/data/indent/cpp.cpp
new file mode 100644
index 000000000..6e7f3a88d
--- /dev/null
+++ b/helix-core/tests/data/indent/cpp.cpp
@@ -0,0 +1,48 @@
+std::vector<std::string>
+fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
+                        char* parm5, bool parm6);
+
+std::vector<std::string>
+fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
+                        char* parm5, bool parm6) {
+  auto lambda = []() {
+    return 0;
+  };
+  auto lambda_with_a_really_long_name_that_uses_a_whole_line
+    = [](int some_more_aligned_parameters,
+         std::string parm2) {
+      do_smth();
+    };
+  if (brace_on_same_line) {
+    do_smth();
+  } else if (brace_on_next_line)
+  {
+    do_smth();
+  } else if (another_condition) {
+    do_smth();
+  }
+  else {
+    do_smth();
+  }
+  if (inline_if_statement)
+    do_smth();
+  if (another_inline_if_statement)
+    return [](int parm1, char* parm2) {
+      this_is_a_really_pointless_lambda();
+    };
+
+  switch (var) {
+  case true:
+    return -1;
+  case false:
+    return 42;
+  }
+}
+
+class MyClass : public MyBaseClass {
+public:
+  MyClass();
+  void public_fn();
+private:
+  super_secret_private_fn();
+}
diff --git a/helix-core/tests/data/indent/indent.rs b/helix-core/tests/data/indent/indent.rs
deleted file mode 120000
index 2ac16cf96..000000000
--- a/helix-core/tests/data/indent/indent.rs
+++ /dev/null
@@ -1 +0,0 @@
-../../../src/indent.rs
\ No newline at end of file
diff --git a/helix-core/tests/data/indent/languages.toml b/helix-core/tests/data/indent/languages.toml
index 3206f124d..fa02e451d 100644
--- a/helix-core/tests/data/indent/languages.toml
+++ b/helix-core/tests/data/indent/languages.toml
@@ -11,3 +11,16 @@ indent = { tab-width = 4, unit = "    " }
 [[grammar]]
 name = "rust"
 source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
+
+[[language]]
+name = "cpp"
+scope = "source.cpp"
+injection-regex = "cpp"
+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H"]
+roots = []
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "cpp"
+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1" }
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index 1dec99894..26010c906 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -1,20 +1,122 @@
 use helix_core::{
     indent::{indent_level_for_line, treesitter_indent_for_pos, IndentStyle},
-    syntax::Loader,
+    syntax::{Configuration, Loader},
     Syntax,
 };
-use std::path::PathBuf;
+use ropey::Rope;
+use std::{ops::Range, path::PathBuf, process::Command};
 
 #[test]
 fn test_treesitter_indent_rust() {
-    test_treesitter_indent("rust.rs", "source.rust");
+    standard_treesitter_test("rust.rs", "source.rust");
 }
+
+#[test]
+fn test_treesitter_indent_cpp() {
+    standard_treesitter_test("cpp.cpp", "source.cpp");
+}
+
 #[test]
-fn test_treesitter_indent_rust_2() {
-    test_treesitter_indent("indent.rs", "source.rust");
-    // TODO Use commands.rs as indentation test.
-    // Currently this fails because we can't align the parameters of a closure yet
-    // test_treesitter_indent("commands.rs", "source.rust");
+fn test_treesitter_indent_rust_helix() {
+    // We pin a specific git revision to prevent unrelated changes from causing the indent tests to fail.
+    // Ideally, someone updates this once in a while and fixes any errors that occur.
+    let rev = "af382768cdaf89ff547dbd8f644a1bddd90e7c8f";
+    let files = Command::new("git")
+        .args([
+            "ls-tree",
+            "-r",
+            "--name-only",
+            "--full-tree",
+            rev,
+            "helix-term/src",
+        ])
+        .output()
+        .unwrap();
+    let files = String::from_utf8(files.stdout).unwrap();
+
+    let ignored_files = vec![
+        // Contains many macros that tree-sitter does not parse in a meaningful way and is otherwise not very interesting
+        "helix-term/src/health.rs",
+    ];
+
+    for file in files.split_whitespace() {
+        if ignored_files.contains(&file) {
+            continue;
+        }
+        let ignored_lines: Vec<Range<usize>> = match file {
+            "helix-term/src/application.rs" => vec![
+                // We can't handle complicated indent rules inside macros (`json!` in this case) since
+                // the tree-sitter grammar only parses them as `token_tree` and `identifier` nodes.
+                1045..1051,
+            ],
+            "helix-term/src/commands.rs" => vec![
+                // This is broken because of the current handling of `call_expression`
+                // (i.e. having an indent query for it but outdenting again in specific cases).
+                // The indent query is needed to correctly handle multi-line arguments in function calls
+                // inside indented `field_expression` nodes (which occurs fairly often).
+                //
+                // Once we have the `@indent.always` capture type, it might be possible to just have an indent
+                // capture for the `arguments` field of a call expression. That could enable us to correctly
+                // handle this.
+                2226..2230,
+            ],
+            "helix-term/src/commands/dap.rs" => vec![
+                // Complex `format!` macro
+                46..52,
+            ],
+            "helix-term/src/commands/lsp.rs" => vec![
+                // Macro
+                624..627,
+                // Return type declaration of a closure. `cargo fmt` adds an additional space here,
+                // which we cannot (yet) model with our indent queries.
+                878..879,
+                // Same as in `helix-term/src/commands.rs`
+                1335..1343,
+            ],
+            "helix-term/src/config.rs" => vec![
+                // Multiline string
+                146..152,
+            ],
+            "helix-term/src/keymap.rs" => vec![
+                // Complex macro (see above)
+                456..470,
+                // Multiline string without indent
+                563..567,
+            ],
+            "helix-term/src/main.rs" => vec![
+                // Multiline string
+                44..70,
+            ],
+            "helix-term/src/ui/completion.rs" => vec![
+                // Macro
+                218..232,
+            ],
+            "helix-term/src/ui/editor.rs" => vec![
+                // The chained function calls here are not indented, probably because of the comment
+                // in between. Since `cargo fmt` doesn't even attempt to format it, there's probably
+                // no point in trying to indent this correctly.
+                342..350,
+            ],
+            "helix-term/src/ui/lsp.rs" => vec![
+                // Macro
+                56..61,
+            ],
+            "helix-term/src/ui/statusline.rs" => vec![
+                // Same as in `helix-term/src/commands.rs`
+                436..442,
+                450..456,
+            ],
+            _ => Vec::new(),
+        };
+
+        let git_object = rev.to_string() + ":" + file;
+        let content = Command::new("git")
+            .args(["cat-file", "blob", &git_object])
+            .output()
+            .unwrap();
+        let doc = Rope::from_reader(&mut content.stdout.as_slice()).unwrap();
+        test_treesitter_indent(file, doc, "source.rust", ignored_lines);
+    }
 }
 
 #[test]
@@ -50,20 +152,41 @@ fn test_indent_level_for_line_with_spaces_and_tabs() {
     assert_eq!(indent_level, 2)
 }
 
-fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
+fn indent_tests_dir() -> PathBuf {
     let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     test_dir.push("tests/data/indent");
+    test_dir
+}
+
+fn indent_test_path(name: &str) -> PathBuf {
+    let mut path = indent_tests_dir();
+    path.push(name);
+    path
+}
 
-    let mut test_file = test_dir.clone();
-    test_file.push(file_name);
-    let test_file = std::fs::File::open(test_file).unwrap();
+fn indent_tests_config() -> Configuration {
+    let mut config_path = indent_tests_dir();
+    config_path.push("languages.toml");
+    let config = std::fs::read_to_string(config_path).unwrap();
+    toml::from_str(&config).unwrap()
+}
+
+fn standard_treesitter_test(file_name: &str, lang_scope: &str) {
+    let test_path = indent_test_path(file_name);
+    let test_file = std::fs::File::open(test_path).unwrap();
     let doc = ropey::Rope::from_reader(test_file).unwrap();
+    test_treesitter_indent(file_name, doc, lang_scope, Vec::new())
+}
 
-    let mut config_file = test_dir;
-    config_file.push("languages.toml");
-    let config = std::fs::read_to_string(config_file).unwrap();
-    let config = toml::from_str(&config).unwrap();
-    let loader = Loader::new(config);
+/// Test that all the lines in the given file are indented as expected.
+/// ignored_lines is a list of (1-indexed) line ranges that are excluded from this test.
+fn test_treesitter_indent(
+    test_name: &str,
+    doc: Rope,
+    lang_scope: &str,
+    ignored_lines: Vec<std::ops::Range<usize>>,
+) {
+    let loader = Loader::new(indent_tests_config());
 
     // set runtime path so we can find the queries
     let mut runtime = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -71,6 +194,7 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
     std::env::set_var("HELIX_RUNTIME", runtime.to_str().unwrap());
 
     let language_config = loader.language_config_for_scope(lang_scope).unwrap();
+    let indent_style = IndentStyle::from_str(&language_config.indent.as_ref().unwrap().unit);
     let highlight_config = language_config.highlight_config(&[]).unwrap();
     let text = doc.slice(..);
     let syntax = Syntax::new(text, highlight_config, std::sync::Arc::new(loader)).unwrap();
@@ -78,14 +202,17 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
 
     for i in 0..doc.len_lines() {
         let line = text.line(i);
+        if ignored_lines.iter().any(|range| range.contains(&(i + 1))) {
+            continue;
+        }
         if let Some(pos) = helix_core::find_first_non_whitespace_char(line) {
-            let tab_and_indent_width: usize = 4;
+            let tab_width: usize = 4;
             let suggested_indent = treesitter_indent_for_pos(
                 indent_query,
                 &syntax,
-                &IndentStyle::Spaces(tab_and_indent_width as u8),
-                tab_and_indent_width,
-                tab_and_indent_width,
+                &indent_style,
+                tab_width,
+                indent_style.indent_width(tab_width),
                 text,
                 i,
                 text.line_to_char(i) + pos,
@@ -94,7 +221,8 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
             .unwrap();
             assert!(
                 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
-                "Wrong indentation on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
+                "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
+                test_name,
                 i+1,
                 line.slice(..line.len_chars()-1),
                 suggested_indent,

From ee3171cc54052bc8d3569cc04bd9f6a57b43afca Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Fri, 11 Aug 2023 13:12:23 +0200
Subject: [PATCH 244/967] Document @align indent capture.

---
 book/src/guides/indent.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/book/src/guides/indent.md b/book/src/guides/indent.md
index 0b0e3938d..bd037bb05 100644
--- a/book/src/guides/indent.md
+++ b/book/src/guides/indent.md
@@ -71,6 +71,12 @@ level for the line.
   ignored.
 - `@outdent.always` (default scope `all`):
   Decrease the indent level by 1. The same rules as for `@indent.always` apply.
+- `@align` (default scope `all`):
+  Align everything inside this node to some anchor. The anchor is given
+  by the start of the node captured by `@anchor` in the same pattern.
+  Every pattern with an `@align` should contain exactly one `@anchor`.
+  Indent (and outdent) for nodes below (in terms of their starting line)
+  the `@align` node is added to the indentation required for alignment.
 - `@extend`:
   Extend the range of this node to the end of the line and to lines that are
   indented more than the line that this node starts on. This is useful for

From 01776e685103032daccbc0d319f0aceed3bb9156 Mon Sep 17 00:00:00 2001
From: Dillard Robertson <32615829+dilr@users.noreply.github.com>
Date: Sat, 12 Aug 2023 21:13:06 -0400
Subject: [PATCH 245/967] Prevent GraphemeStrs created from Strings from
 leaking (#7920)

---
 helix-core/src/graphemes.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-core/src/graphemes.rs b/helix-core/src/graphemes.rs
index 15ef3eb04..d9e5e0224 100644
--- a/helix-core/src/graphemes.rs
+++ b/helix-core/src/graphemes.rs
@@ -481,7 +481,7 @@ impl<'a> From<String> for GraphemeStr<'a> {
         let ptr = Box::into_raw(g.into_bytes().into_boxed_slice()) as *mut u8;
         GraphemeStr {
             ptr: unsafe { NonNull::new_unchecked(ptr) },
-            len: i32::try_from(len).unwrap() as u32,
+            len: (i32::try_from(len).unwrap() as u32) | Self::MASK_OWNED,
             phantom: PhantomData,
         }
     }

From 2caca1c4e92d46a9b021deed5d50025a5f229325 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 12 Aug 2023 21:14:18 -0400
Subject: [PATCH 246/967] Add pod highlighting (#7907)

---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 11 ++++++
 runtime/queries/perl/highlights.scm |  2 -
 runtime/queries/perl/injections.scm |  2 +
 runtime/queries/pod/highlights.scm  | 61 +++++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/pod/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 297f67af0..10989a23c 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -114,6 +114,7 @@
 | perl | ✓ |  |  | `perlnavigator` |
 | php | ✓ | ✓ | ✓ | `intelephense` |
 | po | ✓ | ✓ |  |  |
+| pod | ✓ |  |  |  |
 | ponylang | ✓ | ✓ | ✓ |  |
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
diff --git a/languages.toml b/languages.toml
index 0e2178427..defffa033 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1117,6 +1117,17 @@ indent = { tab-width = 2, unit = "  " }
 name = "perl"
 source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "ed21ecbcc128a6688770ebafd3ef68a1c9bc1ea9" }
 
+[[language]]
+name = "pod"
+scope = "source.pod"
+injection-regex = "pod"
+roots = []
+file-types = ["pod"]
+
+[[grammar]]
+name = "pod"
+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "d466b84009a63986834498073ec05d58d727d55f" }
+
 [[language]]
 name = "racket"
 scope = "source.racket"
diff --git a/runtime/queries/perl/highlights.scm b/runtime/queries/perl/highlights.scm
index 961ff5ea3..c2496f9fb 100644
--- a/runtime/queries/perl/highlights.scm
+++ b/runtime/queries/perl/highlights.scm
@@ -41,8 +41,6 @@
 (eof_marker) @keyword.directive
 (data_section) @comment
 
-(pod) @comment.block.documentation
-
 (number) @constant.numeric
 (version) @constant
 
diff --git a/runtime/queries/perl/injections.scm b/runtime/queries/perl/injections.scm
index 321c90add..2b182a6ed 100644
--- a/runtime/queries/perl/injections.scm
+++ b/runtime/queries/perl/injections.scm
@@ -1,2 +1,4 @@
 ((comment) @injection.content
  (#set! injection.language "comment"))
+((pod) @injection.content
+ (#set! injection.language "pod"))
diff --git a/runtime/queries/pod/highlights.scm b/runtime/queries/pod/highlights.scm
new file mode 100644
index 000000000..e8bd4b546
--- /dev/null
+++ b/runtime/queries/pod/highlights.scm
@@ -0,0 +1,61 @@
+[(pod_directive)
+ (head_directive)
+ (over_directive)
+ (item_directive)
+ (back_directive)
+ (encoding_directive)
+ (cut_directive)] @tag
+
+(head_paragraph
+  (head_directive) @directive
+  (#eq? @directive "=head1")
+  (content) @markup.heading.1)
+(head_paragraph
+  (head_directive) @directive
+  (#eq? @directive "=head2")
+  (content) @markup.heading.2)
+(head_paragraph
+  (head_directive) @directive
+  (#eq? @directive "=head3")
+  (content) @markup.heading.3)
+(head_paragraph
+  (head_directive) @directive
+  (#eq? @directive "=head4")
+  (content) @markup.heading.4)
+(head_paragraph
+  (head_directive) @directive
+  (#eq? @directive "=head5")
+  (content) @markup.heading.5)
+(head_paragraph
+  (head_directive) @directive
+  (#eq? @directive "=head6")
+  (content) @markup.heading.6)
+
+(over_paragraph (content) @constant.numeric.integer)
+(item_paragraph (content) @markup.list)
+(encoding_paragraph (content) @string)
+
+(verbatim_paragraph (content) @markup.raw)
+
+(interior_sequence) @tag
+
+(interior_sequence
+  (sequence_letter) @letter
+  (#eq? @letter "B")
+  (content) @markup.bold)
+(interior_sequence
+  (sequence_letter) @letter
+  (#eq? @letter "C")
+  (content) @markup.raw)
+(interior_sequence
+  (sequence_letter) @letter
+  (#eq? @letter "F")
+  (content) @markup.italic)
+(interior_sequence
+  (sequence_letter) @letter
+  (#eq? @letter "I")
+  (content) @markup.italic)
+(interior_sequence
+  (sequence_letter) @letter
+  (#eq? @letter "L")
+  (content) @markup.link.url)

From b0c270f8e6f11cf6501b21c2ce785822a6f76c7b Mon Sep 17 00:00:00 2001
From: Noob Zhang <17194552+zhanghua000@users.noreply.github.com>
Date: Sun, 13 Aug 2023 15:17:56 +0800
Subject: [PATCH 247/967] Added some LSP servers and updated python's roots
 (#7897)

* Add csharp-ls for possible c-sharp LSP

See https://github.com/razzmatazz/csharp-language-server for more info
about it.

* Add pyright for possible python LSP

It may be prefered than pylsp by someone.
According to https://github.com/helix-editor/helix/issues/5479, I don't
make it default for everyone. Just for people who need this.

* Update roots of python

Using some known filenames to detect correct project root.

* Add pylyzer for possible python LSP

Co-authored-by: zetashift <rskaraya@gmail.com>

---------

Co-authored-by: zetashift <rskaraya@gmail.com>
---
 languages.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index defffa033..e85fcdb16 100644
--- a/languages.toml
+++ b/languages.toml
@@ -15,6 +15,7 @@ clojure-lsp = { command = "clojure-lsp" }
 cmake-language-server = { command = "cmake-language-server" }
 crystalline = { command = "crystalline", args = ["--stdio"] }
 cs = { command = "cs", args = ["launch", "--contrib", "smithy-language-server", "--", "0"] }
+csharp-ls = { command = "csharp-ls" }
 cuelsp = { command = "cuelsp" }
 dart = { command = "dart", args = ["language-server", "--client-id=helix"] }
 dhall-lsp-server = { command = "dhall-lsp-server" }
@@ -54,6 +55,8 @@ perlnavigator = { command = "perlnavigator", args= ["--stdio"] }
 prisma-language-server = { command = "prisma-language-server", args = ["--stdio"] }
 purescript-language-server = { command = "purescript-language-server", args = ["--stdio"] }
 pylsp = { command = "pylsp" }
+pyright = { command = "pyright-langserver", args = ["--stdio"] }
+pylyzer = { command = "pylyzer", args = ["--server"] }
 qmlls = { command = "qmlls" }
 r = { command = "R", args = ["--no-echo", "-e", "languageserver::run()"] }
 racket = { command = "racket", args = ["-l", "racket-langserver"] }
@@ -654,7 +657,7 @@ scope = "source.python"
 injection-regex = "python"
 file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct"]
 shebangs = ["python"]
-roots = []
+roots = ["pyproject.toml", "setup.py", "poetry.lock","pyrightconfig.json"]
 comment-token = "#"
 language-servers = [ "pylsp" ]
 # TODO: pyls needs utf-8 offsets

From 19dff5c3a4c1f41436cc11372e5e7dcbfe197112 Mon Sep 17 00:00:00 2001
From: Erasin Wang <erasinoo@gmail.com>
Date: Sun, 13 Aug 2023 15:18:57 +0800
Subject: [PATCH 248/967] Update slint grammar (#7893)

---
 languages.toml                       |   2 +-
 runtime/queries/slint/highlights.scm | 190 +++++++++++++++++----------
 runtime/queries/slint/indents.scm    |  11 +-
 runtime/queries/slint/injections.scm |   2 +
 runtime/queries/slint/locals.scm     |   2 +-
 5 files changed, 128 insertions(+), 79 deletions(-)
 create mode 100644 runtime/queries/slint/injections.scm

diff --git a/languages.toml b/languages.toml
index e85fcdb16..8fdb5f1f8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2029,7 +2029,7 @@ language-servers = [ "slint-lsp" ]
 
 [[grammar]]
 name = "slint"
-source = { git = "https://github.com/jrmoulton/tree-sitter-slint", rev = "0d4dda94f96623302dfc234e06be62a5717f47da" }
+source = { git = "https://github.com/jrmoulton/tree-sitter-slint", rev = "00c8a2d3645766f68c0d0460086c0a994e5b0d85" }
 
 [[language]]
 name = "task"
diff --git a/runtime/queries/slint/highlights.scm b/runtime/queries/slint/highlights.scm
index c7773913d..c0ef3dd88 100644
--- a/runtime/queries/slint/highlights.scm
+++ b/runtime/queries/slint/highlights.scm
@@ -1,105 +1,153 @@
 
-(user_type_identifier) @type
+(identifier) @variable
+[
+  (type_identifier) 
+  (units)
+]@type
 
-(var_identifier) @variable
+(array_literal 
+  (identifier) @type)
 
-(state_identifier) @variable.other.member
+(function_identifier) @function
+[
+  (image_macro)
+  (children_macro)
+  (radial_grad_macro)
+  (linear_grad_macro)
+] @function.macro
 
-(var_identifier
-  (post_identifier) @variable)
+(call_expression
+  function: (identifier) @function)
+(call_expression
+  function: (field_expression
+    field: (identifier) @function))
 
-(function_identifier) @function
+(vis) @keyword.control.import
 
-(reference_identifier) @keyword.storage.modifier.ref
-(visibility_modifier) @keyword.storage.modifier
+(transition_statement state: (identifier) @variable.other.member)
+(state_expression state: (identifier) @variable.other.member)
+(struct_block_definition field: (identifier) @variable.other.member)
+(assign_property (identifier) @attribute)
 
 (comment) @comment
 
-(string) @string
-(int_number) @constant.numeric
-(unit_type) @type.builtin
+(string_literal) @string
+(int_literal) @constant.numeric.integer
+(float_literal) @constant.numeric.float
+
+[
+  "in"
+  "in-out"
+  "for"
+] @keyword.control.repeat
+
+[
+  "import"
+  "export"
+  "from"
+] @keyword.control.import
+
+[
+  "if"
+  "else"
+  "when"
+] @keyword.control.conditional
+
+[
+  "struct"
+  "property"
+] @keyword.storage.type
+
+[
+  "global"
+] @keyword.storage.modifier
+
 
 [
-"struct"
-"property"
-"callback"
-"import"
-"from"
-"root"
-"parent"
-"this"
-"for"
-"in"
-"if"
-"else if"
-"else"
-"animate"
-"states"
-"when"
-"in"
-"out"
-"transitions"
-"global"
+  "root"
+  "parent"
+  "duration"
+  "easing"
+] @variable.builtin
+
+
+[
+  "callback"
+  "animate"
+  "states"
+  "out"
+  "transitions"
+  "component"
+  "inherits"
 ] @keyword
 
 [
- "black"
- "transparent"
- "blue"
- "ease"
- "ease_in"
- "ease-in"
- "ease_in_out"
- "ease-in-out"
- "ease_out"
- "ease-out"
- "end"
- "green"
- "red"
- "red"
- "start"
- "yellow"
- "true"
- "false"
+  "black"
+  "transparent"
+  "blue"
+  "ease"
+  "ease_in"
+  "ease-in"
+  "ease_in_out"
+  "ease-in-out"
+  "ease_out"
+  "ease-out"
+  "end"
+  "green"
+  "red"
+  "start"
+  "yellow"
+  "white"
+  "gray"
  ] @constant.builtin
 
+[
+  "true"
+  "false"
+] @constant.builtin.boolean
+
 "@" @keyword
 
 ; ; Punctuation
 [
   ","
   "."
+  ";"
+  ":"
 ] @punctuation.delimiter
 
 ; ; Brackets
 [
-"("
-")"
-"["
-"]"
-"{"
-"}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
+(define_property ["<" ">"] @punctuation.bracket)
+
 [
-"angle"
-"bool"
-"brush"
-; "color" // This causes problems
-"duration"
-"easing"
-"float"
-"image"
-"int"
-"length"
-"percent"
-"physical-length"
-"physical_length"
-"string"
+  "angle"
+  "bool"
+  "brush"
+  "color" 
+  "duration"
+  "easing"
+  "float"
+  "image"
+  "int"
+  "length"
+  "percent"
+  "physical-length"
+  "physical_length"
+  "string"
 ] @type.builtin
 
 [
  ":="
+ "<=>"
  "!"
  "-"
  "+"
@@ -118,8 +166,6 @@
  "*="
  "/="
  "?"
-
- "=>"
- ] @operator
+ "=>" ] @operator
 
 (ternary_expression [":" "?"] @keyword.control.conditional)
\ No newline at end of file
diff --git a/runtime/queries/slint/indents.scm b/runtime/queries/slint/indents.scm
index 37bbd5360..4b5ce41b8 100644
--- a/runtime/queries/slint/indents.scm
+++ b/runtime/queries/slint/indents.scm
@@ -1,11 +1,12 @@
 [
-  (field_declaration_list_body) 
-  (list_definition_body) 
-  (struct_field_declaration_list_body)
+  (comp_body) 
+  (state_statement)
+  (transition_statement)
+  (handler_body)
+  (consequence_body)
+  (global_single)
 ] @indent
 
 [
   "}"
-  "]"
-  ")"
 ] @outdent
diff --git a/runtime/queries/slint/injections.scm b/runtime/queries/slint/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/runtime/queries/slint/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/slint/locals.scm b/runtime/queries/slint/locals.scm
index feba5ebb0..a115f0c69 100644
--- a/runtime/queries/slint/locals.scm
+++ b/runtime/queries/slint/locals.scm
@@ -1,3 +1,3 @@
 ; locals.scm
 
-(component_definition) @local.scope
+(component_item) @local.scope

From d56638ba9aab22656b1f477e45b26b78cdc8201c Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 14 Aug 2023 04:06:25 -0400
Subject: [PATCH 249/967] fix formatting in the rust textobject query file

looks like two lines were unintentionally joined - it doesn't appear to
affect the functionality, but it's confusing to read
---
 runtime/queries/rust/textobjects.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm
index 496f752ec..837f981e7 100644
--- a/runtime/queries/rust/textobjects.scm
+++ b/runtime/queries/rust/textobjects.scm
@@ -1,5 +1,8 @@
 (function_item
-  body: (_) @function.inside) @function.around(closure_expression body: (_) @function.inside) @function.around
+  body: (_) @function.inside) @function.around
+
+(closure_expression
+  body: (_) @function.inside) @function.around
 
 (struct_item
   body: (_) @class.inside) @class.around

From d6bb1092c7f046d4ac7eb3bad6a7e4b9b9d94ca7 Mon Sep 17 00:00:00 2001
From: theteachr <sop.theteachr@gmail.com>
Date: Mon, 14 Aug 2023 07:45:35 +0530
Subject: [PATCH 250/967] Update stale comments

Obsoleted by https://github.com/helix-editor/helix/pull/4731
---
 helix-view/src/editor.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index af00864a7..66542e898 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -465,10 +465,10 @@ pub enum StatusLineElement {
     /// The LSP activity spinner
     Spinner,
 
-    /// The base file name, including a dirty flag if it's unsaved
+    /// The file basename (the leaf of the open file's path)
     FileBaseName,
 
-    /// The relative file path, including a dirty flag if it's unsaved
+    /// The relative file path
     FileName,
 
     // The file modification indicator

From 085706e0cdd569f36f36875fb6698a197c46ed11 Mon Sep 17 00:00:00 2001
From: quantonganh <quantonganh@gmail.com>
Date: Mon, 14 Aug 2023 20:46:06 +0700
Subject: [PATCH 251/967] Include completions for git-ignored files in debugger
 prompt (#7936)

---
 helix-term/src/commands/dap.rs |  8 ++++++--
 helix-term/src/ui/mod.rs       | 28 +++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index e26dc08dc..cc013d1e6 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -339,8 +339,12 @@ fn debug_parameter_prompt(
     .to_owned();
 
     let completer = match field_type {
-        "filename" => ui::completers::filename,
-        "directory" => ui::completers::directory,
+        "filename" => |editor: &Editor, input: &str| {
+            ui::completers::filename_with_git_ignore(editor, input, false)
+        },
+        "directory" => |editor: &Editor, input: &str| {
+            ui::completers::directory_with_git_ignore(editor, input, false)
+        },
         _ => ui::completers::none,
     };
 
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 215794e3c..2d15fb32f 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -345,7 +345,15 @@ pub mod completers {
     }
 
     pub fn filename(editor: &Editor, input: &str) -> Vec<Completion> {
-        filename_impl(editor, input, |entry| {
+        filename_with_git_ignore(editor, input, true)
+    }
+
+    pub fn filename_with_git_ignore(
+        editor: &Editor,
+        input: &str,
+        git_ignore: bool,
+    ) -> Vec<Completion> {
+        filename_impl(editor, input, git_ignore, |entry| {
             let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
 
             if is_dir {
@@ -416,7 +424,15 @@ pub mod completers {
     }
 
     pub fn directory(editor: &Editor, input: &str) -> Vec<Completion> {
-        filename_impl(editor, input, |entry| {
+        directory_with_git_ignore(editor, input, true)
+    }
+
+    pub fn directory_with_git_ignore(
+        editor: &Editor,
+        input: &str,
+        git_ignore: bool,
+    ) -> Vec<Completion> {
+        filename_impl(editor, input, git_ignore, |entry| {
             let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
 
             if is_dir {
@@ -439,7 +455,12 @@ pub mod completers {
     }
 
     // TODO: we could return an iter/lazy thing so it can fetch as many as it needs.
-    fn filename_impl<F>(_editor: &Editor, input: &str, filter_fn: F) -> Vec<Completion>
+    fn filename_impl<F>(
+        _editor: &Editor,
+        input: &str,
+        git_ignore: bool,
+        filter_fn: F,
+    ) -> Vec<Completion>
     where
         F: Fn(&ignore::DirEntry) -> FileMatch,
     {
@@ -482,6 +503,7 @@ pub mod completers {
         let mut files: Vec<_> = WalkBuilder::new(&dir)
             .hidden(false)
             .follow_links(false) // We're scanning over depth 1
+            .git_ignore(git_ignore)
             .max_depth(Some(1))
             .build()
             .filter_map(|file| {

From 3a162e2bef0b8a5ae1045d8b018447c9ed9fde61 Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Tue, 15 Aug 2023 07:59:49 +0800
Subject: [PATCH 252/967] Make editor remember the latest search register
 (#5244)

---
 helix-term/src/commands.rs | 26 +++++++++++++++++++++-----
 helix-view/src/register.rs |  2 ++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 61c647d0b..b8324b650 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1895,7 +1895,9 @@ fn searcher(cx: &mut Context, direction: Direction) {
                 .collect()
         },
         move |editor, regex, event| {
-            if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
+            if event == PromptEvent::Validate {
+                editor.registers.last_search_register = reg;
+            } else if event != PromptEvent::Update {
                 return;
             }
             search_impl(
@@ -1914,7 +1916,9 @@ fn searcher(cx: &mut Context, direction: Direction) {
 
 fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
     let count = cx.count();
-    let register = cx.register.unwrap_or('/');
+    let register = cx
+        .register
+        .unwrap_or(cx.editor.registers.last_search_register);
     let config = cx.editor.config();
     let scrolloff = config.scrolloff;
     if let Some(query) = cx.editor.registers.first(register, cx.editor) {
@@ -1982,13 +1986,21 @@ fn search_selection(cx: &mut Context) {
 
     let msg = format!("register '{}' set to '{}'", register, &regex);
     match cx.editor.registers.push(register, regex) {
-        Ok(_) => cx.editor.set_status(msg),
+        Ok(_) => {
+            cx.editor.registers.last_search_register = register;
+            cx.editor.set_status(msg)
+        }
         Err(err) => cx.editor.set_error(err.to_string()),
     }
 }
 
 fn make_search_word_bounded(cx: &mut Context) {
-    let register = cx.register.unwrap_or('/');
+    // Defaults to the active search register instead `/` to be more ergonomic assuming most people
+    // would use this command following `search_selection`. This avoids selecting the register
+    // twice.
+    let register = cx
+        .register
+        .unwrap_or(cx.editor.registers.last_search_register);
     let regex = match cx.editor.registers.first(register, cx.editor) {
         Some(regex) => regex,
         None => return,
@@ -2014,7 +2026,10 @@ fn make_search_word_bounded(cx: &mut Context) {
 
     let msg = format!("register '{}' set to '{}'", register, &new_regex);
     match cx.editor.registers.push(register, new_regex) {
-        Ok(_) => cx.editor.set_status(msg),
+        Ok(_) => {
+            cx.editor.registers.last_search_register = register;
+            cx.editor.set_status(msg)
+        }
         Err(err) => cx.editor.set_error(err.to_string()),
     }
 }
@@ -2078,6 +2093,7 @@ fn global_search(cx: &mut Context) {
             if event != PromptEvent::Validate {
                 return;
             }
+            editor.registers.last_search_register = reg;
 
             let documents: Vec<_> = editor
                 .documents()
diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
index 3d1849a6f..0ebea5369 100644
--- a/helix-view/src/register.rs
+++ b/helix-view/src/register.rs
@@ -29,6 +29,7 @@ pub struct Registers {
     /// efficiently prepend new values in `Registers::push`.
     inner: HashMap<char, Vec<String>>,
     clipboard_provider: Box<dyn ClipboardProvider>,
+    pub last_search_register: char,
 }
 
 impl Default for Registers {
@@ -36,6 +37,7 @@ impl Default for Registers {
         Self {
             inner: Default::default(),
             clipboard_provider: get_clipboard_provider(),
+            last_search_register: '/',
         }
     }
 }

From 0b2e96885fa58a190b35619b77bddd559001c4a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:33:07 +0900
Subject: [PATCH 253/967] build(deps): bump tokio from 1.29.1 to 1.31.0 (#7944)

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

---
updated-dependencies:
- dependency-name: tokio
  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           | 15 +++++++--------
 helix-lsp/Cargo.toml |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 92bff3b12..a3e552152 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1771,9 +1771,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
 
 [[package]]
 name = "pin-utils"
@@ -2108,12 +2108,12 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2283,11 +2283,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.29.1"
+version = "1.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
 dependencies = [
- "autocfg",
  "backtrace",
  "bytes",
  "libc",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 922c8eead..47aeb1fcd 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -25,7 +25,7 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.29", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.31", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
 which = "4.4"
 parking_lot = "0.12.1"

From e9a807a48fe50de05c1db3944910418a0ff48a2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:33:22 +0900
Subject: [PATCH 254/967] build(deps): bump bitflags from 2.3.3 to 2.4.0
 (#7943)

Bumps [bitflags](https://github.com/bitflags/bitflags) from 2.3.3 to 2.4.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.3.3...2.4.0)

---
updated-dependencies:
- dependency-name: bitflags
  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            | 22 +++++++++++-----------
 helix-core/Cargo.toml |  2 +-
 helix-tui/Cargo.toml  |  2 +-
 helix-view/Cargo.toml |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a3e552152..fc2fbed64 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -120,9 +120,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
 [[package]]
 name = "bstr"
@@ -676,7 +676,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83960be5e99266bcf55dae5a24731bbd39f643bfb68f27e939d6b06836b5b87d"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "bstr",
  "gix-path",
  "libc",
@@ -771,7 +771,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c18bdff83143d61e7d60da6183b87542a870d026b2a2d0b30170b8e9c0cd321a"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "bstr",
  "gix-features",
  "gix-path",
@@ -816,7 +816,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68099abdf6ee50ae3c897e8b05de96871cbe54d52a37cdf559101f911b883562"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "bstr",
  "btoi",
  "filetime",
@@ -861,7 +861,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e7bce64d4452dd609f44d04b14b29da2e0ad2c45fcdf4ce1472a5f5f8ec21c2"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "gix-commitgraph",
  "gix-date",
  "gix-hash",
@@ -1040,7 +1040,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ede298863db2a0574a14070991710551e76d1f47c9783b62d4fcbca17f56371c"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "gix-path",
  "libc",
  "windows",
@@ -1214,7 +1214,7 @@ version = "0.6.0"
 dependencies = [
  "ahash 0.8.3",
  "arc-swap",
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "chrono",
  "dunce",
  "encoding_rs",
@@ -1344,7 +1344,7 @@ dependencies = [
 name = "helix-tui"
 version = "0.6.0"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "cassowary",
  "crossterm",
  "helix-core",
@@ -1377,7 +1377,7 @@ version = "0.6.0"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "chardetng",
  "clipboard-win",
  "crossterm",
@@ -1932,7 +1932,7 @@ version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.3",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index f45d97b8e..b434fbf36 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -29,7 +29,7 @@ tree-sitter.workspace = true
 once_cell = "1.18"
 arc-swap = "1"
 regex = "1"
-bitflags = "2.3"
+bitflags = "2.4"
 ahash = "0.8.3"
 hashbrown = { version = "0.14.0", features = ["raw"] }
 dunce = "1.0"
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 32e8a52f3..92f46fb23 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -16,7 +16,7 @@ include = ["src/**/*", "README.md"]
 default = ["crossterm"]
 
 [dependencies]
-bitflags = "2.3"
+bitflags = "2.4"
 cassowary = "0.3"
 unicode-segmentation = "1.10"
 crossterm = { version = "0.26", optional = true }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index b66739a4a..1f6d84232 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -14,7 +14,7 @@ default = []
 term = ["crossterm"]
 
 [dependencies]
-bitflags = "2.3"
+bitflags = "2.4"
 anyhow = "1"
 helix-core = { version = "0.6", path = "../helix-core" }
 helix-loader = { version = "0.6", path = "../helix-loader" }

From a1c50056bf32be3c7d022ad025016c65f89e7b0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:33:31 +0900
Subject: [PATCH 255/967] build(deps): bump regex from 1.9.1 to 1.9.3 (#7945)

Bumps [regex](https://github.com/rust-lang/regex) from 1.9.1 to 1.9.3.
- [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.9.1...1.9.3)

---
updated-dependencies:
- dependency-name: regex
  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 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fc2fbed64..6ce3bc414 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1863,25 +1863,25 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
  "regex-automata",
- "regex-syntax 0.7.3",
+ "regex-syntax 0.7.4",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.3.2"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
- "regex-syntax 0.7.3",
+ "regex-syntax 0.7.4",
 ]
 
 [[package]]
@@ -1892,9 +1892,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "ropey"

From 2756f70dfc67bdfbd051a993db0c274027d56310 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:33:40 +0900
Subject: [PATCH 256/967] build(deps): bump rustix from 0.38.4 to 0.38.8
 (#7946)

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.4 to 0.38.8.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.4...v0.38.8)

---
updated-dependencies:
- dependency-name: rustix
  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 6ce3bc414..f1e8b76c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1392,7 +1392,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.4",
+ "rustix 0.38.8",
  "serde",
  "serde_json",
  "slotmap",
@@ -1928,9 +1928,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.4"
+version = "0.38.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2165,7 +2165,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.38.4",
+ "rustix 0.38.8",
  "windows-sys 0.48.0",
 ]
 

From ea886773945a0c0856ab5866dde3a3fdd459ed1d Mon Sep 17 00:00:00 2001
From: Dillard Robertson <32615829+dilr@users.noreply.github.com>
Date: Mon, 14 Aug 2023 23:19:24 -0400
Subject: [PATCH 257/967] Stop Terminal::drop from overriding work of
 Terminal::restore. (#7931)

When Application::run is exiting, either Terminal::restore or
Terminal::force_restore will be called depending
on if a panic occured or not.
Both of these functions will reset the cursor to terminal's default.

After this is done, Terminal::drop will be called.
If terminal.cursor_kind == Hidden, then
the cursor will be reset to a CursorKind::Block,
undoing the work of restore or force_restore.

This commit just removes the drop implementation,
as its job is already better handled in restore and force_restore.
---
 helix-tui/src/terminal.rs | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/helix-tui/src/terminal.rs b/helix-tui/src/terminal.rs
index 8b7342751..d2a911cf5 100644
--- a/helix-tui/src/terminal.rs
+++ b/helix-tui/src/terminal.rs
@@ -65,20 +65,6 @@ where
     viewport: Viewport,
 }
 
-impl<B> Drop for Terminal<B>
-where
-    B: Backend,
-{
-    fn drop(&mut self) {
-        // Attempt to restore the cursor state
-        if self.cursor_kind == CursorKind::Hidden {
-            if let Err(err) = self.show_cursor(CursorKind::Block) {
-                eprintln!("Failed to show the cursor: {}", err);
-            }
-        }
-    }
-}
-
 impl<B> Terminal<B>
 where
     B: Backend,

From 7b2f3f533c50b647bfd0b1019e9cef421c5124f9 Mon Sep 17 00:00:00 2001
From: N <47500890+avi-cenna@users.noreply.github.com>
Date: Tue, 15 Aug 2023 03:31:30 -0400
Subject: [PATCH 258/967] Recognize more filenames for zsh (#7930)

Including `zshrc` et al. since this is convention in dotfiles repos
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 8fdb5f1f8..e39871e84 100644
--- a/languages.toml
+++ b/languages.toml
@@ -722,7 +722,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-ruby", rev = "206c7
 name = "bash"
 scope = "source.bash"
 injection-regex = "(shell|bash|zsh|sh)"
-file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", ".zlogin", ".zlogout", ".zprofile", ".zshrc", ".zimrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc", ".bash_aliases", "Renviron", ".Renviron"]
+file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", "zshenv", ".zlogin", "zlogin", ".zlogout", "zlogout", ".zprofile", "zprofile", ".zshrc", "zshrc", ".zimrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc", ".bash_aliases", "Renviron", ".Renviron"]
 shebangs = ["sh", "bash", "dash", "zsh"]
 roots = []
 comment-token = "#"

From 090a225f28fb0547e572d1d99153cf84c48e855a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Cabero?= <cabero96@protonmail.com>
Date: Tue, 15 Aug 2023 09:37:44 +0200
Subject: [PATCH 259/967] goto_file: open picker if a directory is selected
 (#7909)

* feat: open file picker on directories using goto_file (gf)

* remove helper and call to canonicalize
---
 helix-term/src/commands.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b8324b650..07aef95d0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1190,7 +1190,11 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
     for sel in paths {
         let p = sel.trim();
         if !p.is_empty() {
-            if let Err(e) = cx.editor.open(&PathBuf::from(p), action) {
+            let path = Path::new(p);
+            if path.is_dir() {
+                let picker = ui::file_picker(path.into(), &cx.editor.config());
+                cx.push_layer(Box::new(overlaid(picker)));
+            } else if let Err(e) = cx.editor.open(path, action) {
                 cx.editor.set_error(format!("Open file failed: {:?}", e));
             }
         }
@@ -2603,6 +2607,7 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
     let picker = ui::file_picker(path, &cx.editor.config());
     cx.push_layer(Box::new(overlaid(picker)));
 }
+
 fn file_picker_in_current_directory(cx: &mut Context) {
     let cwd = helix_loader::current_working_dir();
     if !cwd.exists() {

From cbfe8eef894e8784a9e10127cd1c800ca9b7f532 Mon Sep 17 00:00:00 2001
From: sigmaSd <bedisnbiba@gmail.com>
Date: Tue, 15 Aug 2023 08:38:57 +0100
Subject: [PATCH 260/967] add strace highlighting (#7928)

* feat: add strace tree sitter

* f
---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 10 ++++++++++
 runtime/queries/strace/highlights.scm |  8 ++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 runtime/queries/strace/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 10989a23c..1287c11ff 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -145,6 +145,7 @@
 | sql | ✓ |  |  |  |
 | sshclientconfig | ✓ |  |  |  |
 | starlark | ✓ | ✓ |  |  |
+| strace | ✓ |  |  |  |
 | svelte | ✓ |  | ✓ | `svelteserver` |
 | sway | ✓ | ✓ | ✓ | `forc` |
 | swift | ✓ |  |  | `sourcekit-lsp` |
diff --git a/languages.toml b/languages.toml
index e39871e84..1e692ac4a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2783,3 +2783,13 @@ auto-format = true
 [[grammar]]
 name = "todotxt"
 source = { git = "https://github.com/arnarg/tree-sitter-todotxt", rev = "0207f6a4ab6aeafc4b091914d31d8235049a2578" }
+
+[[language]]
+name = "strace"
+scope = "source.strace"
+file-types = ["strace"]
+roots = []
+
+[[grammar]]
+name = "strace"
+source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "a0f6c50ae4087a9299f055d0f30fe94fd98189a4" }
diff --git a/runtime/queries/strace/highlights.scm b/runtime/queries/strace/highlights.scm
new file mode 100644
index 000000000..4f54cb3e9
--- /dev/null
+++ b/runtime/queries/strace/highlights.scm
@@ -0,0 +1,8 @@
+(syscall) @function
+(integer) @constant.numeric
+(pointer) @constant.numeric
+(value) @label
+(string) @string
+(comment) @comment
+(errorName) @error
+(errorDescription) @error

From 567eda88ef00b40ecabb22dc896872063d8aeda4 Mon Sep 17 00:00:00 2001
From: David Bell <dastbe@users.noreply.github.com>
Date: Tue, 15 Aug 2023 00:39:37 -0700
Subject: [PATCH 261/967] add .star as starlark file extension (#7922)

In addition to the other defined extensions, `.star` is a frequently used extension for starlark files. This can be demonstrated through a cursory search of github for files ending in `.star` here: https://github.com/search?q=path%3A%2F.star%24%2F&type=code
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 1e692ac4a..d3cb40256 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1929,7 +1929,7 @@ source = { git = "https://github.com/sogaiu/tree-sitter-clojure", rev = "e57c569
 name = "starlark"
 scope = "source.starlark"
 injection-regex = "(starlark|bzl|bazel)"
-file-types = ["bzl", "bazel", "BUILD"]
+file-types = ["bzl", "bazel", "BUILD", "star"]
 roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }

From 61ccf4eded132629cfb4a7d76c7c55d9b1169136 Mon Sep 17 00:00:00 2001
From: Jens Getreu <getreu@web.de>
Date: Tue, 15 Aug 2023 09:41:26 +0200
Subject: [PATCH 262/967] autumn theme: improve readability of comments (#7939)

* Improve readability of comments

* Rename color

* Rename color

* Sort variables
---
 runtime/themes/autumn.toml       | 127 +++++++++++++++----------------
 runtime/themes/autumn_night.toml |  12 +--
 2 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index 23af7d6f5..ce684a6a6 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -7,81 +7,79 @@
 # Jens Getreu ported and optimised the color theme for the Helix editor.
 # Author: Jens Getreu <getreu at web.de>
 
+"attribute" = "my_turquoise1"
+"comment" = { fg = "my_gray5" }
+"constant.character.escape" = "my_turquoise1"
+"constant" = "my_white3"
+"constant.numeric" = "my_turquoise1"
+"constructor" = "my_yellow1"
+"debug" = "my_yellow2"
+"diagnostic.error" = { underline = { style = "curl", color = "my_red" } }
+"diagnostic.hint" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
+"diagnostic.info" = { underline = { style = "line" } }
+"diagnostic" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
+"diagnostic.warning" = { underline = { style = "curl", color = "my_yellow2" } }
+"diff.delta" = "my_gray5"
+"diff.minus" = "my_red"
+"diff.plus" = "my_green"
+"error" = "my_red"
+"function" = "my_yellow1"
+"hint" = "my_gray6"
+"info" = "my_yellow2"
+"keyword" = "my_red"
+"label" = "my_red"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.heading" = "my_yellow1"
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.text" = "my_white2"
+"markup.link.url" = "my_turquoise2"
+"markup.list" = "my_white2"
+"markup.quote" = "my_brown"
+"markup.raw" = "my_green"
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"namespace" = "my_white3"
+"operator" = "my_white1"
+"special" = "my_yellow1"
+"string"  = "my_green"
+"type" = { fg = "my_white3", modifiers = ["italic"] }
 "ui.background" = { bg = "my_gray0" }
-"ui.menu" = { fg = "my_white", bg = "my_gray2" }
-"ui.menu.selected" = { fg = "my_gray2", bg = "my_gray6" }
+"ui.cursor" = { bg = "my_white4", fg = "my_black" }
+"ui.cursorline" = { bg = "my_gray3" }
+"ui.cursorline.primary" = { bg = "my_black" }
+"ui.cursorline.secondary" = { bg = "my_black" }
+"ui.cursor.match" = { fg = "my_white1", modifiers = ["bold"], underline = { style = "double_line", color = "my_white1" }, bg = "my_black"}
+"ui.cursor.primary" = { fg = "my_white1", modifiers = ["reversed"] }
+"ui.debug" = { fg = "my_yellow1", bg = "my_gray0" }
+"ui.gutter" = { bg = "my_gray0" }
+"ui.help" = { fg = "my_gray7", bg = "my_gray2" }
+"ui.highlight.frameline" = { bg = "#8b6904" }
 "ui.linenr" = { fg = "my_gray3", bg = "my_gray0" }
-"ui.popup" = { bg = "my_gray2" }
-"ui.window" = { fg = "my_gray3", bg = "my_gray2" }
 "ui.linenr.selected" = { fg = "my_gray7", bg = "my_gray0"}
+"ui.menu" = { fg = "my_white1", bg = "my_gray2" }
+"ui.menu.selected" = { fg = "my_gray2", bg = "my_gray6" }
+"ui.popup" = { bg = "my_gray2" }
 "ui.selection" = { bg = "my_gray3" }
-"comment" = { fg = "my_gray5", modifiers = ["italic"] }
-"ui.cursorline" = { bg = "my_gray3" }
 "ui.statusline" = { fg = "my_gray7", bg = "my_gray2" }
 "ui.statusline.inactive" = { fg = 'my_gray5', bg = 'my_gray2' }
 "ui.statusline.insert" = {fg = "my_black", bg = "my_gray6", modifiers = ["bold"]}
 "ui.statusline.normal" = {fg = "my_gray7", bg = "my_gray2"}
 "ui.statusline.select" = {fg = "my_gray7", bg = "my_black", modifiers = ["bold"]}
-"ui.cursor" = { bg = "my_white4", fg = "my_black" }
-"ui.cursor.primary" = { fg = "my_white", modifiers = ["reversed"] }
-"ui.cursor.match" = { fg = "my_white", modifiers = ["bold"], underline = { style = "double_line", color = "my_white" }, bg = "my_black"}
-"ui.cursorline.primary" = { bg = "my_black" }
-"ui.cursorline.secondary" = { bg = "my_black" }
-"ui.highlight.frameline" = { bg = "#8b6904" }
-"ui.debug" = { fg = "my_yellow1", bg = "my_gray0" }
-"ui.text" = "my_white"
-"operator" = "my_white"
-"ui.text.focus" = "my_white"
-"variable" = "my_white3"
-"constant.numeric" = "my_turquoise"
-"constant" = "my_white3"
-"attribute" = "my_turquoise"
-"type" = { fg = "my_white3", modifiers = ["italic"] }
-"string"  = "my_green"
-"variable.other.member" = "my_brown"
-"constant.character.escape" = "my_turquoise"
-"function" = "my_yellow1"
-"constructor" = "my_yellow1"
-"special" = "my_yellow1"
-"keyword" = "my_red"
-"label" = "my_red"
-"namespace" = "my_white3"
-"ui.help" = { fg = "my_gray7", bg = "my_gray2" }
-"ui.virtual.wrap" = "my_gray4"
-"ui.virtual.whitespace" = { fg = "my_gray6" }
-"ui.virtual.ruler" = { bg = "my_gray1" }
+"ui.text.focus" = "my_white1"
+"ui.text" = "my_white1"
 "ui.virtual.inlay-hint" = { fg = "my_gray4", bg="my_black", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.parameter" = { fg = "my_gray4", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.type" = { fg = "my_gray4", modifiers = ["italic"] }
-
-"markup.heading" = "my_yellow1"
-"markup.list" = "my_white2"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = "my_turquoise2"
-"markup.link.text" = "my_white2"
-"markup.quote" = "my_brown"
-"markup.raw" = "my_green"
-
-"diff.plus" = "my_green"
-"diff.delta" = "my_gray5"
-"diff.minus" = "my_red"
-
-"diagnostic" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
-"diagnostic.hint" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
-"diagnostic.info" = { underline = { style = "line" } }
-"diagnostic.warning" = { underline = { style = "curl", color = "my_yellow2" } }
-"diagnostic.error" = { underline = { style = "curl", color = "my_red" } }
-"ui.gutter" = { bg = "my_gray0" }
-"hint" = "my_gray6"
-"debug" = "my_yellow2"
-"info" = "my_yellow2"
+"ui.virtual.ruler" = { bg = "my_gray1" }
+"ui.virtual.whitespace" = { fg = "my_gray6" }
+"ui.virtual.wrap" = "my_gray4"
+"ui.window" = { fg = "my_gray3", bg = "my_gray2" }
+"variable" = "my_white3"
+"variable.other.member" = "my_brown"
 "warning" = "my_yellow2"
-"error" = "my_red"
 
 [palette]
 my_black      = "#212121" # Cursorline
+my_brown      = "#cfba8b" # Member variables, Quotes
 my_gray0      = "#232323" # Default Background
 my_gray1      = "#2b2b2b" # Ruler
 my_gray2      = "#323232" # Lighter Background (Used for status bars, line number and folding marks)
@@ -91,14 +89,13 @@ my_gray5      = "#646f69" # Comments, Invisibles, Line Highlighting
 my_gray6      = "#a8a8a8" # Dark Foreground (Used for status bars)
 my_gray7      = "#c8c8c8" # Light Foreground
 my_gray8      = "#e8e8e8" # Light Background
-my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
+my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted
+my_red        = "#F05E48" # Keywords, Storage, Selector, Diff Changed
+my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters
+my_turquoise2 = "#72a59e" # URL
+my_white1     = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
 my_white3     = "#F3F2CC" # Classes, Markup Bold, Search Text Background
 my_white4     = "#7e7d6a" # Cursor match
-my_turquoise  = "#86c1b9" # Support, Regular Expressions, Escape Characters
-my_turquoise2 = "#72a59e" # URL
-my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted
-my_brown      = "#cfba8b" # Member variables, Quotes
 my_yellow1    = "#FAD566" # Functions, Methods, Attribute IDs, Headings
 my_yellow2    = "#ffff9f" # Debug, Info
-my_red        = "#F05E48" # Keywords, Storage, Selector, Diff Changed
diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml
index 493976263..128baea3c 100644
--- a/runtime/themes/autumn_night.toml
+++ b/runtime/themes/autumn_night.toml
@@ -11,6 +11,7 @@ inherits = "autumn"
 
 [palette]
 my_black      = "#111111" # Cursorline
+my_brown      = "#cfba8b" # Member variables, Quotes
 my_gray0      = "#090909" # Default Background
 my_gray1      = "#0e0e0e" # Ruler
 my_gray2      = "#1a1a1a" # Lighter Background (Used for status bars, line number and folding marks)
@@ -20,14 +21,13 @@ my_gray5      = "#626C66" # Comments, Invisibles, Line Highlighting
 my_gray6      = "#aaaaaa" # Dark Foreground (Used for status bars)
 my_gray7      = "#c4c4c4" # Light Foreground
 my_gray8      = "#e8e8e8" # Light Background
-my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
+my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted
+my_red        = "#F05E48" # Keywords, Storage, Selector, Diff Changed
+my_turquoise1 = "#86c1b9" # Support, Regular Expressions, Escape Characters
+my_turquoise2 = "#72a59e" # URL
+my_white1     = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
 my_white3     = "#F3F2CC" # Classes, Markup Bold, Search Text Background
 my_white4     = "#7e7d6a" # Secondary cursors
-my_turquoise  = "#86c1b9" # Support, Regular Expressions, Escape Characters
-my_turquoise2 = "#72a59e" # URL
-my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted
-my_brown      = "#cfba8b" # Member variables, Quotes
 my_yellow1    = "#FAD566" # Functions, Methods, Attribute IDs, Headings
 my_yellow2    = "#ffff9f" # Debug, Info
-my_red        = "#F05E48" # Keywords, Storage, Selector, Diff Changed

From 0a45fb4371c3af4a66c430c61d256fe13f4df543 Mon Sep 17 00:00:00 2001
From: Bjorn Ove Hay Andersen <bjrnove@gmail.com>
Date: Tue, 15 Aug 2023 16:22:39 +0200
Subject: [PATCH 263/967] document a-ret picker keybinding (#7884)

---
 book/src/keymap.md | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 5dc467f28..0f41b3247 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -411,19 +411,20 @@ you to selectively add search terms to your selections.
 
 Keys to use within picker. Remapping currently not supported.
 
-| Key                          | Description       |
-| -----                        | -------------     |
-| `Shift-Tab`, `Up`, `Ctrl-p`  | Previous entry    |
-| `Tab`, `Down`, `Ctrl-n`      | Next entry        |
-| `PageUp`, `Ctrl-u`           | Page up           |
-| `PageDown`, `Ctrl-d`         | Page down         |
-| `Home`                       | Go to first entry |
-| `End`                        | Go to last entry  |
-| `Enter`                      | Open selected     |
-| `Ctrl-s`                     | Open horizontally |
-| `Ctrl-v`                     | Open vertically   |
-| `Ctrl-t`                     | Toggle preview    |
-| `Escape`, `Ctrl-c`           | Close picker      |
+| Key                          | Description                                                |
+| -----                        | -------------                                              |
+| `Shift-Tab`, `Up`, `Ctrl-p`  | Previous entry                                             |
+| `Tab`, `Down`, `Ctrl-n`      | Next entry                                                 |
+| `PageUp`, `Ctrl-u`           | Page up                                                    |
+| `PageDown`, `Ctrl-d`         | Page down                                                  |
+| `Home`                       | Go to first entry                                          |
+| `End`                        | Go to last entry                                           |
+| `Enter`                      | Open selected                                              |
+| `Alt-Enter`                  | Open selected in the background without closing the picker |
+| `Ctrl-s`                     | Open horizontally                                          |
+| `Ctrl-v`                     | Open vertically                                            |
+| `Ctrl-t`                     | Toggle preview                                             |
+| `Escape`, `Ctrl-c`           | Close picker                                               |
 
 ## Prompt
 

From 56ccaedffbb8011e36012278e2a4861a8d435a60 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Thu, 17 Aug 2023 01:28:07 +0900
Subject: [PATCH 264/967] markdown.inline: Add `injection.combined` to html tag
 (#7960)

Problem: Closing tags for markdown is sometimes not highlighted
Solution: Add `injection.combined` to create a valid syntax tree for
highlighting
---
 runtime/queries/markdown.inline/injections.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/markdown.inline/injections.scm b/runtime/queries/markdown.inline/injections.scm
index c2e7012ca..62b82678d 100644
--- a/runtime/queries/markdown.inline/injections.scm
+++ b/runtime/queries/markdown.inline/injections.scm
@@ -1,4 +1,7 @@
 
-((html_tag) @injection.content (#set! injection.language "html") (#set! injection.include-unnamed-children))
+((html_tag) @injection.content 
+  (#set! injection.language "html") 
+  (#set! injection.include-unnamed-children)
+  (#set! injection.combined))
 
 ((latex_block) @injection.content (#set! injection.language "latex") (#set! injection.include-unnamed-children))

From 2b7e7c80eb4bdc0c7283f94efd6079992840753b Mon Sep 17 00:00:00 2001
From: Jack Allison <jacallis@cisco.com>
Date: Thu, 17 Aug 2023 14:14:59 -0400
Subject: [PATCH 265/967] Update Monokai bufferline theming to be distinguish
 active buffers (#7983)

* Update OneDark theme to use light-gray for inlay hints.

* fix monokai tab themeing to be more distinguishing
---
 runtime/themes/monokai.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index 913cc49b8..66106d480 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -78,6 +78,11 @@
 "ui.statusline" = { fg = "active_text", bg = "#414339" }
 "ui.statusline.inactive" = { fg = "active_text", bg = "#75715e" }
 
+"ui.bufferline" = { fg = "grey2", bg = "bg3" }
+"ui.bufferline.active" = { fg = "active_text", bg = "selection", modifiers = [
+  "bold",
+] }
+
 "ui.text" = { fg = "text" }
 "ui.text.focus" = { fg = "active_text" }
 

From 18a79aa3bf4bfc1569d104eaab5652ccccc217b3 Mon Sep 17 00:00:00 2001
From: Tomas Sandven <597206+Hubro@users.noreply.github.com>
Date: Fri, 18 Aug 2023 22:48:47 +0200
Subject: [PATCH 266/967] Update tree-sitter-robot (#7970)

* Update tree-sitter-robot

* Update Robot highlights query for Helix

* Change @comment.single to @comment

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml                       |  2 +-
 runtime/queries/robot/highlights.scm | 64 ++++++++++++++++++++++------
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/languages.toml b/languages.toml
index d3cb40256..dc07bb2bd 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1567,7 +1567,7 @@ language-servers = [ "robotframework_ls" ]
 
 [[grammar]]
 name = "robot"
-source = { git = "https://github.com/Hubro/tree-sitter-robot", rev = "f1142bfaa6acfce95e25d2c6d18d218f4f533927" }
+source = { git = "https://github.com/Hubro/tree-sitter-robot", rev = "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af" }
 
 [[language]]
 name = "r"
diff --git a/runtime/queries/robot/highlights.scm b/runtime/queries/robot/highlights.scm
index 60f416b7b..06e95798a 100644
--- a/runtime/queries/robot/highlights.scm
+++ b/runtime/queries/robot/highlights.scm
@@ -1,21 +1,59 @@
-(comment) @comment
+[
+  (comment)
+  (extra_text)
+] @comment
+
+[
+  (section_header)
+  (setting_statement)
+  (keyword_setting)
+  (test_case_setting)
+] @keyword
+
+(variable_definition (variable_name) @variable)
+(keyword_definition (name) @function)
+(test_case_definition (name) @function)
+
+(keyword_invocation (keyword) @function)
 (ellipses) @punctuation.delimiter
 
-(section_header) @keyword
-(extra_text) @comment
+(text_chunk) @string
+(inline_python_expression) @string.special
+[
+  (scalar_variable)
+  (list_variable)
+  (dictionary_variable)
+] @variable
 
-(setting_statement) @keyword
+; Control structures
 
-(variable_definition (variable_name) @variable)
+"RETURN" @keyword.control.return
 
-(keyword_definition (name) @function)
-(keyword_definition (body (keyword_setting) @keyword))
+[
+  "FOR"
+  "IN"
+  "IN RANGE"
+  "IN ENUMERATE"
+  "IN ZIP"
+  (break_statement)
+  (continue_statement)
+] @keyword.control.repeat
+(for_statement "END" @keyword.control.repeat)
 
-(test_case_definition (name) @property)
+"WHILE" @keyword.control.repeat
+(while_statement "END" @keyword.control.repeat)
 
-(keyword_invocation (keyword) @function)
+[
+  "IF"
+  "ELSE IF"
+] @keyword.control.conditional
+(if_statement "END" @keyword.control.conditional)
+(if_statement (else_statement "ELSE" @keyword.control.conditional))
 
-(argument (text_chunk) @string)
-(argument (scalar_variable) @string.special)
-(argument (list_variable) @string.special)
-(argument (dictionary_variable) @string.special)
+[
+  "TRY"
+  "EXCEPT"
+  "FINALLY"
+] @keyword.control.exception
+(try_statement "END" @keyword.control.exception)
+(try_statement (else_statement "ELSE" @keyword.control.exception))

From e4c95f65a64a0553e1dafa365a40dcd5c328fa69 Mon Sep 17 00:00:00 2001
From: dastrukar <3derid@gmail.com>
Date: Sat, 19 Aug 2023 05:34:35 +0800
Subject: [PATCH 267/967] Nord theme: Update ruler to set bg instead of fg
 (#7995)

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

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index c490aa7ce..5c3b6219c 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -125,7 +125,7 @@
 # Virtual/invisable text
 "ui.virtual.indent-guide" = "nord3"
 "ui.virtual.inlay-hint" = { fg = "nord3", modifiers = ["italic"] }
-"ui.virtual.ruler" = "nord3"
+"ui.virtual.ruler" = { bg = "nord1" }
 "ui.virtual.whitespace" = "nord3"
 "ui.virtual.wrap" = "nord3"
 

From 01a1e5ec2a8c5b81da1360746dad0a96cd88ae8e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 19 Aug 2023 10:21:18 -0500
Subject: [PATCH 268/967] Update tree-sitter to latest master (#7998)

---
 Cargo.lock               | 2 +-
 Cargo.toml               | 2 +-
 helix-core/src/syntax.rs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f1e8b76c2..c7c0ceecb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2359,7 +2359,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter"
 version = "0.20.10"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=7d4b0110a9e92161d247a051018ee42b0513e98d#7d4b0110a9e92161d247a051018ee42b0513e98d"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
 dependencies = [
  "cc",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index 1d10dd9b5..14ab5373c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,4 +34,4 @@ package.helix-tui.opt-level = 2
 package.helix-term.opt-level = 2
 
 [workspace.dependencies]
-tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "7d4b0110a9e92161d247a051018ee42b0513e98d" }
+tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 79fb52a79..bf167c28d 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1614,7 +1614,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
 }
 
 pub struct RopeProvider<'a>(pub RopeSlice<'a>);
-impl<'a> TextProvider<'a> for RopeProvider<'a> {
+impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
     type I = ChunksBytes<'a>;
 
     fn text(&mut self, node: Node) -> Self::I {
@@ -1628,7 +1628,7 @@ impl<'a> TextProvider<'a> for RopeProvider<'a> {
 struct HighlightIterLayer<'a> {
     _tree: Option<Tree>,
     cursor: QueryCursor,
-    captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
+    captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
     config: &'a HighlightConfiguration,
     highlight_end_stack: Vec<usize>,
     scope_stack: Vec<LocalScope<'a>>,

From 2767459f89382f2b664c2a9f5ff287f3c48a896d Mon Sep 17 00:00:00 2001
From: nkitsaini <74284503+nkitsaini@users.noreply.github.com>
Date: Sun, 20 Aug 2023 23:21:08 +0530
Subject: [PATCH 269/967] Remove path completions for `:new` command (#8010)

---
 helix-term/src/commands/typed.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 1c65fd54a..4c7314b66 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2408,9 +2408,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         aliases: &["n"],
         doc: "Create a new scratch buffer.",
         fun: new_file,
-        // TODO: This seems to complete with a filename, but doesn't use that filename to
-        //       set the path of the newly created buffer.
-        signature: CommandSignature::positional(&[completers::filename]),
+        signature: CommandSignature::none(),
     },
     TypableCommand {
         name: "format",

From 22f4f313f1cbdaadafcc3dd471f5a0bb4f7034e1 Mon Sep 17 00:00:00 2001
From: nkitsaini <74284503+nkitsaini@users.noreply.github.com>
Date: Mon, 21 Aug 2023 00:41:32 +0530
Subject: [PATCH 270/967] Remove unnecessary `Err` from
 `get_canonicalized_path` (#8009)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-core/src/path.rs           |  4 ++--
 helix-term/src/application.rs    | 13 ++-----------
 helix-term/src/commands/typed.rs |  2 +-
 helix-term/src/ui/picker.rs      | 10 +++++-----
 helix-term/tests/test/picker.rs  |  2 +-
 helix-view/src/document.rs       | 12 ++++--------
 helix-view/src/editor.rs         |  2 +-
 7 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/helix-core/src/path.rs b/helix-core/src/path.rs
index 85c602555..ede37e044 100644
--- a/helix-core/src/path.rs
+++ b/helix-core/src/path.rs
@@ -85,7 +85,7 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
 ///
 /// This function is used instead of `std::fs::canonicalize` because we don't want to verify
 /// here if the path exists, just normalize it's components.
-pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
+pub fn get_canonicalized_path(path: &Path) -> PathBuf {
     let path = expand_tilde(path);
     let path = if path.is_relative() {
         helix_loader::current_working_dir().join(path)
@@ -93,7 +93,7 @@ pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
         path
     };
 
-    Ok(get_normalized_path(path.as_path()))
+    get_normalized_path(path.as_path())
 }
 
 pub fn get_relative_path(path: &Path) -> PathBuf {
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index a97ae5033..3e9389176 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -160,7 +160,7 @@ impl Application {
             let path = helix_loader::runtime_file(Path::new("tutor"));
             editor.open(&path, Action::VerticalSplit)?;
             // Unset path to prevent accidentally saving to the original tutor file.
-            doc_mut!(editor).set_path(None)?;
+            doc_mut!(editor).set_path(None);
         } else if !args.files.is_empty() {
             let first = &args.files[0].0; // we know it's not empty
             if first.is_dir() {
@@ -554,16 +554,7 @@ impl Application {
         let bytes = doc_save_event.text.len_bytes();
 
         if doc.path() != Some(&doc_save_event.path) {
-            if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
-                log::error!(
-                    "error setting path for doc '{:?}': {}",
-                    doc.path(),
-                    err.to_string(),
-                );
-
-                self.editor.set_error(err.to_string());
-                return;
-            }
+            doc.set_path(Some(&doc_save_event.path));
 
             let loader = self.editor.syn_loader.clone();
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 4c7314b66..a7eb22448 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1679,7 +1679,7 @@ fn tutor(
     let path = helix_loader::runtime_file(Path::new("tutor"));
     cx.editor.open(&path, Action::Replace)?;
     // Unset path to prevent accidentally saving to the original tutor file.
-    doc_mut!(cx.editor).set_path(None)?;
+    doc_mut!(cx.editor).set_path(None);
     Ok(())
 }
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 5ee4c407a..b134eb47e 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -51,12 +51,12 @@ pub enum PathOrId {
 }
 
 impl PathOrId {
-    fn get_canonicalized(self) -> std::io::Result<Self> {
+    fn get_canonicalized(self) -> Self {
         use PathOrId::*;
-        Ok(match self {
-            Path(path) => Path(helix_core::path::get_canonicalized_path(&path)?),
+        match self {
+            Path(path) => Path(helix_core::path::get_canonicalized_path(&path)),
             Id(id) => Id(id),
-        })
+        }
     }
 }
 
@@ -375,7 +375,7 @@ impl<T: Item + 'static> Picker<T> {
     fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
         self.selection()
             .and_then(|current| (self.file_fn.as_ref()?)(editor, current))
-            .and_then(|(path_or_id, line)| path_or_id.get_canonicalized().ok().zip(Some(line)))
+            .map(|(path_or_id, line)| (path_or_id.get_canonicalized(), line))
     }
 
     /// Get (cached) preview for a given path. If a document corresponding
diff --git a/helix-term/tests/test/picker.rs b/helix-term/tests/test/picker.rs
index f6d1aa258..89e6531f9 100644
--- a/helix-term/tests/test/picker.rs
+++ b/helix-term/tests/test/picker.rs
@@ -30,7 +30,7 @@ async fn test_picker_alt_ret() -> anyhow::Result<()> {
     ];
     let paths = files
         .iter()
-        .map(|f| get_canonicalized_path(f.path()).unwrap())
+        .map(|f| get_canonicalized_path(f.path()))
         .collect::<Vec<_>>();
 
     fs::write(&paths[0], "1\n2\n3\n4")?;
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 3477608bd..08b57f21d 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -708,7 +708,7 @@ impl Document {
         let mut doc = Self::from(rope, Some((encoding, has_bom)), config);
 
         // set the path and try detecting the language
-        doc.set_path(Some(path))?;
+        doc.set_path(Some(path));
         if let Some(loader) = config_loader {
             doc.detect_language(loader);
         }
@@ -853,7 +853,7 @@ impl Document {
         let text = self.text().clone();
 
         let path = match path {
-            Some(path) => helix_core::path::get_canonicalized_path(&path)?,
+            Some(path) => helix_core::path::get_canonicalized_path(&path),
             None => {
                 if self.path.is_none() {
                     bail!("Can't save with no path set!");
@@ -1047,18 +1047,14 @@ impl Document {
         self.encoding
     }
 
-    pub fn set_path(&mut self, path: Option<&Path>) -> Result<(), std::io::Error> {
-        let path = path
-            .map(helix_core::path::get_canonicalized_path)
-            .transpose()?;
+    pub fn set_path(&mut self, path: Option<&Path>) {
+        let path = path.map(helix_core::path::get_canonicalized_path);
 
         // if parent doesn't exist we still want to open the document
         // and error out when document is saved
         self.path = path;
 
         self.detect_readonly();
-
-        Ok(())
     }
 
     /// Set the programming language for the file and load associated data (e.g. highlighting)
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 66542e898..1735b060f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1436,7 +1436,7 @@ impl Editor {
 
     // ??? possible use for integration tests
     pub fn open(&mut self, path: &Path, action: Action) -> Result<DocumentId, Error> {
-        let path = helix_core::path::get_canonicalized_path(path)?;
+        let path = helix_core::path::get_canonicalized_path(path);
         let id = self.document_by_path(&path).map(|doc| doc.id);
 
         let id = if let Some(id) = id {

From 75342968e23a56d4156a6c845517ea7491838b98 Mon Sep 17 00:00:00 2001
From: kaashyapan <25821867+kaashyapan@users.noreply.github.com>
Date: Mon, 21 Aug 2023 20:08:21 +0530
Subject: [PATCH 271/967] update fsharp tree-sitter (#8024)

---
 languages.toml                    |  2 +-
 runtime/queries/fsharp/locals.scm | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/fsharp/locals.scm

diff --git a/languages.toml b/languages.toml
index dc07bb2bd..2477f1ade 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2692,7 +2692,7 @@ language-servers = ["fsharp-ls"]
 
 [[grammar]]
 name = "fsharp"
-source = { git = "https://github.com/kaashyapan/tree-sitter-fsharp", rev = "1b5a315e003024db6181744f1d25b8f525732665" }
+source = { git = "https://github.com/kaashyapan/tree-sitter-fsharp", rev = "18da392fd9bd5e79f357abcce13f61f3a15e3951" }
 
 [[language]]
 name = "t32"
diff --git a/runtime/queries/fsharp/locals.scm b/runtime/queries/fsharp/locals.scm
new file mode 100644
index 000000000..aa36755ef
--- /dev/null
+++ b/runtime/queries/fsharp/locals.scm
@@ -0,0 +1,25 @@
+; Scopes
+;-------
+
+[
+  (ce_expression)
+  (module_defn)
+  (for_expression)
+  (do_expression)
+  (fun_expression)
+  (function_expression)
+  (try_expression)
+  (match_expression)
+  (elif_expression)
+  (if_expression)
+] @local.scope
+
+; Definitions
+;------------
+
+(function_or_value_defn) @local.definition
+
+; References
+;-----------
+
+(identifier) @local.reference

From 0cc94cd87a7db287a617b60b0a3f444362cf173c Mon Sep 17 00:00:00 2001
From: Mike <62124625+michaelBelsanti@users.noreply.github.com>
Date: Mon, 21 Aug 2023 12:15:45 -0400
Subject: [PATCH 272/967] goto_file_impl: use relative path to open file
 (#7965)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-term/src/commands.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 07aef95d0..1f88079eb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1160,6 +1160,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
     let (view, doc) = current_ref!(cx.editor);
     let text = doc.text();
     let selections = doc.selection(view.id);
+    let rel_path = doc
+        .relative_path()
+        .map(|path| path.parent().unwrap().to_path_buf())
+        .unwrap_or_default();
     let mut paths: Vec<_> = selections
         .iter()
         .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1190,7 +1194,7 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
     for sel in paths {
         let p = sel.trim();
         if !p.is_empty() {
-            let path = Path::new(p);
+            let path = &rel_path.join(p);
             if path.is_dir() {
                 let picker = ui::file_picker(path.into(), &cx.editor.config());
                 cx.push_layer(Box::new(overlaid(picker)));

From 454b61cb21de818b83f89de9e31f62fad70bb1b2 Mon Sep 17 00:00:00 2001
From: David Else <12832280+David-Else@users.noreply.github.com>
Date: Mon, 21 Aug 2023 20:26:32 +0100
Subject: [PATCH 273/967] Update pyright config to avoid time-outs (#8032)

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

diff --git a/languages.toml b/languages.toml
index 2477f1ade..d8fb44a6e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -55,7 +55,7 @@ perlnavigator = { command = "perlnavigator", args= ["--stdio"] }
 prisma-language-server = { command = "prisma-language-server", args = ["--stdio"] }
 purescript-language-server = { command = "purescript-language-server", args = ["--stdio"] }
 pylsp = { command = "pylsp" }
-pyright = { command = "pyright-langserver", args = ["--stdio"] }
+pyright = { command = "pyright-langserver", args = ["--stdio"], config = {} }
 pylyzer = { command = "pylyzer", args = ["--server"] }
 qmlls = { command = "qmlls" }
 r = { command = "R", args = ["--no-echo", "-e", "languageserver::run()"] }
@@ -657,7 +657,7 @@ scope = "source.python"
 injection-regex = "python"
 file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct"]
 shebangs = ["python"]
-roots = ["pyproject.toml", "setup.py", "poetry.lock","pyrightconfig.json"]
+roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
 comment-token = "#"
 language-servers = [ "pylsp" ]
 # TODO: pyls needs utf-8 offsets

From e5f8d8ef049b43d20eaf27b4f143bcf808f6cb24 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 21 Aug 2023 23:24:30 +0200
Subject: [PATCH 274/967] create separate timer for redraw requests (#8023)

* create separate timer for redraw requests

* Update helix-view/src/editor.rs

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-term/src/application.rs |  3 +++
 helix-view/src/editor.rs      | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 3e9389176..97ba0cc32 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -598,6 +598,9 @@ impl Application {
                     self.render().await;
                 }
             }
+            EditorEvent::Redraw => {
+                self.render().await;
+            }
             EditorEvent::IdleTimer => {
                 self.editor.clear_idle_timer();
                 self.handle_idle_timeout().await;
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 1735b060f..94d0a852b 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -918,6 +918,7 @@ pub struct Editor {
     pub auto_pairs: Option<AutoPairs>,
 
     pub idle_timer: Pin<Box<Sleep>>,
+    redraw_timer: Pin<Box<Sleep>>,
     last_motion: Option<Motion>,
     pub last_completion: Option<CompleteAction>,
 
@@ -963,6 +964,7 @@ pub enum EditorEvent {
     LanguageServerMessage((usize, Call)),
     DebuggerEvent(dap::Payload),
     IdleTimer,
+    Redraw,
 }
 
 #[derive(Debug, Clone)]
@@ -1053,6 +1055,7 @@ impl Editor {
             status_msg: None,
             autoinfo: None,
             idle_timer: Box::pin(sleep(conf.idle_timeout)),
+            redraw_timer: Box::pin(sleep(Duration::MAX)),
             last_motion: None,
             last_completion: None,
             config,
@@ -1753,12 +1756,16 @@ impl Editor {
                     if  !self.needs_redraw{
                         self.needs_redraw = true;
                         let timeout = Instant::now() + Duration::from_millis(33);
-                        if timeout < self.idle_timer.deadline(){
-                            self.idle_timer.as_mut().reset(timeout)
+                        if timeout < self.idle_timer.deadline() && timeout < self.redraw_timer.deadline(){
+                            self.redraw_timer.as_mut().reset(timeout)
                         }
                     }
                 }
 
+                _ = &mut self.redraw_timer  => {
+                    self.redraw_timer.as_mut().reset(Instant::now() + Duration::from_secs(86400 * 365 * 30));
+                    return EditorEvent::Redraw
+                }
                 _ = &mut self.idle_timer  => {
                     return EditorEvent::IdleTimer
                 }

From d7e4d07943acee8d88b7936f0ddb74d91b2ff17e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:47:29 +0900
Subject: [PATCH 275/967] build(deps): bump anyhow from 1.0.72 to 1.0.75
 (#8035)

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

---
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 c7c0ceecb..6a7d2cb72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,9 +81,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.72"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arc-swap"

From 52d5bc0eefa3898d5f8d6c7f38ab4160ff4747b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:49:01 +0900
Subject: [PATCH 276/967] build(deps): bump cc from 1.0.79 to 1.0.83 (#8037)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.79 to 1.0.83.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.79...1.0.83)

---
updated-dependencies:
- dependency-name: cc
  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 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a7d2cb72..d14890dd9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -170,9 +170,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cfg-if"

From 10f75ac67a4e45f8b8ab3153f2614a4197e681be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:49:15 +0900
Subject: [PATCH 277/967] build(deps): bump tempfile from 3.7.1 to 3.8.0
 (#8038)

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.7.1 to 3.8.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.7.1...v3.8.0)

---
updated-dependencies:
- dependency-name: tempfile
  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-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-vcs/Cargo.toml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d14890dd9..6495cff02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2161,9 +2161,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.7.1"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if",
  "fastrand",
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index e415cfe04..8e52e9725 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -28,7 +28,7 @@ which = "4.4"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.7.1"
+tempfile = "3.8.0"
 dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index d6b1692c4..a56d53f84 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -79,4 +79,4 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.11"
 indoc = "2.0.3"
-tempfile = "3.7.1"
+tempfile = "3.8.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 9f3cc7c89..eb0dd4763 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -27,4 +27,4 @@ log = "0.4"
 git = ["gix"]
 
 [dev-dependencies]
-tempfile = "3.7"
\ No newline at end of file
+tempfile = "3.8"
\ No newline at end of file

From 2123b993fc7a4f34fe59a702e8dbea2574d5ac0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:49:28 +0900
Subject: [PATCH 278/967] build(deps): bump thiserror from 1.0.44 to 1.0.47
 (#8039)

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

---
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 6495cff02..3ed53ba2a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2203,18 +2203,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.44"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.44"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
 dependencies = [
  "proc-macro2",
  "quote",

From 4ac4055fd5ea00cda3b604a32e4acd36300fc681 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 16:57:19 +0200
Subject: [PATCH 279/967] build(deps): bump serde from 1.0.183 to 1.0.185
 (#8034)

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 3ed53ba2a..e9ecca936 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1971,18 +1971,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.183"
+version = "1.0.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
+checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.183"
+version = "1.0.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
+checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
 dependencies = [
  "proc-macro2",
  "quote",

From c3442f3a18fb5c6a2d69ae63f6dede45376a6c20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 23:56:16 +0000
Subject: [PATCH 280/967] build(deps): bump crossterm from 0.26.1 to 0.27.0

Bumps [crossterm](https://github.com/crossterm-rs/crossterm) from 0.26.1 to 0.27.0.
- [Release notes](https://github.com/crossterm-rs/crossterm/releases)
- [Changelog](https://github.com/crossterm-rs/crossterm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crossterm-rs/crossterm/compare/0.26.1...0.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock            | 10 +++++-----
 helix-term/Cargo.toml |  2 +-
 helix-tui/Cargo.toml  |  2 +-
 helix-view/Cargo.toml |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e9ecca936..978b14cf1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -259,11 +259,11 @@ dependencies = [
 
 [[package]]
 name = "crossterm"
-version = "0.26.1"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "crossterm_winapi",
  "filedescriptor",
  "futures-core",
@@ -277,9 +277,9 @@ dependencies = [
 
 [[package]]
 name = "crossterm_winapi"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
 dependencies = [
  "winapi",
 ]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index a56d53f84..a64a86a2f 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -37,7 +37,7 @@ which = "4.4"
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
-crossterm = { version = "0.26", features = ["event-stream"] }
+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 }
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 92f46fb23..245a6eea8 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -19,7 +19,7 @@ default = ["crossterm"]
 bitflags = "2.4"
 cassowary = "0.3"
 unicode-segmentation = "1.10"
-crossterm = { version = "0.26", optional = true }
+crossterm = { version = "0.27", optional = true }
 termini = "1.0"
 serde = { version = "1", "optional" = true, features = ["derive"]}
 once_cell = "1.18"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 1f6d84232..daaac59d1 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -20,7 +20,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 helix-lsp = { version = "0.6", path = "../helix-lsp" }
 helix-dap = { version = "0.6", path = "../helix-dap" }
-crossterm = { version = "0.26", optional = true }
+crossterm = { version = "0.27", optional = true }
 helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits

From e8fef6b6fc241ced0165199f0c36c6dd6e1c142e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 22 Aug 2023 09:49:13 -0500
Subject: [PATCH 281/967] Bump crossterm to 0.27 in helix-term on macos

---
 helix-term/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index a64a86a2f..29c2eea7d 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -71,7 +71,7 @@ signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
 libc = "0.2.147"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-crossterm = { version = "0.26", features = ["event-stream", "use-dev-tty"] }
+crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
 
 [build-dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }

From 050c019ccb4473e24f7e55cc941e7178db776fb8 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 22 Aug 2023 09:49:22 -0500
Subject: [PATCH 282/967] Translate new ScrollLeft/ScrollRight crossterm mouse
 events

---
 helix-view/src/input.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index 5566a265b..87a0bfcaa 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -43,6 +43,10 @@ pub enum MouseEventKind {
     ScrollDown,
     /// Scrolled mouse wheel upwards (away from the user).
     ScrollUp,
+    /// Scrolled mouse wheel leftwards.
+    ScrollLeft,
+    /// Scrolled mouse wheel rightwards.
+    ScrollRight,
 }
 
 /// Represents a mouse button.
@@ -458,6 +462,8 @@ impl From<crossterm::event::MouseEventKind> for MouseEventKind {
             crossterm::event::MouseEventKind::Moved => Self::Moved,
             crossterm::event::MouseEventKind::ScrollDown => Self::ScrollDown,
             crossterm::event::MouseEventKind::ScrollUp => Self::ScrollUp,
+            crossterm::event::MouseEventKind::ScrollLeft => Self::ScrollLeft,
+            crossterm::event::MouseEventKind::ScrollRight => Self::ScrollRight,
         }
     }
 }

From 546c8ca344afe67add59af65b5548d98975d3687 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 22 Aug 2023 09:49:54 -0500
Subject: [PATCH 283/967] Handle switch from crossterm::Result to io::Result

---
 helix-term/src/application.rs      | 11 +++---
 helix-tui/src/backend/crossterm.rs | 58 ++++++++++++++----------------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 97ba0cc32..8d5b1ceb2 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -288,7 +288,7 @@ impl Application {
 
     pub async fn event_loop<S>(&mut self, input_stream: &mut S)
     where
-        S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
+        S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
     {
         self.render().await;
 
@@ -301,7 +301,7 @@ impl Application {
 
     pub async fn event_loop_until_idle<S>(&mut self, input_stream: &mut S) -> bool
     where
-        S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
+        S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
     {
         loop {
             if self.editor.should_close() {
@@ -615,10 +615,7 @@ impl Application {
         false
     }
 
-    pub async fn handle_terminal_events(
-        &mut self,
-        event: Result<CrosstermEvent, crossterm::ErrorKind>,
-    ) {
+    pub async fn handle_terminal_events(&mut self, event: std::io::Result<CrosstermEvent>) {
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
             jobs: &mut self.jobs,
@@ -1159,7 +1156,7 @@ impl Application {
 
     pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
     where
-        S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
+        S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
     {
         self.claim_term().await?;
 
diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 0c32028ec..d276dea0c 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -201,7 +201,7 @@ where
         for (x, y, cell) in content {
             // Move the cursor if the previous location was not (x - 1, y)
             if !matches!(last_pos, Some(p) if x == p.0 + 1 && y == p.1) {
-                map_error(queue!(self.buffer, MoveTo(x, y)))?;
+                queue!(self.buffer, MoveTo(x, y))?;
             }
             last_pos = Some((x, y));
             if cell.modifier != modifier {
@@ -214,12 +214,12 @@ where
             }
             if cell.fg != fg {
                 let color = CColor::from(cell.fg);
-                map_error(queue!(self.buffer, SetForegroundColor(color)))?;
+                queue!(self.buffer, SetForegroundColor(color))?;
                 fg = cell.fg;
             }
             if cell.bg != bg {
                 let color = CColor::from(cell.bg);
-                map_error(queue!(self.buffer, SetBackgroundColor(color)))?;
+                queue!(self.buffer, SetBackgroundColor(color))?;
                 bg = cell.bg;
             }
 
@@ -227,7 +227,7 @@ where
             if self.capabilities.has_extended_underlines {
                 if cell.underline_color != underline_color {
                     let color = CColor::from(cell.underline_color);
-                    map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
+                    queue!(self.buffer, SetUnderlineColor(color))?;
                     underline_color = cell.underline_color;
                 }
             } else {
@@ -239,24 +239,24 @@ where
 
             if new_underline_style != underline_style {
                 let attr = CAttribute::from(new_underline_style);
-                map_error(queue!(self.buffer, SetAttribute(attr)))?;
+                queue!(self.buffer, SetAttribute(attr))?;
                 underline_style = new_underline_style;
             }
 
-            map_error(queue!(self.buffer, Print(&cell.symbol)))?;
+            queue!(self.buffer, Print(&cell.symbol))?;
         }
 
-        map_error(queue!(
+        queue!(
             self.buffer,
             SetUnderlineColor(CColor::Reset),
             SetForegroundColor(CColor::Reset),
             SetBackgroundColor(CColor::Reset),
             SetAttribute(CAttribute::Reset)
-        ))
+        )
     }
 
     fn hide_cursor(&mut self) -> io::Result<()> {
-        map_error(execute!(self.buffer, Hide))
+        execute!(self.buffer, Hide)
     }
 
     fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
@@ -266,7 +266,7 @@ where
             CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
             CursorKind::Hidden => unreachable!(),
         };
-        map_error(execute!(self.buffer, Show, shape))
+        execute!(self.buffer, Show, shape)
     }
 
     fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
@@ -275,11 +275,11 @@ where
     }
 
     fn set_cursor(&mut self, x: u16, y: u16) -> io::Result<()> {
-        map_error(execute!(self.buffer, MoveTo(x, y)))
+        execute!(self.buffer, MoveTo(x, y))
     }
 
     fn clear(&mut self) -> io::Result<()> {
-        map_error(execute!(self.buffer, Clear(ClearType::All)))
+        execute!(self.buffer, Clear(ClearType::All))
     }
 
     fn size(&self) -> io::Result<Rect> {
@@ -294,10 +294,6 @@ where
     }
 }
 
-fn map_error(error: crossterm::Result<()>) -> io::Result<()> {
-    error.map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))
-}
-
 #[derive(Debug)]
 struct ModifierDiff {
     pub from: Modifier,
@@ -312,48 +308,48 @@ impl ModifierDiff {
         //use crossterm::Attribute;
         let removed = self.from - self.to;
         if removed.contains(Modifier::REVERSED) {
-            map_error(queue!(w, SetAttribute(CAttribute::NoReverse)))?;
+            queue!(w, SetAttribute(CAttribute::NoReverse))?;
         }
         if removed.contains(Modifier::BOLD) {
-            map_error(queue!(w, SetAttribute(CAttribute::NormalIntensity)))?;
+            queue!(w, SetAttribute(CAttribute::NormalIntensity))?;
             if self.to.contains(Modifier::DIM) {
-                map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
+                queue!(w, SetAttribute(CAttribute::Dim))?;
             }
         }
         if removed.contains(Modifier::ITALIC) {
-            map_error(queue!(w, SetAttribute(CAttribute::NoItalic)))?;
+            queue!(w, SetAttribute(CAttribute::NoItalic))?;
         }
         if removed.contains(Modifier::DIM) {
-            map_error(queue!(w, SetAttribute(CAttribute::NormalIntensity)))?;
+            queue!(w, SetAttribute(CAttribute::NormalIntensity))?;
         }
         if removed.contains(Modifier::CROSSED_OUT) {
-            map_error(queue!(w, SetAttribute(CAttribute::NotCrossedOut)))?;
+            queue!(w, SetAttribute(CAttribute::NotCrossedOut))?;
         }
         if removed.contains(Modifier::SLOW_BLINK) || removed.contains(Modifier::RAPID_BLINK) {
-            map_error(queue!(w, SetAttribute(CAttribute::NoBlink)))?;
+            queue!(w, SetAttribute(CAttribute::NoBlink))?;
         }
 
         let added = self.to - self.from;
         if added.contains(Modifier::REVERSED) {
-            map_error(queue!(w, SetAttribute(CAttribute::Reverse)))?;
+            queue!(w, SetAttribute(CAttribute::Reverse))?;
         }
         if added.contains(Modifier::BOLD) {
-            map_error(queue!(w, SetAttribute(CAttribute::Bold)))?;
+            queue!(w, SetAttribute(CAttribute::Bold))?;
         }
         if added.contains(Modifier::ITALIC) {
-            map_error(queue!(w, SetAttribute(CAttribute::Italic)))?;
+            queue!(w, SetAttribute(CAttribute::Italic))?;
         }
         if added.contains(Modifier::DIM) {
-            map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
+            queue!(w, SetAttribute(CAttribute::Dim))?;
         }
         if added.contains(Modifier::CROSSED_OUT) {
-            map_error(queue!(w, SetAttribute(CAttribute::CrossedOut)))?;
+            queue!(w, SetAttribute(CAttribute::CrossedOut))?;
         }
         if added.contains(Modifier::SLOW_BLINK) {
-            map_error(queue!(w, SetAttribute(CAttribute::SlowBlink)))?;
+            queue!(w, SetAttribute(CAttribute::SlowBlink))?;
         }
         if added.contains(Modifier::RAPID_BLINK) {
-            map_error(queue!(w, SetAttribute(CAttribute::RapidBlink)))?;
+            queue!(w, SetAttribute(CAttribute::RapidBlink))?;
         }
 
         Ok(())
@@ -407,7 +403,7 @@ impl Command for SetUnderlineColor {
     }
 
     #[cfg(windows)]
-    fn execute_winapi(&self) -> crossterm::Result<()> {
+    fn execute_winapi(&self) -> io::Result<()> {
         Err(std::io::Error::new(
             std::io::ErrorKind::Other,
             "SetUnderlineColor not supported by winapi.",

From 75c5a33028f2b0502af45488d1a61f547ee87ec8 Mon Sep 17 00:00:00 2001
From: arslee07 <arslee07@gmail.com>
Date: Thu, 24 Aug 2023 01:11:51 +0900
Subject: [PATCH 284/967] Highlight Dart 3 `sealed` and `base` keywords (#7974)

---
 runtime/queries/dart/highlights.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/dart/highlights.scm b/runtime/queries/dart/highlights.scm
index 9f667d6be..dab584962 100644
--- a/runtime/queries/dart/highlights.scm
+++ b/runtime/queries/dart/highlights.scm
@@ -200,6 +200,7 @@
     "async"
     "async*"
     "await"
+    "base"
     "class"
     "covariant"
     "deferred"
@@ -219,6 +220,7 @@
     "operator"
     "part"
     "required"
+    "sealed"
     "set"
     "show"
     "static"
@@ -230,7 +232,7 @@
 
 ; when used as an identifier:
 ((identifier) @variable.builtin
- (#match? @variable.builtin "^(abstract|as|covariant|deferred|dynamic|export|external|factory|Function|get|implements|import|interface|library|operator|mixin|part|set|static|typedef)$"))
+ (#match? @variable.builtin "^(abstract|as|base|covariant|deferred|dynamic|export|external|factory|Function|get|implements|import|interface|library|operator|mixin|part|sealed|set|static|typedef)$"))
 
 ; Error
 (ERROR) @error

From c9694f680f97823ac9b893239a78bf45bfee0403 Mon Sep 17 00:00:00 2001
From: David Else <12832280+David-Else@users.noreply.github.com>
Date: Wed, 23 Aug 2023 20:03:19 +0100
Subject: [PATCH 285/967] Add ltex-ls language server (#7838)

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

diff --git a/languages.toml b/languages.toml
index d8fb44a6e..ca8e68154 100644
--- a/languages.toml
+++ b/languages.toml
@@ -38,6 +38,7 @@ jsonnet-language-server = { command = "jsonnet-language-server", args= ["-t", "-
 julia = { command = "julia", timeout = 60, args = [ "--startup-file=no", "--history-file=no", "--quiet", "-e", "using LanguageServer; runserver()", ] }
 kotlin-language-server = { command = "kotlin-language-server" }
 lean = { command = "lean", args = [ "--server" ] }
+ltex-ls = { command = "ltex-ls" }
 markdoc-ls = { command = "markdoc-ls", args = ["--stdio"] }
 marksman = { command = "marksman", args = ["server"] }
 metals = { command = "metals", config = { "isHttpEnabled" = true } }

From aeaeb09f486c2bc7f8c563bceece03a0954576b9 Mon Sep 17 00:00:00 2001
From: Sol Fisher Romanoff <sol@solfisher.com>
Date: Sun, 27 Aug 2023 01:43:18 +0300
Subject: [PATCH 286/967] add gemini language support (#8070)

---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 10 ++++++++++
 runtime/queries/gemini/highlights.scm | 26 ++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 runtime/queries/gemini/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 1287c11ff..596b62bab 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -45,6 +45,7 @@
 | fortran | ✓ |  | ✓ | `fortls` |
 | fsharp | ✓ |  |  | `fsautocomplete` |
 | gdscript | ✓ | ✓ | ✓ |  |
+| gemini | ✓ |  |  |  |
 | git-attributes | ✓ |  |  |  |
 | git-commit | ✓ | ✓ |  |  |
 | git-config | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index ca8e68154..c0b4bc6e7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2794,3 +2794,13 @@ roots = []
 [[grammar]]
 name = "strace"
 source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "a0f6c50ae4087a9299f055d0f30fe94fd98189a4" }
+
+[[language]]
+name = "gemini"
+scope = "source.gmi"
+file-types = ["gmi"]
+roots = []
+
+[[grammar]]
+name = "gemini"
+source = { git = "https://git.sr.ht/~sfr/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
diff --git a/runtime/queries/gemini/highlights.scm b/runtime/queries/gemini/highlights.scm
new file mode 100644
index 000000000..f98c85326
--- /dev/null
+++ b/runtime/queries/gemini/highlights.scm
@@ -0,0 +1,26 @@
+(link) @punctuation.bracket
+(link 
+  label: (text) @markup.link.label)
+(link
+  uri: (uri) @markup.link.url)
+
+[
+  (start_pre)
+  (pre)
+  (end_pre)
+] @markup.raw.block
+(start_pre
+  alt: (text) @label)
+
+(heading1
+  (text) @markup.heading.1) @markup.heading.marker
+(heading2
+  (text) @markup.heading.2) @markup.heading.marker
+(heading3
+  (text) @markup.heading.3) @markup.heading.marker
+
+(ulist
+  (indicator) @markup.list.unnumbered) 
+(quote
+  (indicator) @markup.quote
+  (text) @markup.italic)

From 9f843e4f56abf6cef38ff8aca8e0b97e249c1cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Mon, 28 Aug 2023 03:07:51 +0200
Subject: [PATCH 287/967] highlight(matlab): bumps grammar after some
 improvements (#8040)

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

diff --git a/languages.toml b/languages.toml
index c0b4bc6e7..fbd31f01b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2351,7 +2351,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "matlab"
-source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "676117eafa64afedc8380a921a77cd9f2244bc6b" }
+source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "6071891a8c39600203eba20513666cf93b4d650a" }
 
 [[language]]
 name = "ponylang"

From 992c858369192b37fe3c22694ff0d8e6a4cd3b96 Mon Sep 17 00:00:00 2001
From: sigmaSd <bedisnbiba@gmail.com>
Date: Mon, 28 Aug 2023 10:44:28 +0100
Subject: [PATCH 288/967] chore: update strace tree sitter grammar (#8087)

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

diff --git a/languages.toml b/languages.toml
index fbd31f01b..1f66ab807 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2793,7 +2793,7 @@ roots = []
 
 [[grammar]]
 name = "strace"
-source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "a0f6c50ae4087a9299f055d0f30fe94fd98189a4" }
+source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "2b18fdf9a01e7ec292cc6006724942c81beb7fd5" }
 
 [[language]]
 name = "gemini"

From 072e1eae9235a5d43e555d409cd6cf9889c266bf Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 28 Aug 2023 04:44:49 -0500
Subject: [PATCH 289/967] Update tree-sitter-gleam, enable auto-format (#8085)

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

diff --git a/languages.toml b/languages.toml
index 1f66ab807..e8baddb9e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1541,10 +1541,11 @@ roots = ["gleam.toml"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "gleam" ]
+auto-format = true
 
 [[grammar]]
 name = "gleam"
-source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "ae79782c00656945db69641378e688cdb78d52c1" }
+source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a" }
 
 [[language]]
 name = "ron"

From 79c04251547e6c0c21366d322e268a6581c0f5dd Mon Sep 17 00:00:00 2001
From: Damir Vandic <info@dvic.io>
Date: Tue, 29 Aug 2023 01:03:54 +0200
Subject: [PATCH 290/967] Sync latest catppuccin theme changes (#8102)

---
 runtime/themes/catppuccin_frappe.toml    |  2 ++
 runtime/themes/catppuccin_latte.toml     |  2 ++
 runtime/themes/catppuccin_macchiato.toml |  2 ++
 runtime/themes/catppuccin_mocha.toml     | 11 +++++++++++
 4 files changed, 17 insertions(+)

diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml
index eb1d47194..b63e5270e 100644
--- a/runtime/themes/catppuccin_frappe.toml
+++ b/runtime/themes/catppuccin_frappe.toml
@@ -34,3 +34,5 @@ crust = "#232634"
 # derived colors by blending existing palette colors
 cursorline = "#3b3f52"
 secondary_cursor = "#b8a5a6"
+secondary_cursor_normal = "#9193be"
+secondary_cursor_insert = "#83a275"
diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml
index e1580c9d7..7a015168e 100644
--- a/runtime/themes/catppuccin_latte.toml
+++ b/runtime/themes/catppuccin_latte.toml
@@ -34,3 +34,5 @@ crust = "#dce0e8"
 # derived colors by blending existing palette colors
 cursorline = "#e9ebf1"
 secondary_cursor = "#e2a99e"
+secondary_cursor_normal = "#98a7fb"
+secondary_cursor_insert = "#75b868"
diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml
index e09a82f9b..6203eaade 100644
--- a/runtime/themes/catppuccin_macchiato.toml
+++ b/runtime/themes/catppuccin_macchiato.toml
@@ -34,3 +34,5 @@ crust = "#181926"
 # derived colors by blending existing palette colors
 cursorline = "#303347"
 secondary_cursor = "#b6a5a7"
+secondary_cursor_normal = "#8b90bf"
+secondary_cursor_insert = "#7fa47a"
diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index 126613bc7..1ea57e960 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -83,6 +83,7 @@
 
 "ui.text" = "text"
 "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+"ui.text.inactive" = { fg = "overlay1" }
 
 "ui.virtual" = "overlay0"
 "ui.virtual.ruler" = { bg = "surface0" }
@@ -95,6 +96,14 @@
 "ui.cursor.primary" = { fg = "base", bg = "rosewater" }
 "ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
 
+"ui.cursor.primary.normal" = { fg = "base", bg = "lavender" }
+"ui.cursor.primary.insert" = { fg = "base", bg = "green" }
+"ui.cursor.primary.select" = { fg = "base", bg = "flamingo" }
+
+"ui.cursor.normal" = { fg = "base", bg = "secondary_cursor_normal" }
+"ui.cursor.insert" = { fg = "base", bg = "secondary_cursor_insert" }
+"ui.cursor.select" = { fg = "base", bg = "secondary_cursor" }
+
 "ui.cursorline.primary" = { bg = "cursorline" }
 
 "ui.highlight" = { bg = "surface1", modifiers = ["bold"] }
@@ -146,3 +155,5 @@ crust = "#11111b"
 # derived colors by blending existing palette colors
 cursorline = "#2a2b3c"
 secondary_cursor = "#b5a6a8"
+secondary_cursor_normal = "#878ec0"
+secondary_cursor_insert = "#7da87e"

From bcbad25e78df8d46945fe04a6768d0f0bd43b3df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:11:45 +0900
Subject: [PATCH 291/967] build(deps): bump regex from 1.9.3 to 1.9.4 (#8106)

Bumps [regex](https://github.com/rust-lang/regex) from 1.9.3 to 1.9.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.9.3...1.9.4)

---
updated-dependencies:
- dependency-name: regex
  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 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 978b14cf1..6ad6fa02e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1866,25 +1866,25 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.3"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
  "regex-automata",
- "regex-syntax 0.7.4",
+ "regex-syntax 0.7.5",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
- "regex-syntax 0.7.4",
+ "regex-syntax 0.7.5",
 ]
 
 [[package]]
@@ -1895,9 +1895,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "ropey"

From 92652638be791f5533ebf60de7c97ce37c80a053 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:12:00 +0900
Subject: [PATCH 292/967] build(deps): bump tokio from 1.31.0 to 1.32.0 (#8105)

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

---
updated-dependencies:
- dependency-name: tokio
  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-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ad6fa02e..9e3e3d023 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2286,9 +2286,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.31.0"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 47aeb1fcd..19bc94d6e 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -25,7 +25,7 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.31", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.32", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
 which = "4.4"
 parking_lot = "0.12.1"

From d71e58c1ba3c08481165a97c3bc5f877113c3815 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:13:27 +0900
Subject: [PATCH 293/967] build(deps): bump encoding_rs from 0.8.32 to 0.8.33
 (#8104)

Bumps [encoding_rs](https://github.com/hsivonen/encoding_rs) from 0.8.32 to 0.8.33.
- [Commits](https://github.com/hsivonen/encoding_rs/compare/v0.8.32...v0.8.33)

---
updated-dependencies:
- dependency-name: encoding_rs
  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 9e3e3d023..229913060 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -342,9 +342,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]

From 3ac2ac6dd6c517cf5e0d4a26a26c1343c45fbbde Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:13:50 +0900
Subject: [PATCH 294/967] build(deps): bump log from 0.4.19 to 0.4.20 (#8103)

Bumps [log](https://github.com/rust-lang/log) from 0.4.19 to 0.4.20.
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/compare/0.4.19...0.4.20)

---
updated-dependencies:
- dependency-name: log
  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 229913060..b9116b419 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1613,9 +1613,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lsp-types"

From 82cd44571569216bb18f37ee22965045574bdd1a Mon Sep 17 00:00:00 2001
From: West <c.westrom@westrom.xyz>
Date: Tue, 29 Aug 2023 06:18:27 +0000
Subject: [PATCH 295/967] add `reset` to the color palette (#8083)

---
 book/src/themes.md      | 1 +
 helix-view/src/theme.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/book/src/themes.md b/book/src/themes.md
index 41a3fe101..d1518de80 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -70,6 +70,7 @@ over it and is merged into the default palette.
 
 | Color Name      |
 | ---             |
+| `reset`         |
 | `black`         |
 | `red`           |
 | `green`         |
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index bf3379ca9..7a9aae51e 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -359,6 +359,7 @@ impl Default for ThemePalette {
     fn default() -> Self {
         Self {
             palette: hashmap! {
+                "reset".to_string() => Color::Reset,
                 "black".to_string() => Color::Black,
                 "red".to_string() => Color::Red,
                 "green".to_string() => Color::Green,

From b67d2c3a68cf91cac6732a49a6737198717d3350 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Tue, 29 Aug 2023 10:00:55 +0300
Subject: [PATCH 296/967] fix: line numbers remain relative when helix loses
 focus (#7955)

* fix: line numbers remain relative when helix loses focus

If `line number = relative` and a new window is opened in helix, lines inside unfocused windows will be `absolute`. This commit adds the same thing when helix becomes unfocused in a terminal emulator.

* partial rebase
---
 helix-term/src/ui/editor.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index aa159d40d..0840749f8 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -43,6 +43,8 @@ pub struct EditorView {
     pub(crate) last_insert: (commands::MappableCommand, Vec<InsertEvent>),
     pub(crate) completion: Option<Completion>,
     spinners: ProgressSpinners,
+    /// Tracks if the terminal window is focused by reaction to terminal focus events
+    terminal_focused: bool,
 }
 
 #[derive(Debug, Clone)]
@@ -71,6 +73,7 @@ impl EditorView {
             last_insert: (commands::MappableCommand::normal_mode, Vec::new()),
             completion: None,
             spinners: ProgressSpinners::default(),
+            terminal_focused: true,
         }
     }
 
@@ -171,7 +174,7 @@ impl EditorView {
                 view,
                 view.area,
                 theme,
-                is_focused,
+                is_focused & self.terminal_focused,
                 &mut line_decorations,
             );
         }
@@ -1372,13 +1375,17 @@ impl Component for EditorView {
 
             Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
             Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
-            Event::FocusGained => EventResult::Ignored(None),
+            Event::FocusGained => {
+                self.terminal_focused = true;
+                EventResult::Consumed(None)
+            }
             Event::FocusLost => {
                 if context.editor.config().auto_save {
                     if let Err(e) = commands::typed::write_all_impl(context, false, false) {
                         context.editor.set_error(format!("{}", e));
                     }
                 }
+                self.terminal_focused = false;
                 EventResult::Consumed(None)
             }
         }

From 40d7e6c9c85d4f1ce2345f6e9d59fc091243124d Mon Sep 17 00:00:00 2001
From: Tanguy <Dragonink@users.noreply.github.com>
Date: Tue, 29 Aug 2023 09:22:03 +0200
Subject: [PATCH 297/967] Copy desktop and icon files to Nix output (#7979)

---
 flake.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index fc9d8c443..40d0549bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,6 @@
           ".ignore"
           ".github"
           ".gitignore"
-          "logo.svg"
           "logo_dark.svg"
           "logo_light.svg"
           "rust-toolchain.toml"
@@ -51,7 +50,6 @@
           "runtime"
           "screenshot.png"
           "book"
-          "contrib"
           "docs"
           "README.md"
           "CHANGELOG.md"
@@ -142,6 +140,12 @@
         helix-unwrapped = craneLib.buildPackage (commonArgs
           // {
             inherit cargoArtifacts;
+            postInstall = ''
+              mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
+              cp contrib/Helix.desktop $out/share/applications
+              cp logo.svg $out/share/icons/hicolor/scalable/apps/helix.svg
+              cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
+            '';
           });
         helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
         default = self.packages.${system}.helix;

From 0cb595e226c9970989ee1e680ae6b8011d188cbf Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 30 Aug 2023 06:26:21 +0200
Subject: [PATCH 298/967] transition to nucleo for fuzzy matching (#7814)

* transition to nucleo for fuzzy matching

* drop flakey test case

since the picker streams in results now any test that relies
on the picker containing results is potentially flakely

* use crates.io version of nucleo

* Fix typo in commands.rs

Co-authored-by: Skyler Hawthorne <skyler@dead10ck.com>

---------

Co-authored-by: Skyler Hawthorne <skyler@dead10ck.com>
---
 Cargo.lock                            | 126 +++++-
 Cargo.toml                            |   2 +
 helix-core/Cargo.toml                 |   3 +
 helix-core/src/fuzzy.rs               |  43 ++
 helix-core/src/lib.rs                 |   1 +
 helix-event/Cargo.toml                |  15 +
 helix-event/src/lib.rs                |   8 +
 helix-event/src/redraw.rs             |  49 +++
 helix-term/Cargo.toml                 |   3 +-
 helix-term/src/application.rs         |  12 +-
 helix-term/src/commands.rs            | 295 +++++++-------
 helix-term/src/commands/typed.rs      |  38 +-
 helix-term/src/ui/fuzzy_match.rs      | 239 -----------
 helix-term/src/ui/fuzzy_match/test.rs |  47 ---
 helix-term/src/ui/menu.rs             |  51 ++-
 helix-term/src/ui/mod.rs              | 184 +++------
 helix-term/src/ui/picker.rs           | 545 +++++++++++++-------------
 helix-term/tests/integration.rs       |   1 -
 helix-term/tests/test/picker.rs       |  80 ----
 helix-vcs/Cargo.toml                  |   1 +
 helix-vcs/src/diff.rs                 |  25 +-
 helix-vcs/src/diff/worker.rs          |  12 +-
 helix-vcs/src/diff/worker/test.rs     |   6 +-
 helix-view/Cargo.toml                 |   1 +
 helix-view/src/document.rs            |   9 +-
 helix-view/src/editor.rs              |  13 +-
 26 files changed, 757 insertions(+), 1052 deletions(-)
 create mode 100644 helix-core/src/fuzzy.rs
 create mode 100644 helix-event/Cargo.toml
 create mode 100644 helix-event/src/lib.rs
 create mode 100644 helix-event/src/redraw.rs
 delete mode 100644 helix-term/src/ui/fuzzy_match.rs
 delete mode 100644 helix-term/src/ui/fuzzy_match/test.rs
 delete mode 100644 helix-term/tests/test/picker.rs

diff --git a/Cargo.lock b/Cargo.lock
index b9116b419..406162f1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -248,6 +248,12 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
+[[package]]
+name = "cov-mark"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3"
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -257,6 +263,49 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crossterm"
 version = "0.27.0"
@@ -505,15 +554,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fuzzy-matcher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
-dependencies = [
- "thread_local",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.9"
@@ -1227,7 +1267,9 @@ dependencies = [
  "imara-diff",
  "indoc",
  "log",
+ "nucleo",
  "once_cell",
+ "parking_lot",
  "quickcheck",
  "regex",
  "ropey",
@@ -1259,6 +1301,14 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "helix-event"
+version = "0.6.0"
+dependencies = [
+ "parking_lot",
+ "tokio",
+]
+
 [[package]]
 name = "helix-loader"
 version = "0.6.0"
@@ -1315,11 +1365,11 @@ dependencies = [
  "crossterm",
  "fern",
  "futures-util",
- "fuzzy-matcher",
  "grep-regex",
  "grep-searcher",
  "helix-core",
  "helix-dap",
+ "helix-event",
  "helix-loader",
  "helix-lsp",
  "helix-tui",
@@ -1329,6 +1379,7 @@ dependencies = [
  "indoc",
  "libc",
  "log",
+ "nucleo",
  "once_cell",
  "pulldown-cmark",
  "serde",
@@ -1367,6 +1418,7 @@ dependencies = [
  "arc-swap",
  "gix",
  "helix-core",
+ "helix-event",
  "imara-diff",
  "log",
  "parking_lot",
@@ -1387,6 +1439,7 @@ dependencies = [
  "futures-util",
  "helix-core",
  "helix-dap",
+ "helix-event",
  "helix-loader",
  "helix-lsp",
  "helix-tui",
@@ -1654,6 +1707,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -1700,6 +1762,28 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nucleo"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ccab936f2c8ad271bb31430944d98d358f74153566ea323265497f5639b11b6"
+dependencies = [
+ "nucleo-matcher",
+ "parking_lot",
+ "rayon",
+]
+
+[[package]]
+name = "nucleo-matcher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57"
+dependencies = [
+ "cov-mark",
+ "memchr",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.15"
@@ -1846,6 +1930,28 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
diff --git a/Cargo.toml b/Cargo.toml
index 14ab5373c..8ffe0fa7a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ members = [
   "helix-term",
   "helix-tui",
   "helix-lsp",
+  "helix-event",
   "helix-dap",
   "helix-loader",
   "helix-vcs",
@@ -35,3 +36,4 @@ package.helix-term.opt-level = 2
 
 [workspace.dependencies]
 tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
+nucleo = "0.2.0"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index b434fbf36..515443e03 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -48,6 +48,9 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"
 etcetera = "0.8"
 textwrap = "0.16.0"
 
+nucleo.workspace = true
+parking_lot = "0.12"
+
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
 indoc = "2.0.3"
diff --git a/helix-core/src/fuzzy.rs b/helix-core/src/fuzzy.rs
new file mode 100644
index 000000000..e40a2d06e
--- /dev/null
+++ b/helix-core/src/fuzzy.rs
@@ -0,0 +1,43 @@
+use std::ops::DerefMut;
+
+use nucleo::pattern::{AtomKind, CaseMatching, Pattern};
+use nucleo::Config;
+use parking_lot::Mutex;
+
+pub struct LazyMutex<T> {
+    inner: Mutex<Option<T>>,
+    init: fn() -> T,
+}
+
+impl<T> LazyMutex<T> {
+    pub const fn new(init: fn() -> T) -> Self {
+        Self {
+            inner: Mutex::new(None),
+            init,
+        }
+    }
+
+    pub fn lock(&self) -> impl DerefMut<Target = T> + '_ {
+        parking_lot::MutexGuard::map(self.inner.lock(), |val| val.get_or_insert_with(self.init))
+    }
+}
+
+pub static MATCHER: LazyMutex<nucleo::Matcher> = LazyMutex::new(nucleo::Matcher::default);
+
+/// convenience function to easily fuzzy match
+/// on a (relatively small list of inputs). This is not recommended for building a full tui
+/// application that can match large numbers of matches as all matching is done on the current
+/// thread, effectively blocking the UI
+pub fn fuzzy_match<T: AsRef<str>>(
+    pattern: &str,
+    items: impl IntoIterator<Item = T>,
+    path: bool,
+) -> Vec<(T, u32)> {
+    let mut matcher = MATCHER.lock();
+    matcher.config = Config::DEFAULT;
+    if path {
+        matcher.config.set_match_paths();
+    }
+    let pattern = Pattern::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy);
+    pattern.match_list(items, &mut matcher)
+}
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 9a512eae8..0acdb2380 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -7,6 +7,7 @@ pub mod config;
 pub mod diagnostic;
 pub mod diff;
 pub mod doc_formatter;
+pub mod fuzzy;
 pub mod graphemes;
 pub mod history;
 pub mod increment;
diff --git a/helix-event/Cargo.toml b/helix-event/Cargo.toml
new file mode 100644
index 000000000..5cd955588
--- /dev/null
+++ b/helix-event/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "helix-event"
+version = "0.6.0"
+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+edition = "2021"
+license = "MPL-2.0"
+categories = ["editor"]
+repository = "https://github.com/helix-editor/helix"
+homepage = "https://helix-editor.com"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot"] }
+parking_lot = { version = "0.12", features = ["send_guard"] }
diff --git a/helix-event/src/lib.rs b/helix-event/src/lib.rs
new file mode 100644
index 000000000..9c082b93a
--- /dev/null
+++ b/helix-event/src/lib.rs
@@ -0,0 +1,8 @@
+//! `helix-event` contains systems that allow (often async) communication between
+//! different editor components without strongly coupling them. Currently this
+//! crate only contains some smaller facilities but the intend is to add more
+//! functionality in the future ( like a generic hook system)
+
+pub use redraw::{lock_frame, redraw_requested, request_redraw, start_frame, RenderLockGuard};
+
+mod redraw;
diff --git a/helix-event/src/redraw.rs b/helix-event/src/redraw.rs
new file mode 100644
index 000000000..a99152238
--- /dev/null
+++ b/helix-event/src/redraw.rs
@@ -0,0 +1,49 @@
+//! Signals that control when/if the editor redraws
+
+use std::future::Future;
+
+use parking_lot::{RwLock, RwLockReadGuard};
+use tokio::sync::Notify;
+
+/// A `Notify` instance that can be used to (asynchronously) request
+/// the editor the render a new frame.
+static REDRAW_NOTIFY: Notify = Notify::const_new();
+
+/// A `RwLock` that prevents the next frame from being
+/// drawn until an exclusive (write) lock can be acquired.
+/// This allows asynchsonous tasks to acquire `non-exclusive`
+/// locks (read) to prevent the next frame from being drawn
+/// until a certain computation has finished.
+static RENDER_LOCK: RwLock<()> = RwLock::new(());
+
+pub type RenderLockGuard = RwLockReadGuard<'static, ()>;
+
+/// Requests that the editor is redrawn. The redraws are debounced (currently to
+/// 30FPS) so this can be called many times without causing a ton of frames to
+/// be rendered.
+pub fn request_redraw() {
+    REDRAW_NOTIFY.notify_one();
+}
+
+/// Returns a future that will yield once a redraw has been asynchronously
+/// requested using [`request_redraw`].
+pub fn redraw_requested() -> impl Future<Output = ()> {
+    REDRAW_NOTIFY.notified()
+}
+
+/// Wait until all locks acquired with [`lock_frame`] have been released.
+/// This function is called before rendering and is intended to allow the frame
+/// to wait for async computations that should be included in the current frame.
+pub fn start_frame() {
+    drop(RENDER_LOCK.write());
+    // exhaust any leftover redraw notifications
+    let notify = REDRAW_NOTIFY.notified();
+    tokio::pin!(notify);
+    notify.enable();
+}
+
+/// Acquires the render lock which will prevent the next frame from being drawn
+/// until the returned guard is dropped.
+pub fn lock_frame() -> RenderLockGuard {
+    RENDER_LOCK.read()
+}
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 29c2eea7d..5c7fd0dea 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -24,6 +24,7 @@ path = "src/main.rs"
 
 [dependencies]
 helix-core = { version = "0.6", path = "../helix-core" }
+helix-event = { version = "0.6", path = "../helix-event" }
 helix-view = { version = "0.6", path = "../helix-view" }
 helix-lsp = { version = "0.6", path = "../helix-lsp" }
 helix-dap = { version = "0.6", path = "../helix-dap" }
@@ -49,7 +50,7 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
 log = "0.4"
 
 # File picker
-fuzzy-matcher = "0.3"
+nucleo.workspace = true
 ignore = "0.4"
 # markdown doc rendering
 pulldown-cmark = { version = "0.9", default-features = false }
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 8d5b1ceb2..0d40fa66f 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -257,16 +257,8 @@ impl Application {
             scroll: None,
         };
 
-        // Acquire mutable access to the redraw_handle lock
-        // to ensure that there are no tasks running that want to block rendering
-        drop(cx.editor.redraw_handle.1.write().await);
+        helix_event::start_frame();
         cx.editor.needs_redraw = false;
-        {
-            // exhaust any leftover redraw notifications
-            let notify = cx.editor.redraw_handle.0.notified();
-            tokio::pin!(notify);
-            notify.enable();
-        }
 
         let area = self
             .terminal
@@ -590,7 +582,7 @@ impl Application {
             EditorEvent::LanguageServerMessage((id, call)) => {
                 self.handle_language_server_message(call, id).await;
                 // limit render calls for fast language server messages
-                self.editor.redraw_handle.0.notify_one();
+                helix_event::request_redraw();
             }
             EditorEvent::DebuggerEvent(payload) => {
                 let needs_render = self.editor.handle_debugger_message(payload).await;
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1f88079eb..31ea75814 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -43,7 +43,6 @@ use helix_view::{
 };
 
 use anyhow::{anyhow, bail, ensure, Context as _};
-use fuzzy_matcher::FuzzyMatcher;
 use insert::*;
 use movement::Movement;
 
@@ -60,7 +59,7 @@ use crate::{
 };
 
 use crate::job::{self, Jobs};
-use futures_util::{stream::FuturesUnordered, StreamExt, TryStreamExt};
+use futures_util::{stream::FuturesUnordered, TryStreamExt};
 use std::{collections::HashMap, fmt, future::Future};
 use std::{collections::HashSet, num::NonZeroUsize};
 
@@ -75,7 +74,6 @@ use serde::de::{self, Deserialize, Deserializer};
 use grep_regex::RegexMatcherBuilder;
 use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
 use ignore::{DirEntry, WalkBuilder, WalkState};
-use tokio_stream::wrappers::UnboundedReceiverStream;
 
 pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
 
@@ -1715,8 +1713,8 @@ fn select_regex(cx: &mut Context) {
         "select:".into(),
         Some(reg),
         ui::completers::none,
-        move |editor, regex, event| {
-            let (view, doc) = current!(editor);
+        move |cx, regex, event| {
+            let (view, doc) = current!(cx.editor);
             if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
                 return;
             }
@@ -1737,8 +1735,8 @@ fn split_selection(cx: &mut Context) {
         "split:".into(),
         Some(reg),
         ui::completers::none,
-        move |editor, regex, event| {
-            let (view, doc) = current!(editor);
+        move |cx, regex, event| {
+            let (view, doc) = current!(cx.editor);
             if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
                 return;
             }
@@ -1902,14 +1900,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
                 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
                 .collect()
         },
-        move |editor, regex, event| {
+        move |cx, regex, event| {
             if event == PromptEvent::Validate {
-                editor.registers.last_search_register = reg;
+                cx.editor.registers.last_search_register = reg;
             } else if event != PromptEvent::Update {
                 return;
             }
             search_impl(
-                editor,
+                cx.editor,
                 &contents,
                 &regex,
                 Movement::Move,
@@ -2078,13 +2076,11 @@ fn global_search(cx: &mut Context) {
         }
     }
 
-    let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
     let config = cx.editor.config();
     let smart_case = config.search.smart_case;
     let file_picker_config = config.file_picker.clone();
 
     let reg = cx.register.unwrap_or('/');
-
     let completions = search_completions(cx, Some(reg));
     ui::regex_prompt(
         cx,
@@ -2097,166 +2093,173 @@ fn global_search(cx: &mut Context) {
                 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
                 .collect()
         },
-        move |editor, regex, event| {
+        move |cx, regex, event| {
             if event != PromptEvent::Validate {
                 return;
             }
-            editor.registers.last_search_register = reg;
+            cx.editor.registers.last_search_register = reg;
 
-            let documents: Vec<_> = editor
+            let current_path = doc_mut!(cx.editor).path().cloned();
+            let documents: Vec<_> = cx
+                .editor
                 .documents()
-                .map(|doc| (doc.path(), doc.text()))
+                .map(|doc| (doc.path().cloned(), doc.text().to_owned()))
                 .collect();
 
             if let Ok(matcher) = RegexMatcherBuilder::new()
                 .case_smart(smart_case)
                 .build(regex.as_str())
             {
-                let searcher = SearcherBuilder::new()
-                    .binary_detection(BinaryDetection::quit(b'\x00'))
-                    .build();
-
                 let search_root = helix_loader::current_working_dir();
                 if !search_root.exists() {
-                    editor.set_error("Current working directory does not exist");
+                    cx.editor
+                        .set_error("Current working directory does not exist");
                     return;
                 }
 
+                let (picker, injector) = Picker::stream(current_path);
+
                 let dedup_symlinks = file_picker_config.deduplicate_links;
                 let absolute_root = search_root
                     .canonicalize()
                     .unwrap_or_else(|_| search_root.clone());
-
-                WalkBuilder::new(search_root)
-                    .hidden(file_picker_config.hidden)
-                    .parents(file_picker_config.parents)
-                    .ignore(file_picker_config.ignore)
-                    .follow_links(file_picker_config.follow_symlinks)
-                    .git_ignore(file_picker_config.git_ignore)
-                    .git_global(file_picker_config.git_global)
-                    .git_exclude(file_picker_config.git_exclude)
-                    .max_depth(file_picker_config.max_depth)
-                    .filter_entry(move |entry| {
-                        filter_picker_entry(entry, &absolute_root, dedup_symlinks)
-                    })
-                    .build_parallel()
-                    .run(|| {
-                        let mut searcher = searcher.clone();
-                        let matcher = matcher.clone();
-                        let all_matches_sx = all_matches_sx.clone();
-                        let documents = &documents;
-                        Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
-                            let entry = match entry {
-                                Ok(entry) => entry,
-                                Err(_) => return WalkState::Continue,
-                            };
-
-                            match entry.file_type() {
-                                Some(entry) if entry.is_file() => {}
-                                // skip everything else
-                                _ => return WalkState::Continue,
-                            };
-
-                            let sink = sinks::UTF8(|line_num, _| {
-                                all_matches_sx
-                                    .send(FileResult::new(entry.path(), line_num as usize - 1))
-                                    .unwrap();
-
-                                Ok(true)
-                            });
-                            let doc = documents.iter().find(|&(doc_path, _)| {
-                                doc_path.map_or(false, |doc_path| doc_path == entry.path())
-                            });
-
-                            let result = if let Some((_, doc)) = doc {
-                                // there is already a buffer for this file
-                                // search the buffer instead of the file because it's faster
-                                // and captures new edits without requireing a save
-                                if searcher.multi_line_with_matcher(&matcher) {
-                                    // in this case a continous buffer is required
-                                    // convert the rope to a string
-                                    let text = doc.to_string();
-                                    searcher.search_slice(&matcher, text.as_bytes(), sink)
+                let injector_ = injector.clone();
+
+                std::thread::spawn(move || {
+                    let searcher = SearcherBuilder::new()
+                        .binary_detection(BinaryDetection::quit(b'\x00'))
+                        .build();
+                    WalkBuilder::new(search_root)
+                        .hidden(file_picker_config.hidden)
+                        .parents(file_picker_config.parents)
+                        .ignore(file_picker_config.ignore)
+                        .follow_links(file_picker_config.follow_symlinks)
+                        .git_ignore(file_picker_config.git_ignore)
+                        .git_global(file_picker_config.git_global)
+                        .git_exclude(file_picker_config.git_exclude)
+                        .max_depth(file_picker_config.max_depth)
+                        .filter_entry(move |entry| {
+                            filter_picker_entry(entry, &absolute_root, dedup_symlinks)
+                        })
+                        .build_parallel()
+                        .run(|| {
+                            let mut searcher = searcher.clone();
+                            let matcher = matcher.clone();
+                            let injector = injector_.clone();
+                            let documents = &documents;
+                            Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
+                                let entry = match entry {
+                                    Ok(entry) => entry,
+                                    Err(_) => return WalkState::Continue,
+                                };
+
+                                match entry.file_type() {
+                                    Some(entry) if entry.is_file() => {}
+                                    // skip everything else
+                                    _ => return WalkState::Continue,
+                                };
+
+                                let mut stop = false;
+                                let sink = sinks::UTF8(|line_num, _| {
+                                    stop = injector
+                                        .push(FileResult::new(entry.path(), line_num as usize - 1))
+                                        .is_err();
+
+                                    Ok(!stop)
+                                });
+                                let doc = documents.iter().find(|&(doc_path, _)| {
+                                    doc_path
+                                        .as_ref()
+                                        .map_or(false, |doc_path| doc_path == entry.path())
+                                });
+
+                                let result = if let Some((_, doc)) = doc {
+                                    // there is already a buffer for this file
+                                    // search the buffer instead of the file because it's faster
+                                    // and captures new edits without requiring a save
+                                    if searcher.multi_line_with_matcher(&matcher) {
+                                        // in this case a continous buffer is required
+                                        // convert the rope to a string
+                                        let text = doc.to_string();
+                                        searcher.search_slice(&matcher, text.as_bytes(), sink)
+                                    } else {
+                                        searcher.search_reader(
+                                            &matcher,
+                                            RopeReader::new(doc.slice(..)),
+                                            sink,
+                                        )
+                                    }
                                 } else {
-                                    searcher.search_reader(
-                                        &matcher,
-                                        RopeReader::new(doc.slice(..)),
-                                        sink,
-                                    )
+                                    searcher.search_path(&matcher, entry.path(), sink)
+                                };
+
+                                if let Err(err) = result {
+                                    log::error!(
+                                        "Global search error: {}, {}",
+                                        entry.path().display(),
+                                        err
+                                    );
                                 }
-                            } else {
-                                searcher.search_path(&matcher, entry.path(), sink)
-                            };
-
-                            if let Err(err) = result {
-                                log::error!(
-                                    "Global search error: {}, {}",
-                                    entry.path().display(),
-                                    err
-                                );
-                            }
-                            WalkState::Continue
-                        })
-                    });
+                                if stop {
+                                    WalkState::Quit
+                                } else {
+                                    WalkState::Continue
+                                }
+                            })
+                        });
+                });
+
+                cx.jobs.callback(async move {
+                    let call = move |_: &mut Editor, compositor: &mut Compositor| {
+                        let picker = Picker::with_stream(
+                            picker,
+                            injector,
+                            move |cx, FileResult { path, line_num }, action| {
+                                let doc = match cx.editor.open(path, action) {
+                                    Ok(id) => doc_mut!(cx.editor, &id),
+                                    Err(e) => {
+                                        cx.editor.set_error(format!(
+                                            "Failed to open file '{}': {}",
+                                            path.display(),
+                                            e
+                                        ));
+                                        return;
+                                    }
+                                };
+
+                                let line_num = *line_num;
+                                let view = view_mut!(cx.editor);
+                                let text = doc.text();
+                                if line_num >= text.len_lines() {
+                                    cx.editor.set_error(
+                    "The line you jumped to does not exist anymore because the file has changed.",
+                );
+                                    return;
+                                }
+                                let start = text.line_to_char(line_num);
+                                let end = text.line_to_char((line_num + 1).min(text.len_lines()));
+
+                                doc.set_selection(view.id, Selection::single(start, end));
+                                if action.align_view(view, doc.id()) {
+                                    align_view(doc, view, Align::Center);
+                                }
+                            },
+                        )
+                        .with_preview(
+                            |_editor, FileResult { path, line_num }| {
+                                Some((path.clone().into(), Some((*line_num, *line_num))))
+                            },
+                        );
+                        compositor.push(Box::new(overlaid(picker)))
+                    };
+                    Ok(Callback::EditorCompositor(Box::new(call)))
+                })
             } else {
                 // Otherwise do nothing
                 // log::warn!("Global Search Invalid Pattern")
             }
         },
     );
-
-    let current_path = doc_mut!(cx.editor).path().cloned();
-
-    let show_picker = async move {
-        let all_matches: Vec<FileResult> =
-            UnboundedReceiverStream::new(all_matches_rx).collect().await;
-        let call: job::Callback = Callback::EditorCompositor(Box::new(
-            move |editor: &mut Editor, compositor: &mut Compositor| {
-                if all_matches.is_empty() {
-                    if !editor.is_err() {
-                        editor.set_status("No matches found");
-                    }
-                    return;
-                }
-
-                let picker = Picker::new(
-                    all_matches,
-                    current_path,
-                    move |cx, FileResult { path, line_num }, action| {
-                        let doc = match cx.editor.open(path, action) {
-                            Ok(id) => doc_mut!(cx.editor, &id),
-                            Err(e) => {
-                                cx.editor.set_error(format!(
-                                    "Failed to open file '{}': {}",
-                                    path.display(),
-                                    e
-                                ));
-                                return;
-                            }
-                        };
-                        let line_num = *line_num;
-                        let view = view_mut!(cx.editor);
-                        let text = doc.text();
-                        if line_num >= text.len_lines() {
-                            cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
-                            return;
-                        }
-                        let start = text.line_to_char(line_num);
-                        let end = text.line_to_char((line_num + 1).min(text.len_lines()));
-
-                        doc.set_selection(view.id, Selection::single(start, end));
-                        if action.align_view(view, doc.id()){
-                            align_view(doc, view, Align::Center);
-                        }
-                    }).with_preview(|_editor, FileResult { path, line_num }| {
-                        Some((path.clone().into(), Some((*line_num, *line_num))))
-                    });
-                compositor.push(Box::new(overlaid(picker)));
-            },
-        ));
-        Ok(call)
-    };
-    cx.jobs.callback(show_picker);
 }
 
 enum Extend {
@@ -4310,8 +4313,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
         if remove { "remove:" } else { "keep:" }.into(),
         Some(reg),
         ui::completers::none,
-        move |editor, regex, event| {
-            let (view, doc) = current!(editor);
+        move |cx, regex, event| {
+            let (view, doc) = current!(cx.editor);
             if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
                 return;
             }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index a7eb22448..0e1d94317 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -5,6 +5,7 @@ use crate::job::Job;
 
 use super::*;
 
+use helix_core::fuzzy::fuzzy_match;
 use helix_core::{encoding, shellwords::Shellwords};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
@@ -1265,12 +1266,10 @@ fn reload(
     }
 
     let scrolloff = cx.editor.config().scrolloff;
-    let redraw_handle = cx.editor.redraw_handle.clone();
     let (view, doc) = current!(cx.editor);
-    doc.reload(view, &cx.editor.diff_providers, redraw_handle)
-        .map(|_| {
-            view.ensure_cursor_in_view(doc, scrolloff);
-        })?;
+    doc.reload(view, &cx.editor.diff_providers).map(|_| {
+        view.ensure_cursor_in_view(doc, scrolloff);
+    })?;
     if let Some(path) = doc.path() {
         cx.editor
             .language_servers
@@ -1316,8 +1315,7 @@ fn reload_all(
         // Ensure that the view is synced with the document's history.
         view.sync_changes(doc);
 
-        let redraw_handle = cx.editor.redraw_handle.clone();
-        doc.reload(view, &cx.editor.diff_providers, redraw_handle)?;
+        doc.reload(view, &cx.editor.diff_providers)?;
         if let Some(path) = doc.path() {
             cx.editor
                 .language_servers
@@ -2902,28 +2900,18 @@ pub(super) fn command_mode(cx: &mut Context) {
         ":".into(),
         Some(':'),
         |editor: &Editor, input: &str| {
-            static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
-                Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
-
             let shellwords = Shellwords::from(input);
             let words = shellwords.words();
 
             if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
-                // If the command has not been finished yet, complete commands.
-                let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
-                    .iter()
-                    .filter_map(|command| {
-                        FUZZY_MATCHER
-                            .fuzzy_match(command.name, input)
-                            .map(|score| (command.name, score))
-                    })
-                    .collect();
-
-                matches.sort_unstable_by_key(|(_file, score)| std::cmp::Reverse(*score));
-                matches
-                    .into_iter()
-                    .map(|(name, _)| (0.., name.into()))
-                    .collect()
+                fuzzy_match(
+                    input,
+                    TYPABLE_COMMAND_LIST.iter().map(|command| command.name),
+                    false,
+                )
+                .into_iter()
+                .map(|(name, _)| (0.., name.into()))
+                .collect()
             } else {
                 // Otherwise, use the command's completer and the last shellword
                 // as completion input.
diff --git a/helix-term/src/ui/fuzzy_match.rs b/helix-term/src/ui/fuzzy_match.rs
deleted file mode 100644
index 22dc3a7fa..000000000
--- a/helix-term/src/ui/fuzzy_match.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
-use fuzzy_matcher::FuzzyMatcher;
-
-#[cfg(test)]
-mod test;
-
-struct QueryAtom {
-    kind: QueryAtomKind,
-    atom: String,
-    ignore_case: bool,
-    inverse: bool,
-}
-impl QueryAtom {
-    fn new(atom: &str) -> Option<QueryAtom> {
-        let mut atom = atom.to_string();
-        let inverse = atom.starts_with('!');
-        if inverse {
-            atom.remove(0);
-        }
-
-        let mut kind = match atom.chars().next() {
-            Some('^') => QueryAtomKind::Prefix,
-            Some('\'') => QueryAtomKind::Substring,
-            _ if inverse => QueryAtomKind::Substring,
-            _ => QueryAtomKind::Fuzzy,
-        };
-
-        if atom.starts_with(['^', '\'']) {
-            atom.remove(0);
-        }
-
-        if atom.is_empty() {
-            return None;
-        }
-
-        if atom.ends_with('$') && !atom.ends_with("\\$") {
-            atom.pop();
-            kind = if kind == QueryAtomKind::Prefix {
-                QueryAtomKind::Exact
-            } else {
-                QueryAtomKind::Postfix
-            }
-        }
-
-        Some(QueryAtom {
-            kind,
-            atom: atom.replace('\\', ""),
-            // not ideal but fuzzy_matches only knows ascii uppercase so more consistent
-            // to behave the same
-            ignore_case: kind != QueryAtomKind::Fuzzy
-                && atom.chars().all(|c| c.is_ascii_lowercase()),
-            inverse,
-        })
-    }
-
-    fn indices(&self, matcher: &Matcher, item: &str, indices: &mut Vec<usize>) -> bool {
-        // for inverse there are no indices to return
-        // just return whether we matched
-        if self.inverse {
-            return self.matches(matcher, item);
-        }
-        let buf;
-        let item = if self.ignore_case {
-            buf = item.to_ascii_lowercase();
-            &buf
-        } else {
-            item
-        };
-        let off = match self.kind {
-            QueryAtomKind::Fuzzy => {
-                if let Some((_, fuzzy_indices)) = matcher.fuzzy_indices(item, &self.atom) {
-                    indices.extend_from_slice(&fuzzy_indices);
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-            QueryAtomKind::Substring => {
-                if let Some(off) = item.find(&self.atom) {
-                    off
-                } else {
-                    return false;
-                }
-            }
-            QueryAtomKind::Prefix if item.starts_with(&self.atom) => 0,
-            QueryAtomKind::Postfix if item.ends_with(&self.atom) => item.len() - self.atom.len(),
-            QueryAtomKind::Exact if item == self.atom => 0,
-            _ => return false,
-        };
-
-        indices.extend(off..(off + self.atom.len()));
-        true
-    }
-
-    fn matches(&self, matcher: &Matcher, item: &str) -> bool {
-        let buf;
-        let item = if self.ignore_case {
-            buf = item.to_ascii_lowercase();
-            &buf
-        } else {
-            item
-        };
-        let mut res = match self.kind {
-            QueryAtomKind::Fuzzy => matcher.fuzzy_match(item, &self.atom).is_some(),
-            QueryAtomKind::Substring => item.contains(&self.atom),
-            QueryAtomKind::Prefix => item.starts_with(&self.atom),
-            QueryAtomKind::Postfix => item.ends_with(&self.atom),
-            QueryAtomKind::Exact => item == self.atom,
-        };
-        if self.inverse {
-            res = !res;
-        }
-        res
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-enum QueryAtomKind {
-    /// Item is a fuzzy match of this behaviour
-    ///
-    /// Usage: `foo`
-    Fuzzy,
-    /// Item contains query atom as a continuous substring
-    ///
-    /// Usage `'foo`
-    Substring,
-    /// Item starts with query atom
-    ///
-    /// Usage: `^foo`
-    Prefix,
-    /// Item ends with query atom
-    ///
-    /// Usage: `foo$`
-    Postfix,
-    /// Item is equal to query atom
-    ///
-    /// Usage `^foo$`
-    Exact,
-}
-
-#[derive(Default)]
-pub struct FuzzyQuery {
-    first_fuzzy_atom: Option<String>,
-    query_atoms: Vec<QueryAtom>,
-}
-
-fn query_atoms(query: &str) -> impl Iterator<Item = &str> + '_ {
-    let mut saw_backslash = false;
-    query.split(move |c| {
-        saw_backslash = match c {
-            ' ' if !saw_backslash => return true,
-            '\\' => true,
-            _ => false,
-        };
-        false
-    })
-}
-
-impl FuzzyQuery {
-    pub fn refine(&self, query: &str, old_query: &str) -> (FuzzyQuery, bool) {
-        // TODO: we could be a lot smarter about this
-        let new_query = Self::new(query);
-        let mut is_refinement = query.starts_with(old_query);
-
-        // if the last atom is an inverse atom adding more text to it
-        // will actually increase the number of matches and we can not refine
-        // the matches.
-        if is_refinement && !self.query_atoms.is_empty() {
-            let last_idx = self.query_atoms.len() - 1;
-            if self.query_atoms[last_idx].inverse
-                && self.query_atoms[last_idx].atom != new_query.query_atoms[last_idx].atom
-            {
-                is_refinement = false;
-            }
-        }
-
-        (new_query, is_refinement)
-    }
-
-    pub fn new(query: &str) -> FuzzyQuery {
-        let mut first_fuzzy_query = None;
-        let query_atoms = query_atoms(query)
-            .filter_map(|atom| {
-                let atom = QueryAtom::new(atom)?;
-                if atom.kind == QueryAtomKind::Fuzzy && first_fuzzy_query.is_none() {
-                    first_fuzzy_query = Some(atom.atom);
-                    None
-                } else {
-                    Some(atom)
-                }
-            })
-            .collect();
-        FuzzyQuery {
-            first_fuzzy_atom: first_fuzzy_query,
-            query_atoms,
-        }
-    }
-
-    pub fn fuzzy_match(&self, item: &str, matcher: &Matcher) -> Option<i64> {
-        // use the rank of the first fuzzzy query for the rank, because merging ranks is not really possible
-        // this behaviour matches fzf and skim
-        let score = self
-            .first_fuzzy_atom
-            .as_ref()
-            .map_or(Some(0), |atom| matcher.fuzzy_match(item, atom))?;
-        if self
-            .query_atoms
-            .iter()
-            .any(|atom| !atom.matches(matcher, item))
-        {
-            return None;
-        }
-        Some(score)
-    }
-
-    pub fn fuzzy_indices(&self, item: &str, matcher: &Matcher) -> Option<(i64, Vec<usize>)> {
-        let (score, mut indices) = self.first_fuzzy_atom.as_ref().map_or_else(
-            || Some((0, Vec::new())),
-            |atom| matcher.fuzzy_indices(item, atom),
-        )?;
-
-        // fast path for the common case of just a single atom
-        if self.query_atoms.is_empty() {
-            return Some((score, indices));
-        }
-
-        for atom in &self.query_atoms {
-            if !atom.indices(matcher, item, &mut indices) {
-                return None;
-            }
-        }
-
-        // deadup and remove duplicate matches
-        indices.sort_unstable();
-        indices.dedup();
-
-        Some((score, indices))
-    }
-}
diff --git a/helix-term/src/ui/fuzzy_match/test.rs b/helix-term/src/ui/fuzzy_match/test.rs
deleted file mode 100644
index 5df79eeb1..000000000
--- a/helix-term/src/ui/fuzzy_match/test.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::ui::fuzzy_match::FuzzyQuery;
-use crate::ui::fuzzy_match::Matcher;
-
-fn run_test<'a>(query: &str, items: &'a [&'a str]) -> Vec<String> {
-    let query = FuzzyQuery::new(query);
-    let matcher = Matcher::default();
-    items
-        .iter()
-        .filter_map(|item| {
-            let (_, indices) = query.fuzzy_indices(item, &matcher)?;
-            let matched_string = indices
-                .iter()
-                .map(|&pos| item.chars().nth(pos).unwrap())
-                .collect();
-            Some(matched_string)
-        })
-        .collect()
-}
-
-#[test]
-fn match_single_value() {
-    let matches = run_test("foo", &["foobar", "foo", "bar"]);
-    assert_eq!(matches, &["foo", "foo"])
-}
-
-#[test]
-fn match_multiple_values() {
-    let matches = run_test(
-        "foo bar",
-        &["foo bar", "foo   bar", "bar foo", "bar", "foo"],
-    );
-    assert_eq!(matches, &["foobar", "foobar", "barfoo"])
-}
-
-#[test]
-fn space_escape() {
-    let matches = run_test(r"foo\ bar", &["bar foo", "foo bar", "foobar"]);
-    assert_eq!(matches, &["foo bar"])
-}
-
-#[test]
-fn trim() {
-    let matches = run_test(r" foo bar ", &["bar foo", "foo bar", "foobar"]);
-    assert_eq!(matches, &["barfoo", "foobar", "foobar"]);
-    let matches = run_test(r" foo bar\ ", &["bar foo", "foo bar", "foobar"]);
-    assert_eq!(matches, &["bar foo"])
-}
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index c73e7bed2..8eeb41eea 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -1,22 +1,22 @@
-use std::{borrow::Cow, path::PathBuf};
+use std::{borrow::Cow, cmp::Reverse, path::PathBuf};
 
 use crate::{
     compositor::{Callback, Component, Compositor, Context, Event, EventResult},
     ctrl, key, shift,
 };
+use helix_core::fuzzy::MATCHER;
+use nucleo::pattern::{AtomKind, CaseMatching, Pattern};
+use nucleo::{Config, Utf32Str};
 use tui::{buffer::Buffer as Surface, widgets::Table};
 
 pub use tui::widgets::{Cell, Row};
 
-use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
-use fuzzy_matcher::FuzzyMatcher;
-
 use helix_view::{editor::SmartTabConfig, graphics::Rect, Editor};
 use tui::layout::Constraint;
 
-pub trait Item {
+pub trait Item: Sync + Send + 'static {
     /// Additional editor state that is used for label calculation.
-    type Data;
+    type Data: Sync + Send + 'static;
 
     fn format(&self, data: &Self::Data) -> Row;
 
@@ -51,9 +51,8 @@ pub struct Menu<T: Item> {
 
     cursor: Option<usize>,
 
-    matcher: Box<Matcher>,
     /// (index, score)
-    matches: Vec<(usize, i64)>,
+    matches: Vec<(u32, u32)>,
 
     widths: Vec<Constraint>,
 
@@ -75,11 +74,10 @@ impl<T: Item> Menu<T> {
         editor_data: <T as Item>::Data,
         callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
     ) -> Self {
-        let matches = (0..options.len()).map(|i| (i, 0)).collect();
+        let matches = (0..options.len() as u32).map(|i| (i, 0)).collect();
         Self {
             options,
             editor_data,
-            matcher: Box::new(Matcher::default().ignore_case()),
             matches,
             cursor: None,
             widths: Vec::new(),
@@ -94,20 +92,19 @@ impl<T: Item> Menu<T> {
     pub fn score(&mut self, pattern: &str) {
         // reuse the matches allocation
         self.matches.clear();
-        self.matches.extend(
-            self.options
-                .iter()
-                .enumerate()
-                .filter_map(|(index, option)| {
-                    let text = option.filter_text(&self.editor_data);
-                    // TODO: using fuzzy_indices could give us the char idx for match highlighting
-                    self.matcher
-                        .fuzzy_match(&text, pattern)
-                        .map(|score| (index, score))
-                }),
-        );
-        // Order of equal elements needs to be preserved as LSP preselected items come in order of high to low priority
-        self.matches.sort_by_key(|(_, score)| -score);
+        let mut matcher = MATCHER.lock();
+        matcher.config = Config::DEFAULT;
+        let pattern = Pattern::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy);
+        let mut buf = Vec::new();
+        let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
+            let text = option.filter_text(&self.editor_data);
+            pattern
+                .score(Utf32Str::new(&text, &mut buf), &mut matcher)
+                .map(|score| (i as u32, score))
+        });
+        self.matches.extend(matches);
+        self.matches
+            .sort_unstable_by_key(|&(i, score)| (Reverse(score), i));
 
         // reset cursor position
         self.cursor = None;
@@ -201,7 +198,7 @@ impl<T: Item> Menu<T> {
         self.cursor.and_then(|cursor| {
             self.matches
                 .get(cursor)
-                .map(|(index, _score)| &self.options[*index])
+                .map(|(index, _score)| &self.options[*index as usize])
         })
     }
 
@@ -209,7 +206,7 @@ impl<T: Item> Menu<T> {
         self.cursor.and_then(|cursor| {
             self.matches
                 .get(cursor)
-                .map(|(index, _score)| &mut self.options[*index])
+                .map(|(index, _score)| &mut self.options[*index as usize])
         })
     }
 
@@ -332,7 +329,7 @@ impl<T: Item + 'static> Component for Menu<T> {
             .iter()
             .map(|(index, _score)| {
                 // (index, self.options.get(*index).unwrap()) // get_unchecked
-                &self.options[*index] // get_unchecked
+                &self.options[*index as usize] // get_unchecked
             })
             .collect();
 
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 2d15fb32f..3ca3d24d0 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -1,7 +1,6 @@
 mod completion;
 mod document;
 pub(crate) mod editor;
-mod fuzzy_match;
 mod info;
 pub mod lsp;
 mod markdown;
@@ -64,7 +63,7 @@ pub fn regex_prompt(
     prompt: std::borrow::Cow<'static, str>,
     history_register: Option<char>,
     completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
-    fun: impl Fn(&mut Editor, Regex, PromptEvent) + 'static,
+    fun: impl Fn(&mut crate::compositor::Context, Regex, PromptEvent) + 'static,
 ) {
     let (view, doc) = current!(cx.editor);
     let doc_id = view.doc;
@@ -111,7 +110,7 @@ pub fn regex_prompt(
                                 view.jumps.push((doc_id, snapshot.clone()));
                             }
 
-                            fun(cx.editor, regex, event);
+                            fun(cx, regex, event);
 
                             let (view, doc) = current!(cx.editor);
                             view.ensure_cursor_in_view(doc, config.scrolloff);
@@ -174,6 +173,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
         .git_ignore(config.file_picker.git_ignore)
         .git_global(config.file_picker.git_global)
         .git_exclude(config.file_picker.git_exclude)
+        .sort_by_file_name(|name1, name2| name1.cmp(name2))
         .max_depth(config.file_picker.max_depth)
         .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
 
@@ -190,32 +190,16 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
         .build()
         .expect("failed to build excluded_types");
     walk_builder.types(excluded_types);
-
-    // We want files along with their modification date for sorting
     let files = walk_builder.build().filter_map(|entry| {
         let entry = entry.ok()?;
-        // This is faster than entry.path().is_dir() since it uses cached fs::Metadata fetched by ignore/walkdir
-        if entry.file_type()?.is_file() {
-            Some(entry.into_path())
-        } else {
-            None
+        if !entry.file_type()?.is_file() {
+            return None;
         }
+        Some(entry.into_path())
     });
-
-    // Cap the number of files if we aren't in a git project, preventing
-    // hangs when using the picker in your home directory
-    let mut files: Vec<PathBuf> = if root.join(".git").exists() {
-        files.collect()
-    } else {
-        // const MAX: usize = 8192;
-        const MAX: usize = 100_000;
-        files.take(MAX).collect()
-    };
-    files.sort();
-
     log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
 
-    Picker::new(files, root, move |cx, path: &PathBuf, action| {
+    let picker = Picker::new(Vec::new(), root, move |cx, path: &PathBuf, action| {
         if let Err(e) = cx.editor.open(path, action) {
             let err = if let Some(err) = e.source() {
                 format!("{}", err)
@@ -225,20 +209,27 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
             cx.editor.set_error(err);
         }
     })
-    .with_preview(|_editor, path| Some((path.clone().into(), None)))
+    .with_preview(|_editor, path| Some((path.clone().into(), None)));
+    let injector = picker.injector();
+    std::thread::spawn(move || {
+        for file in files {
+            if injector.push(file).is_err() {
+                break;
+            }
+        }
+    });
+    picker
 }
 
 pub mod completers {
     use crate::ui::prompt::Completion;
-    use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
-    use fuzzy_matcher::FuzzyMatcher;
+    use helix_core::fuzzy::fuzzy_match;
     use helix_core::syntax::LanguageServerFeature;
     use helix_view::document::SCRATCH_BUFFER_NAME;
     use helix_view::theme;
     use helix_view::{editor::Config, Editor};
     use once_cell::sync::Lazy;
     use std::borrow::Cow;
-    use std::cmp::Reverse;
 
     pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
 
@@ -247,31 +238,16 @@ pub mod completers {
     }
 
     pub fn buffer(editor: &Editor, input: &str) -> Vec<Completion> {
-        let mut names: Vec<_> = editor
-            .documents
-            .values()
-            .map(|doc| {
-                let name = doc
-                    .relative_path()
-                    .map(|p| p.display().to_string())
-                    .unwrap_or_else(|| String::from(SCRATCH_BUFFER_NAME));
-                ((0..), Cow::from(name))
-            })
-            .collect();
-
-        let matcher = Matcher::default();
-
-        let mut matches: Vec<_> = names
-            .into_iter()
-            .filter_map(|(_range, name)| {
-                matcher.fuzzy_match(&name, input).map(|score| (name, score))
-            })
-            .collect();
-
-        matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
-        names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
+        let names = editor.documents.values().map(|doc| {
+            doc.relative_path()
+                .map(|p| p.display().to_string().into())
+                .unwrap_or_else(|| Cow::from(SCRATCH_BUFFER_NAME))
+        });
 
-        names
+        fuzzy_match(input, names, true)
+            .into_iter()
+            .map(|(name, _)| ((0..), name))
+            .collect()
     }
 
     pub fn theme(_editor: &Editor, input: &str) -> Vec<Completion> {
@@ -284,26 +260,10 @@ pub mod completers {
         names.sort();
         names.dedup();
 
-        let mut names: Vec<_> = names
+        fuzzy_match(input, names, false)
             .into_iter()
-            .map(|name| ((0..), Cow::from(name)))
-            .collect();
-
-        let matcher = Matcher::default();
-
-        let mut matches: Vec<_> = names
-            .into_iter()
-            .filter_map(|(_range, name)| {
-                matcher.fuzzy_match(&name, input).map(|score| (name, score))
-            })
-            .collect();
-
-        matches.sort_unstable_by(|(name1, score1), (name2, score2)| {
-            (Reverse(*score1), name1).cmp(&(Reverse(*score2), name2))
-        });
-        names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
-
-        names
+            .map(|(name, _)| ((0..), name.into()))
+            .collect()
     }
 
     /// Recursive function to get all keys from this value and add them to vec
@@ -330,15 +290,7 @@ pub mod completers {
             keys
         });
 
-        let matcher = Matcher::default();
-
-        let mut matches: Vec<_> = KEYS
-            .iter()
-            .filter_map(|name| matcher.fuzzy_match(name, input).map(|score| (name, score)))
-            .collect();
-
-        matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
-        matches
+        fuzzy_match(input, &*KEYS, false)
             .into_iter()
             .map(|(name, _)| ((0..), name.into()))
             .collect()
@@ -365,8 +317,6 @@ pub mod completers {
     }
 
     pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
-        let matcher = Matcher::default();
-
         let text: String = "text".into();
 
         let language_ids = editor
@@ -375,27 +325,13 @@ pub mod completers {
             .map(|config| &config.language_id)
             .chain(std::iter::once(&text));
 
-        let mut matches: Vec<_> = language_ids
-            .filter_map(|language_id| {
-                matcher
-                    .fuzzy_match(language_id, input)
-                    .map(|score| (language_id, score))
-            })
-            .collect();
-
-        matches.sort_unstable_by(|(language1, score1), (language2, score2)| {
-            (Reverse(*score1), language1).cmp(&(Reverse(*score2), language2))
-        });
-
-        matches
+        fuzzy_match(input, language_ids, false)
             .into_iter()
-            .map(|(language, _score)| ((0..), language.clone().into()))
+            .map(|(name, _)| ((0..), name.to_owned().into()))
             .collect()
     }
 
     pub fn lsp_workspace_command(editor: &Editor, input: &str) -> Vec<Completion> {
-        let matcher = Matcher::default();
-
         let Some(options) = doc!(editor)
             .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)
             .find_map(|ls| ls.capabilities().execute_command_provider.as_ref())
@@ -403,23 +339,9 @@ pub mod completers {
             return vec![];
         };
 
-        let mut matches: Vec<_> = options
-            .commands
-            .iter()
-            .filter_map(|command| {
-                matcher
-                    .fuzzy_match(command, input)
-                    .map(|score| (command, score))
-            })
-            .collect();
-
-        matches.sort_unstable_by(|(command1, score1), (command2, score2)| {
-            (Reverse(*score1), command1).cmp(&(Reverse(*score2), command2))
-        });
-
-        matches
+        fuzzy_match(input, &options.commands, false)
             .into_iter()
-            .map(|(command, _score)| ((0..), command.clone().into()))
+            .map(|(name, _)| ((0..), name.to_owned().into()))
             .collect()
     }
 
@@ -500,7 +422,7 @@ pub mod completers {
 
         let end = input.len()..;
 
-        let mut files: Vec<_> = WalkBuilder::new(&dir)
+        let files = WalkBuilder::new(&dir)
             .hidden(false)
             .follow_links(false) // We're scanning over depth 1
             .git_ignore(git_ignore)
@@ -532,43 +454,25 @@ pub mod completers {
                         path.push("");
                     }
 
-                    let path = path.to_str()?.to_owned();
-                    Some((end.clone(), Cow::from(path)))
+                    let path = path.into_os_string().into_string().ok()?;
+                    Some(Cow::from(path))
                 })
             }) // TODO: unwrap or skip
-            .filter(|(_, path)| !path.is_empty()) // TODO
-            .collect();
+            .filter(|path| !path.is_empty());
 
         // if empty, return a list of dirs and files in current dir
         if let Some(file_name) = file_name {
-            let matcher = Matcher::default();
-
-            // inefficient, but we need to calculate the scores, filter out None, then sort.
-            let mut matches: Vec<_> = files
-                .into_iter()
-                .filter_map(|(_range, file)| {
-                    matcher
-                        .fuzzy_match(&file, &file_name)
-                        .map(|score| (file, score))
-                })
-                .collect();
-
             let range = (input.len().saturating_sub(file_name.len()))..;
-
-            matches.sort_unstable_by(|(file1, score1), (file2, score2)| {
-                (Reverse(*score1), file1).cmp(&(Reverse(*score2), file2))
-            });
-
-            files = matches
+            fuzzy_match(&file_name, files, true)
                 .into_iter()
-                .map(|(file, _)| (range.clone(), file))
-                .collect();
+                .map(|(name, _)| (range.clone(), name))
+                .collect()
 
             // TODO: complete to longest common match
         } else {
+            let mut files: Vec<_> = files.map(|file| (end.clone(), file)).collect();
             files.sort_unstable_by(|(_, path1), (_, path2)| path1.cmp(path2));
+            files
         }
-
-        files
     }
 }
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index b134eb47e..3073a697d 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -7,11 +7,12 @@ use crate::{
     ui::{
         self,
         document::{render_document, LineDecoration, LinePos, TextRenderer},
-        fuzzy_match::FuzzyQuery,
         EditorView,
     },
 };
 use futures_util::{future::BoxFuture, FutureExt};
+use nucleo::pattern::CaseMatching;
+use nucleo::{Config, Nucleo, Utf32String};
 use tui::{
     buffer::Buffer as Surface,
     layout::Constraint,
@@ -19,16 +20,23 @@ use tui::{
     widgets::{Block, BorderType, Borders, Cell, Table},
 };
 
-use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
 use tui::widgets::Widget;
 
-use std::cmp::{self, Ordering};
-use std::{collections::HashMap, io::Read, path::PathBuf};
+use std::{
+    collections::HashMap,
+    io::Read,
+    path::PathBuf,
+    sync::{
+        atomic::{self, AtomicBool},
+        Arc,
+    },
+};
 
 use crate::ui::{Prompt, PromptEvent};
 use helix_core::{
-    char_idx_at_visual_offset, movement::Direction, text_annotations::TextAnnotations,
-    unicode::segmentation::UnicodeSegmentation, Position, Syntax,
+    char_idx_at_visual_offset, fuzzy::MATCHER, movement::Direction,
+    text_annotations::TextAnnotations, unicode::segmentation::UnicodeSegmentation, Position,
+    Syntax,
 };
 use helix_view::{
     editor::Action,
@@ -114,20 +122,71 @@ impl Preview<'_, '_> {
     }
 }
 
+fn item_to_nucleo<T: Item>(item: T, editor_data: &T::Data) -> Option<(T, Utf32String)> {
+    let row = item.format(editor_data);
+    let mut cells = row.cells.iter();
+    let mut text = String::with_capacity(row.cell_text().map(|cell| cell.len()).sum());
+    let cell = cells.next()?;
+    if let Some(cell) = cell.content.lines.first() {
+        for span in &cell.0 {
+            text.push_str(&span.content);
+        }
+    }
+
+    for cell in cells {
+        text.push(' ');
+        if let Some(cell) = cell.content.lines.first() {
+            for span in &cell.0 {
+                text.push_str(&span.content);
+            }
+        }
+    }
+    Some((item, text.into()))
+}
+
+pub struct Injector<T: Item> {
+    dst: nucleo::Injector<T>,
+    editor_data: Arc<T::Data>,
+    shutown: Arc<AtomicBool>,
+}
+
+impl<T: Item> Clone for Injector<T> {
+    fn clone(&self) -> Self {
+        Injector {
+            dst: self.dst.clone(),
+            editor_data: self.editor_data.clone(),
+            shutown: Arc::new(AtomicBool::new(false)),
+        }
+    }
+}
+
+pub struct InjectorShutdown;
+
+impl<T: Item> Injector<T> {
+    pub fn push(&self, item: T) -> Result<(), InjectorShutdown> {
+        if self.shutown.load(atomic::Ordering::Relaxed) {
+            return Err(InjectorShutdown);
+        }
+
+        if let Some((item, matcher_text)) = item_to_nucleo(item, &self.editor_data) {
+            self.dst.push(item, |dst| dst[0] = matcher_text);
+        }
+        Ok(())
+    }
+}
+
 pub struct Picker<T: Item> {
-    options: Vec<T>,
-    editor_data: T::Data,
-    // filter: String,
-    matcher: Box<Matcher>,
-    matches: Vec<PickerMatch>,
+    editor_data: Arc<T::Data>,
+    shutdown: Arc<AtomicBool>,
+    matcher: Nucleo<T>,
 
     /// Current height of the completions box
     completion_height: u16,
 
-    cursor: usize,
-    // pattern: String,
+    cursor: u32,
     prompt: Prompt,
-    previous_pattern: (String, FuzzyQuery),
+    previous_pattern: String,
+
     /// Whether to show the preview panel (default true)
     show_preview: bool,
     /// Constraints for tabular formatting
@@ -144,10 +203,59 @@ pub struct Picker<T: Item> {
 }
 
 impl<T: Item + 'static> Picker<T> {
+    pub fn stream(editor_data: T::Data) -> (Nucleo<T>, Injector<T>) {
+        let matcher = Nucleo::new(
+            Config::DEFAULT,
+            Arc::new(helix_event::request_redraw),
+            None,
+            1,
+        );
+        let streamer = Injector {
+            dst: matcher.injector(),
+            editor_data: Arc::new(editor_data),
+            shutown: Arc::new(AtomicBool::new(false)),
+        };
+        (matcher, streamer)
+    }
+
     pub fn new(
         options: Vec<T>,
         editor_data: T::Data,
         callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
+    ) -> Self {
+        let matcher = Nucleo::new(
+            Config::DEFAULT,
+            Arc::new(helix_event::request_redraw),
+            None,
+            1,
+        );
+        let injector = matcher.injector();
+        for item in options {
+            if let Some((item, matcher_text)) = item_to_nucleo(item, &editor_data) {
+                injector.push(item, |dst| dst[0] = matcher_text);
+            }
+        }
+        Self::with(
+            matcher,
+            Arc::new(editor_data),
+            Arc::new(AtomicBool::new(false)),
+            callback_fn,
+        )
+    }
+
+    pub fn with_stream(
+        matcher: Nucleo<T>,
+        injector: Injector<T>,
+        callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
+    ) -> Self {
+        Self::with(matcher, injector.editor_data, injector.shutown, callback_fn)
+    }
+
+    fn with(
+        matcher: Nucleo<T>,
+        editor_data: Arc<T::Data>,
+        shutdown: Arc<AtomicBool>,
+        callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
     ) -> Self {
         let prompt = Prompt::new(
             "".into(),
@@ -156,14 +264,13 @@ impl<T: Item + 'static> Picker<T> {
             |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
         );
 
-        let mut picker = Self {
-            options,
+        Self {
+            matcher,
             editor_data,
-            matcher: Box::default(),
-            matches: Vec::new(),
+            shutdown,
             cursor: 0,
             prompt,
-            previous_pattern: (String::new(), FuzzyQuery::default()),
+            previous_pattern: String::new(),
             truncate_start: true,
             show_preview: true,
             callback_fn: Box::new(callback_fn),
@@ -172,24 +279,15 @@ impl<T: Item + 'static> Picker<T> {
             preview_cache: HashMap::new(),
             read_buffer: Vec::with_capacity(1024),
             file_fn: None,
-        };
-
-        picker.calculate_column_widths();
-
-        // scoring on empty input
-        // TODO: just reuse score()
-        picker
-            .matches
-            .extend(picker.options.iter().enumerate().map(|(index, option)| {
-                let text = option.filter_text(&picker.editor_data);
-                PickerMatch {
-                    index,
-                    score: 0,
-                    len: text.chars().count(),
-                }
-            }));
+        }
+    }
 
-        picker
+    pub fn injector(&self) -> Injector<T> {
+        Injector {
+            dst: self.matcher.injector(),
+            editor_data: self.editor_data.clone(),
+            shutown: self.shutdown.clone(),
+        }
     }
 
     pub fn truncate_start(mut self, truncate_start: bool) -> Self {
@@ -202,122 +300,25 @@ impl<T: Item + 'static> Picker<T> {
         preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
     ) -> Self {
         self.file_fn = Some(Box::new(preview_fn));
+        // assumption: if we have a preview we are matching paths... If this is ever
+        // not true this could be a separate builder function
+        self.matcher.update_config(Config::DEFAULT.match_paths());
         self
     }
 
     pub fn set_options(&mut self, new_options: Vec<T>) {
-        self.options = new_options;
-        self.cursor = 0;
-        self.force_score();
-        self.calculate_column_widths();
-    }
-
-    /// Calculate the width constraints using the maximum widths of each column
-    /// for the current options.
-    fn calculate_column_widths(&mut self) {
-        let n = self
-            .options
-            .first()
-            .map(|option| option.format(&self.editor_data).cells.len())
-            .unwrap_or_default();
-        let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
-            let row = option.format(&self.editor_data);
-            // maintain max for each column
-            for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
-                let width = cell.content.width();
-                if width > *acc {
-                    *acc = width;
-                }
+        self.matcher.restart(false);
+        let injector = self.matcher.injector();
+        for item in new_options {
+            if let Some((item, matcher_text)) = item_to_nucleo(item, &self.editor_data) {
+                injector.push(item, |dst| dst[0] = matcher_text);
             }
-            acc
-        });
-        self.widths = max_lens
-            .into_iter()
-            .map(|len| Constraint::Length(len as u16))
-            .collect();
-    }
-
-    pub fn score(&mut self) {
-        let pattern = self.prompt.line();
-
-        if pattern == &self.previous_pattern.0 {
-            return;
         }
-
-        let (query, is_refined) = self
-            .previous_pattern
-            .1
-            .refine(pattern, &self.previous_pattern.0);
-
-        if pattern.is_empty() {
-            // Fast path for no pattern.
-            self.matches.clear();
-            self.matches
-                .extend(self.options.iter().enumerate().map(|(index, option)| {
-                    let text = option.filter_text(&self.editor_data);
-                    PickerMatch {
-                        index,
-                        score: 0,
-                        len: text.chars().count(),
-                    }
-                }));
-        } else if is_refined {
-            // optimization: if the pattern is a more specific version of the previous one
-            // then we can score the filtered set.
-            self.matches.retain_mut(|pmatch| {
-                let option = &self.options[pmatch.index];
-                let text = option.sort_text(&self.editor_data);
-
-                match query.fuzzy_match(&text, &self.matcher) {
-                    Some(s) => {
-                        // Update the score
-                        pmatch.score = s;
-                        true
-                    }
-                    None => false,
-                }
-            });
-
-            self.matches.sort_unstable();
-        } else {
-            self.force_score();
-        }
-
-        // reset cursor position
-        self.cursor = 0;
-        let pattern = self.prompt.line();
-        self.previous_pattern.0.clone_from(pattern);
-        self.previous_pattern.1 = query;
-    }
-
-    pub fn force_score(&mut self) {
-        let pattern = self.prompt.line();
-
-        let query = FuzzyQuery::new(pattern);
-        self.matches.clear();
-        self.matches.extend(
-            self.options
-                .iter()
-                .enumerate()
-                .filter_map(|(index, option)| {
-                    let text = option.filter_text(&self.editor_data);
-
-                    query
-                        .fuzzy_match(&text, &self.matcher)
-                        .map(|score| PickerMatch {
-                            index,
-                            score,
-                            len: text.chars().count(),
-                        })
-                }),
-        );
-
-        self.matches.sort_unstable();
     }
 
     /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
-    pub fn move_by(&mut self, amount: usize, direction: Direction) {
-        let len = self.matches.len();
+    pub fn move_by(&mut self, amount: u32, direction: Direction) {
+        let len = self.matcher.snapshot().matched_item_count();
 
         if len == 0 {
             // No results, can't move.
@@ -336,12 +337,12 @@ impl<T: Item + 'static> Picker<T> {
 
     /// Move the cursor down by exactly one page. After the last page comes the first page.
     pub fn page_up(&mut self) {
-        self.move_by(self.completion_height as usize, Direction::Backward);
+        self.move_by(self.completion_height as u32, Direction::Backward);
     }
 
     /// Move the cursor up by exactly one page. After the first page comes the last page.
     pub fn page_down(&mut self) {
-        self.move_by(self.completion_height as usize, Direction::Forward);
+        self.move_by(self.completion_height as u32, Direction::Forward);
     }
 
     /// Move the cursor to the first entry
@@ -351,13 +352,18 @@ impl<T: Item + 'static> Picker<T> {
 
     /// Move the cursor to the last entry
     pub fn to_end(&mut self) {
-        self.cursor = self.matches.len().saturating_sub(1);
+        self.cursor = self
+            .matcher
+            .snapshot()
+            .matched_item_count()
+            .saturating_sub(1);
     }
 
     pub fn selection(&self) -> Option<&T> {
-        self.matches
-            .get(self.cursor)
-            .map(|pmatch| &self.options[pmatch.index])
+        self.matcher
+            .snapshot()
+            .get_matched_item(self.cursor)
+            .map(|item| item.data)
     }
 
     pub fn toggle_preview(&mut self) {
@@ -366,8 +372,17 @@ impl<T: Item + 'static> Picker<T> {
 
     fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
-            // TODO: recalculate only if pattern changed
-            self.score();
+            let pattern = self.prompt.line();
+            // TODO: better track how the pattern has changed
+            if pattern != &self.previous_pattern {
+                self.matcher.pattern.reparse(
+                    0,
+                    pattern,
+                    CaseMatching::Smart,
+                    pattern.starts_with(&self.previous_pattern),
+                );
+                self.previous_pattern = pattern.clone();
+            }
         }
         EventResult::Consumed(None)
     }
@@ -411,12 +426,9 @@ impl<T: Item + 'static> Picker<T> {
                             (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
                                 CachedPreview::LargeFile
                             }
-                            _ => {
-                                // TODO: enable syntax highlighting; blocked by async rendering
-                                Document::open(path, None, None, editor.config.clone())
-                                    .map(|doc| CachedPreview::Document(Box::new(doc)))
-                                    .unwrap_or(CachedPreview::NotFound)
-                            }
+                            _ => Document::open(path, None, None, editor.config.clone())
+                                .map(|doc| CachedPreview::Document(Box::new(doc)))
+                                .unwrap_or(CachedPreview::NotFound),
                         },
                     )
                     .unwrap_or(CachedPreview::NotFound);
@@ -495,6 +507,14 @@ impl<T: Item + 'static> Picker<T> {
     }
 
     fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
+        let status = self.matcher.tick(10);
+        let snapshot = self.matcher.snapshot();
+        if status.changed {
+            self.cursor = self
+                .cursor
+                .min(snapshot.matched_item_count().saturating_sub(1))
+        }
+
         let text_style = cx.editor.theme.get("ui.text");
         let selected = cx.editor.theme.get("ui.text.focus");
         let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
@@ -515,8 +535,15 @@ impl<T: Item + 'static> Picker<T> {
         // -- Render the input bar:
 
         let area = inner.clip_left(1).with_height(1);
+        // render the prompt first since it will clear its background
+        self.prompt.render(area, surface, cx);
 
-        let count = format!("{}/{}", self.matches.len(), self.options.len());
+        let count = format!(
+            "{}{}/{}",
+            if status.running { "(running) " } else { "" },
+            snapshot.matched_item_count(),
+            snapshot.item_count(),
+        );
         surface.set_stringn(
             (area.x + area.width).saturating_sub(count.len() as u16 + 1),
             area.y,
@@ -525,8 +552,6 @@ impl<T: Item + 'static> Picker<T> {
             text_style,
         );
 
-        self.prompt.render(area, surface, cx);
-
         // -- Separator
         let sep_style = cx.editor.theme.get("ui.background.separator");
         let borders = BorderType::line_symbols(BorderType::Plain);
@@ -539,106 +564,89 @@ impl<T: Item + 'static> Picker<T> {
         // -- Render the contents:
         // subtract area of prompt from top
         let inner = inner.clip_top(2);
-
-        let rows = inner.height;
-        let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));
+        let rows = inner.height as u32;
+        let offset = self.cursor - (self.cursor % std::cmp::max(1, rows));
         let cursor = self.cursor.saturating_sub(offset);
+        let end = offset
+            .saturating_add(rows)
+            .min(snapshot.matched_item_count());
+        let mut indices = Vec::new();
+        let mut matcher = MATCHER.lock();
+        matcher.config = Config::DEFAULT;
+        if self.file_fn.is_some() {
+            matcher.config.set_match_paths()
+        }
 
-        let options = self
-            .matches
-            .iter()
-            .skip(offset)
-            .take(rows as usize)
-            .map(|pmatch| &self.options[pmatch.index])
-            .map(|option| option.format(&self.editor_data))
-            .map(|mut row| {
-                const TEMP_CELL_SEP: &str = " ";
-
-                let line = row.cell_text().fold(String::new(), |mut s, frag| {
-                    s.push_str(&frag);
-                    s.push_str(TEMP_CELL_SEP);
-                    s
-                });
-
-                // Items are filtered by using the text returned by menu::Item::filter_text
-                // but we do highlighting here using the text in Row and therefore there
-                // might be inconsistencies. This is the best we can do since only the
-                // text in Row is displayed to the end user.
-                let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
-                    .fuzzy_indices(&line, &self.matcher)
-                    .unwrap_or_default();
-
-                let highlight_byte_ranges: Vec<_> = line
-                    .char_indices()
-                    .enumerate()
-                    .filter_map(|(char_idx, (byte_offset, ch))| {
-                        highlights
-                            .contains(&char_idx)
-                            .then(|| byte_offset..byte_offset + ch.len_utf8())
-                    })
-                    .collect();
-
-                // The starting byte index of the current (iterating) cell
-                let mut cell_start_byte_offset = 0;
-                for cell in row.cells.iter_mut() {
-                    let spans = match cell.content.lines.get(0) {
-                        Some(s) => s,
-                        None => {
-                            cell_start_byte_offset += TEMP_CELL_SEP.len();
-                            continue;
-                        }
-                    };
+        let options = snapshot.matched_items(offset..end).map(|item| {
+            snapshot.pattern().column_pattern(0).indices(
+                item.matcher_columns[0].slice(..),
+                &mut matcher,
+                &mut indices,
+            );
+            indices.sort_unstable();
+            indices.dedup();
+            let mut row = item.data.format(&self.editor_data);
+
+            let mut grapheme_idx = 0u32;
+            let mut indices = indices.drain(..);
+            let mut next_highlight_idx = indices.next().unwrap_or(u32::MAX);
+            if self.widths.len() < row.cells.len() {
+                self.widths.resize(row.cells.len(), Constraint::Length(0));
+            }
+            let mut widths = self.widths.iter_mut();
+            for cell in &mut row.cells {
+                let Some(Constraint::Length(max_width)) = widths.next() else {
+                    unreachable!();
+                };
 
-                    let mut cell_len = 0;
-
-                    let graphemes_with_style: Vec<_> = spans
-                        .0
-                        .iter()
-                        .flat_map(|span| {
-                            span.content
-                                .grapheme_indices(true)
-                                .zip(std::iter::repeat(span.style))
-                        })
-                        .map(|((grapheme_byte_offset, grapheme), style)| {
-                            cell_len += grapheme.len();
-                            let start = cell_start_byte_offset;
-
-                            let grapheme_byte_range =
-                                grapheme_byte_offset..grapheme_byte_offset + grapheme.len();
-
-                            if highlight_byte_ranges.iter().any(|hl_rng| {
-                                hl_rng.start >= start + grapheme_byte_range.start
-                                    && hl_rng.end <= start + grapheme_byte_range.end
-                            }) {
-                                (grapheme, style.patch(highlight_style))
-                            } else {
-                                (grapheme, style)
-                            }
-                        })
-                        .collect();
-
-                    let mut span_list: Vec<(String, Style)> = Vec::new();
-                    for (grapheme, style) in graphemes_with_style {
-                        if span_list.last().map(|(_, sty)| sty) == Some(&style) {
-                            let (string, _) = span_list.last_mut().unwrap();
-                            string.push_str(grapheme);
+                // merge index highlights on top of existing hightlights
+                let mut span_list = Vec::new();
+                let mut current_span = String::new();
+                let mut current_style = Style::default();
+                let mut width = 0;
+
+                let spans: &[Span] = cell.content.lines.first().map_or(&[], |it| it.0.as_slice());
+                for span in spans {
+                    // this looks like a bug on first glance, we are iterating
+                    // graphemes but treating them as char indices. The reason that
+                    // this is correct is that nucleo will only ever consider the first char
+                    // of a grapheme (and discard the rest of the grapheme) so the indices
+                    // returned by nucleo are essentially grapheme indecies
+                    for grapheme in span.content.graphemes(true) {
+                        let style = if grapheme_idx == next_highlight_idx {
+                            next_highlight_idx = indices.next().unwrap_or(u32::MAX);
+                            span.style.patch(highlight_style)
                         } else {
-                            span_list.push((String::from(grapheme), style))
+                            span.style
+                        };
+                        if style != current_style {
+                            if !current_span.is_empty() {
+                                span_list.push(Span::styled(current_span, current_style))
+                            }
+                            current_span = String::new();
+                            current_style = style;
                         }
+                        current_span.push_str(grapheme);
+                        grapheme_idx += 1;
                     }
+                    width += span.width();
+                }
 
-                    let spans: Vec<Span> = span_list
-                        .into_iter()
-                        .map(|(string, style)| Span::styled(string, style))
-                        .collect();
-                    let spans: Spans = spans.into();
-                    *cell = Cell::from(spans);
+                span_list.push(Span::styled(current_span, current_style));
+                if width as u16 > *max_width {
+                    *max_width = width as u16;
+                }
+                *cell = Cell::from(Spans::from(span_list));
 
-                    cell_start_byte_offset += cell_len + TEMP_CELL_SEP.len();
+                // spacer
+                if grapheme_idx == next_highlight_idx {
+                    next_highlight_idx = indices.next().unwrap_or(u32::MAX);
                 }
+                grapheme_idx += 1;
+            }
 
-                row
-            });
+            row
+        });
 
         let table = Table::new(options)
             .style(text_style)
@@ -654,7 +662,7 @@ impl<T: Item + 'static> Picker<T> {
             surface,
             &mut TableState {
                 offset: 0,
-                selected: Some(cursor),
+                selected: Some(cursor as usize),
             },
             self.truncate_start,
         );
@@ -755,7 +763,7 @@ impl<T: Item + 'static> Picker<T> {
     }
 }
 
-impl<T: Item + 'static> Component for Picker<T> {
+impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         // +---------+ +---------+
         // |prompt   | |preview  |
@@ -875,29 +883,10 @@ impl<T: Item + 'static> Component for Picker<T> {
         Some((width, height))
     }
 }
-
-#[derive(PartialEq, Eq, Debug)]
-struct PickerMatch {
-    score: i64,
-    index: usize,
-    len: usize,
-}
-
-impl PickerMatch {
-    fn key(&self) -> impl Ord {
-        (cmp::Reverse(self.score), self.len, self.index)
-    }
-}
-
-impl PartialOrd for PickerMatch {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for PickerMatch {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.key().cmp(&other.key())
+impl<T: Item> Drop for Picker<T> {
+    fn drop(&mut self) {
+        // ensure we cancel any ongoing background threads streaming into the picker
+        self.shutdown.store(true, atomic::Ordering::Relaxed)
     }
 }
 
@@ -910,13 +899,13 @@ pub type DynQueryCallback<T> =
 
 /// A picker that updates its contents via a callback whenever the
 /// query string changes. Useful for live grep, workspace symbols, etc.
-pub struct DynamicPicker<T: ui::menu::Item + Send> {
+pub struct DynamicPicker<T: ui::menu::Item + Send + Sync> {
     file_picker: Picker<T>,
     query_callback: DynQueryCallback<T>,
     query: String,
 }
 
-impl<T: ui::menu::Item + Send> DynamicPicker<T> {
+impl<T: ui::menu::Item + Send + Sync> DynamicPicker<T> {
     pub const ID: &'static str = "dynamic-picker";
 
     pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
@@ -928,7 +917,7 @@ impl<T: ui::menu::Item + Send> DynamicPicker<T> {
     }
 }
 
-impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
+impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         self.file_picker.render(area, surface, cx);
     }
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index 9c0e6bbc7..35214bcb8 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -20,7 +20,6 @@ mod test {
     mod commands;
     mod languages;
     mod movement;
-    mod picker;
     mod prompt;
     mod splits;
 }
diff --git a/helix-term/tests/test/picker.rs b/helix-term/tests/test/picker.rs
deleted file mode 100644
index 89e6531f9..000000000
--- a/helix-term/tests/test/picker.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use std::fs;
-
-use helix_core::{path::get_canonicalized_path, Range};
-use helix_loader::{current_working_dir, set_current_working_dir};
-use helix_view::{current_ref, editor::Action};
-use tempfile::{Builder, TempDir};
-
-use super::*;
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_picker_alt_ret() -> anyhow::Result<()> {
-    // Create two files, open the first and run a global search for a word
-    // from the second file. Press <alt-ret> to have helix open the second file in the
-    // new buffer, but not change focus. Then check whether the word is highlighted
-    // correctly and the view of the first file has not changed.
-    let tmp_dir = TempDir::new()?;
-    set_current_working_dir(tmp_dir.path().into())?;
-
-    let mut app = AppBuilder::new().build()?;
-
-    log::debug!(
-        "set current working directory to {:?}",
-        current_working_dir()
-    );
-
-    // Add prefix so helix doesn't hide these files in a picker
-    let files = [
-        Builder::new().prefix("1").tempfile_in(&tmp_dir)?,
-        Builder::new().prefix("2").tempfile_in(&tmp_dir)?,
-    ];
-    let paths = files
-        .iter()
-        .map(|f| get_canonicalized_path(f.path()))
-        .collect::<Vec<_>>();
-
-    fs::write(&paths[0], "1\n2\n3\n4")?;
-    fs::write(&paths[1], "first\nsecond")?;
-
-    log::debug!(
-        "created and wrote two temporary files: {:?} & {:?}",
-        paths[0],
-        paths[1]
-    );
-
-    // Manually open to save the offset, otherwise we won't be able to change the state in the Fn trait
-    app.editor.open(files[0].path(), Action::Replace)?;
-    let view_offset = current_ref!(app.editor).0.offset;
-
-    test_key_sequences(
-        &mut app,
-        vec![
-            (Some("<space>/"), None),
-            (Some("second<ret>"), None),
-            (
-                Some("<A-ret><esc>"),
-                Some(&|app| {
-                    let (view, doc) = current_ref!(app.editor);
-                    assert_eq!(doc.path().unwrap(), &paths[0]);
-                    let select_ranges = doc.selection(view.id).ranges();
-                    assert_eq!(select_ranges[0], Range::new(0, 1));
-                    assert_eq!(view.offset, view_offset);
-                }),
-            ),
-            (
-                Some(":buffer<minus>next<ret>"),
-                Some(&|app| {
-                    let (view, doc) = current_ref!(app.editor);
-                    assert_eq!(doc.path().unwrap(), &paths[1]);
-                    let select_ranges = doc.selection(view.id).ranges();
-                    assert_eq!(select_ranges.len(), 1);
-                    assert_eq!(select_ranges[0], Range::new(6, 12));
-                }),
-            ),
-        ],
-        false,
-    )
-    .await?;
-
-    Ok(())
-}
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index eb0dd4763..1b6cd0635 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -12,6 +12,7 @@ homepage = "https://helix-editor.com"
 
 [dependencies]
 helix-core = { version = "0.6", path = "../helix-core" }
+helix-event = { version = "0.6", path = "../helix-event" }
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 parking_lot = "0.12"
diff --git a/helix-vcs/src/diff.rs b/helix-vcs/src/diff.rs
index ca33dda44..c72deb7ea 100644
--- a/helix-vcs/src/diff.rs
+++ b/helix-vcs/src/diff.rs
@@ -2,10 +2,10 @@ use std::ops::Range;
 use std::sync::Arc;
 
 use helix_core::Rope;
+use helix_event::RenderLockGuard;
 use imara_diff::Algorithm;
 use parking_lot::{Mutex, MutexGuard};
 use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
-use tokio::sync::{Notify, OwnedRwLockReadGuard, RwLock};
 use tokio::task::JoinHandle;
 use tokio::time::Instant;
 
@@ -14,11 +14,9 @@ use crate::diff::worker::DiffWorker;
 mod line_cache;
 mod worker;
 
-type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
-
 /// A rendering lock passed to the differ the prevents redraws from occurring
 struct RenderLock {
-    pub lock: OwnedRwLockReadGuard<()>,
+    pub lock: RenderLockGuard,
     pub timeout: Option<Instant>,
 }
 
@@ -38,28 +36,22 @@ struct DiffInner {
 #[derive(Clone, Debug)]
 pub struct DiffHandle {
     channel: UnboundedSender<Event>,
-    render_lock: Arc<RwLock<()>>,
     diff: Arc<Mutex<DiffInner>>,
     inverted: bool,
 }
 
 impl DiffHandle {
-    pub fn new(diff_base: Rope, doc: Rope, redraw_handle: RedrawHandle) -> DiffHandle {
-        DiffHandle::new_with_handle(diff_base, doc, redraw_handle).0
+    pub fn new(diff_base: Rope, doc: Rope) -> DiffHandle {
+        DiffHandle::new_with_handle(diff_base, doc).0
     }
 
-    fn new_with_handle(
-        diff_base: Rope,
-        doc: Rope,
-        redraw_handle: RedrawHandle,
-    ) -> (DiffHandle, JoinHandle<()>) {
+    fn new_with_handle(diff_base: Rope, doc: Rope) -> (DiffHandle, JoinHandle<()>) {
         let (sender, receiver) = unbounded_channel();
         let diff: Arc<Mutex<DiffInner>> = Arc::default();
         let worker = DiffWorker {
             channel: receiver,
             diff: diff.clone(),
             new_hunks: Vec::default(),
-            redraw_notify: redraw_handle.0,
             diff_finished_notify: Arc::default(),
         };
         let handle = tokio::spawn(worker.run(diff_base, doc));
@@ -67,7 +59,6 @@ impl DiffHandle {
             channel: sender,
             diff,
             inverted: false,
-            render_lock: redraw_handle.1,
         };
         (differ, handle)
     }
@@ -87,11 +78,7 @@ impl DiffHandle {
     /// This function is only intended to be called from within the rendering loop
     /// if called from elsewhere it may fail to acquire the render lock and panic
     pub fn update_document(&self, doc: Rope, block: bool) -> bool {
-        // unwrap is ok here because the rendering lock is
-        // only exclusively locked during redraw.
-        // This function is only intended to be called
-        // from the core rendering loop where no redraw can happen in parallel
-        let lock = self.render_lock.clone().try_read_owned().unwrap();
+        let lock = helix_event::lock_frame();
         let timeout = if block {
             None
         } else {
diff --git a/helix-vcs/src/diff/worker.rs b/helix-vcs/src/diff/worker.rs
index 5406446fd..3a9b6462c 100644
--- a/helix-vcs/src/diff/worker.rs
+++ b/helix-vcs/src/diff/worker.rs
@@ -23,7 +23,6 @@ pub(super) struct DiffWorker {
     pub channel: UnboundedReceiver<Event>,
     pub diff: Arc<Mutex<DiffInner>>,
     pub new_hunks: Vec<Hunk>,
-    pub redraw_notify: Arc<Notify>,
     pub diff_finished_notify: Arc<Notify>,
 }
 
@@ -32,11 +31,7 @@ impl DiffWorker {
         let mut accumulator = EventAccumulator::new();
         accumulator.handle_event(event).await;
         accumulator
-            .accumulate_debounced_events(
-                &mut self.channel,
-                self.redraw_notify.clone(),
-                self.diff_finished_notify.clone(),
-            )
+            .accumulate_debounced_events(&mut self.channel, self.diff_finished_notify.clone())
             .await;
         (accumulator.doc, accumulator.diff_base)
     }
@@ -137,7 +132,6 @@ impl<'a> EventAccumulator {
     async fn accumulate_debounced_events(
         &mut self,
         channel: &mut UnboundedReceiver<Event>,
-        redraw_notify: Arc<Notify>,
         diff_finished_notify: Arc<Notify>,
     ) {
         let async_debounce = Duration::from_millis(DIFF_DEBOUNCE_TIME_ASYNC);
@@ -164,7 +158,7 @@ impl<'a> EventAccumulator {
             None => {
                 tokio::spawn(async move {
                     diff_finished_notify.notified().await;
-                    redraw_notify.notify_one();
+                    helix_event::request_redraw();
                 });
             }
             // diff is performed inside the rendering loop
@@ -190,7 +184,7 @@ impl<'a> EventAccumulator {
                     // and wait until the diff occurs to trigger an async redraw
                     log::info!("Diff computation timed out, update of diffs might appear delayed");
                     diff_finished_notify.notified().await;
-                    redraw_notify.notify_one();
+                    helix_event::request_redraw()
                 });
             }
             // a blocking diff is performed inside the rendering loop
diff --git a/helix-vcs/src/diff/worker/test.rs b/helix-vcs/src/diff/worker/test.rs
index 6a68d987c..a6cc89007 100644
--- a/helix-vcs/src/diff/worker/test.rs
+++ b/helix-vcs/src/diff/worker/test.rs
@@ -5,11 +5,7 @@ use crate::diff::{DiffHandle, Hunk};
 
 impl DiffHandle {
     fn new_test(diff_base: &str, doc: &str) -> (DiffHandle, JoinHandle<()>) {
-        DiffHandle::new_with_handle(
-            Rope::from_str(diff_base),
-            Rope::from_str(doc),
-            Default::default(),
-        )
+        DiffHandle::new_with_handle(Rope::from_str(diff_base), Rope::from_str(doc))
     }
     async fn into_diff(self, handle: JoinHandle<()>) -> Vec<Hunk> {
         let diff = self.diff;
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index daaac59d1..6218e9e41 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -17,6 +17,7 @@ term = ["crossterm"]
 bitflags = "2.4"
 anyhow = "1"
 helix-core = { version = "0.6", path = "../helix-core" }
+helix-event = { version = "0.6", path = "../helix-event" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 helix-lsp = { version = "0.6", path = "../helix-lsp" }
 helix-dap = { version = "0.6", path = "../helix-dap" }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 08b57f21d..19f37c711 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -33,7 +33,7 @@ use helix_core::{
     ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction,
 };
 
-use crate::editor::{Config, RedrawHandle};
+use crate::editor::Config;
 use crate::{DocumentId, Editor, Theme, View, ViewId};
 
 /// 8kB of buffer space for encoding and decoding `Rope`s.
@@ -995,7 +995,6 @@ impl Document {
         &mut self,
         view: &mut View,
         provider_registry: &DiffProviderRegistry,
-        redraw_handle: RedrawHandle,
     ) -> Result<(), Error> {
         let encoding = self.encoding;
         let path = self
@@ -1023,7 +1022,7 @@ impl Document {
         self.detect_indent_and_line_ending();
 
         match provider_registry.get_diff_base(&path) {
-            Some(diff_base) => self.set_diff_base(diff_base, redraw_handle),
+            Some(diff_base) => self.set_diff_base(diff_base),
             None => self.diff_handle = None,
         }
 
@@ -1583,13 +1582,13 @@ impl Document {
     }
 
     /// Intialize/updates the differ for this document with a new base.
-    pub fn set_diff_base(&mut self, diff_base: Vec<u8>, redraw_handle: RedrawHandle) {
+    pub fn set_diff_base(&mut self, diff_base: Vec<u8>) {
         if let Ok((diff_base, ..)) = from_reader(&mut diff_base.as_slice(), Some(self.encoding)) {
             if let Some(differ) = &self.diff_handle {
                 differ.update_diff_base(diff_base);
                 return;
             }
-            self.diff_handle = Some(DiffHandle::new(diff_base, self.text.clone(), redraw_handle))
+            self.diff_handle = Some(DiffHandle::new(diff_base, self.text.clone()))
         } else {
             self.diff_handle = None;
         }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 94d0a852b..86f35e0db 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -32,7 +32,7 @@ use std::{
 use tokio::{
     sync::{
         mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
-        oneshot, Notify, RwLock,
+        oneshot,
     },
     time::{sleep, Duration, Instant, Sleep},
 };
@@ -925,10 +925,6 @@ pub struct Editor {
     pub exit_code: i32,
 
     pub config_events: (UnboundedSender<ConfigEvent>, UnboundedReceiver<ConfigEvent>),
-    /// Allows asynchronous tasks to control the rendering
-    /// The `Notify` allows asynchronous tasks to request the editor to perform a redraw
-    /// The `RwLock` blocks the editor from performing the render until an exclusive lock can be acquired
-    pub redraw_handle: RedrawHandle,
     pub needs_redraw: bool,
     /// Cached position of the cursor calculated during rendering.
     /// The content of `cursor_cache` is returned by `Editor::cursor` if
@@ -955,8 +951,6 @@ pub struct Editor {
 
 pub type Motion = Box<dyn Fn(&mut Editor)>;
 
-pub type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
-
 #[derive(Debug)]
 pub enum EditorEvent {
     DocumentSaved(DocumentSavedEventResult),
@@ -1062,7 +1056,6 @@ impl Editor {
             auto_pairs,
             exit_code: 0,
             config_events: unbounded_channel(),
-            redraw_handle: Default::default(),
             needs_redraw: false,
             cursor_cache: Cell::new(None),
             completion_request_handle: None,
@@ -1453,7 +1446,7 @@ impl Editor {
             )?;
 
             if let Some(diff_base) = self.diff_providers.get_diff_base(&path) {
-                doc.set_diff_base(diff_base, self.redraw_handle.clone());
+                doc.set_diff_base(diff_base);
             }
             doc.set_version_control_head(self.diff_providers.get_current_head_name(&path));
 
@@ -1752,7 +1745,7 @@ impl Editor {
                     return EditorEvent::DebuggerEvent(event)
                 }
 
-                _ = self.redraw_handle.0.notified() => {
+                _ = helix_event::redraw_requested() => {
                     if  !self.needs_redraw{
                         self.needs_redraw = true;
                         let timeout = Instant::now() + Duration::from_millis(33);

From 7fffc0a5d100685f2145c9666653fc03151b9a62 Mon Sep 17 00:00:00 2001
From: chtenb <ctenbrinke@gmail.com>
Date: Wed, 30 Aug 2023 09:38:29 +0200
Subject: [PATCH 299/967] Rename reset to default (#8114)

Use `default` instead of `reset`, as this is the conventional name for ANSI codes 39/49. The word `reset` should be reserved for ANSI code `0`, which resets both fg and bg colors at once, while also removing all modifiers. While the code uses the value name `Reset`, this is misleading and should not leak into the user space.
---
 book/src/themes.md      | 2 +-
 helix-view/src/theme.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index d1518de80..96d7c0eca 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -70,7 +70,7 @@ over it and is merged into the default palette.
 
 | Color Name      |
 | ---             |
-| `reset`         |
+| `default`       |
 | `black`         |
 | `red`           |
 | `green`         |
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 7a9aae51e..a288ae9aa 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -359,7 +359,7 @@ impl Default for ThemePalette {
     fn default() -> Self {
         Self {
             palette: hashmap! {
-                "reset".to_string() => Color::Reset,
+                "default".to_string() => Color::Reset,
                 "black".to_string() => Color::Black,
                 "red".to_string() => Color::Red,
                 "green".to_string() => Color::Green,

From 6bef982f2d259cdecb8e249cf1ec4d5e20bb8b38 Mon Sep 17 00:00:00 2001
From: Ezekiel Warren <zaucy@users.noreply.github.com>
Date: Wed, 30 Aug 2023 07:51:03 -0700
Subject: [PATCH 300/967] use which on formatter command (#8064)

---
 helix-view/src/document.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 19f37c711..36dbbcb8b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -733,16 +733,16 @@ impl Document {
     // We can't use anyhow::Result here since the output of the future has to be
     // clonable to be used as shared future. So use a custom error type.
     pub fn format(&self) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
-        if let Some(formatter) = self
+        if let Some((fmt_cmd, fmt_args)) = self
             .language_config()
-            .and_then(|c| c.formatter.clone())
-            .filter(|formatter| which::which(&formatter.command).is_ok())
+            .and_then(|c| c.formatter.as_ref())
+            .and_then(|formatter| Some((which::which(&formatter.command).ok()?, &formatter.args)))
         {
             use std::process::Stdio;
             let text = self.text().clone();
-            let mut process = tokio::process::Command::new(&formatter.command);
+            let mut process = tokio::process::Command::new(&fmt_cmd);
             process
-                .args(&formatter.args)
+                .args(fmt_args)
                 .stdin(Stdio::piped())
                 .stdout(Stdio::piped())
                 .stderr(Stdio::piped());
@@ -751,7 +751,7 @@ impl Document {
                 let mut process = process
                     .spawn()
                     .map_err(|e| FormatterError::SpawningFailed {
-                        command: formatter.command.clone(),
+                        command: fmt_cmd.to_string_lossy().into(),
                         error: e.kind(),
                     })?;
                 {

From a2767269d0e8500b49088a472856e41cd6dee492 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 31 Aug 2023 01:11:01 -0500
Subject: [PATCH 301/967] crossterm: Handle 'hidden' modifier (#8120)

Crossterm supports the 'hidden' SGR parameter but we previously didn't
set the attribute when the "hidden" modifier was specified in a theme.
---
 helix-tui/src/backend/crossterm.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index d276dea0c..52841f6ef 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -328,6 +328,9 @@ impl ModifierDiff {
         if removed.contains(Modifier::SLOW_BLINK) || removed.contains(Modifier::RAPID_BLINK) {
             queue!(w, SetAttribute(CAttribute::NoBlink))?;
         }
+        if removed.contains(Modifier::HIDDEN) {
+            queue!(w, SetAttribute(CAttribute::NoHidden))?;
+        }
 
         let added = self.to - self.from;
         if added.contains(Modifier::REVERSED) {
@@ -351,6 +354,9 @@ impl ModifierDiff {
         if added.contains(Modifier::RAPID_BLINK) {
             queue!(w, SetAttribute(CAttribute::RapidBlink))?;
         }
+        if added.contains(Modifier::HIDDEN) {
+            queue!(w, SetAttribute(CAttribute::Hidden))?;
+        }
 
         Ok(())
     }

From 48373d4a2b6402dce91ebcdf29b6341fcf0ba302 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 31 Aug 2023 01:12:32 -0500
Subject: [PATCH 302/967] Clear completion when switching windows via click
 (#8118)

The completion component assumes that it operates on the same View but
it's possible to break this assumption by switching windows through
left-clicking. I believe we should clear the completion menu when
switching windows to fix this.

This change fixes a panic for this scenario:

* Open a buffer with LSP completion available
* Split the window (for example '<C-w>v')
* Enter insert mode and trigger the completion menu
* Select a completion candidate (for example with '<C-n>')
* Switch to the original window by left-clicking in its area
* Enter insert mode and make edits (for example 'o<backspace>')

This will trip the 'assert_eq' in Document::restore.
---
 helix-term/src/ui/editor.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 0840749f8..dd6fff087 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1073,6 +1073,7 @@ impl EditorView {
                 let editor = &mut cxt.editor;
 
                 if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) {
+                    let prev_view_id = view!(editor).id;
                     let doc = doc_mut!(editor, &view!(editor, view_id).doc);
 
                     if modifiers == KeyModifiers::ALT {
@@ -1082,6 +1083,10 @@ impl EditorView {
                         doc.set_selection(view_id, Selection::point(pos));
                     }
 
+                    if view_id != prev_view_id {
+                        self.clear_completion(editor);
+                    }
+
                     editor.focus(view_id);
                     editor.ensure_cursor_in_view(view_id);
 

From 7cf775d5128e701722290ef29945549c96e79bd1 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 31 Aug 2023 18:57:38 -0500
Subject: [PATCH 303/967] Build flake packages with stable Rust (#8133)

We can continue to use the MSRV for local development and checks while
building release executables with the latest stable Rust, as we do in
CI.
---
 flake.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 40d0549bd..8198d4cda 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,7 +121,8 @@
         then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
         else "$RUSTFLAGS";
       rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-      craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
+      craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
+      craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
       commonArgs =
         {
           inherit stdenv;
@@ -133,13 +134,13 @@
           doCheck = false;
           meta.mainProgram = "hx";
         }
-        // craneLib.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
-      cargoArtifacts = craneLib.buildDepsOnly commonArgs;
+        // craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
+      cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
     in {
       packages = {
-        helix-unwrapped = craneLib.buildPackage (commonArgs
+        helix-unwrapped = craneLibStable.buildPackage (commonArgs
           // {
-            inherit cargoArtifacts;
+            cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
             postInstall = ''
               mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
               cp contrib/Helix.desktop $out/share/applications
@@ -155,20 +156,20 @@
         # Build the crate itself
         inherit (self.packages.${system}) helix;
 
-        clippy = craneLib.cargoClippy (commonArgs
+        clippy = craneLibMSRV.cargoClippy (commonArgs
           // {
             inherit cargoArtifacts;
             cargoClippyExtraArgs = "--all-targets -- --deny warnings";
           });
 
-        fmt = craneLib.cargoFmt commonArgs;
+        fmt = craneLibMSRV.cargoFmt commonArgs;
 
-        doc = craneLib.cargoDoc (commonArgs
+        doc = craneLibMSRV.cargoDoc (commonArgs
           // {
             inherit cargoArtifacts;
           });
 
-        test = craneLib.cargoTest (commonArgs
+        test = craneLibMSRV.cargoTest (commonArgs
           // {
             inherit cargoArtifacts;
           });

From a38ec6d6ca9e5dbbd2e313f3173f2e967ed71fc1 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 1 Sep 2023 02:13:36 +0200
Subject: [PATCH 304/967] avoid excessive memory consumption in picker (#8127)

* avoid excessive memory consumption from file picker

* fix typos

Co-authored-by: Chris <75008413+cd-a@users.noreply.github.com>

---------

Co-authored-by: Chris <75008413+cd-a@users.noreply.github.com>
---
 helix-term/src/compositor.rs |  6 +++++
 helix-term/src/ui/mod.rs     |  2 +-
 helix-term/src/ui/picker.rs  | 48 +++++++++++++++++++++++++-----------
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index bcb3e4490..dc962e1f1 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -16,6 +16,7 @@ pub enum EventResult {
 }
 
 use crate::job::Jobs;
+use crate::ui::picker;
 use helix_view::Editor;
 
 pub use helix_view::input::Event;
@@ -100,6 +101,11 @@ impl Compositor {
 
     /// Add a layer to be rendered in front of all existing layers.
     pub fn push(&mut self, mut layer: Box<dyn Component>) {
+        // immediately clear last_picker field to avoid excessive memory
+        // consumption for picker with many items
+        if layer.id() == Some(picker::ID) {
+            self.last_picker = None;
+        }
         let size = self.size();
         // trigger required_size on init
         layer.required_size((size.width, size.height));
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 3ca3d24d0..b21601086 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -6,7 +6,7 @@ pub mod lsp;
 mod markdown;
 pub mod menu;
 pub mod overlay;
-mod picker;
+pub mod picker;
 pub mod popup;
 mod prompt;
 mod spinner;
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 3073a697d..1f94a72cf 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -46,6 +46,7 @@ use helix_view::{
     Document, DocumentId, Editor,
 };
 
+pub const ID: &str = "picker";
 use super::{menu::Item, overlay::Overlay};
 
 pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
@@ -802,11 +803,28 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
             _ => return EventResult::Ignored(None),
         };
 
-        let close_fn =
-            EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor, _ctx| {
-                // remove the layer
-                compositor.last_picker = compositor.pop();
-            })));
+        let close_fn = |picker: &mut Self| {
+            // if the picker is very large don't store it as last_picker to avoid
+            // excessive memory consumption
+            let callback: compositor::Callback = if picker.matcher.snapshot().item_count() > 100_000
+            {
+                Box::new(|compositor: &mut Compositor, _ctx| {
+                    // remove the layer
+                    compositor.pop();
+                })
+            } else {
+                // stop streaming in new items in the background, really we should
+                // be restarting the stream somehow once the picker gets
+                // reopened instead (like for an FS crawl) that would also remove the
+                // need for the special case above but that is pretty tricky
+                picker.shutdown.store(true, atomic::Ordering::Relaxed);
+                Box::new(|compositor: &mut Compositor, _ctx| {
+                    // remove the layer
+                    compositor.last_picker = compositor.pop();
+                })
+            };
+            EventResult::Consumed(Some(callback))
+        };
 
         // So that idle timeout retriggers
         ctx.editor.reset_idle_timer();
@@ -830,9 +848,7 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
             key!(End) => {
                 self.to_end();
             }
-            key!(Esc) | ctrl!('c') => {
-                return close_fn;
-            }
+            key!(Esc) | ctrl!('c') => return close_fn(self),
             alt!(Enter) => {
                 if let Some(option) = self.selection() {
                     (self.callback_fn)(ctx, option, Action::Load);
@@ -842,19 +858,19 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
                 if let Some(option) = self.selection() {
                     (self.callback_fn)(ctx, option, Action::Replace);
                 }
-                return close_fn;
+                return close_fn(self);
             }
             ctrl!('s') => {
                 if let Some(option) = self.selection() {
                     (self.callback_fn)(ctx, option, Action::HorizontalSplit);
                 }
-                return close_fn;
+                return close_fn(self);
             }
             ctrl!('v') => {
                 if let Some(option) = self.selection() {
                     (self.callback_fn)(ctx, option, Action::VerticalSplit);
                 }
-                return close_fn;
+                return close_fn(self);
             }
             ctrl!('t') => {
                 self.toggle_preview();
@@ -882,6 +898,10 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
         self.completion_height = height.saturating_sub(4);
         Some((width, height))
     }
+
+    fn id(&self) -> Option<&'static str> {
+        Some(ID)
+    }
 }
 impl<T: Item> Drop for Picker<T> {
     fn drop(&mut self) {
@@ -906,8 +926,6 @@ pub struct DynamicPicker<T: ui::menu::Item + Send + Sync> {
 }
 
 impl<T: ui::menu::Item + Send + Sync> DynamicPicker<T> {
-    pub const ID: &'static str = "dynamic-picker";
-
     pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
         Self {
             file_picker,
@@ -939,7 +957,7 @@ impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
             let callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
                 // Wrapping of pickers in overlay is done outside the picker code,
                 // so this is fragile and will break if wrapped in some other widget.
-                let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(Self::ID) {
+                let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(ID) {
                     Some(overlay) => &mut overlay.content.file_picker,
                     None => return,
                 };
@@ -960,6 +978,6 @@ impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
     }
 
     fn id(&self) -> Option<&'static str> {
-        Some(Self::ID)
+        Some(ID)
     }
 }

From bb3e6998e641f25f3f73d0805522b451c18ac633 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Mon, 4 Sep 2023 00:12:38 +0300
Subject: [PATCH 305/967] Fix find commands for buffers with non-LF
 line-endings (#8111)

---
 helix-term/src/commands.rs        | 69 +++++++++++++++++++++++++++----
 helix-term/tests/test/movement.rs | 39 +++++++++++++++++
 2 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 31ea75814..6e3fb9397 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1251,6 +1251,65 @@ fn extend_next_long_word_end(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_long_word_end)
 }
 
+/// Separate branch to find_char designed only for <ret> char.
+//
+// This is necessary because the one document can have different line endings inside. And we
+// cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
+// but on the next line it can be `crlf`. That's why [`find_char_impl`] cannot be applied here.
+fn find_char_line_ending(
+    cx: &mut Context,
+    count: usize,
+    direction: Direction,
+    inclusive: bool,
+    extend: bool,
+) {
+    let (view, doc) = current!(cx.editor);
+    let text = doc.text().slice(..);
+
+    let selection = doc.selection(view.id).clone().transform(|range| {
+        let cursor = range.cursor(text);
+        let cursor_line = range.cursor_line(text);
+
+        // Finding the line where we're going to find <ret>. Depends mostly on
+        // `count`, but also takes into account edge cases where we're already at the end
+        // of a line or the beginning of a line
+        let find_on_line = match direction {
+            Direction::Forward => {
+                let on_edge = line_end_char_index(&text, cursor_line) == cursor;
+                let line = cursor_line + count - 1 + (on_edge as usize);
+                if line >= text.len_lines() - 1 {
+                    return range;
+                } else {
+                    line
+                }
+            }
+            Direction::Backward => {
+                let on_edge = text.line_to_char(cursor_line) == cursor && !inclusive;
+                let line = cursor_line as isize - (count as isize - 1 + on_edge as isize);
+                if line <= 0 {
+                    return range;
+                } else {
+                    line as usize
+                }
+            }
+        };
+
+        let pos = match (direction, inclusive) {
+            (Direction::Forward, true) => line_end_char_index(&text, find_on_line),
+            (Direction::Forward, false) => line_end_char_index(&text, find_on_line) - 1,
+            (Direction::Backward, true) => line_end_char_index(&text, find_on_line - 1),
+            (Direction::Backward, false) => text.line_to_char(find_on_line),
+        };
+
+        if extend {
+            range.put_cursor(text, pos, true)
+        } else {
+            Range::point(range.cursor(text)).put_cursor(text, pos, true)
+        }
+    });
+    doc.set_selection(view.id, selection);
+}
+
 fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bool) {
     // TODO: count is reset to 1 before next key so we move it into the closure here.
     // Would be nice to carry over.
@@ -1264,13 +1323,9 @@ fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bo
             KeyEvent {
                 code: KeyCode::Enter,
                 ..
-            } =>
-            // TODO: this isn't quite correct when CRLF is involved.
-            // This hack will work in most cases, since documents don't
-            // usually mix line endings.  But we should fix it eventually
-            // anyway.
-            {
-                doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
+            } => {
+                find_char_line_ending(cx, count, direction, inclusive, extend);
+                return;
             }
 
             KeyEvent {
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 9a48cdbcb..e3c2668da 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -513,3 +513,42 @@ async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> any
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn find_char_line_ending() -> anyhow::Result<()> {
+    test((
+        helpers::platform_line(indoc! {
+            "\
+            one
+            #[|t]#wo
+            three"
+        }),
+        "T<ret>gll2f<ret>",
+        helpers::platform_line(indoc! {
+            "\
+            one
+            two#[
+            |]#three"
+        }),
+    ))
+    .await?;
+
+    test((
+        helpers::platform_line(indoc! {
+            "\
+            #[|o]#ne
+            two
+            three"
+        }),
+        "f<ret>2t<ret>ghT<ret>F<ret>",
+        helpers::platform_line(indoc! {
+            "\
+            one#[|
+            t]#wo
+            three"
+        }),
+    ))
+    .await?;
+
+    Ok(())
+}

From e8fc77fe98a79473faacba544acae9e52b36903f Mon Sep 17 00:00:00 2001
From: Lorenzo Bellina <59364991+TheRealLorenz@users.noreply.github.com>
Date: Mon, 4 Sep 2023 05:39:48 +0200
Subject: [PATCH 306/967] Maintain the current cursor's position and view in
 the vsplit/hsplit commands too (#8109)

Co-authored-by: Benjamin Bouvier <public@benj.me>
---
 helix-term/src/commands.rs       | 16 +++++++++-------
 helix-term/src/commands/typed.rs |  8 ++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 6e3fb9397..0fd011cc9 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4886,17 +4886,19 @@ fn transpose_view(cx: &mut Context) {
     cx.editor.transpose_view()
 }
 
-// split helper, clear it later
-fn split(cx: &mut Context, action: Action) {
-    let (view, doc) = current!(cx.editor);
+/// Open a new split in the given direction specified by the action.
+///
+/// Maintain the current view (both the cursor's position and view in document).
+fn split(editor: &mut Editor, action: Action) {
+    let (view, doc) = current!(editor);
     let id = doc.id();
     let selection = doc.selection(view.id).clone();
     let offset = view.offset;
 
-    cx.editor.switch(id, action);
+    editor.switch(id, action);
 
     // match the selection in the previous view
-    let (view, doc) = current!(cx.editor);
+    let (view, doc) = current!(editor);
     doc.set_selection(view.id, selection);
     // match the view scroll offset (switch doesn't handle this fully
     // since the selection is only matched after the split)
@@ -4904,7 +4906,7 @@ fn split(cx: &mut Context, action: Action) {
 }
 
 fn hsplit(cx: &mut Context) {
-    split(cx, Action::HorizontalSplit);
+    split(cx.editor, Action::HorizontalSplit);
 }
 
 fn hsplit_new(cx: &mut Context) {
@@ -4912,7 +4914,7 @@ fn hsplit_new(cx: &mut Context) {
 }
 
 fn vsplit(cx: &mut Context) {
-    split(cx, Action::VerticalSplit);
+    split(cx.editor, Action::VerticalSplit);
 }
 
 fn vsplit_new(cx: &mut Context) {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 0e1d94317..e38853c02 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1536,10 +1536,8 @@ fn vsplit(
         return Ok(());
     }
 
-    let id = view!(cx.editor).doc;
-
     if args.is_empty() {
-        cx.editor.switch(id, Action::VerticalSplit);
+        split(cx.editor, Action::VerticalSplit);
     } else {
         for arg in args {
             cx.editor
@@ -1559,10 +1557,8 @@ fn hsplit(
         return Ok(());
     }
 
-    let id = view!(cx.editor).doc;
-
     if args.is_empty() {
-        cx.editor.switch(id, Action::HorizontalSplit);
+        split(cx.editor, Action::HorizontalSplit);
     } else {
         for arg in args {
             cx.editor

From 9d7f66574d43e3a1eee156a3d18c7317ab267fd6 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Mon, 4 Sep 2023 20:50:42 +0400
Subject: [PATCH 307/967] Update tree-sitter-blueprint (#8161)

---
 languages.toml                           | 2 +-
 runtime/queries/blueprint/highlights.scm | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index e8baddb9e..8777408f9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2665,7 +2665,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "blueprint"
-source = { git = "https://gitlab.com/gabmus/tree-sitter-blueprint", rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14" }
+source = { git = "https://gitlab.com/gabmus/tree-sitter-blueprint", rev = "863cea9f83ad5637300478e0559262f1e791684b" }
 
 [[language]]
 name = "forth"
diff --git a/runtime/queries/blueprint/highlights.scm b/runtime/queries/blueprint/highlights.scm
index 05533cea4..41e6aa8ce 100644
--- a/runtime/queries/blueprint/highlights.scm
+++ b/runtime/queries/blueprint/highlights.scm
@@ -15,6 +15,11 @@
 (decorator) @attribute
 
 (property_definition (property_name) @variable.other.member)
+(property_definition
+  (property_binding
+    "bind" @keyword
+    (property_name) @variable.other.member
+    ["no-sync-create" "bidirectional" "inverted"]* @keyword))
 
 (object) @type
 

From 61814fea7f779267bd0c6bc9428c1f53142ee7f1 Mon Sep 17 00:00:00 2001
From: John Scarrott <johnps@outlook.com>
Date: Mon, 4 Sep 2023 18:21:18 +0100
Subject: [PATCH 308/967] Nord Theme: Fix missing ui text focus, use undercurls
 for diagnostics (#8165)

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

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 5c3b6219c..e1e63b323 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -15,14 +15,14 @@
 "constructor" = "nord8"
 
 # Diagnostics
-"diagnostic" = "nord13"
-"diagnostic.error" = "nord11"
+"diagnostic" = { underline = { color = "nord13", style = "curl" } }
+"diagnostic.error" = { underline = { color = "nord11", style = "curl" } }
 "error" = "nord11"
-"diagnostic.hint" = "nord10"
+"diagnostic.hint" = { underline = { color = "nord10", style = "curl" } }
 "hint" = "nord10"
-"diagnostic.info" = "nord8"
+"diagnostic.info" = { underline = { color = "nord8", style = "curl" } }
 "info" = "nord8"
-"diagnostic.warning" = "nord13"
+"diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }
 "warning" = "nord13"
 
 # Diffs
@@ -100,6 +100,7 @@
 "ui.popup" = { bg = "nord1" }
 "ui.popup.info" = { bg = "nord1" }
 "ui.help" = { bg = "nord1" }
+"ui.text.focus" = { fg = "nord8", bg = "nord2" }
 
 # Gutter
 "ui.gutter" = "nord5"

From 9b397c9e680771a54ba759cf288c2a3ec5ae6fee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:01:17 +0900
Subject: [PATCH 309/967] build(deps): bump rustix from 0.38.8 to 0.38.11
 (#8174)

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.8 to 0.38.11.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.8...v0.38.11)

---
updated-dependencies:
- dependency-name: rustix
  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 406162f1f..8be2cd064 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1448,7 +1448,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.8",
+ "rustix 0.38.11",
  "serde",
  "serde_json",
  "slotmap",
@@ -2037,9 +2037,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.8"
+version = "0.38.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
+checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2274,7 +2274,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.38.8",
+ "rustix 0.38.11",
  "windows-sys 0.48.0",
 ]
 

From 10e7ca819bb9958d42955a41c3c8a467ee6144fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:01:37 +0900
Subject: [PATCH 310/967] build(deps): bump cachix/install-nix-action from 22
 to 23 (#8172)

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 22 to 23.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v22...v23)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 7adb53269..8465cea2d 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install nix
-      uses: cachix/install-nix-action@v22
+      uses: cachix/install-nix-action@v23
 
     - name: Authenticate with Cachix
       uses: cachix/cachix-action@v12

From 761cdf124ae0e1f591677a98db663b986f19ac53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:02:04 +0900
Subject: [PATCH 311/967] build(deps): bump serde from 1.0.185 to 1.0.188
 (#8176)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.185 to 1.0.188.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.185...v1.0.188)

---
updated-dependencies:
- dependency-name: serde
  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 8be2cd064..95eb05936 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2077,18 +2077,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.185"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.185"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",

From 4dbdcaebba41dbabc3e39ddc411d60095de2585f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:02:34 +0900
Subject: [PATCH 312/967] build(deps): bump regex from 1.9.4 to 1.9.5 (#8175)

Bumps [regex](https://github.com/rust-lang/regex) from 1.9.4 to 1.9.5.
- [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.9.4...1.9.5)

---
updated-dependencies:
- dependency-name: regex
  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 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95eb05936..8ff0b9310 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1685,9 +1685,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "memmap2"
@@ -1972,9 +1972,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
@@ -1984,9 +1984,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",

From 65c3cca3cc0d0956f4ce8d40ce9e72ba5c9c8e87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 14:02:40 +0200
Subject: [PATCH 313/967] build(deps): bump serde_json from 1.0.104 to 1.0.105
 (#8177)

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 8ff0b9310..95d0275d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2097,9 +2097,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
 dependencies = [
  "itoa",
  "ryu",

From 48b7520bca0823aad28de9e19080fe5a7ce3b792 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 08:51:19 -0500
Subject: [PATCH 314/967] build(deps): bump actions/checkout from 3 to 4
 (#8173)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml    | 8 ++++----
 .github/workflows/cachix.yml   | 2 +-
 .github/workflows/gh-pages.yml | 2 +-
 .github/workflows/release.yml  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7d7d47e0..2c6267b7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install stable toolchain
         uses: helix-editor/rust-toolchain@v1
         with:
@@ -34,7 +34,7 @@ jobs:
       HELIX_LOG_LEVEL: info
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@1.65
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@1.65
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@1.65
diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 8465cea2d..f5408e4a0 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install nix
       uses: cachix/install-nix-action@v23
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 223f8450f..b288e0f66 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -11,7 +11,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup mdBook
         uses: peaceiris/actions-mdbook@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 785a5a4df..b645d94c6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -103,7 +103,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download grammars
         uses: actions/download-artifact@v3
@@ -231,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
 

From 8778083b5a101947fb6d7c359772231a7610bf7a Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Tue, 5 Sep 2023 22:01:32 -0700
Subject: [PATCH 315/967] Detect tmux clipboard provider on macOS (#8182)

---
 helix-view/src/clipboard.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index d639902f7..812c803e9 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -73,9 +73,14 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
 
 #[cfg(target_os = "macos")]
 pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
-    use crate::env::binary_exists;
+    use crate::env::{binary_exists, env_var_is_set};
 
-    if binary_exists("pbcopy") && binary_exists("pbpaste") {
+    if env_var_is_set("TMUX") && binary_exists("tmux") {
+        command_provider! {
+            paste => "tmux", "save-buffer", "-";
+            copy => "tmux", "load-buffer", "-w", "-";
+        }
+    } else if binary_exists("pbcopy") && binary_exists("pbpaste") {
         command_provider! {
             paste => "pbpaste";
             copy => "pbcopy";

From 0cfd46c14f67351db1e739834f58d8ed15d2bb4d Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 6 Sep 2023 07:01:56 +0200
Subject: [PATCH 316/967] Do not show (running) when opening picker (#8148)

* only stream from background thread if necessary

If the file transversal is longer shorter 30ms it will now be performed
on the main thread. Spawning a thread can take a while (or rather it
takes a while until that thread is scheduled) so the files can actually
take a while to show up. This prevents the `(running)` indicator from
briefly showing up when opening the file picker in a small directory.

* run partial cargo update
---
 Cargo.lock               | 49 +++++++++-------------------------------
 helix-term/src/ui/mod.rs | 28 +++++++++++++++++------
 2 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95d0275d7..2b0527c3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,17 +17,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.3"
@@ -107,7 +96,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -495,12 +484,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1237,9 +1226,6 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.6",
-]
 
 [[package]]
 name = "hashbrown"
@@ -1247,7 +1233,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
 dependencies = [
- "ahash 0.8.3",
+ "ahash",
  "allocator-api2",
 ]
 
@@ -1255,7 +1241,7 @@ dependencies = [
 name = "helix-core"
 version = "0.6.0"
 dependencies = [
- "ahash 0.8.3",
+ "ahash",
  "arc-swap",
  "bitflags 2.4.0",
  "chrono",
@@ -1546,7 +1532,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
 dependencies = [
- "ahash 0.8.3",
+ "ahash",
  "hashbrown 0.12.3",
 ]
 
@@ -1722,15 +1708,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -1764,9 +1741,9 @@ dependencies = [
 
 [[package]]
 name = "nucleo"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ccab936f2c8ad271bb31430944d98d358f74153566ea323265497f5639b11b6"
+checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"
 dependencies = [
  "nucleo-matcher",
  "parking_lot",
@@ -2509,13 +2486,9 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
 [[package]]
 name = "unicode-linebreak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
-dependencies = [
- "hashbrown 0.12.3",
- "regex",
-]
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
 [[package]]
 name = "unicode-normalization"
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index b21601086..12ac1783c 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -190,7 +190,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
         .build()
         .expect("failed to build excluded_types");
     walk_builder.types(excluded_types);
-    let files = walk_builder.build().filter_map(|entry| {
+    let mut files = walk_builder.build().filter_map(|entry| {
         let entry = entry.ok()?;
         if !entry.file_type()?.is_file() {
             return None;
@@ -211,13 +211,27 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
     })
     .with_preview(|_editor, path| Some((path.clone().into(), None)));
     let injector = picker.injector();
-    std::thread::spawn(move || {
-        for file in files {
-            if injector.push(file).is_err() {
-                break;
-            }
+    let timeout = std::time::Instant::now() + std::time::Duration::from_millis(30);
+
+    let mut hit_timeout = false;
+    for file in &mut files {
+        if injector.push(file).is_err() {
+            break;
         }
-    });
+        if std::time::Instant::now() >= timeout {
+            hit_timeout = true;
+            break;
+        }
+    }
+    if hit_timeout {
+        std::thread::spawn(move || {
+            for file in files {
+                if injector.push(file).is_err() {
+                    break;
+                }
+            }
+        });
+    }
     picker
 }
 

From e6cdc5f9d327d30886a8fa2961e7a55b4ca0b692 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 6 Sep 2023 16:03:48 +0200
Subject: [PATCH 317/967] Don't use word splitting during fuzzy matching
 (#8192)

---
 helix-core/src/fuzzy.rs   | 6 +++---
 helix-term/src/ui/menu.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/helix-core/src/fuzzy.rs b/helix-core/src/fuzzy.rs
index e40a2d06e..549c6b0e5 100644
--- a/helix-core/src/fuzzy.rs
+++ b/helix-core/src/fuzzy.rs
@@ -1,6 +1,6 @@
 use std::ops::DerefMut;
 
-use nucleo::pattern::{AtomKind, CaseMatching, Pattern};
+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
 use nucleo::Config;
 use parking_lot::Mutex;
 
@@ -32,12 +32,12 @@ pub fn fuzzy_match<T: AsRef<str>>(
     pattern: &str,
     items: impl IntoIterator<Item = T>,
     path: bool,
-) -> Vec<(T, u32)> {
+) -> Vec<(T, u16)> {
     let mut matcher = MATCHER.lock();
     matcher.config = Config::DEFAULT;
     if path {
         matcher.config.set_match_paths();
     }
-    let pattern = Pattern::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy);
+    let pattern = Atom::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy, false);
     pattern.match_list(items, &mut matcher)
 }
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 8eeb41eea..9704b1f2a 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -5,7 +5,7 @@ use crate::{
     ctrl, key, shift,
 };
 use helix_core::fuzzy::MATCHER;
-use nucleo::pattern::{AtomKind, CaseMatching, Pattern};
+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
 use nucleo::{Config, Utf32Str};
 use tui::{buffer::Buffer as Surface, widgets::Table};
 
@@ -94,13 +94,13 @@ impl<T: Item> Menu<T> {
         self.matches.clear();
         let mut matcher = MATCHER.lock();
         matcher.config = Config::DEFAULT;
-        let pattern = Pattern::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy);
+        let pattern = Atom::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy, false);
         let mut buf = Vec::new();
         let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
             let text = option.filter_text(&self.editor_data);
             pattern
                 .score(Utf32Str::new(&text, &mut buf), &mut matcher)
-                .map(|score| (i as u32, score))
+                .map(|score| (i as u32, score as u32))
         });
         self.matches.extend(matches);
         self.matches

From c0fd8bc61b4c1611a48312938aaf0e3121f393b1 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 6 Sep 2023 21:10:00 -0500
Subject: [PATCH 318/967] Fix Clone definition for Injector (#8194)

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

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 1f94a72cf..a8411f535 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -156,7 +156,7 @@ impl<T: Item> Clone for Injector<T> {
         Injector {
             dst: self.dst.clone(),
             editor_data: self.editor_data.clone(),
-            shutown: Arc::new(AtomicBool::new(false)),
+            shutown: self.shutown.clone(),
         }
     }
 }

From 8017bb29990bd15eb31542fa25e8cb1207364b07 Mon Sep 17 00:00:00 2001
From: Weiyuan Wu <weiyuan@crows.land>
Date: Fri, 8 Sep 2023 09:46:36 +0800
Subject: [PATCH 319/967] add redraw command (#6949)

Co-authored-by: Roberto Vidal <vidal.roberto.j@gmail.com>
---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/application.rs     |  5 +++++
 helix-term/src/commands/typed.rs  | 30 ++++++++++++++++++++++++++++++
 helix-term/src/compositor.rs      |  6 ++++++
 4 files changed, 42 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index ce28a3ca6..4a6e697ae 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -83,3 +83,4 @@
 | `:run-shell-command`, `:sh` | Run a shell command |
 | `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
 | `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
+| `:redraw` | Clear and re-render the whole UI |
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 0d40fa66f..3e6da5bbd 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -251,6 +251,11 @@ impl Application {
     }
 
     async fn render(&mut self) {
+        if self.compositor.full_redraw {
+            self.terminal.clear().expect("Cannot clear the terminal");
+            self.compositor.full_redraw = false;
+        }
+
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
             jobs: &mut self.jobs,
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index e38853c02..ef539180d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2291,6 +2291,29 @@ fn clear_register(
     Ok(())
 }
 
+fn redraw(
+    cx: &mut compositor::Context,
+    _args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let callback = Box::pin(async move {
+        let call: job::Callback =
+            job::Callback::EditorCompositor(Box::new(|_editor, compositor| {
+                compositor.need_full_redraw();
+            }));
+
+        Ok(call)
+    });
+
+    cx.jobs.callback(callback);
+
+    Ok(())
+}
+
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
     TypableCommand {
         name: "quit",
@@ -2877,6 +2900,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         fun: clear_register,
         signature: CommandSignature::none(),
     },
+    TypableCommand {
+        name: "redraw",
+        aliases: &[],
+        doc: "Clear and re-render the whole UI",
+        fun: redraw,
+        signature: CommandSignature::none(),
+    },
 ];
 
 pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index dc962e1f1..3dcb5f2bf 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -80,6 +80,7 @@ pub struct Compositor {
     area: Rect,
 
     pub(crate) last_picker: Option<Box<dyn Component>>,
+    pub(crate) full_redraw: bool,
 }
 
 impl Compositor {
@@ -88,6 +89,7 @@ impl Compositor {
             layers: Vec::new(),
             area,
             last_picker: None,
+            full_redraw: false,
         }
     }
 
@@ -206,6 +208,10 @@ impl Compositor {
             .find(|component| component.id() == Some(id))
             .and_then(|component| component.as_any_mut().downcast_mut())
     }
+
+    pub fn need_full_redraw(&mut self) {
+        self.full_redraw = true;
+    }
 }
 
 // View casting, taken straight from Cursive

From 14401ff75b90cbd98d39eb4b7b5442ad43b49e31 Mon Sep 17 00:00:00 2001
From: Theodore Gregory <5040901+tjmgregory@users.noreply.github.com>
Date: Fri, 8 Sep 2023 19:15:42 +0200
Subject: [PATCH 320/967] docs: fix link to document formatting requests
 (#8166)

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

diff --git a/book/src/languages.md b/book/src/languages.md
index 5e56a332f..778489f8d 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -127,7 +127,7 @@ These are the available options for a language server.
 | `environment`         | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
 
 A `format` sub-table within `config` can be used to pass extra formatting options to
-[Document Formatting Requests](https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-17.md#document-formatting-request--leftwards_arrow_with_hook).
+[Document Formatting Requests](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting).
 For example, with typescript:
 
 ```toml

From eb9c37844cae8af1ca5039581ed767e602eb0ef1 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 9 Sep 2023 06:41:49 +0200
Subject: [PATCH 321/967] fix syntax highlights in dynamic picker (#8206)

---
 helix-term/src/ui/picker.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index a8411f535..94a69b0d3 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -474,9 +474,13 @@ impl<T: Item + 'static> Picker<T> {
                             log::info!("highlighting picker item failed");
                             return;
                         };
-                        let Some(Overlay {
-                            content: picker, ..
-                        }) = compositor.find::<Overlay<Self>>()
+                        let picker = match compositor.find::<Overlay<Self>>() {
+                            Some(Overlay { content, .. }) => Some(content),
+                            None => compositor
+                                .find::<Overlay<DynamicPicker<T>>>()
+                                .map(|overlay| &mut overlay.content.file_picker),
+                        };
+                        let Some(picker) = picker
                         else {
                             log::info!("picker closed before syntax highlighting finished");
                             return;

From 528a5e3aff011f652b0f3ac3bff61de41a9e05b2 Mon Sep 17 00:00:00 2001
From: Jaden <thejadenjack@gmail.com>
Date: Sat, 9 Sep 2023 19:58:28 +0000
Subject: [PATCH 322/967] Update EdgedDB (ESDL) grammar (#8222)

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

diff --git a/languages.toml b/languages.toml
index 8777408f9..b23cb4489 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2069,7 +2069,7 @@ roots = ["edgedb.toml"]
 
 [[grammar]]
 name ="esdl"
-source = { git = "https://github.com/greym0uth/tree-sitter-esdl", rev = "b840c8a8028127e0a7c6e6c45141adade2bd75cf" }
+source = { git = "https://github.com/greym0uth/tree-sitter-esdl", rev = "df83acc8cacd0cfb139eecee0e718dc32c4f92e2" }
 
 [[language]]
 name = "pascal"

From b959162ceb41d891c8b5fad6145ca5d1a4964a54 Mon Sep 17 00:00:00 2001
From: Luke Halasy <lhalasy@gmail.com>
Date: Sun, 10 Sep 2023 08:57:44 -0400
Subject: [PATCH 323/967] Add tree-sitter-highlight-name command (#8170)

* adds treesitter-highlight-name command

* commit documentation changes

* moves the get_highlight_name function into core/syntax

* rename get_highlight_name function to get_highlight_for_node_at_position

* addresses pr comments: moves fn into helper fn, simplifies a lot

* commit updated documentation changes

* changes scope method to return &str so that callers can decide whether or not to own
---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 85 +++++++++++++++++++++++++++++++
 helix-view/src/theme.rs           |  5 ++
 3 files changed, 91 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 4a6e697ae..4b737893d 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -55,6 +55,7 @@
 | `:lsp-restart` | Restarts the language servers used by the current doc |
 | `:lsp-stop` | Stops the language servers that are used by the current doc |
 | `:tree-sitter-scopes` | Display tree sitter scopes, primarily for theming and development. |
+| `:tree-sitter-highlight-name` | Display name of tree-sitter highlight scope under the cursor. |
 | `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
 | `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
 | `:debug-eval` | Evaluate expression in current debug context. |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index ef539180d..4237b6f62 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1527,6 +1527,84 @@ fn tree_sitter_scopes(
     Ok(())
 }
 
+fn tree_sitter_highlight_name(
+    cx: &mut compositor::Context,
+    _args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    fn find_highlight_at_cursor(
+        cx: &mut compositor::Context<'_>,
+    ) -> Option<helix_core::syntax::Highlight> {
+        use helix_core::syntax::HighlightEvent;
+
+        let (view, doc) = current!(cx.editor);
+        let syntax = doc.syntax()?;
+        let text = doc.text().slice(..);
+        let cursor = doc.selection(view.id).primary().cursor(text);
+        let byte = text.char_to_byte(cursor);
+        let node = syntax
+            .tree()
+            .root_node()
+            .descendant_for_byte_range(byte, byte)?;
+        // Query the same range as the one used in syntax highlighting.
+        let range = {
+            // Calculate viewport byte ranges:
+            let row = text.char_to_line(view.offset.anchor.min(text.len_chars()));
+            // Saturating subs to make it inclusive zero indexing.
+            let last_line = text.len_lines().saturating_sub(1);
+            let height = view.inner_area(doc).height;
+            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
+            let start = text.line_to_byte(row.min(last_line));
+            let end = text.line_to_byte(last_visible_line + 1);
+
+            start..end
+        };
+
+        let mut highlight = None;
+
+        for event in syntax.highlight_iter(text, Some(range), None) {
+            match event.unwrap() {
+                HighlightEvent::Source { start, end }
+                    if start == node.start_byte() && end == node.end_byte() =>
+                {
+                    return highlight;
+                }
+                HighlightEvent::HighlightStart(hl) => {
+                    highlight = Some(hl);
+                }
+                _ => (),
+            }
+        }
+
+        None
+    }
+
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let Some(highlight) = find_highlight_at_cursor(cx) else {
+        return Ok(());
+    };
+
+    let content = cx.editor.theme.scope(highlight.0).to_string();
+
+    let callback = async move {
+        let call: job::Callback = Callback::EditorCompositor(Box::new(
+            move |editor: &mut Editor, compositor: &mut Compositor| {
+                let content = ui::Markdown::new(content, editor.syn_loader.clone());
+                let popup = Popup::new("hover", content).auto_close(true);
+                compositor.replace_or_push("hover", popup);
+            },
+        ));
+        Ok(call)
+    };
+
+    cx.jobs.callback(callback);
+
+    Ok(())
+}
+
 fn vsplit(
     cx: &mut compositor::Context,
     args: &[Cow<str>],
@@ -2703,6 +2781,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         fun: tree_sitter_scopes,
         signature: CommandSignature::none(),
     },
+    TypableCommand {
+        name: "tree-sitter-highlight-name",
+        aliases: &[],
+        doc: "Display name of tree-sitter highlight scope under the cursor.",
+        fun: tree_sitter_highlight_name,
+        signature: CommandSignature::none(),
+    },
     TypableCommand {
         name: "debug-start",
         aliases: &["dbg"],
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index a288ae9aa..4acc56648 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -297,6 +297,11 @@ impl Theme {
         self.highlights[index]
     }
 
+    #[inline]
+    pub fn scope(&self, index: usize) -> &str {
+        &self.scopes[index]
+    }
+
     pub fn name(&self) -> &str {
         &self.name
     }

From 0d986fce76f2089322d07b4b37b7914c826713cc Mon Sep 17 00:00:00 2001
From: Ross Manchester <33374742+rossmanch@users.noreply.github.com>
Date: Sun, 10 Sep 2023 19:53:15 +0100
Subject: [PATCH 324/967] chore: add additional ignore file highlights (#8220)

* chore: add additional ignore file highlights

Various files use the same syntax highlighting as `.gitignore` and
similarly tell different tools what files/folders to ignore. Update the
languages file so that other ignore type files use the same highlighting
as gitignore. The files added are:

- `.ignore`
- `.prettierignore`
- `.eslintignore`
- `.npmignore`

* chore: add highlighting for codeowners files

Add `CODEOWNERS` as an additional file type for `git-ignore` in the
language file. `CODEOWNERS`'s grammar is close enough to that of
`.gitignore`, this can be used to avoid making a new grammar
specifically for `CODEOWNERS` files.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index b23cb4489..d9cf7ef2c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1380,7 +1380,7 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-gitattributes", rev =
 name = "git-ignore"
 scope = "source.gitignore"
 roots = []
-file-types = [".gitignore", ".gitignore_global"]
+file-types = [".gitignore", ".gitignore_global", ".ignore", ".prettierignore", ".eslintignore", ".npmignore", "CODEOWNERS"]
 injection-regex = "git-ignore"
 comment-token = "#"
 grammar = "gitignore"

From 829db76563be3c7aec71ba3602b20bbbfa75f078 Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@rudder.io>
Date: Sun, 10 Sep 2023 20:54:34 +0200
Subject: [PATCH 325/967] Add feed-related formats as xml (#8232)

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

diff --git a/languages.toml b/languages.toml
index d9cf7ef2c..3e3c5a5a2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2202,7 +2202,7 @@ source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d1
 name = "xml"
 scope = "source.xml"
 injection-regex = "xml"
-file-types = ["xml", "mobileconfig", "plist", "xib", "storyboard", "svg", "xsd", "gml", "xaml", "gir"]
+file-types = ["xml", "mobileconfig", "plist", "xib", "storyboard", "svg", "xsd", "gml", "xaml", "gir", "rss", "atom", "opml"]
 indent = { tab-width = 2, unit = "  " }
 roots = []
 

From 81d6d3ff0eace62481863b7957b5ccc52b1c6718 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 10 Sep 2023 15:27:04 -0400
Subject: [PATCH 326/967] re-add indent and textobject queries for perl (#7947)

* bump tree-sitter-perl version

need some grammar tweaks for the indent queries to function properly

* add indent queries for perl

* add textobject queries for perl
---
 book/src/generated/lang-support.md   |  2 +-
 languages.toml                       |  2 +-
 runtime/queries/perl/indents.scm     | 29 ++++++++++++++++++++++++++++
 runtime/queries/perl/textobjects.scm | 14 ++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/perl/indents.scm
 create mode 100644 runtime/queries/perl/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 596b62bab..c1b0acfdb 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -112,7 +112,7 @@
 | pascal | ✓ | ✓ |  | `pasls` |
 | passwd | ✓ |  |  |  |
 | pem | ✓ |  |  |  |
-| perl | ✓ |  |  | `perlnavigator` |
+| perl | ✓ | ✓ | ✓ | `perlnavigator` |
 | php | ✓ | ✓ | ✓ | `intelephense` |
 | po | ✓ | ✓ |  |  |
 | pod | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 3e3c5a5a2..4d1e6fe0a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1119,7 +1119,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "perl"
-source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "ed21ecbcc128a6688770ebafd3ef68a1c9bc1ea9" }
+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "9f3166800d40267fa68ed8273e96baf74f390517" }
 
 [[language]]
 name = "pod"
diff --git a/runtime/queries/perl/indents.scm b/runtime/queries/perl/indents.scm
new file mode 100644
index 000000000..03318243b
--- /dev/null
+++ b/runtime/queries/perl/indents.scm
@@ -0,0 +1,29 @@
+[
+  (block)
+  (conditional_statement)
+  (loop_statement)
+  (cstyle_for_statement)
+  (for_statement)
+  (elsif)
+  (array_element_expression)
+  (hash_element_expression)
+  (coderef_call_expression)
+  (anonymous_slice_expression)
+  (slice_expression)
+  (keyval_expression)
+  (anonymous_array_expression)
+  (anonymous_hash_expression)
+  (stub_expression)
+  (func0op_call_expression)
+  (func1op_call_expression)
+  (map_grep_expression)
+  (function_call_expression)
+  (method_call_expression)
+  (attribute)
+] @indent
+
+[
+  "}"
+  "]"
+  ")"
+] @outdent
diff --git a/runtime/queries/perl/textobjects.scm b/runtime/queries/perl/textobjects.scm
new file mode 100644
index 000000000..1b0b5f076
--- /dev/null
+++ b/runtime/queries/perl/textobjects.scm
@@ -0,0 +1,14 @@
+(subroutine_declaration_statement
+  body: (_) @function.inside) @function.around
+(anonymous_subroutine_expression
+  body: (_) @function.inside) @function.around
+
+(package_statement) @class.around
+(package_statement
+  (block) @class.inside)
+
+(list_expression
+  (_) @parameter.inside)
+
+(comment) @comment.around
+(pod) @comment.around

From 6f3a6575dc9f4f9390cdfa5b56f5a0d182775ca2 Mon Sep 17 00:00:00 2001
From: Yhya <113423953+yhyadev@users.noreply.github.com>
Date: Sun, 10 Sep 2023 19:27:56 +0000
Subject: [PATCH 327/967] add material theme collection (#8211)

* Create material theme files

* Add material deep ocean pallete

* Add primary theme properties to material deep ocean theme

* Fix material deep ocean theme

* Ad syntax highlighting to material deep ocean theme

* Make material oceanic theme

* Make material darker theme

* Remove material lighter theme

* Make material palenight theme

* Make other material themes inherit material deep ocean theme

* Add virtual ruler background to the material theme collection
---
 runtime/themes/material_darker.toml     |  20 ++++
 runtime/themes/material_deep_ocean.toml | 123 ++++++++++++++++++++++++
 runtime/themes/material_oceanic.toml    |  21 ++++
 runtime/themes/material_palenight.toml  |  19 ++++
 4 files changed, 183 insertions(+)
 create mode 100644 runtime/themes/material_darker.toml
 create mode 100644 runtime/themes/material_deep_ocean.toml
 create mode 100644 runtime/themes/material_oceanic.toml
 create mode 100644 runtime/themes/material_palenight.toml

diff --git a/runtime/themes/material_darker.toml b/runtime/themes/material_darker.toml
new file mode 100644
index 000000000..f117f7194
--- /dev/null
+++ b/runtime/themes/material_darker.toml
@@ -0,0 +1,20 @@
+# Material Theme <https://material-theme.com/> for Helix Editor
+
+inherits = "material_deep_ocean"
+
+[palette]
+bg = "#212121"
+text = "#b0bec5"
+
+gray = "#616161"
+error = "#ff5370"
+
+disabled = "#474747"
+
+accent = "#ff9800"
+
+highlight = "#3f3f3f"
+
+comment = "#616161"
+
+selection = "#404040"
diff --git a/runtime/themes/material_deep_ocean.toml b/runtime/themes/material_deep_ocean.toml
new file mode 100644
index 000000000..b98a32e55
--- /dev/null
+++ b/runtime/themes/material_deep_ocean.toml
@@ -0,0 +1,123 @@
+# Material Theme <https://material-theme.com/> for Helix Editor
+
+# Syntax Highlighting
+
+"type" = "purple"
+
+"constructor" = "blue"
+
+"constant" = "yellow"
+
+"string" = "green"
+"string.regexp" = "yellow"
+"string.special" = "blue"
+
+"comment" = { fg = "comment" }
+
+"variable" = "text"
+"variable.parameter" = { fg = "orange" }
+"variable.builtin" = "yellow"
+
+"label" = "orange"
+
+"punctuation" = "cyan"
+
+"keyword" = "purple"
+"keyword.storage" = "cyan"
+
+"operator" = "cyan"
+
+"function" = "blue"
+"function.macro" = "cyan"
+
+"tag" = "red"
+"attribute" = "purple"
+
+"namespace" = { fg = "yellow" }
+
+"special" = "cyan"
+
+"markup.heading.marker" = { fg = "cyan", modifiers = ["bold"] }
+"markup.heading.1" = "cyan"
+"markup.heading.2" = "red"
+"markup.heading.3" = "green"
+"markup.heading.4" = "yellow"
+"markup.heading.5" = "blue"
+"markup.heading.6" = "orange"
+"markup.list" = "purple"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "green", modifiers = ["underlined"] }
+"markup.link.text" = "blue"
+"markup.raw" = "text"
+
+"diff.plus" = "green"
+"diff.minus" = "red"
+"diff.delta" = "blue"
+
+# User Interface
+
+"ui.background" = { bg = "bg", fg = "text" }
+"ui.text" = { fg = "text" }
+
+"ui.statusline" = { bg = "bg", fg = "text" }
+"ui.statusline.inactive" = { bg = "bg", fg = "disabled" }
+"ui.statusline.normal" = { bg = "accent", fg = "text" }
+"ui.statusline.insert" = { bg = "green", fg = "text" }
+"ui.statusline.select" = { bg = "purple", fg = "text" }
+
+
+"ui.selection" = { bg = "selection" }
+
+"ui.linenr" = { fg = "line-number" }
+"ui.linenr.selected" = { fg = "accent" }
+
+"ui.cursor" = { bg = "highlight", fg = "white" }
+
+"ui.cursor.primary" = { bg = "white", fg = "gray" }
+"ui.cursorline.primary" = { bg = "white" }
+
+"ui.virtual" = { fg = "gray" }
+"ui.virtual.ruler" = { bg = "highlight" }
+"ui.virtual.indent-guide" = { fg = "gray" }
+
+"ui.highlight" = { bg = "highlight" }
+
+"ui.menu" = { bg = "highlight", fg = "text" }
+
+"ui.help" = { bg = "highlight", fg = "text" }
+
+"ui.popup" = { bg = "highlight", fg = "text" }
+
+warning = "yellow"
+error = "error"
+info = "blue"
+hint = "purple"
+
+[palette]
+bg = "#0f111a"
+text = "#a6accd"
+
+white = "#eeffff"
+green = "#c3e88d"
+yellow = "#ffcb6b"
+blue = "#82aaff"
+red = "#f07178"
+purple = "#c792ea"
+orange = "#f78c6c"
+cyan = "#89ddff"
+gray = "#717cb4"
+error = "#ff5370"
+
+disabled = "#464b5d"
+
+accent = "#84ffff"
+
+highlight = "#1f2233"
+
+comment = "#464b5d"
+
+selection = "#1f2233"
+
+line-number = "#3b3f51"
diff --git a/runtime/themes/material_oceanic.toml b/runtime/themes/material_oceanic.toml
new file mode 100644
index 000000000..ea4930d30
--- /dev/null
+++ b/runtime/themes/material_oceanic.toml
@@ -0,0 +1,21 @@
+# Material Theme <https://material-theme.com/> for Helix Editor
+
+inherits = "material_deep_ocean"
+
+[palette]
+bg = "#25363b"
+text = "#b0bec5"
+
+gray = "#546e7a"
+
+disabled = "#415967"
+
+accent = "#009688"
+
+highlight = "#425b67"
+
+comment = "#546e7a"
+
+selection = "#395b65"
+
+line-number = "#355058"
\ No newline at end of file
diff --git a/runtime/themes/material_palenight.toml b/runtime/themes/material_palenight.toml
new file mode 100644
index 000000000..ef9c27e26
--- /dev/null
+++ b/runtime/themes/material_palenight.toml
@@ -0,0 +1,19 @@
+# Material Theme <https://material-theme.com/> for Helix Editor
+
+inherits = "material_deep_ocean"
+
+[palette]
+bg = "#292d3e"
+text = "#a6accd"
+
+disabled = "#515772"
+
+accent = "#ab47bc"
+
+highlight = "#444267"
+
+comment = "#676e95"
+
+selection = "#444267"
+
+line-number = "#3a3f58"
\ No newline at end of file

From 83ac53a1090e90bb36376dcf5713fac8e1cf66fd Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@rudder.io>
Date: Sun, 10 Sep 2023 22:31:12 +0200
Subject: [PATCH 328/967] Fix various typos (#8233)

---
 helix-core/src/syntax.rs       | 2 +-
 helix-view/src/document.rs     | 2 +-
 runtime/themes/jellybeans.toml | 2 +-
 runtime/themes/molokai.toml    | 2 +-
 runtime/themes/nightfox.toml   | 4 ++--
 runtime/themes/noctis.toml     | 6 +++---
 runtime/themes/rose_pine.toml  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index bf167c28d..881b45098 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -962,7 +962,7 @@ impl Syntax {
         let res = syntax.update(source, source, &ChangeSet::new(source));
 
         if res.is_err() {
-            log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
+            log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
             return None;
         }
         Some(syntax)
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 36dbbcb8b..bb61eaa6a 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1206,7 +1206,7 @@ impl Document {
                     transaction.changes(),
                 );
                 if res.is_err() {
-                    log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
+                    log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
                     self.syntax = None;
                 }
             }
diff --git a/runtime/themes/jellybeans.toml b/runtime/themes/jellybeans.toml
index 592db9a92..55088c298 100644
--- a/runtime/themes/jellybeans.toml
+++ b/runtime/themes/jellybeans.toml
@@ -22,7 +22,7 @@
 
 "constant.builtin.boolean" = "yellow"
 "constant.character" = "yellow"
-"constant.characted.escape" = "red_error"
+"constant.character.escape" = "red_error"
 "constant.numeric" = "dark_orange"
 "string" = "dark_green"
 "string.regexp" = "light_purple"
diff --git a/runtime/themes/molokai.toml b/runtime/themes/molokai.toml
index fc8e533d5..2d5c9455e 100644
--- a/runtime/themes/molokai.toml
+++ b/runtime/themes/molokai.toml
@@ -13,7 +13,7 @@ inherits = "monokai"
 "keyword.storage.modifier" = { fg = "#fd971f", modifiers = ["italic"] }
 "label" = "#e6db74"
 "operator" = "keyword"
-"punctuation.delimeter" = "#8f8f8f"
+"punctuation.delimiter" = "#8f8f8f"
 "type" = "light-blue"
 "variable.builtin" = { fg = "#ae81ff", modifiers = ["bold"] }
 "tag.builtin" = { fg = "#ae81ff", modifiers = ["bold"] }
diff --git a/runtime/themes/nightfox.toml b/runtime/themes/nightfox.toml
index 069b32ab4..6c5ed3501 100644
--- a/runtime/themes/nightfox.toml
+++ b/runtime/themes/nightfox.toml
@@ -125,7 +125,7 @@
 "keyword.control.exception" = { fg = "magenta" } # `try`, `catch`, `raise`/`throw` and related.
 "keyword.operator" = { fg = "fg2", modifiers = ["bold"] } # 'or', 'and', 'in'.
 "keyword.directive" = { fg = "pink-bright" } # Preprocessor directives (#if in C...).
-"keyword.function" = { fg = "red" } # The keyword to define a funtion: 'def', 'fun', 'fn'.
+"keyword.function" = { fg = "red" } # The keyword to define a function: 'def', 'fun', 'fn'.
 "keyword.storage" = { fg = "magenta" } # Keywords describing how things are stored
 "keyword.storage.type" = { fg = "magenta" } #  The type of something, class, function, var, let, etc.
 "keyword.storage.modifier" = { fg = "yellow" } # Storage modifiers like static, mut, const, ref, etc.
@@ -183,6 +183,6 @@ bg4            = "#39506d" # Conceal, border fg
 fg0            = "#d6d6d7" # Lighter fg
 fg1            = "#cdcecf" # Default fg
 fg2            = "#aeafb0" # Darker fg (status line)
-fg3            = "#71839b" # Darker fg (line numbers, fold colums)
+fg3            = "#71839b" # Darker fg (line numbers, fold columns)
 sel0           = "#2b3b51" # Popup bg, visual selection bg
 sel1           = "#3c5372" # Popup sel bg, search bg
diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml
index c7d33680e..f4c2d5b5a 100644
--- a/runtime/themes/noctis.toml
+++ b/runtime/themes/noctis.toml
@@ -100,14 +100,14 @@
 
 'variable' = { fg = "white" }  # Variable names.
 'variable.builtin' = { } # Language reserved variables: `this`, `self`, `super`, etc.
-'variable.parameter' = { } # Funtion parameters.
+'variable.parameter' = { } # Function parameters.
 'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions).
 'variable.function' = { } # ?
 
 'label' = { fg = "purple" } # Loop labels in rust.
 
 'punctuation' =  { fg = "yellow", modifiers = ["bold"] } # (){}[]:;,.
-# 'punctuation.delimeter' = { fg = "yellow" } # Commas and colons.
+# 'punctuation.delimiter' = { fg = "yellow" } # Commas and colons.
 # 'punctuation.bracket' = { fg = "yellow" } # Parentheses, angle brackets, etc.
 
 'keyword' = { fg = "pink", modifiers = ["bold"] } # Language reserved keywords.
@@ -119,7 +119,7 @@
 'keyword.control.exception' = {fg = "pink", modifiers = ["bold"] } # 'raise' in python.
 'keyword.operator' = { } # 'or', 'and', 'in'.
 'keyword.directive' = { fg = "purple" } # Preprocessor directives (#if in C).
-'keyword.function' = { } # The keyword to define a funtion: 'def', 'fun', 'fn'.
+'keyword.function' = { } # The keyword to define a function: 'def', 'fun', 'fn'.
 
 'operator' = { fg = "pink", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators
 
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index e1d968941..4bbf219ed 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -89,7 +89,7 @@
 "comment" = { fg = "muted", modifiers = ["italic"]}
 # "comment.line" = ""
 # "comment.block" = ""
-# "comment.block.documenation" = ""
+# "comment.block.documentation" = ""
 
 "variable" = "text"
 "variable.builtin" = "love"

From acef759a5e2e4dab46d037efab8775912639e229 Mon Sep 17 00:00:00 2001
From: Galen Abell <galen@galenabell.com>
Date: Sun, 10 Sep 2023 22:49:28 +0200
Subject: [PATCH 329/967] Add additional YAML injections (#8217)

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

diff --git a/runtime/queries/yaml/injections.scm b/runtime/queries/yaml/injections.scm
index 321c90add..52b437a4e 100644
--- a/runtime/queries/yaml/injections.scm
+++ b/runtime/queries/yaml/injections.scm
@@ -1,2 +1,54 @@
 ((comment) @injection.content
  (#set! injection.language "comment"))
+
+; The remaining code in this file incorporates work covered by the following
+; copyright and permission notice:
+;
+;   Copyright 2023 the nvim-treesitter authors
+;
+;   Licensed under the Apache License, Version 2.0 (the "License");
+;   you may not use this file except in compliance with the License.
+;   You may obtain a copy of the License at
+;
+;       http://www.apache.org/licenses/LICENSE-2.0
+;
+;   Unless required by applicable law or agreed to in writing, software
+;   distributed under the License is distributed on an "AS IS" BASIS,
+;   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;   See the License for the specific language governing permissions and
+;   limitations under the License.
+
+; Modified for Helix from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/yaml/injections.scm
+
+;; Github actions ("run") / Gitlab CI ("scripts")
+(block_mapping_pair
+  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  value: (flow_node
+           (plain_scalar
+             (string_scalar) @injection.content)
+           (#set! injection.language "bash")))
+
+(block_mapping_pair
+  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  value: (block_node
+           (block_scalar) @injection.content
+           (#set! injection.language "bash")))
+
+(block_mapping_pair
+  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  value: (block_node
+           (block_sequence
+             (block_sequence_item
+                (flow_node
+                  (plain_scalar
+                    (string_scalar) @injection.content))
+                (#set! injection.language "bash")))))
+
+(block_mapping_pair
+  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  value: (block_node
+           (block_sequence
+             (block_sequence_item
+               (block_node
+                  (block_scalar) @injection.content
+                  (#set! injection.language "bash"))))))

From 060e73a7110fe38cc6ed30ca0cc3abc686e225fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 11 Sep 2023 13:14:41 +0900
Subject: [PATCH 330/967] Lower idle-timeout to 250ms

The aim is to make it slow enough it only triggers during a typing
pause, but not too slow. Initial value was chosen as a safe slow
default but I've been using 250 for a while.
---
 helix-view/src/editor.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 86f35e0db..6963867af 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -244,7 +244,7 @@ pub struct Config {
     /// Set a global text_width
     pub text_width: usize,
     /// Time in milliseconds since last keypress before idle timers trigger.
-    /// Used for autocompletion, set to 0 for instant. Defaults to 400ms.
+    /// Used for autocompletion, set to 0 for instant. Defaults to 250ms.
     #[serde(
         serialize_with = "serialize_duration_millis",
         deserialize_with = "deserialize_duration_millis"
@@ -817,7 +817,7 @@ impl Default for Config {
             auto_completion: true,
             auto_format: true,
             auto_save: false,
-            idle_timeout: Duration::from_millis(400),
+            idle_timeout: Duration::from_millis(250),
             preview_completion_insert: true,
             completion_trigger_len: 2,
             auto_info: true,

From 95e994ab3817b3803f0d25b10423de4ef74508d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 11 Sep 2023 13:15:45 +0900
Subject: [PATCH 331/967] Add more shebangs to languages

---
 languages.toml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 4d1e6fe0a..85cc95d40 100644
--- a/languages.toml
+++ b/languages.toml
@@ -587,7 +587,7 @@ scope = "source.ts"
 injection-regex = "(ts|typescript)"
 file-types = ["ts", "mts", "cts"]
 language-id = "typescript"
-shebangs = []
+shebangs = ["deno", "ts-node"]
 roots = []
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
@@ -821,6 +821,7 @@ name = "julia"
 scope = "source.julia"
 injection-regex = "julia"
 file-types = ["jl"]
+shebangs = ["julia"]
 roots = ["Manifest.toml", "Project.toml"]
 comment-token = "#"
 language-servers = [ "julia" ]
@@ -834,7 +835,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "8fb3
 name = "java"
 scope = "source.java"
 injection-regex = "java"
-file-types = ["java"]
+file-types = ["java", "jav"]
 roots = ["pom.xml", "build.gradle", "build.gradle.kts"]
 language-servers = [ "jdtls" ]
 indent = { tab-width = 2, unit = "  " }
@@ -874,7 +875,7 @@ name = "ocaml"
 scope = "source.ocaml"
 injection-regex = "ocaml"
 file-types = ["ml"]
-shebangs = []
+shebangs = ["ocaml", "ocamlrun", "ocamlscript"]
 roots = []
 comment-token = "(**)"
 language-servers = [ "ocamllsp" ]
@@ -1824,6 +1825,7 @@ name = "scheme"
 scope = "source.scheme"
 injection-regex = "scheme"
 file-types = ["ss", "scm"]
+shebangs = ["scheme", "guile", "chicken"]
 roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }

From ef23847957463b95a68599efb12a32837d73727b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 11 Sep 2023 13:15:58 +0900
Subject: [PATCH 332/967] scheme: Highlight abbreviations

---
 runtime/queries/scheme/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/runtime/queries/scheme/highlights.scm b/runtime/queries/scheme/highlights.scm
index 468193745..c7050847f 100644
--- a/runtime/queries/scheme/highlights.scm
+++ b/runtime/queries/scheme/highlights.scm
@@ -97,3 +97,8 @@
 
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
+(quote "'") @operator
+(unquote_splicing ",@") @operator
+(unquote ",") @operator
+(quasiquote "`") @operator
+

From 7090555daba6bce37dc6cc900387015a10a1e791 Mon Sep 17 00:00:00 2001
From: Em Zhan <zqianem@gmail.com>
Date: Mon, 11 Sep 2023 19:06:25 -0500
Subject: [PATCH 333/967] Add `insert-final-newline` config option (#8157)

Co-authored-by: Xalfer <64538944+Xalfer@users.noreply.github.com>
---
 book/src/configuration.md               |   1 +
 helix-term/src/commands/typed.rs        |  70 ++++++++-----
 helix-term/tests/test/commands/write.rs | 125 +++++++++++++++++++++++-
 helix-term/tests/test/helpers.rs        |   2 +-
 helix-term/tests/test/splits.rs         |   6 +-
 helix-view/src/editor.rs                |   3 +
 6 files changed, 173 insertions(+), 34 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index eb2cf473c..3b78481e3 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -64,6 +64,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set | `80` |
 | `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
 | `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
+| `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
 
 ### `[editor.statusline]` Section
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 4237b6f62..abe6dd97e 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -6,7 +6,7 @@ use crate::job::Job;
 use super::*;
 
 use helix_core::fuzzy::fuzzy_match;
-use helix_core::{encoding, shellwords::Shellwords};
+use helix_core::{encoding, line_ending, shellwords::Shellwords};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
 use serde_json::Value;
@@ -330,12 +330,16 @@ fn write_impl(
     path: Option<&Cow<str>>,
     force: bool,
 ) -> anyhow::Result<()> {
-    let editor_auto_fmt = cx.editor.config().auto_format;
+    let config = cx.editor.config();
     let jobs = &mut cx.jobs;
     let (view, doc) = current!(cx.editor);
     let path = path.map(AsRef::as_ref);
 
-    let fmt = if editor_auto_fmt {
+    if config.insert_final_newline {
+        insert_final_newline(doc, view);
+    }
+
+    let fmt = if config.auto_format {
         doc.auto_format().map(|fmt| {
             let callback = make_format_callback(
                 doc.id(),
@@ -359,6 +363,16 @@ fn write_impl(
     Ok(())
 }
 
+fn insert_final_newline(doc: &mut Document, view: &mut View) {
+    let text = doc.text();
+    if line_ending::get_line_ending(&text.slice(..)).is_none() {
+        let eof = Selection::point(text.len_chars());
+        let insert = Transaction::insert(text, &eof, doc.line_ending.as_str().into());
+        doc.apply(&insert, view.id);
+        doc.append_changes_to_history(view);
+    }
+}
+
 fn write(
     cx: &mut compositor::Context,
     args: &[Cow<str>],
@@ -658,11 +672,10 @@ pub fn write_all_impl(
     write_scratch: bool,
 ) -> anyhow::Result<()> {
     let mut errors: Vec<&'static str> = Vec::new();
-    let auto_format = cx.editor.config().auto_format;
+    let config = cx.editor.config();
     let jobs = &mut cx.jobs;
     let current_view = view!(cx.editor);
 
-    // save all documents
     let saves: Vec<_> = cx
         .editor
         .documents
@@ -693,32 +706,35 @@ pub fn write_all_impl(
                 current_view.id
             };
 
-            let fmt = if auto_format {
-                doc.auto_format().map(|fmt| {
-                    let callback = make_format_callback(
-                        doc.id(),
-                        doc.version(),
-                        target_view,
-                        fmt,
-                        Some((None, force)),
-                    );
-                    jobs.add(Job::with_callback(callback).wait_before_exiting());
-                })
-            } else {
-                None
-            };
+            Some((doc.id(), target_view))
+        })
+        .collect();
 
-            if fmt.is_none() {
-                return Some(doc.id());
-            }
+    for (doc_id, target_view) in saves {
+        let doc = doc_mut!(cx.editor, &doc_id);
 
+        if config.insert_final_newline {
+            insert_final_newline(doc, view_mut!(cx.editor, target_view));
+        }
+
+        let fmt = if config.auto_format {
+            doc.auto_format().map(|fmt| {
+                let callback = make_format_callback(
+                    doc_id,
+                    doc.version(),
+                    target_view,
+                    fmt,
+                    Some((None, force)),
+                );
+                jobs.add(Job::with_callback(callback).wait_before_exiting());
+            })
+        } else {
             None
-        })
-        .collect();
+        };
 
-    // manually call save for the rest of docs that don't have a formatter
-    for id in saves {
-        cx.editor.save::<PathBuf>(id, None, force)?;
+        if fmt.is_none() {
+            cx.editor.save::<PathBuf>(doc_id, None, force)?;
+        }
     }
 
     if !errors.is_empty() && !force {
diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index f33c8aaf6..376ba5e7b 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs
@@ -93,7 +93,7 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     )
     .await?;
 
-    helpers::assert_file_has_content(file.as_file_mut(), &RANGE.end().to_string())?;
+    helpers::assert_file_has_content(file.as_file_mut(), &platform_line(&RANGE.end().to_string()))?;
 
     Ok(())
 }
@@ -209,7 +209,7 @@ 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!(RANGE.end().to_string(), file_content);
+    assert_eq!(platform_line(&RANGE.end().to_string()), file_content);
 
     Ok(())
 }
@@ -424,13 +424,132 @@ async fn test_write_utf_bom_file() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .with_input_text("#[h|]#ave you tried chamomile tea?")
+        .build()?;
+
+    test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
+
+    helpers::assert_file_has_content(
+        file.as_file_mut(),
+        &helpers::platform_line("have you tried chamomile tea?\n"),
+    )?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_insert_final_newline_unchanged_if_not_missing() -> anyhow::Result<()> {
+    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"))
+        .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"),
+    )?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_insert_final_newline_unchanged_if_missing_and_false() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_config(Config {
+            editor: helix_view::editor::Config {
+                insert_final_newline: false,
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+        .with_file(file.path(), None)
+        .with_input_text("#[t|]#he quiet rain continued through the night")
+        .build()?;
+
+    test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
+
+    helpers::assert_file_has_content(
+        file.as_file_mut(),
+        "the quiet rain continued through the night",
+    )?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_all_insert_final_newline_add_if_missing_and_modified() -> anyhow::Result<()> {
+    let mut file1 = tempfile::NamedTempFile::new()?;
+    let mut file2 = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file1.path(), None)
+        .with_input_text("#[w|]#e don't serve time travelers here")
+        .build()?;
+
+    test_key_sequence(
+        &mut app,
+        Some(&format!(
+            ":o {}<ret>ia time traveler walks into a bar<esc>:wa<ret>",
+            file2.path().to_string_lossy()
+        )),
+        None,
+        false,
+    )
+    .await?;
+
+    helpers::assert_file_has_content(
+        file1.as_file_mut(),
+        &helpers::platform_line("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"),
+    )?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_write_all_insert_final_newline_do_not_add_if_unmodified() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
+
+    file.write_all(b"i lost on Jeopardy!")?;
+    file.rewind()?;
+
+    test_key_sequence(&mut app, Some(":wa<ret>"), None, false).await?;
+
+    helpers::assert_file_has_content(file.as_file_mut(), "i lost on Jeopardy!")?;
+
+    Ok(())
+}
+
 async fn edit_file_with_content(file_content: &[u8]) -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
 
     file.as_file_mut().write_all(&file_content)?;
 
     helpers::test_key_sequence(
-        &mut helpers::AppBuilder::new().build()?,
+        &mut helpers::AppBuilder::new()
+            .with_config(Config {
+                editor: helix_view::editor::Config {
+                    insert_final_newline: false,
+                    ..Default::default()
+                },
+                ..Default::default()
+            })
+            .build()?,
         Some(&format!(":o {}<ret>:x<ret>", file.path().to_string_lossy())),
         None,
         true,
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 6466bc764..e6762baf9 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -350,7 +350,7 @@ pub fn assert_file_has_content(file: &mut File, content: &str) -> anyhow::Result
 
     let mut file_content = String::new();
     file.read_to_string(&mut file_content)?;
-    assert_eq!(content, file_content);
+    assert_eq!(file_content, content);
 
     Ok(())
 }
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index 1d70f24a6..f010c86ba 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -62,9 +62,9 @@ async fn test_split_write_quit_all() -> anyhow::Result<()> {
     )
     .await?;
 
-    helpers::assert_file_has_content(file1.as_file_mut(), "hello1")?;
-    helpers::assert_file_has_content(file2.as_file_mut(), "hello2")?;
-    helpers::assert_file_has_content(file3.as_file_mut(), "hello3")?;
+    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"))?;
 
     Ok(())
 }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 6963867af..2265633df 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -287,6 +287,8 @@ pub struct Config {
     pub workspace_lsp_roots: Vec<PathBuf>,
     /// Which line ending to choose for new documents. Defaults to `native`. i.e. `crlf` on Windows, otherwise `lf`.
     pub default_line_ending: LineEndingConfig,
+    /// Whether to automatically insert a trailing line-ending on write if missing. Defaults to `true`.
+    pub insert_final_newline: bool,
     /// Enables smart tab
     pub smart_tab: Option<SmartTabConfig>,
 }
@@ -842,6 +844,7 @@ impl Default for Config {
             completion_replace: false,
             workspace_lsp_roots: Vec::new(),
             default_line_ending: LineEndingConfig::default(),
+            insert_final_newline: true,
             smart_tab: Some(SmartTabConfig::default()),
         }
     }

From a8449afbfeb357bc140eb0666ef1efaf3555c4dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 19:09:27 -0500
Subject: [PATCH 334/967] build(deps): bump thiserror from 1.0.47 to 1.0.48
 (#8252)

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

---
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 2b0527c3a..89699d3f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2286,18 +2286,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
 dependencies = [
  "proc-macro2",
  "quote",

From d46127fb2e52cfe0bb3b476cf21919a79e49c0c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 19:11:17 -0500
Subject: [PATCH 335/967] build(deps): bump which from 4.4.0 to 4.4.1 (#8251)

Bumps [which](https://github.com/harryfei/which-rs) from 4.4.0 to 4.4.1.
- [Changelog](https://github.com/harryfei/which-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/harryfei/which-rs/compare/4.4.0...4.4.1)

---
updated-dependencies:
- dependency-name: which
  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 | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 89699d3f3..2fec9a8b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -366,6 +366,27 @@ dependencies = [
  "syn 2.0.28",
 ]
 
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "dunce"
 version = "1.0.4"
@@ -1804,6 +1825,12 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1947,6 +1974,17 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
 [[package]]
 name = "regex"
 version = "1.9.5"
@@ -2601,13 +2639,14 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "which"
-version = "4.4.0"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
+checksum = "8ad25fe5717e59ada8ea33511bbbf7420b11031730a24c65e82428766c307006"
 dependencies = [
+ "dirs",
  "either",
- "libc",
  "once_cell",
+ "rustix 0.38.11",
 ]
 
 [[package]]

From 719ef3f8797439b27af4f1389e591334e2814633 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 02:18:35 +0200
Subject: [PATCH 336/967] build(deps): bump chrono from 0.4.26 to 0.4.30
 (#8247)

Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.26 to 0.4.30.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.26...v0.4.30)

---
updated-dependencies:
- dependency-name: chrono
  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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2fec9a8b2..39cc7a554 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -185,14 +185,14 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "winapi",
+ "windows-targets 0.48.0",
 ]
 
 [[package]]

From e3d537cee5f06fa8a3454b7eeba80852308d52e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 02:21:14 +0200
Subject: [PATCH 337/967] build(deps): bump url from 2.4.0 to 2.4.1 (#8250)

Bumps [url](https://github.com/servo/rust-url) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/servo/rust-url/releases)
- [Commits](https://github.com/servo/rust-url/compare/v2.4.0...v2.4.1)

---
updated-dependencies:
- dependency-name: url
  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 39cc7a554..3799e3895 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2551,9 +2551,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
  "idna",

From ccabfee3811bdcc8372beaae777a98fd36e2657e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 02:47:31 +0200
Subject: [PATCH 338/967] build(deps): bump rustix from 0.38.11 to 0.38.13
 (#8249)

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.11 to 0.38.13.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.11...v0.38.13)

---
updated-dependencies:
- dependency-name: rustix
  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 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3799e3895..d2a700a85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1455,7 +1455,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.11",
+ "rustix 0.38.13",
  "serde",
  "serde_json",
  "slotmap",
@@ -1657,9 +1657,9 @@ checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.3"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
 
 [[package]]
 name = "lock_api"
@@ -2052,14 +2052,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.11"
+version = "0.38.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
+checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.3",
+ "linux-raw-sys 0.4.7",
  "windows-sys 0.48.0",
 ]
 
@@ -2289,7 +2289,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.38.11",
+ "rustix 0.38.13",
  "windows-sys 0.48.0",
 ]
 
@@ -2646,7 +2646,7 @@ dependencies = [
  "dirs",
  "either",
  "once_cell",
- "rustix 0.38.11",
+ "rustix 0.38.13",
 ]
 
 [[package]]

From e4ba237258afc7b8545c3e08719a55207b604ae3 Mon Sep 17 00:00:00 2001
From: Bannerets <comonoid@protonmail.com>
Date: Tue, 12 Sep 2023 20:51:54 +0300
Subject: [PATCH 339/967] Disable auto-pairing ` in OCaml (#8260)

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

diff --git a/languages.toml b/languages.toml
index 85cc95d40..37d2e94cf 100644
--- a/languages.toml
+++ b/languages.toml
@@ -886,7 +886,6 @@ indent = { tab-width = 2, unit = "  " }
 '{' = '}'
 '[' = ']'
 '"' = '"'
-'`' = '`'
 
 [[grammar]]
 name = "ocaml"
@@ -907,7 +906,6 @@ indent = { tab-width = 2, unit = "  " }
 '{' = '}'
 '[' = ']'
 '"' = '"'
-'`' = '`'
 
 [[grammar]]
 name = "ocaml-interface"

From 729f32de21d6ead25c1795f262b1be6661016b46 Mon Sep 17 00:00:00 2001
From: Chirikumbrah <78883260+Chirikumbrah@users.noreply.github.com>
Date: Wed, 13 Sep 2023 00:06:21 +0300
Subject: [PATCH 340/967] Better indent line color for Dracula theme. (#8266)

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

diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 1ec5b4fe2..1253544f2 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -90,6 +90,7 @@
 "ui.virtual.whitespace"           = { fg    = "current_line"                                                }
 "ui.virtual.wrap"                 = { fg    = "current_line"                                                }
 "ui.virtual.ruler"                = { bg    = "black"                                                       }
+"ui.virtual.indent-guide"         = { fg    = "indent"                                                      }
 "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"]              }
@@ -123,6 +124,7 @@ black             = "#191A21"
 grey              = "#666771"
 comment           = "#6272A4"
 current_line      = "#44475a"
+indent            = "#56596a"
 selection         = "#363848"
 red               = "#ff5555"
 orange            = "#ffb86c" 

From fe6b556f51e5dfac828e139131af99117b655efe Mon Sep 17 00:00:00 2001
From: Em Zhan <zqianem@gmail.com>
Date: Wed, 13 Sep 2023 09:37:39 -0500
Subject: [PATCH 341/967] Fix search highlighting for the default docs theme
 (#8270)

---
 book/custom.css      |  2 +-
 docs/CONTRIBUTING.md | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/book/custom.css b/book/custom.css
index 0e812090e..4b039125e 100644
--- a/book/custom.css
+++ b/book/custom.css
@@ -164,7 +164,7 @@ code.hljs {
   --searchresults-header-fg: #5f5f71;
   --searchresults-border-color: #5c5c68;
   --searchresults-li-bg: #242430;
-  --search-mark-bg: #acff5;
+  --search-mark-bg: #a2cff5;
 }
 
 .colibri .content .header {
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 982b2237e..2be8f77c7 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -29,9 +29,15 @@ files, run
 cargo xtask docgen
 ```
 
-inside the project. We use [xtask][xtask] as an ad-hoc task runner and
-thus do not require any dependencies other than `cargo` (You don't have
-to `cargo install` anything either).
+inside the project. We use [xtask][xtask] as an ad-hoc task runner.
+
+To preview the book itself, install [mdbook][mdbook]. Then, run
+
+```shell
+mdbook serve book
+```
+
+and visit [http://localhost:3000](http://localhost:3000).
 
 # Testing
 
@@ -58,4 +64,5 @@ The current MSRV and future changes to the MSRV are listed in the [Firefox docum
 [architecture.md]: ./architecture.md
 [docs]: https://docs.helix-editor.com/
 [xtask]: https://github.com/matklad/cargo-xtask
+[mdbook]: https://rust-lang.github.io/mdBook/guide/installation.html
 [helpers.rs]: ../helix-term/tests/test/helpers.rs

From 764172d5bce243e11c23b4540ce89968bcb2f643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 14 Sep 2023 00:37:53 +0200
Subject: [PATCH 342/967] Theme: Papercolor: Cleanup, linting and using
 inheritance (#8276)

---
 runtime/themes/papercolor-dark.toml  | 183 ++++++-----------
 runtime/themes/papercolor-light.toml | 293 +++++++++++++++++----------
 2 files changed, 257 insertions(+), 219 deletions(-)

diff --git a/runtime/themes/papercolor-dark.toml b/runtime/themes/papercolor-dark.toml
index eaaa36dcf..6e6dc0c33 100644
--- a/runtime/themes/papercolor-dark.toml
+++ b/runtime/themes/papercolor-dark.toml
@@ -1,124 +1,75 @@
 # Palette based on https://github.com/NLKNguyen/papercolor-theme
 # Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
 
-"ui.linenr.selected" = { fg = "linenr_fg_selected" }
-"ui.background" = {bg="background"}
-"ui.text" = "foreground"
-"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]}
-"ui.selection" = {bg="selection_background", fg="selection_foreground"}
-"ui.cursorline" = {bg="cursorline_background"}
-"ui.highlight" = {bg="cursorline_background"}
-"ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
-"ui.statusline.select" = {bg="background", fg="bright7"}
-"ui.statusline.normal" = {bg="background", fg="bright3"}
-"ui.statusline.inactive" = {bg="selection_foreground", fg="foreground"}
-"ui.virtual.whitespace" = { fg = "regular5" }
-"ui.virtual.ruler" = {bg="cursorline_background"}
-"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
-"ui.cursor" = {bg = "regular5", fg = "background"}
-"ui.window" = {bg = "#303030", fg = "bright2"}
-"ui.help" = {bg = "background", fg = "bright2"}
-"ui.popup" = {bg = "#303030", fg = "bright6"}
-"ui.menu" = {bg = "#303030", fg = "bright6"}
-"ui.menu.selected" = {bg = "#C6C6C6", fg="selection_foreground"}
+inherits = "papercolor-light"
 
-"markup.heading" = { fg = "regular4", modifiers = ["bold"] }
-"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "bright5", modifiers = ["bold"] }
-"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "bright5", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "bright5", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "bright5", modifiers = ["bold"] }
-"markup.list" = "bright3"
-"markup.bold" = { fg = "foreground", modifiers = ["bold"] }
-"markup.italic" = { fg = "bright0", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "bright6", modifiers = ["underlined"] }
-"markup.link.text" = "bright2"
-"markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
-"markup.raw" = "foreground"
-
-"string" = "foreground"
-"attribute" = "bright7"
-"keyword" = { fg = "regular4", modifiers = ["bold"]}
-"keyword.directive" = "regular4"
-"keyword.control.conditional" = "bright3"
-"keyword.function" = "regular4"
-"namespace" = "bright1"
-"type" = "bright2"
-"type.builtin" = { fg = "foreground", modifiers = ["bold"]}
-"variable" = "foreground"
-"variable.builtin" = "cyan"
-"variable.other.member" = "cyan"
-"variable.parameter" = "foreground"
-
-"special" = "#3E999F"
-"function"  = "bright6"
-"constructor" = "regular4"
-"function.builtin" = { fg = "foreground", modifiers = ["bold"]}
-"function.macro" = { fg = "regular4", modifiers = ["bold"] }
-"comment" = { fg = "#686868", modifiers = ["dim"] }
-"ui.linenr" = { fg = "bright0" }
-"module" = "regular4"
-"constant" = "bright5"
-"constant.builtin" = "bright6"
-"constant.numeric" = "bright5"
-"constant.character.escape" = { fg = "foreground", modifiers = ["bold"]}
-"operator" = { fg = "regular4", modifiers = ["bold"]}
-
-"label" = { fg = "selection_background", modifiers = ["bold", "italic"] }
-
-"diff.plus" = "regular2"
-"diff.delta" = "regular6"
-"diff.minus" = "regular1"
+[palette]
+background = "#1c1c1c"
+foreground = "#d0d0d0"
 
-"warning" = "bright4"
-"error" = "regular1"
-"info" = "bright4"
+regular0 = "#1c1c1c" # color00 "Background"
+regular1 = "#af005f" # color01 "Negative"
+regular2 = "#5faf00" # color02 "Positive"
+regular3 = "#d7af5f" # color03 "Olive"
+regular4 = "#5fafd7" # color04 "Neutral" / Aqua
+regular5 = "#808080" # color05 "Comment"
+regular6 = "#d7875f" # color06 "Navy"
+regular7 = "#d0d0d0" # color07 "Foreground"
+bright0 = "#585858"  # color08 "Nontext"
+bright1 = "#5faf5f"  # color09 "Red"
+bright2 = "#afd700"  # color10 "Pink"
+bright3 = "#af87d7"  # color11 "Purple"
+bright4 = "#ffaf00"  # color12 "Accent"
+bright5 = "#ff5faf"  # color13 "Orange"
+bright6 = "#00afaf"  # color14 "Blue"
+bright7 = "#5f8787"  # color15 "Highlight"
 
-"diagnostic.warning".underline = { color = "bright4", style = "curl" } 
-"diagnostic.error".underline = { color = "regular1", style = "curl" } 
-"diagnostic.info".underline = { color = "bright4", style = "curl" } 
-"diagnostic.hint".underline = { color = "bright4", style = "curl" } 
+selection_fg = "#000000"
+selection_bg = "#8787af"
+selection_secondary_fg = "#333333"
+selection_secondary_bg = "#707097"
+special = "#3e999f"
 
+cursorline_bg = "#303030"
+cursorline_secondary_bg = "#2a2a2a"
+cursorcolumn_bg = "#303030"
+cursorcolumn_secondary_bg = "#2a2a2a"
+cursorlinenr_fg = "#ffff00"
+popupmenu_fg = "#c6c6c6"
+popupmenu_bg = "#303030"
+linenumber_fg = "#585858"
+vertsplit_fg = "#5f8787"
+statusline_active_fg = "#1c1c1c"
+statusline_active_bg = "#5f8787"
+statusline_inactive_fg = "#bcbcbc"
+statusline_inactive_bg = "#3a3a3a"
+todo_fg = "#ff8700"
+error_fg = "#af005f"
+error_bg = "#5f0000"
+matchparen_bg = "#4e4e4e"
+matchparen_fg = "#c6c6c6"
+wildmenu_fg = "#1c1c1c"
+wildmenu_bg = "#afd700"
+diffadd_fg = "#87d700"
+diffadd_bg = "#005f00"
+diffdelete_fg = "#af005f"
+diffdelete_bg = "#5f0000"
+diffchange_bg = "#005f5f"
 
-[palette]
-background="#1c1c1c"
-foreground="#d0d0d0"
-regular0="#1c1c1c"
-regular1="#af005f"
-regular2="#5faf00"
-regular3="#d7af5f"
-regular4="#5fafd7"
-regular5="#808080"
-regular6="#d7875f"
-regular7="#d0d0d0"
-bright0="#585858"
-bright1="#5faf5f"
-bright2="#afd700"
-bright3="#af87d7"
-bright4="#FFAF00"
-bright5="#ff5faf"
-bright6="#00afaf"
-bright7="#5f8787"
-selection_foreground="#585858"
-selection_background="#8787AF"
-cursorline_background="#303030"
-paper_bar_bg="#5F8787"
-black="#1c1c1c"
-red="#af005f"
-green="#5faf00"
-yellow="#d7af5f"
-blue="#5fafd7"
-magenta="#808080"
-cyan="#d7875f"
-gray="#d0d0d0"
-light-red="#5faf5f"
-light-green="#afd700"
-light-yellow="#af87d7"
-light-blue="#FFAF00"
-light-magenta="#ff5faf"
-light-cyan="#00afaf"
-light-gray="#5f8787"
-white="#808080"
-linenr_fg_selected="#FFFF00"
+# 16 bit ANSI color names
+black = "#1c1c1c"
+red = "#af005f"
+green = "#5faf00"
+yellow = "#d7af5f"
+blue = "#5fafd7"
+magenta = "#808080"
+cyan = "#d7875f"
+white = "#d0d0d0"
+light-black = "#585858"
+light-red = "#5faf5f"
+light-green = "#afd700"
+light-yellow = "#af87d7"
+light-blue = "#ffaf00"
+light-magenta = "#ff5faf"
+light-cyan = "#00afaf"
+light-white = "#5f8787"
diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index 63671e1b3..ae104e17e 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -1,31 +1,124 @@
 # Palette based on https://github.com/NLKNguyen/papercolor-theme
 # Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
 
-"ui.linenr.selected" = { fg = "linenr_fg_selected" }
-"ui.background" = {bg="background"}
+"ui.linenr.selected" = { fg = "cursorlinenr_fg", modifiers = ["bold"] }
+"ui.linenr" = { fg = "linenumber_fg" }
+"ui.background" = { bg = "background" }
 "ui.text" = "foreground"
-"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]}
-"ui.selection" = {bg="selection_background", fg="selection_foreground"}
-"ui.highlight" = {bg="cursorline_background"}
-"ui.cursorline" = {bg="cursorline_background"}
-"ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
-"ui.statusline.select" = {bg="background", fg="bright7"}
-"ui.statusline.normal" = {bg="background", fg="bright3"}
-"ui.statusline.inactive" = {bg="bright0", fg="foreground"}
-"ui.virtual" = "indent"
+"ui.text.focus" = { fg = "selection_bg", modifiers = ["bold"] }
+"ui.selection" = { bg = "selection_secondary_bg", fg = "selection_secondary_fg" }
+"ui.selection.primary" = { bg = "selection_bg", fg = "selection_fg" }
+"ui.highlight" = { bg = "cursorline_bg" }
+
+"ui.cursorline" = { bg = "cursorline_bg" }
+"ui.cursorline.secondary" = { bg = "cursorline_secondary_bg" }
+"ui.cursorcolumn" = { bg = "cursorline_bg" }
+"ui.cursorcolumn.secondary" = { bg = "cursorcolumn_secondary_bg" }
+
+"ui.statusline" = { bg = "statusline_active_bg", fg = "statusline_active_fg" }
+"ui.statusline.inactive" = { bg = "statusline_inactive_bg", fg = "statusline_inactive_fg" }
+"ui.statusline.normal" = { bg = "statusline_inactive_bg", fg = "bright6" }
+"ui.statusline.insert" = { bg = "statusline_inactive_bg", fg = "bright4" }
+"ui.statusline.select" = { bg = "statusline_inactive_bg", fg = "regular3" }
+"ui.statusline.separator" = { bg = "statusline_active_bg", fg = "statusline_active_bg" }
+
+"ui.virtual" = { fg = "cursorlinenr_fg" }
 "ui.virtual.whitespace" = { fg = "regular5" }
-"ui.virtual.ruler" = {bg="cursorline_background"}
-"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
-"ui.cursor" = {bg = "regular5", fg = "background"}
-"ui.window" = {bg = "#D0D0D0", fg = "bright2"}
-"ui.help" = {bg = "background", fg = "bright2"}
-"ui.popup" = {bg = "#D0D0D0", fg = "bright7"}
-"ui.menu" = {bg = "#D0D0D0", fg = "bright7"}
-"ui.menu.selected" = {bg = "selection_background", fg="selection_foreground"}
-
-"markup.heading" = { fg = "bright7", modifiers = ["bold"] }
+"ui.virtual.indent-guide" = { fg = "bright0" }
+"ui.virtual.ruler" = { bg = "cursorline_secondary_bg", fg = "regular4" }
+"ui.cursor.match" = { bg = "matchparen_bg", fg = "matchparen_fg" }
+"ui.cursor" = { bg = "regular5", fg = "background" }
+"ui.cursor.primary" = { bg = "foreground", fg = "background" }
+"ui.window" = { fg = "vertsplit_fg" }
+"ui.help" = { bg = "wildmenu_bg", fg = "wildmenu_fg" }
+"ui.popup" = { bg = "popupmenu_bg", fg = "popupmenu_fg" }
+"ui.popup.info" = { bg = "popupmenu_bg", fg = "bright7", modifiers = ["bold"] }
+"ui.menu" = { bg = "popupmenu_bg", fg = "foreground" }
+"ui.menu.selected" = { bg = "selection_bg", fg = "selection_fg" }
+
+"warning" = "bright5"
+"error" = { bg = "error_bg", fg = "error_fg" }
+"info" = "todo_fg"
+
+"diagnostic.warning" = { fg = "bright0", modifiers = [
+  "dim",
+], underline = { color = "bright5", style = "curl" } }
+"diagnostic.error".underline = { color = "bright1", style = "curl" }
+"diagnostic.info".underline = { color = "bright4", style = "curl" }
+"diagnostic.hint".underline = { color = "bright6", style = "curl" }
+
+# Tree-sitter scopes for syntax highlighting
+"attribute" = "bright4"
+
+"type" = { fg = "bright2", modifiers = ["bold"] }
+"type.builtin" = { fg = "bright2", modifiers = ["bold"] }
+"type.enum" = { fg = "foreground" }
+"type.enum.variant" = { fg = "foreground" }
+
+"constructor" = "foreground"
+
+"constant" = "bright5"
+"constant.builtin" = "regular3"
+"constant.builtin.boolean" = { fg = "regular2", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "bright3", modifiers = ["bold"] }
+"constant.character" = { fg = "regular3" }
+"constant.numeric" = "bright5"
+
+"string" = "regular3"
+"string.regexp" = "bright3"
+
+"comment" = { fg = "regular5", modifiers = ["italic"] }
+"comment.line" = { fg = "regular5", modifiers = ["italic"] }
+"comment.block" = { fg = "regular5", modifiers = ["italic"] }
+"comment.block.documentation" = { fg = "regular5", modifiers = ["bold"] }
+
+"variable" = "foreground"
+"variable.builtin" = "bright5"
+"variable.other.member" = "foreground"
+"variable.parameter" = "foreground"
+
+"label" = { fg = "selection_bg", modifiers = ["bold", "italic"] }
+
+"punctuation" = { fg = "foreground" }
+"punctuation.delimiter" = { fg = "regular4", modifiers = ["bold"] }
+"punctuation.bracket" = { fg = "foreground" }
+"punctuation.special" = { fg = "bright1", modifiers = ["bold"] }
+
+"keyword" = { fg = "bright2" }
+"keyword.control" = "bright1"
+"keyword.control.conditional" = { fg = "bright3", modifiers = ["bold"] }
+"keyword.control.repeat" = { fg = "bright3", modifiers = ["bold"] }
+"keyword.control.import" = { fg = "bright2" }
+"keyword.control.return" = { fg = "bright2" }
+"keyword.control.exception" = { fg = "bright1" }
+
+"keyword.operator" = { fg = "regular4", modifiers = ["bold"] }
+"keyword.directive" = "regular4"
+"keyword.function" = "bright2"
+"keyword.storage" = "bright2"
+"keyword.storage.type" = { fg = "regular4", modifiers = ["bold"] }
+"keyword.storage.modifier" = { fg = "regular6", modifiers = ["bold"] }
+"keyword.storage.modifier.ref" = { fg = "regular4", modifiers = ["bold"] }
+"keyword.special" = "bright1"
+
+"operator" = { fg = "regular4", modifiers = ["bold"] }
+
+"function" = { fg = "foreground" }
+"function.builtin" = { fg = "bright6" }
+"function.method" = { fg = "foreground" }
+"function.macro" = { fg = "regular3", modifiers = ["bold"] }
+"function.special" = { fg = "bright4" }
+
+"tag" = { fg = "regular4" }
+
+"namespace" = "bright6"
+
+"special" = "special"
+
+"markup.heading" = { fg = "bright4", modifiers = ["bold"] }
+"markup.heading.marker" = { fg = "bright2", modifiers = ["bold"] }
 "markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "bright4", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "bright5", modifiers = ["bold"] }
 "markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
 "markup.heading.4" = { fg = "bright4", modifiers = ["bold"] }
 "markup.heading.5" = { fg = "bright4", modifiers = ["bold"] }
@@ -34,90 +127,84 @@
 "markup.bold" = { fg = "foreground", modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "regular4", modifiers = ["underlined"] }
+"markup.link.url" = { fg = "bright6", underline.style = "line" }
 "markup.link.text" = "bright2"
-"markup.link.label" = { fg = "regular7", modifiers = ["bold"] }
-"markup.raw" = "foreground"
-
-"string" = "foreground"
-"attribute" = "bright7"
-"keyword" = { fg = "regular4", modifiers = ["bold"]}
-"keyword.directive" = "regular1"
-"namespace" = "regular1"
-"type" = "bright2"
-"type.builtin" = { fg = "regular4", modifiers = ["bold"]}
-"variable" = "foreground"
-"variable.builtin" = "cyan"
-"variable.other.member" = "regular4"
-"variable.parameter" = "foreground"
-
-"special" = "#3E999F"
-"function"  = "bright1"
-"constructor" = "bright1"
-"function.builtin" = { fg = "regular4", modifiers = ["bold"]}
-"function.macro" = { fg = "regular1" }
-"comment" = { fg = "bright0", modifiers = ["dim"] }
-"ui.linenr" = { fg = "bright0" }
-"module" = "#af0000"
-"constant" = "#5f8700"
-"constant.builtin" = "#5f8700"
-"constant.numeric" = "#d75f00"
-"constant.character.escape" = { fg = "#8700af", modifiers = ["bold"]}
-"operator" = { fg = "regular4", modifiers = ["bold"]}
+"markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
+"markup.quote" = "regular4"
+# Both inline and block code
+"markup.raw" = "regular3"
 
-"label" = { fg = "selection_background", modifiers = ["bold", "italic"] }
+"diff.plus" = { bg = "diffadd_bg", fg = "diffadd_fg" }
+"diff.delta" = { bg = "diffchange_bg" }
+"diff.delta.moved" = { modifiers = ["italic"] }
+"diff.minus" = { bg = "diffdelete_bg", fg = "diffdelete_fg" }
 
-"diff.plus" = "regular2"
-"diff.delta" = "bright0"
-"diff.minus" = "bright1"
-
-"warning" = "bright4"
-"error" = "regular1"
-"info" = "#FFAF00"
+[palette]
+background = "#eeeeee"
+foreground = "#444444"
+regular0 = "#eeeeee"   # color00 "Background"
+regular1 = "#af0000"   # color01 "Negative"
+regular2 = "#008700"   # color02 "Positive"
+regular3 = "#5f8700"   # color03 "Olve"
+regular4 = "#0087af"   # color04 "Neutral" / Aqua
+regular5 = "#878787"   # color05 "Comment"
+regular6 = "#005f87"   # color06 "Navy"
+regular7 = "#444444"   # color07 "Foreground"
+bright0 = "#bcbcbc"    # color08 "Nontext"
+bright1 = "#d70000"    # color09 "Red"
+bright2 = "#d70087"    # color10 "Pink"
+bright3 = "#8700af"    # color11 "Purple"
+bright4 = "#d75f00"    # color12 "Accent"
+bright5 = "#d75f00"    # color13 "Orange"
+bright6 = "#005faf"    # color14 "Blue"
+bright7 = "#005f87"    # color15 "Highlight"
 
-"diagnostic.warning".underline = { color = "bright4", style = "curl" } 
-"diagnostic.error".underline = { color = "regular1", style = "curl" } 
-"diagnostic.info".underline = { color = "#FFAF00", style = "curl" } 
-"diagnostic.hint".underline = { color = "#FFAF00", style = "curl" } 
+selection_fg = "#eeeeee"
+selection_bg = "#0087af"
+selection_secondary_fg = "#d9d7d7"
+selection_secondary_bg = "#2c687a"
+special = "#3e999f"
 
+cursorline_bg = "#e4e4e4"
+cursorline_secondary_bg = "#eaeaea"
+cursorcolumn_bg = "#e4e4e4"
+cursorcolumn_secondary_bg = "#eaeaea"
+cursorlinenr_fg = "#af5f00"
+popupmenu_fg = "#444444"
+popupmenu_bg = "#d0d0d0"
+linenumber_fg = "#b2b2b2"
+vertsplit_fg = "#005f87"
+statusline_active_fg = "#e4e4e4"
+statusline_active_bg = "#005f87"
+statusline_inactive_fg = "#444444"
+statusline_inactive_bg = "#d0d0d0"
+todo_fg = "#00af5f"
+error_fg = "#af0000"
+error_bg = "#ffd7ff"
+matchparen_bg = "#c6c6c6"
+matchparen_fg = "#005f87"
+wildmenu_fg = "#444444"
+wildmenu_bg = "#ffff00"
+diffadd_fg = "#008700"
+diffadd_bg = "#afffaf"
+diffdelete_fg = "#af0000"
+diffdelete_bg = "#ffd7ff"
+diffchange_bg = "#ffd787"
 
-[palette]
-background="#eeeeee"
-foreground="#444444"
-regular0="#eeeeee"
-regular1="#af0000"
-regular2="#008700"
-regular3="#5f8700"
-regular4="#0087af"
-regular5="#878787"
-regular6="#005f87"
-regular7="#764e37"
-bright0="#bcbcbc"
-bright1="#d70000"
-bright2="#d70087"
-bright3="#8700af"
-bright4="#d75f00"
-bright5="#d75f00"
-bright6="#4c7a5d"
-bright7="#005faf"
-selection_foreground="#eeeeee"
-selection_background="#0087af"
-cursorline_background="#fdfdfd"
-paper_bar_bg="#005F87"
-black="#eeeeee"
-red="#d70000"
-green="#008700"
-yellow="#5f8700"
-blue="#0087af"
-magenta="#878787"
-cyan="#005f87"
-gray="#764e37"
-light-red="#d70000"
-light-green="#d70087"
-light-yellow="#8700af"
-light-blue="#d75f00"
-light-magenta="#d75f00"
-light-cyan="#4c7a4d"
-light-gray="#005faf"
-white="#444444"
-linenr_fg_selected="#AF634D"
+# 16 bit ANSI color names
+black = "#eeeeee"
+red = "#d70000"
+green = "#008700"
+yellow = "#5f8700"
+blue = "#0087af"
+magenta = "#878787"
+cyan = "#005f87"
+white = "#444444"
+light-black = "#bcbcbc"
+light-red = "#d70000"
+light-green = "#d70087"
+light-yellow = "#8700af"
+light-blue = "#d75f00"
+light-magenta = "#d75f00"
+light-cyan = "#4c7a4d"
+light-white = "#005faf"

From e41bee6ac63095a3cd74c3efba0a417d8834f0b8 Mon Sep 17 00:00:00 2001
From: Anton Romanov <theli.ua@gmail.com>
Date: Wed, 13 Sep 2023 15:38:14 -0700
Subject: [PATCH 343/967] [theme] Fix zenburn theme inlay hint color (#8278)

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

diff --git a/runtime/themes/zenburn.toml b/runtime/themes/zenburn.toml
index 8518e78f8..9a4a7abcc 100644
--- a/runtime/themes/zenburn.toml
+++ b/runtime/themes/zenburn.toml
@@ -9,7 +9,7 @@
 "ui.selection" = { bg = "#304a3d" }
 "ui.selection.primary" = { bg = "#2f2f2f" }
 "comment" = { fg = "comment" }
-"ui.virtual.inlay-hint" = { fg = "comment" }
+"ui.virtual.inlay-hint" = { fg = "#9f9f9f" }
 "comment.block.documentation" = { fg = "black", modifiers = ["bold"] }
 "ui.statusline" = { bg = "statusbg", fg = "#ccdc90" }
 "ui.statusline.inactive" = { fg = '#2e3330', bg = '#88b090' }

From e9d0bd7aefda6962b56245eb7d0f56b5d2fa4859 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 12 Sep 2023 21:11:07 +0200
Subject: [PATCH 344/967] fix crash in picker preview for invalid ranges

---
 helix-term/src/ui/picker.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 94a69b0d3..7e745f724 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -112,9 +112,9 @@ impl Preview<'_, '_> {
     /// Alternate text to show for the preview.
     fn placeholder(&self) -> &str {
         match *self {
-            Self::EditorDocument(_) => "<File preview>",
+            Self::EditorDocument(_) => "<Invalid file location>",
             Self::Cached(preview) => match preview {
-                CachedPreview::Document(_) => "<File preview>",
+                CachedPreview::Document(_) => "<Invalid file location>",
                 CachedPreview::Binary => "<Binary file>",
                 CachedPreview::LargeFile => "<File too large to preview>",
                 CachedPreview::NotFound => "<File not found>",
@@ -693,8 +693,14 @@ impl<T: Item + 'static> Picker<T> {
         if let Some((path, range)) = self.current_file(cx.editor) {
             let preview = self.get_preview(path, cx.editor);
             let doc = match preview.document() {
-                Some(doc) => doc,
-                None => {
+                Some(doc)
+                    if range.map_or(true, |(start, end)| {
+                        start <= end && end <= doc.text().len_lines()
+                    }) =>
+                {
+                    doc
+                }
+                _ => {
                     let alt_text = preview.placeholder();
                     let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2;
                     let y = inner.y + inner.height / 2;

From 13d4463e4146473391e37b7f75e99b731aa55878 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 12 Sep 2023 21:12:36 +0200
Subject: [PATCH 345/967] correctly center items in picker preview

---
 helix-term/src/ui/picker.rs | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 7e745f724..2c41fc12d 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -710,18 +710,30 @@ impl<T: Item + 'static> Picker<T> {
             };
 
             let mut offset = ViewPosition::default();
-            if let Some(range) = range {
-                let text_fmt = doc.text_format(inner.width, None);
-                let annotations = TextAnnotations::default();
-                (offset.anchor, offset.vertical_offset) = char_idx_at_visual_offset(
-                    doc.text().slice(..),
-                    doc.text().line_to_char(range.0),
-                    // align to middle
-                    -(inner.height as isize / 2),
-                    0,
-                    &text_fmt,
-                    &annotations,
-                );
+            if let Some((start_line, end_line)) = range {
+                let height = end_line - start_line;
+                let text = doc.text().slice(..);
+                let start = text.line_to_char(start_line);
+                let middle = text.line_to_char(start_line + height / 2);
+                if height < inner.height as usize {
+                    let text_fmt = doc.text_format(inner.width, None);
+                    let annotations = TextAnnotations::default();
+                    (offset.anchor, offset.vertical_offset) = char_idx_at_visual_offset(
+                        text,
+                        middle,
+                        // align to middle
+                        -(inner.height as isize / 2),
+                        0,
+                        &text_fmt,
+                        &annotations,
+                    );
+                    if start < offset.anchor {
+                        offset.anchor = start;
+                        offset.vertical_offset = 0;
+                    }
+                } else {
+                    offset.anchor = start;
+                }
             }
 
             let mut highlights = EditorView::doc_syntax_highlights(

From 19d44b6fde2a7689ff32410c573106b9c8359236 Mon Sep 17 00:00:00 2001
From: Abderrahmane TAHRI JOUTI <302837+atahrijouti@users.noreply.github.com>
Date: Sat, 16 Sep 2023 00:22:40 +0200
Subject: [PATCH 346/967] add cyan_light theme (#8293)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 runtime/themes/cyan_light.toml | 151 +++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 runtime/themes/cyan_light.toml

diff --git a/runtime/themes/cyan_light.toml b/runtime/themes/cyan_light.toml
new file mode 100644
index 000000000..2114054d0
--- /dev/null
+++ b/runtime/themes/cyan_light.toml
@@ -0,0 +1,151 @@
+# An approximation/port of the Cyan Light Theme from Jetbrains
+# 
+# Original Color Scheme here https://plugins.jetbrains.com/plugin/12102-cyan-light-theme
+
+"attribute" = "blue"
+"type" = "shade07"
+"type.enum.variant" = "purple"
+"constructor" = "shade07"
+
+"constant" = "darker_blue"
+"constant.builtin.boolean" = "blue"
+"constant.character" = "blue"
+"constant.character.escape" = "dark_red"
+"constant.numeric" = "blue"
+
+"string" = "green"
+"string.regexp" = "blue"
+"string.special" = { fg = "dark_red", modifiers = ["underlined"] }
+
+"comment" = "comment_gray"
+
+"variable" = "green_blue"
+"variable.builtin" = { fg = "darker_blue" }
+"variable.parameter" = "purple"
+"variable.other.member" = "purple"
+
+"label" = { fg = "darker_blue", modifiers = ["underlined"] }
+"punctuation" = "shade06"
+
+"keyword" = "darker_blue"
+"keyword.control.exception" = "darker_blue"
+
+"operator" = "shade06"
+
+"function" = "shade07"
+"function.macro" = "yellow"
+"function.builtin" = { fg = "shade07", modifiers = ["italic"] }
+"function.special" = "dark_red"
+"function.method" = "dark_yellow"
+
+"tag" = "darker_blue"
+"special" = "shade06"
+"namespace" = "darker_blue"
+
+"markup.bold" = { fg = "shade06", modifiers = ["bold"] }
+"markup.italic" = { fg = "shade06", modifiers = ["italic"] }
+"markup.strikethrough" = { fg = "shade06", modifiers = ["crossed_out"] }
+"markup.heading" = { fg = "purple" }
+"markup.list" = "darker_blue"
+"markup.list.numbered" = "darker_blue"
+"markup.list.unnumbered" = "darker_blue"
+"markup.link.url" = "shade06"
+"markup.link.text" = { fg = "dark_blue", modifiers = ['underlined'] }
+"markup.link.label" = "dark_blue"
+"markup.quote" = "green"
+"markup.raw" = "green"
+"markup.raw.inline" = "green"
+"markup.raw.block" = "green"
+
+"diff.plus" = "diff_green"
+"diff.minus" = "diff_red"
+"diff.delta" = "diff_blue"
+
+# ui specific
+"ui.background" = { bg = "shade00" }
+"ui.cursor" = { bg = "shade02" }
+"ui.cursor.primary" = { bg = "cursor_blue" }
+"ui.cursor.match" = { fg = "shade00", bg = "shade04" }
+"ui.cursor.primary.select" = { bg = "light_purple" }
+"ui.cursor.primary.insert" = { bg = "light_green" }
+
+"ui.selection" = { bg = "lighter_blue" }
+"ui.selection.primary" = { bg = "lighter_blue" }
+
+"ui.highlight" = { bg = "faint_blue" }
+"ui.cursorline.primary" = { bg = "faint_blue" }
+
+"ui.linenr" = { fg = "shade03" }
+"ui.linenr.selected" = { fg = "shade04", bg = "faint_blue", modifiers = [
+    "bold",
+] }
+
+"ui.statusline" = { fg = "shade06", bg = "shade02" }
+"ui.statusline.inactive" = { fg = "shade04", bg = "shade01" }
+"ui.statusline.normal" = { fg = "shade00", bg = "blue" }
+"ui.statusline.insert" = { fg = "shade00", bg = "green" }
+"ui.statusline.select" = { fg = "shade00", bg = "purple" }
+
+"ui.popup" = { bg = "shade01", fg = "shade04" }
+"ui.window" = { bg = "shade00", fg = "shade04" }
+"ui.help" = { fg = "shade06", bg = "shade01" }
+"ui.text" = "shade05"
+"ui.text.focus" = { fg = "shade07", bg = "light_blue" }
+"ui.virtual" = "shade03"
+"ui.virtual.ruler" = { bg = "shade04" }
+"ui.menu" = { fg = "shade05", bg = "shade01" }
+"ui.menu.selected" = { fg = "shade07", bg = "light_blue" }
+
+"hint" = "shade04"
+"info" = "light_blue"
+"warning" = "orange"
+"error" = "red"
+"diagnostic" = { modifiers = [] }
+"diagnostic.hint" = { underline = { color = "shade04", style = "line" } }
+"diagnostic.info" = { underline = { color = "light_blue", style = "line" } }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+
+[palette]
+shade00 = "#f2f3f7"
+shade01 = "#dadde8"
+shade02 = "#c1c6d9"
+shade03 = "#a9b0ca"
+shade04 = "#525c85"
+shade05 = "#434b6c"
+shade06 = "#343a54"
+shade07 = "#25293c"
+
+background = "#f2f3f7"
+foreground = "#25293c"
+
+comment_gray = "#808080"
+
+diff_blue = "#C3D6E8"
+faint_blue = "#E8Eef1"
+lighter_blue = "#d0eaff"
+light_blue = "#99ccff"
+cursor_blue = "#80bfff"
+blue = "#0073E6"
+dark_blue = "#185b93"
+darker_blue = "#000080"
+
+
+purple = "#660E7A"
+light_purple = "#ED9CFF"
+
+diff_green = "#C9DEC1"
+green = "#00733B"
+light_green = "#5DCE87"
+green_blue = "#458383"
+
+
+yellow = "#808000"
+dark_yellow = "#7A7A43"
+
+light_orange = "#f9c881"
+orange = "#F49810"
+
+diff_red = "#EBBCBC"
+red = "#d90016"
+dark_red = "#7F0000"

From 941dc6c614d684804c3580c4ae8b3c4368aab217 Mon Sep 17 00:00:00 2001
From: Cyrill Schenkel <cyrill.schenkel@gmail.com>
Date: Sat, 16 Sep 2023 02:04:44 +0200
Subject: [PATCH 347/967] add GNU assembler (gas) support #8291)

---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 15 ++++++++++++++-
 runtime/queries/gas/highlights.scm  | 21 +++++++++++++++++++++
 runtime/queries/gas/injections.scm  |  2 ++
 runtime/queries/gas/textobjects.scm |  2 ++
 5 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/gas/highlights.scm
 create mode 100644 runtime/queries/gas/injections.scm
 create mode 100644 runtime/queries/gas/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c1b0acfdb..9d036b73c 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -44,6 +44,7 @@
 | forth | ✓ |  |  | `forth-lsp` |
 | fortran | ✓ |  | ✓ | `fortls` |
 | fsharp | ✓ |  |  | `fsautocomplete` |
+| gas | ✓ | ✓ |  |  |
 | gdscript | ✓ | ✓ | ✓ |  |
 | gemini | ✓ |  |  |  |
 | git-attributes | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 37d2e94cf..a6ff9c676 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2495,7 +2495,7 @@ source = { git = "https://github.com/erasin/tree-sitter-po", rev = "417cee9abb20
 [[language]]
 name = "nasm"
 scope = "source.nasm"
-file-types = ["asm", "s", "S", "nasm"]
+file-types = ["asm", "S", "nasm"]
 injection-regex = "n?asm"
 roots = []
 comment-token = ";"
@@ -2505,6 +2505,19 @@ indent = { tab-width = 8, unit = "        " }
 name = "nasm"
 source = { git = "https://github.com/naclsn/tree-sitter-nasm", rev = "a0db15db6fcfb1bf2cc8702500e55e558825c48b" }
 
+[[language]]
+name = "gas"
+scope = "source.gas"
+file-types = ["s"]
+injection-regex = "gas"
+roots = []
+comment-token = "#"
+indent = { tab-width = 8, unit = "        " }
+
+[[grammar]]
+name = "gas"
+source = { git = "https://github.com/sirius94/tree-sitter-gas", rev = "60f443646b20edee3b7bf18f3a4fb91dc214259a" }
+
 [[language]]
 name = "rst"
 scope = "source.rst"
diff --git a/runtime/queries/gas/highlights.scm b/runtime/queries/gas/highlights.scm
new file mode 100644
index 000000000..46cefcbab
--- /dev/null
+++ b/runtime/queries/gas/highlights.scm
@@ -0,0 +1,21 @@
+(comment) @comment
+(number) @constant.numeric
+(directive_name) @keyword.directive
+(symbol) @variable
+(label) @function
+(label)
+(instruction_prefix) @keyword
+(instruction_name) @function.special
+(register) @constant.builtin
+(string) @string
+(char) @constant.character
+(type) @type
+(constant "$" @constant)
+(operand_modifier) @attribute
+
+(expression
+  ["-" "+" "*" "/" "="] @operator)
+
+["(" ")"] @punctuation.bracket
+
+["," ":"] @punctuation.delimiter
diff --git a/runtime/queries/gas/injections.scm b/runtime/queries/gas/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/runtime/queries/gas/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/runtime/queries/gas/textobjects.scm b/runtime/queries/gas/textobjects.scm
new file mode 100644
index 000000000..4465c8768
--- /dev/null
+++ b/runtime/queries/gas/textobjects.scm
@@ -0,0 +1,2 @@
+(comment) @comment.inside
+(comment)+ @comment.around

From 0e556484b7dbb4078a416ef0b3d923a206e6670e Mon Sep 17 00:00:00 2001
From: Yoav Lavi <yoav@yoavlavi.com>
Date: Sat, 16 Sep 2023 22:27:50 +0300
Subject: [PATCH 348/967] Add JSON highlighting for `flake.lock` files (#8304)

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

diff --git a/languages.toml b/languages.toml
index a6ff9c676..543c3dcc5 100644
--- a/languages.toml
+++ b/languages.toml
@@ -317,7 +317,7 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 scope = "source.json"
 injection-regex = "json"
-file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf"]
+file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf", "flake.lock"]
 roots = []
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true

From b4494e1dc54f342d8c765b793bf934ae730b5253 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Fri, 3 Feb 2023 23:09:55 +0100
Subject: [PATCH 349/967] queries/nix: add injection rule for python test
 scripts

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

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
index 1da63ce08..03a6dc368 100644
--- a/runtime/queries/nix/injections.scm
+++ b/runtime/queries/nix/injections.scm
@@ -6,6 +6,16 @@
   (indented_string_expression (string_fragment) @injection.content))
   (#set! injection.combined))
 
+; Common attribute keys corresponding to Python scripts,
+; such as those for NixOS VM tests in nixpkgs/nixos/tests.
+((binding
+   attrpath: (attrpath (identifier) @_path)
+   expression: (indented_string_expression
+     (string_fragment) @injection.content))
+ (#match? @_path "(^|\\.)testScript$")
+ (#set! injection.language "python")
+ (#set! injection.combined))
+
 ; Common attribute keys corresponding to scripts,
 ; such as those of stdenv.mkDerivation.
 ((binding

From 37e48f4307a79cbc4e54e045584ec816bcc245a5 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Fri, 15 Sep 2023 17:12:47 +0200
Subject: [PATCH 350/967] queries/nix: align match start for language comments

This rule failed to override other ones because it started its
matching later.
---
 runtime/queries/nix/injections.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
index 03a6dc368..9804b75be 100644
--- a/runtime/queries/nix/injections.scm
+++ b/runtime/queries/nix/injections.scm
@@ -5,6 +5,10 @@
 ((((comment) @injection.language) .
   (indented_string_expression (string_fragment) @injection.content))
   (#set! injection.combined))
+((binding
+    (comment) @injection.language
+    expression: (indented_string_expression (string_fragment) @injection.content))
+  (#set! injection.combined))
 
 ; Common attribute keys corresponding to Python scripts,
 ; such as those for NixOS VM tests in nixpkgs/nixos/tests.

From 8b076e3851c868307223b6152de9a8de52fcb88f Mon Sep 17 00:00:00 2001
From: Yoav Lavi <yoav@yoavlavi.com>
Date: Sat, 16 Sep 2023 23:31:19 +0300
Subject: [PATCH 351/967] Add `.editorconfig` highlighting as INI (#8308)

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

diff --git a/languages.toml b/languages.toml
index 543c3dcc5..78d7f6e9d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2290,7 +2290,8 @@ file-types = [
   "container",
   "volume",
   "kube",
-  "network"
+  "network",
+  ".editorconfig"
 ]
 injection-regex = "ini"
 comment-token = "#"

From ca9a7d506e735abec8903c5d8e721e765f76a6f9 Mon Sep 17 00:00:00 2001
From: Yoav Lavi <yoav@yoavlavi.com>
Date: Sun, 17 Sep 2023 18:29:14 +0300
Subject: [PATCH 352/967] add .babelrc highlighting (#8309)

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

diff --git a/languages.toml b/languages.toml
index 78d7f6e9d..387aee6af 100644
--- a/languages.toml
+++ b/languages.toml
@@ -317,7 +317,7 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 scope = "source.json"
 injection-regex = "json"
-file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf", "flake.lock"]
+file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf", "flake.lock", ".babelrc"]
 roots = []
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true

From cb3924278372f8e065487b0785489ee6ad3cf660 Mon Sep 17 00:00:00 2001
From: NomisIV <47303199+NomisIV@users.noreply.github.com>
Date: Sun, 17 Sep 2023 18:50:58 +0200
Subject: [PATCH 353/967] Use Maskhjarnas tree-sitter-purescript (#8306)

---
 book/src/generated/lang-support.md         |   2 +-
 languages.toml                             |   5 +-
 runtime/queries/purescript/highlights.scm  | 119 ++++++++++++++++++++-
 runtime/queries/purescript/injections.scm  |   3 +-
 runtime/queries/purescript/locals.scm      |   5 +-
 runtime/queries/purescript/textobjects.scm |  13 +++
 6 files changed, 142 insertions(+), 5 deletions(-)
 create mode 100644 runtime/queries/purescript/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 9d036b73c..f65f268d0 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -122,7 +122,7 @@
 | prolog |  |  |  | `swipl` |
 | protobuf | ✓ |  | ✓ | `bufls`, `pb` |
 | prql | ✓ |  |  |  |
-| purescript | ✓ |  |  | `purescript-language-server` |
+| purescript | ✓ | ✓ |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `pylsp` |
 | qml | ✓ |  | ✓ | `qmlls` |
 | r | ✓ |  |  | `R` |
diff --git a/languages.toml b/languages.toml
index 387aee6af..b0fc6344d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1003,7 +1003,10 @@ language-servers = [ "purescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 auto-format = true
 formatter = { command = "purs-tidy", args = ["format"] }
-grammar = "haskell"
+
+[[grammar]]
+name = "purescript"
+source = { git = "https://github.com/maskhjarna/tree-sitter-purescript", rev = "5f5a030826849b7be17596d372967f60051b42bd" }
 
 [[language]]
 name = "zig"
diff --git a/runtime/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
index ef073eb25..bbfdf16e7 100644
--- a/runtime/queries/purescript/highlights.scm
+++ b/runtime/queries/purescript/highlights.scm
@@ -1 +1,118 @@
-; inherits: haskell
+; ----------------------------------------------------------------------------
+; Literals and comments
+
+ (integer) @constant.numeric.integer
+ (exp_negation) @constant.numeric.integer
+ (exp_literal (float)) @constant.numeric.float
+ (char) @constant.character
+ (string) @string
+
+ (con_unit) @constant.builtin ; unit, as in ()
+
+ (comment) @comment
+
+
+; ----------------------------------------------------------------------------
+; Punctuation
+
+ [
+   "("
+   ")"
+   "{"
+   "}"
+   "["
+   "]"
+ ] @punctuation.bracket
+
+ [
+ (comma)
+ ";"
+ ] @punctuation.delimiter
+
+
+; ----------------------------------------------------------------------------
+; Keywords, operators, includes
+
+ [
+   "if"
+   "then"
+   "else"
+   "case"
+   "of"
+ ] @keyword.control.conditional
+
+ [
+   "import"
+   "module"
+ ] @keyword.control.import
+
+ [
+   (operator)
+   (constructor_operator)
+   (type_operator)
+   (tycon_arrow)
+   (qualified_module)  ; grabs the `.` (dot), ex: import System.IO
+   (all_names)
+   "="
+   "|"
+   "::"
+   "=>"
+   "->"
+   "<-"
+   "\\"
+   "`"
+   "@"
+ ] @operator
+
+ (qualified_module (module) @constructor)
+ (module) @namespace
+ (qualified_type (module) @namespace)
+ (qualified_variable (module) @namespace)
+ (import (module) @namespace)
+
+ [
+   (where)
+   "let"
+   "in"
+   "class"
+   "instance"
+   "derive"
+   "foreign"
+   "data"
+   "newtype"
+   "type"
+   "as"
+   "do"
+   "ado"
+   "forall"
+   "∀"
+   "infix"
+   "infixl"
+   "infixr"
+ ] @keyword
+
+
+; ----------------------------------------------------------------------------
+; Functions and variables
+
+ (signature name: (variable) @type)
+ (function name: (variable) @function)
+
+ ; true or false
+((variable) @constant.builtin.boolean
+ (#match? @constant.builtin.boolean "^(true|false)$"))
+
+ (variable) @variable
+
+ (exp_infix (variable) @operator)  ; consider infix functions as operators
+
+ ("@" @namespace)  ; "as" pattern operator, e.g. x@Constructor
+
+
+; ----------------------------------------------------------------------------
+; Types
+
+ (type) @type
+
+ (constructor) @constructor
+
diff --git a/runtime/queries/purescript/injections.scm b/runtime/queries/purescript/injections.scm
index ef073eb25..321c90add 100644
--- a/runtime/queries/purescript/injections.scm
+++ b/runtime/queries/purescript/injections.scm
@@ -1 +1,2 @@
-; inherits: haskell
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/purescript/locals.scm b/runtime/queries/purescript/locals.scm
index ef073eb25..ad67fe43f 100644
--- a/runtime/queries/purescript/locals.scm
+++ b/runtime/queries/purescript/locals.scm
@@ -1 +1,4 @@
-; inherits: haskell
+(signature name: (variable)) @local.definition
+(function name: (variable)) @local.definition
+(pat_name (variable)) @local.definition
+(exp_name (variable)) @local.reference
diff --git a/runtime/queries/purescript/textobjects.scm b/runtime/queries/purescript/textobjects.scm
new file mode 100644
index 000000000..5f8eaff73
--- /dev/null
+++ b/runtime/queries/purescript/textobjects.scm
@@ -0,0 +1,13 @@
+(comment) @comment.inside
+
+[
+  (data)
+  (type)
+  (newtype)
+] @class.around
+
+((signature)? (function rhs:(_) @function.inside)) @function.around 
+(exp_lambda) @function.around
+
+(data (type_variable) @parameter.inside)
+(patterns (_) @parameter.inside)

From 7fa5f341e931f9bdb4058e51ebf77276e9b82242 Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Sun, 17 Sep 2023 20:23:19 +0200
Subject: [PATCH 354/967] Update Unison highlights (#8315)

---
 runtime/queries/unison/highlights.scm | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/runtime/queries/unison/highlights.scm b/runtime/queries/unison/highlights.scm
index 8ec2b6ff2..956dc5824 100644
--- a/runtime/queries/unison/highlights.scm
+++ b/runtime/queries/unison/highlights.scm
@@ -10,14 +10,18 @@
 [
   (kw_forall)
   (unique_kw)
+  (structural_kw)
   (type_kw)
   (kw_equals)
   (do)
+  (ability)
+  (where)
 ] @keyword
 
 (kw_let) @keyword.function
 (type_kw) @keyword.storage.type
 (unique) @keyword.storage.modifier
+(structural) @keyword.storage.modifier
 ("use") @keyword.control.import
 
 
@@ -31,6 +35,7 @@
   (arrow_symbol)
   (">")
   (or)
+  (and)
   (bang)
 ] @operator
 
@@ -47,13 +52,22 @@
 
 ;; Types
 (record_field name: (wordy_id) @variable.other.member type: (wordy_id) @type)
-[
-  (type_name)
-  (type_signature)
-  (effect)
-] @type
+(type_constructor (type_name (wordy_id) @constructor))
+(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @variable.parameter)
+(effect (wordy_id) @special) ;; NOTE: an effect is just like a type, but in signature we special case it
+
+;; Namespaces
+(path) @namespace
+(namespace) @namespace
+
+;; Terms
+(type_signature term_name: (path)? @variable term_name: (wordy_id) @variable)
+(type_signature (wordy_id) @type)
+(type_signature (delayed (wordy_id)) @type)
+
+(term_definition param: (wordy_id) @variable.parameter)
 
-(term_definition) @variable
+(function_application function_name: (path)? function_name: (wordy_id) @function)
 
 ;; Punctuation
 [
@@ -70,3 +84,4 @@
   "]"
 ] @punctuation.bracket
 
+(test_watch_expression (wordy_id) @keyword.directive)

From 53500f6ebd9538876b033e8658d809884917c4e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 11:29:30 +0900
Subject: [PATCH 355/967] build(deps): bump libc from 0.2.147 to 0.2.148
 (#8327)

Bumps [libc](https://github.com/rust-lang/libc) from 0.2.147 to 0.2.148.
- [Release notes](https://github.com/rust-lang/libc/releases)
- [Commits](https://github.com/rust-lang/libc/compare/0.2.147...0.2.148)

---
updated-dependencies:
- dependency-name: libc
  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-term/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d2a700a85..867083dc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1626,9 +1626,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 5c7fd0dea..65e9743ea 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -69,7 +69,7 @@ grep-searcher = "0.1.11"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.147"
+libc = "0.2.148"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }

From 312c175aecf6238a58ed7c67e4b11e5c2599ef66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 11:29:46 +0900
Subject: [PATCH 356/967] build(deps): bump indoc from 2.0.3 to 2.0.4 (#8329)

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

---
updated-dependencies:
- dependency-name: indoc
  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-core/Cargo.toml | 2 +-
 helix-term/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 867083dc4..bccc33e07 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1569,9 +1569,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
+checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
 
 [[package]]
 name = "io-close"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 515443e03..912342438 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -53,4 +53,4 @@ parking_lot = "0.12"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
-indoc = "2.0.3"
+indoc = "2.0.4"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 65e9743ea..878dcd1f9 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -79,5 +79,5 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.11"
-indoc = "2.0.3"
+indoc = "2.0.4"
 tempfile = "3.8.0"

From 3640623b453fa827ce620f4e4654273a1208a2b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 11:30:13 +0900
Subject: [PATCH 357/967] build(deps): bump chrono from 0.4.30 to 0.4.31
 (#8328)

Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.30 to 0.4.31.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.30...v0.4.31)

---
updated-dependencies:
- dependency-name: chrono
  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 bccc33e07..0546a7bf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -185,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.30"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",

From 1c88432efc3724f60b27d580b8b490040a3048f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 11:30:34 +0900
Subject: [PATCH 358/967] build(deps): bump serde_json from 1.0.105 to 1.0.107
 (#8330)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.105 to 1.0.107.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.105...v1.0.107)

---
updated-dependencies:
- dependency-name: serde_json
  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 0546a7bf0..eba11ac95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2112,9 +2112,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",

From 651fd1ca7296bce719049e15cc1337fd72d1c918 Mon Sep 17 00:00:00 2001
From: postsolar <120750161+postsolar@users.noreply.github.com>
Date: Thu, 21 Sep 2023 01:26:40 +0300
Subject: [PATCH 359/967] Add Unicode support to PureScript's highlight queries
 (#8338)

---
 runtime/queries/purescript/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
index bbfdf16e7..86deb48f6 100644
--- a/runtime/queries/purescript/highlights.scm
+++ b/runtime/queries/purescript/highlights.scm
@@ -56,9 +56,13 @@
    "="
    "|"
    "::"
+   "∷"
    "=>"
+   "⇒"
    "->"
+   "→"
    "<-"
+   "←"
    "\\"
    "`"
    "@"

From 2284bce970e9175fd81851e1616218a6119354fc Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@rudder.io>
Date: Thu, 21 Sep 2023 00:28:36 +0200
Subject: [PATCH 360/967] Allow specifying a different style for diff indicator
 in vcs gutter. (#8343)

This allows using a background in diff style
(for nice patch file coloring) while keeping the
gutter indicator nice (and using appropriate colors).
---
 book/src/themes.md       | 3 +++
 helix-view/src/gutter.rs | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 96d7c0eca..661210765 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -245,9 +245,12 @@ We use a similar set of scopes as
 
 - `diff` - version control changes
   - `plus` - additions
+    - `gutter` - gutter indicator
   - `minus` - deletions
+    - `gutter` - gutter indicator
   - `delta` - modifications
     - `moved` - renamed or moved files/changes
+    - `gutter` - gutter indicator
 
 #### Interface
 
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index a332a8a32..397dff4f4 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -94,9 +94,9 @@ pub fn diff<'doc>(
     theme: &Theme,
     _is_focused: bool,
 ) -> GutterFn<'doc> {
-    let added = theme.get("diff.plus");
-    let deleted = theme.get("diff.minus");
-    let modified = theme.get("diff.delta");
+    let added = theme.get("diff.plus.gutter");
+    let deleted = theme.get("diff.minus.gutter");
+    let modified = theme.get("diff.delta.gutter");
     if let Some(diff_handle) = doc.diff_handle() {
         let hunks = diff_handle.load();
         let mut hunk_i = 0;

From 842687e8452322f860e22d135d5e8240ad29879c Mon Sep 17 00:00:00 2001
From: zefr0x <65136727+zefr0x@users.noreply.github.com>
Date: Sat, 23 Sep 2023 04:50:44 +0300
Subject: [PATCH 361/967] Add `.webmanifest` as supported JSON files (#8342)

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

diff --git a/languages.toml b/languages.toml
index b0fc6344d..965da6dde 100644
--- a/languages.toml
+++ b/languages.toml
@@ -317,7 +317,7 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 scope = "source.json"
 injection-regex = "json"
-file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf", "flake.lock", ".babelrc"]
+file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf", "webmanifest", "flake.lock", ".babelrc"]
 roots = []
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true

From 7702e130ba93f885ac56be5818b93c544a00538f Mon Sep 17 00:00:00 2001
From: nerohd <145902536+nerohd@users.noreply.github.com>
Date: Sun, 24 Sep 2023 12:33:43 +0100
Subject: [PATCH 362/967] add polkit policy files to xml detection (#8369)

polkit policy files are just xml files, https://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html for more info
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 965da6dde..081b36e20 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2205,7 +2205,7 @@ source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d1
 name = "xml"
 scope = "source.xml"
 injection-regex = "xml"
-file-types = ["xml", "mobileconfig", "plist", "xib", "storyboard", "svg", "xsd", "gml", "xaml", "gir", "rss", "atom", "opml"]
+file-types = ["xml", "mobileconfig", "plist", "xib", "storyboard", "svg", "xsd", "gml", "xaml", "gir", "rss", "atom", "opml", "policy"]
 indent = { tab-width = 2, unit = "  " }
 roots = []
 

From 17edbacfbd6209119039fdaa593da76474e78ea9 Mon Sep 17 00:00:00 2001
From: zefr0x <65136727+zefr0x@users.noreply.github.com>
Date: Mon, 25 Sep 2023 04:18:26 +0300
Subject: [PATCH 363/967] Improve and complete Arabic translation for meta
 information (#8380)

---
 contrib/Helix.appdata.xml | 12 ++++++++++++
 contrib/Helix.desktop     |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/contrib/Helix.appdata.xml b/contrib/Helix.appdata.xml
index f1b310db4..08f23b3e1 100644
--- a/contrib/Helix.appdata.xml
+++ b/contrib/Helix.appdata.xml
@@ -5,6 +5,7 @@
   <project_license>MPL-2.0</project_license>
   <name>Helix</name>
   <summary>A post-modern text editor</summary>
+  <summary xml:lang="ar">مُحَرِّرُ نُصُوصٍ سَابِقٌ لِعَهدِه</summary>
 
   <description>
     <p>
@@ -17,6 +18,17 @@
       <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>
+    </ul>
+  </description>
 
   <launchable type="desktop-id">Helix.desktop</launchable>
 
diff --git a/contrib/Helix.desktop b/contrib/Helix.desktop
index 844286f84..25d5c3b1a 100644
--- a/contrib/Helix.desktop
+++ b/contrib/Helix.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Helix
 GenericName=Text Editor
+GenericName[ar]=مُحَرِّرُ نُصُوص
 GenericName[de]=Texteditor
 GenericName[fr]=Éditeur de texte
 GenericName[ru]=Текстовый редактор
@@ -9,7 +10,7 @@ GenericName[tr]=Metin Düzenleyici
 Comment=Edit text files
 Comment[af]=Redigeer tekslêers
 Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
-Comment[ar]=حرّر ملفات نصية
+Comment[ar]=مُحَرِّرُ مِلَفَّاتٍ نَصِّيَّة
 Comment[az]=Mətn fayllarını redaktə edin
 Comment[be]=Рэдагаваньне тэкставых файлаў
 Comment[bg]=Редактиране на текстови файлове
@@ -79,6 +80,7 @@ Exec=hx %F
 Terminal=true
 Type=Application
 Keywords=Text;editor;
+Keywords[ar]=نص;نصوص;محرر;
 Keywords[fr]=Texte;éditeur;
 Keywords[ru]=текст;текстовый редактор;
 Keywords[sr]=Текст;едитор;

From 0252c7b162ae5f3ff18b03ed9fe947d61a301926 Mon Sep 17 00:00:00 2001
From: nerohd <145902536+nerohd@users.noreply.github.com>
Date: Mon, 25 Sep 2023 02:44:35 +0100
Subject: [PATCH 364/967] add polkit rules files to javascript detection
 (#8370)

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

diff --git a/languages.toml b/languages.toml
index 081b36e20..7b249fc6e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -546,7 +546,7 @@ name = "javascript"
 scope = "source.js"
 injection-regex = "(js|javascript)"
 language-id = "javascript"
-file-types = ["js", "mjs", "cjs"]
+file-types = ["js", "mjs", "cjs", "rules"]
 shebangs = ["node"]
 roots = []
 comment-token = "//"

From f520b16fcaa2bc13d8d72c09694d88717055d0fd Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Mon, 25 Sep 2023 18:42:42 +0300
Subject: [PATCH 365/967] Style Bold/Italic/Strikethrough markdown in docs
 (#8385)

* Style Bold/Italic/Strikthrough markdown in docs

* Flatten to single match
---
 helix-term/src/ui/markdown.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 1433381d5..3c8a98685 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -14,6 +14,7 @@ use helix_core::{
 };
 use helix_view::{
     graphics::{Margin, Rect, Style},
+    theme::Modifier,
     Theme,
 };
 
@@ -275,17 +276,21 @@ impl Markdown {
                         );
                         lines.extend(tui_text.lines.into_iter());
                     } else {
-                        let style = if let Some(Tag::Heading(level, ..)) = tags.last() {
-                            match level {
+                        let style = match tags.last() {
+                            Some(Tag::Heading(level, ..)) => match level {
                                 HeadingLevel::H1 => heading_styles[0],
                                 HeadingLevel::H2 => heading_styles[1],
                                 HeadingLevel::H3 => heading_styles[2],
                                 HeadingLevel::H4 => heading_styles[3],
                                 HeadingLevel::H5 => heading_styles[4],
                                 HeadingLevel::H6 => heading_styles[5],
+                            },
+                            Some(Tag::Emphasis) => text_style.add_modifier(Modifier::ITALIC),
+                            Some(Tag::Strong) => text_style.add_modifier(Modifier::BOLD),
+                            Some(Tag::Strikethrough) => {
+                                text_style.add_modifier(Modifier::CROSSED_OUT)
                             }
-                        } else {
-                            text_style
+                            _ => text_style,
                         };
                         spans.push(Span::styled(text, style));
                     }

From 35cbe26f21b1446914075535985f459e8edd72d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:03:59 +0900
Subject: [PATCH 366/967] build(deps): bump unicode-width from 0.1.10 to 0.1.11
 (#8393)

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 eba11ac95..f2e65f806 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2545,9 +2545,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "url"

From d7b38e3e4a2cd77f33d26c8b5f1795e9b392c9d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:04:16 +0900
Subject: [PATCH 367/967] build(deps): bump smallvec from 1.11.0 to 1.11.1
 (#8394)

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 f2e65f806..c244b1d0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2209,9 +2209,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "smartstring"

From b495ca429ad484e3c387d871a04a664252ebcd71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Sep 2023 11:04:48 +0900
Subject: [PATCH 368/967] build(deps): bump rustix from 0.38.13 to 0.38.14
 (#8395)

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

diff --git a/Cargo.lock b/Cargo.lock
index c244b1d0b..02bdd57b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1455,7 +1455,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.13",
+ "rustix 0.38.14",
  "serde",
  "serde_json",
  "slotmap",
@@ -2052,9 +2052,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.13"
+version = "0.38.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
+checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2289,7 +2289,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.38.13",
+ "rustix 0.38.14",
  "windows-sys 0.48.0",
 ]
 
@@ -2646,7 +2646,7 @@ dependencies = [
  "dirs",
  "either",
  "once_cell",
- "rustix 0.38.13",
+ "rustix 0.38.14",
 ]
 
 [[package]]

From 01e281ce107e57cc1865a0e09e89a8e8c79f2a4e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 25 Sep 2023 21:05:19 -0500
Subject: [PATCH 369/967] markdown: Recognize `<code>` tags with attributes as
 code (#8397)

---
 helix-term/src/ui/markdown.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 3c8a98685..4d0c0d4a5 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -184,7 +184,9 @@ impl Markdown {
         // Transform text in `<code>` blocks into `Event::Code`
         let mut in_code = false;
         let parser = parser.filter_map(|event| match event {
-            Event::Html(tag) if *tag == *"<code>" => {
+            Event::Html(tag)
+                if tag.starts_with("<code") && matches!(tag.chars().nth(5), Some(' ' | '>')) =>
+            {
                 in_code = true;
                 None
             }

From 2776233a6f732edb69e2adf853ad0cb8c12afc59 Mon Sep 17 00:00:00 2001
From: Ben Haines <bhainesva@users.noreply.github.com>
Date: Tue, 26 Sep 2023 12:05:42 -0400
Subject: [PATCH 370/967] update go highlight queries (#8399)

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

diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index b2d81e45d..b45a11bee 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -24,7 +24,6 @@
 
 ; Identifiers
 
-((identifier) @constant (match? @constant "^[A-Z][A-Z\\d_]+$"))
 (const_spec
   name: (identifier) @constant)
 
@@ -38,6 +37,7 @@
 (type_spec 
   name: (type_identifier) @constructor)
 (field_identifier) @variable.other.member
+(keyed_element (literal_element (identifier) @variable.other.member))
 (identifier) @variable
 (package_identifier) @namespace
 

From 080a085fa796fe2b71b5932b704d465695fba824 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Tue, 26 Sep 2023 23:12:19 +0300
Subject: [PATCH 371/967] Filter out language servers which fail to spawn
 (#8374)

---
 helix-lsp/src/lib.rs     | 40 +++++++++--------
 helix-view/src/editor.rs | 95 ++++++++++++++++++++++------------------
 2 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index d29a21440..a4be923b2 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -749,36 +749,40 @@ impl Registry {
         }
     }
 
-    pub fn get(
-        &mut self,
-        language_config: &LanguageConfiguration,
-        doc_path: Option<&std::path::PathBuf>,
-        root_dirs: &[PathBuf],
+    pub fn get<'a>(
+        &'a mut self,
+        language_config: &'a LanguageConfiguration,
+        doc_path: Option<&'a std::path::PathBuf>,
+        root_dirs: &'a [PathBuf],
         enable_snippets: bool,
-    ) -> Result<HashMap<LanguageServerName, Arc<Client>>> {
-        language_config
-            .language_servers
-            .iter()
-            .map(|LanguageServerFeatures { name, .. }| {
+    ) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {
+        language_config.language_servers.iter().map(
+            move |LanguageServerFeatures { name, .. }| {
                 if let Some(clients) = self.inner.get(name) {
                     if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
                         client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
                     }) {
-                        return Ok((name.to_owned(), client.clone()));
+                        return (name.to_owned(), Ok(client.clone()));
                     }
                 }
-                let client = self.start_client(
+                match self.start_client(
                     name.clone(),
                     language_config,
                     doc_path,
                     root_dirs,
                     enable_snippets,
-                )?;
-                let clients = self.inner.entry(name.clone()).or_default();
-                clients.push(client.clone());
-                Ok((name.clone(), client))
-            })
-            .collect()
+                ) {
+                    Ok(client) => {
+                        self.inner
+                            .entry(name.to_owned())
+                            .or_default()
+                            .push(client.clone());
+                        (name.clone(), Ok(client))
+                    }
+                    Err(err) => (name.to_owned(), Err(err)),
+                }
+            },
+        )
     }
 
     pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 2265633df..7af28ccc6 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1188,71 +1188,80 @@ impl Editor {
     }
 
     /// Refreshes the language server for a given document
-    pub fn refresh_language_servers(&mut self, doc_id: DocumentId) -> Option<()> {
+    pub fn refresh_language_servers(&mut self, doc_id: DocumentId) {
         self.launch_language_servers(doc_id)
     }
 
     /// Launch a language server for a given document
-    fn launch_language_servers(&mut self, doc_id: DocumentId) -> Option<()> {
+    fn launch_language_servers(&mut self, doc_id: DocumentId) {
         if !self.config().lsp.enable {
-            return None;
+            return;
         }
         // if doc doesn't have a URL it's a scratch buffer, ignore it
-        let doc = self.documents.get_mut(&doc_id)?;
-        let doc_url = doc.url()?;
+        let Some(doc) = self.documents.get_mut(&doc_id) else {
+            return;
+        };
+        let Some(doc_url) = doc.url() else {
+            return;
+        };
         let (lang, path) = (doc.language.clone(), doc.path().cloned());
         let config = doc.config.load();
         let root_dirs = &config.workspace_lsp_roots;
 
-        // try to find language servers based on the language name
-        let language_servers = lang.as_ref().and_then(|language| {
+        // store only successfully started language servers
+        let language_servers = lang.as_ref().map_or_else(HashMap::default, |language| {
             self.language_servers
                 .get(language, path.as_ref(), root_dirs, config.lsp.snippets)
-                .map_err(|e| {
-                    log::error!(
-                        "Failed to initialize the language servers for `{}` {{ {} }}",
-                        language.scope(),
-                        e
-                    )
+                .filter_map(|(lang, client)| match client {
+                    Ok(client) => Some((lang, client)),
+                    Err(err) => {
+                        log::error!(
+                            "Failed to initialize the language servers for `{}` - `{}` {{ {} }}",
+                            language.scope(),
+                            lang,
+                            err
+                        );
+                        None
+                    }
                 })
-                .ok()
+                .collect::<HashMap<_, _>>()
         });
 
-        if let Some(language_servers) = language_servers {
-            let language_id = doc.language_id().map(ToOwned::to_owned).unwrap_or_default();
-
-            // only spawn new language servers if the servers aren't the same
-
-            let doc_language_servers_not_in_registry =
-                doc.language_servers.iter().filter(|(name, doc_ls)| {
-                    language_servers
-                        .get(*name)
-                        .map_or(true, |ls| ls.id() != doc_ls.id())
-                });
+        if language_servers.is_empty() {
+            return;
+        }
 
-            for (_, language_server) in doc_language_servers_not_in_registry {
-                tokio::spawn(language_server.text_document_did_close(doc.identifier()));
-            }
+        let language_id = doc.language_id().map(ToOwned::to_owned).unwrap_or_default();
 
-            let language_servers_not_in_doc = language_servers.iter().filter(|(name, ls)| {
-                doc.language_servers
+        // only spawn new language servers if the servers aren't the same
+        let doc_language_servers_not_in_registry =
+            doc.language_servers.iter().filter(|(name, doc_ls)| {
+                language_servers
                     .get(*name)
-                    .map_or(true, |doc_ls| ls.id() != doc_ls.id())
+                    .map_or(true, |ls| ls.id() != doc_ls.id())
             });
 
-            for (_, language_server) in language_servers_not_in_doc {
-                // TODO: this now races with on_init code if the init happens too quickly
-                tokio::spawn(language_server.text_document_did_open(
-                    doc_url.clone(),
-                    doc.version(),
-                    doc.text(),
-                    language_id.clone(),
-                ));
-            }
+        for (_, language_server) in doc_language_servers_not_in_registry {
+            tokio::spawn(language_server.text_document_did_close(doc.identifier()));
+        }
+
+        let language_servers_not_in_doc = language_servers.iter().filter(|(name, ls)| {
+            doc.language_servers
+                .get(*name)
+                .map_or(true, |doc_ls| ls.id() != doc_ls.id())
+        });
 
-            doc.language_servers = language_servers;
+        for (_, language_server) in language_servers_not_in_doc {
+            // TODO: this now races with on_init code if the init happens too quickly
+            tokio::spawn(language_server.text_document_did_open(
+                doc_url.clone(),
+                doc.version(),
+                doc.text(),
+                language_id.clone(),
+            ));
         }
-        Some(())
+
+        doc.language_servers = language_servers;
     }
 
     fn _refresh(&mut self) {
@@ -1454,7 +1463,7 @@ impl Editor {
             doc.set_version_control_head(self.diff_providers.get_current_head_name(&path));
 
             let id = self.new_document(doc);
-            let _ = self.launch_language_servers(id);
+            self.launch_language_servers(id);
 
             id
         };

From 0c879d4edcd8644475f4fa809af2d9aaf6959eb0 Mon Sep 17 00:00:00 2001
From: Ken Micklas <git@kmicklas.com>
Date: Tue, 26 Sep 2023 16:19:24 -0400
Subject: [PATCH 372/967] Add shebangs for Makefiles (#8410)

For example, this is standard for Debian rules files: https://www.debian.org/doc/manuals/maint-guide/dreq.en.html#defaultrules
---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index 7b249fc6e..c12c4e82d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1087,6 +1087,7 @@ source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef30
 name = "make"
 scope = "source.make"
 file-types = ["Makefile", "makefile", "make", "mk"]
+shebangs = ["make", "gmake"]
 injection-regex = "(make|makefile|Makefile|mk)"
 roots = []
 comment-token = "#"

From ba06371499a8682effbd733f2692ae140b63284e Mon Sep 17 00:00:00 2001
From: Lucas Zebrowsky <78442275+Lu-Die-Milchkuh@users.noreply.github.com>
Date: Tue, 26 Sep 2023 22:19:52 +0200
Subject: [PATCH 373/967] Fix missing HTML tag colorization in onedark theme
 (#8409)

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

diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 21101ea75..1db2aff86 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -1,5 +1,6 @@
 # Author : Gokul Soumya <gokulps15@gmail.com>
 
+"tag" = { fg = "red" }
 "attribute" = { fg = "yellow" }
 "comment" = { fg = "light-gray", modifiers = ["italic"] }
 "constant" = { fg = "cyan" }

From 77fe8f214b15b8297a9f2f8ed929994559604d6c Mon Sep 17 00:00:00 2001
From: boofexxx <86674880+boofexxx@users.noreply.github.com>
Date: Thu, 28 Sep 2023 12:29:02 +0500
Subject: [PATCH 374/967] refine darcula and darcula-solid themes (#8412)

---
 runtime/themes/darcula-solid.toml | 5 +----
 runtime/themes/darcula.toml       | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/runtime/themes/darcula-solid.toml b/runtime/themes/darcula-solid.toml
index 5feac234e..c867583d9 100644
--- a/runtime/themes/darcula-solid.toml
+++ b/runtime/themes/darcula-solid.toml
@@ -4,9 +4,8 @@ inherits = "darcula"
 
 "ui.background.separator" = { bg = "grey01" }
 "ui.menu.scroll" = { fg = "grey02", bg = "grey00" }
-"ui.popup" = { fg = "grey03", bg = "grey02" }
+"ui.popup" = { fg = "grey05", bg = "grey00" }
 "ui.window" = { bg = "grey00" }
-"ui.selection" = { bg = "blue" }
 "ui.cursorline.secondary" = { bg = "grey03" }
 
 [palette]
@@ -15,5 +14,3 @@ grey01 = "#1f1f1f"
 grey02 = "#323232"
 grey03 = "#555555"
 grey04 = "#a8a8a8"
-
-blue = "#104158"
diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index 53a271bd2..3086b727f 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -8,7 +8,8 @@
 "ui.gutter" = { bg = "grey01" }
 "ui.popup" = { fg = "grey05", bg = "grey00" }
 "ui.window" = { bg = "grey01" }
-"ui.selection" = { bg = "grey03" }
+"ui.selection" = { bg = "grey02" }
+"ui.selection.primary" = { bg = "blue" }
 "ui.statusline" = { fg = "grey04", bg = "grey02" }
 "ui.statusline.insert" = { bg = "white", fg = "grey01" }
 "ui.statusline.select" = { bg = "orange", fg = "grey01" }
@@ -61,7 +62,7 @@
 "markup.link.url" = { fg = "lightblue", modifiers = ["underlined"] }
 "markup.link.text" = "white"
 "markup.quote" = "darkgreen"
-"markup.raw" = "white"
+"markup.raw" = "purple"
 
 "diff.plus" = "green"
 "diff.delta" = "grey"
@@ -97,3 +98,4 @@ green = "#32cd32"
 grey = "#808080"
 darkgreen = "#629755"
 lightblue = "#6897bb"
+blue = "#104158"

From 1297d924e7480fdd2a77c792c06042770856fa3e Mon Sep 17 00:00:00 2001
From: Jonah Lund <126015019+JonahLund@users.noreply.github.com>
Date: Fri, 29 Sep 2023 21:19:57 +0200
Subject: [PATCH 375/967] improve nord theme (#8414)

---
 runtime/themes/nord.toml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index e1e63b323..bc78db71d 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -50,7 +50,7 @@
 "keyword.operator" = "nord9"
 "keyword.return" = "nord9"
 "keyword.storage.modifier" = "nord9"
-"keyword.storage.type" = "nord7"
+"keyword.storage.type" = "nord9"
 
 # Punctuation
 "punctuation" = "nord6"
@@ -65,22 +65,22 @@
 "string.special" = "nord13"
 
 # Types
-"type" = "nord4"
+"type" = "nord7"
 "type.builtin" = "nord7"
 
 # Variables
 "variable" = "nord4"
-"variable.builint" = "nord9"
+"variable.builtin" = "nord9"
 "variable.other.member" = "nord4"
 "variable.parameter" = "nord8"
-"attribute" = "nord4"
+"attribute" = "nord9"
 
 # Misc.
 "label" = "nord7"
 "namespace" = "nord4"
 "operator" = "nord9"
-"special" = "nord4"
-"tag" = "nord4"
+"special" = "nord9"
+"tag" = "nord7"
 "comment" = { fg = "nord3_bright", modifiers = ["italic"] }
 
 ## EDITOR UI COLORS
@@ -165,7 +165,7 @@ nord8 = "#88C0D0"
 # A more darkened and less saturated color reminiscent of arctic waters
 nord9 = "#81A1C1" 
 # A dark and intensive color reminiscent of the deep arctic ocean
- nord10 = "#5E81AC" 
+nord10 = "#5E81AC" 
 
 # Aurora consists of five colorful components reminiscent of the "Aurora borealis", sometimes referred to as polar lights or northern lights.
 #

From 4e86d1c35adbb7c158b2d262e4c129c2bee41a0a Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 30 Sep 2023 05:28:25 +0200
Subject: [PATCH 376/967] fix multicursor snippet placeholder directions
 (#8423)

---
 helix-lsp/src/lib.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index a4be923b2..b6a990659 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -445,36 +445,36 @@ pub mod util {
             // the tabstop closest to the range simply replaces `head` while anchor remains in place
             // the remaining tabstops receive their own single-width cursor
             if range.head < range.anchor {
-                let first_tabstop = tabstop_anchor + tabstops[0].1;
+                let last_idx = tabstops.len() - 1;
+                let last_tabstop = tabstop_anchor + tabstops[last_idx].0;
 
                 // if selection is forward but was moved to the right it is
                 // contained entirely in the replacement text, just do a point
                 // selection (fallback below)
-                if range.anchor >= first_tabstop {
-                    let range = Range::new(range.anchor, first_tabstop);
+                if range.anchor > last_tabstop {
+                    let range = Range::new(range.anchor, last_tabstop);
                     mapped_selection.push(range);
-                    let rem_tabstops = tabstops[1..]
+                    let rem_tabstops = tabstops[..last_idx]
                         .iter()
-                        .map(|tabstop| Range::point(tabstop_anchor + tabstop.1));
+                        .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
                     mapped_selection.extend(rem_tabstops);
                     continue;
                 }
             } else {
-                let last_idx = tabstops.len() - 1;
-                let last_tabstop = tabstop_anchor + tabstops[last_idx].1;
+                let first_tabstop = tabstop_anchor + tabstops[0].0;
 
                 // if selection is forward but was moved to the right it is
                 // contained entirely in the replacement text, just do a point
                 // selection (fallback below)
-                if range.anchor <= last_tabstop {
+                if range.anchor < first_tabstop {
                     // we can't properly compute the the next grapheme
                     // here because the transaction hasn't been applied yet
                     // that is not a problem because the range gets grapheme aligned anyway
                     // tough so just adding one will always cause head to be grapheme
                     // aligned correctly when applied to the document
-                    let range = Range::new(range.anchor, last_tabstop + 1);
+                    let range = Range::new(range.anchor, first_tabstop + 1);
                     mapped_selection.push(range);
-                    let rem_tabstops = tabstops[..last_idx]
+                    let rem_tabstops = tabstops[1..]
                         .iter()
                         .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
                     mapped_selection.extend(rem_tabstops);

From 893802d5a2155f6a14a7f55265614779f20006a2 Mon Sep 17 00:00:00 2001
From: Yoav Lavi <yoav@yoavlavi.com>
Date: Mon, 2 Oct 2023 01:40:47 +0300
Subject: [PATCH 377/967] Add VSCode file associations (#8388)

* Add VSCode file associations

* Update languages.toml

Co-authored-by: Robert Clover <robert@clover.gdn>

* Change cpp *.in files to suffixes

---------

Co-authored-by: Robert Clover <robert@clover.gdn>
---
 languages.toml | 191 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 172 insertions(+), 19 deletions(-)

diff --git a/languages.toml b/languages.toml
index c12c4e82d..e93308343 100644
--- a/languages.toml
+++ b/languages.toml
@@ -317,7 +317,27 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 scope = "source.json"
 injection-regex = "json"
-file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf", "webmanifest", "flake.lock", ".babelrc"]
+file-types = [
+  "json",
+  "jsonc",
+  "arb",
+  "ipynb",
+  "geojson",
+  "gltf",
+  "webmanifest",
+  "flake.lock",
+  ".babelrc",
+  ".bowerrc",
+  ".jscrc",
+  "js.map",
+  "ts.map",
+  "css.map",
+  ".jslintrc",
+  "jsonld",
+  ".vuerc",
+  "composer.lock",
+  ".watchmanconfig"
+]
 roots = []
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true
@@ -368,7 +388,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd
 name = "cpp"
 scope = "source.cpp"
 injection-regex = "cpp"
-file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm"]
+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm", "h++", "ii", "inl", { suffix = ".hpp.in" }, { suffix = ".h.in" }]
 roots = []
 comment-token = "//"
 language-servers = [ "clangd" ]
@@ -415,7 +435,7 @@ language-servers = [ "crystalline" ]
 name = "c-sharp"
 scope = "source.csharp"
 injection-regex = "c-?sharp"
-file-types = ["cs"]
+file-types = ["cs", "csx", "cake"]
 roots = ["sln", "csproj"]
 comment-token = "//"
 indent = { tab-width = 4, unit = "\t" }
@@ -546,7 +566,7 @@ name = "javascript"
 scope = "source.js"
 injection-regex = "(js|javascript)"
 language-id = "javascript"
-file-types = ["js", "mjs", "cjs", "rules"]
+file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", "jakefile"]
 shebangs = ["node"]
 roots = []
 comment-token = "//"
@@ -642,7 +662,7 @@ source = { git = "https://github.com/serenadeai/tree-sitter-scss", rev = "c478c6
 name = "html"
 scope = "text.html.basic"
 injection-regex = "html"
-file-types = ["html"]
+file-types = ["html", "htm", "shtml", "xhtml", "xht", "jsp", "asp", "aspx", "jshtm", "volt", "rhtml"]
 roots = []
 language-servers = [ "vscode-html-language-server" ]
 auto-format = true
@@ -656,7 +676,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53
 name = "python"
 scope = "source.python"
 injection-regex = "python"
-file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct"]
+file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct", "rpy", "cpy", "ipy", "pyt", "SConscript"]
 shebangs = ["python"]
 roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
 comment-token = "#"
@@ -708,7 +728,42 @@ source = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "1b69
 name = "ruby"
 scope = "source.ruby"
 injection-regex = "ruby"
-file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile", "rabl", "jbuilder", "jb", "Podfile", "podspec", "Vagrantfile", "Brewfile"]
+file-types = [
+  "rb",
+  "rake",
+  "rakefile",
+  "irb",
+  "gemfile",
+  "gemspec",
+  "Rakefile",
+  "Gemfile",
+  "rabl",
+  "jbuilder",
+  "jb",
+  "Podfile",
+  "podspec",
+  "Vagrantfile",
+  "Brewfile",
+  "rjs",
+  "rbi",
+  "Guardfile",
+  "Capfile",
+  "Cheffile",
+  "Hobofile",
+  "Appraisals",
+  "Rantfile",
+  "Berksfile",
+  "Berksfile.lock",
+  "Thorfile",
+  "Puppetfile",
+  "Fastfile",
+  "Appfile",
+  "Deliverfile",
+  "Matchfile",
+  "Scanfile",
+  "Snapfile",
+  "Gymfile"
+]
 shebangs = ["ruby"]
 roots = []
 comment-token = "#"
@@ -723,7 +778,47 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-ruby", rev = "206c7
 name = "bash"
 scope = "source.bash"
 injection-regex = "(shell|bash|zsh|sh)"
-file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", "zshenv", ".zlogin", "zlogin", ".zlogout", "zlogout", ".zprofile", "zprofile", ".zshrc", "zshrc", ".zimrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc", ".bash_aliases", "Renviron", ".Renviron"]
+file-types = [
+  "sh",
+  "bash",
+  "zsh",
+  ".bash_login",
+  ".bash_logout",
+  ".bash_profile",
+  ".bashrc",
+  ".profile",
+  ".zshenv",
+  "zshenv",
+  ".zlogin",
+  "zlogin",
+  ".zlogout",
+  "zlogout",
+  ".zprofile",
+  "zprofile",
+  ".zshrc",
+  "zshrc",
+  ".zimrc",
+  "APKBUILD",
+  "PKGBUILD",
+  "eclass",
+  "ebuild",
+  "bazelrc",
+  ".bash_aliases",
+  "Renviron",
+  ".Renviron",
+  ".xprofile",
+  ".xsession",
+  ".xsessionrc",
+  "zsh-theme",
+  "ksh",
+  "cshrc",
+  "tcshrc",
+  ".yashrc",
+  ".yash_profile",
+  ".hushlogin",
+  "bashrc_Apple_Terminal",
+  "zshrc_Apple_Terminal"
+]
 shebangs = ["sh", "bash", "dash", "zsh"]
 roots = []
 comment-token = "#"
@@ -738,7 +833,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "275ef
 name = "php"
 scope = "source.php"
 injection-regex = "php"
-file-types = ["php", "inc"]
+file-types = ["php", "inc", "php4", "php5", "phtml", "ctp"]
 shebangs = ["php"]
 roots = ["composer.json", "index.php"]
 language-servers = [ "intelephense" ]
@@ -764,7 +859,7 @@ source = { git = "https://github.com/gbprod/tree-sitter-twig", rev = "807b293fec
 name = "latex"
 scope = "source.tex"
 injection-regex = "tex"
-file-types = ["tex", "sty", "cls", "Rd"]
+file-types = ["tex", "sty", "cls", "Rd", "bbx", "cbx"]
 roots = []
 comment-token = "%"
 language-servers = [ "texlab" ]
@@ -1086,7 +1181,7 @@ source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef30
 [[language]]
 name = "make"
 scope = "source.make"
-file-types = ["Makefile", "makefile", "make", "mk"]
+file-types = ["Makefile", "makefile", "make", "mk", "mak", "GNUmakefile", "OCamlMakefile"]
 shebangs = ["make", "gmake"]
 injection-regex = "(make|makefile|Makefile|mk)"
 roots = []
@@ -1113,7 +1208,7 @@ source = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "88408ff
 [[language]]
 name = "perl"
 scope = "source.perl"
-file-types = ["pl", "pm", "t"]
+file-types = ["pl", "pm", "t", "psgi", "raku", "rakumod", "rakutest", "rakudoc", "nqp", "p6", "pl6", "pm6"]
 shebangs = ["perl"]
 roots = []
 comment-token = "#"
@@ -1240,7 +1335,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", "PULLREQ_EDITMSG"]
+file-types = ["md", "markdown", "PULLREQ_EDITMSG", "mkd", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook"]
 roots = [".marksman.toml"]
 language-servers = [ "marksman" ]
 indent = { tab-width = 2, unit = "  " }
@@ -1320,7 +1415,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev
 name = "diff"
 scope = "source.diff"
 roots = []
-file-types = ["diff", "patch"]
+file-types = ["diff", "patch", "rej"]
 injection-regex = "diff"
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
@@ -1578,7 +1673,7 @@ source = { git = "https://github.com/Hubro/tree-sitter-robot", rev = "322e4cc657
 name = "r"
 scope = "source.r"
 injection-regex = "(r|R)"
-file-types = ["r", "R", ".Rprofile", "Rprofile.site"]
+file-types = ["r", "R", ".Rprofile", "Rprofile.site", ".RHistory"]
 shebangs = ["r", "R"]
 roots = []
 comment-token = "#"
@@ -1663,7 +1758,7 @@ source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "
 [[language]]
 name = "sql"
 scope = "source.sql"
-file-types = ["sql"]
+file-types = ["sql", "dsql"]
 roots = []
 comment-token = "--"
 indent = { tab-width = 4, unit = "    " }
@@ -2206,7 +2301,62 @@ source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d1
 name = "xml"
 scope = "source.xml"
 injection-regex = "xml"
-file-types = ["xml", "mobileconfig", "plist", "xib", "storyboard", "svg", "xsd", "gml", "xaml", "gir", "rss", "atom", "opml", "policy"]
+file-types = [
+  "xml",
+  "mobileconfig",
+  "plist",
+  "xib",
+  "storyboard",
+  "svg",
+  "xsd",
+  "gml",
+  "xaml",
+  "gir",
+  "rss",
+  "atom",
+  "opml",
+  "policy",
+  "ascx",
+  "axml",
+  "axaml",
+  "bpmn",
+  "cpt",
+  "csl",
+  "csproj.user",
+  "dita",
+  "ditamap",
+  "dtml",
+  "fxml",
+  "iml",
+  "isml",
+  "jmx",
+  "launch",
+  "menu",
+  "mxml",
+  "nuspec",
+  "pt",
+  "publishsettings",
+  "pubxml",
+  "pubxml.user",
+  "rbxlx",
+  "rbxmx",
+  "rng",
+  "shproj",
+  "tld",
+  "tmx",
+  "vbproj.user",
+  "vcxproj",
+  "vcxproj.filters",
+  "wsdl",
+  "wxi",
+  "wxs",
+  "xbl",
+  "xlf",
+  "xliff",
+  "xpdl",
+  "xul",
+  "xoml"
+]
 indent = { tab-width = 2, unit = "  " }
 roots = []
 
@@ -2295,7 +2445,10 @@ file-types = [
   "volume",
   "kube",
   "network",
-  ".editorconfig"
+  ".editorconfig",
+  "properties",
+  "cfg",
+  "directory"
 ]
 injection-regex = "ini"
 comment-token = "#"
@@ -2704,7 +2857,7 @@ name = "fsharp"
 scope = "source.fs"
 roots = ["sln", "fsproj"]
 injection-regex = "fsharp"
-file-types = ["fs", "fsx"]
+file-types = ["fs", "fsx", "fsi", "fsscript"]
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 auto-format = true

From 0e13db28327d69e97907d27bc5364629637a6c8e Mon Sep 17 00:00:00 2001
From: David Else <12832280+David-Else@users.noreply.github.com>
Date: Sun, 1 Oct 2023 23:41:54 +0100
Subject: [PATCH 378/967] Add validation to CSS and JSON language servers
 (#8433)

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

diff --git a/languages.toml b/languages.toml
index e93308343..af1466f1b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -77,9 +77,9 @@ texlab = { command = "texlab" }
 vala-language-server = { command = "vala-language-server" }
 vhdl_ls = { command = "vhdl_ls", args = [] }
 vlang-language-server = { command = "v-analyzer" }
-vscode-css-language-server = { command = "vscode-css-language-server", args = ["--stdio"], config = { "provideFormatter" = true }}
+vscode-css-language-server = { command = "vscode-css-language-server", args = ["--stdio"], config = { provideFormatter = true, css = { validate = { enable = true } } } }
 vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
-vscode-json-language-server =  { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true } }
+vscode-json-language-server = { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true, json = { validate = { enable = true } } } }
 vuels = { command = "vue-language-server", args = ["--stdio"], config = { typescript = { tsdk = "node_modules/typescript/lib/" } } }
 wgsl_analyzer = { command = "wgsl_analyzer" }
 yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }

From 6abaf3d24f47b9537766e9a8ffe1d76a4329d1f2 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 1 Oct 2023 22:32:27 -0500
Subject: [PATCH 379/967] LSP: Fix codeAction/resolve server capability check
 (#8421)

Previously we accidentally checked the server's _completion_ resolve
capability rather than the code action resolve capability.
---
 helix-lsp/src/client.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index ed9a2f830..341702c37 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -971,12 +971,12 @@ impl Client {
     ) -> Option<impl Future<Output = Result<Value>>> {
         let capabilities = self.capabilities.get().unwrap();
 
-        // Return early if the server does not support resolving code action.
-        match capabilities.completion_provider {
-            Some(lsp::CompletionOptions {
+        // Return early if the server does not support resolving code actions.
+        match capabilities.code_action_provider {
+            Some(lsp::CodeActionProviderCapability::Options(lsp::CodeActionOptions {
                 resolve_provider: Some(true),
                 ..
-            }) => (),
+            })) => (),
             _ => return None,
         }
 

From 7fbfec766c2ce2570ca4160744723813dbdc3019 Mon Sep 17 00:00:00 2001
From: Mathis Brossier <mathis.brossier@gmail.com>
Date: Mon, 2 Oct 2023 16:10:29 +0200
Subject: [PATCH 380/967] book: Fix broken link (#8441)

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

diff --git a/book/src/guides/injection.md b/book/src/guides/injection.md
index 18c474cfe..e842ae303 100644
--- a/book/src/guides/injection.md
+++ b/book/src/guides/injection.md
@@ -1,7 +1,7 @@
 # Adding Injection Queries
 
 Writing language injection queries allows one to highlight a specific node as a different language.
-In addition to the [standard](upstream-docs) language injection options used by tree-sitter, there
+In addition to the [standard][upstream-docs] language injection options used by tree-sitter, there
 are a few Helix specific extensions that allow for more control.
 
 And example of a simple query that would highlight all strings as bash in Nix:

From 588363c2c17f3f70d0c06739d84eb5f6f18c3a25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:16:00 +0900
Subject: [PATCH 381/967] build(deps): bump regex from 1.9.5 to 1.9.6 (#8451)

Bumps [regex](https://github.com/rust-lang/regex) from 1.9.5 to 1.9.6.
- [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.9.5...1.9.6)

---
updated-dependencies:
- dependency-name: regex
  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 02bdd57b0..8426583c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1987,9 +1987,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.5"
+version = "1.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
@@ -1999,9 +1999,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",

From 7dddbca558e14a42c1f947e67b463e2c2b5647c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:16:30 +0900
Subject: [PATCH 382/967] build(deps): bump rustix from 0.38.14 to 0.38.15
 (#8449)

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.14 to 0.38.15.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.14...v0.38.15)

---
updated-dependencies:
- dependency-name: rustix
  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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8426583c4..16f89f8f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1455,7 +1455,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.14",
+ "rustix 0.38.15",
  "serde",
  "serde_json",
  "slotmap",
@@ -2052,9 +2052,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.14"
+version = "0.38.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
+checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
@@ -2289,7 +2289,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.38.14",
+ "rustix 0.38.15",
  "windows-sys 0.48.0",
 ]
 
@@ -2646,7 +2646,7 @@ dependencies = [
  "dirs",
  "either",
  "once_cell",
- "rustix 0.38.14",
+ "rustix 0.38.15",
 ]
 
 [[package]]

From a42b5f011e212bfb6106deddcb1b99dc584453e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:16:51 +0900
Subject: [PATCH 383/967] build(deps): bump libloading from 0.8.0 to 0.8.1
 (#8448)

Bumps [libloading](https://github.com/nagisa/rust_libloading) from 0.8.0 to 0.8.1.
- [Commits](https://github.com/nagisa/rust_libloading/compare/0.8.0...0.8.1)

---
updated-dependencies:
- dependency-name: libloading
  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 16f89f8f1..d22a689e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1632,9 +1632,9 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "libloading"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
 dependencies = [
  "cfg-if",
  "windows-sys 0.48.0",

From e122add561ebe310f6976b447f0a3d984e0de5d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:17:03 +0900
Subject: [PATCH 384/967] build(deps): bump thiserror from 1.0.48 to 1.0.49
 (#8447)

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

---
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 d22a689e6..ee09c8e0c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2324,18 +2324,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",

From 1756ba443631b0eb6d93c089d3b13b13cd8ef28f Mon Sep 17 00:00:00 2001
From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com>
Date: Mon, 2 Oct 2023 21:17:32 -0400
Subject: [PATCH 385/967] update with new mdbook index.hbs (#8445)

---
 book/theme/index.hbs | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/book/theme/index.hbs b/book/theme/index.hbs
index ed27410f6..0a0bc5501 100644
--- a/book/theme/index.hbs
+++ b/book/theme/index.hbs
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
-<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
     <head>
         <!-- Book generated using mdBook -->
         <meta charset="UTF-8">
         <title>{{ title }}</title>
         {{#if is_print }}
-        <meta name="robots" content="noindex" />
+        <meta name="robots" content="noindex">
         {{/if}}
         {{#if base_url}}
         <base href="{{ base_url }}">
@@ -17,7 +17,7 @@
 
         <meta name="description" content="{{ description }}">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff" />
+        <meta name="theme-color" content="#ffffff">
 
         {{#if favicon_svg}}
         <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -34,8 +34,6 @@
 
         <!-- Fonts -->
         <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
-        <link rel="preconnect" href="https://fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;400;500;700&display=swap" rel="stylesheet">
         {{#if copy_fonts}}
         <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
         {{/if}}
@@ -55,7 +53,7 @@
         <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
         {{/if}}
     </head>
-    <body>
+    <body class="sidebar-visible no-js">
     <div id="body-container">
         <!-- Provide site root to javascript -->
         <script>
@@ -85,24 +83,29 @@
             try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
             if (theme === null || theme === undefined) { theme = default_theme; }
             var html = document.querySelector('html');
-            html.classList.remove('no-js')
             html.classList.remove('{{ default_theme }}')
             html.classList.add(theme);
-            html.classList.add('js');
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
         </script>
 
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
         <!-- Hide / unhide sidebar before it is displayed -->
         <script>
-            var html = document.querySelector('html');
+            var body = document.querySelector('body');
             var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
             if (document.body.clientWidth >= 1080) {
                 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
                 sidebar = sidebar || 'visible';
             } else {
                 sidebar = 'hidden';
             }
-            html.classList.remove('sidebar-visible');
-            html.classList.add("sidebar-" + sidebar);
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
         </script>
 
         <nav id="sidebar" class="sidebar" aria-label="Table of contents">
@@ -141,9 +144,9 @@
                 <div id="menu-bar-hover-placeholder"></div>
                 <div id="menu-bar" class="menu-bar sticky">
                     <div class="left-buttons">
-                        <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
                             <i class="fa fa-bars"></i>
-                        </button>
+                        </label>
                         <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
                             <i class="fa fa-paint-brush"></i>
                         </button>
@@ -220,7 +223,7 @@
                         {{/previous}}
 
                         {{#next}}
-                            <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
                                 <i class="fa fa-angle-right"></i>
                             </a>
                         {{/next}}
@@ -238,7 +241,7 @@
                 {{/previous}}
 
                 {{#next}}
-                    <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
                         <i class="fa fa-angle-right"></i>
                     </a>
                 {{/next}}

From 75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b Mon Sep 17 00:00:00 2001
From: Lloyd Bond <lbond@sailthru.com>
Date: Mon, 2 Oct 2023 21:18:27 -0400
Subject: [PATCH 386/967] enable starting hx with a working directory (#8223)

* added working path arg to cli and help menu

* improve working path cli arg handling

* enable hx to set the working path

* applied cargo formatting

* improved code from cargo clippy suggestion

* improved code from follow up review

* fix for -w <path> is set but args.files is empty

* improved formatting of --help output
---
 helix-term/src/application.rs |  3 +++
 helix-term/src/args.rs        | 15 +++++++++++++++
 helix-term/src/main.rs        |  1 +
 3 files changed, 19 insertions(+)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 3e6da5bbd..7c23ddfe2 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -156,6 +156,9 @@ impl Application {
         let editor_view = Box::new(ui::EditorView::new(Keymaps::new(keys)));
         compositor.push(editor_view);
 
+        if let Some(path) = args.working_directory {
+            helix_loader::set_current_working_dir(path)?
+        }
         if args.load_tutor {
             let path = helix_loader::runtime_file(Path::new("tutor"));
             editor.open(&path, Action::VerticalSplit)?;
diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
index dd787f1fd..f782539ca 100644
--- a/helix-term/src/args.rs
+++ b/helix-term/src/args.rs
@@ -17,6 +17,7 @@ pub struct Args {
     pub log_file: Option<PathBuf>,
     pub config_file: Option<PathBuf>,
     pub files: Vec<(PathBuf, Position)>,
+    pub working_directory: Option<PathBuf>,
 }
 
 impl Args {
@@ -59,6 +60,20 @@ impl Args {
                     Some(path) => args.log_file = Some(path.into()),
                     None => anyhow::bail!("--log must specify a path to write"),
                 },
+                "-w" | "--working-dir" => match argv.next().as_deref() {
+                    Some(path) => {
+                        args.working_directory = if Path::new(path).is_dir() {
+                            Some(PathBuf::from(path))
+                        } else {
+                            anyhow::bail!(
+                                "--working-dir specified does not exist or is not a directory"
+                            )
+                        }
+                    }
+                    None => {
+                        anyhow::bail!("--working-dir must specify an initial working directory")
+                    }
+                },
                 arg if arg.starts_with("--") => {
                     anyhow::bail!("unexpected double dash argument: {}", arg)
                 }
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 542d18e6a..009cbf7f4 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -66,6 +66,7 @@ FLAGS:
     -V, --version                  Prints version information
     --vsplit                       Splits all given files vertically into different windows
     --hsplit                       Splits all given files horizontally into different windows
+    -w, --working-dir <path>       Specify an initial working directory
 ",
         env!("CARGO_PKG_NAME"),
         VERSION_AND_GIT_HASH,

From 68fce3e160c64c488567f0e80f8d57bbbdd9dd82 Mon Sep 17 00:00:00 2001
From: David Else <12832280+David-Else@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:00:43 +0100
Subject: [PATCH 387/967] Add tailwindcss language server (#8442)

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

diff --git a/languages.toml b/languages.toml
index af1466f1b..8fafd5d43 100644
--- a/languages.toml
+++ b/languages.toml
@@ -71,6 +71,7 @@ solc = { command = "solc", args = ["--lsp"] }
 sourcekit-lsp = { command = "sourcekit-lsp" }
 svlangserver = { command = "svlangserver", args = [] }
 swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
+tailwindcss-ls = { command = "tailwindcss-language-server", args = ["--stdio"] }
 taplo = { command = "taplo", args = ["lsp", "stdio"] }
 terraform-ls = { command = "terraform-ls", args = ["serve"] }
 texlab = { command = "texlab" }

From 93e54fa0c88dc0c8761242b14b11a5aca79c6faf Mon Sep 17 00:00:00 2001
From: DS/Charlie <82801887+ds-cbo@users.noreply.github.com>
Date: Sat, 7 Oct 2023 00:29:42 +0200
Subject: [PATCH 388/967] add support for json5 (#8473)

* add json5 language

* docgen
---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 16 ++++++++++++++++
 runtime/queries/json5/highlights.scm | 11 +++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 runtime/queries/json5/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index f65f268d0..378c6730e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -76,6 +76,7 @@
 | jinja | ✓ |  |  |  |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
+| json5 | ✓ |  |  |  |
 | jsonnet | ✓ |  |  | `jsonnet-language-server` |
 | jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ | ✓ | ✓ | `julia` |
diff --git a/languages.toml b/languages.toml
index 8fafd5d43..6eab0421c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -348,6 +348,22 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 source = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "73076754005a460947cafe8e03a8cf5fa4fa2938" }
 
+
+[[language]]
+name = "json5"
+scope = "source.json5"
+injection-regex = "json5"
+file-types = ["json5"]
+roots = []
+language-servers = []
+comment-token = "//"
+indent = { tab-width = 4, unit = "    " }
+# https://json5.org
+
+[[grammar]]
+name = "json5"
+source = { git = "https://github.com/Joakker/tree-sitter-json5", rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d" }
+
 [[language]]
 name = "c"
 scope = "source.c"
diff --git a/runtime/queries/json5/highlights.scm b/runtime/queries/json5/highlights.scm
new file mode 100644
index 000000000..4bf03fe31
--- /dev/null
+++ b/runtime/queries/json5/highlights.scm
@@ -0,0 +1,11 @@
+(string) @string
+
+(identifier) @constant
+
+(number) @constant.numeric
+
+(null) @constant.builtin
+
+[(true) (false)] @constant.builtin.boolean
+
+(comment) @comment

From bdf7937a599058daa168fa24b0f52c06d4259cf7 Mon Sep 17 00:00:00 2001
From: Laurent Wandrebeck <l.wandrebeck@quelquesmots.fr>
Date: Sun, 8 Oct 2023 12:34:21 +0200
Subject: [PATCH 389/967] Add ansible-language-server for yaml (#7973)

* Update languages.toml

Add ansible support to yaml.

* cargo xtask docgen
---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 378c6730e..a2c4ba97f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -179,6 +179,6 @@
 | wren | ✓ | ✓ | ✓ |  |
 | xit | ✓ |  |  |  |
 | xml | ✓ |  | ✓ |  |
-| yaml | ✓ |  | ✓ | `yaml-language-server` |
+| yaml | ✓ |  | ✓ | `yaml-language-server`, `ansible-language-server` |
 | yuck | ✓ |  |  |  |
 | zig | ✓ | ✓ | ✓ | `zls` |
diff --git a/languages.toml b/languages.toml
index 6eab0421c..257d90afe 100644
--- a/languages.toml
+++ b/languages.toml
@@ -87,6 +87,9 @@ yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
 zls = { command = "zls" }
 blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
 
+[language-server.ansible-language-server]
+command = "ansible-language-server"
+args = ["--stdio"]
 
 [language-server.lua-language-server]
 command = "lua-language-server" 
@@ -1071,7 +1074,7 @@ file-types = ["yml", "yaml"]
 roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
-language-servers = [ "yaml-language-server" ]
+language-servers = [ "yaml-language-server", "ansible-language-server" ]
 injection-regex = "yml|yaml"
 
 [[grammar]]

From 96bbfb7c2e880c8ed0d7f3f15ee39fb5b68c93b4 Mon Sep 17 00:00:00 2001
From: DS/Charlie <82801887+ds-cbo@users.noreply.github.com>
Date: Mon, 9 Oct 2023 17:29:30 +0200
Subject: [PATCH 390/967] bump tree-sitter-sql (#8464)

* bump tree-sitter-sql

* update highlights classes to helix flavour

* replace lua-match with match
---
 languages.toml                     |   2 +-
 runtime/queries/sql/highlights.scm | 510 ++++++++++++++++-------------
 2 files changed, 280 insertions(+), 232 deletions(-)

diff --git a/languages.toml b/languages.toml
index 257d90afe..f0c27a0cf 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1786,7 +1786,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "eeab7240a11098724e6f95bc57cc3ceaf5487d5f" }
 
 [[language]]
 name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index 2faa67ed3..1041cc2fc 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -1,134 +1,168 @@
+(invocation
+  (object_reference
+    name: (identifier) @function.method))
 
 [
+  (keyword_gist)
   (keyword_btree)
   (keyword_hash)
-  (keyword_gist)
   (keyword_spgist)
   (keyword_gin)
   (keyword_brin)
-
-  (cast)
-  (group_concat)
-  (invocation)
+  (keyword_array)
 ] @function.builtin
-  
-(table_reference
-  name: (identifier) @namespace)
 
-(relation
-  table_alias: (identifier) @variable.parameter)
-  
-(field
+(object_reference
   name: (identifier) @variable.other.member)
-  
+
+(relation
+  alias: (identifier) @variable.parameter)
+
 (field
-  table_alias: (identifier) @variable.parameter
   name: (identifier) @variable.other.member)
 
-(comment) @comment
+(term
+  alias: (identifier) @variable.parameter)
 
-[
-  "("
-  ")"
-] @punctuation.bracket
+(term
+   value: (cast
+    name: (keyword_cast) @function.builtin
+    parameter: [(literal)]?))
 
-[
-  ";"
-  ","
-  "."
-] @punctuation.delimiter
+(literal) @string
+(comment) @comment.line
+(marginalia) @comment.block
 
-(binary_expression
-  operator: _ @operator)
+((literal) @constant.numeric.integer
+  (#match? @constant.numeric.integer "^-?\\d+$"))
 
-(unary_expression
-  operator: _ @operator)
+((literal) @constant.numeric.float
+  (#match? @constant.numeric.float "^-?\\d*\\.\\d*$"))
 
-(all_fields) @special
+(parameter) @variable.parameter
 
 [
-  (keyword_null)
-  (keyword_true)
-  (keyword_false)
-] @constant.builtin
+ (keyword_true)
+ (keyword_false)
+] @constant.builtin.boolean
 
-((literal) @constant.numeric
-  (#match? @constant.numeric "^-?\\d*\\.?\\d*$"))
+[
+ (keyword_asc)
+ (keyword_desc)
+ (keyword_terminated)
+ (keyword_escaped)
+ (keyword_unsigned)
+ (keyword_nulls)
+ (keyword_last)
+ (keyword_delimited)
+ (keyword_replication)
+ (keyword_auto_increment)
+ (keyword_default)
+ (keyword_collate)
+ (keyword_concurrently)
+ (keyword_engine)
+ (keyword_always)
+ (keyword_generated)
+ (keyword_preceding)
+ (keyword_following)
+ (keyword_first)
+ (keyword_current_timestamp)
+ (keyword_immutable)
+ (keyword_atomic)
+ (keyword_parallel)
+ (keyword_leakproof)
+ (keyword_safe)
+ (keyword_cost)
+ (keyword_strict)
+] @attribute
 
-(literal) @string
+[
+ (keyword_materialized)
+ (keyword_recursive)
+ (keyword_temp)
+ (keyword_temporary)
+ (keyword_unlogged)
+ (keyword_external)
+ (keyword_parquet)
+ (keyword_csv)
+ (keyword_rcfile)
+ (keyword_textfile)
+ (keyword_orc)
+ (keyword_avro)
+ (keyword_jsonfile)
+ (keyword_sequencefile)
+ (keyword_volatile)
+] @keyword.storage.type
+
+[
+ (keyword_case)
+ (keyword_when)
+ (keyword_then)
+ (keyword_else)
+] @keyword.control.conditional
 
 [
   (keyword_select)
+  (keyword_from)
+  (keyword_where)
+  (keyword_index)
+  (keyword_join)
+  (keyword_primary)
   (keyword_delete)
+  (keyword_create)
   (keyword_insert)
+  (keyword_merge)
+  (keyword_distinct)
   (keyword_replace)
   (keyword_update)
   (keyword_into)
   (keyword_overwrite)
+  (keyword_matched)
   (keyword_values)
+  (keyword_value)
+  (keyword_attribute)
   (keyword_set)
-  (keyword_from)
   (keyword_left)
   (keyword_right)
+  (keyword_outer)
   (keyword_inner)
   (keyword_full)
-  (keyword_outer)
-  (keyword_cross)
-  (keyword_join)
-  (keyword_lateral)
-  (keyword_on)
-  (keyword_not)
   (keyword_order)
-  (keyword_group)
   (keyword_partition)
-  (keyword_by)
+  (keyword_group)
+  (keyword_with)
+  (keyword_as)
   (keyword_having)
-  (keyword_desc)
-  (keyword_asc)
   (keyword_limit)
   (keyword_offset)
-  (keyword_primary)
-  (keyword_create)
-  (keyword_alter)
-  (keyword_change)
-  (keyword_analyze)
-  (keyword_modify)
-  (keyword_drop)
-  (keyword_add)
   (keyword_table)
   (keyword_tables)
-  (keyword_view)
-  (keyword_materialized)
-  (keyword_column)
   (keyword_key)
-  (keyword_as)
-  (keyword_distinct)
+  (keyword_references)
+  (keyword_foreign)
   (keyword_constraint)
-  ; (keyword_cast)
-  ; (keyword_group_concat)
-  (keyword_separator)
-  (keyword_max)
-  (keyword_min)
-  (keyword_avg)
-  (keyword_end)
   (keyword_force)
-  (keyword_ignore)
-  (keyword_using)
   (keyword_use)
-  (keyword_index)
   (keyword_for)
   (keyword_if)
   (keyword_exists)
-  (keyword_auto_increment)
-  (keyword_generated)
-  (keyword_always)
-  (keyword_collate)
-  (keyword_character)
-  (keyword_engine)
-  (keyword_default)
-  (keyword_cascade)
-  (keyword_restrict)
-  (keyword_with)
+  (keyword_max)
+  (keyword_min)
+  (keyword_avg)
+  (keyword_column)
+  (keyword_columns)
+  (keyword_cross)
+  (keyword_lateral)
+  (keyword_natural)
+  (keyword_alter)
+  (keyword_drop)
+  (keyword_add)
+  (keyword_view)
+  (keyword_end)
+  (keyword_is)
+  (keyword_using)
+  (keyword_between)
+  (keyword_window)
   (keyword_no)
   (keyword_data)
   (keyword_type)
@@ -136,208 +170,222 @@
   (keyword_to)
   (keyword_schema)
   (keyword_owner)
-  (keyword_temp)
-  (keyword_temporary)
-  (keyword_unlogged)
-  (keyword_union)
+  (keyword_authorization)
   (keyword_all)
   (keyword_any)
   (keyword_some)
-  (keyword_except)
-  (keyword_intersect)
   (keyword_returning)
   (keyword_begin)
   (keyword_commit)
   (keyword_rollback)
   (keyword_transaction)
+  (keyword_only)
+  (keyword_like)
+  (keyword_similar)
   (keyword_over)
-  (keyword_nulls)
-  (keyword_first)
+  (keyword_change)
+  (keyword_modify)
   (keyword_after)
-  (keyword_last)
-  (keyword_window)
+  (keyword_before)
   (keyword_range)
   (keyword_rows)
   (keyword_groups)
-  (keyword_between)
-  (keyword_unbounded)
-  (keyword_preceding)
-  (keyword_following)
   (keyword_exclude)
   (keyword_current)
-  (keyword_row)
   (keyword_ties)
   (keyword_others)
-  (keyword_only)
-  (keyword_unique)
-  (keyword_foreign)
-  (keyword_references)
-  (keyword_concurrently)
-  ; (keyword_btree)
-  ; (keyword_hash)
-  ; (keyword_gist)
-  ; (keyword_spgist)
-  ; (keyword_gin)
-  ; (keyword_brin)
-  (keyword_like)
-  (keyword_similar)
   (keyword_preserve)
-  (keyword_unsigned)
   (keyword_zerofill)
-  (keyword_conflict)
-  (keyword_do)
-  (keyword_nothing)
-  (keyword_high_priority)
-  (keyword_low_priority)
-  (keyword_delayed)
-  (keyword_recursive)
-  (keyword_cascaded)
-  (keyword_local)
-  (keyword_current_timestamp)
-  (keyword_check)
-  (keyword_option)
+  (keyword_format)
+  (keyword_fields)
+  (keyword_row)
+  (keyword_sort)
+  (keyword_compute)
+  (keyword_comment)
+  (keyword_location)
+  (keyword_cached)
+  (keyword_uncached)
+  (keyword_lines)
+  (keyword_stored)
+  (keyword_virtual)
+  (keyword_partitioned)
+  (keyword_analyze)
+  (keyword_explain)
+  (keyword_verbose)
+  (keyword_truncate)
+  (keyword_rewrite)
+  (keyword_optimize)
   (keyword_vacuum)
-  (keyword_wait)
-  (keyword_nowait)
-
-  (keyword_trigger)
-  (keyword_function)
-  (keyword_returns)
-  (keyword_return)
-  (keyword_setof)
-  (keyword_atomic)
-  (keyword_declare)
-  ; (keyword_language)
+  (keyword_cache)
+  (keyword_language)
   (keyword_sql)
+  (keyword_called)
+  (keyword_conflict)
+  (keyword_declare)
+  (keyword_filter)
+  (keyword_function)
+  (keyword_input)
+  (keyword_name)
+  (keyword_oid)
+  (keyword_options)
   (keyword_plpgsql)
-  (keyword_immutable)
-  (keyword_stable)
-  (keyword_volatile)
-  (keyword_leakproof)
-  (keyword_parallel)
-  (keyword_safe)
-  (keyword_unsafe)
+  (keyword_precision)
+  (keyword_regclass)
+  (keyword_regnamespace)
+  (keyword_regproc)
+  (keyword_regtype)
   (keyword_restricted)
-  (keyword_called)
+  (keyword_return)
   (keyword_returns)
-  (keyword_input)
-  (keyword_strict)
-  (keyword_cost)
-  (keyword_rows)
+  (keyword_separator)
+  (keyword_setof)
+  (keyword_stable)
   (keyword_support)
-
-  (keyword_external)
-  (keyword_stored)
-  (keyword_cached)
-  (keyword_uncached)
-  (keyword_replication)
   (keyword_tblproperties)
-  (keyword_options)
-  (keyword_compute)
-  (keyword_stats)
-  (keyword_statistics)
-  (keyword_optimize)
-  (keyword_rewrite)
-  (keyword_bin_pack)
-  (keyword_incremental)
-  (keyword_location)
-  (keyword_partitioned)
-  (keyword_comment)
-  (keyword_sort)
-  (keyword_format)
-  (keyword_delimited)
-  (keyword_fields)
-  (keyword_terminated)
-  (keyword_escaped)
-  (keyword_lines)
-  (keyword_cache)
-  (keyword_metadata)
-  (keyword_noscan)
-
-  (keyword_parquet)
-  (keyword_rcfile)
-  (keyword_csv)
-  (keyword_textfile)
-  (keyword_avro)
-  (keyword_sequencefile)
-  (keyword_orc)
-  (keyword_avro)
-  (keyword_jsonfile)
-
-  (keyword_precision)
-  (keyword_inet)
+  (keyword_trigger)
+  (keyword_unsafe)
+  (keyword_admin)
+  (keyword_connection)
+  (keyword_cycle)
+  (keyword_database)
+  (keyword_encrypted)
+  (keyword_increment)
+  (keyword_logged)
+  (keyword_none)
+  (keyword_owned)
+  (keyword_password)
+  (keyword_reset)
+  (keyword_role)
+  (keyword_sequence)
+  (keyword_start)
+  (keyword_restart)
+  (keyword_tablespace)
+  (keyword_until)
+  (keyword_user)
+  (keyword_valid)
+  (keyword_action)
 ] @keyword
 
 [
-  (keyword_case)
-  (keyword_when)
-  (keyword_then)
-  (keyword_else)
-  (keyword_where)
-] @keyword.control.conditional
-
-[
-  (keyword_in)
-  (keyword_and)
-  (keyword_or)
-  (keyword_is)
-] @keyword.operator
+ (keyword_restrict)
+ (keyword_unbounded)
+ (keyword_unique)
+ (keyword_cascade)
+ (keyword_delayed)
+ (keyword_high_priority)
+ (keyword_low_priority)
+ (keyword_ignore)
+ (keyword_nothing)
+ (keyword_check)
+ (keyword_option)
+ (keyword_local)
+ (keyword_cascaded)
+ (keyword_wait)
+ (keyword_nowait)
+ (keyword_metadata)
+ (keyword_incremental)
+ (keyword_bin_pack)
+ (keyword_noscan)
+ (keyword_stats)
+ (keyword_statistics)
+ (keyword_maxvalue)
+ (keyword_minvalue)
+] @keyword
 
 [
+  (keyword_int)
+  (keyword_null)
   (keyword_boolean)
-  (bit)
   (keyword_binary)
-
+  (keyword_varbinary)
+  (keyword_image)
+  (keyword_bit)
+  (keyword_inet)
+  (keyword_character)
   (keyword_smallserial)
   (keyword_serial)
   (keyword_bigserial)
-
-  (tinyint)
-  (smallint)
-  (mediumint)
-  (int)
-  (bigint)
-  (decimal)
-  (numeric)
+  (keyword_smallint)
+  (keyword_mediumint)
+  (keyword_bigint)
+  (keyword_tinyint)
+  (keyword_decimal)
+  (keyword_float)
+  (keyword_double)
+  (keyword_numeric)
   (keyword_real)
   (double)
-  (float)
-
   (keyword_money)
-
-  (char)
-  (varchar)
-  (numeric)
-  (keyword_string)
+  (keyword_smallmoney)
+  (keyword_char)
+  (keyword_nchar)
+  (keyword_varchar)
+  (keyword_nvarchar)
+  (keyword_varying)
   (keyword_text)
-
+  (keyword_string)
   (keyword_uuid)
-
   (keyword_json)
   (keyword_jsonb)
   (keyword_xml)
-
   (keyword_bytea)
-  (keyword_inet)
-
-  (enum)
-
+  (keyword_enum)
   (keyword_date)
   (keyword_datetime)
+  (keyword_time)
+  (keyword_datetime2)
+  (keyword_datetimeoffset)
+  (keyword_smalldatetime)
   (keyword_timestamp)
   (keyword_timestamptz)
-
-  (keyword_interval)
-
   (keyword_geometry)
   (keyword_geography)
   (keyword_box2d)
   (keyword_box3d)
-
-  (keyword_oid)
-  (keyword_name)
-  (keyword_regclass)
-  (keyword_regnamespace)
-  (keyword_regproc)
-  (keyword_regtype)
+  (keyword_interval)
 ] @type.builtin
+
+[
+  (keyword_in)
+  (keyword_and)
+  (keyword_or)
+  (keyword_not)
+  (keyword_by)
+  (keyword_on)
+  (keyword_do)
+  (keyword_union)
+  (keyword_except)
+  (keyword_intersect)
+] @keyword.operator
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "^"
+  ":="
+  "="
+  "<"
+  "<="
+  "!="
+  ">="
+  ">"
+  "<>"
+  "->"
+  "->>"
+  "#>"
+  "#>>"
+] @operator
+
+[
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  ";"
+  ","
+  "."
+] @punctuation.delimiter

From 5cb76e74f9bd226f1b4757f478bf49873d9ecfe6 Mon Sep 17 00:00:00 2001
From: Kasper Juul Hermansen <contact@kjuulh.io>
Date: Mon, 9 Oct 2023 17:30:27 +0200
Subject: [PATCH 391/967] add lsp for graphql (#8492)

graphql-lsp has quite the strange name upstream, the project is technically called graphql-language-service,
but the binary shipped is called graphql-lsp hence the strange naming scheme

Signed-off-by: kjuulh <contact@kjuulh.io>
---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a2c4ba97f..429f54f55 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -59,7 +59,7 @@
 | gomod | ✓ |  |  | `gopls` |
 | gotmpl | ✓ |  |  | `gopls` |
 | gowork | ✓ |  |  | `gopls` |
-| graphql | ✓ |  |  |  |
+| graphql | ✓ |  |  | `graphql-lsp` |
 | hare | ✓ |  |  |  |
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | haskell-persistent | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index f0c27a0cf..24b6cccf9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -30,6 +30,7 @@ forth-lsp = { command = "forth-lsp" }
 fortls = { command = "fortls", args = ["--lowercase_intrinsics"] }
 fsharp-ls = { command = "fsautocomplete", config = { AutomaticWorkspaceInit = true } }
 gleam = { command = "gleam", args = ["lsp"] }
+graphql-language-service = { command = "graphql-lsp", args = ["server", "-m", "stream"] }
 haskell-language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }
 idris2-lsp = { command = "idris2-lsp" }
 intelephense = { command = "intelephense", args = ["--stdio"] }
@@ -1513,6 +1514,7 @@ scope = "source.graphql"
 injection-regex = "graphql"
 file-types = ["gql", "graphql", "graphqls"]
 roots = []
+language-servers = [ "graphql-language-service" ]
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]

From a8574805617d86304232b47d84fd7c7f4f773520 Mon Sep 17 00:00:00 2001
From: Bjorn Ove Hay Andersen <bjrnove@gmail.com>
Date: Mon, 9 Oct 2023 18:38:09 +0200
Subject: [PATCH 392/967] Set the working directory before loading the config
 (#8498)

---
 helix-loader/src/lib.rs       | 6 +++---
 helix-term/src/application.rs | 5 +----
 helix-term/src/main.rs        | 8 ++++++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 7ff4cada7..82ed2edea 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -33,9 +33,9 @@ pub fn current_working_dir() -> PathBuf {
     path
 }
 
-pub fn set_current_working_dir(path: PathBuf) -> std::io::Result<()> {
+pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
     let path = dunce::canonicalize(path)?;
-    std::env::set_current_dir(path.clone())?;
+    std::env::set_current_dir(&path)?;
     let mut cwd = CWD.write().unwrap();
     *cwd = Some(path);
     Ok(())
@@ -280,7 +280,7 @@ mod merge_toml_tests {
         let cwd = current_working_dir();
         assert_ne!(cwd, new_path);
 
-        set_current_working_dir(new_path.clone()).expect("Couldn't set new path");
+        set_current_working_dir(&new_path).expect("Couldn't set new path");
 
         let cwd = current_working_dir();
         assert_eq!(cwd, new_path);
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 7c23ddfe2..fabd0fa4d 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -156,9 +156,6 @@ impl Application {
         let editor_view = Box::new(ui::EditorView::new(Keymaps::new(keys)));
         compositor.push(editor_view);
 
-        if let Some(path) = args.working_directory {
-            helix_loader::set_current_working_dir(path)?
-        }
         if args.load_tutor {
             let path = helix_loader::runtime_file(Path::new("tutor"));
             editor.open(&path, Action::VerticalSplit)?;
@@ -167,7 +164,7 @@ impl Application {
         } else if !args.files.is_empty() {
             let first = &args.files[0].0; // we know it's not empty
             if first.is_dir() {
-                helix_loader::set_current_working_dir(first.clone())?;
+                // NOTE: The working directory is already set to args.files[0] in main()
                 editor.new_file(Action::VerticalSplit);
                 let picker = ui::file_picker(".".into(), &config.load().editor);
                 compositor.push(Box::new(overlaid(picker)));
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 009cbf7f4..ed3478ac9 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -115,6 +115,14 @@ FLAGS:
 
     setup_logging(args.verbosity).context("failed to initialize logging")?;
 
+    // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
+    // Application::new() depends on this logic so it must be updated if this changes.
+    if let Some((path, true)) = args.files.first().map(|(path, _)| (path, path.is_dir())) {
+        helix_loader::set_current_working_dir(path)?;
+    } else if let Some(path) = &args.working_directory {
+        helix_loader::set_current_working_dir(path)?;
+    }
+
     let config = match Config::load_default() {
         Ok(config) => config,
         Err(ConfigLoadError::Error(err)) if err.kind() == std::io::ErrorKind::NotFound => {

From e0d5b79a73b2faf807b934fbb145d003df575b84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 18:46:51 +0900
Subject: [PATCH 393/967] build(deps): bump hashbrown from 0.14.0 to 0.14.1
 (#8500)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 10 +++++-----
 helix-core/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee09c8e0c..8a05415d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -847,7 +847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e133bc56d938eaec1c675af7c681a51de9662b0ada779f45607b967a10da77a"
 dependencies = [
  "gix-hash",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "parking_lot",
 ]
 
@@ -1250,9 +1250,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -1269,7 +1269,7 @@ dependencies = [
  "dunce",
  "encoding_rs",
  "etcetera",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "helix-loader",
  "imara-diff",
  "indoc",
@@ -1564,7 +1564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 912342438..fb4894137 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -31,7 +31,7 @@ arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
 ahash = "0.8.3"
-hashbrown = { version = "0.14.0", features = ["raw"] }
+hashbrown = { version = "0.14.1", features = ["raw"] }
 dunce = "1.0"
 
 log = "0.4"

From ca0382b75bc70f3122bfcef5abdc90229182d3b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 18:47:04 +0900
Subject: [PATCH 394/967] build(deps): bump tokio from 1.32.0 to 1.33.0 (#8501)

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 8a05415d6..ecad9ab1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2407,9 +2407,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 19bc94d6e..0b181a845 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -25,7 +25,7 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.32", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.33", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
 which = "4.4"
 parking_lot = "0.12.1"

From d8f059cbcc0de7c4aec68d1c1f1538d0c50acc1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 18:47:15 +0900
Subject: [PATCH 395/967] build(deps): bump rustix from 0.38.15 to 0.38.18
 (#8502)

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

diff --git a/Cargo.lock b/Cargo.lock
index ecad9ab1f..cea0f4858 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1455,7 +1455,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.15",
+ "rustix 0.38.18",
  "serde",
  "serde_json",
  "slotmap",
@@ -1657,9 +1657,9 @@ checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.7"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "lock_api"
@@ -2052,14 +2052,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.15"
+version = "0.38.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
+checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.7",
+ "linux-raw-sys 0.4.10",
  "windows-sys 0.48.0",
 ]
 
@@ -2289,7 +2289,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.38.15",
+ "rustix 0.38.18",
  "windows-sys 0.48.0",
 ]
 
@@ -2646,7 +2646,7 @@ dependencies = [
  "dirs",
  "either",
  "once_cell",
- "rustix 0.38.15",
+ "rustix 0.38.18",
 ]
 
 [[package]]

From 1852292451d984de33ea526b3b7dc7f51c6130eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 18:47:25 +0900
Subject: [PATCH 396/967] build(deps): bump libc from 0.2.148 to 0.2.149
 (#8503)

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

diff --git a/Cargo.lock b/Cargo.lock
index cea0f4858..38d39f498 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1626,9 +1626,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 878dcd1f9..72ddf360c 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -69,7 +69,7 @@ grep-searcher = "0.1.11"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.148"
+libc = "0.2.149"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }

From 07a006d1d5270e81c57bbc0e712614741d3b31a7 Mon Sep 17 00:00:00 2001
From: Bjorn Ove Hay Andersen <bjrnove@gmail.com>
Date: Thu, 12 Oct 2023 10:35:43 +0200
Subject: [PATCH 397/967] Add +N CLI argument to jump to first file's line
 number (#8521)

* Accept +num flag for opening at line number

* Update +N argument feature according to feedback in original PR #5603

* Only override the line number of the first file if +N is specified

---------

Co-authored-by: Nachum Barcohen <38861757+nabaco@users.noreply.github.com>
---
 helix-term/src/args.rs | 14 ++++++++++++++
 helix-term/src/main.rs |  1 +
 2 files changed, 15 insertions(+)

diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
index f782539ca..6a49889b6 100644
--- a/helix-term/src/args.rs
+++ b/helix-term/src/args.rs
@@ -24,6 +24,7 @@ impl Args {
     pub fn parse_args() -> Result<Args> {
         let mut args = Args::default();
         let mut argv = std::env::args().peekable();
+        let mut line_number = 0;
 
         argv.next(); // skip the program, we don't care about that
 
@@ -88,6 +89,13 @@ impl Args {
                         }
                     }
                 }
+                arg if arg.starts_with('+') => {
+                    let arg = &arg[1..];
+                    line_number = match arg.parse::<usize>() {
+                        Ok(n) => n.saturating_sub(1),
+                        _ => anyhow::bail!("bad line number after +"),
+                    };
+                }
                 arg => args.files.push(parse_file(arg)),
             }
         }
@@ -97,6 +105,12 @@ impl Args {
             args.files.push(parse_file(&arg));
         }
 
+        if let Some(file) = args.files.first_mut() {
+            if line_number != 0 {
+                file.1.row = line_number;
+            }
+        }
+
         Ok(args)
     }
 }
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index ed3478ac9..8db5f3100 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -67,6 +67,7 @@ FLAGS:
     --vsplit                       Splits all given files vertically into different windows
     --hsplit                       Splits all given files horizontally into different windows
     -w, --working-dir <path>       Specify an initial working directory
+    +N                             Open the first given file at line number N
 ",
         env!("CARGO_PKG_NAME"),
         VERSION_AND_GIT_HASH,

From 574f82130892d4a388bfdcce63fe2c4a190e479e Mon Sep 17 00:00:00 2001
From: Bjorn Ove Hay Andersen <bjrnove@gmail.com>
Date: Thu, 12 Oct 2023 14:09:57 +0200
Subject: [PATCH 398/967] Make parse_macro work for "-" outside "<..>" (#8475)

* Translate  to   when a part of the outher string in

* Changed the if a little
---
 helix-view/src/input.rs | 60 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index 87a0bfcaa..0f4ffaacf 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -549,7 +549,7 @@ pub fn parse_macro(keys_str: &str) -> anyhow::Result<Vec<KeyEvent>> {
         if c == ">" {
             keys_res = Err(anyhow!("Unmatched '>'"));
         } else if c != "<" {
-            keys.push(c);
+            keys.push(if c == "-" { keys::MINUS } else { c });
             i += end_i;
         } else {
             match s.find('>').context("'>' expected") {
@@ -813,6 +813,64 @@ mod test {
                 },
             ])
         );
+
+        assert_eq!(
+            parse_macro(":w aa-bb.txt<ret>").ok(),
+            Some(vec![
+                KeyEvent {
+                    code: KeyCode::Char(':'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('w'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char(' '),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('a'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('a'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('-'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('b'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('b'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('.'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('t'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('x'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Char('t'),
+                    modifiers: KeyModifiers::NONE,
+                },
+                KeyEvent {
+                    code: KeyCode::Enter,
+                    modifiers: KeyModifiers::NONE,
+                },
+            ])
+        );
     }
 
     #[test]

From 1ef7f24daec1602e39ea9b01b0e1a50fc6623155 Mon Sep 17 00:00:00 2001
From: NomisIV <47303199+NomisIV@users.noreply.github.com>
Date: Fri, 13 Oct 2023 17:08:27 +0200
Subject: [PATCH 399/967] Update purescript-tree-sitter grammar (#8527)

---
 languages.toml                            | 2 +-
 runtime/queries/purescript/highlights.scm | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 24b6cccf9..048c76bb4 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1122,7 +1122,7 @@ formatter = { command = "purs-tidy", args = ["format"] }
 
 [[grammar]]
 name = "purescript"
-source = { git = "https://github.com/maskhjarna/tree-sitter-purescript", rev = "5f5a030826849b7be17596d372967f60051b42bd" }
+source = { git = "https://github.com/maskhjarna/tree-sitter-purescript", rev = "0e36a885a941078bf40e559026be425764dc27bf" }
 
 [[language]]
 name = "zig"
diff --git a/runtime/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
index 86deb48f6..f559fd1ea 100644
--- a/runtime/queries/purescript/highlights.scm
+++ b/runtime/queries/purescript/highlights.scm
@@ -5,7 +5,10 @@
  (exp_negation) @constant.numeric.integer
  (exp_literal (float)) @constant.numeric.float
  (char) @constant.character
- (string) @string
+ [
+   (string)
+   (triple_quote_string)
+ ] @string
 
  (con_unit) @constant.builtin ; unit, as in ()
 

From 9f6e9a151228c3c95cddb9032849625883d2ac8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Gajd=C5=AF=C5=A1ek?= <petr.gajdusek@egston.com>
Date: Fri, 13 Oct 2023 17:08:56 +0200
Subject: [PATCH 400/967] Add 'while_statement' to bash indents (#8528)

---
 runtime/queries/bash/indents.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/bash/indents.scm b/runtime/queries/bash/indents.scm
index f2077037d..7dbf46c54 100644
--- a/runtime/queries/bash/indents.scm
+++ b/runtime/queries/bash/indents.scm
@@ -2,6 +2,7 @@
   (function_definition)
   (if_statement)
   (for_statement)
+  (while_statement)
   (case_statement)
   (pipeline)
 ] @indent

From c6854e5135e4547ee3cad838bc7aa584af0f82f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Aug 2023 00:03:36 +0000
Subject: [PATCH 401/967] build(deps): bump gix from 0.48.0 to 0.51.0

Bumps [gix](https://github.com/Byron/gitoxide) from 0.48.0 to 0.51.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.48.0...gix-v0.51.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock           | 334 +++++++++++++++++++++++++------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 194 insertions(+), 142 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38d39f498..d4ec67abc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -366,6 +366,15 @@ dependencies = [
  "syn 2.0.28",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "dirs"
 version = "5.0.1"
@@ -465,6 +474,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "faster-hex"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.0.0"
@@ -583,9 +601,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.48.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e74cea676de7f53a79f3c0365812b11f6814b81e671b8ee4abae6ca09c7881"
+checksum = "4ce5c049b1afcae9bb9e10c0f6dd8eb1335e8647fb7fd34732a66133ca3b9886"
 dependencies = [
  "gix-actor",
  "gix-attributes",
@@ -595,8 +613,9 @@ dependencies = [
  "gix-date",
  "gix-diff",
  "gix-discover",
- "gix-features",
- "gix-fs",
+ "gix-features 0.32.1",
+ "gix-filter",
+ "gix-fs 0.4.1",
  "gix-glob",
  "gix-hash",
  "gix-hashtable",
@@ -631,9 +650,9 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.23.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1969b77b9ee4cc1755c841987ec6f7622aaca95e952bcafb76973ae59d1b8716"
+checksum = "abd2566c12095a584716f2c16f051850bd8987f57556f1fef4a7cce0300b83d0"
 dependencies = [
  "bstr",
  "btoi",
@@ -645,9 +664,9 @@ dependencies = [
 
 [[package]]
 name = "gix-attributes"
-version = "0.14.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3772b0129dcd1fc73e985bbd08a1482d082097d2915cb1ee31ce8092b8e4434"
+checksum = "63a134a674e39e238bd273326a9815296cc71f867ad5466518da71392cff98ce"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -662,40 +681,40 @@ dependencies = [
 
 [[package]]
 name = "gix-bitmap"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "311e2fa997be6560c564b070c5da2d56d038b645a94e1e5796d5d85a350da33c"
+checksum = "0ccab4bc576844ddb51b78d81b4a42d73e6229660fa614dfc3d3999c874d1959"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39db5ed0fc0a2e9b1b8265993f7efdbc30379dec268f3b91b7af0c2de4672fdd"
+checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-command"
-version = "0.2.6"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb"
+checksum = "3c576cfbf577f72c097b5f88aedea502cd62952bdc1fb3adcab4531d5525a4c7"
 dependencies = [
  "bstr",
 ]
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed42baa50075d41c1a0931074ce1a97c5797c7c6fe7591d9f1f2dcd448532c26"
+checksum = "8219fe6f39588a29dbfb8d1c244b07ee653126edc5b6f3860752c3b5454fa10b"
 dependencies = [
  "bstr",
  "gix-chunk",
- "gix-features",
+ "gix-features 0.32.1",
  "gix-hash",
  "memmap2 0.7.1",
  "thiserror",
@@ -703,31 +722,31 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.25.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "817688c7005a716d9363e267913526adea402dabd947f4ba63842d10cc5132af"
+checksum = "2135b921a699a4c36167148193bea23c653a16ef0686f6a280e383469709a773"
 dependencies = [
  "bstr",
  "gix-config-value",
- "gix-features",
+ "gix-features 0.32.1",
  "gix-glob",
  "gix-path",
  "gix-ref",
  "gix-sec",
  "log",
  "memchr",
- "nom",
  "once_cell",
  "smallvec",
  "thiserror",
  "unicode-bom",
+ "winnow 0.5.17",
 ]
 
 [[package]]
 name = "gix-config-value"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83960be5e99266bcf55dae5a24731bbd39f643bfb68f27e939d6b06836b5b87d"
+checksum = "6e874f41437441c02991dcea76990b9058fadfc54b02ab4dd06ab2218af43897"
 dependencies = [
  "bitflags 2.4.0",
  "bstr",
@@ -738,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "gix-credentials"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a75565e0e6e7f80cfa4eb1b05cc448c6846ddd48dcf413a28875fbc11ee9af"
+checksum = "307d91ec5f7c8e9bfaa217fe30c2e0099101cbe83dbed27a222dbb6def38725f"
 dependencies = [
  "bstr",
  "gix-command",
@@ -754,9 +773,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.7.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9a04a1d2387c955ec91059d56b673000dd24f3c07cad08ed253e36381782bf"
+checksum = "0a825babda995d788e30d306a49dacd1e93d5f5d33d53c7682d0347cef40333c"
 dependencies = [
  "bstr",
  "itoa",
@@ -766,9 +785,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.32.0"
+version = "0.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf5d9b9b521b284ebe53ee69eee33341835ec70edc314f36b2100ea81396121"
+checksum = "9a49d7a9a9ed5ec3428c3061da45d0fc5f50b3c07b91ea4e7ec4959668f25f6c"
 dependencies = [
  "gix-hash",
  "gix-object",
@@ -778,9 +797,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.21.1"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "272aad20dc63dedba76615373dd8885fb5aebe4795e5b5b0aa2a24e63c82085c"
+checksum = "041480eb03d8aa0894d9b73d25d182d51bc4d0ea8925a6ee0c971262bbc7715e"
 dependencies = [
  "bstr",
  "dunce",
@@ -796,6 +815,17 @@ name = "gix-features"
 version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06142d8cff5d17509399b04052b64d2f9b3a311d5cff0b1a32b220f62cd0d595"
+dependencies = [
+ "gix-hash",
+ "gix-trace",
+ "libc",
+]
+
+[[package]]
+name = "gix-features"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882695cccf38da4c3cc7ee687bdb412cf25e37932d7f8f2c306112ea712449f1"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -809,32 +839,61 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "gix-filter"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4d4d61f2ab07de4612f8e078d7f1a443c7ab5c40f382784c8eacdf0fd172b9"
+dependencies = [
+ "bstr",
+ "encoding_rs",
+ "gix-attributes",
+ "gix-command",
+ "gix-hash",
+ "gix-object",
+ "gix-packetline-blocking",
+ "gix-path",
+ "gix-quote",
+ "gix-trace",
+ "smallvec",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-fs"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496"
 dependencies = [
- "gix-features",
+ "gix-features 0.31.1",
+]
+
+[[package]]
+name = "gix-fs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d5b6e9d34a2c61ea4a02bbca94c409ab6dbbca1348cbb67298cd7fed8758761"
+dependencies = [
+ "gix-features 0.32.1",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.9.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c18bdff83143d61e7d60da6183b87542a870d026b2a2d0b30170b8e9c0cd321a"
+checksum = "b7255c717f49a556fa5029f6d9f2b3c008b4dd016c87f23c2ab8ca9636d5fade"
 dependencies = [
  "bitflags 2.4.0",
  "bstr",
- "gix-features",
+ "gix-features 0.32.1",
  "gix-path",
 ]
 
 [[package]]
 name = "gix-hash"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0dd58cdbe7ffa4032fc111864c80d5f8cecd9a2c9736c97ae7e5be834188272"
+checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f"
 dependencies = [
  "hex",
  "thiserror",
@@ -842,9 +901,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e133bc56d938eaec1c675af7c681a51de9662b0ada779f45607b967a10da77a"
+checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d"
 dependencies = [
  "gix-hash",
  "hashbrown 0.14.1",
@@ -853,9 +912,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ignore"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca801f2d0535210f77b33e2c067d565aedecacc82f1b3dbce26da1388ebc4634"
+checksum = "a88b95ceb3bc45abcab6eb55ef4e0053e58b4df0712d3f9aec7d0ca990952603"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -865,16 +924,17 @@ dependencies = [
 
 [[package]]
 name = "gix-index"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68099abdf6ee50ae3c897e8b05de96871cbe54d52a37cdf559101f911b883562"
+checksum = "732f61ec71576bd443a3c24f4716dc7eac180d8929e7bb8603c7310161507106"
 dependencies = [
  "bitflags 2.4.0",
  "bstr",
  "btoi",
  "filetime",
  "gix-bitmap",
- "gix-features",
+ "gix-features 0.32.1",
+ "gix-fs 0.4.1",
  "gix-hash",
  "gix-lock",
  "gix-object",
@@ -898,9 +958,9 @@ dependencies = [
 
 [[package]]
 name = "gix-mailmap"
-version = "0.15.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1787e3c37fc43b1f7c0e3be6196c6837b3ba5f869190dfeaa444b816f0a7f34b"
+checksum = "7fc0dbbf35d29639770af68d7ff55924d83786c8924b0e6a1766af1a98b7d58b"
 dependencies = [
  "bstr",
  "gix-actor",
@@ -910,9 +970,9 @@ dependencies = [
 
 [[package]]
 name = "gix-negotiate"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7bce64d4452dd609f44d04b14b29da2e0ad2c45fcdf4ce1472a5f5f8ec21c2"
+checksum = "ce0061b7ae867e830c77b1ecfc5875f0d042aebb3d7e6014d04fd86ca6c71d59"
 dependencies = [
  "bitflags 2.4.0",
  "gix-commitgraph",
@@ -926,15 +986,15 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.32.0"
+version = "0.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953f3d7ffad16734aa3ab1d05807972c80e339d1bd9dde03e0198716b99e2a6"
+checksum = "bfdd87520c71a19afecfa616863a4b761621074878f5a3999243b3e37e233943"
 dependencies = [
  "bstr",
  "btoi",
  "gix-actor",
  "gix-date",
- "gix-features",
+ "gix-features 0.32.1",
  "gix-hash",
  "gix-validate",
  "hex",
@@ -946,13 +1006,13 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.49.1"
+version = "0.50.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6418cff00ecc2713b58c8e04bff30dda808fbba1a080e7248b299d069894a01"
+checksum = "e827dbda6d3dabadb94cd437d0e0fe8c314a60d136a3235fc6f5bf7b96b976ac"
 dependencies = [
  "arc-swap",
  "gix-date",
- "gix-features",
+ "gix-features 0.32.1",
  "gix-hash",
  "gix-object",
  "gix-pack",
@@ -965,14 +1025,14 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.39.1"
+version = "0.40.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414935138d90043ea5898de7a93f02c2558e52652492719470e203ef26a8fd0a"
+checksum = "46f029a4dce9ac91da35c968c3abdcae573b3e52c123be86cbab3011599de533"
 dependencies = [
  "clru",
  "gix-chunk",
  "gix-diff",
- "gix-features",
+ "gix-features 0.32.1",
  "gix-hash",
  "gix-hashtable",
  "gix-object",
@@ -985,11 +1045,22 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gix-packetline-blocking"
+version = "0.16.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8395f7501c84d6a1fe902035fdfd8cd86d89e2dd6be0200ec1a72fd3c92d39"
+dependencies = [
+ "bstr",
+ "faster-hex",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-path"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfca182d2575ded2ed38280f1ebf75cd5d3790b77e0872de07854cf085821fbe"
+checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -1000,22 +1071,22 @@ dependencies = [
 
 [[package]]
 name = "gix-prompt"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dfd363fd89a40c1e7bff9c9c1b136cd2002480f724b0c627c1bc771cd5480ec"
+checksum = "2c22decaf4a063ccae2b2108820c8630c01bd6756656df3fe464b32b8958a5ea"
 dependencies = [
  "gix-command",
  "gix-config-value",
  "parking_lot",
- "rustix 0.37.15",
+ "rustix",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-quote"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3874de636c2526de26a3405b8024b23ef1a327bebf4845d770d00d48700b6a40"
+checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905"
 dependencies = [
  "bstr",
  "btoi",
@@ -1024,14 +1095,14 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.32.1"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39453f4e5f23cddc2e6e4cca2ba20adfdbec29379e3ca829714dfe98ae068ccd"
+checksum = "25db11edd78bf33043d1969fff51c567a4b30edd77ab44f6f8eb460a4c14985d"
 dependencies = [
  "gix-actor",
  "gix-date",
- "gix-features",
- "gix-fs",
+ "gix-features 0.32.1",
+ "gix-fs 0.4.1",
  "gix-hash",
  "gix-lock",
  "gix-object",
@@ -1045,9 +1116,9 @@ dependencies = [
 
 [[package]]
 name = "gix-refspec"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e76ff1f82fba295a121e31ab02f69642994e532c45c0c899aa393f4b740302"
+checksum = "d19a02bf740b326d6c082a7d6f754ebe56eef900986c5e91be7cf000df9ea18d"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -1059,9 +1130,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237428a7d3978e8572964e1e45d984027c2acc94df47e594baa6c4b0da7c9922"
+checksum = "38a13500890435e3b9e7746bceda248646bfc69e259210884c98e29bb7a1aa6f"
 dependencies = [
  "bstr",
  "gix-date",
@@ -1074,9 +1145,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.3.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028d50fcaf8326a8f79a359490d9ca9fb4e2b51ac9ac86503560d0bcc888d2eb"
+checksum = "71d4cbaf3cfbfde2b81b5ee8b469aff42c34693ce0fe17fc3c244d5085307f2c"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1089,9 +1160,9 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede298863db2a0574a14070991710551e76d1f47c9783b62d4fcbca17f56371c"
+checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7"
 dependencies = [
  "bitflags 2.4.0",
  "gix-path",
@@ -1105,7 +1176,7 @@ version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2"
 dependencies = [
- "gix-fs",
+ "gix-fs 0.3.0",
  "libc",
  "once_cell",
  "parking_lot",
@@ -1116,15 +1187,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "103eac621617be3ebe0605c9065ca51a223279a23218aaf67d10daa6e452f663"
+checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836"
 
 [[package]]
 name = "gix-traverse"
-version = "0.29.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3cdfd54598db4fae57d5ae6f52958422b2d13382d2745796bfe5c8015ffa86e"
+checksum = "e12e0fe428394226c37dd686ad64b09a04b569fe157d638b125b4a4c1e7e2df0"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1138,12 +1209,12 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.20.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beaede6dbc83f408b19adfd95bb52f1dbf01fb8862c3faf6c6243e2e67fcdfa1"
+checksum = "4411bdbd1d46b35ae50e84c191660d437f89974e4236627785024be0b577170a"
 dependencies = [
  "bstr",
- "gix-features",
+ "gix-features 0.32.1",
  "gix-path",
  "home",
  "thiserror",
@@ -1152,18 +1223,18 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7058c94f4164fcf5b8457d35f6d8f6e1007f9f7f938c9c7684a7e01d23c6ddde"
+checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f"
 dependencies = [
  "fastrand",
 ]
 
 [[package]]
 name = "gix-validate"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d092b594c8af00a3a31fe526d363ee8a51a6f29d8496cdb991ed2f01ec0ec13"
+checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040"
 dependencies = [
  "bstr",
  "thiserror",
@@ -1171,15 +1242,16 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree"
-version = "0.21.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1363b9aa66b9e14412ac04e1f759827203f491729d92172535a8ce6cde02efa"
+checksum = "9f8bb6dd57dc6c9dfa03cc2cf2cc0942edae405eb6dfd1c34dbd2be00a90cab2"
 dependencies = [
  "bstr",
  "filetime",
  "gix-attributes",
- "gix-features",
- "gix-fs",
+ "gix-features 0.32.1",
+ "gix-filter",
+ "gix-fs 0.4.1",
  "gix-glob",
  "gix-hash",
  "gix-ignore",
@@ -1455,7 +1527,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot",
- "rustix 0.38.18",
+ "rustix",
  "serde",
  "serde_json",
  "slotmap",
@@ -1475,12 +1547,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1583,17 +1649,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
-dependencies = [
- "hermit-abi 0.3.2",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.6"
@@ -1649,12 +1704,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.10"
@@ -1797,7 +1846,7 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
@@ -1872,6 +1921,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.63"
@@ -2036,20 +2091,6 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
-[[package]]
-name = "rustix"
-version = "0.37.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.4",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.18"
@@ -2059,7 +2100,7 @@ dependencies = [
  "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.10",
+ "linux-raw-sys",
  "windows-sys 0.48.0",
 ]
 
@@ -2289,7 +2330,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.38.18",
+ "rustix",
  "windows-sys 0.48.0",
 ]
 
@@ -2363,13 +2404,15 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.20"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
+ "deranged",
  "itoa",
  "libc",
  "num_threads",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -2377,15 +2420,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.8"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -2477,7 +2520,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.4.6",
 ]
 
 [[package]]
@@ -2646,7 +2689,7 @@ dependencies = [
  "dirs",
  "either",
  "once_cell",
- "rustix 0.38.18",
+ "rustix",
 ]
 
 [[package]]
@@ -2830,6 +2873,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "xtask"
 version = "0.6.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 1b6cd0635..edb6291c9 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -18,7 +18,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
 parking_lot = "0.12"
 arc-swap = { version = "1.6.0" }
 
-gix = { version = "0.48.0", default-features = false , optional = true }
+gix = { version = "0.55.0", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From a6ab062b2dad0da41613113bce7b98353e5de104 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 8 Aug 2023 18:12:14 -0500
Subject: [PATCH 402/967] Re-lock 'time' dep at 0.3.23

Co-authored-by: Gabriel Dinner-David <gabydinnerdavid@gmail.com>
---
 Cargo.lock | 451 +++++++++++------------------------------------------
 1 file changed, 89 insertions(+), 362 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d4ec67abc..a69d2b037 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -366,15 +366,6 @@ dependencies = [
  "syn 2.0.28",
 ]
 
-[[package]]
-name = "deranged"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
-dependencies = [
- "powerfmt",
-]
-
 [[package]]
 name = "dirs"
 version = "5.0.1"
@@ -509,18 +500,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "filetime"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.2.16",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "flate2"
 version = "1.0.27"
@@ -601,37 +580,31 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.51.0"
+version = "0.55.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ce5c049b1afcae9bb9e10c0f6dd8eb1335e8647fb7fd34732a66133ca3b9886"
+checksum = "002667cd1ebb789313d0d0afe3d23b2821cf3b0e91605095f0e6d8751f0ceeea"
 dependencies = [
  "gix-actor",
- "gix-attributes",
  "gix-commitgraph",
  "gix-config",
- "gix-credentials",
  "gix-date",
  "gix-diff",
  "gix-discover",
- "gix-features 0.32.1",
- "gix-filter",
- "gix-fs 0.4.1",
+ "gix-features",
+ "gix-fs",
  "gix-glob",
  "gix-hash",
  "gix-hashtable",
- "gix-ignore",
- "gix-index",
  "gix-lock",
- "gix-mailmap",
- "gix-negotiate",
+ "gix-macros",
  "gix-object",
  "gix-odb",
  "gix-pack",
  "gix-path",
- "gix-prompt",
  "gix-ref",
  "gix-refspec",
  "gix-revision",
+ "gix-revwalk",
  "gix-sec",
  "gix-tempfile",
  "gix-trace",
@@ -639,10 +612,8 @@ dependencies = [
  "gix-url",
  "gix-utils",
  "gix-validate",
- "gix-worktree",
- "log",
  "once_cell",
- "signal-hook",
+ "parking_lot",
  "smallvec",
  "thiserror",
  "unicode-normalization",
@@ -650,42 +621,16 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.24.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd2566c12095a584716f2c16f051850bd8987f57556f1fef4a7cce0300b83d0"
+checksum = "948a5f9e43559d16faf583694f1c742eb401ce24ce8e6f2238caedea7486433c"
 dependencies = [
  "bstr",
  "btoi",
  "gix-date",
  "itoa",
- "nom",
- "thiserror",
-]
-
-[[package]]
-name = "gix-attributes"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63a134a674e39e238bd273326a9815296cc71f867ad5466518da71392cff98ce"
-dependencies = [
- "bstr",
- "gix-glob",
- "gix-path",
- "gix-quote",
- "kstring",
- "log",
- "smallvec",
- "thiserror",
- "unicode-bom",
-]
-
-[[package]]
-name = "gix-bitmap"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ccab4bc576844ddb51b78d81b4a42d73e6229660fa614dfc3d3999c874d1959"
-dependencies = [
  "thiserror",
+ "winnow 0.5.17",
 ]
 
 [[package]]
@@ -697,24 +642,15 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "gix-command"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c576cfbf577f72c097b5f88aedea502cd62952bdc1fb3adcab4531d5525a4c7"
-dependencies = [
- "bstr",
-]
-
 [[package]]
 name = "gix-commitgraph"
-version = "0.18.2"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8219fe6f39588a29dbfb8d1c244b07ee653126edc5b6f3860752c3b5454fa10b"
+checksum = "7e8bc78b1a6328fa6d8b3a53b6c73997af37fd6bfc1d6c49f149e63bda5cbb36"
 dependencies = [
  "bstr",
  "gix-chunk",
- "gix-features 0.32.1",
+ "gix-features",
  "gix-hash",
  "memmap2 0.7.1",
  "thiserror",
@@ -722,18 +658,17 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.26.2"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2135b921a699a4c36167148193bea23c653a16ef0686f6a280e383469709a773"
+checksum = "5cae98c6b4c66c09379bc35274b172587d6b0ac369a416c39128ad8c6454f9bb"
 dependencies = [
  "bstr",
  "gix-config-value",
- "gix-features 0.32.1",
+ "gix-features",
  "gix-glob",
  "gix-path",
  "gix-ref",
  "gix-sec",
- "log",
  "memchr",
  "once_cell",
  "smallvec",
@@ -744,9 +679,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.12.5"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e874f41437441c02991dcea76990b9058fadfc54b02ab4dd06ab2218af43897"
+checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47"
 dependencies = [
  "bitflags 2.4.0",
  "bstr",
@@ -755,27 +690,11 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "gix-credentials"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307d91ec5f7c8e9bfaa217fe30c2e0099101cbe83dbed27a222dbb6def38725f"
-dependencies = [
- "bstr",
- "gix-command",
- "gix-config-value",
- "gix-path",
- "gix-prompt",
- "gix-sec",
- "gix-url",
- "thiserror",
-]
-
 [[package]]
 name = "gix-date"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a825babda995d788e30d306a49dacd1e93d5f5d33d53c7682d0347cef40333c"
+checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d"
 dependencies = [
  "bstr",
  "itoa",
@@ -785,21 +704,20 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.33.1"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49d7a9a9ed5ec3428c3061da45d0fc5f50b3c07b91ea4e7ec4959668f25f6c"
+checksum = "931394f69fb8c9ed6afc0aae3487bd869e936339bcc13ed8884472af072e0554"
 dependencies = [
  "gix-hash",
  "gix-object",
- "imara-diff",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-discover"
-version = "0.22.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "041480eb03d8aa0894d9b73d25d182d51bc4d0ea8925a6ee0c971262bbc7715e"
+checksum = "a45d5cf0321178883e38705ab2b098f625d609a7d4c391b33ac952eff2c490f2"
 dependencies = [
  "bstr",
  "dunce",
@@ -812,20 +730,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06142d8cff5d17509399b04052b64d2f9b3a311d5cff0b1a32b220f62cd0d595"
-dependencies = [
- "gix-hash",
- "gix-trace",
- "libc",
-]
-
-[[package]]
-name = "gix-features"
-version = "0.32.1"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882695cccf38da4c3cc7ee687bdb412cf25e37932d7f8f2c306112ea712449f1"
+checksum = "51f4365ba17c4f218d7fd9ec102b8d2d3cb0ca200a835e81151ace7778aec827"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -839,117 +746,53 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "gix-filter"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4d4d61f2ab07de4612f8e078d7f1a443c7ab5c40f382784c8eacdf0fd172b9"
-dependencies = [
- "bstr",
- "encoding_rs",
- "gix-attributes",
- "gix-command",
- "gix-hash",
- "gix-object",
- "gix-packetline-blocking",
- "gix-path",
- "gix-quote",
- "gix-trace",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gix-fs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496"
-dependencies = [
- "gix-features 0.31.1",
-]
-
 [[package]]
 name = "gix-fs"
-version = "0.4.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5b6e9d34a2c61ea4a02bbca94c409ab6dbbca1348cbb67298cd7fed8758761"
+checksum = "8cd171c0cae97cd0dc57e7b4601cb1ebf596450e263ef3c02be9107272c877bd"
 dependencies = [
- "gix-features 0.32.1",
+ "gix-features",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.10.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7255c717f49a556fa5029f6d9f2b3c008b4dd016c87f23c2ab8ca9636d5fade"
+checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4"
 dependencies = [
  "bitflags 2.4.0",
  "bstr",
- "gix-features 0.32.1",
+ "gix-features",
  "gix-path",
 ]
 
 [[package]]
 name = "gix-hash"
-version = "0.11.4"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f"
+checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60"
 dependencies = [
- "hex",
+ "faster-hex",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-hashtable"
-version = "0.2.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d"
+checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16"
 dependencies = [
  "gix-hash",
  "hashbrown 0.14.1",
  "parking_lot",
 ]
 
-[[package]]
-name = "gix-ignore"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88b95ceb3bc45abcab6eb55ef4e0053e58b4df0712d3f9aec7d0ca990952603"
-dependencies = [
- "bstr",
- "gix-glob",
- "gix-path",
- "unicode-bom",
-]
-
-[[package]]
-name = "gix-index"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732f61ec71576bd443a3c24f4716dc7eac180d8929e7bb8603c7310161507106"
-dependencies = [
- "bitflags 2.4.0",
- "bstr",
- "btoi",
- "filetime",
- "gix-bitmap",
- "gix-features 0.32.1",
- "gix-fs 0.4.1",
- "gix-hash",
- "gix-lock",
- "gix-object",
- "gix-traverse",
- "itoa",
- "memmap2 0.7.1",
- "smallvec",
- "thiserror",
-]
-
 [[package]]
 name = "gix-lock"
-version = "7.0.0"
+version = "11.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "328f50aad713ab606caeaf834459ef915ccdfbb9133ac6cd54616d601aa9249f"
+checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37"
 dependencies = [
  "gix-tempfile",
  "gix-utils",
@@ -957,62 +800,44 @@ dependencies = [
 ]
 
 [[package]]
-name = "gix-mailmap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc0dbbf35d29639770af68d7ff55924d83786c8924b0e6a1766af1a98b7d58b"
-dependencies = [
- "bstr",
- "gix-actor",
- "gix-date",
- "thiserror",
-]
-
-[[package]]
-name = "gix-negotiate"
-version = "0.5.1"
+name = "gix-macros"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce0061b7ae867e830c77b1ecfc5875f0d042aebb3d7e6014d04fd86ca6c71d59"
+checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6"
 dependencies = [
- "bitflags 2.4.0",
- "gix-commitgraph",
- "gix-date",
- "gix-hash",
- "gix-object",
- "gix-revwalk",
- "smallvec",
- "thiserror",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "gix-object"
-version = "0.33.2"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdd87520c71a19afecfa616863a4b761621074878f5a3999243b3e37e233943"
+checksum = "740f2a44267f58770a1cb3a3d01d14e67b089c7136c48d4bddbb3cfd2bf86a51"
 dependencies = [
  "bstr",
  "btoi",
  "gix-actor",
  "gix-date",
- "gix-features 0.32.1",
+ "gix-features",
  "gix-hash",
  "gix-validate",
- "hex",
  "itoa",
- "nom",
  "smallvec",
  "thiserror",
+ "winnow 0.5.17",
 ]
 
 [[package]]
 name = "gix-odb"
-version = "0.50.2"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e827dbda6d3dabadb94cd437d0e0fe8c314a60d136a3235fc6f5bf7b96b976ac"
+checksum = "8630b56cb80d8fa684d383dad006a66401ee8314e12fbf0e566ddad8c115143b"
 dependencies = [
  "arc-swap",
  "gix-date",
- "gix-features 0.32.1",
+ "gix-features",
  "gix-hash",
  "gix-object",
  "gix-pack",
@@ -1025,42 +850,29 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.40.2"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f029a4dce9ac91da35c968c3abdcae573b3e52c123be86cbab3011599de533"
+checksum = "1431ba2e30deff1405920693d54ab231c88d7c240dd6ccc936ee223d8f8697c3"
 dependencies = [
  "clru",
  "gix-chunk",
- "gix-diff",
- "gix-features 0.32.1",
+ "gix-features",
  "gix-hash",
  "gix-hashtable",
  "gix-object",
  "gix-path",
  "gix-tempfile",
- "gix-traverse",
  "memmap2 0.7.1",
  "parking_lot",
  "smallvec",
  "thiserror",
 ]
 
-[[package]]
-name = "gix-packetline-blocking"
-version = "0.16.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d8395f7501c84d6a1fe902035fdfd8cd86d89e2dd6be0200ec1a72fd3c92d39"
-dependencies = [
- "bstr",
- "faster-hex",
- "thiserror",
-]
-
 [[package]]
 name = "gix-path"
-version = "0.8.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c"
+checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -1069,19 +881,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "gix-prompt"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c22decaf4a063ccae2b2108820c8630c01bd6756656df3fe464b32b8958a5ea"
-dependencies = [
- "gix-command",
- "gix-config-value",
- "parking_lot",
- "rustix",
- "thiserror",
-]
-
 [[package]]
 name = "gix-quote"
 version = "0.4.7"
@@ -1095,14 +894,14 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.33.3"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db11edd78bf33043d1969fff51c567a4b30edd77ab44f6f8eb460a4c14985d"
+checksum = "0ec2f6d07ac88d2fb8007ee3fa3e801856fb9d82e7366ec0ca332eb2c9d74a52"
 dependencies = [
  "gix-actor",
  "gix-date",
- "gix-features 0.32.1",
- "gix-fs 0.4.1",
+ "gix-features",
+ "gix-fs",
  "gix-hash",
  "gix-lock",
  "gix-object",
@@ -1110,15 +909,15 @@ dependencies = [
  "gix-tempfile",
  "gix-validate",
  "memmap2 0.7.1",
- "nom",
  "thiserror",
+ "winnow 0.5.17",
 ]
 
 [[package]]
 name = "gix-refspec"
-version = "0.14.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19a02bf740b326d6c082a7d6f754ebe56eef900986c5e91be7cf000df9ea18d"
+checksum = "ccb0974cc41dbdb43a180c7f67aa481e1c1e160fcfa8f4a55291fd1126c1a6e7"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -1130,9 +929,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.18.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a13500890435e3b9e7746bceda248646bfc69e259210884c98e29bb7a1aa6f"
+checksum = "2ca97ac73459a7f3766aa4a5638a6e37d56d4c7962bc1986fbaf4883d0772588"
 dependencies = [
  "bstr",
  "gix-date",
@@ -1140,14 +939,15 @@ dependencies = [
  "gix-hashtable",
  "gix-object",
  "gix-revwalk",
+ "gix-trace",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-revwalk"
-version = "0.4.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d4cbaf3cfbfde2b81b5ee8b469aff42c34693ce0fe17fc3c244d5085307f2c"
+checksum = "a16d8c892e4cd676d86f0265bf9d40cefd73d8d94f86b213b8b77d50e77efae0"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1160,9 +960,9 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.8.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7"
+checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28"
 dependencies = [
  "bitflags 2.4.0",
  "gix-path",
@@ -1172,16 +972,14 @@ dependencies = [
 
 [[package]]
 name = "gix-tempfile"
-version = "7.0.0"
+version = "11.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2"
+checksum = "05cc2205cf10d99f70b96e04e16c55d4c7cf33efc151df1f793e29fd12a931f8"
 dependencies = [
- "gix-fs 0.3.0",
+ "gix-fs",
  "libc",
  "once_cell",
  "parking_lot",
- "signal-hook",
- "signal-hook-registry",
  "tempfile",
 ]
 
@@ -1193,9 +991,9 @@ checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836"
 
 [[package]]
 name = "gix-traverse"
-version = "0.30.1"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12e0fe428394226c37dd686ad64b09a04b569fe157d638b125b4a4c1e7e2df0"
+checksum = "14d050ec7d4e1bb76abf0636cf4104fb915b70e54e3ced9a4427c999100ff38a"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1209,12 +1007,12 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.21.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4411bdbd1d46b35ae50e84c191660d437f89974e4236627785024be0b577170a"
+checksum = "b1b9ac8ed32ad45f9fc6c5f8c0be2ed911e544a5a19afd62d95d524ebaa95671"
 dependencies = [
  "bstr",
- "gix-features 0.32.1",
+ "gix-features",
  "gix-path",
  "home",
  "thiserror",
@@ -1232,33 +1030,11 @@ dependencies = [
 
 [[package]]
 name = "gix-validate"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040"
-dependencies = [
- "bstr",
- "thiserror",
-]
-
-[[package]]
-name = "gix-worktree"
-version = "0.23.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f8bb6dd57dc6c9dfa03cc2cf2cc0942edae405eb6dfd1c34dbd2be00a90cab2"
+checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5"
 dependencies = [
  "bstr",
- "filetime",
- "gix-attributes",
- "gix-features 0.32.1",
- "gix-filter",
- "gix-fs 0.4.1",
- "gix-glob",
- "gix-hash",
- "gix-ignore",
- "gix-index",
- "gix-object",
- "gix-path",
- "io-close",
  "thiserror",
 ]
 
@@ -1547,12 +1323,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "home"
 version = "0.5.4"
@@ -1639,16 +1409,6 @@ version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
 
-[[package]]
-name = "io-close"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.6"
@@ -1664,15 +1424,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "kstring"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
-dependencies = [
- "static_assertions",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1772,12 +1523,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -1799,16 +1544,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "nucleo"
 version = "0.2.1"
@@ -1921,12 +1656,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.63"
@@ -1938,9 +1667,9 @@ dependencies = [
 
 [[package]]
 name = "prodash"
-version = "25.0.0"
+version = "26.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3236ce1618b6da4c7b618e0143c4d5b5dc190f75f81c49f248221382f7e9e9ae"
+checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf"
 
 [[package]]
 name = "pulldown-cmark"
@@ -2404,15 +2133,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
 dependencies = [
- "deranged",
  "itoa",
  "libc",
  "num_threads",
- "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -2420,15 +2147,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
 dependencies = [
  "time-core",
 ]

From 7c98b1c8293139e0ddbd8a71bdc350f5e0cef41c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 8 Aug 2023 18:13:57 -0500
Subject: [PATCH 403/967] Fix 'Tree::lookup_entry_by_path' usage

---
 helix-vcs/src/git.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs
index cd28d5e48..88dba70c8 100644
--- a/helix-vcs/src/git.rs
+++ b/helix-vcs/src/git.rs
@@ -126,7 +126,7 @@ fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Resul
     let rel_path = file.strip_prefix(repo_dir)?;
     let tree = commit.tree()?;
     let tree_entry = tree
-        .lookup_entry_by_path(rel_path)?
+        .lookup_entry_by_path(rel_path, &mut Vec::new())?
         .context("file is untracked")?;
     match tree_entry.mode() {
         // not a file, everything is new, do not show diff

From d9d7f67898a09816f51e9a699975a97734ec114f Mon Sep 17 00:00:00 2001
From: Lorenzo Bellina <59364991+TheRealLorenz@users.noreply.github.com>
Date: Mon, 16 Oct 2023 11:42:25 +0200
Subject: [PATCH 404/967] Add support for showing all LSPs in --health (#7315)

* Add support for showing all LSPs in --health <lang>

* Add support for showing all LSPs in --health languages

* Use available/configured in --health languages

* Apply @AlexanderBrevig suggestion in --health

* Update `--health <language>`

Better output (inspired by #8156).

Handle the case where no LSPs are configured.

* Display all LSPs in `--health languages` instead of x/x

Displays all LSPs as a list in the table generated wih `--health languages`

* Make check_binary accept Optional references to str

Avoids some calls to .clone()

* Apply @the-mikedavis suggestions

* Avoid useless collecting and cloning

* Use for loop instead of .try_for_each()
---
 helix-term/src/health.rs | 60 +++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
index 8f9218777..dff903192 100644
--- a/helix-term/src/health.rs
+++ b/helix-term/src/health.rs
@@ -181,8 +181,8 @@ pub fn languages_all() -> std::io::Result<()> {
         .language
         .sort_unstable_by_key(|l| l.language_id.clone());
 
-    let check_binary = |cmd: Option<String>| match cmd {
-        Some(cmd) => match which::which(&cmd) {
+    let check_binary = |cmd: Option<&str>| match cmd {
+        Some(cmd) => match which::which(cmd) {
             Ok(_) => column(&format!("✓ {}", cmd), Color::Green),
             Err(_) => column(&format!("✘ {}", cmd), Color::Red),
         },
@@ -192,17 +192,15 @@ pub fn languages_all() -> std::io::Result<()> {
     for lang in &syn_loader_conf.language {
         column(&lang.language_id, Color::Reset);
 
-        // TODO multiple language servers (check binary for each supported language server, not just the first)
-
-        let lsp = lang.language_servers.first().and_then(|ls| {
+        let mut cmds = lang.language_servers.iter().filter_map(|ls| {
             syn_loader_conf
                 .language_server
                 .get(&ls.name)
-                .map(|config| config.command.clone())
+                .map(|config| config.command.as_str())
         });
-        check_binary(lsp);
+        check_binary(cmds.next());
 
-        let dap = lang.debugger.as_ref().map(|dap| dap.command.to_string());
+        let dap = lang.debugger.as_ref().map(|dap| dap.command.as_str());
         check_binary(dap);
 
         for ts_feat in TsFeature::all() {
@@ -213,6 +211,12 @@ pub fn languages_all() -> std::io::Result<()> {
         }
 
         writeln!(stdout)?;
+
+        for cmd in cmds {
+            column("", Color::Reset);
+            check_binary(Some(cmd));
+            writeln!(stdout)?;
+        }
     }
 
     Ok(())
@@ -268,15 +272,12 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
         }
     };
 
-    // TODO multiple language servers
-    probe_protocol(
+    probe_protocols(
         "language server",
-        lang.language_servers.first().and_then(|ls| {
-            syn_loader_conf
-                .language_server
-                .get(&ls.name)
-                .map(|config| config.command.clone())
-        }),
+        lang.language_servers
+            .iter()
+            .filter_map(|ls| syn_loader_conf.language_server.get(&ls.name))
+            .map(|config| config.command.as_str()),
     )?;
 
     probe_protocol(
@@ -291,6 +292,33 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
     Ok(())
 }
 
+/// Display diagnostics about multiple LSPs and DAPs.
+fn probe_protocols<'a, I: Iterator<Item = &'a str> + 'a>(
+    protocol_name: &str,
+    server_cmds: I,
+) -> std::io::Result<()> {
+    let stdout = std::io::stdout();
+    let mut stdout = stdout.lock();
+    let mut server_cmds = server_cmds.peekable();
+
+    write!(stdout, "Configured {}s:", protocol_name)?;
+    if server_cmds.peek().is_none() {
+        writeln!(stdout, "{}", " None".yellow())?;
+        return Ok(());
+    }
+    writeln!(stdout)?;
+
+    for cmd in server_cmds {
+        let (path, icon) = match which::which(cmd) {
+            Ok(path) => (path.display().to_string().green(), "✓".green()),
+            Err(_) => (format!("'{}' not found in $PATH", cmd).red(), "✘".red()),
+        };
+        writeln!(stdout, "  {} {}: {}", icon, cmd, path)?;
+    }
+
+    Ok(())
+}
+
 /// Display diagnostics about LSP and DAP.
 fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::Result<()> {
     let stdout = std::io::stdout();

From cd591647ec93843d0f8d523253cd2ee3993f7e28 Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:07:00 +0200
Subject: [PATCH 405/967] fix(lsp): ensure we only highlight diagnostics for
 lsp with the feature enabled (#8551)

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

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index dd6fff087..31195a4e5 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -365,7 +365,7 @@ impl EditorView {
         let mut warning_vec = Vec::new();
         let mut error_vec = Vec::new();
 
-        for diagnostic in doc.diagnostics() {
+        for diagnostic in doc.shown_diagnostics() {
             // Separate diagnostics into different Vecs by severity.
             let (vec, scope) = match diagnostic.severity {
                 Some(Severity::Info) => (&mut info_vec, info),

From 814cf177d470e9890e5d62ecf46ff2f9cf3ed75a Mon Sep 17 00:00:00 2001
From: Ryan Mehri <52933714+rmehri01@users.noreply.github.com>
Date: Tue, 17 Oct 2023 03:19:57 -0700
Subject: [PATCH 406/967] bump tree-sitter-haskell and update queries (#8558)

---
 languages.toml                         |  2 +-
 runtime/queries/haskell/highlights.scm | 35 ++++++++++++++++++--------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/languages.toml b/languages.toml
index 048c76bb4..cf2783de9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1094,7 +1094,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "haskell"
-source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "98fc7f59049aeb713ab9b72a8ff25dcaaef81087" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3" }
 
 [[language]]
 name = "haskell-persistent"
diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index 5009f3b51..18c57c930 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -33,6 +33,11 @@
 ;; ----------------------------------------------------------------------------
 ;; Keywords, operators, includes
 
+[
+  "forall"
+  "∀"
+] @keyword.control.repeat
+
 (pragma) @constant.macro
 
 [
@@ -68,10 +73,7 @@
   "@"
 ] @operator
 
-(qualified_module (module) @constructor)
-(qualified_type (module) @namespace)
-(qualified_variable (module) @namespace)
-(import (module) @namespace)
+(module) @namespace
 
 [
   (where)
@@ -92,8 +94,6 @@
   "do"
   "mdo"
   "rec"
-  "forall"
-  "∀"
   "infix"
   "infixl"
   "infixr"
@@ -104,22 +104,35 @@
 ;; Functions and variables
 
 (signature name: (variable) @type)
-(function name: (variable) @function)
-
-(variable) @variable
-"_" @variable.builtin
+(function
+  name: (variable) @function
+  patterns: (patterns))
+((signature (fun)) . (function (variable) @function))
+((signature (context (fun))) . (function (variable) @function))
+((signature (forall (context (fun)))) . (function (variable) @function))
 
 (exp_infix (variable) @operator)  ; consider infix functions as operators
 
-("@" @namespace)  ; "as" pattern operator, e.g. x@Constructor
+(exp_infix (exp_name) @function)
+(exp_apply . (exp_name (variable) @function))
+(exp_apply . (exp_name (qualified_variable (variable) @function)))
 
+(variable) @variable
+(pat_wildcard) @variable
 
 ;; ----------------------------------------------------------------------------
 ;; Types
 
 (type) @type
+(type_variable) @type
 
 (constructor) @constructor
 
 ; True or False
 ((constructor) @_bool (#match? @_bool "(True|False)")) @constant.builtin.boolean
+
+;; ----------------------------------------------------------------------------
+;; Quasi-quotes
+
+(quoter) @function
+; Highlighting of quasiquote_body is handled by injections.scm

From 83ce8d0c5d6cccf4d9c43075377ed9b91a5aa606 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:20:20 +0200
Subject: [PATCH 407/967] build(deps): bump regex from 1.9.6 to 1.10.2 (#8557)

Bumps [regex](https://github.com/rust-lang/regex) from 1.9.6 to 1.10.2.
- [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.9.6...1.10.2)

---
updated-dependencies:
- dependency-name: regex
  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 | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a69d2b037..589a1caf8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -120,7 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
- "regex-automata",
+ "regex-automata 0.3.9",
  "serde",
 ]
 
@@ -1771,14 +1771,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.6"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
- "regex-automata",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -1786,10 +1786,16 @@ name = "regex-automata"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick 1.0.2",
  "memchr",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -1800,9 +1806,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "ropey"

From fc16449efe58a49c15e19c9fde6584d8625493fd Mon Sep 17 00:00:00 2001
From: Joe-Zer0 <70542456+Joe-Zer0@users.noreply.github.com>
Date: Tue, 17 Oct 2023 05:46:28 -0500
Subject: [PATCH 408/967] Add nord night theme (#8549)

---
 runtime/themes/nord-night.toml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 runtime/themes/nord-night.toml

diff --git a/runtime/themes/nord-night.toml b/runtime/themes/nord-night.toml
new file mode 100644
index 000000000..b759738bd
--- /dev/null
+++ b/runtime/themes/nord-night.toml
@@ -0,0 +1,23 @@
+# Nord Night
+#
+# Based on the Nord theme, with minor modifications.
+# The Background and the Primary Text color have been slightly darkened.
+# The Aurora color palette has been used more generously.
+
+inherits = 'nord'
+
+'constant' = 'nord13'
+'constant.builtin.boolean' = 'nord13'
+'constant.numeric' = 'nord13'
+
+'keyword.control' = 'nord11'
+'keyword.control.conditional' = 'nord11'
+'keyword.control.exception' = 'nord11'
+'keyword.control.repeat' = 'nord11'
+'keyword.control.return' = 'nord11'
+
+'variable.parameter' = 'nord15'
+
+[palette]
+nord0 = '#252933'
+nord4 = '#C0C5CF'

From e6d2835b0907102831a8979688a8464c064ff842 Mon Sep 17 00:00:00 2001
From: Bjorn Ove Hay Andersen <bjrnove@gmail.com>
Date: Wed, 18 Oct 2023 10:45:05 +0200
Subject: [PATCH 409/967] Fixed issue when the first file specified as an
 argument was a relative directory (#8520)

---
 helix-term/src/application.rs    |  3 +--
 helix-term/src/args.rs           |  1 +
 helix-term/src/main.rs           | 10 +++++++---
 helix-term/tests/test/helpers.rs |  8 ++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index fabd0fa4d..43e1cdfc9 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -162,8 +162,7 @@ impl Application {
             // Unset path to prevent accidentally saving to the original tutor file.
             doc_mut!(editor).set_path(None);
         } else if !args.files.is_empty() {
-            let first = &args.files[0].0; // we know it's not empty
-            if first.is_dir() {
+            if args.open_cwd {
                 // NOTE: The working directory is already set to args.files[0] in main()
                 editor.new_file(Action::VerticalSplit);
                 let picker = ui::file_picker(".".into(), &config.load().editor);
diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
index 6a49889b6..99ce39926 100644
--- a/helix-term/src/args.rs
+++ b/helix-term/src/args.rs
@@ -17,6 +17,7 @@ pub struct Args {
     pub log_file: Option<PathBuf>,
     pub config_file: Option<PathBuf>,
     pub files: Vec<(PathBuf, Position)>,
+    pub open_cwd: bool,
     pub working_directory: Option<PathBuf>,
 }
 
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 8db5f3100..6411a7c5f 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -76,7 +76,7 @@ FLAGS:
         helix_loader::default_log_file().display(),
     );
 
-    let args = Args::parse_args().context("could not parse arguments")?;
+    let mut args = Args::parse_args().context("could not parse arguments")?;
 
     helix_loader::initialize_config_file(args.config_file.clone());
     helix_loader::initialize_log_file(args.log_file.clone());
@@ -118,10 +118,14 @@ FLAGS:
 
     // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
     // Application::new() depends on this logic so it must be updated if this changes.
-    if let Some((path, true)) = args.files.first().map(|(path, _)| (path, path.is_dir())) {
+    if let Some(path) = &args.working_directory {
         helix_loader::set_current_working_dir(path)?;
-    } else if let Some(path) = &args.working_directory {
+    }
+
+    // If the first file is a directory, it will be the working directory and a file picker will be opened
+    if let Some((path, _)) = args.files.first().filter(|p| p.0.is_dir()) {
         helix_loader::set_current_working_dir(path)?;
+        args.open_cwd = true; // Signal Application that we want to open the picker on "."
     }
 
     let config = match Config::load_default() {
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index e6762baf9..112b5e358 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -320,6 +320,14 @@ impl AppBuilder {
     }
 
     pub fn build(self) -> anyhow::Result<Application> {
+        if let Some(path) = &self.args.working_directory {
+            bail!("Changing the working directory to {path:?} is not yet supported for integration tests");
+        }
+
+        if let Some((path, _)) = self.args.files.first().filter(|p| p.0.is_dir()) {
+            bail!("Having the directory {path:?} in args.files[0] is not yet supported for integration tests");
+        }
+
         let mut app = Application::new(self.args, self.config, self.syn_conf)?;
 
         if let Some((text, selection)) = self.input {

From 7d5bc9b87860b7fbbee0fa4e54e14a22d3ef51b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Oct 2023 22:55:42 +0900
Subject: [PATCH 410/967] build(deps): bump serde from 1.0.188 to 1.0.189
 (#8554)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.188 to 1.0.189.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.188...v1.0.189)

---
updated-dependencies:
- dependency-name: serde
  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 589a1caf8..806ade651 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1868,18 +1868,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",

From ac8759c0c92c4ae257d9e687cb3f748ac773df28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Oct 2023 22:56:07 +0900
Subject: [PATCH 411/967] build(deps): bump bitflags from 2.4.0 to 2.4.1
 (#8555)

Bumps [bitflags](https://github.com/bitflags/bitflags) from 2.4.0 to 2.4.1.
- [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.0...2.4.1)

---
updated-dependencies:
- dependency-name: bitflags
  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 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 806ade651..8d2de2762 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,9 +109,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bstr"
@@ -301,7 +301,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "crossterm_winapi",
  "filedescriptor",
  "futures-core",
@@ -683,7 +683,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "bstr",
  "gix-path",
  "libc",
@@ -761,7 +761,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "bstr",
  "gix-features",
  "gix-path",
@@ -964,7 +964,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "gix-path",
  "libc",
  "windows",
@@ -1112,7 +1112,7 @@ version = "0.6.0"
 dependencies = [
  "ahash",
  "arc-swap",
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "chrono",
  "dunce",
  "encoding_rs",
@@ -1253,7 +1253,7 @@ dependencies = [
 name = "helix-tui"
 version = "0.6.0"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "cassowary",
  "crossterm",
  "helix-core",
@@ -1287,7 +1287,7 @@ version = "0.6.0"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "chardetng",
  "clipboard-win",
  "crossterm",
@@ -1832,7 +1832,7 @@ version = "0.38.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",

From 6d598d32398943718b4943a452ae6dd8490fa439 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Oct 2023 22:56:28 +0900
Subject: [PATCH 412/967] build(deps): bump rustix from 0.38.18 to 0.38.19
 (#8556)

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.18 to 0.38.19.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.18...v0.38.19)

---
updated-dependencies:
- dependency-name: rustix
  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 8d2de2762..ab6f40347 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1828,9 +1828,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.18"
+version = "0.38.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
+checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
 dependencies = [
  "bitflags 2.4.1",
  "errno",

From 8d44459c6ab1e1c7f26c8da4e6afafdb439c8450 Mon Sep 17 00:00:00 2001
From: Paul Olteanu <p.a.olteanu@gmail.com>
Date: Sat, 21 Oct 2023 05:20:29 -0400
Subject: [PATCH 413/967] Add helix-specific ignore files (#8099)

---
 helix-term/src/commands.rs | 137 +++++++++++++++++++------------------
 helix-term/src/ui/mod.rs   |   3 +
 2 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0fd011cc9..75df430a3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2184,7 +2184,10 @@ fn global_search(cx: &mut Context) {
                     let searcher = SearcherBuilder::new()
                         .binary_detection(BinaryDetection::quit(b'\x00'))
                         .build();
-                    WalkBuilder::new(search_root)
+
+                    let mut walk_builder = WalkBuilder::new(search_root);
+
+                    walk_builder
                         .hidden(file_picker_config.hidden)
                         .parents(file_picker_config.parents)
                         .ignore(file_picker_config.ignore)
@@ -2195,73 +2198,77 @@ fn global_search(cx: &mut Context) {
                         .max_depth(file_picker_config.max_depth)
                         .filter_entry(move |entry| {
                             filter_picker_entry(entry, &absolute_root, dedup_symlinks)
-                        })
-                        .build_parallel()
-                        .run(|| {
-                            let mut searcher = searcher.clone();
-                            let matcher = matcher.clone();
-                            let injector = injector_.clone();
-                            let documents = &documents;
-                            Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
-                                let entry = match entry {
-                                    Ok(entry) => entry,
-                                    Err(_) => return WalkState::Continue,
-                                };
-
-                                match entry.file_type() {
-                                    Some(entry) if entry.is_file() => {}
-                                    // skip everything else
-                                    _ => return WalkState::Continue,
-                                };
-
-                                let mut stop = false;
-                                let sink = sinks::UTF8(|line_num, _| {
-                                    stop = injector
-                                        .push(FileResult::new(entry.path(), line_num as usize - 1))
-                                        .is_err();
-
-                                    Ok(!stop)
-                                });
-                                let doc = documents.iter().find(|&(doc_path, _)| {
-                                    doc_path
-                                        .as_ref()
-                                        .map_or(false, |doc_path| doc_path == entry.path())
-                                });
-
-                                let result = if let Some((_, doc)) = doc {
-                                    // there is already a buffer for this file
-                                    // search the buffer instead of the file because it's faster
-                                    // and captures new edits without requiring a save
-                                    if searcher.multi_line_with_matcher(&matcher) {
-                                        // in this case a continous buffer is required
-                                        // convert the rope to a string
-                                        let text = doc.to_string();
-                                        searcher.search_slice(&matcher, text.as_bytes(), sink)
-                                    } else {
-                                        searcher.search_reader(
-                                            &matcher,
-                                            RopeReader::new(doc.slice(..)),
-                                            sink,
-                                        )
-                                    }
-                                } else {
-                                    searcher.search_path(&matcher, entry.path(), sink)
-                                };
+                        });
 
-                                if let Err(err) = result {
-                                    log::error!(
-                                        "Global search error: {}, {}",
-                                        entry.path().display(),
-                                        err
-                                    );
-                                }
-                                if stop {
-                                    WalkState::Quit
+                    walk_builder
+                        .add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
+                    walk_builder.add_custom_ignore_filename(".helix/ignore");
+
+                    walk_builder.build_parallel().run(|| {
+                        let mut searcher = searcher.clone();
+                        let matcher = matcher.clone();
+                        let injector = injector_.clone();
+                        let documents = &documents;
+                        Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
+                            let entry = match entry {
+                                Ok(entry) => entry,
+                                Err(_) => return WalkState::Continue,
+                            };
+
+                            match entry.file_type() {
+                                Some(entry) if entry.is_file() => {}
+                                // skip everything else
+                                _ => return WalkState::Continue,
+                            };
+
+                            let mut stop = false;
+                            let sink = sinks::UTF8(|line_num, _| {
+                                stop = injector
+                                    .push(FileResult::new(entry.path(), line_num as usize - 1))
+                                    .is_err();
+
+                                Ok(!stop)
+                            });
+                            let doc = documents.iter().find(|&(doc_path, _)| {
+                                doc_path
+                                    .as_ref()
+                                    .map_or(false, |doc_path| doc_path == entry.path())
+                            });
+
+                            let result = if let Some((_, doc)) = doc {
+                                // there is already a buffer for this file
+                                // search the buffer instead of the file because it's faster
+                                // and captures new edits without requiring a save
+                                if searcher.multi_line_with_matcher(&matcher) {
+                                    // in this case a continous buffer is required
+                                    // convert the rope to a string
+                                    let text = doc.to_string();
+                                    searcher.search_slice(&matcher, text.as_bytes(), sink)
                                 } else {
-                                    WalkState::Continue
+                                    searcher.search_reader(
+                                        &matcher,
+                                        RopeReader::new(doc.slice(..)),
+                                        sink,
+                                    )
                                 }
-                            })
-                        });
+                            } else {
+                                searcher.search_path(&matcher, entry.path(), sink)
+                            };
+
+                            if let Err(err) = result {
+                                log::error!(
+                                    "Global search error: {}, {}",
+                                    entry.path().display(),
+                                    err
+                                );
+                            }
+                            if stop {
+                                WalkState::Quit
+                            } else {
+                                WalkState::Continue
+                            }
+                        })
+                    });
                 });
 
                 cx.jobs.callback(async move {
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 12ac1783c..660bbfea3 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -177,6 +177,9 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
         .max_depth(config.file_picker.max_depth)
         .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
 
+    walk_builder.add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
+    walk_builder.add_custom_ignore_filename(".helix/ignore");
+
     // We want to exclude files that the editor can't handle yet
     let mut type_builder = TypesBuilder::new();
     type_builder

From 764715a6c069754b852ed9e8d98aaf7efd88abe6 Mon Sep 17 00:00:00 2001
From: rsteube <rsteube@users.noreply.github.com>
Date: Sat, 21 Oct 2023 14:15:18 +0200
Subject: [PATCH 414/967] languages: add templ (#8540)

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

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 429f54f55..6fdc6f115 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -155,6 +155,7 @@
 | t32 | ✓ |  |  |  |
 | tablegen | ✓ | ✓ | ✓ |  |
 | task | ✓ |  |  |  |
+| templ | ✓ |  |  | `templ` |
 | tfvars | ✓ |  | ✓ | `terraform-ls` |
 | todotxt | ✓ |  |  |  |
 | toml | ✓ |  |  | `taplo` |
diff --git a/languages.toml b/languages.toml
index cf2783de9..77c629e49 100644
--- a/languages.toml
+++ b/languages.toml
@@ -74,6 +74,7 @@ svlangserver = { command = "svlangserver", args = [] }
 swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
 tailwindcss-ls = { command = "tailwindcss-language-server", args = ["--stdio"] }
 taplo = { command = "taplo", args = ["lsp", "stdio"] }
+templ = { command = "templ", args = ["lsp"] }
 terraform-ls = { command = "terraform-ls", args = ["serve"] }
 texlab = { command = "texlab" }
 vala-language-server = { command = "vala-language-server" }
@@ -2998,3 +2999,16 @@ roots = []
 [[grammar]]
 name = "gemini"
 source = { git = "https://git.sr.ht/~sfr/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
+
+[[language]]
+name = "templ"
+scope = "source.templ"
+file-types = ["templ"]
+roots = ["go.work", "go.mod"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+language-servers = [ "templ" ]
+
+[[grammar]]
+name = "templ"
+source = { git = "https://github.com/vrischmann/tree-sitter-templ", rev = "ea56ac0655243490a4929a988f4eaa91dfccc995" }
diff --git a/runtime/queries/templ/highlights.scm b/runtime/queries/templ/highlights.scm
new file mode 100644
index 000000000..e5b2ede01
--- /dev/null
+++ b/runtime/queries/templ/highlights.scm
@@ -0,0 +1,99 @@
+(package_identifier) @namespace
+
+(parameter_declaration (identifier) @variable.parameter)
+(variadic_parameter_declaration (identifier) @variable.parameter)
+
+(function_declaration
+  name: (identifier) @function)
+
+(type_spec name: (type_identifier) @type)
+(type_identifier) @type
+(field_identifier) @variable.other.member
+(identifier) @variable
+
+; Function calls
+
+(call_expression
+  function: (identifier) @function)
+
+(call_expression
+  function: (selector_expression
+    field: (field_identifier) @function))
+
+;
+; These are Templ specific
+;
+
+(component_declaration
+  name: (component_identifier) @function)
+
+(tag_start) @tag
+(tag_end) @tag
+(self_closing_tag) @tag
+(style_element) @tag
+
+(attribute
+  name: (attribute_name) @attribute)
+(attribute
+  value: (quoted_attribute_value) @string)
+
+(element_text) @string.special
+(style_element_text) @string.special
+
+(css_property
+  name: (css_property_name) @attribute)
+
+(expression) @function.method
+(dynamic_class_attribute_value) @function.method
+
+(component_import
+  name: (component_identifier) @function)
+
+(component_render) @function
+
+[
+  "@"
+] @operator
+
+[
+  "func"
+  "var"
+  "const"
+  "templ"
+  "css"
+  "type"
+  "struct"
+  "range"
+  "script"
+] @keyword.storage.type
+
+[
+  "return"
+] @keyword.control.return
+
+[
+  "import"
+  "package"
+] @keyword.control.import
+
+[
+  "else"
+  "case"
+  "switch"
+  "if"
+  "default"
+] @keyword.control.conditional
+
+"for" @keyword.control.repeat
+
+[
+  (interpreted_string_literal)
+  (raw_string_literal)
+  (rune_literal)
+] @string
+
+; Comments
+
+(comment) @comment
+
+(element_comment) @comment
diff --git a/runtime/queries/templ/injections.scm b/runtime/queries/templ/injections.scm
new file mode 100644
index 000000000..4dd5a6305
--- /dev/null
+++ b/runtime/queries/templ/injections.scm
@@ -0,0 +1,4 @@
+((script_block_text) @injection.content (#set! injection.language "javascript"))
+((script_element_text) @injection.content (#set! injection.language "javascript"))
+
+((style_element_text) @injection.content (#set! injection.language "css"))

From 31f50bf5bf0d49af7359533e0865e878184c5225 Mon Sep 17 00:00:00 2001
From: Stephen Seo <seo.disparate@gmail.com>
Date: Sat, 21 Oct 2023 21:58:36 +0900
Subject: [PATCH 415/967] don't break on hyphen with :reflow (#8569)

---
 helix-core/src/wrap.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/wrap.rs b/helix-core/src/wrap.rs
index 2ba8d173e..f32d6f4bc 100644
--- a/helix-core/src/wrap.rs
+++ b/helix-core/src/wrap.rs
@@ -1,7 +1,9 @@
 use smartstring::{LazyCompact, SmartString};
+use textwrap::{Options, WordSplitter::NoHyphenation};
 
 /// Given a slice of text, return the text re-wrapped to fit it
 /// within the given width.
 pub fn reflow_hard_wrap(text: &str, text_width: usize) -> SmartString<LazyCompact> {
-    textwrap::refill(text, text_width).into()
+    let options = Options::new(text_width).word_splitter(NoHyphenation);
+    textwrap::refill(text, options).into()
 }

From 88bc52a57058941e8f56b298b179426023184ac3 Mon Sep 17 00:00:00 2001
From: Abderrahmane TAHRI JOUTI <302837+atahrijouti@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:10:42 +0200
Subject: [PATCH 416/967] Theme cyan light diff colors (#8587)

---
 runtime/themes/cyan_light.toml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/runtime/themes/cyan_light.toml b/runtime/themes/cyan_light.toml
index 2114054d0..e18c46a9f 100644
--- a/runtime/themes/cyan_light.toml
+++ b/runtime/themes/cyan_light.toml
@@ -57,9 +57,12 @@
 "markup.raw.inline" = "green"
 "markup.raw.block" = "green"
 
-"diff.plus" = "diff_green"
-"diff.minus" = "diff_red"
-"diff.delta" = "diff_blue"
+"diff.plus" = "green"
+"diff.plus.gutter" = "gutter_green"
+"diff.minus" = "red"
+"diff.minus.gutter" = "gutter_red"
+"diff.delta" = "blue"
+"diff.delta.gutter" = "gutter_blue"
 
 # ui specific
 "ui.background" = { bg = "shade00" }
@@ -121,7 +124,7 @@ foreground = "#25293c"
 
 comment_gray = "#808080"
 
-diff_blue = "#C3D6E8"
+gutter_blue = "#C3D6E8"
 faint_blue = "#E8Eef1"
 lighter_blue = "#d0eaff"
 light_blue = "#99ccff"
@@ -134,7 +137,7 @@ darker_blue = "#000080"
 purple = "#660E7A"
 light_purple = "#ED9CFF"
 
-diff_green = "#C9DEC1"
+gutter_green = "#C9DEC1"
 green = "#00733B"
 light_green = "#5DCE87"
 green_blue = "#458383"
@@ -146,6 +149,6 @@ dark_yellow = "#7A7A43"
 light_orange = "#f9c881"
 orange = "#F49810"
 
-diff_red = "#EBBCBC"
+gutter_red = "#EBBCBC"
 red = "#d90016"
 dark_red = "#7F0000"

From fef4d5321b5eb1b13ba996243c88eade98e951f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:13:46 +0900
Subject: [PATCH 417/967] build(deps): bump ropey from 1.6.0 to 1.6.1 (#8593)

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

diff --git a/Cargo.lock b/Cargo.lock
index ab6f40347..189729f35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1812,9 +1812,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "ropey"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
+checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
 dependencies = [
  "smallvec",
  "str_indices",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index fb4894137..891850128 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -17,7 +17,7 @@ integration = []
 [dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
-ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
+ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
 smallvec = "1.11"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"

From 6acbb07ca9bb0fd69e5bb1946aa2779d140128fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:14:00 +0900
Subject: [PATCH 418/967] build(deps): bump hashbrown from 0.14.1 to 0.14.2
 (#8594)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 10 +++++-----
 helix-core/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 189729f35..def24e43e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -784,7 +784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16"
 dependencies = [
  "gix-hash",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
  "parking_lot",
 ]
 
@@ -1098,9 +1098,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -1117,7 +1117,7 @@ dependencies = [
  "dunce",
  "encoding_rs",
  "etcetera",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
  "helix-loader",
  "imara-diff",
  "indoc",
@@ -1400,7 +1400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 891850128..29e6653aa 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -31,7 +31,7 @@ arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
 ahash = "0.8.3"
-hashbrown = { version = "0.14.1", features = ["raw"] }
+hashbrown = { version = "0.14.2", features = ["raw"] }
 dunce = "1.0"
 
 log = "0.4"

From 25ea6b81523bb2d6762b02fba467bd03240f4233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:14:09 +0900
Subject: [PATCH 419/967] build(deps): bump rustix from 0.38.19 to 0.38.20
 (#8595)

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 def24e43e..931cdde29 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1828,9 +1828,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.19"
+version = "0.38.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
 dependencies = [
  "bitflags 2.4.1",
  "errno",

From 9dbf882808681f495725a716b734b725baa2eb90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:14:18 +0900
Subject: [PATCH 420/967] build(deps): bump thiserror from 1.0.49 to 1.0.50
 (#8596)

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 931cdde29..ca3cb9e86 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2100,18 +2100,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",

From 68c7537de522cf6b38705a7af51eeaac260fdc98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 17:59:38 +0900
Subject: [PATCH 421/967] build(deps): bump ahash from 0.8.3 to 0.8.5 (#8597)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 47 +++++++++++++++++++++++++++++++------------
 helix-core/Cargo.toml |  2 +-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca3cb9e86..3a88401ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,14 +19,15 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d"
 dependencies = [
  "cfg-if",
  "getrandom",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
@@ -346,7 +347,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.28",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -363,7 +364,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -807,7 +808,7 @@ checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1658,9 +1659,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -1883,7 +1884,7 @@ checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1905,7 +1906,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2047,9 +2048,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.28"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2115,7 +2116,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2208,7 +2209,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2625,3 +2626,23 @@ dependencies = [
  "helix-view",
  "toml",
 ]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 29e6653aa..f0903f42b 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -30,7 +30,7 @@ once_cell = "1.18"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
-ahash = "0.8.3"
+ahash = "0.8.5"
 hashbrown = { version = "0.14.2", features = ["raw"] }
 dunce = "1.0"
 

From b5d691a5d7e791f9b9581d96217f80ea10a6f2ca Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Wed, 25 Oct 2023 12:08:01 -0400
Subject: [PATCH 422/967] Add optional runtime fallback directory (#8610)

---
 book/src/install.md     | 26 +++++++++++++++++++++++---
 helix-loader/src/lib.rs | 11 ++++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/book/src/install.md b/book/src/install.md
index 9c052917c..01858034f 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -224,7 +224,7 @@ Or, create a symbolic link:
 ln -Ts $PWD/runtime ~/.config/helix/runtime
 ```
 
-If the above command fails to create a symbolic link because the file exists either move `~/.config/helix/runtime` to a new location or delete it, then run the symlink command above again. 
+If the above command fails to create a symbolic link because the file exists either move `~/.config/helix/runtime` to a new location or delete it, then run the symlink command above again.
 
 #### Windows
 
@@ -257,12 +257,32 @@ following order:
 1. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
   developing and testing helix only).
 2. `runtime/` subdirectory of OS-dependent helix user config directory.
-3. `$HELIX_RUNTIME`.
-4. `runtime/` subdirectory of path to Helix executable.
+3. `$HELIX_RUNTIME`
+4. Distribution-specific fallback directory (set at compile time—not run time—
+   with the `HELIX_DEFAULT_RUNTIME` environment variable)
+5. `runtime/` subdirectory of path to Helix executable.
 
 This order also sets the priority for selecting which file will be used if multiple runtime
 directories have files with the same name.
 
+#### Note to packagers
+
+If you are making a package of Helix for end users, to provide a good out of
+the box experience, you should set the `HELIX_DEFAULT_RUNTIME` environment
+variable at build time (before invoking `cargo build`) to a directory which
+will store the final runtime files after installation. For example, say you want
+to package the runtime into `/usr/lib/helix/runtime`. The rough steps a build
+script could follow are:
+
+1. `export HELIX_DEFAULT_RUNTIME=/usr/lib/helix/runtime`
+1. `cargo build --profile opt --locked --path helix-term`
+1. `cp -r runtime $BUILD_DIR/usr/lib/helix/`
+1. `cp target/opt/hx $BUILD_DIR/usr/bin/hx`
+
+This way the resulting `hx` binary will always look for its runtime directory in
+`/usr/lib/helix/runtime` if the user has no custom runtime in `~/.config/helix`
+or `HELIX_RUNTIME`.
+
 ### Validating the installation
 
 To make sure everything is set up as expected you should run the Helix health
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 82ed2edea..5337d6027 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -60,7 +60,8 @@ pub fn initialize_log_file(specified_file: Option<PathBuf>) {
 /// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
 /// 2. subdirectory of user config directory (always included)
 /// 3. `HELIX_RUNTIME` (if environment variable is set)
-/// 4. subdirectory of path to helix executable (always included)
+/// 4. `HELIX_DEFAULT_RUNTIME` (if environment variable is set *at build time*)
+/// 5. subdirectory of path to helix executable (always included)
 ///
 /// Postcondition: returns at least two paths (they might not exist).
 fn prioritize_runtime_dirs() -> Vec<PathBuf> {
@@ -81,6 +82,14 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
         rt_dirs.push(dir.into());
     }
 
+    // If this variable is set during build time, it will always be included
+    // in the lookup list. This allows downstream packagers to set a fallback
+    // directory to a location that is conventional on their distro so that they
+    // need not resort to a wrapper script or a global environment variable.
+    if let Some(dir) = std::option_env!("HELIX_DEFAULT_RUNTIME") {
+        rt_dirs.push(dir.into());
+    }
+
     // fallback to location of the executable being run
     // canonicalize the path in case the executable is symlinked
     let exe_rt_dir = std::env::current_exe()

From 2ebcc4dbeb306cc285d47bd1d21d72c7e57ecb72 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 25 Oct 2023 11:08:46 -0500
Subject: [PATCH 423/967] Pin tree-sitter to the 0.20.10 release (#8396)

---
 Cargo.lock               | 3 ++-
 Cargo.toml               | 2 +-
 helix-core/src/syntax.rs | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a88401ed..d10cd16f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2260,7 +2260,8 @@ dependencies = [
 [[package]]
 name = "tree-sitter"
 version = "0.20.10"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
 dependencies = [
  "cc",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index 8ffe0fa7a..7217cd3de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,5 +35,5 @@ package.helix-tui.opt-level = 2
 package.helix-term.opt-level = 2
 
 [workspace.dependencies]
-tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
+tree-sitter = { version = "0.20" }
 nucleo = "0.2.0"
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 881b45098..97a882249 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1614,7 +1614,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
 }
 
 pub struct RopeProvider<'a>(pub RopeSlice<'a>);
-impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
+impl<'a> TextProvider<'a> for RopeProvider<'a> {
     type I = ChunksBytes<'a>;
 
     fn text(&mut self, node: Node) -> Self::I {
@@ -1628,7 +1628,7 @@ impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
 struct HighlightIterLayer<'a> {
     _tree: Option<Tree>,
     cursor: QueryCursor,
-    captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
+    captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
     config: &'a HighlightConfiguration,
     highlight_end_stack: Vec<usize>,
     scope_stack: Vec<LocalScope<'a>>,

From c7e15dd87e932934f5807065bdf2de2c382a6b09 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 25 Oct 2023 11:10:45 -0500
Subject: [PATCH 424/967] Add changelog notes for 23.10 (#8086)

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 CHANGELOG.md              | 260 ++++++++++++++++++++++++++++++++++++++
 VERSION                   |   2 +-
 contrib/Helix.appdata.xml |   3 +
 3 files changed, 264 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f7509b0b..b5edbf72b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,263 @@
+# 23.10 (2023-10-24)
+
+A big shout out to all the contributors! We had 118 contributors in this release.
+
+Breaking changes:
+
+- Support multiple language servers per language ([#2507](https://github.com/helix-editor/helix/pull/2507))
+    - This is a breaking change to language configuration
+
+Features:
+
+- Support multiple language servers per language ([#2507](https://github.com/helix-editor/helix/pull/2507), [#7082](https://github.com/helix-editor/helix/pull/7082), [#7286](https://github.com/helix-editor/helix/pull/7286), [#8374](https://github.com/helix-editor/helix/pull/8374))
+- Add a statusline element for the selected register ([#7222](https://github.com/helix-editor/helix/pull/7222))
+- Add `%`, `#`, `.`, `*` and `+` special registers ([#6985](https://github.com/helix-editor/helix/pull/6985))
+- Add initial support for LSP DidChangeWatchedFiles notifications ([#7665](https://github.com/helix-editor/helix/pull/7665))
+- Search buffer contents in `global_search` ([#5652](https://github.com/helix-editor/helix/pull/5652))
+- Add a "smart tab" command that intelligently jumps the cursor on tab ([#4443](https://github.com/helix-editor/helix/pull/4443))
+- Add a statusline element for whether a file is read-only ([#7222](https://github.com/helix-editor/helix/pull/7222), [#7875](https://github.com/helix-editor/helix/pull/7875))
+- Syntax highlight regex prompts ([#7738](https://github.com/helix-editor/helix/pull/7738))
+- Allow defining alignment in indent queries ([#5355](https://github.com/helix-editor/helix/pull/5355))
+- Show visual feedback in `surround_replace` ([#7588](https://github.com/helix-editor/helix/pull/7588))
+- Switch to Nucleo for fuzzy matching ([#7814](https://github.com/helix-editor/helix/pull/7814), [#8148](https://github.com/helix-editor/helix/pull/8148), [#8192](https://github.com/helix-editor/helix/pull/8192), [#8194](https://github.com/helix-editor/helix/pull/8194))
+- Insert a trailing newline on write ([#8157](https://github.com/helix-editor/helix/pull/8157))
+- Add a `-w`/`--working-dir` CLI flag for specifying a working directory on startup ([#8223](https://github.com/helix-editor/helix/pull/8223), [#8498](https://github.com/helix-editor/helix/pull/8498), [#8520](https://github.com/helix-editor/helix/pull/8520))
+- Accept a `+N` CLI argument to set the first file's line number ([#8521](https://github.com/helix-editor/helix/pull/8521))
+- Accept Helix-specific ignore files in `.helix/ignore` and `~/.config/helix/ignore` ([#8099](https://github.com/helix-editor/helix/pull/8099))
+
+Commands:
+
+- `merge_selections` (`A-minus`) - merge all selections into one selection that covers all ranges ([#7053](https://github.com/helix-editor/helix/pull/7053))
+- `move_prev_long_word_end` and `extend_prev_long_word_end` - move/extend to the end of the previous WORD ([#6905](https://github.com/helix-editor/helix/pull/6905))
+- `reverse_selection_contents` - swaps the values of each selection so they are reversed ([#7329](https://github.com/helix-editor/helix/pull/7329))
+- Add `:rl` and `:rla` aliases for `:reload` and `:reload-all` ([#7158](https://github.com/helix-editor/helix/pull/7158))
+- `yank_joined` - join the selections and yank to the selected register ([#7195](https://github.com/helix-editor/helix/pull/7195))
+- `:write-all!` (`:wa!`) - forcibly write all buffers to disk and create any necessary subdirectories ([#7577](https://github.com/helix-editor/helix/pull/7577))
+- `:redraw` - clear re-render the UI ([#6949](https://github.com/helix-editor/helix/pull/6949))
+- `:tree-sitter-highlight-name` - show the theme scope name of the highlight under the cursor ([#8170](https://github.com/helix-editor/helix/pull/8170))
+
+Usability improvements:
+
+- Allow cycling option values at runtime ([#4411](https://github.com/helix-editor/helix/pull/4411), [#7240](https://github.com/helix-editor/helix/pull/7240), [#7877](https://github.com/helix-editor/helix/pull/7877))
+- Exit gracefully on termination signals ([#7236](https://github.com/helix-editor/helix/pull/7236))
+- Add plaintext matching fallback to tree-sitter pair matching ([#4288](https://github.com/helix-editor/helix/pull/4288))
+- Persist register selection in pending keymaps ([0e08349](https://github.com/helix-editor/helix/commit/0e08349))
+- Propagate the count and register to command palette commands ([b394997](https://github.com/helix-editor/helix/commit/b394997))
+- Auto indent on `insert_at_line_start` ([#5837](https://github.com/helix-editor/helix/pull/5837))
+- Add a config option to control whether LSP completions are automatically inserted on preview ([#7189](https://github.com/helix-editor/helix/pull/7189))
+- Add a config option for default line endings ([#5621](https://github.com/helix-editor/helix/pull/5621), [#7357](https://github.com/helix-editor/helix/pull/7357))
+- Allow ANSI colors in themes ([#5119](https://github.com/helix-editor/helix/pull/5119))
+- Match pairs that don't form a standalone tree-sitter node ([#7242](https://github.com/helix-editor/helix/pull/7242))
+- Allow indent sizes of up to 16 columns ([#7429](https://github.com/helix-editor/helix/pull/7429))
+- Improve performance of mapping positions through changes ([#7408](https://github.com/helix-editor/helix/pull/7408), [8d39a81](https://github.com/helix-editor/helix/commit/8d39a81), [#7471](https://github.com/helix-editor/helix/pull/7471))
+- Mark buffers created from stdin as modified ([#7431](https://github.com/helix-editor/helix/pull/7431))
+- Forcibly shut down uninitialized language servers ([#7449](https://github.com/helix-editor/helix/pull/7449))
+- Add filename completer for shell prompts ([#7569](https://github.com/helix-editor/helix/pull/7569))
+- Allow binding F13-F24 ([#7672](https://github.com/helix-editor/helix/pull/7672))
+- Resolve LSP code actions ([#7677](https://github.com/helix-editor/helix/pull/7677), [#8421](https://github.com/helix-editor/helix/pull/8421))
+- Save an undo checkpoint before accepting completions ([#7747](https://github.com/helix-editor/helix/pull/7747))
+- Include gitignored files in debugger completions ([#7936](https://github.com/helix-editor/helix/pull/7936))
+- Make editor remember the last search register ([#5244](https://github.com/helix-editor/helix/pull/5244))
+- Open directories with `goto_file` ([#7909](https://github.com/helix-editor/helix/pull/7909))
+- Use relative path to open buffer in `goto_file` (`gf`) ([#7965](https://github.com/helix-editor/helix/pull/7965))
+- Support `default` color in themes ([#8083](https://github.com/helix-editor/helix/pull/8083), [#8114](https://github.com/helix-editor/helix/pull/8114))
+- Toggle between relative and absolute line numbers when the terminal loses focus ([#7955](https://github.com/helix-editor/helix/pull/7955))
+- Lower default idle-timeout to 250ms ([060e73a](https://github.com/helix-editor/helix/commit/060e73a))
+- Allow theming diff gutters separately from other diff colors ([#8343](https://github.com/helix-editor/helix/pull/8343))
+- Style bold/italic/strikethrough in markdown doc popups ([#8385](https://github.com/helix-editor/helix/pull/8385))
+- Maintain the cursor position and view when splitting with `:hsplit`/`:vsplit` ([#8109](https://github.com/helix-editor/helix/pull/8109))
+- Accept `-` in macros outside of `<`/`>` ([#8475](https://github.com/helix-editor/helix/pull/8475))
+- Show all language servers for each language in `--health` ([#7315](https://github.com/helix-editor/helix/pull/7315))
+- Don't break on hyphens in `:reflow` ([#8569](https://github.com/helix-editor/helix/pull/8569))
+
+Fixes:
+
+- Update diagnostics correctly on language server exit ([#7111](https://github.com/helix-editor/helix/pull/7111))
+- Fix off-by-one in `select_references_to_symbol_under_cursor` ([#7132](https://github.com/helix-editor/helix/pull/7132))
+- Extend selection with repeat-last-motion only if the original motion extended the selection ([#7159](https://github.com/helix-editor/helix/pull/7159))
+- Fix undefined behavior in the diff gutter ([#7227](https://github.com/helix-editor/helix/pull/7227))
+- Check that tab width is non-zero ([#7178](https://github.com/helix-editor/helix/pull/7178))
+- Fix styles being overwritten in table rows with multiple cells ([#7281](https://github.com/helix-editor/helix/pull/7281))
+- Add file for `--log` CLI arg in help text ([#7307](https://github.com/helix-editor/helix/pull/7307))
+- Fix underflow when repeating a completion that has a negative shift position ([#7322](https://github.com/helix-editor/helix/pull/7322))
+- Prefer longer matches in `select_next_sibling` and `select_prev_sibling` ([#7332](https://github.com/helix-editor/helix/pull/7332))
+- Preview scratch buffers in the jumplist picker ([#7331](https://github.com/helix-editor/helix/pull/7331))
+- Fix chunking by bytes in tree-sitter parsing ([#7417](https://github.com/helix-editor/helix/pull/7417))
+- Discard LSP publishDiagnostic from uninitialized servers ([#7467](https://github.com/helix-editor/helix/pull/7467))
+- Use negotiated position encoding for LSP workspace edits ([#7469](https://github.com/helix-editor/helix/pull/7469))
+- Fix error message for unknown gutter types in config ([#7534](https://github.com/helix-editor/helix/pull/7534))
+- Fix `:log-open` when `--log` CLI arg is specified ([#7573](https://github.com/helix-editor/helix/pull/7573), [#7585](https://github.com/helix-editor/helix/pull/7585))
+- Fix debouncing of LSP messages to fix the last message sticking around ([#7538](https://github.com/helix-editor/helix/pull/7538), [#8023](https://github.com/helix-editor/helix/pull/8023))
+- Fix crash when the current working directory is deleted ([#7185](https://github.com/helix-editor/helix/pull/7185))
+- Fix piping to Helix on macOS ([#5468](https://github.com/helix-editor/helix/pull/5468))
+- Fix crash when parsing overlapping injections ([#7621](https://github.com/helix-editor/helix/pull/7621))
+- Clear the statusline when the prompt is visible ([#7646](https://github.com/helix-editor/helix/pull/7646))
+- Fix range formatting error message typo ([#7823](https://github.com/helix-editor/helix/pull/7823))
+- Skip rendering gutters when gutter width exceeds view width ([#7821](https://github.com/helix-editor/helix/pull/7821))
+- Center the picker preview using visual lines ([#7837](https://github.com/helix-editor/helix/pull/7837))
+- Align view correctly for background buffers opened with `A-ret` ([#7691](https://github.com/helix-editor/helix/pull/7691))
+- Fix cursor resetting to block when quitting via a keybind ([#7931](https://github.com/helix-editor/helix/pull/7931))
+- Remove path completions for the `:new` command ([#8010](https://github.com/helix-editor/helix/pull/8010))
+- Use binary path resolved by `which` for formatter commands ([#8064](https://github.com/helix-editor/helix/pull/8064))
+- Handle crossterm's `hidden` modifier ([#8120](https://github.com/helix-editor/helix/pull/8120))
+- Clear completion when switching between windows with the mouse ([#8118](https://github.com/helix-editor/helix/pull/8118))
+- Eagerly remove the last picker (`<space>'`) when the picker has many items ([#8127](https://github.com/helix-editor/helix/pull/8127))
+- Fix find commands for buffers with non-LF line-endings ([#8111](https://github.com/helix-editor/helix/pull/8111))
+- Detect the tmux clipboard provider on macOS ([#8182](https://github.com/helix-editor/helix/pull/8182))
+- Fix syntax highlighting in dynamic picker preview pane ([#8206](https://github.com/helix-editor/helix/pull/8206))
+- Recognize HTML code tags with attributes as code in markdown previews ([#8397](https://github.com/helix-editor/helix/pull/8397))
+- Fix multicursor snippet placeholder directions ([#8423](https://github.com/helix-editor/helix/pull/8423))
+- Only show diagnostic highlights when diagnostics are enabled for a language server ([#8551](https://github.com/helix-editor/helix/pull/8551))
+
+Themes:
+
+- Improve the selection color in `ferra` ([#7138](https://github.com/helix-editor/helix/pull/7138))
+- Add `variable.other.member` theming to `spacebones_light` ([#7125](https://github.com/helix-editor/helix/pull/7125))
+- Update `autumn` and theme the soft-wrap indicator ([#7229](https://github.com/helix-editor/helix/pull/7229))
+- Add `gruvbox_dark_soft` ([#7139](https://github.com/helix-editor/helix/pull/7139))
+- Add `merionette` ([#7186](https://github.com/helix-editor/helix/pull/7186))
+- Add `zed_onedark` and `zed_onelight` ([#7250](https://github.com/helix-editor/helix/pull/7250))
+- Use light-gray for `onedarker` inlay hint theming ([#7433](https://github.com/helix-editor/helix/pull/7433))
+- Update the Nord theme to follow the style guidelines ([#7490](https://github.com/helix-editor/helix/pull/7490))
+- Tune `dark_plus` inlay hint colors ([#7611](https://github.com/helix-editor/helix/pull/7611))
+- Add `naysayer` ([#7570](https://github.com/helix-editor/helix/pull/7570))
+- Add `kaolin-dark`, `kaolin-light` and `kaolin-valley-dark` ([#7151](https://github.com/helix-editor/helix/pull/7151))
+- Fix selection highlighting in gruvbox variants ([#7717](https://github.com/helix-editor/helix/pull/7717))
+- Add soft-wrap indicator to `gruvbox` ([#7736](https://github.com/helix-editor/helix/pull/7736))
+- Add missing palette definitions in `everforest_dark` ([#7739](https://github.com/helix-editor/helix/pull/7739))
+- Increase diagnostics clarity in `pop-dark` ([#7702](https://github.com/helix-editor/helix/pull/7702))
+- Add `vim_dark_high_contrast` ([#7785](https://github.com/helix-editor/helix/pull/7785))
+- Add `new_moon` ([#7834](https://github.com/helix-editor/helix/pull/7834))
+- Add `yellowed` ([#7849](https://github.com/helix-editor/helix/pull/7849))
+- Improve comment readability for `autumn` ([#7939](https://github.com/helix-editor/helix/pull/7939))
+- Distinguish active bufferline buffer in `monokai` ([#7983](https://github.com/helix-editor/helix/pull/7983))
+- Update ruler colors in `nord` ([#7995](https://github.com/helix-editor/helix/pull/7995))
+- Update Catppuccin themes ([#8102](https://github.com/helix-editor/helix/pull/8102))
+- Add text focus scope and diagnostics undercurls for `nord` ([#8165](https://github.com/helix-editor/helix/pull/8165))
+- Add material theme collection ([#8211](https://github.com/helix-editor/helix/pull/8211))
+- Improve indent line color in `dracula` ([#8266](https://github.com/helix-editor/helix/pull/8266))
+- Clean up and refactor `papercolor` to use inheritance ([#8276](https://github.com/helix-editor/helix/pull/8276))
+- Fix `zenburn` inlay hint color ([#8278](https://github.com/helix-editor/helix/pull/8278)a)
+- Fix picker crash when previewing an invalid range ([e9d0bd7](https://github.com/helix-editor/helix/commit/e9d0bd7))
+- Correctly center items in the picker preview ([13d4463](https://github.com/helix-editor/helix/commit/13d4463))
+- Add `cyan_light` ([#8293](https://github.com/helix-editor/helix/pull/8293), [#8587](https://github.com/helix-editor/helix/pull/8587))
+- Theme HTML tags in `onedark` ([#8409](https://github.com/helix-editor/helix/pull/8409))
+- Refine `darcula` and `darcula-solid` themes ([#8412](https://github.com/helix-editor/helix/pull/8412))
+- Improve `nord` highlights ([#8414](https://github.com/helix-editor/helix/pull/8414))
+- Add `nord-night` ([#8549](https://github.com/helix-editor/helix/pull/8549))
+
+New languages:
+
+- Blueprint ([#7213](https://github.com/helix-editor/helix/pull/7213), [#8161](https://github.com/helix-editor/helix/pull/8161))
+- Forth ([#7256](https://github.com/helix-editor/helix/pull/7256), [#7334](https://github.com/helix-editor/helix/pull/7334))
+- t32 ([#7140](https://github.com/helix-editor/helix/pull/7140), [#7811](https://github.com/helix-editor/helix/pull/7811))
+- WebC ([#7290](https://github.com/helix-editor/helix/pull/7290))
+- Persistent DSL for Haskell ([#7261](https://github.com/helix-editor/helix/pull/7261))
+- F# ([#7619](https://github.com/helix-editor/helix/pull/7619), [#8024](https://github.com/helix-editor/helix/pull/8024))
+- Wren ([#7765](https://github.com/helix-editor/helix/pull/7765), [#7819](https://github.com/helix-editor/helix/pull/7819))
+- Unison ([#7724](https://github.com/helix-editor/helix/pull/7724))
+- Todo.txt ([#7835](https://github.com/helix-editor/helix/pull/7835))
+- Jinja and Handlebars ([#7233](https://github.com/helix-editor/helix/pull/7233))
+- Pod ([#7907](https://github.com/helix-editor/helix/pull/7907))
+- Strace ([#7928](https://github.com/helix-editor/helix/pull/7928))
+- Gemini ([#8070](https://github.com/helix-editor/helix/pull/8070))
+- GNU Assembler (GAS) ([#8291](https://github.com/helix-editor/helix/pull/8291))
+- JSON5 ([#8473](https://github.com/helix-editor/helix/pull/8473))
+- TEMPL ([#8540](https://github.com/helix-editor/helix/pull/8540))
+
+Updated languages and queries:
+
+- Add one to the ruler numbers for git-commit ([#7072](https://github.com/helix-editor/helix/pull/7072))
+- Recognize XAML files as XML ([#7083](https://github.com/helix-editor/helix/pull/7083))
+- Recognize `Cargo.lock` as TOML ([#7095](https://github.com/helix-editor/helix/pull/7095))
+- Use Rust grammar for Cairo ([c6d1430](https://github.com/helix-editor/helix/commit/c6d1430))
+- Update tree-sitter-nickel ([#7059](https://github.com/helix-editor/helix/pull/7059), [#7551](https://github.com/helix-editor/helix/pull/7551))
+- Tune auto-pair characters for Nickel ([#7059](https://github.com/helix-editor/helix/pull/7059))
+- Recognize `Vagrantfile` as Ruby ([#7112](https://github.com/helix-editor/helix/pull/7112))
+- Recognize hidden justfiles as Just ([#7088](https://github.com/helix-editor/helix/pull/7088))
+- Update Java and TypeScript highlight queries ([#7145](https://github.com/helix-editor/helix/pull/7145))
+- Recognize `.zimrc` as Bash ([#7146](https://github.com/helix-editor/helix/pull/7146))
+- Recognize `.gir` as XML ([#7152](https://github.com/helix-editor/helix/pull/7152))
+- Update tree-sitter-scala ([#7147](https://github.com/helix-editor/helix/pull/7147))
+- Recognize make file-type as Makefile ([#7212](https://github.com/helix-editor/helix/pull/7212))
+- Update tree-sitter-verilog ([#7262](https://github.com/helix-editor/helix/pull/7262))
+- Update tree-sitter-cpp ([#7285](https://github.com/helix-editor/helix/pull/7285))
+- Support core mode for delve debugger ([#7300](https://github.com/helix-editor/helix/pull/7300))
+- Add Fortran comment injections ([#7305](https://github.com/helix-editor/helix/pull/7305))
+- Switch Vue language server to `vue-language-server` ([#7312](https://github.com/helix-editor/helix/pull/7312))
+- Update tree-sitter-sql ([#7387](https://github.com/helix-editor/helix/pull/7387), [#8464](https://github.com/helix-editor/helix/pull/8464))
+- Replace the MATLAB tre-sitter grammar ([#7388](https://github.com/helix-editor/helix/pull/7388), [#7442](https://github.com/helix-editor/helix/pull/7442), [#7491](https://github.com/helix-editor/helix/pull/7491), [#7493](https://github.com/helix-editor/helix/pull/7493), [#7511](https://github.com/helix-editor/helix/pull/7511), [#7532](https://github.com/helix-editor/helix/pull/7532), [#8040](https://github.com/helix-editor/helix/pull/8040))
+- Highlight TOML table headers ([#7441](https://github.com/helix-editor/helix/pull/7441))
+- Recognize `cppm` file-type as C++ ([#7492](https://github.com/helix-editor/helix/pull/7492))
+- Refactor ecma language queries into private and public queries ([#7207](https://github.com/helix-editor/helix/pull/7207))
+- Update tree-sitter-dart ([#7576](https://github.com/helix-editor/helix/pull/7576))
+- Add shebang for nushell files ([#7606](https://github.com/helix-editor/helix/pull/7606))
+- Recognize systemd files as INI ([#7592](https://github.com/helix-editor/helix/pull/7592))
+- Update TypeScript, TSX and Svelte grammars ([#6874](https://github.com/helix-editor/helix/pull/6874))
+- Enable inlay hints in the Svelte language server ([#7622](https://github.com/helix-editor/helix/pull/7622))
+- Recognize `Brewfile`s as Ruby ([#7629](https://github.com/helix-editor/helix/pull/7629))
+- Add more file-types for R ([#7633](https://github.com/helix-editor/helix/pull/7633))
+- Switch tree-sitter-perl to official upstream parser ([#7644](https://github.com/helix-editor/helix/pull/7644), [#7947](https://github.com/helix-editor/helix/pull/7947))
+- Fix predicate typo in comment highlights ([#7732](https://github.com/helix-editor/helix/pull/7732))
+- Update tree-sitter-prql ([#7771](https://github.com/helix-editor/helix/pull/7771))
+- Recognize `.gitf` as JSON ([#7781](https://github.com/helix-editor/helix/pull/7781))
+- Switch V language server to `v-analyzer` ([#7760](https://github.com/helix-editor/helix/pull/7760))
+- Add protobuf language servers ([#7796](https://github.com/helix-editor/helix/pull/7796))
+- Update tree-sitter-zig ([#7803](https://github.com/helix-editor/helix/pull/7803))
+- Update tree-sitter-hare ([#7784](https://github.com/helix-editor/helix/pull/7784))
+- Add Java indent queries ([#7844](https://github.com/helix-editor/helix/pull/7844))
+- Update tree-sitter-scheme ([979933b](https://github.com/helix-editor/helix/commit/979933b))
+- Recognize `scm` as Scheme instead of TSQ ([5707151](https://github.com/helix-editor/helix/commit/5707151))
+- Update tree-sitter-git-commit ([#7831](https://github.com/helix-editor/helix/pull/7831))
+- Update JavaScript, TypeScript and TSX grammars ([#7852](https://github.com/helix-editor/helix/pull/7852))
+- Update tree-sitter-nu ([#7873](https://github.com/helix-editor/helix/pull/7873))
+- Fix YAML indentation ([#6768](https://github.com/helix-editor/helix/pull/6768))
+- Add `csharp-ls`, Pyright, Pylyzer and add roots for Python ([#7897](https://github.com/helix-editor/helix/pull/7897), [#8032](https://github.com/helix-editor/helix/pull/8032))
+- Update tree-sitter-slint ([#7893](https://github.com/helix-editor/helix/pull/7893))
+- Recognize more ZSH file-types as Bash ([#7930](https://github.com/helix-editor/helix/pull/7930))
+- Recognize `star` extension as Starlark ([#7922](https://github.com/helix-editor/helix/pull/7922))
+- Fix inline HTML tag highlighting in markdown ([#7960](https://github.com/helix-editor/helix/pull/7960))
+- Update tree-sitter-robot ([#7970](https://github.com/helix-editor/helix/pull/7970))
+- Highlight Dart 3 `sealed` and `base` keywords ([#7974](https://github.com/helix-editor/helix/pull/7974))
+- Add configuration for `ltex-ls` to the default `languages.toml` ([#7838](https://github.com/helix-editor/helix/pull/7838))
+- Update tree-sitter-strace ([#8087](https://github.com/helix-editor/helix/pull/8087))
+- Update tree-sitter-gleam, enable auto-format ([#8085](https://github.com/helix-editor/helix/pull/8085))
+- Update tree-sitter-esdl ([#8222](https://github.com/helix-editor/helix/pull/8222))
+- Expand ignore file-types ([#8220](https://github.com/helix-editor/helix/pull/8220))
+- Recognize feed related formats as XML ([#8232](https://github.com/helix-editor/helix/pull/8232))
+- Improve YAML injections ([#8217](https://github.com/helix-editor/helix/pull/8217))
+- Add shebangs for TypeScript, Julia, Java and OCaml ([95e994a](https://github.com/helix-editor/helix/commit/95e994a))
+- Highlight abbreviations in Scheme ([ef23847](https://github.com/helix-editor/helix/commit/ef23847))
+- Remove backtic auto-pair in OCaml ([#8260](https://github.com/helix-editor/helix/pull/8260))
+- Recognize `flake.lock` as JSON ([#8304](https://github.com/helix-editor/helix/pull/8304))
+- Add Python test script injection for Nix ([b4494e1](https://github.com/helix-editor/helix/commit/b4494e1))
+- Fix Nix comment injection precedence ([37e48f4](https://github.com/helix-editor/helix/commit/37e48f4))
+- Recognize editorconfig files as INI ([#8308](https://github.com/helix-editor/helix/pull/8308))
+- Recognize `.babelrc` as JSON ([#8309](https://github.com/helix-editor/helix/pull/8309))
+- Switch Purescript to its own tree-sitter parser ([#8306](https://github.com/helix-editor/helix/pull/8306), [#8338](https://github.com/helix-editor/helix/pull/8338), [#8527](https://github.com/helix-editor/helix/pull/8527))
+- Update Unison highlights ([#8315](https://github.com/helix-editor/helix/pull/8315))
+- Recognize `.webmanifest` as JSON ([#8342](https://github.com/helix-editor/helix/pull/8342))
+- Recognize polkit policy files as XML ([#8369](https://github.com/helix-editor/helix/pull/8369))
+- Recognize polkit rules files as JavaScript ([#8370](https://github.com/helix-editor/helix/pull/8370))
+- Update Go highlight queries ([#8399](https://github.com/helix-editor/helix/pull/8399))
+- Add shebangs for Makefiles ([#8410](https://github.com/helix-editor/helix/pull/8410))
+- Add file-type associations from VSCode ([#8388](https://github.com/helix-editor/helix/pull/8388))
+- Add validation to JSON/CSS language server configs ([#8433](https://github.com/helix-editor/helix/pull/8433))
+- Add a configuration for the tailwind language server ([#8442](https://github.com/helix-editor/helix/pull/8442))
+- Add a configuration for the ansible language server ([#7973](https://github.com/helix-editor/helix/pull/7973))
+- Add a configuration for the GraphQL language server ([#8492](https://github.com/helix-editor/helix/pull/8492))
+- Indent while statements in Bash ([#8528](https://github.com/helix-editor/helix/pull/8528))
+- Update tree-sitter-haskell and queries ([#8558](https://github.com/helix-editor/helix/pull/8558))
+
+Packaging:
+
+- Add an overlay to the Nix flake ([#7078](https://github.com/helix-editor/helix/pull/7078))
+- Check for `git` before fetching or building grammars ([#7320](https://github.com/helix-editor/helix/pull/7320))
+- Refactor Nix flake to use Crane ([#7763](https://github.com/helix-editor/helix/pull/7763))
+- Remove the aarch64 appimage from the release CI ([#7832](https://github.com/helix-editor/helix/pull/7832))
+- Add desktop and icon files to Nix flake output ([#7979](https://github.com/helix-editor/helix/pull/7979))
+- Build flake packages with the latest stable Rust ([#8133](https://github.com/helix-editor/helix/pull/8133))
+
 # 23.05 (2023-05-18)
 
 23.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!
diff --git a/VERSION b/VERSION
index 527d78c51..f5f8bffe4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-23.05
\ No newline at end of file
+23.10
\ No newline at end of file
diff --git a/contrib/Helix.appdata.xml b/contrib/Helix.appdata.xml
index 08f23b3e1..c455b242e 100644
--- a/contrib/Helix.appdata.xml
+++ b/contrib/Helix.appdata.xml
@@ -48,6 +48,9 @@
   <content_rating type="oars-1.1" />
 
   <releases>
+    <release version="23.10" date="2023-10-24">
+      <url>https://helix-editor.com/news/release-23-10-highlights/</url>
+    </release>
     <release version="23.05" date="2023-05-18">
       <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
     </release>

From f6021dd0cdd8cf6795f024e396241cb0af2ca368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 26 Oct 2023 01:37:27 +0900
Subject: [PATCH 425/967] ci: Disable riscv release build (currently broken)

---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b645d94c6..eceb57f46 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -70,11 +70,11 @@ jobs:
           rust: stable
           target: aarch64-unknown-linux-gnu
           cross: true
-        - build: riscv64-linux
-          os: ubuntu-latest
-          rust: stable
-          target: riscv64gc-unknown-linux-gnu
-          cross: true
+        # - build: riscv64-linux
+        #   os: ubuntu-latest
+        #   rust: stable
+        #   target: riscv64gc-unknown-linux-gnu
+        #   cross: true
         - build: x86_64-macos
           os: macos-latest
           rust: stable

From c24a67c0e4cd1f7c10ee86c7d7ccbbaae233cbe8 Mon Sep 17 00:00:00 2001
From: Ryan Mehri <52933714+rmehri01@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:39:22 -0700
Subject: [PATCH 426/967] Add rust html injection query (#8603)

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

diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
index b29a5ad70..ae9e587fd 100644
--- a/runtime/queries/rust/injections.scm
+++ b/runtime/queries/rust/injections.scm
@@ -1,6 +1,12 @@
 ([(line_comment) (block_comment)] @injection.content
  (#set! injection.language "comment"))
 
+((macro_invocation
+   macro: (identifier) @_html (#eq? @_html "html")
+   (token_tree) @injection.content)
+ (#set! injection.language "html")
+ (#set! injection.include-children))
+
 ((macro_invocation
   (token_tree) @injection.content)
  (#set! injection.language "rust")

From 5ce1c30f775ba74b2b061655aea4441d8beaa445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 26 Oct 2023 15:58:10 +0900
Subject: [PATCH 427/967] Revert "Pin tree-sitter to the 0.20.10 release
 (#8396)"

We only reverted so that the latest release would use a stable
tree-sitter version hosted on crates.io. We do want the improvements
on nightly.

This reverts commit 2ebcc4dbeb306cc285d47bd1d21d72c7e57ecb72.
---
 Cargo.lock               | 3 +--
 Cargo.toml               | 2 +-
 helix-core/src/syntax.rs | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d10cd16f6..3a88401ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2260,8 +2260,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter"
 version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
 dependencies = [
  "cc",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index 7217cd3de..8ffe0fa7a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,5 +35,5 @@ package.helix-tui.opt-level = 2
 package.helix-term.opt-level = 2
 
 [workspace.dependencies]
-tree-sitter = { version = "0.20" }
+tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
 nucleo = "0.2.0"
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 97a882249..881b45098 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1614,7 +1614,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
 }
 
 pub struct RopeProvider<'a>(pub RopeSlice<'a>);
-impl<'a> TextProvider<'a> for RopeProvider<'a> {
+impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
     type I = ChunksBytes<'a>;
 
     fn text(&mut self, node: Node) -> Self::I {
@@ -1628,7 +1628,7 @@ impl<'a> TextProvider<'a> for RopeProvider<'a> {
 struct HighlightIterLayer<'a> {
     _tree: Option<Tree>,
     cursor: QueryCursor,
-    captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
+    captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
     config: &'a HighlightConfiguration,
     highlight_end_stack: Vec<usize>,
     scope_stack: Vec<LocalScope<'a>>,

From ef1f4f31b6e0d8338a9f5b8932de9b07ac7bb0a0 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 26 Oct 2023 09:07:36 -0500
Subject: [PATCH 428/967] CI: Publish stable book before master (#8621)

---
 .github/workflows/gh-pages.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index b288e0f66..ae2e5835e 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -26,16 +26,16 @@ jobs:
           OUTDIR=$(basename ${{ github.ref }})
           echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
 
-      - name: Deploy
+      - name: Deploy stable
         uses: peaceiris/actions-gh-pages@v3
+        if: startswith(github.ref, 'refs/tags/')
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./book/book
-          destination_dir: ./${{ env.OUTDIR }}
 
-      - name: Deploy stable
+      - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
-        if: startswith(github.ref, 'refs/tags/')
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./book/book
+          destination_dir: ./${{ env.OUTDIR }}

From 290666011971c79e36b5172eea66b315dc52e2c9 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Fri, 27 Oct 2023 01:27:42 +0200
Subject: [PATCH 429/967] Add typst language and lsp (#7474)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 22 ++++++++
 runtime/queries/typst/highlights.scm | 77 ++++++++++++++++++++++++++++
 runtime/queries/typst/injections.scm |  6 +++
 4 files changed, 106 insertions(+)
 create mode 100644 runtime/queries/typst/highlights.scm
 create mode 100644 runtime/queries/typst/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 6fdc6f115..58bc3d059 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -163,6 +163,7 @@
 | tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | twig | ✓ |  |  |  |
 | typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
+| typst | ✓ |  |  | `typst-lsp` |
 | ungrammar | ✓ |  |  |  |
 | unison | ✓ |  |  |  |
 | uxntal | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 77c629e49..a6c9d5567 100644
--- a/languages.toml
+++ b/languages.toml
@@ -88,6 +88,7 @@ wgsl_analyzer = { command = "wgsl_analyzer" }
 yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
 zls = { command = "zls" }
 blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
+typst-lsp = { command = "typst-lsp" }
 
 [language-server.ansible-language-server]
 command = "ansible-language-server"
@@ -2912,6 +2913,27 @@ roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "html"
 
+[[language]]
+name = "typst"
+scope = "source.typst"
+injection-regex = "typst"
+file-types = ["typst", "typ"]
+roots = []
+comment-token = "//"
+language-servers = ["typst-lsp"]
+indent = { tab-width = 2, unit = "  " }
+
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'$' = '$'
+'"' = '"'
+
+[[grammar]]
+name = "typst"
+source = { git = "https://github.com/uben0/tree-sitter-typst", rev = "e35aa22395fdde82bbc4b5700c324ce346dfc9e5" }
+
 [[language]]
 name = "nunjucks"
 scope = "text.html.nunjucks"
diff --git a/runtime/queries/typst/highlights.scm b/runtime/queries/typst/highlights.scm
new file mode 100644
index 000000000..b422e05b3
--- /dev/null
+++ b/runtime/queries/typst/highlights.scm
@@ -0,0 +1,77 @@
+(call
+  item: (ident) @function)
+(call
+  item: (field field: (ident) @function.method))
+(tagged field: (ident) @tag)
+(field field: (ident) @tag)
+(comment) @comment
+
+; CONTROL
+(let "let" @keyword.storage.type)
+(branch ["if" "else"] @keyword.control.conditional)
+(while "while" @keyword.control.repeat)
+(for ["for" "in"] @keyword.control.repeat)
+(import "import" @keyword.control.import)
+(as "as" @keyword.operator)
+(include "include" @keyword.control.import)
+(show "show" @keyword.control)
+(set "set" @keyword.control)
+(return "return" @keyword.control)
+(flow ["break" "continue"] @keyword.control)
+
+; OPERATOR
+(in ["in" "not"] @keyword.operator)
+(and "and" @keyword.operator)
+(or "or" @keyword.operator)
+(not "not" @keyword.operator)
+(sign ["+" "-"] @operator)
+(add "+" @operator)
+(sub "-" @operator)
+(mul "*" @operator)
+(div "/" @operator)
+(cmp ["==" "<=" ">=" "!=" "<" ">"] @operator)
+(fraction "/" @operator)
+(fac "!" @operator)
+(attach ["^" "_"] @operator)
+(wildcard) @operator
+
+; VALUE
+(raw_blck "```" @operator) @markup.raw.block
+(raw_span "`" @operator) @markup.raw.block
+(raw_blck lang: (ident) @tag)
+(label) @tag
+(ref) @tag
+(number) @constant.numeric
+(string) @string
+(content ["[" "]"] @operator)
+(bool) @constant.builtin.boolean
+(builtin) @constant.builtin
+(none) @constant.builtin
+(auto) @constant.builtin
+(ident) @variable
+(call
+  item: (builtin) @function.builtin)
+
+; MARKUP
+(item "-" @markup.list)
+(term ["/" ":"] @markup.list)
+(heading ["=" "==" "===" "====" "====="] @markup.heading.marker) @markup.heading
+(url) @tag
+(emph) @markup.italic
+(strong) @markup.bold
+(symbol) @constant.character
+(shorthand) @constant.builtin
+(quote) @markup.quote
+(align) @operator
+(letter) @constant.character
+(linebreak) @constant.builtin
+
+(math "$" @operator)
+"#" @operator
+"end" @operator
+
+(escape) @constant.character.escape
+["(" ")" "{" "}"] @punctuation.bracket
+["," ";" ".." ":" "sep"] @punctuation.delimiter
+"assign" @punctuation
+(field "." @punctuation)
diff --git a/runtime/queries/typst/injections.scm b/runtime/queries/typst/injections.scm
new file mode 100644
index 000000000..8039b4cab
--- /dev/null
+++ b/runtime/queries/typst/injections.scm
@@ -0,0 +1,6 @@
+(raw_blck
+  (blob) @injection.shebang @injection.content)
+
+(raw_blck
+	lang: (ident) @injection.language
+  (blob) @injection.content)
\ No newline at end of file

From 9eec9adb8fb299ea57dc6fa13f0c5d789dcdff73 Mon Sep 17 00:00:00 2001
From: Frans Skarman <frans.skarman@protonmail.com>
Date: Thu, 26 Oct 2023 23:32:49 +0000
Subject: [PATCH 430/967] Add LPF tree sitter (#8536)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 12 ++++++++++++
 runtime/queries/lpf/highlights.scm | 19 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 runtime/queries/lpf/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 58bc3d059..48d805bc7 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -89,6 +89,7 @@
 | llvm | ✓ | ✓ | ✓ |  |
 | llvm-mir | ✓ | ✓ | ✓ |  |
 | llvm-mir-yaml | ✓ |  | ✓ |  |
+| lpf | ✓ |  |  |  |
 | lua | ✓ | ✓ | ✓ | `lua-language-server` |
 | make | ✓ |  |  |  |
 | markdoc | ✓ |  |  | `markdoc-ls` |
diff --git a/languages.toml b/languages.toml
index a6c9d5567..d8207b3ed 100644
--- a/languages.toml
+++ b/languages.toml
@@ -934,6 +934,18 @@ indent = { tab-width = 2, unit = "  " }
 name = "lean"
 source = { git = "https://github.com/Julian/tree-sitter-lean", rev = "d98426109258b266e1e92358c5f11716d2e8f638" }
 
+
+[[language]]
+name = "lpf"
+comment-token = "#"
+scope = "source.lpf"
+file-types = ["lpf"]
+roots = []
+
+[[grammar]]
+name = "lpf"
+source = { git = "https://gitlab.com/TheZoq2/tree-sitter-lpf", rev = "db7372e60c722ca7f12ab359e57e6bf7611ab126" }
+
 [[language]]
 name = "julia"
 scope = "source.julia"
diff --git a/runtime/queries/lpf/highlights.scm b/runtime/queries/lpf/highlights.scm
new file mode 100644
index 000000000..836aef846
--- /dev/null
+++ b/runtime/queries/lpf/highlights.scm
@@ -0,0 +1,19 @@
+[
+  "SYSCONFIG"
+  "BLOCK"
+  "LOCATE"
+  "COMP"
+  "FREQUENCY"
+  "PORT"
+  "IOBUF"
+] @keyword
+
+["SITE"] @keyword.storage
+
+["="] @operator
+
+((number) @constant.numeric)
+
+((string) @string)
+((line_comment) @comment)
+

From 553ffbcaa09847ec606539bddab8af1456450d73 Mon Sep 17 00:00:00 2001
From: Ryan Mehri <52933714+rmehri01@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:36:34 -0700
Subject: [PATCH 431/967] Use terminfo to reset terminal cursor style (#8591)

---
 helix-tui/src/backend/crossterm.rs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 52841f6ef..c55ab6bbd 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -32,10 +32,21 @@ fn vte_version() -> Option<usize> {
 }
 
 /// Describes terminal capabilities like extended underline, truecolor, etc.
-#[derive(Copy, Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 struct Capabilities {
     /// Support for undercurled, underdashed, etc.
     has_extended_underlines: bool,
+    /// Support for resetting the cursor style back to normal.
+    reset_cursor_command: String,
+}
+
+impl Default for Capabilities {
+    fn default() -> Self {
+        Self {
+            has_extended_underlines: false,
+            reset_cursor_command: "\x1B[0 q".to_string(),
+        }
+    }
 }
 
 impl Capabilities {
@@ -54,6 +65,10 @@ impl Capabilities {
                     || t.extended_cap("Su").is_some()
                     || vte_version() >= Some(5102)
                     || matches!(term_program().as_deref(), Some("WezTerm")),
+                reset_cursor_command: t
+                    .utf8_string_cap(termini::StringCapability::CursorNormal)
+                    .unwrap_or("\x1B[0 q")
+                    .to_string(),
             },
         }
     }
@@ -154,7 +169,8 @@ where
 
     fn restore(&mut self, config: Config) -> io::Result<()> {
         // reset cursor shape
-        write!(self.buffer, "\x1B[0 q")?;
+        self.buffer
+            .write_all(self.capabilities.reset_cursor_command.as_bytes())?;
         if config.enable_mouse_capture {
             execute!(self.buffer, DisableMouseCapture)?;
         }

From 4f1d414d9c04e611e60f1af5e69f2347a17bc6ce Mon Sep 17 00:00:00 2001
From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com>
Date: Thu, 26 Oct 2023 19:40:16 -0400
Subject: [PATCH 432/967] switch to tree-sitter-ron (#8624)

---
 languages.toml                     |  5 +++-
 runtime/queries/ron/highlights.scm | 44 +++++++++++++++++++++++++++++-
 runtime/queries/ron/indents.scm    | 13 ++++++++-
 runtime/queries/ron/injections.scm |  3 +-
 4 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/languages.toml b/languages.toml
index d8207b3ed..8b9b01e9c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1689,7 +1689,10 @@ file-types = ["ron"]
 roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
-grammar = "rust"
+
+[[grammar]]
+name = "ron"
+source = { git = "https://github.com/zee-editor/tree-sitter-ron", rev = "7762d709a0f7c1f9e269d0125a2e8a7a69006146" }
 
 [[language]]
 name = "robot"
diff --git a/runtime/queries/ron/highlights.scm b/runtime/queries/ron/highlights.scm
index 43766a4f8..1061d559a 100644
--- a/runtime/queries/ron/highlights.scm
+++ b/runtime/queries/ron/highlights.scm
@@ -1 +1,43 @@
-; inherits: rust
\ No newline at end of file
+; Literals
+;------------
+
+(string) @string
+(boolean) @constant.builtin.boolean
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
+(char) @constant.character
+
+; Structs
+;------------
+
+(enum_variant) @type.enum.variant
+(struct_entry (_) @variable.other.member ":")
+(struct_name (identifier)) @type
+
+
+
+
+; Comments
+;------------
+
+(line_comment) @comment.line
+(block_comment) @comment.block
+
+
+; Punctuation
+;------------
+
+"," @punctuation.delimiter
+":" @punctuation.delimiter
+
+"(" @punctuation.bracket
+")" @punctuation.bracket
+"[" @punctuation.bracket
+"]" @punctuation.bracket
+"{" @punctuation.bracket
+"}" @punctuation.bracket
+
+
+; Special
+;------------
+(escape_sequence) @constant.character.escape
diff --git a/runtime/queries/ron/indents.scm b/runtime/queries/ron/indents.scm
index 43766a4f8..e73bf9224 100644
--- a/runtime/queries/ron/indents.scm
+++ b/runtime/queries/ron/indents.scm
@@ -1 +1,12 @@
-; inherits: rust
\ No newline at end of file
+[
+  (array)
+  (map)
+  (tuple)
+  (struct)
+] @indent
+
+[
+  "}"
+  "]"
+  ")"
+] @outdent
diff --git a/runtime/queries/ron/injections.scm b/runtime/queries/ron/injections.scm
index 43766a4f8..e4509a5fd 100644
--- a/runtime/queries/ron/injections.scm
+++ b/runtime/queries/ron/injections.scm
@@ -1 +1,2 @@
-; inherits: rust
\ No newline at end of file
+([(line_comment) (block_comment)] @injection.content
+ (#set! injection.language "comment"))

From 99bf62a5607a096de863893ae5dcce3dc1b92678 Mon Sep 17 00:00:00 2001
From: Mehedi Rifat <78611383+rifoxide@users.noreply.github.com>
Date: Fri, 27 Oct 2023 05:40:33 +0600
Subject: [PATCH 433/967] Theme: Add gruber-darker theme (#8598)

---
 runtime/themes/gruber-darker.toml | 114 ++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 runtime/themes/gruber-darker.toml

diff --git a/runtime/themes/gruber-darker.toml b/runtime/themes/gruber-darker.toml
new file mode 100644
index 000000000..355a3be83
--- /dev/null
+++ b/runtime/themes/gruber-darker.toml
@@ -0,0 +1,114 @@
+# Author : Mehedi Hasan <mehedi.r137@gmail.com>
+# Based on : https://github.com/rexim/gruber-darker-theme
+
+"attribute" = "fg0"
+"keyword" = { fg = "yellow0", modifiers = ["bold"] }
+"keyword.directive" = "quartz"
+"namespace" = "quartz"
+"punctuation" = "fg0"
+"punctuation.delimiter" = "fg0"
+"operator" = "fg0"
+"special" = { fg = "yellow0", modifiers = ["bold"] }
+"variable" = "fg0"
+"variable.builtin" = {  fg = "yellow0", modifiers = ["bold"] }
+"variable.parameter" = "fg0"
+"type" = "quartz"
+"type.builtin" = "yellow0"
+"constructor" = { fg = "quartz" }
+"function" = "niagara0"
+"function.builtin" = "yellow0"
+"tag" = "niagara0"
+"comment" = { fg = "brown0" }
+"constant.character" = { fg = "green0" }
+"constant.character.escape" = { fg = "yellow0" }
+"constant.builtin" = { fg = "yellow0", modifiers = ["bold"] }
+"string" = "green0"
+"constant.numeric" = "wisteria"
+"label" = "fg0"
+"module" = "aqua1"
+
+"diff.plus" = "green1"
+"diff.delta" = "orange1"
+"diff.minus" = "red0"
+
+"warning" = { fg = "orange1", modifiers = ["bold"] }
+"error" = { fg = "red0", modifiers = ["bold"] }
+"info" = { fg = "aqua1", modifiers = ["bold"] }
+"hint" = { fg = "blue0", modifiers = ["bold"] }
+
+"ui.background" = { bg = "bg0" }
+"ui.linenr" = { fg = "bg4" }
+"ui.linenr.selected" = { fg = "yellow0" }
+"ui.cursorline" = { bg = "bg1" }
+
+"ui.statusline" = { fg = "fg0", bg = "bg1" }
+"ui.statusline.normal" = { fg = "bg1", bg = "yellow0", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "bg1", bg = "blue0", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "bg1", bg = "wisteria", modifiers = ["bold"] }
+"ui.statusline.inactive" = { fg = "fg3", bg = "bg1" }
+
+"ui.bufferline" = { fg = "fg3", bg = "bg6" }
+"ui.bufferline.active" = { fg = "fg0", bg = "bg7" }
+
+"ui.popup" = { bg = "bg6" }
+"ui.window" = { fg = "bg1" }
+"ui.help" = { bg = "bg1", fg = "fg0" }
+"ui.text" = { fg = "fg0" }
+"ui.text.focus" = { bg = "bg5", modifiers = ["bold"] }
+"ui.selection" = { bg = "bg2" }
+"ui.selection.primary" = { bg = "bg5" }
+"ui.cursor.primary" = { bg = "fg0", fg = "niagara1" }
+"ui.cursor.match" = { bg = "yellow1" }
+"ui.menu" = { fg = "fg0", bg = "bg6" }
+"ui.menu.selected" = { fg = "fg0", bg = "bg5", modifiers = ["bold"] }
+
+"ui.virtual.whitespace" = "bg8"
+"ui.virtual.indent-guide" = "bg8"
+"ui.virtual.ruler" = { bg = "bg1" }
+"ui.virtual.inlay-hint" = { fg = "bg7" }
+"ui.virtual.wrap" = { fg = "bg2" }
+
+"diagnostic.warning" = { underline = { color = "orange1", style = "dashed" } }
+"diagnostic.error" = { underline = { color = "red3", style = "dashed" } }
+"diagnostic.info" = { underline = { color = "aqua1", style = "dashed" } }
+"diagnostic.hint" = { underline = { color = "blue0", style = "dashed" } }
+
+"markup.heading" = { fg = "aqua1", modifiers = ["bold"] }
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "green1", modifiers = ["underlined"] }
+"markup.link.text" = "red3"
+"markup.raw" = { fg = "fg0", bg = "bg8", modifiers = ["bold"] }
+
+[palette]
+fg0 =      "#e4e4ef"
+fg1 =      "#f4f4ff"
+fg2 =      "#f5f5f5"
+fg3 =      "#a89984" 
+bg0 =      "#181818"
+bg1 =      "#282828"
+bg2 =      "#453d41"
+bg4 =      "#52494e"
+bg5 =      "#404040"
+bg6 =      "#232323"
+bg7 =      "#3f3f3f"
+bg8 =      "#2c2c2c"
+red0 =     "#f43841"
+red1 =     "#ff4f58"
+red2 =     "#2B0A0B"
+red3 =     "#fb4934"
+green0 =   "#73c936"
+green1 =   "#b8bb26"
+yellow0 =  "#ffdd33"
+yellow1 =  "#655814"
+blue0 =    "#5292c8"
+orange0 =  "#d65d0e"
+orange1 =  "#fe8019"
+brown0 =   "#cc8c3c"
+quartz =   "#95a99f"
+niagara0 = "#96a6c8"
+niagara1 = "#303540"
+wisteria = "#9e95c7"
+aqua1 =    "#8ec07c"
+

From ab266b99e63813fd02e2b8d7619946a4f8db67d6 Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Fri, 27 Oct 2023 03:40:49 +0400
Subject: [PATCH 434/967] Say "unindent" instead of "outdent" in tutor (#8623)

---
 runtime/tutor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index f0de5a2d5..a781b5fe6 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -794,11 +794,11 @@ lines.
 =                      7.3 INDENTING LINES                      =
 =================================================================
 
- Type > to indent a line and < to outdent it.
+ Type > to indent a line and < to unindent it.
 
  1. Move the cursor to the line marked '-->' below.
  2. Move down to the second line and type > to indent it.
- 3. Move to the third line and type < to outdent it.
+ 3. Move to the third line and type < to unindent it.
 
  --> These lines
     are indented
@@ -842,7 +842,7 @@ lines.
 
  * Type J to join lines in selection.
 
- * Type < and > to indent / outdent lines.
+ * Type > and < to indent / unindent lines.
 
  * Press Ctrl-a to increment the selected number.
    * Press Ctrl-x to decrement the selected number.

From f992c3b5972dbe2432ceb55bc8d47fed912f88bf Mon Sep 17 00:00:00 2001
From: RoloEdits <RoloEdits@gmail.com>
Date: Thu, 26 Oct 2023 16:41:09 -0700
Subject: [PATCH 435/967] feat(highlights): add more comment highlights (#8564)

---
 runtime/queries/comment/highlights.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/runtime/queries/comment/highlights.scm b/runtime/queries/comment/highlights.scm
index 6255d2858..9583f9c53 100644
--- a/runtime/queries/comment/highlights.scm
+++ b/runtime/queries/comment/highlights.scm
@@ -7,31 +7,31 @@
 
 ; Hint level tags
 ((tag (name) @hint)
- (#match? @hint "^(HINT|MARK)$"))
+ (#match? @hint "^(HINT|MARK|PASSED|STUB|MOCK)$"))
 
 ("text" @hint
- (#match? @hint "^(HINT|MARK)$"))
+ (#match? @hint "^(HINT|MARK|PASSED|STUB|MOCK)$"))
 
 ; Info level tags
 ((tag (name) @info)
- (#match? @info "^(INFO|NOTE|TODO)$"))
+ (#match? @info "^(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK)$"))
 
 ("text" @info
- (#match? @info "^(INFO|NOTE|TODO)$"))
+ (#match? @info "^(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK)$"))
 
 ; Warning level tags
 ((tag (name) @warning)
- (#match? @warning "^(HACK|WARN|WARNING)$"))
+ (#match? @warning "^(HACK|WARN|WARNING|TEST|TEMP)$"))
 
 ("text" @warning
- (#match? @warning "^(HACK|WARN|WARNING)$"))
+ (#match? @warning "^(HACK|WARN|WARNING|TEST|TEMP)$"))
 
 ; Error level tags
 ((tag (name) @error)
- (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
+ (#match? @error "^(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG)$"))
 
 ("text" @error
- (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
+ (#match? @error "^(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG)$"))
 
 (tag
  (name) @ui.text

From ef0c31db02cc1ade81b6d5097f1d05d7b3fa85e5 Mon Sep 17 00:00:00 2001
From: Triton171 <daniel.ebert@protonmail.com>
Date: Sun, 29 Oct 2023 17:48:58 +0100
Subject: [PATCH 436/967] Fix precedence order of @align captures in indent
 computation (#8659)

precedence when multiple occur on the same line in an indent query.
---
 helix-core/src/indent.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 6ccdc5952..abf45d6fa 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -271,7 +271,9 @@ impl Indentation {
     }
 
     /// Add an indent capture to this indent.
-    /// All the captures that are added in this way should be on the same line.
+    /// Only captures that apply to the same line should be added together in this way (otherwise use `add_line`)
+    /// and the captures should be added starting from the innermost tree-sitter node (currently this only matters
+    /// if multiple `@align` patterns occur on the same line).
     fn add_capture(&mut self, added: IndentCaptureType) {
         match added {
             IndentCaptureType::Indent => {
@@ -295,7 +297,9 @@ impl Indentation {
                 self.outdent = 0;
             }
             IndentCaptureType::Align(align) => {
-                self.align = Some(align);
+                if self.align.is_none() {
+                    self.align = Some(align);
+                }
             }
         }
     }

From 44e03fa41446f46c7be60a62acf6aa4131a62a4a Mon Sep 17 00:00:00 2001
From: Angus Dippenaar <angusdippenaar@gmail.com>
Date: Sun, 29 Oct 2023 17:53:15 +0100
Subject: [PATCH 437/967] add golangci-lint-langserver (#8656)

* languages add golangci-lint-langserver

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

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 48d805bc7..c879a9677 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -54,7 +54,7 @@
 | git-rebase | ✓ |  |  |  |
 | gleam | ✓ | ✓ |  | `gleam` |
 | glsl | ✓ | ✓ | ✓ |  |
-| go | ✓ | ✓ | ✓ | `gopls` |
+| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
 | godot-resource | ✓ |  |  |  |
 | gomod | ✓ |  |  | `gopls` |
 | gotmpl | ✓ |  |  | `gopls` |
diff --git a/languages.toml b/languages.toml
index 8b9b01e9c..24e20654d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -117,6 +117,12 @@ functionTypeParameters = true
 parameterNames = true
 rangeVariableTypes = true
 
+[language-server.golangci-lint-lsp]
+command = "golangci-lint-langserver"
+
+[language-server.golangci-lint-lsp.config]
+command = ["golangci-lint", "run", "--out-format", "json", "--issues-exit-code=1"]
+
 
 [language-server.rust-analyzer]
 command = "rust-analyzer"
@@ -495,7 +501,7 @@ file-types = ["go"]
 roots = ["go.work", "go.mod"]
 auto-format = true
 comment-token = "//"
-language-servers = [ "gopls" ]
+language-servers = [ "gopls", "golangci-lint-lsp" ]
 # TODO: gopls needs utf-8 offsets?
 indent = { tab-width = 4, unit = "\t" }
 

From 992b7a0c395b5c43e2fd4f6eee38bed8dda9721a Mon Sep 17 00:00:00 2001
From: John Careaga <johnc219dev@gmail.com>
Date: Sun, 29 Oct 2023 20:28:06 -0400
Subject: [PATCH 438/967] Update idle-timeout in docs (#8661)

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

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 3b78481e3..f8796245f 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -51,7 +51,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `auto-completion` | Enable automatic pop up of auto-completion | `true` |
 | `auto-format` | Enable automatic formatting on save | `true` |
 | `auto-save` | Enable automatic saving on the focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal | `false` |
-| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `400` |
+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `250` |
 | `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |
 | `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
 | `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |

From 7d7ed78681797d2dffa1070060e063a508a18ecf Mon Sep 17 00:00:00 2001
From: Jeffrey Gelens <jeffrey@qonvoy.io>
Date: Mon, 30 Oct 2023 19:28:55 +0100
Subject: [PATCH 439/967] Add MacPorts as installation option for MacOS (#8663)

* Added MacPorts as installation option for MacOS

* Added macports to ToC
---
 book/src/install.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/book/src/install.md b/book/src/install.md
index 01858034f..dc028625b 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -13,6 +13,7 @@
   - [AppImage](#appimage)
 - [macOS](#macos)
   - [Homebrew Core](#homebrew-core)
+  - [MacPorts](#macports)
 - [Windows](#windows)
   - [Winget](#winget)
   - [Scoop](#scoop)
@@ -133,6 +134,12 @@ chmod +x helix-*.AppImage # change permission for executable mode
 brew install helix
 ```
 
+### MacPorts
+
+```sh
+port install helix
+```
+
 ## Windows
 
 Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)

From d0430f1c8166e5aad495474eb5c847a0df4dcb2f Mon Sep 17 00:00:00 2001
From: Ryan Mehri <52933714+rmehri01@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:03:38 -0700
Subject: [PATCH 440/967] Only render preview if picker has a preview function
 (#8667)

---
 helix-term/src/ui/picker.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 2c41fc12d..0214a3910 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -795,7 +795,8 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
         // |         | |         |
         // +---------+ +---------+
 
-        let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
+        let render_preview =
+            self.show_preview && self.file_fn.is_some() && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
 
         let picker_width = if render_preview {
             area.width / 2

From 566f41635eae6b7533773d7b6b1aa89e980db8ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 11:38:41 +0900
Subject: [PATCH 441/967] build(deps): bump rustix from 0.38.20 to 0.38.21
 (#8671)

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 3a88401ed..4bd82e579 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1829,9 +1829,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.20"
+version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
  "bitflags 2.4.1",
  "errno",

From ccc3085ad001d6d89e25ea854221d728bd0462a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 31 Oct 2023 11:55:12 +0900
Subject: [PATCH 442/967] ci: Use a shared cache across build workflow steps

---
 .github/workflows/build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c6267b7c..e8c55fa4a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,8 @@ jobs:
           override: true
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "build"
 
       - name: Run cargo check
         run: cargo check
@@ -40,6 +42,8 @@ jobs:
         uses: dtolnay/rust-toolchain@1.65
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "build"
 
       - name: Cache test tree-sitter grammar
         uses: actions/cache@v3
@@ -71,6 +75,8 @@ jobs:
           components: rustfmt, clippy
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "build"
 
       - name: Run cargo fmt
         run: cargo fmt --all --check
@@ -94,6 +100,8 @@ jobs:
         uses: dtolnay/rust-toolchain@1.65
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "build"
 
       - name: Validate queries
         run: cargo xtask query-check

From 403a1739cf8dbe74213074c7048c0036e16686ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 12:27:07 +0900
Subject: [PATCH 443/967] build(deps): bump serde from 1.0.189 to 1.0.190
 (#8670)

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 4bd82e579..bbda804da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1869,18 +1869,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",

From d171e23f72e9ada8ba5cd39516f91aa95392cea9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 12:27:15 +0900
Subject: [PATCH 444/967] build(deps): bump futures-util from 0.3.28 to 0.3.29
 (#8673)

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

diff --git a/Cargo.lock b/Cargo.lock
index bbda804da..2c7127c60 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -528,9 +528,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-executor"
@@ -545,15 +545,15 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-core",
  "futures-task",

From d32e052e0e5b03ff59c2d72b6eefa7fad37b8eac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 16:56:23 +0900
Subject: [PATCH 445/967] build(deps): bump ahash from 0.8.5 to 0.8.6 (#8669)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 12 ++++++------
 helix-core/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c7127c60..2ad5c9ead 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -2629,18 +2629,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.11"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f"
+checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.11"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9"
+checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index f0903f42b..8035333dd 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -30,7 +30,7 @@ once_cell = "1.18"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
-ahash = "0.8.5"
+ahash = "0.8.6"
 hashbrown = { version = "0.14.2", features = ["raw"] }
 dunce = "1.0"
 

From 53bb62b318d3b898ac10f28f35df5dcb47da6bb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 16:57:03 +0900
Subject: [PATCH 446/967] build(deps): bump tempfile from 3.8.0 to 3.8.1
 (#8672)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 10 +++++-----
 helix-loader/Cargo.toml |  2 +-
 helix-term/Cargo.toml   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ad5c9ead..b5f25da4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1752,9 +1752,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
@@ -2059,13 +2059,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "rustix",
  "windows-sys 0.48.0",
 ]
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 8e52e9725..54cb5b854 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -28,7 +28,7 @@ which = "4.4"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.8.0"
+tempfile = "3.8.1"
 dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 72ddf360c..a84d372fd 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -80,4 +80,4 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.11"
 indoc = "2.0.4"
-tempfile = "3.8.0"
+tempfile = "3.8.1"

From a069b928973aad99b85dffb9d5ade7dae4b58c43 Mon Sep 17 00:00:00 2001
From: blinxen <h-k-81@hotmail.com>
Date: Tue, 31 Oct 2023 23:09:48 +0100
Subject: [PATCH 447/967] Add missing license files for themes (#8684)

---
 runtime/themes/licenses/everforest.LICENSE    | 21 +++++++++++++++++++
 runtime/themes/licenses/serika-syntax.LICENSE | 21 +++++++++++++++++++
 runtime/themes/licenses/sonokai.LICENSE       | 21 +++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 runtime/themes/licenses/everforest.LICENSE
 create mode 100644 runtime/themes/licenses/serika-syntax.LICENSE
 create mode 100644 runtime/themes/licenses/sonokai.LICENSE

diff --git a/runtime/themes/licenses/everforest.LICENSE b/runtime/themes/licenses/everforest.LICENSE
new file mode 100644
index 000000000..546ed6343
--- /dev/null
+++ b/runtime/themes/licenses/everforest.LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 sainnhe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/runtime/themes/licenses/serika-syntax.LICENSE b/runtime/themes/licenses/serika-syntax.LICENSE
new file mode 100644
index 000000000..a88cd6fa3
--- /dev/null
+++ b/runtime/themes/licenses/serika-syntax.LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 arturoalviar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/runtime/themes/licenses/sonokai.LICENSE b/runtime/themes/licenses/sonokai.LICENSE
new file mode 100644
index 000000000..167e749cf
--- /dev/null
+++ b/runtime/themes/licenses/sonokai.LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 sainnhe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 1755c61d08b0a6f332eb8feee2e8d28bde162357 Mon Sep 17 00:00:00 2001
From: Omnikar <omnikar5@gmail.com>
Date: Thu, 2 Nov 2023 20:51:10 -0400
Subject: [PATCH 448/967] Swap system and primary clipboard registers (#8703)

---
 helix-view/src/register.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/helix-view/src/register.rs b/helix-view/src/register.rs
index 0ebea5369..5592c6afd 100644
--- a/helix-view/src/register.rs
+++ b/helix-view/src/register.rs
@@ -75,8 +75,8 @@ impl Registers {
                 self.clipboard_provider.as_ref(),
                 self.inner.get(&name),
                 match name {
-                    '*' => ClipboardType::Clipboard,
-                    '+' => ClipboardType::Selection,
+                    '+' => ClipboardType::Clipboard,
+                    '*' => ClipboardType::Selection,
                     _ => unreachable!(),
                 },
             )),
@@ -95,8 +95,8 @@ impl Registers {
                 self.clipboard_provider.set_contents(
                     values.join(NATIVE_LINE_ENDING.as_str()),
                     match name {
-                        '*' => ClipboardType::Clipboard,
-                        '+' => ClipboardType::Selection,
+                        '+' => ClipboardType::Clipboard,
+                        '*' => ClipboardType::Selection,
                         _ => unreachable!(),
                     },
                 )?;
@@ -118,8 +118,8 @@ impl Registers {
             '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
             '*' | '+' => {
                 let clipboard_type = match name {
-                    '*' => ClipboardType::Clipboard,
-                    '+' => ClipboardType::Selection,
+                    '+' => ClipboardType::Clipboard,
+                    '*' => ClipboardType::Selection,
                     _ => unreachable!(),
                 };
                 let contents = self.clipboard_provider.get_contents(clipboard_type)?;
@@ -172,8 +172,8 @@ impl Registers {
                     ('#', "<selection indices>"),
                     ('.', "<selection contents>"),
                     ('%', "<document path>"),
-                    ('*', "<system clipboard>"),
-                    ('+', "<primary clipboard>"),
+                    ('+', "<system clipboard>"),
+                    ('*', "<primary clipboard>"),
                 ]
                 .iter()
                 .copied(),
@@ -190,8 +190,8 @@ impl Registers {
         match name {
             '*' | '+' => {
                 self.clear_clipboard(match name {
-                    '*' => ClipboardType::Clipboard,
-                    '+' => ClipboardType::Selection,
+                    '+' => ClipboardType::Clipboard,
+                    '*' => ClipboardType::Selection,
                     _ => unreachable!(),
                 });
                 self.inner.remove(&name);

From ae6a0a9cfd377fbfa494760282498cf2ca322782 Mon Sep 17 00:00:00 2001
From: Arkady Rost <arkrost@users.noreply.github.com>
Date: Fri, 3 Nov 2023 00:51:22 +0000
Subject: [PATCH 449/967] Adjusted ui.virtual.inlay-hint color for everblush
 theme (#8705)

Co-authored-by: Arkady Rost <1239844+arkrost@users.noreply.github.com>
---
 runtime/themes/everblush.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/everblush.toml b/runtime/themes/everblush.toml
index edcdaf41b..b49bf0494 100644
--- a/runtime/themes/everblush.toml
+++ b/runtime/themes/everblush.toml
@@ -68,6 +68,7 @@
 "ui.virtual.whitespace" = { fg = "comment" }
 "ui.virtual.wrap" = { fg = "comment" }
 "ui.virtual.indent-guide" = { fg = "comment" }
+"ui.virtual.inlay-hint" = { fg = "comment" }
 "ui.window" = { fg = "black" }
 
 "error" = { fg = "red" }

From 70bbbd7d193a7928c9b621af9a7e192ef8251f6b Mon Sep 17 00:00:00 2001
From: Joey Hain <joey@sigmacomputing.com>
Date: Fri, 3 Nov 2023 14:21:01 -0700
Subject: [PATCH 450/967] add highlight scope for type parameters (#8660)

* rust: add highlight scope for type parameters

* handle optional type parameters
---
 book/src/themes.md                  |  1 +
 runtime/queries/rust/highlights.scm |  7 +++++++
 runtime/queries/rust/locals.scm     | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 661210765..a62c07fee 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -155,6 +155,7 @@ We use a similar set of scopes as
 
 - `type` - Types
   - `builtin` - Primitive types provided by the language (`int`, `usize`)
+  - `parameter` - Generic type parameters (`T`)
   - `enum`
     - `variant`
 - `constructor`
diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index bf2fde499..47e57e800 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -9,6 +9,13 @@
 ; Types
 ; -------
 
+(type_parameters
+  (type_identifier) @type.parameter)
+(constrained_type_parameter
+  left: (type_identifier) @type.parameter)
+(optional_type_parameter
+  name: (type_identifier) @type.parameter)
+
 ; ---
 ; Primitives
 ; ---
diff --git a/runtime/queries/rust/locals.scm b/runtime/queries/rust/locals.scm
index 75e5d181c..cb75d1557 100644
--- a/runtime/queries/rust/locals.scm
+++ b/runtime/queries/rust/locals.scm
@@ -2,6 +2,12 @@
 
 [
   (function_item)
+  (struct_item)
+  (enum_item)
+  (union_item)
+  (type_item)
+  (trait_item)
+  (impl_item)
   (closure_expression)
   (block)
 ] @local.scope
@@ -11,8 +17,15 @@
 (parameter
   (identifier) @local.definition)
 
+(type_parameters
+  (type_identifier) @local.definition)
+(constrained_type_parameter
+  left: (type_identifier) @local.definition)
+(optional_type_parameter
+  name: (type_identifier) @local.definition)
+
 (closure_parameters (identifier) @local.definition)
 
 ; References
 (identifier) @local.reference
-
+(type_identifier) @local.reference

From 5c325fe342c26f31df495ec478a1d427270e8e42 Mon Sep 17 00:00:00 2001
From: cgahr <constantin.gahr+github@pm.me>
Date: Fri, 3 Nov 2023 22:21:54 +0100
Subject: [PATCH 451/967] replace kdl tree-sitter to fix highlighting (#8652)

* replace kdl tree-sitter

* kdl: adopt highlights for new tree-sitter

* kdl: add indent queries

* kdl: add textobjects

* kdl: improve syntax highlighting

* kdl: update lang-support

* kdl: make indents more concise

---------

Co-authored-by: Constantin Gahr <constantin.gahr@ipp.mpg.de>
---
 book/src/generated/lang-support.md  |  2 +-
 languages.toml                      |  2 +-
 runtime/queries/kdl/highlights.scm  |  8 ++++----
 runtime/queries/kdl/indents.scm     |  3 +++
 runtime/queries/kdl/textobjects.scm | 27 +++++++++++++++++++++++++++
 5 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 runtime/queries/kdl/indents.scm
 create mode 100644 runtime/queries/kdl/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c879a9677..3b2a115f2 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -81,7 +81,7 @@
 | jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ | ✓ | ✓ | `julia` |
 | just | ✓ | ✓ | ✓ |  |
-| kdl | ✓ |  |  |  |
+| kdl | ✓ | ✓ | ✓ |  |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
 | latex | ✓ | ✓ |  | `texlab` |
 | lean | ✓ |  |  | `lean` |
diff --git a/languages.toml b/languages.toml
index 24e20654d..6e637be78 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2340,7 +2340,7 @@ injection-regex = "kdl"
 
 [[grammar]]
 name = "kdl"
-source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d15df6610484e1d4b5c987ecad52373" }
+source = { git = "https://github.com/amaanq/tree-sitter-kdl", rev = "3ca569b9f9af43593c24f9e7a21f02f43a13bb88" }
 
 [[language]]
 name = "xml"
diff --git a/runtime/queries/kdl/highlights.scm b/runtime/queries/kdl/highlights.scm
index d83bde19c..78e5acf49 100644
--- a/runtime/queries/kdl/highlights.scm
+++ b/runtime/queries/kdl/highlights.scm
@@ -1,12 +1,12 @@
-(comment) @comment
 (single_line_comment) @comment
+(multi_line_comment) @comment
 
 (node
-    name: (identifier) @function)
+    (identifier) @variable)
+
 (prop (identifier) @attribute)
-(type) @type
 
-(bare_identifier) @variable.other.member
+(type (_) @type) @punctuation.bracket
 
 (keyword) @keyword
 
diff --git a/runtime/queries/kdl/indents.scm b/runtime/queries/kdl/indents.scm
new file mode 100644
index 000000000..bc2ffc15d
--- /dev/null
+++ b/runtime/queries/kdl/indents.scm
@@ -0,0 +1,3 @@
+(node_children) @indent
+
+ "}" @outdent
diff --git a/runtime/queries/kdl/textobjects.scm b/runtime/queries/kdl/textobjects.scm
new file mode 100644
index 000000000..7f9a562cc
--- /dev/null
+++ b/runtime/queries/kdl/textobjects.scm
@@ -0,0 +1,27 @@
+(type (_) @test.inside) @test.around
+
+(node
+	children: (node_children)? @class.inside) @class.around
+
+(node
+	children: (node_children)? @function.inside) @function.around
+
+(node (identifier) @function.movement)
+
+[
+	(single_line_comment)
+	(multi_line_comment)
+] @comment.inside
+
+[
+	(single_line_comment)+
+	(multi_line_comment)+
+] @comment.around
+
+[
+	(prop)
+	(value)
+] @parameter.inside
+
+(value (type) ? (_) @parameter.inside @parameter.movement . ) @parameter.around
+

From 8dc197721bd6e7bb68e57ddeff0abf1aac067a1f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 3 Nov 2023 19:34:54 -0500
Subject: [PATCH 452/967] Add an installation method field to the bug report
 template (#8711)

We can guess the installation method from the version tag and platform
in some cases but it would be useful to have this be explicit for the
sake of debugging packager-specific problems.
---
 .github/ISSUE_TEMPLATE/bug_report.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 47fd3fe8a..52a4619fb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -55,6 +55,16 @@ body:
       placeholder: wezterm 20220101-133340-7edc5b5a
     validations:
       required: true
+  - type: input
+    id: installation-method
+    attributes:
+      label: Installation Method
+      description: >
+        How you installed Helix - from a package manager like Homebrew or the
+        AUR, built from source, downloaded a binary from the releases page, etc.
+      placeholder: "source / brew / nixpkgs / flake / releases page"
+    validations:
+      required: true
   - type: input
     id: helix-version
     attributes:

From 10b178e94b0d3c44c56f5cd573ff65b3249aea78 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 3 Nov 2023 20:35:38 -0400
Subject: [PATCH 453/967] swap yank command registers (#8708)

#8703 swapped the `+` and `*` registers, but did not swap them in the
corresponding yank commands.
---
 book/src/usage.md                |  4 ++--
 helix-term/src/commands.rs       | 24 ++++++++++++------------
 helix-term/src/commands/typed.rs | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/book/src/usage.md b/book/src/usage.md
index e392e5e67..e01482193 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -59,8 +59,8 @@ Some registers have special behavior when read from and written to.
 | `#`                | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
 | `.`                | Contents of the current selections | This register is not writable |
 | `%`                | Name of the current file | This register is not writable |
-| `*`                | Reads from the system clipboard | Joins and yanks to the system clipboard |
-| `+`                | Reads from the primary clipboard | Joins and yanks to the primary clipboard |
+| `+`                | Reads from the system clipboard | Joins and yanks to the system clipboard |
+| `*`                | Reads from the primary clipboard | Joins and yanks to the primary clipboard |
 
 When yanking multiple selections to the clipboard registers, the selections
 are joined with newlines. Pasting from these registers will paste multiple
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 75df430a3..648aa96e8 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3897,12 +3897,12 @@ fn yank(cx: &mut Context) {
 }
 
 fn yank_to_clipboard(cx: &mut Context) {
-    yank_impl(cx.editor, '*');
+    yank_impl(cx.editor, '+');
     exit_select_mode(cx);
 }
 
 fn yank_to_primary_clipboard(cx: &mut Context) {
-    yank_impl(cx.editor, '+');
+    yank_impl(cx.editor, '*');
     exit_select_mode(cx);
 }
 
@@ -3959,13 +3959,13 @@ fn yank_joined(cx: &mut Context) {
 
 fn yank_joined_to_clipboard(cx: &mut Context) {
     let line_ending = doc!(cx.editor).line_ending;
-    yank_joined_impl(cx.editor, line_ending.as_str(), '*');
+    yank_joined_impl(cx.editor, line_ending.as_str(), '+');
     exit_select_mode(cx);
 }
 
 fn yank_joined_to_primary_clipboard(cx: &mut Context) {
     let line_ending = doc!(cx.editor).line_ending;
-    yank_joined_impl(cx.editor, line_ending.as_str(), '+');
+    yank_joined_impl(cx.editor, line_ending.as_str(), '*');
     exit_select_mode(cx);
 }
 
@@ -3982,12 +3982,12 @@ fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
 }
 
 fn yank_main_selection_to_clipboard(cx: &mut Context) {
-    yank_primary_selection_impl(cx.editor, '*');
+    yank_primary_selection_impl(cx.editor, '+');
     exit_select_mode(cx);
 }
 
 fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
-    yank_primary_selection_impl(cx.editor, '+');
+    yank_primary_selection_impl(cx.editor, '*');
     exit_select_mode(cx);
 }
 
@@ -4088,19 +4088,19 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
 }
 
 fn paste_clipboard_after(cx: &mut Context) {
-    paste(cx.editor, '*', Paste::After, cx.count());
+    paste(cx.editor, '+', Paste::After, cx.count());
 }
 
 fn paste_clipboard_before(cx: &mut Context) {
-    paste(cx.editor, '*', Paste::Before, cx.count());
+    paste(cx.editor, '+', Paste::Before, cx.count());
 }
 
 fn paste_primary_clipboard_after(cx: &mut Context) {
-    paste(cx.editor, '+', Paste::After, cx.count());
+    paste(cx.editor, '*', Paste::After, cx.count());
 }
 
 fn paste_primary_clipboard_before(cx: &mut Context) {
-    paste(cx.editor, '+', Paste::Before, cx.count());
+    paste(cx.editor, '*', Paste::Before, cx.count());
 }
 
 fn replace_with_yanked(cx: &mut Context) {
@@ -4138,11 +4138,11 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
 }
 
 fn replace_selections_with_clipboard(cx: &mut Context) {
-    replace_with_yanked_impl(cx.editor, '*', cx.count());
+    replace_with_yanked_impl(cx.editor, '+', cx.count());
 }
 
 fn replace_selections_with_primary_clipboard(cx: &mut Context) {
-    replace_with_yanked_impl(cx.editor, '+', cx.count());
+    replace_with_yanked_impl(cx.editor, '*', cx.count());
 }
 
 fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index abe6dd97e..e73433080 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -921,7 +921,7 @@ fn yank_main_selection_to_clipboard(
         return Ok(());
     }
 
-    yank_primary_selection_impl(cx.editor, '*');
+    yank_primary_selection_impl(cx.editor, '+');
     Ok(())
 }
 
@@ -956,7 +956,7 @@ fn yank_joined_to_clipboard(
     let doc = doc!(cx.editor);
     let default_sep = Cow::Borrowed(doc.line_ending.as_str());
     let separator = args.first().unwrap_or(&default_sep);
-    yank_joined_impl(cx.editor, separator, '*');
+    yank_joined_impl(cx.editor, separator, '+');
     Ok(())
 }
 
@@ -969,7 +969,7 @@ fn yank_main_selection_to_primary_clipboard(
         return Ok(());
     }
 
-    yank_primary_selection_impl(cx.editor, '+');
+    yank_primary_selection_impl(cx.editor, '*');
     Ok(())
 }
 
@@ -985,7 +985,7 @@ fn yank_joined_to_primary_clipboard(
     let doc = doc!(cx.editor);
     let default_sep = Cow::Borrowed(doc.line_ending.as_str());
     let separator = args.first().unwrap_or(&default_sep);
-    yank_joined_impl(cx.editor, separator, '+');
+    yank_joined_impl(cx.editor, separator, '*');
     Ok(())
 }
 
@@ -998,7 +998,7 @@ fn paste_clipboard_after(
         return Ok(());
     }
 
-    paste(cx.editor, '*', Paste::After, 1);
+    paste(cx.editor, '+', Paste::After, 1);
     Ok(())
 }
 
@@ -1011,7 +1011,7 @@ fn paste_clipboard_before(
         return Ok(());
     }
 
-    paste(cx.editor, '*', Paste::Before, 1);
+    paste(cx.editor, '+', Paste::Before, 1);
     Ok(())
 }
 
@@ -1024,7 +1024,7 @@ fn paste_primary_clipboard_after(
         return Ok(());
     }
 
-    paste(cx.editor, '+', Paste::After, 1);
+    paste(cx.editor, '*', Paste::After, 1);
     Ok(())
 }
 
@@ -1037,7 +1037,7 @@ fn paste_primary_clipboard_before(
         return Ok(());
     }
 
-    paste(cx.editor, '+', Paste::Before, 1);
+    paste(cx.editor, '*', Paste::Before, 1);
     Ok(())
 }
 
@@ -1050,7 +1050,7 @@ fn replace_selections_with_clipboard(
         return Ok(());
     }
 
-    replace_with_yanked_impl(cx.editor, '*', 1);
+    replace_with_yanked_impl(cx.editor, '+', 1);
     Ok(())
 }
 
@@ -1063,7 +1063,7 @@ fn replace_selections_with_primary_clipboard(
         return Ok(());
     }
 
-    replace_with_yanked_impl(cx.editor, '+', 1);
+    replace_with_yanked_impl(cx.editor, '*', 1);
     Ok(())
 }
 

From 2fddc2a4fcd3b8d9415e35994af3049d6960b23a Mon Sep 17 00:00:00 2001
From: MDeiml <matthias@deiml.net>
Date: Sun, 5 Nov 2023 13:04:20 +0100
Subject: [PATCH 454/967] Update markdown grammar to v0.1.6

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

diff --git a/languages.toml b/languages.toml
index 6e637be78..e3f9395bf 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1383,7 +1383,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "markdown"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", subpath = "tree-sitter-markdown" }
+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee", subpath = "tree-sitter-markdown" }
 
 [[language]]
 name = "markdown.inline"
@@ -1395,7 +1395,7 @@ grammar = "markdown_inline"
 
 [[grammar]]
 name = "markdown_inline"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", subpath = "tree-sitter-markdown-inline" }
+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee", subpath = "tree-sitter-markdown-inline" }
 
 [[language]]
 name = "dart"

From a98ad137f9b0678ce9770aaa56a8bf8ca7c51d17 Mon Sep 17 00:00:00 2001
From: postsolar <120750161+postsolar@users.noreply.github.com>
Date: Sun, 5 Nov 2023 15:16:25 +0200
Subject: [PATCH 455/967] Update PureScript grammar (#8712)

---
 languages.toml                            |  2 +-
 runtime/queries/purescript/highlights.scm | 38 ++++++++++++++++++-----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/languages.toml b/languages.toml
index e3f9395bf..9b7d93ed2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1142,7 +1142,7 @@ formatter = { command = "purs-tidy", args = ["format"] }
 
 [[grammar]]
 name = "purescript"
-source = { git = "https://github.com/maskhjarna/tree-sitter-purescript", rev = "0e36a885a941078bf40e559026be425764dc27bf" }
+source = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "593193b9bf0f46d5eee708a4e53044d2a9054897" }
 
 [[language]]
 name = "zig"
diff --git a/runtime/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
index f559fd1ea..b110f3e01 100644
--- a/runtime/queries/purescript/highlights.scm
+++ b/runtime/queries/purescript/highlights.scm
@@ -3,15 +3,13 @@
 
  (integer) @constant.numeric.integer
  (exp_negation) @constant.numeric.integer
- (exp_literal (float)) @constant.numeric.float
+ (exp_literal (number)) @constant.numeric.float
  (char) @constant.character
  [
    (string)
    (triple_quote_string)
  ] @string
 
- (con_unit) @constant.builtin ; unit, as in ()
-
  (comment) @comment
 
 
@@ -36,6 +34,10 @@
 ; ----------------------------------------------------------------------------
 ; Keywords, operators, includes
 
+ ; This needs to come before the other "else" in
+ ; order to be highlighted correctly
+ (class_instance "else" @keyword)
+
  [
    "if"
    "then"
@@ -53,15 +55,20 @@
    (operator)
    (constructor_operator)
    (type_operator)
-   (tycon_arrow)
    (qualified_module)  ; grabs the `.` (dot), ex: import System.IO
    (all_names)
+
+   ; `_` wildcards in if-then-else and case-of expressions,
+   ; as well as record updates and operator sections
+   (wildcard)
    "="
    "|"
    "::"
    "∷"
    "=>"
    "⇒"
+   "<="
+   "⇐"
    "->"
    "→"
    "<-"
@@ -89,6 +96,7 @@
    "newtype"
    "type"
    "as"
+   "hiding"
    "do"
    "ado"
    "forall"
@@ -98,24 +106,40 @@
    "infixr"
  ] @keyword
 
+ (type_role_declaration
+   "role" @keyword
+   role: (type_role) @keyword)
+
+ (hole) @label
 
 ; ----------------------------------------------------------------------------
 ; Functions and variables
 
+ (row_field (field_name) @variable.other.member)
+ (record_field (field_name) @variable.other.member)
+ (record_accessor (variable) @variable.other.member)
+ (exp_record_access (variable) @variable.other.member)
+
  (signature name: (variable) @type)
  (function name: (variable) @function)
+ (class_instance (instance_name) @function)
+ (derive_declaration (instance_name) @function)
 
  ; true or false
 ((variable) @constant.builtin.boolean
  (#match? @constant.builtin.boolean "^(true|false)$"))
 
- (variable) @variable
+ ; The former one works for `tree-sitter highlight` but not in Helix/Kakoune.
+ ; The latter two work in Helix (but not Kakoune) and are a good compromise between not highlighting anything at all
+ ; as an operator and leaving it to the child nodes, and highlighting everything as an operator.
+ (exp_ticked (_) @operator)
+ (exp_ticked (exp_name (variable) @operator))
+ (exp_ticked (exp_name (qualified_variable (variable) @operator)))
 
- (exp_infix (variable) @operator)  ; consider infix functions as operators
+ (variable) @variable
 
  ("@" @namespace)  ; "as" pattern operator, e.g. x@Constructor
 
-
 ; ----------------------------------------------------------------------------
 ; Types
 

From f73e9a8d15fd5a87d472a49808baf42ba403f9bf Mon Sep 17 00:00:00 2001
From: Joey Hain <hain.joseph@gmail.com>
Date: Sun, 5 Nov 2023 17:54:25 -0800
Subject: [PATCH 456/967] highlights: add type.parameter scope to several more
 languages  (#8718)

* typescript

* go

* haskell

* ocaml

* kotlin (+ bugfix)
---
 runtime/queries/_typescript/highlights.scm |  2 ++
 runtime/queries/_typescript/locals.scm     | 17 +++++++++++++++++
 runtime/queries/go/highlights.scm          | 16 ++++++++++++----
 runtime/queries/go/locals.scm              | 12 ++++++++++--
 runtime/queries/haskell/highlights.scm     |  2 +-
 runtime/queries/kotlin/highlights.scm      |  5 ++++-
 runtime/queries/kotlin/locals.scm          | 15 +++++++++++++++
 runtime/queries/ocaml/highlights.scm       |  2 ++
 8 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 runtime/queries/kotlin/locals.scm

diff --git a/runtime/queries/_typescript/highlights.scm b/runtime/queries/_typescript/highlights.scm
index a83b43475..f9a672667 100644
--- a/runtime/queries/_typescript/highlights.scm
+++ b/runtime/queries/_typescript/highlights.scm
@@ -107,6 +107,8 @@
 ; Types
 ; -----
 
+(type_parameter
+  name: (type_identifier) @type.parameter)
 (type_identifier) @type
 (predefined_type) @type.builtin
 
diff --git a/runtime/queries/_typescript/locals.scm b/runtime/queries/_typescript/locals.scm
index fe13f21d3..041ad59d1 100644
--- a/runtime/queries/_typescript/locals.scm
+++ b/runtime/queries/_typescript/locals.scm
@@ -1,6 +1,18 @@
+; Scopes
+;-------
+
+[
+  (type_alias_declaration)
+  (class_declaration)
+  (interface_declaration)
+] @local.scope
+
 ; Definitions
 ;------------
 
+(type_parameter
+  name: (type_identifier) @local.definition)
+
 ; Javascript and Typescript Treesitter grammars deviate when defining the
 ; tree structure for parameters, so we need to address them in each specific
 ; language instead of ecma.
@@ -14,3 +26,8 @@
 ; (i?: t = 1) // Invalid but still posible to hihglight.
 (optional_parameter
   (identifier) @local.definition)
+
+; References
+;-----------
+
+(type_identifier) @local.reference
diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index b45a11bee..fba2df99e 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -11,6 +11,18 @@
   function: (selector_expression
     field: (field_identifier) @function.method))
 
+
+; Types
+
+(type_parameter_list
+  (parameter_declaration
+    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)$"))
+
+(type_identifier) @type
+
 ; Function definitions
 
 (function_declaration
@@ -30,10 +42,6 @@
 (parameter_declaration (identifier) @variable.parameter)
 (variadic_parameter_declaration (identifier) @variable.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)$"))
-
-(type_identifier) @type
 (type_spec 
   name: (type_identifier) @constructor)
 (field_identifier) @variable.other.member
diff --git a/runtime/queries/go/locals.scm b/runtime/queries/go/locals.scm
index aae562571..14a6f3e43 100644
--- a/runtime/queries/go/locals.scm
+++ b/runtime/queries/go/locals.scm
@@ -1,9 +1,17 @@
 ; Scopes
 
-(block) @local.scope
+[
+  (function_declaration)
+  (type_declaration)
+  (block)
+] @local.scope
 
 ; Definitions
 
+(type_parameter_list
+  (parameter_declaration
+    name: (identifier) @local.definition))
+
 (parameter_declaration (identifier) @local.definition)
 (variadic_parameter_declaration (identifier) @local.definition)
 
@@ -27,4 +35,4 @@
 
 (identifier) @local.reference
 (field_identifier) @local.reference
-
+(type_identifier) @local.reference
diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index 18c57c930..3d416de8d 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -124,7 +124,7 @@
 ;; Types
 
 (type) @type
-(type_variable) @type
+(type_variable) @type.parameter
 
 (constructor) @constructor
 
diff --git a/runtime/queries/kotlin/highlights.scm b/runtime/queries/kotlin/highlights.scm
index 208a673f3..5b19f849e 100644
--- a/runtime/queries/kotlin/highlights.scm
+++ b/runtime/queries/kotlin/highlights.scm
@@ -244,7 +244,10 @@
 	. (identifier)) @namespace
 
 ((type_identifier) @type.builtin
-	(#match? @function.builtin "^(Byte|Short|Int|Long|UByte|UShort|UInt|ULong|Float|Double|Boolean|Char|String|Array|ByteArray|ShortArray|IntArray|LongArray|UByteArray|UShortArray|UIntArray|ULongArray|FloatArray|DoubleArray|BooleanArray|CharArray|Map|Set|List|EmptyMap|EmptySet|EmptyList|MutableMap|MutableSet|MutableList)$"))
+	(#match? @type.builtin "^(Byte|Short|Int|Long|UByte|UShort|UInt|ULong|Float|Double|Boolean|Char|String|Array|ByteArray|ShortArray|IntArray|LongArray|UByteArray|UShortArray|UIntArray|ULongArray|FloatArray|DoubleArray|BooleanArray|CharArray|Map|Set|List|EmptyMap|EmptySet|EmptyList|MutableMap|MutableSet|MutableList)$"))
+
+(type_parameter
+  (type_identifier) @type.parameter)
 
 (type_identifier) @type
 
diff --git a/runtime/queries/kotlin/locals.scm b/runtime/queries/kotlin/locals.scm
new file mode 100644
index 000000000..752ed995e
--- /dev/null
+++ b/runtime/queries/kotlin/locals.scm
@@ -0,0 +1,15 @@
+; Scopes
+
+[
+  (class_declaration)
+  (function_declaration)
+] @local.scope
+
+; Definitions
+
+(type_parameter
+  (type_identifier) @local.definition)
+
+; References
+
+(type_identifier) @local.reference
diff --git a/runtime/queries/ocaml/highlights.scm b/runtime/queries/ocaml/highlights.scm
index a08b12670..9d3bf4c8b 100644
--- a/runtime/queries/ocaml/highlights.scm
+++ b/runtime/queries/ocaml/highlights.scm
@@ -8,6 +8,8 @@
 
 [(class_name) (class_type_name) (type_constructor)] @type
 
+(type_variable) @type.parameter
+
 [(constructor_name) (tag)] @constructor
 
 ; Functions

From 7bc564d3dcdee69555578bbec75d08e6ce227a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Mon, 6 Nov 2023 22:33:18 +0100
Subject: [PATCH 457/967] Theme: Papercolor: Add type.parameter (#8735)

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

diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index ae104e17e..5c59d6f51 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -52,6 +52,7 @@
 
 "type" = { fg = "bright2", modifiers = ["bold"] }
 "type.builtin" = { fg = "bright2", modifiers = ["bold"] }
+"type.parameter" = { fg = "foreground" }
 "type.enum" = { fg = "foreground" }
 "type.enum.variant" = { fg = "foreground" }
 

From e868678139bc8f4f5b14236c3c3c3f6aa4aab47b Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Wed, 8 Nov 2023 19:38:17 +0100
Subject: [PATCH 458/967] Add command to move files with LSP support (#8584)

* Added rename command

* Added an error if the new path already exists

* Fixed wrong command name being used

* fixed clippy suggestions

* removed didRenameFiles call, fixed early return due to path Err

* added ':rnm' alias to ':rename'

* code cleanup

* formatting

* removed debug line

* cargo fmt

* Improved new buffer error message

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

* Removed unnecessary path normalizing

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

* Update helix-term/src/commands/typed.rs

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

* Update helix-term/src/commands/typed.rs

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

* Update helix-term/src/commands/typed.rs

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

* Update helix-term/src/commands/typed.rs

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

* feat: change `rename` command to `move`

* feat: add multi lsp support when moving files

* feat: allow lsp calls with a custom timeout

* feat: sending lsp file_changed event once file has moved

---------

Co-authored-by: ontley <theontley@gmail.com>
Co-authored-by: ontley <67148677+ontley@users.noreply.github.com>
Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 book/src/generated/typable-cmd.md |  1 +
 helix-lsp/src/client.rs           | 76 +++++++++++++++++++++++++++-
 helix-term/src/commands/typed.rs  | 84 ++++++++++++++++++++++++++++++-
 3 files changed, 159 insertions(+), 2 deletions(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 4b737893d..6280d3c72 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -85,3 +85,4 @@
 | `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
 | `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
 | `:redraw` | Clear and re-render the whole UI |
+| `:move` | Move the current buffer and its corresponding file to a different path |
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 341702c37..e6e1f8a03 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -401,12 +401,22 @@ impl Client {
         &self,
         params: R::Params,
     ) -> impl Future<Output = Result<Value>>
+    where
+        R::Params: serde::Serialize,
+    {
+        self.call_with_timeout::<R>(params, self.req_timeout)
+    }
+
+    fn call_with_timeout<R: lsp::request::Request>(
+        &self,
+        params: R::Params,
+        timeout_secs: u64,
+    ) -> impl Future<Output = Result<Value>>
     where
         R::Params: serde::Serialize,
     {
         let server_tx = self.server_tx.clone();
         let id = self.next_request_id();
-        let timeout_secs = self.req_timeout;
 
         async move {
             use std::time::Duration;
@@ -548,6 +558,11 @@ impl Client {
                         dynamic_registration: Some(true),
                         relative_pattern_support: Some(false),
                     }),
+                    file_operations: Some(lsp::WorkspaceFileOperationsClientCapabilities {
+                        will_rename: Some(true),
+                        did_rename: Some(true),
+                        ..Default::default()
+                    }),
                     ..Default::default()
                 }),
                 text_document: Some(lsp::TextDocumentClientCapabilities {
@@ -700,6 +715,65 @@ impl Client {
         })
     }
 
+    pub fn prepare_file_rename(
+        &self,
+        old_uri: &lsp::Url,
+        new_uri: &lsp::Url,
+    ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support willRename feature
+        match &capabilities.workspace {
+            Some(workspace) => match &workspace.file_operations {
+                Some(op) => {
+                    op.will_rename.as_ref()?;
+                }
+                _ => return None,
+            },
+            _ => return None,
+        }
+
+        let files = vec![lsp::FileRename {
+            old_uri: old_uri.to_string(),
+            new_uri: new_uri.to_string(),
+        }];
+        let request = self.call_with_timeout::<lsp::request::WillRenameFiles>(
+            lsp::RenameFilesParams { files },
+            5,
+        );
+
+        Some(async move {
+            let json = request.await?;
+            let response: Option<lsp::WorkspaceEdit> = serde_json::from_value(json)?;
+            Ok(response.unwrap_or_default())
+        })
+    }
+
+    pub fn did_file_rename(
+        &self,
+        old_uri: &lsp::Url,
+        new_uri: &lsp::Url,
+    ) -> Option<impl Future<Output = std::result::Result<(), Error>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support DidRename feature
+        match &capabilities.workspace {
+            Some(workspace) => match &workspace.file_operations {
+                Some(op) => {
+                    op.did_rename.as_ref()?;
+                }
+                _ => return None,
+            },
+            _ => return None,
+        }
+
+        let files = vec![lsp::FileRename {
+            old_uri: old_uri.to_string(),
+            new_uri: new_uri.to_string(),
+        }];
+        Some(self.notify::<lsp::notification::DidRenameFiles>(lsp::RenameFilesParams { files }))
+    }
+
     // -------------------------------------------------------------------------------------------
     // Text document
     // -------------------------------------------------------------------------------------------
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index e73433080..4148257fc 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -6,7 +6,8 @@ use crate::job::Job;
 use super::*;
 
 use helix_core::fuzzy::fuzzy_match;
-use helix_core::{encoding, line_ending, shellwords::Shellwords};
+use helix_core::{encoding, line_ending, path::get_canonicalized_path, shellwords::Shellwords};
+use helix_lsp::{OffsetEncoding, Url};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
 use serde_json::Value;
@@ -2408,6 +2409,80 @@ fn redraw(
     Ok(())
 }
 
+fn move_buffer(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    ensure!(args.len() == 1, format!(":move takes one argument"));
+    let doc = doc!(cx.editor);
+
+    let new_path = get_canonicalized_path(&PathBuf::from(args.first().unwrap().to_string()));
+    let old_path = doc
+        .path()
+        .ok_or_else(|| anyhow!("Scratch buffer cannot be moved. Use :write instead"))?
+        .clone();
+    let old_path_as_url = doc.url().unwrap();
+    let new_path_as_url = Url::from_file_path(&new_path).unwrap();
+
+    let edits: Vec<(
+        helix_lsp::Result<helix_lsp::lsp::WorkspaceEdit>,
+        OffsetEncoding,
+        String,
+    )> = doc
+        .language_servers()
+        .map(|lsp| {
+            (
+                lsp.prepare_file_rename(&old_path_as_url, &new_path_as_url),
+                lsp.offset_encoding(),
+                lsp.name().to_owned(),
+            )
+        })
+        .filter(|(f, _, _)| f.is_some())
+        .map(|(f, encoding, name)| (helix_lsp::block_on(f.unwrap()), encoding, name))
+        .collect();
+
+    for (lsp_reply, encoding, name) in edits {
+        match lsp_reply {
+            Ok(edit) => {
+                if let Err(e) = apply_workspace_edit(cx.editor, encoding, &edit) {
+                    log::error!(
+                        ":move command failed to apply edits from lsp {}: {:?}",
+                        name,
+                        e
+                    );
+                };
+            }
+            Err(e) => {
+                log::error!("LSP {} failed to treat willRename request: {:?}", name, e);
+            }
+        };
+    }
+
+    let doc = doc_mut!(cx.editor);
+
+    doc.set_path(Some(new_path.as_path()));
+    if let Err(e) = std::fs::rename(&old_path, &new_path) {
+        doc.set_path(Some(old_path.as_path()));
+        bail!("Could not move file: {}", e);
+    };
+
+    doc.language_servers().for_each(|lsp| {
+        lsp.did_file_rename(&old_path_as_url, &new_path_as_url);
+    });
+
+    cx.editor
+        .language_servers
+        .file_event_handler
+        .file_changed(new_path);
+
+    Ok(())
+}
+
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
     TypableCommand {
         name: "quit",
@@ -3008,6 +3083,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         fun: redraw,
         signature: CommandSignature::none(),
     },
+    TypableCommand {
+        name: "move",
+        aliases: &[],
+        doc: "Move the current buffer and its corresponding file to a different path",
+        fun: move_buffer,
+        signature: CommandSignature::positional(&[completers::filename]),
+    },
 ];
 
 pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =

From cb0bc25a9fc00c2b5c7450754d096bec39cd26e6 Mon Sep 17 00:00:00 2001
From: Triton171 <daniel.ebert@protonmail.com>
Date: Wed, 8 Nov 2023 20:53:07 +0100
Subject: [PATCH 459/967] Add indent queries for scheme (and reuse them for
 common-lisp & racket). (#8720)

---
 book/src/generated/lang-support.md      |  6 ++--
 languages.toml                          |  1 +
 runtime/queries/common-lisp/indents.scm |  1 +
 runtime/queries/racket/indents.scm      |  1 +
 runtime/queries/scheme/indents.scm      | 43 +++++++++++++++++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 runtime/queries/common-lisp/indents.scm
 create mode 100644 runtime/queries/racket/indents.scm
 create mode 100644 runtime/queries/scheme/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 3b2a115f2..9c55b4a05 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -16,7 +16,7 @@
 | clojure | ✓ |  |  | `clojure-lsp` |
 | cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
 | comment | ✓ |  |  |  |
-| common-lisp | ✓ |  |  | `cl-lsp` |
+| common-lisp | ✓ |  | ✓ | `cl-lsp` |
 | cpon | ✓ |  | ✓ |  |
 | cpp | ✓ | ✓ | ✓ | `clangd` |
 | crystal | ✓ | ✓ |  | `crystalline` |
@@ -128,7 +128,7 @@
 | python | ✓ | ✓ | ✓ | `pylsp` |
 | qml | ✓ |  | ✓ | `qmlls` |
 | r | ✓ |  |  | `R` |
-| racket | ✓ |  |  | `racket` |
+| racket | ✓ |  | ✓ | `racket` |
 | regex | ✓ |  |  |  |
 | rego | ✓ |  |  | `regols` |
 | rescript | ✓ | ✓ |  | `rescript-language-server` |
@@ -140,7 +140,7 @@
 | rust | ✓ | ✓ | ✓ | `rust-analyzer` |
 | sage | ✓ | ✓ |  |  |
 | scala | ✓ |  | ✓ | `metals` |
-| scheme | ✓ |  |  |  |
+| scheme | ✓ |  | ✓ |  |
 | scss | ✓ |  |  | `vscode-css-language-server` |
 | slint | ✓ |  | ✓ | `slint-lsp` |
 | smithy | ✓ |  |  | `cs` |
diff --git a/languages.toml b/languages.toml
index 9b7d93ed2..11df7d247 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1278,6 +1278,7 @@ roots = []
 file-types = ["rkt", "rktd", "rktl", "scrbl"]
 shebangs = ["racket"]
 comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
 language-servers = [ "racket" ]
 grammar = "scheme"
 
diff --git a/runtime/queries/common-lisp/indents.scm b/runtime/queries/common-lisp/indents.scm
new file mode 100644
index 000000000..e11eb7881
--- /dev/null
+++ b/runtime/queries/common-lisp/indents.scm
@@ -0,0 +1 @@
+; inherits: scheme
diff --git a/runtime/queries/racket/indents.scm b/runtime/queries/racket/indents.scm
new file mode 100644
index 000000000..e11eb7881
--- /dev/null
+++ b/runtime/queries/racket/indents.scm
@@ -0,0 +1 @@
+; inherits: scheme
diff --git a/runtime/queries/scheme/indents.scm b/runtime/queries/scheme/indents.scm
new file mode 100644
index 000000000..b00b29652
--- /dev/null
+++ b/runtime/queries/scheme/indents.scm
@@ -0,0 +1,43 @@
+; This roughly follows the description at: https://github.com/ds26gte/scmindent#how-subforms-are-indented
+
+; Exclude literals in the first patterns, since different rules apply for them.
+; Similarly, exclude certain keywords (detected by a regular expression).
+; If a list has 2 elements on the first line, it is aligned to the second element.
+(list . (_) @first . (_) @anchor
+  (#same-line? @first @anchor)
+  (#set! "scope" "tail")
+  (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
+  (#not-match? @first "def.*|let.*|set!")) @align
+; If the first element in a list is also a list and on a line by itself, the outer list is aligned to it
+(list . (list) @anchor .
+  (#set! "scope" "tail")
+  (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")) @align
+(list . (list) @anchor . (_) @second
+  (#not-same-line? @anchor @second)
+  (#set! "scope" "tail")
+  (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
+  (#not-match? @first "def.*|let.*|set!")) @align
+; If the first element in a list is not a list and on a line by itself, the outer list is aligned to
+; it plus 1 additional space. This cannot currently be modelled exactly by our indent queries,
+; but the following is equivalent, assuming that:
+; - the indent width is 2 (the default for scheme)
+; - There is no space between the opening parenthesis of the list and the first element
+(list . (_) @first .
+  (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
+  (#not-match? @first "def.*|let.*|set!")) @indent
+(list . (_) @first . (_) @second
+  (#not-same-line? @first @second)
+  (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
+  (#not-match? @first "def.*|let.*|set!")) @indent
+
+; If the first element in a list is a literal, align the list to it
+(list . [(boolean) (character) (string) (number)] @anchor
+  (#set! "scope" "tail")) @align
+
+; If the first element is among a set of predefined keywords, align the list to this element
+; plus 1 space (using the same workaround as above for now). This is a simplification since actually
+; the second line of the list should be indented by 2 spaces more in some cases. Supporting this would
+; be possible but require significantly more patterns.
+(list . (symbol) @first
+  (#match? @first "def.*|let.*|set!")) @indent
+

From 676ab0c1f392888a3dd44e3c6b84ac4b15dde59e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:12:45 +0900
Subject: [PATCH 460/967] build(deps): bump serde from 1.0.190 to 1.0.191
 (#8740)

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 b5f25da4b..ea167d3ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1869,18 +1869,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.190"
+version = "1.0.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "a834c4821019838224821468552240d4d95d14e751986442c816572d39a080c9"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.190"
+version = "1.0.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "46fa52d5646bce91b680189fe5b1c049d2ea38dabb4e2e7c8d00ca12cfbfbcfd"
 dependencies = [
  "proc-macro2",
  "quote",

From 91bdceb8b607300516c041977881f94014ae7cde Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:12:54 +0900
Subject: [PATCH 461/967] build(deps): bump serde_json from 1.0.107 to 1.0.108
 (#8744)

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 ea167d3ce..2c83a0997 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1889,9 +1889,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",

From aac7bd9b08c72af161684cefc56fc1a3e59b5b1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:13:03 +0900
Subject: [PATCH 462/967] build(deps): bump libc from 0.2.149 to 0.2.150
 (#8741)

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

diff --git a/Cargo.lock b/Cargo.lock
index 2c83a0997..82bb2e6ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1433,9 +1433,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index a84d372fd..c6374de54 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -69,7 +69,7 @@ grep-searcher = "0.1.11"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.149"
+libc = "0.2.150"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }

From 4229583631e0aedf6571e0479f574b5efd2eb98a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:13:32 +0900
Subject: [PATCH 463/967] build(deps): bump futures-executor from 0.3.28 to
 0.3.29 (#8743)

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 82bb2e6ee..e1df49f49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -534,9 +534,9 @@ checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
 dependencies = [
  "futures-core",
  "futures-task",

From 6ab774da0b473c36a437d90abcdac3558353d32e Mon Sep 17 00:00:00 2001
From: mydumpfire <134539278+mydumpfire@users.noreply.github.com>
Date: Thu, 9 Nov 2023 15:56:57 +0700
Subject: [PATCH 464/967] grammars.nix: allow the user to apply overlays
 (#8749)

You can now apply overlays to the grammar derivations via
`grammarOverlays`. Also, the `src` in the derivation is now properly
unpacked to the build directory, allowing the user to mutate the source
files if they want to.
---
 grammars.nix | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/grammars.nix b/grammars.nix
index 9ca0cf3d6..843fa02ad 100644
--- a/grammars.nix
+++ b/grammars.nix
@@ -5,6 +5,7 @@
   runCommand,
   yj,
   includeGrammarIf ? _: true,
+  grammarOverlays ? [],
   ...
 }: let
   # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
@@ -48,22 +49,22 @@
       then sourceGitHub
       else sourceGit;
   in
-    stdenv.mkDerivation rec {
+    stdenv.mkDerivation {
       # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
 
       pname = "helix-tree-sitter-${grammar.name}";
       version = grammar.source.rev;
 
-      src =
-        if builtins.hasAttr "subpath" grammar.source
-        then "${source}/${grammar.source.subpath}"
-        else source;
+      src = source;
+      sourceRoot = if builtins.hasAttr "subpath" grammar.source then
+        "source/${grammar.source.subpath}"
+      else
+        "source";
 
-      dontUnpack = true;
       dontConfigure = true;
 
       FLAGS = [
-        "-I${src}/src"
+        "-Isrc"
         "-g"
         "-O3"
         "-fPIC"
@@ -76,13 +77,13 @@
       buildPhase = ''
         runHook preBuild
 
-        if [[ -e "$src/src/scanner.cc" ]]; then
-          $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS
-        elif [[ -e "$src/src/scanner.c" ]]; then
-          $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS
+        if [[ -e src/scanner.cc ]]; then
+          $CXX -c src/scanner.cc -o scanner.o $FLAGS
+        elif [[ -e src/scanner.c ]]; then
+          $CC -c src/scanner.c -o scanner.o $FLAGS
         fi
 
-        $CC -c "$src/src/parser.c" -o parser.o $FLAGS
+        $CC -c src/parser.c -o parser.o $FLAGS
         $CXX -shared -o $NAME.so *.o
 
         ls -al
@@ -105,15 +106,17 @@
       '';
     };
   grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
-  builtGrammars =
-    builtins.map (grammar: {
-      inherit (grammar) name;
-      artifact = buildGrammar grammar;
-    })
-    grammarsToBuild;
-  grammarLinks =
-    builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
-    builtGrammars;
+  builtGrammars = builtins.map (grammar: {
+    inherit (grammar) name;
+    value = buildGrammar grammar;
+  }) grammarsToBuild;
+  extensibleGrammars =
+    lib.makeExtensible (self: builtins.listToAttrs builtGrammars);
+  overlayedGrammars = lib.pipe extensibleGrammars
+    (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);
+  grammarLinks = lib.mapAttrsToList
+    (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")
+    (lib.filterAttrs (n: v: lib.isDerivation v) overlayedGrammars);
 in
   runCommand "consolidated-helix-grammars" {} ''
     mkdir -p $out

From 172ef2fa9f2322b3a82729c584ede6cb84879b91 Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Mon, 13 Nov 2023 02:04:03 +0400
Subject: [PATCH 465/967] Highlight meson_options.txt as a meson file (#8794)

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

diff --git a/languages.toml b/languages.toml
index 11df7d247..7d4326a1d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1943,7 +1943,7 @@ source = { git = "https://github.com/ap29600/tree-sitter-odin", rev = "b219207e4
 name = "meson"
 scope = "source.meson"
 injection-regex = "meson"
-file-types = ["meson.build"]
+file-types = ["meson.build", "meson_options.txt"]
 roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }

From 23fea46815371a8e1a0fa340be34d80624cd9bcc Mon Sep 17 00:00:00 2001
From: Ambuj Singh <97109381+that-ambuj@users.noreply.github.com>
Date: Mon, 13 Nov 2023 03:34:36 +0530
Subject: [PATCH 466/967] theme: Add Theme poimandres (#8759)

* theme: Add Theme poimandres

* theme: inherit `poimandres_storm` from `poimandres` with minor tweaks

* fix(theme): rename `crossed-out` to `crossed_out`

* fix(theme:poimandres): improve contrast of selection color for regular variant
---
 runtime/themes/poimandres.toml       | 113 +++++++++++++++++++++++++++
 runtime/themes/poimandres_storm.toml |  19 +++++
 2 files changed, 132 insertions(+)
 create mode 100644 runtime/themes/poimandres.toml
 create mode 100644 runtime/themes/poimandres_storm.toml

diff --git a/runtime/themes/poimandres.toml b/runtime/themes/poimandres.toml
new file mode 100644
index 000000000..5dbc799d5
--- /dev/null
+++ b/runtime/themes/poimandres.toml
@@ -0,0 +1,113 @@
+# Author: Ambuj Kumar <ambujs89@gmail.com>
+# Ported from: https://github.com/drcmda/poimandres-theme
+
+attribute = { fg = "desaturatedBlue", modifiers = ["italic"] }
+keyword = "brightMint"
+"keyword.directive" = "gray"
+"keyword.storage.type" = "desaturatedBlue"
+"keyword.storage.modifier" = "lowerMint"
+"keyword.other" = "brightMint"
+"keyword.operator" = "desaturatedBlue"
+namespace = "lightBlue"
+punctuation = "gray"
+"punctuation.bracket" = "desaturatedBlue"
+operator = "desaturatedBlue"
+special = "desaturatedBlue"
+variable = "offWhite"
+"variable.parameter" = { fg = "offWhite" }
+"variable.builtin" = { fg = "lightBlue", modifiers = ["italic"] }
+"variable.other" = "offWhite"
+type = { fg = "gray.c0" }
+"type.builtin" = { fg = "desaturatedBlue" }
+constructor = "lightBlue"
+function = "lightBlue"
+"function.method" = { fg = "lightBlue" }
+tag = "brightMint"
+comment = { fg = "darkerGray.b0", modifiers = ["italic"] }
+constant = "brightMint"
+"constant.character.escape" = { fg = "offWhite" }
+"constant.numeric" = { fg = "brightMint" }
+"constant.builtin" = { fg = "hotRed" }
+label = { fg = "gray.c0" }
+string = { fg = "brightMint" }
+
+# Markup
+"markup.heading" = { fg = "brightMint" }
+"markup.bold" = { fg = "bluishGrayBrighter", modifiers = ["bold"] }
+"markup.italic" = { fg = "bluishGrayBrighter", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["italic", "crossed_out"] }
+
+# UI
+"markup.link.url" = { fg = "lightBlue", modifiers = ["underlined"] }
+"markup.link.text" = { fg = "lightBlue", modifiers = ["underlined"] }
+"markup.raw" = { fg = "lightBlue" }
+
+"ui.background" = { bg = "bg" }
+"ui.background.separator" = { fg = "darkerGray" }
+"ui.linenr" = "darkerGray.50"
+"ui.linenr.selected" = "offWhite"
+"ui.cursor" = { bg = "gray", fg = "bg" }
+"ui.cursor.match" = { bg = "focus" }
+"ui.cursorline" = { bg = "#242837" }
+
+"ui.popup" = { bg = "#20232d" }
+"ui.window" = "gray"
+
+"ui.text" = "gray"
+"ui.text.focus" = { fg = "offWhite", bg = "focus", modifiers = ["bold"] }
+"ui.text.inactive" = "darkerGray"
+"ui.virtual" = { fg = "darkerGray.b0" }
+"ui.virtual.indent-guide" = "#303442"
+
+"ui.selection" = { bg = "focus" }
+"ui.selection.primary" = { bg = "selection" }
+
+"ui.menu" = { fg = "offWhite", bg = "bg" }
+"ui.menu.selected" = { fg = "bg", bg = "gray" }
+"ui.menu.scroll" = { fg = "gray", bg = "bg" }
+
+"ui.statusline" = { fg = "offWhite", bg = "selection" }
+"ui.statusline.inactive" = { fg = "lightBlue", bg = "bg" }
+"ui.statusline.normal" = { bg = "lightBlue", fg = "bg", modifiers = ["bold"] }
+"ui.statusline.insert" = { bg = "brightMint", fg = "bg", modifiers = ["bold"] }
+"ui.statusline.select" = { bg = "hotRed", fg = "bg", modifiers = ["bold"] }
+
+"diagnostic.hint" = { underline = { color = "lowerMint", style = "curl" } }
+"diagnostic.info" = { underline = { color = "lightBlue", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "brightYellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "hotRed", style = "curl" } }
+
+hint = "lowerMint"
+info = "lightBlue"
+warning = "brightYellow"
+error = "hotRed"
+
+# Version Control
+"diff.plus" = "lowerMint"
+"diff.minus" = "hotRed"
+"diff.delta" = "lightBlue"
+
+[palette]
+brightYellow = "#fffac2"
+brightMint = "#5DE4c7"
+lowerMint = "#5fb3a1"
+blueishGreen = "#42675A"
+lowerBlue = "#89ddff"
+lightBlue = "#ADD7FF"
+desaturatedBlue = "#91B4D5"
+bluishGrayBrighter = "#7390AA"
+hotRed = "#d0679d"
+pink = "#f087bd"
+gray = "#a6accd"
+"gray.c0" = "#98a0c2"
+darkerGray = "#767c9d"
+"darkerGray.50" = "#404559"
+"darkerGray.b0" = "#6c7494"
+bluishGray = "#506477"
+focus = "#303340"
+bg = "#1b1e28"
+offWhite = "#e4f0fb"
+selection = "#30354a"
+white = "#ffffff"
+black = "#000000"
+transparent = "#00000000"
diff --git a/runtime/themes/poimandres_storm.toml b/runtime/themes/poimandres_storm.toml
new file mode 100644
index 000000000..123122070
--- /dev/null
+++ b/runtime/themes/poimandres_storm.toml
@@ -0,0 +1,19 @@
+# Author: Ambuj Kumar <ambujs89@gmail.com>
+# Ported from: https://github.com/drcmda/poimandres-theme
+
+inherits = "poimandres"
+
+"ui.cursorline" = { bg = "#303747" }
+"ui.popup" = { bg = "#2a303c" }
+"ui.virtual.indent-guide" = "#3a4151"
+
+[palette]
+"gray.c0" = "#98a2c4"
+darkerGray = "#868cad"
+"darkerGray.50" = "#4f576d"
+"darkerGray.b0" = "#818cae"
+bluishGray = "#607487"
+focus = "#404350"
+bg = "#252b37"
+selection = "#3d455c"
+black = "#101010"

From 5ec53c02224557935a0e955c99e021943a372fd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 11:55:57 +0900
Subject: [PATCH 467/967] build(deps): bump tokio from 1.33.0 to 1.34.0 (#8811)

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

diff --git a/Cargo.lock b/Cargo.lock
index e1df49f49..1f4c04020 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1535,14 +1535,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2009,9 +2009,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
 
 [[package]]
 name = "socket2"
-version = "0.5.3"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -2184,9 +2184,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2203,9 +2203,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 0b181a845..50b296b37 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -25,7 +25,7 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.33", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.34", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
 which = "4.4"
 parking_lot = "0.12.1"

From 13386a47865f7cf857dbd78dbfd107e0e2fa9bd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 11:56:13 +0900
Subject: [PATCH 468/967] build(deps): bump smallvec from 1.11.1 to 1.11.2
 (#8808)

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 1f4c04020..6d8c7166d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1986,9 +1986,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "smartstring"

From 8b2d97eb56d6cffcc6ce235d6a6bf2d56055fe4b Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 13 Nov 2023 09:24:24 -0500
Subject: [PATCH 469/967] Default 'roots' field of language config

Previously roots needed to be specified by every language and `[]` was
used as an explicit default. Root files don't make sense for every
language (for example TOML) so I think we should allow languages to
not explicitly mention the key and have the `[]` default automatically.
---
 helix-core/src/syntax.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 881b45098..36a1e5c97 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -101,7 +101,8 @@ pub struct LanguageConfiguration {
     pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
     #[serde(default)]
     pub shebangs: Vec<String>, // interpreter(s) associated with language
-    pub roots: Vec<String>,        // these indicate project roots <.git, Cargo.toml>
+    #[serde(default)]
+    pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
     pub comment_token: Option<String>,
     pub text_width: Option<usize>,
     pub soft_wrap: Option<SoftWrap>,

From 69a0df929a1cfbe0a313e328b90ebcfa7c655be4 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 13 Nov 2023 10:13:54 -0500
Subject: [PATCH 470/967] Remove 'roots' keys with default value from
 languages.toml

---
 languages.toml | 142 -------------------------------------------------
 1 file changed, 142 deletions(-)

diff --git a/languages.toml b/languages.toml
index 7d4326a1d..8761f90ad 100644
--- a/languages.toml
+++ b/languages.toml
@@ -249,7 +249,6 @@ name = "toml"
 scope = "source.toml"
 injection-regex = "toml"
 file-types = ["toml", "poetry.lock", "Cargo.lock"]
-roots = []
 comment-token = "#"
 language-servers = [ "taplo" ]
 indent = { tab-width = 2, unit = "  " }
@@ -263,7 +262,6 @@ name = "awk"
 scope = "source.awk"
 injection-regex = "awk"
 file-types = ["awk", "gawk", "nawk", "mawk"]
-roots = []
 comment-token = "#"
 language-servers = [ "awk-language-server" ]
 indent = { tab-width = 2, unit = "  " }
@@ -278,7 +276,6 @@ scope = "source.proto"
 injection-regex = "protobuf"
 file-types = ["proto"]
 language-servers = [ "bufls", "pbkit" ]
-roots = []
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 
@@ -307,7 +304,6 @@ scope = "source.fish"
 injection-regex = "fish"
 file-types = ["fish"]
 shebangs = ["fish"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
 
@@ -321,7 +317,6 @@ scope = "source.mint"
 injection-regex = "mint"
 file-types = ["mint"]
 shebangs = []
-roots = []
 comment-token = "//"
 language-servers = [ "mint" ]
 indent = { tab-width = 2, unit = "  " }
@@ -351,7 +346,6 @@ file-types = [
   "composer.lock",
   ".watchmanconfig"
 ]
-roots = []
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true
 indent = { tab-width = 2, unit = "  " }
@@ -366,7 +360,6 @@ name = "json5"
 scope = "source.json5"
 injection-regex = "json5"
 file-types = ["json5"]
-roots = []
 language-servers = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
@@ -381,7 +374,6 @@ name = "c"
 scope = "source.c"
 injection-regex = "c"
 file-types = ["c"] # TODO: ["h"]
-roots = []
 comment-token = "//"
 language-servers = [ "clangd" ]
 indent = { tab-width = 2, unit = "  " }
@@ -418,7 +410,6 @@ name = "cpp"
 scope = "source.cpp"
 injection-regex = "cpp"
 file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm", "h++", "ii", "inl", { suffix = ".hpp.in" }, { suffix = ".h.in" }]
-roots = []
 comment-token = "//"
 language-servers = [ "clangd" ]
 indent = { tab-width = 2, unit = "  " }
@@ -551,7 +542,6 @@ name = "gomod"
 scope = "source.gomod"
 injection-regex = "gomod"
 file-types = ["go.mod"]
-roots = []
 auto-format = true
 comment-token = "//"
 language-servers = [ "gopls" ]
@@ -566,7 +556,6 @@ name = "gotmpl"
 scope = "source.gotmpl"
 injection-regex = "gotmpl"
 file-types = ["gotmpl"]
-roots = []
 comment-token = "//"
 language-servers = [ "gopls" ]
 indent = { tab-width = 2, unit = " " }
@@ -580,7 +569,6 @@ name = "gowork"
 scope = "source.gowork"
 injection-regex = "gowork"
 file-types = ["go.work"]
-roots = []
 auto-format = true
 comment-token = "//"
 language-servers = [ "gopls" ]
@@ -597,7 +585,6 @@ injection-regex = "(js|javascript)"
 language-id = "javascript"
 file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", "jakefile"]
 shebangs = ["node"]
-roots = []
 comment-token = "//"
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
@@ -624,7 +611,6 @@ scope = "source.jsx"
 injection-regex = "jsx"
 language-id = "javascriptreact"
 file-types = ["jsx"]
-roots = []
 comment-token = "//"
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
@@ -637,7 +623,6 @@ injection-regex = "(ts|typescript)"
 file-types = ["ts", "mts", "cts"]
 language-id = "typescript"
 shebangs = ["deno", "ts-node"]
-roots = []
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -651,7 +636,6 @@ scope = "source.tsx"
 injection-regex = "(tsx)" # |typescript
 language-id = "typescriptreact"
 file-types = ["tsx"]
-roots = []
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -664,7 +648,6 @@ name = "css"
 scope = "source.css"
 injection-regex = "css"
 file-types = ["css", "scss"]
-roots = []
 language-servers = [ "vscode-css-language-server" ]
 auto-format = true
 indent = { tab-width = 2, unit = "  " }
@@ -678,7 +661,6 @@ name = "scss"
 scope = "source.scss"
 injection-regex = "scss"
 file-types = ["scss"]
-roots = []
 language-servers = [ "vscode-css-language-server" ]
 auto-format = true
 indent = { tab-width = 2, unit = "  " }
@@ -692,7 +674,6 @@ name = "html"
 scope = "text.html.basic"
 injection-regex = "html"
 file-types = ["html", "htm", "shtml", "xhtml", "xht", "jsp", "asp", "aspx", "jshtm", "volt", "rhtml"]
-roots = []
 language-servers = [ "vscode-html-language-server" ]
 auto-format = true
 indent = { tab-width = 2, unit = "  " }
@@ -723,7 +704,6 @@ scope = "source.nickel"
 injection-regex = "nickel"
 file-types = ["ncl"]
 shebangs = []
-roots = []
 comment-token = "#"
 language-servers = [ "nls" ]
 indent = { tab-width = 2, unit = "  " }
@@ -744,7 +724,6 @@ scope = "source.nix"
 injection-regex = "nix"
 file-types = ["nix"]
 shebangs = []
-roots = []
 comment-token = "#"
 language-servers = [ "nil" ]
 indent = { tab-width = 2, unit = "  " }
@@ -794,7 +773,6 @@ file-types = [
   "Gymfile"
 ]
 shebangs = ["ruby"]
-roots = []
 comment-token = "#"
 language-servers = [ "solargraph" ]
 indent = { tab-width = 2, unit = "  " }
@@ -849,7 +827,6 @@ file-types = [
   "zshrc_Apple_Terminal"
 ]
 shebangs = ["sh", "bash", "dash", "zsh"]
-roots = []
 comment-token = "#"
 language-servers = [ "bash-language-server" ]
 indent = { tab-width = 2, unit = "  " }
@@ -877,7 +854,6 @@ name = "twig"
 scope = "source.twig"
 injection-regex = "twig"
 file-types = ["twig"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -889,7 +865,6 @@ name = "latex"
 scope = "source.tex"
 injection-regex = "tex"
 file-types = ["tex", "sty", "cls", "Rd", "bbx", "cbx"]
-roots = []
 comment-token = "%"
 language-servers = [ "texlab" ]
 indent = { tab-width = 4, unit = "\t" }
@@ -903,7 +878,6 @@ name = "bibtex"
 scope = "source.bib"
 injection-regex = "bib"
 file-types = ["bib"]
-roots = []
 comment-token = "%"
 language-servers = [ "texlab" ]
 indent = { tab-width = 4, unit = "\t" }
@@ -946,7 +920,6 @@ name = "lpf"
 comment-token = "#"
 scope = "source.lpf"
 file-types = ["lpf"]
-roots = []
 
 [[grammar]]
 name = "lpf"
@@ -985,7 +958,6 @@ name = "ledger"
 scope = "source.ledger"
 injection-regex = "ledger"
 file-types = ["ldg", "ledger", "journal"]
-roots = []
 comment-token = ";"
 indent = { tab-width = 4, unit = "    " }
 
@@ -998,7 +970,6 @@ name = "beancount"
 scope = "source.beancount"
 injection-regex = "beancount"
 file-types = ["beancount", "bean"]
-roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 
@@ -1012,7 +983,6 @@ scope = "source.ocaml"
 injection-regex = "ocaml"
 file-types = ["ml"]
 shebangs = ["ocaml", "ocamlrun", "ocamlscript"]
-roots = []
 comment-token = "(**)"
 language-servers = [ "ocamllsp" ]
 indent = { tab-width = 2, unit = "  " }
@@ -1032,7 +1002,6 @@ name = "ocaml-interface"
 scope = "source.ocaml.interface"
 file-types = ["mli"]
 shebangs = []
-roots = []
 comment-token = "(**)"
 language-servers = [ "ocamllsp" ]
 indent = { tab-width = 2, unit = "  " }
@@ -1067,7 +1036,6 @@ name = "svelte"
 scope = "source.svelte"
 injection-regex = "svelte"
 file-types = ["svelte"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "svelteserver" ]
 
@@ -1092,7 +1060,6 @@ source = { git = "https://github.com/ikatyang/tree-sitter-vue", rev = "91fe27547
 name = "yaml"
 scope = "source.yaml"
 file-types = ["yml", "yaml"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "yaml-language-server", "ansible-language-server" ]
@@ -1120,7 +1087,6 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "d7
 name = "haskell-persistent"
 scope = "source.persistentmodels"
 file-types = ["persistentmodels"]
-roots = []
 comment-token = "--"
 indent = { tab-width = 2, unit = "  " }
 
@@ -1186,7 +1152,6 @@ source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4
 [[language]]
 name = "prolog"
 scope = "source.prolog"
-roots = []
 file-types = ["pl", "prolog"]
 shebangs = ["swipl"]
 comment-token = "%"
@@ -1196,7 +1161,6 @@ language-servers = [ "swipl" ]
 name = "tsq"
 scope = "source.tsq"
 file-types = ["tsq"]
-roots = []
 comment-token = ";"
 injection-regex = "tsq"
 indent = { tab-width = 2, unit = "  " }
@@ -1209,7 +1173,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-tsq", rev = "48b5
 name = "cmake"
 scope = "source.cmake"
 file-types = ["cmake", "CMakeLists.txt"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "cmake-language-server" ]
@@ -1225,7 +1188,6 @@ scope = "source.make"
 file-types = ["Makefile", "makefile", "make", "mk", "mak", "GNUmakefile", "OCamlMakefile"]
 shebangs = ["make", "gmake"]
 injection-regex = "(make|makefile|Makefile|mk)"
-roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
 
@@ -1237,7 +1199,6 @@ source = { git = "https://github.com/alemuller/tree-sitter-make", rev = "a4b9187
 name = "glsl"
 scope = "source.glsl"
 file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
-roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 injection-regex = "glsl"
@@ -1251,7 +1212,6 @@ name = "perl"
 scope = "source.perl"
 file-types = ["pl", "pm", "t", "psgi", "raku", "rakumod", "rakutest", "rakudoc", "nqp", "p6", "pl6", "pm6"]
 shebangs = ["perl"]
-roots = []
 comment-token = "#"
 language-servers = [ "perlnavigator" ]
 indent = { tab-width = 2, unit = "  " }
@@ -1264,7 +1224,6 @@ source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "
 name = "pod"
 scope = "source.pod"
 injection-regex = "pod"
-roots = []
 file-types = ["pod"]
 
 [[grammar]]
@@ -1274,7 +1233,6 @@ source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "d
 [[language]]
 name = "racket"
 scope = "source.racket"
-roots = []
 file-types = ["rkt", "rktd", "rktl", "scrbl"]
 shebangs = ["racket"]
 comment-token = ";"
@@ -1285,7 +1243,6 @@ grammar = "scheme"
 [[language]]
 name = "common-lisp"
 scope = "source.lisp"
-roots = []
 file-types = ["lisp", "asd", "cl", "l", "lsp", "ny", "podsl", "sexp"]
 shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
 comment-token = ";"
@@ -1302,7 +1259,6 @@ grammar = "scheme"
 [[language]]
 name = "comment"
 scope = "scope.comment"
-roots = []
 file-types = []
 injection-regex = "comment"
 
@@ -1314,7 +1270,6 @@ source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "5dd3c62
 name = "wgsl"
 scope = "source.wgsl"
 file-types = ["wgsl"]
-roots = []
 comment-token = "//"
 language-servers = [ "wgsl_analyzer" ]
 indent = { tab-width = 4, unit = "    " }
@@ -1326,7 +1281,6 @@ source = { git = "https://github.com/szebniok/tree-sitter-wgsl", rev = "272e89ef
 [[language]]
 name = "llvm"
 scope = "source.llvm"
-roots = []
 file-types = ["ll"]
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
@@ -1339,7 +1293,6 @@ source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "
 [[language]]
 name = "llvm-mir"
 scope = "source.llvm_mir"
-roots = []
 file-types = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
@@ -1355,7 +1308,6 @@ name = "llvm-mir-yaml"
 #
 #     grammar = "yaml"
 scope = "source.yaml"
-roots = []
 file-types = ["mir"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
@@ -1363,7 +1315,6 @@ indent = { tab-width = 2, unit = "  " }
 [[language]]
 name = "tablegen"
 scope = "source.tablegen"
-roots = []
 file-types = ["td"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
@@ -1391,7 +1342,6 @@ name = "markdown.inline"
 scope = "source.markdown.inline"
 injection-regex = "markdown\\.inline"
 file-types = []
-roots = []
 grammar = "markdown_inline"
 
 [[grammar]]
@@ -1442,7 +1392,6 @@ source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev =
 [[language]]
 name = "git-commit"
 scope = "git.commitmsg"
-roots = []
 file-types = ["COMMIT_EDITMSG"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
@@ -1456,7 +1405,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev
 [[language]]
 name = "diff"
 scope = "source.diff"
-roots = []
 file-types = ["diff", "patch", "rej"]
 injection-regex = "diff"
 comment-token = "#"
@@ -1469,7 +1417,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-diff", rev = "fd7
 [[language]]
 name = "git-rebase"
 scope = "source.gitrebase"
-roots = []
 file-types = ["git-rebase-todo"]
 injection-regex = "git-rebase"
 comment-token = "#"
@@ -1484,7 +1431,6 @@ name = "regex"
 scope = "source.regex"
 injection-regex = "regex"
 file-types = ["regex", ".Rbuildignore"]
-roots = []
 
 [[grammar]]
 name = "regex"
@@ -1493,7 +1439,6 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-regex", rev = "e1cf
 [[language]]
 name = "git-config"
 scope = "source.gitconfig"
-roots = []
 file-types = [".gitmodules", ".gitconfig", { suffix = ".git/config" }, { suffix = ".config/git/config" }]
 injection-regex = "git-config"
 comment-token = "#"
@@ -1506,7 +1451,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-config", rev
 [[language]]
 name = "git-attributes"
 scope = "source.gitattributes"
-roots = []
 file-types = [".gitattributes"]
 injection-regex = "git-attributes"
 comment-token = "#"
@@ -1519,7 +1463,6 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-gitattributes", rev =
 [[language]]
 name = "git-ignore"
 scope = "source.gitignore"
-roots = []
 file-types = [".gitignore", ".gitignore_global", ".ignore", ".prettierignore", ".eslintignore", ".npmignore", "CODEOWNERS"]
 injection-regex = "git-ignore"
 comment-token = "#"
@@ -1534,7 +1477,6 @@ name = "graphql"
 scope = "source.graphql"
 injection-regex = "graphql"
 file-types = ["gql", "graphql", "graphqls"]
-roots = []
 language-servers = [ "graphql-language-service" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -1562,7 +1504,6 @@ name = "iex"
 scope = "source.iex"
 injection-regex = "iex"
 file-types = ["iex"]
-roots = []
 
 [[grammar]]
 name = "iex"
@@ -1625,7 +1566,6 @@ scope = "source.hcl"
 injection-regex = "(hcl|tf|nomad)"
 language-id = "terraform"
 file-types = ["hcl", "tf", "nomad"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "terraform-ls" ]
@@ -1640,7 +1580,6 @@ name = "tfvars"
 scope = "source.tfvars"
 language-id = "terraform-vars"
 file-types = ["tfvars"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "terraform-ls" ]
@@ -1652,7 +1591,6 @@ name = "org"
 scope = "source.org"
 injection-regex = "org"
 file-types = ["org"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -1664,7 +1602,6 @@ name = "solidity"
 scope = "source.sol"
 injection-regex = "(sol|solidity)"
 file-types = ["sol"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "solc" ]
@@ -1693,7 +1630,6 @@ name = "ron"
 scope = "source.ron"
 injection-regex = "ron"
 file-types = ["ron"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 
@@ -1707,7 +1643,6 @@ scope = "source.robot"
 injection-regex = "robot"
 file-types = ["robot", "resource"]
 comment-token = "#"
-roots = []
 indent = { tab-width = 4, unit = " " }
 language-servers = [ "robotframework_ls" ]
 
@@ -1721,7 +1656,6 @@ scope = "source.r"
 injection-regex = "(r|R)"
 file-types = ["r", "R", ".Rprofile", "Rprofile.site", ".RHistory"]
 shebangs = ["r", "R"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "r" ]
@@ -1735,7 +1669,6 @@ name = "rmarkdown"
 scope = "source.rmd"
 injection-regex = "(r|R)md"
 file-types = ["rmd", "Rmd"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "markdown"
 language-servers = [ "r" ]
@@ -1759,7 +1692,6 @@ name = "erb"
 scope = "text.html.erb"
 injection-regex = "erb"
 file-types = ["erb"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "embedded-template"
 
@@ -1768,7 +1700,6 @@ name = "ejs"
 scope = "text.html.ejs"
 injection-regex = "ejs"
 file-types = ["ejs"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "embedded-template"
 
@@ -1805,7 +1736,6 @@ source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "
 name = "sql"
 scope = "source.sql"
 file-types = ["sql", "dsql"]
-roots = []
 comment-token = "--"
 indent = { tab-width = 4, unit = "    " }
 injection-regex = "sql"
@@ -1851,7 +1781,6 @@ scope = "source.nu"
 injection-regex = "nu"
 file-types = ["nu"]
 shebangs = ["nu"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
@@ -1864,7 +1793,6 @@ name = "vala"
 scope = "source.vala"
 injection-regex = "vala"
 file-types = ["vala", "vapi"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "vala-language-server" ]
@@ -1878,7 +1806,6 @@ name = "hare"
 scope = "source.hare"
 injection-regex = "hare"
 file-types = ["ha"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 8, unit = "\t" }
 
@@ -1891,7 +1818,6 @@ name = "devicetree"
 scope = "source.devicetree"
 injection-regex = "(dtsi?|devicetree|fdt)"
 file-types = ["dts", "dtsi"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "\t" }
 
@@ -1904,7 +1830,6 @@ name = "cairo"
 scope = "source.cairo"
 injection-regex = "cairo"
 file-types = ["cairo"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 # auto-format = true
@@ -1916,7 +1841,6 @@ name = "cpon"
 scope = "scope.cpon"
 injection-regex = "cpon"
 file-types = ["cpon", "cp"]
-roots = []
 auto-format = true
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
@@ -1944,7 +1868,6 @@ name = "meson"
 scope = "source.meson"
 injection-regex = "meson"
 file-types = ["meson.build", "meson_options.txt"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
@@ -1956,7 +1879,6 @@ source = { git = "https://github.com/staysail/tree-sitter-meson", rev = "32a83e8
 name = "sshclientconfig"
 scope = "source.sshclientconfig"
 file-types = [{ suffix = ".ssh/config" }, { suffix = "/etc/ssh/ssh_config" }]
-roots = []
 comment-token = "#"
 
 [[grammar]]
@@ -1969,7 +1891,6 @@ scope = "source.scheme"
 injection-regex = "scheme"
 file-types = ["ss", "scm"]
 shebangs = ["scheme", "guile", "chicken"]
-roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 
@@ -1996,7 +1917,6 @@ source = {git = "https://github.com/v-analyzer/v-analyzer", subpath = "tree_sitt
 name = "verilog"
 scope = "source.verilog"
 file-types = ["v", "vh", "sv", "svh"]
-roots = []
 comment-token = "//"
 language-servers = [ "svlangserver" ]
 indent = { tab-width = 2, unit = "  " }
@@ -2011,7 +1931,6 @@ name = "edoc"
 scope = "source.edoc"
 file-types = ["edoc", "edoc.in"]
 injection-regex = "edoc"
-roots = []
 indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
@@ -2023,7 +1942,6 @@ name = "jsdoc"
 scope = "source.jsdoc"
 injection-regex = "jsdoc"
 file-types = ["jsdoc"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -2035,7 +1953,6 @@ name = "openscad"
 scope = "source.openscad"
 injection-regex = "openscad"
 file-types = ["scad"]
-roots = []
 comment-token = "//"
 language-servers = [ "openscad-lsp" ]
 indent = { tab-width = 2, unit = "\t" }
@@ -2077,7 +1994,6 @@ name = "starlark"
 scope = "source.starlark"
 injection-regex = "(starlark|bzl|bazel)"
 file-types = ["bzl", "bazel", "BUILD", "star"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
 grammar = "python"
@@ -2086,7 +2002,6 @@ grammar = "python"
 name = "elvish"
 scope = "source.elvish"
 file-types = ["elv"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "elvish" ]
@@ -2102,7 +2017,6 @@ scope = "source.idr"
 injection-regex = "idr"
 file-types = ["idr"]
 shebangs = []
-roots = []
 comment-token = "--"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "idris2-lsp" ]
@@ -2126,7 +2040,6 @@ name = "ungrammar"
 scope = "source.ungrammar"
 injection-regex = "ungrammar"
 file-types = ["ungram", "ungrammar"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 
@@ -2139,7 +2052,6 @@ name = "dot"
 scope = "source.dot"
 injection-regex = "dot"
 file-types = ["dot"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "dot-language-server" ]
@@ -2169,7 +2081,6 @@ name = "slint"
 scope = "source.slint"
 injection-regex = "slint"
 file-types = ["slint"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "slint-lsp" ]
@@ -2183,7 +2094,6 @@ name = "task"
 scope = "source.task"
 injection-regex = "task"
 file-types = ["task"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
@@ -2196,7 +2106,6 @@ name = "xit"
 scope = "source.xit"
 injection-regex = "xit"
 file-types = ["xit"]
-roots = []
 indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
@@ -2221,7 +2130,6 @@ name = "pascal"
 scope = "source.pascal"
 injection-regex = "pascal"
 file-types = ["pas", "pp", "inc", "lpr", "lfm"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "pasls" ]
@@ -2236,7 +2144,6 @@ scope = "source.sml"
 injection-regex = "sml"
 file-types = ["sml"]
 comment-token = "(*"
-roots = []
 
 [[grammar]]
 name = "sml"
@@ -2260,7 +2167,6 @@ name = "astro"
 scope = "source.astro"
 injection-regex = "astro"
 file-types = ["astro"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -2272,7 +2178,6 @@ name = "bass"
 scope = "source.bass"
 injection-regex = "bass"
 file-types = ["bass"]
-roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "bass" ]
@@ -2286,7 +2191,6 @@ name = "wat"
 scope = "source.wat"
 comment-token = ";;"
 file-types = ["wat"]
-roots = []
 
 [[grammar]]
 name = "wat"
@@ -2297,7 +2201,6 @@ name = "wast"
 scope = "source.wast"
 comment-token = ";;"
 file-types = ["wast"]
-roots = []
 
 [[grammar]]
 name = "wast"
@@ -2307,7 +2210,6 @@ source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f
 name = "d"
 scope = "source.d"
 file-types = [ "d", "dd" ]
-roots = []
 comment-token = "//"
 injection-regex = "d"
 indent = { tab-width = 4, unit = "    "}
@@ -2322,7 +2224,6 @@ source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb
 name = "vhs"
 scope = "source.vhs"
 file-types = ["tape"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 grammar = "vhs"
@@ -2335,7 +2236,6 @@ source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "c6d8
 name = "kdl"
 scope = "source.kdl"
 file-types = ["kdl"]
-roots = []
 comment-token = "//"
 injection-regex = "kdl"
 
@@ -2404,7 +2304,6 @@ file-types = [
   "xoml"
 ]
 indent = { tab-width = 2, unit = "  " }
-roots = []
 
 [language.auto-pairs]
 '(' = ')'
@@ -2425,7 +2324,6 @@ scope = "source.dtd"
 injection-regex = "dtd"
 file-types = ["dtd", "ent"]
 indent = {tab-width = 2, unit = "  "}
-roots = []
 
 [language.auto-pairs]
 '(' = ')'
@@ -2443,7 +2341,6 @@ name = "wit"
 scope = "source.wit"
 injection-regex = "wit"
 file-types = ["wit"]
-roots = []
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 
@@ -2466,7 +2363,6 @@ file-types = [".env", ".env.local", ".env.development", ".env.production", ".env
 injection-regex = "env"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
-roots = []
 grammar = "bash"
 
 [[language]]
@@ -2499,7 +2395,6 @@ file-types = [
 injection-regex = "ini"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
-roots = []
 
 [[grammar]]
 name = "ini"
@@ -2509,7 +2404,6 @@ source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "4d247fb87
 name = "bicep"
 scope = "source.bicep"
 file-types = ["bicep"]
-roots = []
 auto-format = true
 comment-token = "//"
 indent = { tab-width = 2, unit = " "}
@@ -2523,7 +2417,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-bicep", rev = "d8
 name = "qml"
 scope = "source.qml"
 file-types = ["qml"]
-roots = []
 language-servers = [ "qmlls" ]
 indent = { tab-width = 4, unit = "    " }
 grammar = "qmljs"
@@ -2537,7 +2430,6 @@ name = "mermaid"
 scope = "source.mermaid"
 injection-regex = "mermaid"
 file-types = ["mermaid"]
-roots = []
 comment-token = "%%"
 indent = { tab-width = 4, unit = "    " }
 
@@ -2551,7 +2443,6 @@ scope = "source.m"
 file-types = ["m"]
 comment-token = "%"
 shebangs = ["octave-cli", "matlab"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -2576,7 +2467,6 @@ name = "dhall"
 scope = "source.dhall"
 injection-regex = "dhall"
 file-types = ["dhall"]
-roots = []
 comment-token = "--"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "dhall-lsp-server" ]
@@ -2591,7 +2481,6 @@ name = "sage"
 scope = "source.sage"
 file-types = ["sage"]
 injection-regex = "sage"
-roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
 grammar = "python"
@@ -2602,7 +2491,6 @@ scope = "source.msbuild"
 injection-regex = "msbuild"
 file-types = ["proj", "vbproj", "csproj", "fsproj", "targets", "props"]
 indent = { tab-width = 2, unit = "  " }
-roots = []
 grammar = "xml"
 
 [language.auto-pairs]
@@ -2618,7 +2506,6 @@ name = "pem"
 scope = "source.pem"
 file-types = ["pem", "cert", "crt"]
 injection-regex = "pem"
-roots = []
 grammar = "pem"
 
 [[grammar]]
@@ -2629,7 +2516,6 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-pem", rev = "be67a433
 name = "passwd"
 scope = "source.passwd"
 file-types = ["passwd"]
-roots = []
 
 [[grammar]]
 name = "passwd"
@@ -2639,7 +2525,6 @@ source = { git = "https://github.com/ath3/tree-sitter-passwd", rev = "20239395ea
 name = "hosts"
 scope = "source.hosts"
 file-types = ["hosts"]
-roots = []
 comment-token = "#"
 
 [[grammar]]
@@ -2651,7 +2536,6 @@ name = "uxntal"
 scope = "source.tal"
 injection-regex = "tal"
 file-types = ["tal"]
-roots = []
 auto-format = false
 comment-token = "("
 
@@ -2664,7 +2548,6 @@ name = "yuck"
 scope = "source.yuck"
 injection-regex = "yuck"
 file-types = ["yuck"]
-roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 
@@ -2677,7 +2560,6 @@ name = "prql"
 scope = "source.prql"
 injection-regex = "prql"
 file-types = ["prql"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
 
@@ -2689,7 +2571,6 @@ source = { git = "https://github.com/PRQL/tree-sitter-prql", rev = "09e158cd3650
 name = "po"
 scope = "source.po"
 file-types = ["po", "pot"]
-roots = []
 comment-token = "#"
 
 [[grammar]]
@@ -2701,7 +2582,6 @@ name = "nasm"
 scope = "source.nasm"
 file-types = ["asm", "S", "nasm"]
 injection-regex = "n?asm"
-roots = []
 comment-token = ";"
 indent = { tab-width = 8, unit = "        " }
 
@@ -2714,7 +2594,6 @@ name = "gas"
 scope = "source.gas"
 file-types = ["s"]
 injection-regex = "gas"
-roots = []
 comment-token = "#"
 indent = { tab-width = 8, unit = "        " }
 
@@ -2727,7 +2606,6 @@ name = "rst"
 scope = "source.rst"
 comment-token = ".."
 file-types = ["rst"]
-roots = []
 
 [[grammar]]
 name = "rst"
@@ -2738,7 +2616,6 @@ name = "capnp"
 scope = "source.capnp"
 injection-regex = "capnp"
 file-types = ["capnp"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
@@ -2764,7 +2641,6 @@ source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "c
 name = "vhdl"
 scope = "source.vhdl"
 file-types = ["vhd", "vhdl"]
-roots = []
 comment-token = "--"
 language-servers = [ "vhdl_ls" ]
 indent = { tab-width = 2, unit = "  " }
@@ -2776,7 +2652,6 @@ source = { git = "https://github.com/teburd/tree-sitter-vhdl", rev = "c57313adee
 
 [[language]]
 name = "rego"
-roots = []
 scope = "source.rego"
 injection-regex = "rego"
 file-types = ["rego"]
@@ -2795,7 +2670,6 @@ scope = "source.nim"
 injection-regex = "nim"
 file-types = ["nim", "nims", "nimble"]
 shebangs = []
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "nimlangserver" ]
@@ -2825,7 +2699,6 @@ name = "hurl"
 scope = "source.hurl"
 injection-regex = "hurl"
 file-types = ["hurl"]
-roots = []
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
@@ -2836,7 +2709,6 @@ source = { git = "https://github.com/pfeiferj/tree-sitter-hurl", rev = "264c4206
 [[language]]
 name = "markdoc"
 scope = "text.markdoc"
-roots = []
 file-types = ["mdoc"]
 language-servers = [ "markdoc-ls" ]
 
@@ -2849,7 +2721,6 @@ name = "opencl"
 scope = "source.cl"
 injection-regex = "(cl|opencl)"
 file-types = ["cl"]
-roots = []
 comment-token = "//"
 language-servers = [ "clangd" ]
 
@@ -2862,7 +2733,6 @@ name = "just"
 scope = "source.just"
 file-types = ["justfile", "Justfile", ".justfile", ".Justfile"]
 injection-regex = "just"
-roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
 
@@ -2875,7 +2745,6 @@ name = "blueprint"
 scope = "source.blueprint"
 injection-regex = "blueprint"
 file-types = ["blp"]
-roots = []
 comment-token = "//"
 language-servers = [ "blueprint-compiler" ]
 indent = { tab-width = 4, unit = "    " }
@@ -2889,7 +2758,6 @@ name = "forth"
 scope = "source.forth"
 injection-regex = "forth"
 file-types = ["fs", "forth", "fth", "4th"]
-roots = []
 comment-token = "\\"
 language-servers = [ "forth-lsp" ]
 indent = { tab-width = 3, unit = "   " }
@@ -2918,7 +2786,6 @@ name = "t32"
 scope = "source.t32"
 injection-regex = "t32"
 file-types = ["cmm", "t32"]
-roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 
@@ -2931,7 +2798,6 @@ name = "webc"
 scope = "text.html.webc"
 injection-regex = "webc"
 file-types = ["webc"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "html"
 
@@ -2940,7 +2806,6 @@ name = "typst"
 scope = "source.typst"
 injection-regex = "typst"
 file-types = ["typst", "typ"]
-roots = []
 comment-token = "//"
 language-servers = ["typst-lsp"]
 indent = { tab-width = 2, unit = "  " }
@@ -2961,7 +2826,6 @@ name = "nunjucks"
 scope = "text.html.nunjucks"
 injection-regex = "nunjucks"
 file-types = ["njk"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "jinja2"
 
@@ -2970,7 +2834,6 @@ name = "jinja"
 scope = "text.html.jinja"
 injection-regex = "jinja"
 file-types = ["jinja", "jinja2", "j2"]
-roots = []
 indent = { tab-width = 2, unit = "  " }
 grammar = "jinja2"
 
@@ -2987,7 +2850,6 @@ name = "wren"
 scope = "source.wren"
 injection-regex = "wren"
 file-types = ["wren"]
-roots = []
 indent = { tab-width = 2, unit = "  "}
 
 [[language]]
@@ -2996,7 +2858,6 @@ scope = "source.unison"
 injection-regex = "unison"
 file-types = ["u"]
 shebangs = []
-roots = []
 auto-format = false
 comment-token = "--"
 indent = { tab-width = 4, unit = "    " }
@@ -3016,7 +2877,6 @@ source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "98c4e
 name = "todotxt"
 scope = "text.todotxt"
 file-types = [{ suffix = ".todo.txt" }, "todotxt"]
-roots = []
 formatter = { command = "sort" }
 auto-format = true
 
@@ -3028,7 +2888,6 @@ source = { git = "https://github.com/arnarg/tree-sitter-todotxt", rev = "0207f6a
 name = "strace"
 scope = "source.strace"
 file-types = ["strace"]
-roots = []
 
 [[grammar]]
 name = "strace"
@@ -3038,7 +2897,6 @@ source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "2b18fdf
 name = "gemini"
 scope = "source.gmi"
 file-types = ["gmi"]
-roots = []
 
 [[grammar]]
 name = "gemini"

From e5d02cd4bd19c9db7825c969d3c2660e3bee93c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:15:37 +0900
Subject: [PATCH 471/967] build(deps): bump serde from 1.0.191 to 1.0.192
 (#8810)

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 6d8c7166d..d44f952cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1869,18 +1869,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.191"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a834c4821019838224821468552240d4d95d14e751986442c816572d39a080c9"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.191"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fa52d5646bce91b680189fe5b1c049d2ea38dabb4e2e7c8d00ca12cfbfbcfd"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
  "proc-macro2",
  "quote",

From 40959bb449ec9dfbff9249332853a02b50f483fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:15:50 +0900
Subject: [PATCH 472/967] build(deps): bump cc from 1.0.83 to 1.0.84 (#8809)

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 d44f952cf..1e85dd86b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -160,9 +160,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
 dependencies = [
  "libc",
 ]

From 2040444da9eb3a9b2438bf98c0568ce06ec4c1e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 20:21:00 +0100
Subject: [PATCH 473/967] build(deps): bump rustix from 0.38.21 to 0.38.22
 (#8807)

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 1e85dd86b..f7361d0ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1458,9 +1458,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
 
 [[package]]
 name = "lock_api"
@@ -1829,9 +1829,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "80109a168d9bc0c7f483083244543a6eb0dba02295d33ca268145e6190d6df0c"
 dependencies = [
  "bitflags 2.4.1",
  "errno",

From 3c8bf9df4adc88b3e81b2955813098b873dde44a Mon Sep 17 00:00:00 2001
From: Eemil Haapanen <70660230+eemilhaa@users.noreply.github.com>
Date: Fri, 17 Nov 2023 02:34:56 +0200
Subject: [PATCH 474/967] theme: add starlight (#8787)

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

diff --git a/runtime/themes/starlight.toml b/runtime/themes/starlight.toml
new file mode 100644
index 000000000..09db90fd6
--- /dev/null
+++ b/runtime/themes/starlight.toml
@@ -0,0 +1,113 @@
+# Author : eemilhaa <eemil.haapanen@gmail.com> 
+# Palette from : https://github.com/CosmicToast/starlight
+
+# Syntax
+"function"               = "green"
+"constructor"            = "green"
+
+"type"                   = "cyan"
+"string.special"         = "cyan"
+"string.regexp"          = "cyan"
+"constant"               = "cyan"
+"punctuation.special"    = "cyan"
+
+"namespace"              = "white"
+"module"                 = "white"
+"variable"               = "white"
+
+"attribute"              = "magenta"
+"variable.parameter"     = "magenta"
+"variable.other.member"  = "magenta"
+"type.parameter"         = "magenta"
+
+"keyword"                = "blue"
+"variable.builtin"       = "blue"
+"label"                  = "blue"
+"tag"                    = "blue"
+"operator"               = "blue"
+"special"                = "blue"
+
+"string"                 = "yellow"
+
+"punctuation"            = "punct"
+
+"comment"                = "dark-fg"
+
+# Markup
+"markup.heading.marker"  = { fg = "blue", modifiers = ["bold"] }
+"markup.heading"         = { fg = "white", modifiers = ["bold"] }
+"markup.list"            = "blue"
+"markup.bold"            = { fg = "magenta", modifiers = ["bold"] }
+"markup.italic"          = { fg = "magenta", modifiers = ["italic"] }
+"markup.strikethrough"   = "red"
+"markup.link"            = "cyan"
+"markup.link.text"       = "yellow"
+"markup.quote"           = "magenta"
+"markup.raw"             = "green"
+
+# UI
+"diff.plus"   = "green"
+"diff.minus"  = "red"
+"diff.delta"  = "blue"
+
+"ui.background"             = { fg = "dark-fg", bg = "dark-bg" }
+"ui.cursor"                 = { fg = "black", bg = "light-fg" }
+"ui.cursor.primary"         = { fg = "black", bg = "yellow" }
+"ui.cursor.match"           = { fg = "black", bg = "dark-blue", modifiers = ["bold"] }
+"ui.linenr"                 = "dark-fg"
+"ui.linenr.selected"        = "yellow"
+"ui.statusline"             = { fg = "light-fg", bg = "light-bg" }
+"ui.statusline.inactive"    = { fg = "dark-fg", bg = "light-bg" }
+"ui.statusline.insert"      = { fg = "black", bg = "green" }
+"ui.statusline.select"      = { fg = "black", bg = "magenta" }
+"ui.statusline.normal"      = { fg = "black", bg = "blue" }
+"ui.popup"                  = { fg = "dark-fg", bg = "light-bg" }
+"ui.window"                 = { fg = "light-bg", bg = "dark-bg" }
+"ui.help"                   = { fg = "light-fg", bg = "light-bg" }
+"ui.text"                   = "light-fg"
+"ui.text.focus"             = { fg = "white", bg = "light-bg", modifiers = ["bold"] }
+"ui.virtual"                = "dark-fg"
+"ui.virtual.ruler"          = { bg = "medium-bg" }
+"ui.virtual.indent-guide"   = "indent"
+"ui.virtual.whitespace"     = "indent"
+"ui.menu"                   = { fg = "light-fg", bg = "light-bg" }
+"ui.menu.selected"          = { fg = "white", bg = "dark-fg", modifiers = ["bold"] }
+"ui.selection"              = { fg = "light-fg", bg = "dark-fg" }
+"ui.selection.primary"      = { fg = "white", bg = "dark-blue" }
+"ui.highlight"              = { bg = "light-bg" }
+"ui.cursorline.primary"     = { bg = "black" }
+"ui.cursorcolumn.primary"   = { bg = "black" }
+"ui.bufferline.background"  = { bg = "dark-bg" }
+"ui.bufferline"             = { fg = "light-fg", bg = "light-bg" }
+"ui.bufferline.active"      = { fg = "white", bg = "dark-fg" }
+
+"diagnostic.error"    = { underline = { color = "red", style = "curl" } }
+"diagnostic.warning"  = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.info"     = { underline = { color = "blue", style = "curl" } }
+"diagnostic.hint"     = { underline = { color = "blue", style = "curl" } }
+
+"info"     = "blue"
+"hint"     = "blue"
+"warning"  = "yellow"
+"error"    = "red"
+
+[palette]
+# Colors
+red        = "#FF4D51"
+green      = "#35D450"
+yellow     = "#E9E836"
+blue       = "#5DC5F8"
+dark-blue  = "#24ACD4"
+magenta    = "#FEABF2"
+cyan       = "#24DFC4"
+white      = "#ffffff"
+punct      = "#C9C9C9"
+
+# Grays
+black      = "#1e1e1e"
+dark-bg    = "#242424"
+medium-bg  = "#2D2D2D"
+light-bg   = "#353535"
+indent     = "#616161"
+dark-fg    = "#929292"
+light-fg   = "#E6E6E6"

From 73ca2d5f84c5728712c00135ff82a42ae3487b8c Mon Sep 17 00:00:00 2001
From: Seth Maurice-Brant <37915796+iSaluki@users.noreply.github.com>
Date: Fri, 17 Nov 2023 21:54:30 +0000
Subject: [PATCH 475/967] Change Fedora installation to the new official Helix
 package (#8762)

Remove COPR install in favour of official Helix package
---
 book/src/install.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/book/src/install.md b/book/src/install.md
index dc028625b..897985013 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -65,10 +65,7 @@ sudo apt install helix
 
 ### Fedora/RHEL
 
-Enable the `COPR` repository for Helix:
-
 ```sh
-sudo dnf copr enable varlad/helix
 sudo dnf install helix
 ```
 

From 5889b81fc7a7da25352f47240aa6d665ce6b8773 Mon Sep 17 00:00:00 2001
From: Luca Saccarola <96259932+saccarosium@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:57:15 +0100
Subject: [PATCH 476/967] docs: add docs for soft-wrap in languages.toml
 (#8836)

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

diff --git a/book/src/languages.md b/book/src/languages.md
index 778489f8d..632a9146c 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -66,6 +66,7 @@ These configuration keys are available:
 | `language-servers`    | The Language Servers used for this language. See below for more information in the section [Configuring Language Servers for a language](#configuring-language-servers-for-a-language)   |
 | `grammar`             | The tree-sitter grammar to use (defaults to the value of `name`) |
 | `formatter`           | The formatter for the language, it will take precedence over the lsp when defined. The formatter must be able to take the original file as input from stdin and write the formatted file to stdout |
+| `soft-wrap` | [editor.softwrap](./configuration.md#editorsoft-wrap-section)
 | `text-width`          |  Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set, defaults to `editor.text-width`   |
 | `workspace-lsp-roots`     | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml`. Overwrites the setting of the same name in `config.toml` if set. |
 

From 7868136a18aefc2c611d667b344dacacb4b9e8e1 Mon Sep 17 00:00:00 2001
From: crozbo <35157367+crozbo@users.noreply.github.com>
Date: Sat, 18 Nov 2023 00:32:06 +0100
Subject: [PATCH 477/967] Theme: Papercolor: Add inlay-hint style (#8827)

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

diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index 5c59d6f51..279fa2429 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -26,6 +26,9 @@
 "ui.virtual.whitespace" = { fg = "regular5" }
 "ui.virtual.indent-guide" = { fg = "bright0" }
 "ui.virtual.ruler" = { bg = "cursorline_secondary_bg", fg = "regular4" }
+"ui.virtual.inlay-hint" = { fg = "regular5", modifiers = ["italic"] }
+"ui.virtual.inlay-hint.parameter" = { fg = "regular5", modifiers = ["italic"] }
+"ui.virtual.inlay-hint.type" = { fg = "regular5", modifiers = ["bold", "italic"] }
 "ui.cursor.match" = { bg = "matchparen_bg", fg = "matchparen_fg" }
 "ui.cursor" = { bg = "regular5", fg = "background" }
 "ui.cursor.primary" = { bg = "foreground", fg = "background" }

From 2579bca21c250050e59ef782380ca3f3ed44fbb0 Mon Sep 17 00:00:00 2001
From: WuerfelDev <WuerfelDev@users.noreply.github.com>
Date: Fri, 17 Nov 2023 23:34:17 +0000
Subject: [PATCH 478/967] Book: fix formatting of some default values (#8837)

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

diff --git a/book/src/configuration.md b/book/src/configuration.md
index f8796245f..f067038a5 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -166,14 +166,14 @@ All git related options are only enabled in a git repository.
 
 | Key | Description | Default |
 |--|--|---------|
-|`hidden` | Enables ignoring hidden files | true
-|`follow-symlinks` | Follow symlinks instead of ignoring them | true
-|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
-|`parents` | Enables reading ignore files from parent directories | true
-|`ignore` | Enables reading `.ignore` files | true
-|`git-ignore` | Enables reading `.gitignore` files | true
-|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` option | true
-|`git-exclude` | Enables reading `.git/info/exclude` files | true
+|`hidden` | Enables ignoring hidden files | `true`
+|`follow-symlinks` | Follow symlinks instead of ignoring them | `true`
+|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | `true`
+|`parents` | Enables reading ignore files from parent directories | `true`
+|`ignore` | Enables reading `.ignore` files | `true`
+|`git-ignore` | Enables reading `.gitignore` files | `true`
+|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` 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`.
 
 ### `[editor.auto-pairs]` Section

From 39aa6fa646aeae08f4156558af199df1ecba4638 Mon Sep 17 00:00:00 2001
From: blinxen <h-k-81@hotmail.com>
Date: Sat, 18 Nov 2023 02:24:59 +0100
Subject: [PATCH 479/967] Update some grammars to a commit where the license
 file is included (#8691)

---
 languages.toml                            | 24 ++++++------
 runtime/queries/purescript/highlights.scm | 23 ++++++++++--
 runtime/queries/sql/highlights.scm        | 46 +++++++++++++++++++++--
 3 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/languages.toml b/languages.toml
index 8761f90ad..3456209ae 100644
--- a/languages.toml
+++ b/languages.toml
@@ -95,7 +95,7 @@ command = "ansible-language-server"
 args = ["--stdio"]
 
 [language-server.lua-language-server]
-command = "lua-language-server" 
+command = "lua-language-server"
 
 [language-server.lua-language-server.config.Lua.hint]
 enable = true
@@ -975,7 +975,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "beancount"
-source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c" }
+source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3" }
 
 [[language]]
 name = "ocaml"
@@ -1108,7 +1108,7 @@ formatter = { command = "purs-tidy", args = ["format"] }
 
 [[grammar]]
 name = "purescript"
-source = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "593193b9bf0f46d5eee708a4e53044d2a9054897" }
+source = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "5ef5592674ea42de75fc2792972e4ea0b6e3da6c" }
 
 [[language]]
 name = "zig"
@@ -1218,7 +1218,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "perl"
-source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "9f3166800d40267fa68ed8273e96baf74f390517" }
+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "e99bb5283805db4cb86c964722d709df21b0ac16" }
 
 [[language]]
 name = "pod"
@@ -1264,7 +1264,7 @@ injection-regex = "comment"
 
 [[grammar]]
 name = "comment"
-source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "5dd3c62f1bbe378b220fe16b317b85247898639e" }
+source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e" }
 
 [[language]]
 name = "wgsl"
@@ -1288,7 +1288,7 @@ injection-regex = "llvm"
 
 [[grammar]]
 name = "llvm"
-source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d" }
+source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6" }
 
 [[language]]
 name = "llvm-mir"
@@ -1742,7 +1742,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "eeab7240a11098724e6f95bc57cc3ceaf5487d5f" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286" }
 
 [[language]]
 name = "gdscript"
@@ -2045,7 +2045,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "ungrammar"
-source = { git = "https://github.com/Philipp-M/tree-sitter-ungrammar", rev = "0113de880a58ea14f2a75802e9b99fcc25003d9c" }
+source = { git = "https://github.com/Philipp-M/tree-sitter-ungrammar", rev = "a7e104629cff5a8b7367187610631e8f5eb7c6ea" }
 
 [[language]]
 name = "dot"
@@ -2171,7 +2171,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "astro"
-source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "5f5c3e73c45967df9aa42f861fad2d77cd4e0900" }
+source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "947e93089e60c66e681eba22283f4037841451e7" }
 
 [[language]]
 name = "bass"
@@ -2541,7 +2541,7 @@ comment-token = "("
 
 [[grammar]]
 name = "uxntal"
-source = { git = "https://github.com/Jummit/tree-sitter-uxntal", rev = "9297e95ef74380b0ad84c4fd98f91e9f6e4319e6" }
+source = { git = "https://github.com/Jummit/tree-sitter-uxntal", rev = "d68406066648cd6db4c6a2f11ec305af02079884" }
 
 [[language]]
 name = "yuck"
@@ -2662,7 +2662,7 @@ grammar = "rego"
 
 [[grammar]]
 name = "rego"
-source = { git = "https://github.com/FallenAngel97/tree-sitter-rego", rev = "b2667c975f07b33be3ceb83bea5cfbad88095866" }
+source = { git = "https://github.com/FallenAngel97/tree-sitter-rego", rev = "9ac75e71b2d791e0aadeef68098319d86a2a14cf" }
 
 [[language]]
 name = "nim"
@@ -2764,7 +2764,7 @@ indent = { tab-width = 3, unit = "   " }
 
 [[grammar]]
 name = "forth"
-source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "304ed77beb113e37af38b20ff14e3c37bf350d10" }
+source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "90189238385cf636b9ee99ce548b9e5b5e569d48" }
 
 [[language]]
 name = "fsharp"
diff --git a/runtime/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
index b110f3e01..b7868e6e7 100644
--- a/runtime/queries/purescript/highlights.scm
+++ b/runtime/queries/purescript/highlights.scm
@@ -1,3 +1,19 @@
+; ----------------------------------------------------------------------------
+; Record fields would need to come before literal strings in order to be captured correctly
+
+ (record_accessor
+    field: [ (variable)
+             (string)
+             (triple_quote_string)
+           ] @variable.other.member)
+
+ (exp_record_access
+    field: [ (variable)
+             (string)
+             (triple_quote_string)
+           ] @variable.other.member)
+
+
 ; ----------------------------------------------------------------------------
 ; Literals and comments
 
@@ -117,8 +133,7 @@
 
  (row_field (field_name) @variable.other.member)
  (record_field (field_name) @variable.other.member)
- (record_accessor (variable) @variable.other.member)
- (exp_record_access (variable) @variable.other.member)
+ (record_field (field_pun) @variable.other.member)
 
  (signature name: (variable) @type)
  (function name: (variable) @function)
@@ -126,8 +141,8 @@
  (derive_declaration (instance_name) @function)
 
  ; true or false
-((variable) @constant.builtin.boolean
- (#match? @constant.builtin.boolean "^(true|false)$"))
+ ((variable) @constant.builtin.boolean
+  (#match? @constant.builtin.boolean "^(true|false)$"))
 
  ; The former one works for `tree-sitter highlight` but not in Helix/Kakoune.
  ; The latter two work in Helix (but not Kakoune) and are a good compromise between not highlighting anything at all
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index 1041cc2fc..09b07489e 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -131,6 +131,7 @@
   (keyword_partition)
   (keyword_group)
   (keyword_with)
+  (keyword_without)
   (keyword_as)
   (keyword_having)
   (keyword_limit)
@@ -227,6 +228,7 @@
   (keyword_input)
   (keyword_name)
   (keyword_oid)
+  (keyword_oids)
   (keyword_options)
   (keyword_plpgsql)
   (keyword_precision)
@@ -264,6 +266,44 @@
   (keyword_user)
   (keyword_valid)
   (keyword_action)
+  (keyword_definer)
+  (keyword_invoker)
+  (keyword_security)
+  (keyword_extension)
+  (keyword_version)
+  (keyword_out)
+  (keyword_inout)
+  (keyword_variadic)
+  (keyword_session)
+  (keyword_isolation)
+  (keyword_level)
+  (keyword_serializable)
+  (keyword_repeatable)
+  (keyword_read)
+  (keyword_write)
+  (keyword_committed)
+  (keyword_uncommitted)
+  (keyword_deferrable)
+  (keyword_names)
+  (keyword_zone)
+  (keyword_immediate)
+  (keyword_deferred)
+  (keyword_constraints)
+  (keyword_snapshot)
+  (keyword_characteristics)
+  (keyword_off)
+  (keyword_follows)
+  (keyword_precedes)
+  (keyword_each)
+  (keyword_instead)
+  (keyword_of)
+  (keyword_initially)
+  (keyword_old)
+  (keyword_new)
+  (keyword_referencing)
+  (keyword_statement)
+  (keyword_execute)
+  (keyword_procedure)
 ] @keyword
 
 [
@@ -373,10 +413,8 @@
   ">="
   ">"
   "<>"
-  "->"
-  "->>"
-  "#>"
-  "#>>"
+  (op_other)
+  (op_unary_other)
 ] @operator
 
 [

From 2acf5e365e3a24ef244665435824ccb1abbef80a Mon Sep 17 00:00:00 2001
From: Niklas Alexander Shern <90867839+nshern@users.noreply.github.com>
Date: Sat, 18 Nov 2023 02:44:01 +0100
Subject: [PATCH 480/967] theme: show active selection and buffer for naysayer
 theme (#8838)

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

diff --git a/runtime/themes/naysayer.toml b/runtime/themes/naysayer.toml
index 8922b3e22..41530d141 100644
--- a/runtime/themes/naysayer.toml
+++ b/runtime/themes/naysayer.toml
@@ -20,13 +20,13 @@
 "ui.help" = { fg = "text", bg = "bg" }
 "ui.popup" = { fg = "text", bg = "bg" }
 "ui.menu" = { fg = "text", bg = "bg" }
-"ui.menu.selected" = { fg = "text", bg = "bg" }
+"ui.menu.selected" = { fg = "text", bg = "bg", modifiers = ['underlined'] }
 "ui.window" = { bg = "bg" }
 "diagnostic.error" = { bg = "error", fg = "text", modifiers = ["bold"] }
 "diagnostic.warning" = { bg = "warning", fg = "text", modifiers = ["bold"] }
 "diagnostic.hint" = { bg = "cyan", modifiers = ["bold"] }
 "ui.bufferline" = { fg = "text", bg = "bg" }
-"ui.bufferline.active" = { fg = "text", bg = "bg" }
+"ui.bufferline.active" = { fg = "text", bg = "bg", modifiers = ['underlined'] }
 "ui.gutter.selected" = { bg = "highlight-line", modifiers = ["bold"] }
 "ui.highlight" = { bg = "highlight-line" }
 

From 34de1cab623c03b2ffdafb54714bc67cbabcf9e9 Mon Sep 17 00:00:00 2001
From: Ryan Mehri <ryan.mehri1@gmail.com>
Date: Wed, 1 Nov 2023 08:14:17 -0700
Subject: [PATCH 481/967] make indent/unindent exit select mode

---
 helix-term/src/commands.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 648aa96e8..7f9e9d018 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4207,6 +4207,7 @@ fn indent(cx: &mut Context) {
         }),
     );
     doc.apply(&transaction, view.id);
+    exit_select_mode(cx);
 }
 
 fn unindent(cx: &mut Context) {
@@ -4246,6 +4247,7 @@ fn unindent(cx: &mut Context) {
     let transaction = Transaction::change(doc.text(), changes.into_iter());
 
     doc.apply(&transaction, view.id);
+    exit_select_mode(cx);
 }
 
 fn format_selections(cx: &mut Context) {

From 1271a50a82b596fda0fe33a9cdec7b0c3fb92654 Mon Sep 17 00:00:00 2001
From: Ryan Mehri <ryan.mehri1@gmail.com>
Date: Sun, 5 Nov 2023 08:12:21 -0800
Subject: [PATCH 482/967] make paste commands exit select mode

---
 helix-term/src/commands.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7f9e9d018..4e73568b1 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4085,22 +4085,27 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
     };
     let (view, doc) = current!(cx.editor);
     paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
+    exit_select_mode(cx);
 }
 
 fn paste_clipboard_after(cx: &mut Context) {
     paste(cx.editor, '+', Paste::After, cx.count());
+    exit_select_mode(cx);
 }
 
 fn paste_clipboard_before(cx: &mut Context) {
     paste(cx.editor, '+', Paste::Before, cx.count());
+    exit_select_mode(cx);
 }
 
 fn paste_primary_clipboard_after(cx: &mut Context) {
     paste(cx.editor, '*', Paste::After, cx.count());
+    exit_select_mode(cx);
 }
 
 fn paste_primary_clipboard_before(cx: &mut Context) {
     paste(cx.editor, '*', Paste::Before, cx.count());
+    exit_select_mode(cx);
 }
 
 fn replace_with_yanked(cx: &mut Context) {
@@ -4160,6 +4165,7 @@ fn paste_after(cx: &mut Context) {
         Paste::After,
         cx.count(),
     );
+    exit_select_mode(cx);
 }
 
 fn paste_before(cx: &mut Context) {
@@ -4169,6 +4175,7 @@ fn paste_before(cx: &mut Context) {
         Paste::Before,
         cx.count(),
     );
+    exit_select_mode(cx);
 }
 
 fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {

From 5913073733b8724d97589ec9999252256708cf3c Mon Sep 17 00:00:00 2001
From: Ryan Mehri <ryan.mehri1@gmail.com>
Date: Sun, 5 Nov 2023 08:14:39 -0800
Subject: [PATCH 483/967] make replace with clipboard commands exit select mode

---
 helix-term/src/commands.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4e73568b1..d300f848d 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4144,10 +4144,12 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
 
 fn replace_selections_with_clipboard(cx: &mut Context) {
     replace_with_yanked_impl(cx.editor, '+', cx.count());
+    exit_select_mode(cx);
 }
 
 fn replace_selections_with_primary_clipboard(cx: &mut Context) {
     replace_with_yanked_impl(cx.editor, '*', cx.count());
+    exit_select_mode(cx);
 }
 
 fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {

From d4a0eba1a7de3961a321e5220376c61634ec8cc4 Mon Sep 17 00:00:00 2001
From: Ryan Mehri <ryan.mehri1@gmail.com>
Date: Sun, 5 Nov 2023 08:18:58 -0800
Subject: [PATCH 484/967] make align exit select mode

---
 helix-term/src/commands.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d300f848d..e73fe2ed6 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -984,6 +984,7 @@ fn align_selections(cx: &mut Context) {
 
     let transaction = Transaction::change(doc.text(), changes.into_iter());
     doc.apply(&transaction, view.id);
+    exit_select_mode(cx);
 }
 
 fn goto_window(cx: &mut Context, align: Align) {

From 09c78e8b4e36cff0a4c00a0de3fc691dbf0e4873 Mon Sep 17 00:00:00 2001
From: Ryan Mehri <ryan.mehri1@gmail.com>
Date: Sun, 5 Nov 2023 08:15:49 -0800
Subject: [PATCH 485/967] make switch case commands exit select mode

---
 helix-term/src/commands.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e73fe2ed6..a783fc683 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1528,6 +1528,7 @@ where
     });
 
     doc.apply(&transaction, view.id);
+    exit_select_mode(cx);
 }
 
 fn switch_case(cx: &mut Context) {

From 6bf5548dbdfd1df6abe6323bd46b6e051168d94e Mon Sep 17 00:00:00 2001
From: Ryan Mehri <ryan.mehri1@gmail.com>
Date: Sun, 5 Nov 2023 08:07:22 -0800
Subject: [PATCH 486/967] make increment/decrement exit select mode

---
 helix-term/src/commands.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a783fc683..f1d1df063 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5684,6 +5684,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
         let transaction = Transaction::change(doc.text(), changes.into_iter());
         let transaction = transaction.with_selection(new_selection);
         doc.apply(&transaction, view.id);
+        exit_select_mode(cx);
     }
 }
 

From b306b25e82a33b4704846ab4fce9b10b2ee7f67c Mon Sep 17 00:00:00 2001
From: Dan Field <dfield@gmail.com>
Date: Sat, 18 Nov 2023 00:11:18 -0800
Subject: [PATCH 487/967] GN language support (#6969)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 14 ++++++++++
 runtime/queries/gn/highlights.scm  | 42 ++++++++++++++++++++++++++++++
 runtime/queries/gn/injections.scm  | 15 +++++++++++
 runtime/queries/gn/locals.scm      | 16 ++++++++++++
 5 files changed, 88 insertions(+)
 create mode 100644 runtime/queries/gn/highlights.scm
 create mode 100644 runtime/queries/gn/injections.scm
 create mode 100644 runtime/queries/gn/locals.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 9c55b4a05..a7d45a461 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -54,6 +54,7 @@
 | git-rebase | ✓ |  |  |  |
 | gleam | ✓ | ✓ |  | `gleam` |
 | glsl | ✓ | ✓ | ✓ |  |
+| gn | ✓ |  |  |  |
 | go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
 | godot-resource | ✓ |  |  |  |
 | gomod | ✓ |  |  | `gopls` |
diff --git a/languages.toml b/languages.toml
index 3456209ae..3dedf6715 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2740,6 +2740,20 @@ indent = { tab-width = 4, unit = "\t" }
 name = "just"
 source = { git = "https://github.com/IndianBoy42/tree-sitter-just", rev = "8af0aab79854aaf25b620a52c39485849922f766" }
 
+[[language]]
+name = "gn"
+scope = "source.gn"
+injection-regex = "gn"
+file-types = ["gn", "gni"]
+roots = []
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+formatter = { command = "gn", args = ["format", "--stdin"] }
+
+[[grammar]]
+name = "gn"
+source = { git = "https://github.com/willcassella/tree-sitter-gn", rev = "e18d6e36a79b20dafb58f19d407bd38b0e60260e" }
+
 [[language]]
 name = "blueprint"
 scope = "source.blueprint"
diff --git a/runtime/queries/gn/highlights.scm b/runtime/queries/gn/highlights.scm
new file mode 100644
index 000000000..ff619db11
--- /dev/null
+++ b/runtime/queries/gn/highlights.scm
@@ -0,0 +1,42 @@
+; Copyright (C) 2021 Will Cassella (github@willcassella.com)
+; 
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;         http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+(identifier) @variable.builtin
+
+(scope_access field: (_) @variable.other.member)
+
+(call target: (_) @function)
+
+[ "if" "else" ] @keyword.control.conditional
+
+[
+    (assign_op)
+    (arithmetic_binary_op)
+    (comparison_binary_op)
+    (equivalence_binary_op)
+    (logical_and_binary_op)
+    (logical_or_binary_op)
+    (negation_unary_op)
+] @operator
+
+[ "(" ")" "[" "]" "{" "}" ] @punctuation.bracket
+[ "." "," ] @punctuation.delimiter
+
+(string) @string
+(string_escape) @constant.character.escape
+(string_expansion [ "$" "${" "}" ] @constant.character.escape)
+[ (integer) (hex) ] @constant.numeric
+(boolean) @constant.builtin.boolean
+
+(comment) @comment
diff --git a/runtime/queries/gn/injections.scm b/runtime/queries/gn/injections.scm
new file mode 100644
index 000000000..55864c293
--- /dev/null
+++ b/runtime/queries/gn/injections.scm
@@ -0,0 +1,15 @@
+; Copyright (C) 2021 Will Cassella (github@willcassella.com)
+; 
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;         http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+((comment) @injection.content (#set! injection.language "comment"))
diff --git a/runtime/queries/gn/locals.scm b/runtime/queries/gn/locals.scm
new file mode 100644
index 000000000..e8bd995c3
--- /dev/null
+++ b/runtime/queries/gn/locals.scm
@@ -0,0 +1,16 @@
+; Copyright (C) 2021 Will Cassella (github@willcassella.com)
+; 
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+; 
+;         http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+(source_file) @local.scope
+(assignment target: (identifier) @local.definition)

From b16752306cf6799b30a5bd5cde743a8cf4c395f4 Mon Sep 17 00:00:00 2001
From: blinxen <h-k-81@hotmail.com>
Date: Mon, 13 Nov 2023 22:10:09 +0100
Subject: [PATCH 488/967] [themes] Mention license files in README

---
 runtime/themes/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/runtime/themes/README.md b/runtime/themes/README.md
index 1c9c5ae9b..302ba34cf 100644
--- a/runtime/themes/README.md
+++ b/runtime/themes/README.md
@@ -6,4 +6,12 @@ If you submit a theme, please include a comment at the top with your name and em
 # Author : Name <email@my.domain>
 ```
 
+If you are submitting a theme that is already published somewhere, then please
+add the corresponding license file for it under `licenses/` with the following
+name `theme_name.license` and add a comment at the top of the theme file:
+
+```toml
+# License: <License specification>
+```
+
 We have a preview page for themes on our [wiki](https://github.com/helix-editor/helix/wiki/Themes)!

From a0e5bb8520b4461417e171e4b8146f02d04ffdc1 Mon Sep 17 00:00:00 2001
From: blinxen <h-k-81@hotmail.com>
Date: Sun, 19 Nov 2023 14:08:05 +0100
Subject: [PATCH 489/967] [themes] Add missing license files for recently added
 themes

---
 runtime/themes/licenses/poimandres.LICENSE | 21 +++++++++++++++++++
 runtime/themes/licenses/starlight.LICENSE  | 24 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 runtime/themes/licenses/poimandres.LICENSE
 create mode 100644 runtime/themes/licenses/starlight.LICENSE

diff --git a/runtime/themes/licenses/poimandres.LICENSE b/runtime/themes/licenses/poimandres.LICENSE
new file mode 100644
index 000000000..bc8d1cf48
--- /dev/null
+++ b/runtime/themes/licenses/poimandres.LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 drcmda
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/runtime/themes/licenses/starlight.LICENSE b/runtime/themes/licenses/starlight.LICENSE
new file mode 100644
index 000000000..fdddb29aa
--- /dev/null
+++ b/runtime/themes/licenses/starlight.LICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>

From bfd60a5b39c468055f03a3339ac60546cceefc48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 09:31:12 +0900
Subject: [PATCH 490/967] build(deps): bump rustix from 0.38.22 to 0.38.25
 (#8874)

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 f7361d0ec..fda89964c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1829,9 +1829,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.22"
+version = "0.38.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80109a168d9bc0c7f483083244543a6eb0dba02295d33ca268145e6190d6df0c"
+checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
 dependencies = [
  "bitflags 2.4.1",
  "errno",

From 3052050ee0388207048318fed0909e63a2c865f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Tue, 21 Nov 2023 12:04:20 +0100
Subject: [PATCH 491/967] open urls with goto_file command (#5820)

* feat(commands): open urls with goto_file command

Add capability for `goto_file` command to open an URL under cursor.

Fixes: https://github.com/helix-editor/helix/issues/1472
Superseds: https://github.com/helix-editor/helix/pull/4398

* open files inside helix

* address code review

* bump deps

* fix based on code review comments
---
 Cargo.lock                 | 38 +++++++++++++++++++
 helix-term/Cargo.toml      |  4 ++
 helix-term/src/commands.rs | 76 +++++++++++++++++++++++++++++++++++---
 helix-view/Cargo.toml      |  2 +-
 4 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fda89964c..544a13bb6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1237,6 +1237,7 @@ dependencies = [
  "log",
  "nucleo",
  "once_cell",
+ "open",
  "pulldown-cmark",
  "serde",
  "serde_json",
@@ -1247,6 +1248,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "toml",
+ "url",
  "which",
 ]
 
@@ -1410,6 +1412,25 @@ version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
 
+[[package]]
+name = "is-docker"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.6"
@@ -1610,6 +1631,17 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "open"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8"
+dependencies = [
+ "is-wsl",
+ "libc",
+ "pathdiff",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -1639,6 +1671,12 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "pathdiff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.0"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index c6374de54..378f25f87 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -57,6 +57,10 @@ pulldown-cmark = { version = "0.9", default-features = false }
 # file type detection
 content_inspector = "0.2.4"
 
+# opening URLs
+open = "5.0.0"
+url = "2.4.1"
+
 # config
 toml = "0.7"
 
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f1d1df063..bc54abaaf 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -60,8 +60,13 @@ use crate::{
 
 use crate::job::{self, Jobs};
 use futures_util::{stream::FuturesUnordered, TryStreamExt};
-use std::{collections::HashMap, fmt, future::Future};
-use std::{collections::HashSet, num::NonZeroUsize};
+use std::{
+    collections::{HashMap, HashSet},
+    fmt,
+    future::Future,
+    io::Read,
+    num::NonZeroUsize,
+};
 
 use std::{
     borrow::Cow,
@@ -70,6 +75,7 @@ use std::{
 
 use once_cell::sync::Lazy;
 use serde::de::{self, Deserialize, Deserializer};
+use url::Url;
 
 use grep_regex::RegexMatcherBuilder;
 use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
@@ -331,7 +337,7 @@ impl MappableCommand {
         goto_implementation, "Goto implementation",
         goto_file_start, "Goto line number <n> else file start",
         goto_file_end, "Goto file end",
-        goto_file, "Goto files in selection",
+        goto_file, "Goto files/URLs in selection",
         goto_file_hsplit, "Goto files in selection (hsplit)",
         goto_file_vsplit, "Goto files in selection (vsplit)",
         goto_reference, "Goto references",
@@ -1190,10 +1196,53 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
                 .to_string(),
         );
     }
+
     for sel in paths {
         let p = sel.trim();
-        if !p.is_empty() {
-            let path = &rel_path.join(p);
+        if p.is_empty() {
+            continue;
+        }
+
+        if let Ok(url) = Url::parse(p) {
+            return open_url(cx, url, action);
+        }
+
+        let path = &rel_path.join(p);
+        if path.is_dir() {
+            let picker = ui::file_picker(path.into(), &cx.editor.config());
+            cx.push_layer(Box::new(overlaid(picker)));
+        } else if let Err(e) = cx.editor.open(path, action) {
+            cx.editor.set_error(format!("Open file failed: {:?}", e));
+        }
+    }
+}
+
+/// Opens the given url. If the URL points to a valid textual file it is open in helix.
+//  Otherwise, the file is open using external program.
+fn open_url(cx: &mut Context, url: Url, action: Action) {
+    let doc = doc!(cx.editor);
+    let rel_path = doc
+        .relative_path()
+        .map(|path| path.parent().unwrap().to_path_buf())
+        .unwrap_or_default();
+
+    if url.scheme() != "file" {
+        return open_external_url(cx, url);
+    }
+
+    let content_type = std::fs::File::open(url.path()).and_then(|file| {
+        // Read up to 1kb to detect the content type
+        let mut read_buffer = Vec::new();
+        let n = file.take(1024).read_to_end(&mut read_buffer)?;
+        Ok(content_inspector::inspect(&read_buffer[..n]))
+    });
+
+    // we attempt to open binary files - files that can't be open in helix - using external
+    // program as well, e.g. pdf files or images
+    match content_type {
+        Ok(content_inspector::ContentType::BINARY) => open_external_url(cx, url),
+        Ok(_) | Err(_) => {
+            let path = &rel_path.join(url.path());
             if path.is_dir() {
                 let picker = ui::file_picker(path.into(), &cx.editor.config());
                 cx.push_layer(Box::new(overlaid(picker)));
@@ -1204,6 +1253,23 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
     }
 }
 
+/// Opens URL in external program.
+fn open_external_url(cx: &mut Context, url: Url) {
+    let commands = open::commands(url.as_str());
+    cx.jobs.callback(async {
+        for cmd in commands {
+            let mut command = tokio::process::Command::new(cmd.get_program());
+            command.args(cmd.get_args());
+            if command.output().await.is_ok() {
+                return Ok(job::Callback::Editor(Box::new(|_| {})));
+            }
+        }
+        Ok(job::Callback::Editor(Box::new(move |editor| {
+            editor.set_error("Opening URL in external program failed")
+        })))
+    });
+}
+
 fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
 where
     F: Fn(RopeSlice, Range, usize) -> Range,
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 6218e9e41..a5218b9ac 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -26,7 +26,7 @@ helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits
 once_cell = "1.18"
-url = "2"
+url = "2.4.1"
 
 arc-swap = { version = "1.6.0" }
 

From 47b6c4bc78d449e3586f28d26507bfc8fb8608e2 Mon Sep 17 00:00:00 2001
From: Bjorn Ove Hay Andersen <bjrnove@gmail.com>
Date: Tue, 21 Nov 2023 12:07:00 +0100
Subject: [PATCH 492/967] Resolve args.files before changing directory (#8676)

* Resolve args.files before changing directory

* Removed the open_cwd work-around now that the path is full

* If -w is specified, use that as the working directory

* Open the remaining files in the argument list, also when the first is a directory

* Use an iterator access the files argument
---
 helix-term/src/application.rs | 23 +++++++++++++++--------
 helix-term/src/args.rs        |  1 -
 helix-term/src/main.rs        | 12 +++++++-----
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 43e1cdfc9..ed085749b 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -162,14 +162,19 @@ impl Application {
             // Unset path to prevent accidentally saving to the original tutor file.
             doc_mut!(editor).set_path(None);
         } else if !args.files.is_empty() {
-            if args.open_cwd {
-                // NOTE: The working directory is already set to args.files[0] in main()
-                editor.new_file(Action::VerticalSplit);
-                let picker = ui::file_picker(".".into(), &config.load().editor);
+            let mut files_it = args.files.into_iter().peekable();
+
+            // If the first file is a directory, skip it and open a picker
+            if let Some((first, _)) = files_it.next_if(|(p, _)| p.is_dir()) {
+                let picker = ui::file_picker(first, &config.load().editor);
                 compositor.push(Box::new(overlaid(picker)));
-            } else {
-                let nr_of_files = args.files.len();
-                for (i, (file, pos)) in args.files.into_iter().enumerate() {
+            }
+
+            // If there are any more files specified, open them
+            if files_it.peek().is_some() {
+                let mut nr_of_files = 0;
+                for (file, pos) in files_it {
+                    nr_of_files += 1;
                     if file.is_dir() {
                         return Err(anyhow::anyhow!(
                             "expected a path to file, found a directory. (to open a directory pass it as first argument)"
@@ -181,7 +186,7 @@ impl Application {
                         // option. If neither of those two arguments are passed
                         // in, just load the files normally.
                         let action = match args.split {
-                            _ if i == 0 => Action::VerticalSplit,
+                            _ if nr_of_files == 1 => Action::VerticalSplit,
                             Some(Layout::Vertical) => Action::VerticalSplit,
                             Some(Layout::Horizontal) => Action::HorizontalSplit,
                             None => Action::Load,
@@ -208,6 +213,8 @@ impl Application {
                 // does not affect views without pos since it is at the top
                 let (view, doc) = current!(editor);
                 align_view(doc, view, Align::Center);
+            } else {
+                editor.new_file(Action::VerticalSplit);
             }
         } else if stdin().is_tty() || cfg!(feature = "integration") {
             editor.new_file(Action::VerticalSplit);
diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
index 99ce39926..6a49889b6 100644
--- a/helix-term/src/args.rs
+++ b/helix-term/src/args.rs
@@ -17,7 +17,6 @@ pub struct Args {
     pub log_file: Option<PathBuf>,
     pub config_file: Option<PathBuf>,
     pub files: Vec<(PathBuf, Position)>,
-    pub open_cwd: bool,
     pub working_directory: Option<PathBuf>,
 }
 
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 6411a7c5f..a62c54a40 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -116,16 +116,18 @@ FLAGS:
 
     setup_logging(args.verbosity).context("failed to initialize logging")?;
 
+    // Before setting the working directory, resolve all the paths in args.files
+    for (path, _) in args.files.iter_mut() {
+        *path = helix_core::path::get_canonicalized_path(path);
+    }
+
     // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
     // Application::new() depends on this logic so it must be updated if this changes.
     if let Some(path) = &args.working_directory {
         helix_loader::set_current_working_dir(path)?;
-    }
-
-    // If the first file is a directory, it will be the working directory and a file picker will be opened
-    if let Some((path, _)) = args.files.first().filter(|p| p.0.is_dir()) {
+    } else if let Some((path, _)) = args.files.first().filter(|p| p.0.is_dir()) {
+        // If the first file is a directory, it will be the working directory unless -w was specified
         helix_loader::set_current_working_dir(path)?;
-        args.open_cwd = true; // Signal Application that we want to open the picker on "."
     }
 
     let config = match Config::load_default() {

From 41b307b673a34183123585d63746cb756c1779ed Mon Sep 17 00:00:00 2001
From: chtenb <ctenbrinke@gmail.com>
Date: Wed, 22 Nov 2023 03:42:40 +0100
Subject: [PATCH 493/967] Fix precedence of ui.virtual.whitespace (#8750)

---
 helix-term/src/ui/document.rs | 84 +++++++++++++++++++++---------
 helix-term/src/ui/editor.rs   | 96 +++++++++++++++++++++--------------
 helix-term/src/ui/picker.rs   | 10 ++--
 3 files changed, 125 insertions(+), 65 deletions(-)

diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index 80da1c542..af218a840 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -97,7 +97,8 @@ pub fn render_document(
     doc: &Document,
     offset: ViewPosition,
     doc_annotations: &TextAnnotations,
-    highlight_iter: impl Iterator<Item = HighlightEvent>,
+    syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
+    overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
     theme: &Theme,
     line_decoration: &mut [Box<dyn LineDecoration + '_>],
     translated_positions: &mut [TranslatedPosition],
@@ -109,7 +110,8 @@ pub fn render_document(
         offset,
         &doc.text_format(viewport.width, Some(theme)),
         doc_annotations,
-        highlight_iter,
+        syntax_highlight_iter,
+        overlay_highlight_iter,
         theme,
         line_decoration,
         translated_positions,
@@ -157,7 +159,8 @@ pub fn render_text<'t>(
     offset: ViewPosition,
     text_fmt: &TextFormat,
     text_annotations: &TextAnnotations,
-    highlight_iter: impl Iterator<Item = HighlightEvent>,
+    syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
+    overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
     theme: &Theme,
     line_decorations: &mut [Box<dyn LineDecoration + '_>],
     translated_positions: &mut [TranslatedPosition],
@@ -178,10 +181,16 @@ pub fn render_text<'t>(
 
     let (mut formatter, mut first_visible_char_idx) =
         DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
-    let mut styles = StyleIter {
+    let mut syntax_styles = StyleIter {
         text_style: renderer.text_style,
         active_highlights: Vec::with_capacity(64),
-        highlight_iter,
+        highlight_iter: syntax_highlight_iter,
+        theme,
+    };
+    let mut overlay_styles = StyleIter {
+        text_style: renderer.text_style,
+        active_highlights: Vec::with_capacity(64),
+        highlight_iter: overlay_highlight_iter,
         theme,
     };
 
@@ -193,7 +202,10 @@ pub fn render_text<'t>(
     };
     let mut is_in_indent_area = true;
     let mut last_line_indent_level = 0;
-    let mut style_span = styles
+    let mut syntax_style_span = syntax_styles
+        .next()
+        .unwrap_or_else(|| (Style::default(), usize::MAX));
+    let mut overlay_style_span = overlay_styles
         .next()
         .unwrap_or_else(|| (Style::default(), usize::MAX));
 
@@ -221,9 +233,16 @@ pub fn render_text<'t>(
 
         // skip any graphemes on visual lines before the block start
         if pos.row < row_off {
-            if char_pos >= style_span.1 {
-                style_span = if let Some(style_span) = styles.next() {
-                    style_span
+            if char_pos >= syntax_style_span.1 {
+                syntax_style_span = if let Some(syntax_style_span) = syntax_styles.next() {
+                    syntax_style_span
+                } else {
+                    break;
+                }
+            }
+            if char_pos >= overlay_style_span.1 {
+                overlay_style_span = if let Some(overlay_style_span) = overlay_styles.next() {
+                    overlay_style_span
                 } else {
                     break;
                 }
@@ -260,8 +279,15 @@ pub fn render_text<'t>(
         }
 
         // acquire the correct grapheme style
-        if char_pos >= style_span.1 {
-            style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
+        if char_pos >= syntax_style_span.1 {
+            syntax_style_span = syntax_styles
+                .next()
+                .unwrap_or((Style::default(), usize::MAX));
+        }
+        if char_pos >= overlay_style_span.1 {
+            overlay_style_span = overlay_styles
+                .next()
+                .unwrap_or((Style::default(), usize::MAX));
         }
         char_pos += grapheme.doc_chars();
 
@@ -275,22 +301,25 @@ pub fn render_text<'t>(
             pos,
         );
 
-        let grapheme_style = if let GraphemeSource::VirtualText { highlight } = grapheme.source {
-            let style = renderer.text_style;
-            if let Some(highlight) = highlight {
-                style.patch(theme.highlight(highlight.0))
+        let (syntax_style, overlay_style) =
+            if let GraphemeSource::VirtualText { highlight } = grapheme.source {
+                let mut style = renderer.text_style;
+                if let Some(highlight) = highlight {
+                    style = style.patch(theme.highlight(highlight.0))
+                }
+                (style, Style::default())
             } else {
-                style
-            }
-        } else {
-            style_span.0
-        };
+                (syntax_style_span.0, overlay_style_span.0)
+            };
 
-        let virt = grapheme.is_virtual();
+        let is_virtual = grapheme.is_virtual();
         renderer.draw_grapheme(
             grapheme.grapheme,
-            grapheme_style,
-            virt,
+            GraphemeStyle {
+                syntax_style,
+                overlay_style,
+            },
+            is_virtual,
             &mut last_line_indent_level,
             &mut is_in_indent_area,
             pos,
@@ -322,6 +351,11 @@ pub struct TextRenderer<'a> {
     pub viewport: Rect,
 }
 
+pub struct GraphemeStyle {
+    syntax_style: Style,
+    overlay_style: Style,
+}
+
 impl<'a> TextRenderer<'a> {
     pub fn new(
         surface: &'a mut Surface,
@@ -395,7 +429,7 @@ impl<'a> TextRenderer<'a> {
     pub fn draw_grapheme(
         &mut self,
         grapheme: Grapheme,
-        mut style: Style,
+        grapheme_style: GraphemeStyle,
         is_virtual: bool,
         last_indent_level: &mut usize,
         is_in_indent_area: &mut bool,
@@ -405,9 +439,11 @@ impl<'a> TextRenderer<'a> {
         let is_whitespace = grapheme.is_whitespace();
 
         // TODO is it correct to apply the whitespace style to all unicode white spaces?
+        let mut style = grapheme_style.syntax_style;
         if is_whitespace {
             style = style.patch(self.whitespace_style);
         }
+        style = style.patch(grapheme_style.overlay_style);
 
         let width = grapheme.width();
         let space = if is_virtual { " " } else { &self.space };
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 31195a4e5..6b85d9a33 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -124,16 +124,20 @@ impl EditorView {
             line_decorations.push(Box::new(line_decoration));
         }
 
-        let mut highlights =
+        let syntax_highlights =
             Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
-        let overlay_highlights = Self::overlay_syntax_highlights(
+
+        let mut overlay_highlights =
+            Self::empty_highlight_iter(doc, view.offset.anchor, inner.height);
+        let overlay_syntax_highlights = Self::overlay_syntax_highlights(
             doc,
             view.offset.anchor,
             inner.height,
             &text_annotations,
         );
-        if !overlay_highlights.is_empty() {
-            highlights = Box::new(syntax::merge(highlights, overlay_highlights));
+        if !overlay_syntax_highlights.is_empty() {
+            overlay_highlights =
+                Box::new(syntax::merge(overlay_highlights, overlay_syntax_highlights));
         }
 
         for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
@@ -142,12 +146,12 @@ impl EditorView {
             if diagnostic.is_empty() {
                 continue;
             }
-            highlights = Box::new(syntax::merge(highlights, diagnostic));
+            overlay_highlights = Box::new(syntax::merge(overlay_highlights, diagnostic));
         }
 
-        let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
+        if is_focused {
             let highlights = syntax::merge(
-                highlights,
+                overlay_highlights,
                 Self::doc_selection_highlights(
                     editor.mode(),
                     doc,
@@ -158,13 +162,11 @@ impl EditorView {
             );
             let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
             if focused_view_elements.is_empty() {
-                Box::new(highlights)
+                overlay_highlights = Box::new(highlights)
             } else {
-                Box::new(syntax::merge(highlights, focused_view_elements))
+                overlay_highlights = Box::new(syntax::merge(highlights, focused_view_elements))
             }
-        } else {
-            Box::new(highlights)
-        };
+        }
 
         let gutter_overflow = view.gutter_offset(doc) == 0;
         if !gutter_overflow {
@@ -197,7 +199,8 @@ impl EditorView {
             doc,
             view.offset,
             &text_annotations,
-            highlights,
+            syntax_highlights,
+            overlay_highlights,
             theme,
             &mut line_decorations,
             &mut translated_positions,
@@ -257,27 +260,39 @@ impl EditorView {
             .for_each(|area| surface.set_style(area, ruler_theme))
     }
 
-    pub fn overlay_syntax_highlights(
+    fn viewport_byte_range(
+        text: helix_core::RopeSlice,
+        row: usize,
+        height: u16,
+    ) -> std::ops::Range<usize> {
+        // Calculate viewport byte ranges:
+        // Saturating subs to make it inclusive zero indexing.
+        let last_line = text.len_lines().saturating_sub(1);
+        let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
+        let start = text.line_to_byte(row.min(last_line));
+        let end = text.line_to_byte(last_visible_line + 1);
+
+        start..end
+    }
+
+    pub fn empty_highlight_iter(
         doc: &Document,
         anchor: usize,
         height: u16,
-        text_annotations: &TextAnnotations,
-    ) -> Vec<(usize, std::ops::Range<usize>)> {
+    ) -> Box<dyn Iterator<Item = HighlightEvent>> {
         let text = doc.text().slice(..);
         let row = text.char_to_line(anchor.min(text.len_chars()));
 
-        let range = {
-            // Calculate viewport byte ranges:
-            // Saturating subs to make it inclusive zero indexing.
-            let last_line = text.len_lines().saturating_sub(1);
-            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
-            let start = text.line_to_byte(row.min(last_line));
-            let end = text.line_to_byte(last_visible_line + 1);
-
-            start..end
-        };
-
-        text_annotations.collect_overlay_highlights(range)
+        // Calculate viewport byte ranges:
+        // Saturating subs to make it inclusive zero indexing.
+        let range = Self::viewport_byte_range(text, row, height);
+        Box::new(
+            [HighlightEvent::Source {
+                start: text.byte_to_char(range.start),
+                end: text.byte_to_char(range.end),
+            }]
+            .into_iter(),
+        )
     }
 
     /// Get syntax highlights for a document in a view represented by the first line
@@ -292,16 +307,7 @@ impl EditorView {
         let text = doc.text().slice(..);
         let row = text.char_to_line(anchor.min(text.len_chars()));
 
-        let range = {
-            // Calculate viewport byte ranges:
-            // Saturating subs to make it inclusive zero indexing.
-            let last_line = text.len_lines().saturating_sub(1);
-            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
-            let start = text.line_to_byte(row.min(last_line));
-            let end = text.line_to_byte(last_visible_line + 1);
-
-            start..end
-        };
+        let range = Self::viewport_byte_range(text, row, height);
 
         match doc.syntax() {
             Some(syntax) => {
@@ -334,6 +340,20 @@ impl EditorView {
         }
     }
 
+    pub fn overlay_syntax_highlights(
+        doc: &Document,
+        anchor: usize,
+        height: u16,
+        text_annotations: &TextAnnotations,
+    ) -> Vec<(usize, std::ops::Range<usize>)> {
+        let text = doc.text().slice(..);
+        let row = text.char_to_line(anchor.min(text.len_chars()));
+
+        let range = Self::viewport_byte_range(text, row, height);
+
+        text_annotations.collect_overlay_highlights(range)
+    }
+
     /// Get highlight spans for document diagnostics
     pub fn doc_diagnostics_highlights(
         doc: &Document,
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 0214a3910..9ba453357 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -736,17 +736,20 @@ impl<T: Item + 'static> Picker<T> {
                 }
             }
 
-            let mut highlights = EditorView::doc_syntax_highlights(
+            let syntax_highlights = EditorView::doc_syntax_highlights(
                 doc,
                 offset.anchor,
                 area.height,
                 &cx.editor.theme,
             );
+
+            let mut overlay_highlights =
+                EditorView::empty_highlight_iter(doc, offset.anchor, area.height);
             for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
                 if spans.is_empty() {
                     continue;
                 }
-                highlights = Box::new(helix_core::syntax::merge(highlights, spans));
+                overlay_highlights = Box::new(helix_core::syntax::merge(overlay_highlights, spans));
             }
             let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
 
@@ -777,7 +780,8 @@ impl<T: Item + 'static> Picker<T> {
                 offset,
                 // TODO: compute text annotations asynchronously here (like inlay hints)
                 &TextAnnotations::default(),
-                highlights,
+                syntax_highlights,
+                overlay_highlights,
                 &cx.editor.theme,
                 &mut decorations,
                 &mut [],

From 811d62d3b3699efb7b7ceb362f537979e5911871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 22 Nov 2023 16:00:28 +0900
Subject: [PATCH 494/967] Revert "Fix precedence of ui.virtual.whitespace
 (#8750)"

This reverts commit 41b307b673a34183123585d63746cb756c1779ed.
---
 helix-term/src/ui/document.rs | 84 +++++++++---------------------
 helix-term/src/ui/editor.rs   | 96 ++++++++++++++---------------------
 helix-term/src/ui/picker.rs   | 10 ++--
 3 files changed, 65 insertions(+), 125 deletions(-)

diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index af218a840..80da1c542 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -97,8 +97,7 @@ pub fn render_document(
     doc: &Document,
     offset: ViewPosition,
     doc_annotations: &TextAnnotations,
-    syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
-    overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
+    highlight_iter: impl Iterator<Item = HighlightEvent>,
     theme: &Theme,
     line_decoration: &mut [Box<dyn LineDecoration + '_>],
     translated_positions: &mut [TranslatedPosition],
@@ -110,8 +109,7 @@ pub fn render_document(
         offset,
         &doc.text_format(viewport.width, Some(theme)),
         doc_annotations,
-        syntax_highlight_iter,
-        overlay_highlight_iter,
+        highlight_iter,
         theme,
         line_decoration,
         translated_positions,
@@ -159,8 +157,7 @@ pub fn render_text<'t>(
     offset: ViewPosition,
     text_fmt: &TextFormat,
     text_annotations: &TextAnnotations,
-    syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
-    overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
+    highlight_iter: impl Iterator<Item = HighlightEvent>,
     theme: &Theme,
     line_decorations: &mut [Box<dyn LineDecoration + '_>],
     translated_positions: &mut [TranslatedPosition],
@@ -181,16 +178,10 @@ pub fn render_text<'t>(
 
     let (mut formatter, mut first_visible_char_idx) =
         DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
-    let mut syntax_styles = StyleIter {
+    let mut styles = StyleIter {
         text_style: renderer.text_style,
         active_highlights: Vec::with_capacity(64),
-        highlight_iter: syntax_highlight_iter,
-        theme,
-    };
-    let mut overlay_styles = StyleIter {
-        text_style: renderer.text_style,
-        active_highlights: Vec::with_capacity(64),
-        highlight_iter: overlay_highlight_iter,
+        highlight_iter,
         theme,
     };
 
@@ -202,10 +193,7 @@ pub fn render_text<'t>(
     };
     let mut is_in_indent_area = true;
     let mut last_line_indent_level = 0;
-    let mut syntax_style_span = syntax_styles
-        .next()
-        .unwrap_or_else(|| (Style::default(), usize::MAX));
-    let mut overlay_style_span = overlay_styles
+    let mut style_span = styles
         .next()
         .unwrap_or_else(|| (Style::default(), usize::MAX));
 
@@ -233,16 +221,9 @@ pub fn render_text<'t>(
 
         // skip any graphemes on visual lines before the block start
         if pos.row < row_off {
-            if char_pos >= syntax_style_span.1 {
-                syntax_style_span = if let Some(syntax_style_span) = syntax_styles.next() {
-                    syntax_style_span
-                } else {
-                    break;
-                }
-            }
-            if char_pos >= overlay_style_span.1 {
-                overlay_style_span = if let Some(overlay_style_span) = overlay_styles.next() {
-                    overlay_style_span
+            if char_pos >= style_span.1 {
+                style_span = if let Some(style_span) = styles.next() {
+                    style_span
                 } else {
                     break;
                 }
@@ -279,15 +260,8 @@ pub fn render_text<'t>(
         }
 
         // acquire the correct grapheme style
-        if char_pos >= syntax_style_span.1 {
-            syntax_style_span = syntax_styles
-                .next()
-                .unwrap_or((Style::default(), usize::MAX));
-        }
-        if char_pos >= overlay_style_span.1 {
-            overlay_style_span = overlay_styles
-                .next()
-                .unwrap_or((Style::default(), usize::MAX));
+        if char_pos >= style_span.1 {
+            style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
         }
         char_pos += grapheme.doc_chars();
 
@@ -301,25 +275,22 @@ pub fn render_text<'t>(
             pos,
         );
 
-        let (syntax_style, overlay_style) =
-            if let GraphemeSource::VirtualText { highlight } = grapheme.source {
-                let mut style = renderer.text_style;
-                if let Some(highlight) = highlight {
-                    style = style.patch(theme.highlight(highlight.0))
-                }
-                (style, Style::default())
+        let grapheme_style = if let GraphemeSource::VirtualText { highlight } = grapheme.source {
+            let style = renderer.text_style;
+            if let Some(highlight) = highlight {
+                style.patch(theme.highlight(highlight.0))
             } else {
-                (syntax_style_span.0, overlay_style_span.0)
-            };
+                style
+            }
+        } else {
+            style_span.0
+        };
 
-        let is_virtual = grapheme.is_virtual();
+        let virt = grapheme.is_virtual();
         renderer.draw_grapheme(
             grapheme.grapheme,
-            GraphemeStyle {
-                syntax_style,
-                overlay_style,
-            },
-            is_virtual,
+            grapheme_style,
+            virt,
             &mut last_line_indent_level,
             &mut is_in_indent_area,
             pos,
@@ -351,11 +322,6 @@ pub struct TextRenderer<'a> {
     pub viewport: Rect,
 }
 
-pub struct GraphemeStyle {
-    syntax_style: Style,
-    overlay_style: Style,
-}
-
 impl<'a> TextRenderer<'a> {
     pub fn new(
         surface: &'a mut Surface,
@@ -429,7 +395,7 @@ impl<'a> TextRenderer<'a> {
     pub fn draw_grapheme(
         &mut self,
         grapheme: Grapheme,
-        grapheme_style: GraphemeStyle,
+        mut style: Style,
         is_virtual: bool,
         last_indent_level: &mut usize,
         is_in_indent_area: &mut bool,
@@ -439,11 +405,9 @@ impl<'a> TextRenderer<'a> {
         let is_whitespace = grapheme.is_whitespace();
 
         // TODO is it correct to apply the whitespace style to all unicode white spaces?
-        let mut style = grapheme_style.syntax_style;
         if is_whitespace {
             style = style.patch(self.whitespace_style);
         }
-        style = style.patch(grapheme_style.overlay_style);
 
         let width = grapheme.width();
         let space = if is_virtual { " " } else { &self.space };
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 6b85d9a33..31195a4e5 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -124,20 +124,16 @@ impl EditorView {
             line_decorations.push(Box::new(line_decoration));
         }
 
-        let syntax_highlights =
+        let mut highlights =
             Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
-
-        let mut overlay_highlights =
-            Self::empty_highlight_iter(doc, view.offset.anchor, inner.height);
-        let overlay_syntax_highlights = Self::overlay_syntax_highlights(
+        let overlay_highlights = Self::overlay_syntax_highlights(
             doc,
             view.offset.anchor,
             inner.height,
             &text_annotations,
         );
-        if !overlay_syntax_highlights.is_empty() {
-            overlay_highlights =
-                Box::new(syntax::merge(overlay_highlights, overlay_syntax_highlights));
+        if !overlay_highlights.is_empty() {
+            highlights = Box::new(syntax::merge(highlights, overlay_highlights));
         }
 
         for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
@@ -146,12 +142,12 @@ impl EditorView {
             if diagnostic.is_empty() {
                 continue;
             }
-            overlay_highlights = Box::new(syntax::merge(overlay_highlights, diagnostic));
+            highlights = Box::new(syntax::merge(highlights, diagnostic));
         }
 
-        if is_focused {
+        let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
             let highlights = syntax::merge(
-                overlay_highlights,
+                highlights,
                 Self::doc_selection_highlights(
                     editor.mode(),
                     doc,
@@ -162,11 +158,13 @@ impl EditorView {
             );
             let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
             if focused_view_elements.is_empty() {
-                overlay_highlights = Box::new(highlights)
+                Box::new(highlights)
             } else {
-                overlay_highlights = Box::new(syntax::merge(highlights, focused_view_elements))
+                Box::new(syntax::merge(highlights, focused_view_elements))
             }
-        }
+        } else {
+            Box::new(highlights)
+        };
 
         let gutter_overflow = view.gutter_offset(doc) == 0;
         if !gutter_overflow {
@@ -199,8 +197,7 @@ impl EditorView {
             doc,
             view.offset,
             &text_annotations,
-            syntax_highlights,
-            overlay_highlights,
+            highlights,
             theme,
             &mut line_decorations,
             &mut translated_positions,
@@ -260,39 +257,27 @@ impl EditorView {
             .for_each(|area| surface.set_style(area, ruler_theme))
     }
 
-    fn viewport_byte_range(
-        text: helix_core::RopeSlice,
-        row: usize,
-        height: u16,
-    ) -> std::ops::Range<usize> {
-        // Calculate viewport byte ranges:
-        // Saturating subs to make it inclusive zero indexing.
-        let last_line = text.len_lines().saturating_sub(1);
-        let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
-        let start = text.line_to_byte(row.min(last_line));
-        let end = text.line_to_byte(last_visible_line + 1);
-
-        start..end
-    }
-
-    pub fn empty_highlight_iter(
+    pub fn overlay_syntax_highlights(
         doc: &Document,
         anchor: usize,
         height: u16,
-    ) -> Box<dyn Iterator<Item = HighlightEvent>> {
+        text_annotations: &TextAnnotations,
+    ) -> Vec<(usize, std::ops::Range<usize>)> {
         let text = doc.text().slice(..);
         let row = text.char_to_line(anchor.min(text.len_chars()));
 
-        // Calculate viewport byte ranges:
-        // Saturating subs to make it inclusive zero indexing.
-        let range = Self::viewport_byte_range(text, row, height);
-        Box::new(
-            [HighlightEvent::Source {
-                start: text.byte_to_char(range.start),
-                end: text.byte_to_char(range.end),
-            }]
-            .into_iter(),
-        )
+        let range = {
+            // Calculate viewport byte ranges:
+            // Saturating subs to make it inclusive zero indexing.
+            let last_line = text.len_lines().saturating_sub(1);
+            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
+            let start = text.line_to_byte(row.min(last_line));
+            let end = text.line_to_byte(last_visible_line + 1);
+
+            start..end
+        };
+
+        text_annotations.collect_overlay_highlights(range)
     }
 
     /// Get syntax highlights for a document in a view represented by the first line
@@ -307,7 +292,16 @@ impl EditorView {
         let text = doc.text().slice(..);
         let row = text.char_to_line(anchor.min(text.len_chars()));
 
-        let range = Self::viewport_byte_range(text, row, height);
+        let range = {
+            // Calculate viewport byte ranges:
+            // Saturating subs to make it inclusive zero indexing.
+            let last_line = text.len_lines().saturating_sub(1);
+            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
+            let start = text.line_to_byte(row.min(last_line));
+            let end = text.line_to_byte(last_visible_line + 1);
+
+            start..end
+        };
 
         match doc.syntax() {
             Some(syntax) => {
@@ -340,20 +334,6 @@ impl EditorView {
         }
     }
 
-    pub fn overlay_syntax_highlights(
-        doc: &Document,
-        anchor: usize,
-        height: u16,
-        text_annotations: &TextAnnotations,
-    ) -> Vec<(usize, std::ops::Range<usize>)> {
-        let text = doc.text().slice(..);
-        let row = text.char_to_line(anchor.min(text.len_chars()));
-
-        let range = Self::viewport_byte_range(text, row, height);
-
-        text_annotations.collect_overlay_highlights(range)
-    }
-
     /// Get highlight spans for document diagnostics
     pub fn doc_diagnostics_highlights(
         doc: &Document,
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 9ba453357..0214a3910 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -736,20 +736,17 @@ impl<T: Item + 'static> Picker<T> {
                 }
             }
 
-            let syntax_highlights = EditorView::doc_syntax_highlights(
+            let mut highlights = EditorView::doc_syntax_highlights(
                 doc,
                 offset.anchor,
                 area.height,
                 &cx.editor.theme,
             );
-
-            let mut overlay_highlights =
-                EditorView::empty_highlight_iter(doc, offset.anchor, area.height);
             for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
                 if spans.is_empty() {
                     continue;
                 }
-                overlay_highlights = Box::new(helix_core::syntax::merge(overlay_highlights, spans));
+                highlights = Box::new(helix_core::syntax::merge(highlights, spans));
             }
             let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
 
@@ -780,8 +777,7 @@ impl<T: Item + 'static> Picker<T> {
                 offset,
                 // TODO: compute text annotations asynchronously here (like inlay hints)
                 &TextAnnotations::default(),
-                syntax_highlights,
-                overlay_highlights,
+                highlights,
                 &cx.editor.theme,
                 &mut decorations,
                 &mut [],

From db83eb0c506617b39798a0e5000063459f81ce6a Mon Sep 17 00:00:00 2001
From: chtenb <ctenbrinke@gmail.com>
Date: Wed, 22 Nov 2023 14:07:26 +0100
Subject: [PATCH 495/967] Document the bufferline scopes (#8880)

* Document the bufferline scopes

* Update book/src/themes.md

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/themes.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/book/src/themes.md b/book/src/themes.md
index a62c07fee..495b76856 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -296,6 +296,9 @@ These scopes are used for theming the editor interface:
 | `ui.statusline.insert`            | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
 | `ui.statusline.select`            | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
 | `ui.statusline.separator`         | Separator character in statusline                                                              |
+| `ui.bufferline`                   | Style for the buffer line                                                                      |
+| `ui.bufferline.active`            | Style for the active buffer in buffer line                                                        |
+| `ui.bufferline.background`        | Style for bufferline background                                                                |
 | `ui.popup`                        | Documentation popups (e.g. Space + k)                                                          |
 | `ui.popup.info`                   | Prompt for multiple key options                                                                |
 | `ui.window`                       | Borderlines separating splits                                                                  |

From f1b9c19fa91ea21b81cf912c24ef11bf267d7bc7 Mon Sep 17 00:00:00 2001
From: Ethan Brierley <ethanboxx@gmail.com>
Date: Wed, 22 Nov 2023 18:24:34 +0100
Subject: [PATCH 496/967] add LSP for nushell  (#8878)

---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a7d45a461..f93624f61 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -105,7 +105,7 @@
 | nickel | ✓ |  | ✓ | `nls` |
 | nim | ✓ | ✓ | ✓ | `nimlangserver` |
 | nix | ✓ |  |  | `nil` |
-| nu | ✓ |  |  |  |
+| nu | ✓ |  |  | `nu` |
 | nunjucks | ✓ |  |  |  |
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
 | ocaml-interface | ✓ |  |  | `ocamllsp` |
diff --git a/languages.toml b/languages.toml
index 3dedf6715..afbf34557 100644
--- a/languages.toml
+++ b/languages.toml
@@ -47,6 +47,7 @@ mint = { command = "mint", args = ["ls"] }
 nil = { command = "nil" }
 nimlangserver = { command = "nimlangserver" }
 nls = { command = "nls" }
+nu-lsp = { command = "nu", args = [ "--lsp" ] }
 ocamllsp = { command = "ocamllsp" }
 ols = { command = "ols", args = [] }
 omnisharp = { command = "OmniSharp", args = [ "--languageserver" ] }
@@ -1783,6 +1784,7 @@ file-types = ["nu"]
 shebangs = ["nu"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
+language-servers = [ "nu-lsp" ]
 
 [[grammar]]
 name = "nu"

From ff095ebd9b47bd5b06f16baca8dea9202f8d3c68 Mon Sep 17 00:00:00 2001
From: ghashy <109857267+ghashy@users.noreply.github.com>
Date: Wed, 22 Nov 2023 20:27:25 +0300
Subject: [PATCH 497/967] DBML Language support (#8860)

* DBML language support

* DBML language support, highlights.scm added

* DBML support

* Update runtime/queries/dbml/highlights.scm

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

* Update runtime/queries/dbml/highlights.scm

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

* Update runtime/queries/dbml/highlights.scm

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

* remove unnecessary block highlight

* remove unnecessary line

* remove index_block query

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 12 ++++++++
 runtime/queries/dbml/highlights.scm | 44 +++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 runtime/queries/dbml/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index f93624f61..c21ca2501 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -24,6 +24,7 @@
 | cue | ✓ |  |  | `cuelsp` |
 | d | ✓ | ✓ | ✓ | `serve-d` |
 | dart | ✓ |  | ✓ | `dart` |
+| dbml | ✓ |  |  |  |
 | devicetree | ✓ |  |  |  |
 | dhall | ✓ | ✓ |  | `dhall-lsp-server` |
 | diff | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index afbf34557..ef4687af8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2930,3 +2930,15 @@ language-servers = [ "templ" ]
 [[grammar]]
 name = "templ"
 source = { git = "https://github.com/vrischmann/tree-sitter-templ", rev = "ea56ac0655243490a4929a988f4eaa91dfccc995" }
+
+[[language]]
+name = "dbml"
+scope = "source.dbml"
+injection-regex = "dbml"
+file-types = ["dbml"]
+comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "dbml"
+source = { git = "https://github.com/dynamotn/tree-sitter-dbml", rev = "2e2fa5640268c33c3d3f27f7e676f631a9c68fd9" }
diff --git a/runtime/queries/dbml/highlights.scm b/runtime/queries/dbml/highlights.scm
new file mode 100644
index 000000000..accc65b4c
--- /dev/null
+++ b/runtime/queries/dbml/highlights.scm
@@ -0,0 +1,44 @@
+
+; comments highlighting
+(comment) @comment
+
+; keyword highlighting
+(keyword_def) @keyword
+(keyword_enum) @keyword
+(keyword_ref) @keyword
+
+; identify blocks and definitions
+(definition) @function
+
+; for identifiers
+(identifier) @variable
+(type) @keyword
+
+; Highlight special types for database/data types
+("Project" ) @type
+("Table" ) @type
+("TableGroup" ) @type
+("database_type" ) @variable
+
+; string and number constants
+("'''") @constant.character.escape
+(string) @string
+(number) @constant.numeric
+
+; brackets
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+; brackets
+[
+  ":"
+  "."
+  ","
+] @punctuation.delimiter
+

From 090ed97e0045bfad1e5bff8b96c61707b996b85a Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@rudder.io>
Date: Wed, 22 Nov 2023 19:04:10 +0100
Subject: [PATCH 498/967] Add modus operandi themes (#8728)

---
 runtime/themes/modus_operandi.toml            | 194 ++++++++++++++++++
 .../themes/modus_operandi_deuteranopia.toml   |  46 +++++
 runtime/themes/modus_operandi_tinted.toml     |  45 ++++
 runtime/themes/modus_operandi_tritanopia.toml |  73 +++++++
 4 files changed, 358 insertions(+)
 create mode 100644 runtime/themes/modus_operandi.toml
 create mode 100644 runtime/themes/modus_operandi_deuteranopia.toml
 create mode 100644 runtime/themes/modus_operandi_tinted.toml
 create mode 100644 runtime/themes/modus_operandi_tritanopia.toml

diff --git a/runtime/themes/modus_operandi.toml b/runtime/themes/modus_operandi.toml
new file mode 100644
index 000000000..2247bb3be
--- /dev/null
+++ b/runtime/themes/modus_operandi.toml
@@ -0,0 +1,194 @@
+# Author: Alexis Mousset <contact@amousset.me>
+# Adapted from https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
+# Version 4.3.0
+#
+
+# Syntax highlighting
+# -------------------
+"type" = "cyan-cooler"
+"constructor" = "cyan-cooler"
+
+"constant" = "blue-cooler"
+"constant.character.escape" = "magenta"
+
+"string" = "blue-warmer"
+"string.regexp" = "magenta-faint"
+"string.special" = "blue-faint" # used for colors in CSS
+
+"comment" = "fg-dim"
+
+"variable.parameter" = "cyan"
+"variable.builtin" = "magenta-cooler"
+"label" = "fg-dim" # used for language in markdown code blocks
+"keyword" = "magenta-cooler"
+"keyword.directive" = "red-cooler"
+"function" = "magenta"
+"function.macro" = "magenta-warmer"
+
+punctuation = "fg-dim"
+"tag" = "magenta"
+"attribute" = "cyan-cooler"
+"namespace" = "blue-cooler"
+"special" = "red-cooler"
+
+"markup.heading.marker" = "fg-dim"
+"markup.heading.1" = { fg = "fg-main", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "yellow-faint", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "fg-alt", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "magenta", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "green-faint", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "red-faint", modifiers = ["bold"] }
+"markup.list" = "fg-dim"
+"markup.list.checked" = { fg = "yellow-warmer" }
+"markup.list.unchecked" = { fg = "yellow-warmer" }
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "cyan" }
+"markup.link.text" = { fg = "blue-warmer", modifiers = ["underlined"] }
+"markup.raw.block" = { bg = "bg-dim" }
+"markup.raw.inline" = { fg = "green-cooler" }
+
+"diff.plus" = { fg = "fg-added", bg = "bg-added" }
+"diff.plus.gutter" = "green-intense"
+"diff.minus" = { fg = "fg-removed", bg = "bg-removed" }
+"diff.minus.gutter" = "red-intense"
+"diff.delta" = { fg = "fg-changed", bg = "bg-changed" }
+"diff.delta.gutter" = "yellow-intense"
+
+# User Interface
+# --------------
+
+"ui.background" = { bg = "bg-main" }
+
+"ui.linenr" = { fg = "fg-dim", bg = "bg-dim" }
+"ui.linenr.selected" = { fg = "fg-main", bg = "bg-active" }
+
+"ui.statusline" = { fg = "fg-mode-line-active", bg = "bg-mode-line-active" }
+"ui.statusline.inactive" = { fg = "fg-mode-line-inactive", bg = "bg-mode-line-inactive" }
+"ui.statusline.normal" = { fg = "blue-warmer" }
+"ui.statusline.insert" = { fg = "green-warmer" }
+"ui.statusline.select" = { fg = "magenta-warmer" }
+
+"ui.popup" = { fg = "fg-main", bg = "bg-dim" }
+"ui.window" = { fg = "fg-dim" }
+"ui.help" = { fg = "fg-main", bg = "bg-dim" }
+"ui.gutter" = { bg = "bg-dim" }
+"ui.text" = "fg-main"
+"ui.text.focus" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
+"ui.text.inactive" = { fg = "fg-dim" }
+"ui.virtual" = "bg-active"
+"ui.virtual.ruler" = { bg = "bg-dim" }
+"ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
+
+"ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
+"ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
+
+"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.cursorline.primary" = { bg = "bg-hl-line" }
+
+"ui.highlight" = { bg = "bg-hl-line" }
+
+"ui.menu" = { fg = "fg-main", bg = "bg-dim" }
+"ui.menu.selected" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
+"ui.menu.scroll" = { fg = "fg-dim", bg = "bg-cyan-intense" }
+
+"diagnostic.error" = { underline = { color = "red-intense", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
+"diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
+
+error = "red"
+warning = "yellow-warmer"
+info = "cyan-cooler"
+hint = "blue-cooler"
+
+[palette]
+# Basic values
+bg-main = "#ffffff"
+bg-dim = "#f2f2f2"
+fg-main = "#000000"
+fg-dim = "#595959"
+fg-alt = "#193668"
+bg-active = "#c4c4c4"
+bg-inactive = "#e0e0e0"
+
+# Common accent foregrounds
+red = "#a60000"
+red-warmer = "#972500"
+red-cooler = "#a0132f"
+red-faint = "#7f0000"
+red-intense = "#d00000"
+green = "#006800"
+green-warmer = "#316500"
+green-cooler = "#00663f"
+green-faint = "#2a5045"
+green-intense = "#008900"
+yellow = "#6f5500"
+yellow-warmer = "#884900"
+yellow-cooler = "#7a4f2f"
+yellow-faint = "#624416"
+yellow-intense = "#808000"
+blue = "#0031a9"
+blue-warmer = "#354fcf"
+blue-cooler = "#0000b0"
+blue-faint = "#003497"
+blue-intense = "#0000ff"
+magenta = "#721045"
+magenta-warmer = "#8f0075"
+magenta-cooler = "#531ab6"
+magenta-faint = "#7c318f"
+magenta-intense = "#dd22dd"
+cyan = "#005e8b"
+cyan-warmer = "#3f578f"
+cyan-cooler = "#005f5f"
+cyan-faint = "#005077"
+cyan-intense = "#008899"
+
+# Common accent backgrounds
+bg-red-intense = "#ff8f88"
+bg-green-intense = "#8adf80"
+bg-yellow-intense = "#f3d000"
+bg-blue-intense = "#bfc9ff"
+bg-magenta-intense = "#dfa0f0"
+bg-cyan-intense = "#a4d5f9"
+
+bg-red-subtle = "#ffcfbf"
+bg-green-subtle = "#b3fabf"
+bg-yellow-subtle = "#fff576"
+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"
+
+# Special purpose
+bg-completion = "#c0deff"
+bg-hl-line = "#dae5ec"
+
+bg-mode-line-active = "#c8c8c8"
+fg-mode-line-active = "#000000"
+bg-mode-line-inactive = "#e6e6e6"
+fg-mode-line-inactive = "#585858"
+
+modeline-err = "#7f0000"
+modeline-warning = "#5f0070"
+modeline-info = "#002580"
+
+# Diffs
+bg-added = "#c1f2d1"
+fg-added = "#005000"
+bg-changed = "#ffdfa9"
+fg-changed = "#553d00"
+bg-removed = "#ffd8d5"
+fg-removed = "#8f1313"
+
+# Paren match
+bg-paren-match = "#5fcfff"
diff --git a/runtime/themes/modus_operandi_deuteranopia.toml b/runtime/themes/modus_operandi_deuteranopia.toml
new file mode 100644
index 000000000..28601d37f
--- /dev/null
+++ b/runtime/themes/modus_operandi_deuteranopia.toml
@@ -0,0 +1,46 @@
+# Author: Alexis Mousset <contact@amousset.me>
+# modus_operandi.toml variant
+#
+# This variant is optimized for users with red-green color deficiency (deuteranopia)
+
+inherits = "modus_operandi"
+
+"constant.character.escape" = "magenta"
+"comment" = "yellow-cooler"
+"function" = "magenta"
+"tag" = "magenta"
+
+"ui.cursor" = { fg = "bg-main", bg = "blue-intense" }
+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "blue-intense" }
+
+"diagnostic.error" = { underline = { color = "yellow-intense", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "magenta-faint", style = "curl" } }
+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
+
+error = "yellow-intense"
+warning = "magenta-faint"
+info = "cyan"
+hint = "blue"
+
+[palette]
+
+yellow = "#695500"
+yellow-warmer = "#973300"
+yellow-cooler = "#77492f"
+
+bg-mode-line-active = "#d0d6ff"
+fg-mode-line-active = "#0f0f0f"
+border-mode-line-active = "#4f4f74"
+
+modeline-err = "#603a00"
+modeline-warning = "#454500"
+modeline-info = "#023d92"
+
+# Diffs
+bg-added = "#d5d7ff"
+fg-added = "#303099"
+bg-changed = "#eecfdf"
+fg-changed = "#6f1343"
+bg-removed = "#f4f099"
+fg-removed = "#553d00"
diff --git a/runtime/themes/modus_operandi_tinted.toml b/runtime/themes/modus_operandi_tinted.toml
new file mode 100644
index 000000000..14faf0e5a
--- /dev/null
+++ b/runtime/themes/modus_operandi_tinted.toml
@@ -0,0 +1,45 @@
+# Author: Alexis Mousset <contact@amousset.me>
+# modus_operandi.toml variant
+
+inherits = "modus_operandi"
+
+"comment" = "red-faint"
+
+"ui.cursor.primary" = { fg = "bg-main", bg = "red" }
+
+[palette]
+# Basic values
+bg-main = "#fbf7f0"
+bg-dim = "#efe9dd"
+bg-active = "#c9b9b0"
+bg-inactive = "#dfd5cf"
+border = "#9f9690"
+
+# Common accent backgrounds
+bg-red-nuanced = "#ffe8f0"
+bg-green-nuanced = "#e0f5e0"
+bg-yellow-nuanced = "#f9ead0"
+bg-blue-nuanced = "#ebebff"
+bg-magenta-nuanced = "#f6e7ff"
+bg-cyan-nuanced = "#e1f3fc"
+
+# Special purpose
+bg-completion = "#f0c1cf"
+bg-hl-line = "#f1d5d0"
+bg-region = "#c2bcb5"
+
+bg-mode-line-active = "#cab9b2"
+border-mode-line-active = "#545454"
+bg-mode-line-inactive = "#dfd9cf"
+border-mode-line-inactive = "#a59a94"
+
+bg-tab-bar = "#e0d4ce"
+bg-tab-current = "#fbf7f0"
+bg-tab-other = "#c8b8b2"
+
+# Diffs
+bg-added = "#c3ebc1"
+bg-removed = "#f4d0cf"
+
+# Paren match
+bg-paren-match = "#7fdfcf"
diff --git a/runtime/themes/modus_operandi_tritanopia.toml b/runtime/themes/modus_operandi_tritanopia.toml
new file mode 100644
index 000000000..8149f653e
--- /dev/null
+++ b/runtime/themes/modus_operandi_tritanopia.toml
@@ -0,0 +1,73 @@
+# Author: Alexis Mousset <contact@amousset.me>
+# modus_operandi.toml variant
+#
+# This variant is optimized for users with blue-yellow color deficiency (tritanopia)
+
+inherits = "modus_operandi"
+
+"type" = "blue-warmer"
+"constructor" = "blue-warmer"
+"constant" = "green-cooler"
+"constant.character.escape" = "red-cooler"
+"string" = "cyan"
+"comment" = "red-faint"
+"variable.parameter" = "cyan-cooler"
+"keyword" = "red-cooler"
+"keyword.directive" = "red-warmer"
+"function" = "cyan-warmer"
+"function.macro" = "magenta"
+"tag" = "red-cooler"
+
+"markup.heading.2" = { fg = "red-faint", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "cyan-faint", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "magenta-faint", modifiers = ["bold"] }
+"markup.link.url" = { fg = "cyan-cooler" }
+"markup.link.text" = { fg = "cyan", modifiers = ["underlined"] }
+
+"ui.cursor" = { fg = "bg-main", bg = "red-intense" }
+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "red-intense" }
+
+"diagnostic.error" = { underline = { color = "red-warmer", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "magenta", style = "curl" } }
+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
+
+error = "red-warmer"
+warning = "magenta"
+info = "cyan"
+hint = "blue"
+
+[palette]
+
+# Common accent foregrounds
+red-warmer = "#b21100"
+red-faint = "#702000"
+yellow = "#695500"
+yellow-warmer = "#973300"
+yellow-cooler = "#77492f"
+magenta-intense = "#cd22bd"
+cyan-faint = "#004f5f"
+
+# Special purpose
+bg-completion = "#afdfef"
+bg-hover = "#ffafbc"
+bg-hover-secondary = "#9fdfff"
+bg-hl-line = "#dfeaec"
+
+bg-char-0 = "#ff908f"
+bg-char-1 = "#bfbfff"
+bg-char-2 = "#5fcfdf"
+
+bg-mode-line-active = "#afe0f2"
+fg-mode-line-active = "#0f0f0f"
+border-mode-line-active = "#2f4f44"
+
+modeline-err = "#8f0000"
+modeline-warning = "#6f306f"
+modeline-info = "#00445f"
+
+# Diffs
+bg-added = "#b5e7ff"
+fg-added = "#005079"
+bg-changed = "#eecfdf"
+fg-changed = "#6f1343"

From 8b0ae3d27912799d59e4948ff11d3a5428e32ce4 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sat, 25 Nov 2023 04:55:49 -0800
Subject: [PATCH 499/967] bump MSRV to 1.70.0 (#8877)

* rust-toolchain.toml: bump MSRV to 1.70.0

With Firefox 120 released on 21 November 2023, the MSRV is now 1.70.0.

* Fix cargo fmt with Rust 1.70.0

* Fix cargo clippy with Rust 1.70.0

* Fix cargo doc with Rust 1.70.0

* rust-toolchain.toml: add clippy component

* .github: bump dtolnay/rust-toolchain to 1.70

* helix-term: bump rust-version to 1.70

* helix-view/gutter: use checked_ilog10 to count digits

* helix-core/syntax: use MAIN_SEPARATOR_STR constant

* helix-view/handlers/dap: use Display impl for displaying process spawn error

* WIP: helix-term/commands: use checked math to assert ranges cannot overlap
---
 .github/workflows/build.yml    |  6 +++---
 helix-core/src/syntax.rs       |  5 +----
 helix-term/Cargo.toml          |  2 +-
 helix-term/src/commands.rs     | 16 +++++++++++-----
 helix-term/src/commands/lsp.rs |  2 +-
 helix-tui/src/buffer.rs        |  4 ++--
 helix-view/src/editor.rs       | 11 +++--------
 helix-view/src/gutter.rs       |  3 +--
 helix-view/src/handlers/dap.rs |  4 +---
 rust-toolchain.toml            |  4 ++--
 10 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8c55fa4a..22151c378 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@1.65
+        uses: dtolnay/rust-toolchain@1.70
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -70,7 +70,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@1.65
+        uses: dtolnay/rust-toolchain@1.70
         with:
           components: rustfmt, clippy
 
@@ -97,7 +97,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@1.65
+        uses: dtolnay/rust-toolchain@1.70
 
       - uses: Swatinem/rust-cache@v2
         with:
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 36a1e5c97..8c7fc4e15 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -212,10 +212,7 @@ impl<'de> Deserialize<'de> for FileType {
             {
                 match map.next_entry::<String, String>()? {
                     Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
-                        // FIXME: use `suffix.replace('/', std::path::MAIN_SEPARATOR_STR)`
-                        //        if MSRV is updated to 1.68
-                        let mut separator = [0; 1];
-                        suffix.replace('/', std::path::MAIN_SEPARATOR.encode_utf8(&mut separator))
+                        suffix.replace('/', std::path::MAIN_SEPARATOR_STR)
                     })),
                     Some((key, _value)) => Err(serde::de::Error::custom(format!(
                         "unknown key in `file-types` list: {}",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 378f25f87..672e6f847 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/helix-editor/helix"
 homepage = "https://helix-editor.com"
 include = ["src/**/*", "README.md"]
 default-run = "hx"
-rust-version = "1.65"
+rust-version = "1.70"
 
 [features]
 default = ["git"]
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index bc54abaaf..cd053266c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1318,7 +1318,7 @@ fn extend_next_long_word_end(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_long_word_end)
 }
 
-/// Separate branch to find_char designed only for <ret> char.
+/// Separate branch to find_char designed only for `<ret>` char.
 //
 // This is necessary because the one document can have different line endings inside. And we
 // cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
@@ -5606,12 +5606,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
         };
 
         // These `usize`s cannot underflow because selection ranges cannot overlap.
-        // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
-        // arithmetic to assert this.
-        let anchor = (to as isize + offset - deleted_len as isize) as usize;
+        let anchor = to
+            .checked_add_signed(offset)
+            .expect("Selection ranges cannot overlap")
+            .checked_sub(deleted_len)
+            .expect("Selection ranges cannot overlap");
         let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
         ranges.push(new_range);
-        offset = offset + output_len as isize - deleted_len as isize;
+        offset = offset
+            .checked_add_unsigned(output_len)
+            .expect("Selection ranges cannot overlap")
+            .checked_sub_unsigned(deleted_len)
+            .expect("Selection ranges cannot overlap");
 
         changes.push((from, to, Some(output)));
     }
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 57be1267c..874004616 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -49,7 +49,7 @@ use std::{
 /// If there is no configured language server that supports the feature, this displays a status message.
 /// Using this macro in a context where the editor automatically queries the LSP
 /// (instead of when the user explicitly does so via a keybind like `gd`)
-/// will spam the "No configured language server supports <feature>" status message confusingly.
+/// will spam the "No configured language server supports \<feature>" status message confusingly.
 #[macro_export]
 macro_rules! language_server_with_feature {
     ($editor:expr, $doc:expr, $feature:expr) => {{
diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 93e9fcf9b..51a864f5f 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -213,7 +213,7 @@ impl Buffer {
             && y < self.area.bottom()
     }
 
-    /// Returns the index in the Vec<Cell> for the given global (x, y) coordinates.
+    /// Returns the index in the `Vec<Cell>` for the given global (x, y) coordinates.
     ///
     /// Global coordinates are offset by the Buffer's area offset (`x`/`y`).
     ///
@@ -242,7 +242,7 @@ impl Buffer {
         ((y - self.area.y) as usize) * (self.area.width as usize) + ((x - self.area.x) as usize)
     }
 
-    /// Returns the index in the Vec<Cell> for the given global (x, y) coordinates,
+    /// Returns the index in the `Vec<Cell>` for the given global (x, y) coordinates,
     /// or `None` if the coordinates are outside the buffer's area.
     fn index_of_opt(&self, x: u16, y: u16) -> Option<usize> {
         if self.in_bounds(x, y) {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 7af28ccc6..5a81cb5d6 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -727,7 +727,7 @@ pub struct WhitespaceCharacters {
 impl Default for WhitespaceCharacters {
     fn default() -> Self {
         Self {
-            space: '·',    // U+00B7
+            space: '·',   // U+00B7
             nbsp: '⍽',    // U+237D
             tab: '→',     // U+2192
             newline: '⏎', // U+23CE
@@ -755,12 +755,13 @@ impl Default for IndentGuidesConfig {
 }
 
 /// Line ending configuration.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum LineEndingConfig {
     /// The platform's native line ending.
     ///
     /// `crlf` on Windows, otherwise `lf`.
+    #[default]
     Native,
     /// Line feed.
     LF,
@@ -777,12 +778,6 @@ pub enum LineEndingConfig {
     Nel,
 }
 
-impl Default for LineEndingConfig {
-    fn default() -> Self {
-        LineEndingConfig::Native
-    }
-}
-
 impl From<LineEndingConfig> for LineEnding {
     fn from(line_ending: LineEndingConfig) -> Self {
         match line_ending {
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 397dff4f4..ebdac9e23 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -9,8 +9,7 @@ use crate::{
 };
 
 fn count_digits(n: usize) -> usize {
-    // TODO: use checked_log10 when MSRV reaches 1.67
-    std::iter::successors(Some(n), |&n| (n >= 10).then_some(n / 10)).count()
+    (usize::checked_ilog10(n).unwrap_or(0) + 1) as usize
 }
 
 pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, bool, &mut String) -> Option<Style> + 'doc>;
diff --git a/helix-view/src/handlers/dap.rs b/helix-view/src/handlers/dap.rs
index 3da01494d..e1437bef7 100644
--- a/helix-view/src/handlers/dap.rs
+++ b/helix-view/src/handlers/dap.rs
@@ -369,9 +369,7 @@ impl Editor {
                     {
                         Ok(process) => process,
                         Err(err) => {
-                            // TODO replace the pretty print {:?} with a regular format {}
-                            // when the MSRV is raised to 1.60.0
-                            self.set_error(format!("Error starting external terminal: {:?}", err));
+                            self.set_error(format!("Error starting external terminal: {}", err));
                             return true;
                         }
                     };
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 2abc56652..e661a1113 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.65.0"
-components = ["rustfmt", "rust-src"]
+channel = "1.70.0"
+components = ["rustfmt", "rust-src", "clippy"]

From 8c68074fa6d2e3771bbc1a7f80bc9b422a787da4 Mon Sep 17 00:00:00 2001
From: chtenb <ctenbrinke@gmail.com>
Date: Sat, 25 Nov 2023 14:27:31 +0100
Subject: [PATCH 500/967] Fix precedence of ui.virtual.whitespace  (#8879)

* Revert "Revert "Fix precedence of ui.virtual.whitespace (#8750)""

This reverts commit 811d62d3b3699efb7b7ceb362f537979e5911871.

* Fix ui.text overwriting the syntax highlighting

Adjust ui.text description
---
 book/src/themes.md            |  2 +-
 helix-term/src/ui/document.rs | 84 +++++++++++++++++++++---------
 helix-term/src/ui/editor.rs   | 96 +++++++++++++++++++++--------------
 helix-term/src/ui/picker.rs   | 10 ++--
 4 files changed, 126 insertions(+), 66 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 495b76856..f040dfb19 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -303,7 +303,7 @@ These scopes are used for theming the editor interface:
 | `ui.popup.info`                   | Prompt for multiple key options                                                                |
 | `ui.window`                       | Borderlines separating splits                                                                  |
 | `ui.help`                         | Description box for commands                                                                   |
-| `ui.text`                         | Command prompts, popup text, etc.                                                              |
+| `ui.text`                         | Default text style, command prompts, popup text, etc.                                          |
 | `ui.text.focus`                   | The currently selected line in the picker                                                      |
 | `ui.text.inactive`                | Same as `ui.text` but when the text is inactive (e.g. suggestions)                             |
 | `ui.text.info`                    | The key: command text in `ui.popup.info` boxes                                                 |
diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index 80da1c542..dc61ca2e3 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -97,7 +97,8 @@ pub fn render_document(
     doc: &Document,
     offset: ViewPosition,
     doc_annotations: &TextAnnotations,
-    highlight_iter: impl Iterator<Item = HighlightEvent>,
+    syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
+    overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
     theme: &Theme,
     line_decoration: &mut [Box<dyn LineDecoration + '_>],
     translated_positions: &mut [TranslatedPosition],
@@ -109,7 +110,8 @@ pub fn render_document(
         offset,
         &doc.text_format(viewport.width, Some(theme)),
         doc_annotations,
-        highlight_iter,
+        syntax_highlight_iter,
+        overlay_highlight_iter,
         theme,
         line_decoration,
         translated_positions,
@@ -157,7 +159,8 @@ pub fn render_text<'t>(
     offset: ViewPosition,
     text_fmt: &TextFormat,
     text_annotations: &TextAnnotations,
-    highlight_iter: impl Iterator<Item = HighlightEvent>,
+    syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
+    overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
     theme: &Theme,
     line_decorations: &mut [Box<dyn LineDecoration + '_>],
     translated_positions: &mut [TranslatedPosition],
@@ -178,10 +181,16 @@ pub fn render_text<'t>(
 
     let (mut formatter, mut first_visible_char_idx) =
         DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
-    let mut styles = StyleIter {
+    let mut syntax_styles = StyleIter {
         text_style: renderer.text_style,
         active_highlights: Vec::with_capacity(64),
-        highlight_iter,
+        highlight_iter: syntax_highlight_iter,
+        theme,
+    };
+    let mut overlay_styles = StyleIter {
+        text_style: Style::default(),
+        active_highlights: Vec::with_capacity(64),
+        highlight_iter: overlay_highlight_iter,
         theme,
     };
 
@@ -193,7 +202,10 @@ pub fn render_text<'t>(
     };
     let mut is_in_indent_area = true;
     let mut last_line_indent_level = 0;
-    let mut style_span = styles
+    let mut syntax_style_span = syntax_styles
+        .next()
+        .unwrap_or_else(|| (Style::default(), usize::MAX));
+    let mut overlay_style_span = overlay_styles
         .next()
         .unwrap_or_else(|| (Style::default(), usize::MAX));
 
@@ -221,9 +233,16 @@ pub fn render_text<'t>(
 
         // skip any graphemes on visual lines before the block start
         if pos.row < row_off {
-            if char_pos >= style_span.1 {
-                style_span = if let Some(style_span) = styles.next() {
-                    style_span
+            if char_pos >= syntax_style_span.1 {
+                syntax_style_span = if let Some(syntax_style_span) = syntax_styles.next() {
+                    syntax_style_span
+                } else {
+                    break;
+                }
+            }
+            if char_pos >= overlay_style_span.1 {
+                overlay_style_span = if let Some(overlay_style_span) = overlay_styles.next() {
+                    overlay_style_span
                 } else {
                     break;
                 }
@@ -260,8 +279,15 @@ pub fn render_text<'t>(
         }
 
         // acquire the correct grapheme style
-        if char_pos >= style_span.1 {
-            style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
+        if char_pos >= syntax_style_span.1 {
+            syntax_style_span = syntax_styles
+                .next()
+                .unwrap_or((Style::default(), usize::MAX));
+        }
+        if char_pos >= overlay_style_span.1 {
+            overlay_style_span = overlay_styles
+                .next()
+                .unwrap_or((Style::default(), usize::MAX));
         }
         char_pos += grapheme.doc_chars();
 
@@ -275,22 +301,25 @@ pub fn render_text<'t>(
             pos,
         );
 
-        let grapheme_style = if let GraphemeSource::VirtualText { highlight } = grapheme.source {
-            let style = renderer.text_style;
-            if let Some(highlight) = highlight {
-                style.patch(theme.highlight(highlight.0))
+        let (syntax_style, overlay_style) =
+            if let GraphemeSource::VirtualText { highlight } = grapheme.source {
+                let mut style = renderer.text_style;
+                if let Some(highlight) = highlight {
+                    style = style.patch(theme.highlight(highlight.0))
+                }
+                (style, Style::default())
             } else {
-                style
-            }
-        } else {
-            style_span.0
-        };
+                (syntax_style_span.0, overlay_style_span.0)
+            };
 
-        let virt = grapheme.is_virtual();
+        let is_virtual = grapheme.is_virtual();
         renderer.draw_grapheme(
             grapheme.grapheme,
-            grapheme_style,
-            virt,
+            GraphemeStyle {
+                syntax_style,
+                overlay_style,
+            },
+            is_virtual,
             &mut last_line_indent_level,
             &mut is_in_indent_area,
             pos,
@@ -322,6 +351,11 @@ pub struct TextRenderer<'a> {
     pub viewport: Rect,
 }
 
+pub struct GraphemeStyle {
+    syntax_style: Style,
+    overlay_style: Style,
+}
+
 impl<'a> TextRenderer<'a> {
     pub fn new(
         surface: &'a mut Surface,
@@ -395,7 +429,7 @@ impl<'a> TextRenderer<'a> {
     pub fn draw_grapheme(
         &mut self,
         grapheme: Grapheme,
-        mut style: Style,
+        grapheme_style: GraphemeStyle,
         is_virtual: bool,
         last_indent_level: &mut usize,
         is_in_indent_area: &mut bool,
@@ -405,9 +439,11 @@ impl<'a> TextRenderer<'a> {
         let is_whitespace = grapheme.is_whitespace();
 
         // TODO is it correct to apply the whitespace style to all unicode white spaces?
+        let mut style = grapheme_style.syntax_style;
         if is_whitespace {
             style = style.patch(self.whitespace_style);
         }
+        style = style.patch(grapheme_style.overlay_style);
 
         let width = grapheme.width();
         let space = if is_virtual { " " } else { &self.space };
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 31195a4e5..6b85d9a33 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -124,16 +124,20 @@ impl EditorView {
             line_decorations.push(Box::new(line_decoration));
         }
 
-        let mut highlights =
+        let syntax_highlights =
             Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
-        let overlay_highlights = Self::overlay_syntax_highlights(
+
+        let mut overlay_highlights =
+            Self::empty_highlight_iter(doc, view.offset.anchor, inner.height);
+        let overlay_syntax_highlights = Self::overlay_syntax_highlights(
             doc,
             view.offset.anchor,
             inner.height,
             &text_annotations,
         );
-        if !overlay_highlights.is_empty() {
-            highlights = Box::new(syntax::merge(highlights, overlay_highlights));
+        if !overlay_syntax_highlights.is_empty() {
+            overlay_highlights =
+                Box::new(syntax::merge(overlay_highlights, overlay_syntax_highlights));
         }
 
         for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
@@ -142,12 +146,12 @@ impl EditorView {
             if diagnostic.is_empty() {
                 continue;
             }
-            highlights = Box::new(syntax::merge(highlights, diagnostic));
+            overlay_highlights = Box::new(syntax::merge(overlay_highlights, diagnostic));
         }
 
-        let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
+        if is_focused {
             let highlights = syntax::merge(
-                highlights,
+                overlay_highlights,
                 Self::doc_selection_highlights(
                     editor.mode(),
                     doc,
@@ -158,13 +162,11 @@ impl EditorView {
             );
             let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
             if focused_view_elements.is_empty() {
-                Box::new(highlights)
+                overlay_highlights = Box::new(highlights)
             } else {
-                Box::new(syntax::merge(highlights, focused_view_elements))
+                overlay_highlights = Box::new(syntax::merge(highlights, focused_view_elements))
             }
-        } else {
-            Box::new(highlights)
-        };
+        }
 
         let gutter_overflow = view.gutter_offset(doc) == 0;
         if !gutter_overflow {
@@ -197,7 +199,8 @@ impl EditorView {
             doc,
             view.offset,
             &text_annotations,
-            highlights,
+            syntax_highlights,
+            overlay_highlights,
             theme,
             &mut line_decorations,
             &mut translated_positions,
@@ -257,27 +260,39 @@ impl EditorView {
             .for_each(|area| surface.set_style(area, ruler_theme))
     }
 
-    pub fn overlay_syntax_highlights(
+    fn viewport_byte_range(
+        text: helix_core::RopeSlice,
+        row: usize,
+        height: u16,
+    ) -> std::ops::Range<usize> {
+        // Calculate viewport byte ranges:
+        // Saturating subs to make it inclusive zero indexing.
+        let last_line = text.len_lines().saturating_sub(1);
+        let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
+        let start = text.line_to_byte(row.min(last_line));
+        let end = text.line_to_byte(last_visible_line + 1);
+
+        start..end
+    }
+
+    pub fn empty_highlight_iter(
         doc: &Document,
         anchor: usize,
         height: u16,
-        text_annotations: &TextAnnotations,
-    ) -> Vec<(usize, std::ops::Range<usize>)> {
+    ) -> Box<dyn Iterator<Item = HighlightEvent>> {
         let text = doc.text().slice(..);
         let row = text.char_to_line(anchor.min(text.len_chars()));
 
-        let range = {
-            // Calculate viewport byte ranges:
-            // Saturating subs to make it inclusive zero indexing.
-            let last_line = text.len_lines().saturating_sub(1);
-            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
-            let start = text.line_to_byte(row.min(last_line));
-            let end = text.line_to_byte(last_visible_line + 1);
-
-            start..end
-        };
-
-        text_annotations.collect_overlay_highlights(range)
+        // Calculate viewport byte ranges:
+        // Saturating subs to make it inclusive zero indexing.
+        let range = Self::viewport_byte_range(text, row, height);
+        Box::new(
+            [HighlightEvent::Source {
+                start: text.byte_to_char(range.start),
+                end: text.byte_to_char(range.end),
+            }]
+            .into_iter(),
+        )
     }
 
     /// Get syntax highlights for a document in a view represented by the first line
@@ -292,16 +307,7 @@ impl EditorView {
         let text = doc.text().slice(..);
         let row = text.char_to_line(anchor.min(text.len_chars()));
 
-        let range = {
-            // Calculate viewport byte ranges:
-            // Saturating subs to make it inclusive zero indexing.
-            let last_line = text.len_lines().saturating_sub(1);
-            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
-            let start = text.line_to_byte(row.min(last_line));
-            let end = text.line_to_byte(last_visible_line + 1);
-
-            start..end
-        };
+        let range = Self::viewport_byte_range(text, row, height);
 
         match doc.syntax() {
             Some(syntax) => {
@@ -334,6 +340,20 @@ impl EditorView {
         }
     }
 
+    pub fn overlay_syntax_highlights(
+        doc: &Document,
+        anchor: usize,
+        height: u16,
+        text_annotations: &TextAnnotations,
+    ) -> Vec<(usize, std::ops::Range<usize>)> {
+        let text = doc.text().slice(..);
+        let row = text.char_to_line(anchor.min(text.len_chars()));
+
+        let range = Self::viewport_byte_range(text, row, height);
+
+        text_annotations.collect_overlay_highlights(range)
+    }
+
     /// Get highlight spans for document diagnostics
     pub fn doc_diagnostics_highlights(
         doc: &Document,
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 0214a3910..9ba453357 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -736,17 +736,20 @@ impl<T: Item + 'static> Picker<T> {
                 }
             }
 
-            let mut highlights = EditorView::doc_syntax_highlights(
+            let syntax_highlights = EditorView::doc_syntax_highlights(
                 doc,
                 offset.anchor,
                 area.height,
                 &cx.editor.theme,
             );
+
+            let mut overlay_highlights =
+                EditorView::empty_highlight_iter(doc, offset.anchor, area.height);
             for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
                 if spans.is_empty() {
                     continue;
                 }
-                highlights = Box::new(helix_core::syntax::merge(highlights, spans));
+                overlay_highlights = Box::new(helix_core::syntax::merge(overlay_highlights, spans));
             }
             let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
 
@@ -777,7 +780,8 @@ impl<T: Item + 'static> Picker<T> {
                 offset,
                 // TODO: compute text annotations asynchronously here (like inlay hints)
                 &TextAnnotations::default(),
-                highlights,
+                syntax_highlights,
+                overlay_highlights,
                 &cx.editor.theme,
                 &mut decorations,
                 &mut [],

From 3f9788daaa0669a81e218d18636f9abb285b6c15 Mon Sep 17 00:00:00 2001
From: Davide Ferrero <d.ferrero@me.com>
Date: Sat, 25 Nov 2023 17:37:00 +0100
Subject: [PATCH 501/967] update which crate to 5.0.0 (#8902)

* update which crate to 5.0.0

* update which crate to 5.0.0
---
 Cargo.lock              | 51 ++++++-----------------------------------
 helix-dap/Cargo.toml    |  2 +-
 helix-loader/Cargo.toml |  2 +-
 helix-lsp/Cargo.toml    |  2 +-
 helix-term/Cargo.toml   |  2 +-
 helix-view/Cargo.toml   |  2 +-
 6 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 544a13bb6..8901f99f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -367,27 +367,6 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "dunce"
 version = "1.0.4"
@@ -1328,11 +1307,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
 dependencies = [
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1642,12 +1621,6 @@ dependencies = [
  "pathdiff",
 ]
 
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1797,17 +1770,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall 0.2.16",
- "thiserror",
-]
-
 [[package]]
 name = "regex"
 version = "1.10.2"
@@ -2454,14 +2416,15 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "which"
-version = "4.4.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad25fe5717e59ada8ea33511bbbf7420b11031730a24c65e82428766c307006"
+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
 dependencies = [
- "dirs",
  "either",
+ "home",
  "once_cell",
  "rustix",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/helix-dap/Cargo.toml b/helix-dap/Cargo.toml
index d42ce23ff..1aa69ecab 100644
--- a/helix-dap/Cargo.toml
+++ b/helix-dap/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
-which = "4.4"
+which = "5.0.0"
 
 [dev-dependencies]
 fern = "0.6"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 54cb5b854..e24c3d7cf 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -21,7 +21,7 @@ etcetera = "0.8"
 tree-sitter.workspace = true
 once_cell = "1.18"
 log = "0.4"
-which = "4.4"
+which = "5.0.0"
 
 # TODO: these two should be on !wasm32 only
 
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 50b296b37..6511df408 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -27,5 +27,5 @@ serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.34", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
-which = "4.4"
+which = "5.0.0"
 parking_lot = "0.12.1"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 672e6f847..0c207ffdb 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -34,7 +34,7 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 anyhow = "1"
 once_cell = "1.18"
 
-which = "4.4"
+which = "5.0.0"
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index a5218b9ac..9fe24bca6 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -43,7 +43,7 @@ serde_json = "1.0"
 toml = "0.7"
 log = "~0.4"
 
-which = "4.4"
+which = "5.0.0"
 parking_lot = "0.12.1"
 
 

From b7f98d1d9930b15f07342f67d2560aecd4ebc401 Mon Sep 17 00:00:00 2001
From: Fomalhaut Weisszwerg <weisszwerg@gmail.com>
Date: Mon, 27 Nov 2023 21:24:57 +0900
Subject: [PATCH 502/967] set Cargo feature resolver to v2 (#8917)

* fix: version of Cargo feature resolver.

This commit solve the ambiguity to determin the version of resolver.
To get more detail, see the following two documents:

- https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions
- https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html

* unified: Rust edition in all workspaces.

Now, the Rust 2021 is available in all workspaces.

* fined up: Cargo.toml by using workspace inheritance.

To get more detail of the `workspace.package` table, see a following document:

- https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table
---
 Cargo.toml              | 6 ++++++
 helix-core/Cargo.toml   | 5 +++--
 helix-dap/Cargo.toml    | 5 +++--
 helix-event/Cargo.toml  | 5 +++--
 helix-loader/Cargo.toml | 5 +++--
 helix-lsp/Cargo.toml    | 5 +++--
 helix-parsec/Cargo.toml | 5 +++--
 helix-term/Cargo.toml   | 6 +++---
 helix-tui/Cargo.toml    | 5 +++--
 helix-vcs/Cargo.toml    | 5 +++--
 helix-view/Cargo.toml   | 5 +++--
 11 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8ffe0fa7a..f2cd9b766 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "helix-core",
   "helix-view",
@@ -37,3 +38,8 @@ package.helix-term.opt-level = 2
 [workspace.dependencies]
 tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
 nucleo = "0.2.0"
+
+[workspace.package]
+edition = "2021"
+license = "MPL-2.0"
+rust-version = "1.70"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 8035333dd..0fa550462 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -2,8 +2,9 @@
 name = "helix-core"
 version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 description = "Helix editor core editing primitives"
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
diff --git a/helix-dap/Cargo.toml b/helix-dap/Cargo.toml
index 1aa69ecab..b4dd5177e 100644
--- a/helix-dap/Cargo.toml
+++ b/helix-dap/Cargo.toml
@@ -2,8 +2,9 @@
 name = "helix-dap"
 version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2018"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 description = "DAP client implementation for Helix project"
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
diff --git a/helix-event/Cargo.toml b/helix-event/Cargo.toml
index 5cd955588..2dd4b512d 100644
--- a/helix-event/Cargo.toml
+++ b/helix-event/Cargo.toml
@@ -2,8 +2,9 @@
 name = "helix-event"
 version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
 homepage = "https://helix-editor.com"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index e24c3d7cf..b32318d04 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -3,8 +3,9 @@ name = "helix-loader"
 version = "0.6.0"
 description = "A post-modern text editor."
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
 homepage = "https://helix-editor.com"
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 6511df408..98ff5d0b9 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -2,8 +2,9 @@
 name = "helix-lsp"
 version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 description = "LSP client implementation for Helix project"
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
diff --git a/helix-parsec/Cargo.toml b/helix-parsec/Cargo.toml
index 505a4247e..d2b6105e6 100644
--- a/helix-parsec/Cargo.toml
+++ b/helix-parsec/Cargo.toml
@@ -2,8 +2,9 @@
 name = "helix-parsec"
 version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 description = "Parser combinators for Helix"
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 0c207ffdb..a11b4ae5d 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -3,14 +3,14 @@ name = "helix-term"
 version = "0.6.0"
 description = "A post-modern text editor."
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
 categories = ["editor", "command-line-utilities"]
 repository = "https://github.com/helix-editor/helix"
 homepage = "https://helix-editor.com"
 include = ["src/**/*", "README.md"]
 default-run = "hx"
-rust-version = "1.70"
+rust-version.workspace = true
 
 [features]
 default = ["git"]
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 245a6eea8..602fa3e5f 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -5,8 +5,9 @@ authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
 description = """
 A library to build rich terminal user interfaces or dashboards
 """
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
 homepage = "https://helix-editor.com"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index edb6291c9..1152cf9ab 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -2,8 +2,9 @@
 name = "helix-vcs"
 version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"
 homepage = "https://helix-editor.com"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 9fe24bca6..266abf5f5 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -2,8 +2,9 @@
 name = "helix-view"
 version = "0.6.0"
 authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition = "2021"
-license = "MPL-2.0"
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
 description = "UI abstractions for use in backends"
 categories = ["editor"]
 repository = "https://github.com/helix-editor/helix"

From 71fd85894b71e4be3298fcb09b2165caee2968e0 Mon Sep 17 00:00:00 2001
From: Hendrik Norkowski <hnorkowski@mail.de>
Date: Mon, 27 Nov 2023 20:11:16 +0100
Subject: [PATCH 503/967] use crossterm cursor in editor when out of focus
 (#6858)

Use crossterm cursor in the editor when the terminal is out of focus to achieve consistent out-of-focus cursor behaviour
---
 helix-term/src/ui/editor.rs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 6b85d9a33..2a4169bed 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -158,6 +158,7 @@ impl EditorView {
                     view,
                     theme,
                     &config.cursor_shape,
+                    self.terminal_focused,
                 ),
             );
             let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
@@ -420,6 +421,7 @@ impl EditorView {
         view: &View,
         theme: &Theme,
         cursor_shape_config: &CursorShapeConfig,
+        is_terminal_focused: bool,
     ) -> Vec<(usize, std::ops::Range<usize>)> {
         let text = doc.text().slice(..);
         let selection = doc.selection(view.id);
@@ -490,13 +492,17 @@ impl EditorView {
                         cursor_start
                     };
                 spans.push((selection_scope, range.anchor..selection_end));
-                if !selection_is_primary || cursor_is_block {
+                // add block cursors
+                // skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
+                if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
                     spans.push((cursor_scope, cursor_start..range.head));
                 }
             } else {
                 // Reverse case.
                 let cursor_end = next_grapheme_boundary(text, range.head);
-                if !selection_is_primary || cursor_is_block {
+                // add block cursors
+                // skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
+                if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
                     spans.push((cursor_scope, range.head..cursor_end));
                 }
                 // non block cursors look like they exclude the cursor
@@ -1520,8 +1526,15 @@ impl Component for EditorView {
 
     fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
         match editor.cursor() {
-            // All block cursors are drawn manually
-            (pos, CursorKind::Block) => (pos, CursorKind::Hidden),
+            // all block cursors are drawn manually
+            (pos, CursorKind::Block) => {
+                if self.terminal_focused {
+                    (pos, CursorKind::Hidden)
+                } else {
+                    // use crossterm cursor when terminal loses focus
+                    (pos, CursorKind::Underline)
+                }
+            }
             cursor => cursor,
         }
     }

From 8de8a661823fe9f782bff03fb1143891f7a3a582 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:51:45 +0900
Subject: [PATCH 504/967] build(deps): bump globset from 0.4.13 to 0.4.14
 (#8926)

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

diff --git a/Cargo.lock b/Cargo.lock
index 8901f99f9..d18b4fa65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -116,12 +116,12 @@ checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bstr"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
 dependencies = [
  "memchr",
- "regex-automata 0.3.9",
+ "regex-automata",
  "serde",
 ]
 
@@ -490,12 +490,6 @@ 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.0"
@@ -1020,15 +1014,15 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick 1.1.2",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -1776,25 +1770,19 @@ version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick 1.1.2",
  "memchr",
- "regex-automata 0.4.3",
+ "regex-automata",
  "regex-syntax 0.8.2",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
-
 [[package]]
 name = "regex-automata"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick 1.1.2",
  "memchr",
  "regex-syntax 0.8.2",
 ]
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 98ff5d0b9..d9507f1b6 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -20,7 +20,7 @@ helix-parsec = { version = "0.6", path = "../helix-parsec" }
 anyhow = "1.0"
 futures-executor = "0.3"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
-globset = "0.4.13"
+globset = "0.4.14"
 log = "0.4"
 lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }

From 4bc43347a198b9bbed53087481852d08ed4d48cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:52:46 +0900
Subject: [PATCH 505/967] build(deps): bump clipboard-win from 4.5.0 to 5.0.0
 (#8927)

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

diff --git a/Cargo.lock b/Cargo.lock
index d18b4fa65..c71bb1f00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -198,13 +198,11 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.5.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
+checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
 dependencies = [
  "error-code",
- "str-buf",
- "winapi",
 ]
 
 [[package]]
@@ -426,13 +424,9 @@ dependencies = [
 
 [[package]]
 name = "error-code"
-version = "2.3.1"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
-dependencies = [
- "libc",
- "str-buf",
-]
+checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
 
 [[package]]
 name = "etcetera"
@@ -2011,12 +2005,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
 [[package]]
 name = "str_indices"
 version = "0.4.1"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 266abf5f5..7671151ad 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -49,7 +49,7 @@ parking_lot = "0.12.1"
 
 
 [target.'cfg(windows)'.dependencies]
-clipboard-win = { version = "4.5", features = ["std"] }
+clipboard-win = { version = "5.0", features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

From b30451f77618f8ee2a082adb6b6e3a5491d8227c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:53:53 +0900
Subject: [PATCH 506/967] build(deps): bump hashbrown from 0.14.2 to 0.14.3
 (#8928)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 10 +++++-----
 helix-core/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c71bb1f00..f63a0dd91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -752,7 +752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16"
 dependencies = [
  "gix-hash",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
  "parking_lot",
 ]
 
@@ -1066,9 +1066,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -1085,7 +1085,7 @@ dependencies = [
  "dunce",
  "encoding_rs",
  "etcetera",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
  "helix-loader",
  "imara-diff",
  "indoc",
@@ -1370,7 +1370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 0fa550462..f3797af29 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -32,7 +32,7 @@ arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
 ahash = "0.8.6"
-hashbrown = { version = "0.14.2", features = ["raw"] }
+hashbrown = { version = "0.14.3", features = ["raw"] }
 dunce = "1.0"
 
 log = "0.4"

From 008208fcfbf2833eb1229a15b000a5d28ec10f87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:54:16 +0900
Subject: [PATCH 507/967] build(deps): bump grep-searcher from 0.1.11 to 0.1.12
 (#8929)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 26 ++++++++++----------------
 helix-term/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f63a0dd91..658faef79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -140,12 +140,6 @@ version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
-[[package]]
-name = "bytecount"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
-
 [[package]]
 name = "bytes"
 version = "1.4.0"
@@ -1021,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "grep-matcher"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319"
+checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"
 dependencies = [
  "memchr",
 ]
@@ -1045,17 +1039,17 @@ dependencies = [
 
 [[package]]
 name = "grep-searcher"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f"
+checksum = "fda02a2d9a8c9375ee678bfcba5919b31854c617b6b4f60edec7c9f1dceb84b9"
 dependencies = [
  "bstr",
- "bytecount",
  "encoding_rs",
  "encoding_rs_io",
  "grep-matcher",
  "log",
- "memmap2 0.5.10",
+ "memchr",
+ "memmap2 0.9.0",
 ]
 
 [[package]]
@@ -1487,18 +1481,18 @@ checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "memmap2"
-version = "0.5.10"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "memmap2"
-version = "0.7.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
 dependencies = [
  "libc",
 ]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index a11b4ae5d..909a114b3 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -69,7 +69,7 @@ serde = { version = "1.0", features = ["derive"] }
 
 # ripgrep for global search
 grep-regex = "0.1.11"
-grep-searcher = "0.1.11"
+grep-searcher = "0.1.12"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }

From 3e451f0d53737ad637ca0bd9957fcd818d9b4015 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:54:35 +0900
Subject: [PATCH 508/967] build(deps): bump serde from 1.0.192 to 1.0.193
 (#8931)

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 658faef79..0792f1931 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1845,18 +1845,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",

From 6d168eda275deb23b0c643aecd746af3f4cc9937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 28 Nov 2023 14:38:15 +0900
Subject: [PATCH 509/967] fix CI: tree-sitter-gemini user renamed

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

diff --git a/languages.toml b/languages.toml
index ef4687af8..33b27626e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2916,7 +2916,7 @@ file-types = ["gmi"]
 
 [[grammar]]
 name = "gemini"
-source = { git = "https://git.sr.ht/~sfr/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
+source = { git = "https://git.sr.ht/~nbsp/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
 
 [[language]]
 name = "templ"

From b023faacf898e2f393fa8f7f91e685547080442c Mon Sep 17 00:00:00 2001
From: Hendrik Norkowski <hnorkowski@mail.de>
Date: Tue, 28 Nov 2023 16:11:23 +0100
Subject: [PATCH 510/967] fix(ui): use crossterm cursor when at the end of the
 rope (#8934)

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

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 2a4169bed..c808be175 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -469,7 +469,7 @@ impl EditorView {
 
             // Special-case: cursor at end of the rope.
             if range.head == range.anchor && range.head == text.len_chars() {
-                if !selection_is_primary || cursor_is_block {
+                if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
                     // Bar and underline cursors are drawn by the terminal
                     // BUG: If the editor area loses focus while having a bar or
                     // underline cursor (eg. when a regex prompt has focus) then

From 0d9145a1bf2c1987f99347848705ad844284bad8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 02:41:10 +0100
Subject: [PATCH 511/967] build(deps): bump grep-regex from 0.1.11 to 0.1.12
 (#8930)

Bumps [grep-regex](https://github.com/BurntSushi/ripgrep) from 0.1.11 to 0.1.12.
- [Release notes](https://github.com/BurntSushi/ripgrep/releases)
- [Changelog](https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BurntSushi/ripgrep/compare/grep-regex-0.1.11...0.1.12)

---
updated-dependencies:
- dependency-name: grep-regex
  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            | 37 ++++++++++---------------------------
 helix-term/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0792f1931..4a567175a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -30,15 +30,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.2"
@@ -1006,11 +997,11 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 dependencies = [
- "aho-corasick 1.1.2",
+ "aho-corasick",
  "bstr",
  "log",
  "regex-automata",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1024,17 +1015,15 @@ dependencies = [
 
 [[package]]
 name = "grep-regex"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
+checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"
 dependencies = [
- "aho-corasick 0.7.20",
  "bstr",
  "grep-matcher",
  "log",
- "regex",
- "regex-syntax 0.6.29",
- "thread_local",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1758,10 +1747,10 @@ version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
- "aho-corasick 1.1.2",
+ "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1770,17 +1759,11 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
- "aho-corasick 1.1.2",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 909a114b3..ea1b5647f 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -68,7 +68,7 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 
 # ripgrep for global search
-grep-regex = "0.1.11"
+grep-regex = "0.1.12"
 grep-searcher = "0.1.12"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100

From 0739d13b038d4fe75604612caf468cc376734d0c Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Wed, 29 Nov 2023 03:41:35 +0200
Subject: [PATCH 512/967] Add musicxml to xml extensions (#8935)

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

diff --git a/languages.toml b/languages.toml
index 33b27626e..613a91bdc 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2303,7 +2303,8 @@ file-types = [
   "xliff",
   "xpdl",
   "xul",
-  "xoml"
+  "xoml",
+  "musicxml"
 ]
 indent = { tab-width = 2, unit = "  " }
 

From f8d261cd20c4f74c89ab103ed42b01f029be1fec Mon Sep 17 00:00:00 2001
From: Tudyx <56633664+Tudyx@users.noreply.github.com>
Date: Wed, 29 Nov 2023 02:42:59 +0100
Subject: [PATCH 513/967] add log tree-sitter (#8916)

* add log tree-sitter

* better highlight queries
---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     |  9 +++++++++
 runtime/queries/log/highlights.scm | 10 ++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 runtime/queries/log/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c21ca2501..ed4014e30 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -91,6 +91,7 @@
 | llvm | ✓ | ✓ | ✓ |  |
 | llvm-mir | ✓ | ✓ | ✓ |  |
 | llvm-mir-yaml | ✓ |  | ✓ |  |
+| log | ✓ |  |  |  |
 | lpf | ✓ |  |  |  |
 | lua | ✓ | ✓ | ✓ | `lua-language-server` |
 | make | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 613a91bdc..10ed167b0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2943,3 +2943,12 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "dbml"
 source = { git = "https://github.com/dynamotn/tree-sitter-dbml", rev = "2e2fa5640268c33c3d3f27f7e676f631a9c68fd9" }
+
+[[language]]
+name = "log"
+scope = "source.log"
+file-types = ["log"]
+
+[[grammar]]
+name = "log"
+source = { git = "https://github.com/Tudyx/tree-sitter-log", rev = "62cfe307e942af3417171243b599cc7deac5eab9" }
diff --git a/runtime/queries/log/highlights.scm b/runtime/queries/log/highlights.scm
new file mode 100644
index 000000000..6820b3fd0
--- /dev/null
+++ b/runtime/queries/log/highlights.scm
@@ -0,0 +1,10 @@
+(trace) @comment
+(debug) @hint
+(info) @info
+(warn) @warning
+(error) @error
+(year_month_day) @keyword
+(time) @constant
+(string_literal) @string
+(number) @constant.numeric
+(constant) @constant.builtin

From 0c81ef73e17a3d45cd6240fd5933ad99b3a60d01 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 28 Nov 2023 20:01:12 -0600
Subject: [PATCH 514/967] direnv: Watch the rust-toolchain file (#8921)

---
 .envrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.envrc b/.envrc
index 8643617f0..935a201a2 100644
--- a/.envrc
+++ b/.envrc
@@ -1,5 +1,6 @@
 watch_file shell.nix
 watch_file flake.lock
+watch_file rust-toolchain.toml
 
 # try to use flakes, if it fails use normal nix (ie. shell.nix)
 use flake || use nix

From 86023cf1e6c9ab12446061e40c838335c5790979 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Fri, 1 Dec 2023 07:07:31 +0200
Subject: [PATCH 515/967] use canonical name (#8960)

I do not find anywhere where the option omits the 's'
---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index f067038a5..f70ce5470 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -172,7 +172,7 @@ All git related options are only enabled in a git repository.
 |`parents` | Enables reading ignore files from parent directories | `true`
 |`ignore` | Enables reading `.ignore` files | `true`
 |`git-ignore` | Enables reading `.gitignore` files | `true`
-|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` option | `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`.
 

From 466b87c8e5c3a2f360794b005d8b6122aa6e648d Mon Sep 17 00:00:00 2001
From: Nan Zhong <me@nanzho.ng>
Date: Sun, 3 Dec 2023 19:46:00 -0500
Subject: [PATCH 516/967] languages: update rescript grammar (#8962)

This bump fixes a build failure of the grammer with clang.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 10ed167b0..f4ff483b2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1523,7 +1523,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "rescript"
-source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "65609807c628477f3b94052e7ef895885ac51c3c" }
+source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "467dcf99f68c47823d7b378779a6b282d7ef9782" }
 
 [[language]]
 name = "erlang"

From 455b206a8c1fee40e131728783f47dfe89018bd7 Mon Sep 17 00:00:00 2001
From: Evan Richter <evanjrichter@gmail.com>
Date: Sun, 3 Dec 2023 17:46:17 -0700
Subject: [PATCH 517/967] nix: update flake inputs (#8943)

* removed non-existent crane flake input overrides
---
 flake.lock | 47 ++++++++++++-----------------------------------
 flake.nix  |  2 --
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index b90a7f201..9bb5dece1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,23 +2,16 @@
   "nodes": {
     "crane": {
       "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "rust-overlay": [
-          "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1688772518,
-        "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
+        "lastModified": 1701025348,
+        "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
+        "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
         "type": "github"
       },
       "original": {
@@ -27,32 +20,16 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -63,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690272529,
-        "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
+        "lastModified": 1700794826,
+        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
+        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
         "type": "github"
       },
       "original": {
@@ -95,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690424156,
-        "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=",
+        "lastModified": 1701137803,
+        "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f335a0213504c7e6481c359dc1009be9cf34432c",
+        "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 8198d4cda..410c46155 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,6 @@
     };
     crane = {
       url = "github:ipetkov/crane";
-      inputs.rust-overlay.follows = "rust-overlay";
-      inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

From fcd564fddfa9b8f3fd7d02686e1f8b8a97a9f92b Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Mon, 4 Dec 2023 03:26:11 -0500
Subject: [PATCH 518/967] upgrade tree-sitter-python (#8976)

supports new syntaxes from Python 3.12
---
 languages.toml                        | 2 +-
 runtime/queries/python/highlights.scm | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index f4ff483b2..b2c2a7ef8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -697,7 +697,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "python"
-source = { git = "https://github.com/tree-sitter/tree-sitter-python", rev = "de221eccf9a221f5b85474a553474a69b4b5784d" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-python", rev = "4bfdd9033a2225cc95032ce77066b7aeca9e2efc" }
 
 [[language]]
 name = "nickel"
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 0c6a83c54..2666402b8 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -134,14 +134,17 @@
   "//="
   "/="
   "&"
+  "&="
   "%"
   "%="
   "^"
+  "^="
   "+"
   "->"
   "+="
   "<"
   "<<"
+  "<<="
   "<="
   "<>"
   "="
@@ -150,8 +153,11 @@
   ">"
   ">="
   ">>"
+  ">>="
   "|"
+  "|="
   "~"
+  "@="
 ] @operator
 
 [

From 79965a238d84c9e8a36255b602102e0b9263fa2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:41:30 +0900
Subject: [PATCH 519/967] build(deps): bump url from 2.4.1 to 2.5.0 (#8991)

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

diff --git a/Cargo.lock b/Cargo.lock
index 4a567175a..cb2cfa384 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -471,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -1311,9 +1311,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -1623,9 +1623,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project-lite"
@@ -2281,9 +2281,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
  "idna",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index ea1b5647f..9426aaa4e 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -59,7 +59,7 @@ content_inspector = "0.2.4"
 
 # opening URLs
 open = "5.0.0"
-url = "2.4.1"
+url = "2.5.0"
 
 # config
 toml = "0.7"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 7671151ad..9fc83d4cf 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -27,7 +27,7 @@ helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits
 once_cell = "1.18"
-url = "2.4.1"
+url = "2.5.0"
 
 arc-swap = { version = "1.6.0" }
 

From aad44f6dd0972fc4ad1248e7e4009adb937adc9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:41:50 +0900
Subject: [PATCH 520/967] build(deps): bump rustix from 0.38.25 to 0.38.26
 (#8993)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 89 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 72 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb2cfa384..6e309127a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -388,23 +388,12 @@ checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
 
 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1788,15 +1777,15 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.25"
+version = "0.38.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
+checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2438,6 +2427,15 @@ dependencies = [
  "windows-targets 0.48.0",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -2468,6 +2466,21 @@ dependencies = [
  "windows_x86_64_msvc 0.48.0",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -2480,6 +2493,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -2492,6 +2511,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -2504,6 +2529,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -2516,6 +2547,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -2528,6 +2565,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -2540,6 +2583,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -2552,6 +2601,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "winnow"
 version = "0.4.6"

From 58daa31523c47ace81aaf33fd4511e7ac510db39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:43:35 +0900
Subject: [PATCH 521/967] build(deps): bump slotmap from 1.0.6 to 1.0.7 (#8994)

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 6e309127a..8e5489900 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1925,9 +1925,9 @@ dependencies = [
 
 [[package]]
 name = "slotmap"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
 dependencies = [
  "version_check",
 ]

From 00d565bf743116792c68fb0ad9103ec737e7c6dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:43:43 +0900
Subject: [PATCH 522/967] build(deps): bump cachix/install-nix-action from 23
 to 24 (#8995)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index f5408e4a0..d4e6da208 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install nix
-      uses: cachix/install-nix-action@v23
+      uses: cachix/install-nix-action@v24
 
     - name: Authenticate with Cachix
       uses: cachix/cachix-action@v12

From 0d890ef0f720e49beda193e2316aa041a0c4e970 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:44:51 +0900
Subject: [PATCH 523/967] build(deps): bump ignore from 0.4.20 to 0.4.21
 (#8996)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e5489900..55f89eda5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1310,17 +1310,16 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
 dependencies = [
+ "crossbeam-deque",
  "globset",
- "lazy_static",
  "log",
  "memchr",
- "regex",
+ "regex-automata",
  "same-file",
- "thread_local",
  "walkdir",
  "winapi-util",
 ]
@@ -1385,12 +1384,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
 [[package]]
 name = "libc"
 version = "0.2.150"
@@ -2061,16 +2054,6 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "threadpool"
 version = "1.8.1"
@@ -2288,9 +2271,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",

From fa7a8ffc501736cfeb82f02b583874f235a840fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:45:01 +0900
Subject: [PATCH 524/967] build(deps): bump cachix/cachix-action from 12 to 13
 (#8997)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index d4e6da208..0620cbf12 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -17,7 +17,7 @@ jobs:
       uses: cachix/install-nix-action@v24
 
     - name: Authenticate with Cachix
-      uses: cachix/cachix-action@v12
+      uses: cachix/cachix-action@v13
       with:
         name: helix
         authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

From 8532cec01cef75277c2af8ef84d3cbada3571b13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:45:18 +0900
Subject: [PATCH 525/967] build(deps): bump grep-searcher from 0.1.12 to 0.1.13
 (#8998)

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

diff --git a/Cargo.lock b/Cargo.lock
index 55f89eda5..7d4a2fc9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1017,9 +1017,9 @@ dependencies = [
 
 [[package]]
 name = "grep-searcher"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda02a2d9a8c9375ee678bfcba5919b31854c617b6b4f60edec7c9f1dceb84b9"
+checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"
 dependencies = [
  "bstr",
  "encoding_rs",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 9426aaa4e..eaed83754 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -69,7 +69,7 @@ serde = { version = "1.0", features = ["derive"] }
 
 # ripgrep for global search
 grep-regex = "0.1.12"
-grep-searcher = "0.1.12"
+grep-searcher = "0.1.13"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }

From 9fcfb8813237c62a18c506e67fdd99cb166e85cc Mon Sep 17 00:00:00 2001
From: Manuel Mendez <708570+mmlb@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:45:41 -0500
Subject: [PATCH 526/967] Add .envrc.local and .envrc.private to env file-types
 (#8988)

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

diff --git a/languages.toml b/languages.toml
index b2c2a7ef8..dd849c477 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2362,7 +2362,7 @@ source = { git = "https://github.com/hh9527/tree-sitter-wit", rev = "c917790ab9a
 [[language]]
 name = "env"
 scope = "source.env"
-file-types = [".env", ".env.local", ".env.development", ".env.production", ".env.dist", ".envrc"]
+file-types = [".env", ".env.local", ".env.development", ".env.production", ".env.dist", ".envrc", ".envrc.local", ".envrc.private"]
 injection-regex = "env"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }

From ab763b31119484ae8afefd2cc4f1d6539c1905ec Mon Sep 17 00:00:00 2001
From: Niklas Alexander Shern <90867839+nshern@users.noreply.github.com>
Date: Tue, 5 Dec 2023 02:45:50 +0100
Subject: [PATCH 527/967] fix: update rose_pine to be identical to main repo
 (#8946)

---
 runtime/themes/rose_pine.toml | 58 ++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 4bbf219ed..456237e94 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -10,7 +10,7 @@
 "ui.cursor" = { fg = "text", bg = "highlight_high" }
 # "ui.cursor.select" = {}
 "ui.cursor.match" = { fg = "text", bg = "highlight_med" }
-"ui.cursor.primary" = { fg = "text", bg = "muted"}
+"ui.cursor.primary" = { fg = "text", bg = "muted" }
 
 # "ui.gutter" = {}
 # "ui.gutter.selected" = {}
@@ -18,6 +18,8 @@
 "ui.linenr" = { fg = "muted" }
 "ui.linenr.selected" = { fg = "text" }
 
+"ui.bufferline" = { fg = "muted", bg = "base" }
+"ui.bufferline.active" = { fg = "text", bg = "overlay" }
 "ui.statusline" = { fg = "subtle", bg = "surface" }
 "ui.statusline.inactive" = { fg = "muted", bg = "surface" }
 "ui.statusline.normal" = { fg = "rose", bg = "rose_10" }
@@ -71,8 +73,8 @@
 "constructor" = "foam"
 
 "constant" = "foam"
-"constant.builtin" = "rose"
-# "constant.builtin.boolean" = ""
+"constant.builtin" = "love"
+"constant.builtin.boolean" = "rose"
 "constant.character" = "gold"
 "constant.character.escape" = "pine"
 "constant.numeric" = "gold"
@@ -86,7 +88,7 @@
 # "string.special.url" = ""
 # "string.special.symbol" = ""
 
-"comment" = { fg = "muted", modifiers = ["italic"]}
+"comment" = { fg = "muted", modifiers = ["italic"] }
 # "comment.line" = ""
 # "comment.block" = ""
 # "comment.block.documentation" = ""
@@ -95,7 +97,7 @@
 "variable.builtin" = "love"
 "variable.parameter" = "iris"
 # "variable.other" = ""
-# "variable.other.member" = ""
+"variable.other.member" = "foam"
 
 "label" = "foam"
 
@@ -120,7 +122,7 @@
 
 "operator" = "subtle"
 
-"function" = "rose" # maybe pine
+"function" = "rose"         # maybe pine
 "function.builtin" = "love"
 # "function.method" = ""
 # "function.macro" = ""
@@ -128,7 +130,7 @@
 
 "tag" = "foam"
 
-"namespace" = "iris"
+"namespace" = "text"
 
 "markup.heading.marker" = "muted"
 "markup.heading" = { fg = "iris", modifiers = ["bold"] }
@@ -147,7 +149,7 @@
 "markup.italic" = { modifiers = ["italic"] }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link" = "iris"
-"markup.link.url" = { fg = "iris",  underline = { color = "iris", style = "line" } } 
+"markup.link.url" = { fg = "iris", underline = { color = "iris", style = "line" } }
 "markup.link.label" = "subtle"
 "markup.link.text" = "text"
 "markup.quote" = "subtle"
@@ -167,24 +169,24 @@
 # "diff.delta.moved" = ""
 
 [palette]
-base           = "#191724" 
-surface        = "#1f1d2e" 
-overlay        = "#26233a"
-muted          = "#6e6a86"
-subtle         = "#908caa"
-text           = "#e0def4"
-love           = "#eb6f92"
-love_10        = "#311f30"
-gold           = "#f6c177"
-gold_10        = "#30282c"
-rose           = "#ebbcba"
-rose_10        = "#2f2834"
-pine           = "#31748f"
-pine_10        = "#1a2030"
-foam           = "#9ccfd8"
-foam_10        = "#252937"
-iris           = "#c4a7e7"
-iris_10        = "#2b2539"
-highlight_low  = "#21202e"
-highlight_med  = "#403d52"
+base = "#191724"
+surface = "#1f1d2e"
+overlay = "#26233a"
+muted = "#6e6a86"
+subtle = "#908caa"
+text = "#e0def4"
+love = "#eb6f92"
+love_10 = "#311f30"
+gold = "#f6c177"
+gold_10 = "#30282c"
+rose = "#ebbcba"
+rose_10 = "#2f2834"
+pine = "#31748f"
+pine_10 = "#1a2030"
+foam = "#9ccfd8"
+foam_10 = "#252937"
+iris = "#c4a7e7"
+iris_10 = "#2b2539"
+highlight_low = "#21202e"
+highlight_med = "#403d52"
 highlight_high = "#524f67"

From 44c3d48a941c5e2d6484c808c9066b91cfbcf0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Gonz=C3=A1lez?= <ito123456789@gmail.com>
Date: Mon, 4 Dec 2023 22:46:23 -0300
Subject: [PATCH 528/967] Add more accurate to official theme type highlighting
 to Darcula themes (#8738)

---
 runtime/themes/darcula.toml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index 3086b727f..495463744 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -35,7 +35,11 @@
 "constant.numeric" = "lightblue"
 "constant.character.escape" = "white"
 "attribute" = "yellow"
-"type" = "orange"
+"type" = "white"
+"type.builtin" = "orange"
+"type.parameter" = { fg = "white", modifiers = ["bold"] }
+"type.enum" = "white"
+"type.enum.variant" = "orange"
 "string"  = "darkgreen"
 "function" = "yellow"
 "function.macro" = "green"

From bf7c4e165946f7a5be48c9d7e8abb8e68f066882 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Mon, 4 Dec 2023 20:54:18 -0500
Subject: [PATCH 529/967] use workspace inheritance for common version (#8925)

---
 Cargo.lock              | 22 +++++++++++-----------
 Cargo.toml              |  5 +++++
 VERSION                 |  1 -
 docs/releases.md        | 17 ++++++++++++-----
 helix-core/Cargo.toml   | 16 ++++++++--------
 helix-dap/Cargo.toml    | 15 ++++++++-------
 helix-event/Cargo.toml  | 10 +++++-----
 helix-loader/Cargo.toml | 12 ++++++------
 helix-loader/build.rs   | 18 ++++++++++++++----
 helix-lsp/Cargo.toml    | 18 +++++++++---------
 helix-parsec/Cargo.toml | 14 +++++++-------
 helix-term/Cargo.toml   | 30 +++++++++++++++---------------
 helix-tui/Cargo.toml    | 21 ++++++++++-----------
 helix-vcs/Cargo.toml    | 16 ++++++++--------
 helix-view/Cargo.toml   | 25 +++++++++++++------------
 xtask/Cargo.toml        | 18 ++++++++++++------
 16 files changed, 143 insertions(+), 115 deletions(-)
 delete mode 100644 VERSION

diff --git a/Cargo.lock b/Cargo.lock
index 7d4a2fc9f..1e14ff02f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1048,7 +1048,7 @@ dependencies = [
 
 [[package]]
 name = "helix-core"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -1083,7 +1083,7 @@ dependencies = [
 
 [[package]]
 name = "helix-dap"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "anyhow",
  "fern",
@@ -1098,7 +1098,7 @@ dependencies = [
 
 [[package]]
 name = "helix-event"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "parking_lot",
  "tokio",
@@ -1106,7 +1106,7 @@ dependencies = [
 
 [[package]]
 name = "helix-loader"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "anyhow",
  "cc",
@@ -1125,7 +1125,7 @@ dependencies = [
 
 [[package]]
 name = "helix-lsp"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "anyhow",
  "futures-executor",
@@ -1147,11 +1147,11 @@ dependencies = [
 
 [[package]]
 name = "helix-parsec"
-version = "0.6.0"
+version = "23.10.0"
 
 [[package]]
 name = "helix-term"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1193,7 +1193,7 @@ dependencies = [
 
 [[package]]
 name = "helix-tui"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "bitflags 2.4.1",
  "cassowary",
@@ -1209,7 +1209,7 @@ dependencies = [
 
 [[package]]
 name = "helix-vcs"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -1225,7 +1225,7 @@ dependencies = [
 
 [[package]]
 name = "helix-view"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2610,7 +2610,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "0.6.0"
+version = "23.10.0"
 dependencies = [
  "helix-core",
  "helix-loader",
diff --git a/Cargo.toml b/Cargo.toml
index f2cd9b766..6c006fbb4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,11 @@ tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sit
 nucleo = "0.2.0"
 
 [workspace.package]
+version = "23.10.0"
 edition = "2021"
+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+categories = ["editor"]
+repository = "https://github.com/helix-editor/helix"
+homepage = "https://helix-editor.com"
 license = "MPL-2.0"
 rust-version = "1.70"
diff --git a/VERSION b/VERSION
deleted file mode 100644
index f5f8bffe4..000000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-23.10
\ No newline at end of file
diff --git a/docs/releases.md b/docs/releases.md
index 842886753..e39cfd910 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -1,16 +1,23 @@
 ## Checklist
 
 Helix releases are versioned in the Calendar Versioning scheme:
-`YY.0M(.MICRO)`, for example, `22.05` for May of 2022. In these instructions
-we'll use `<tag>` as a placeholder for the tag being published.
+`YY.0M(.MICRO)`, for example, `22.05` for May of 2022, or in a patch release,
+`22.05.1`. In these instructions we'll use `<tag>` as a placeholder for the tag
+being published.
 
 * Merge the changelog PR
 * Add new `<release>` entry in `contrib/Helix.appdata.xml` with release information according to the [AppStream spec](https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Releases.html)
 * Tag and push
     * `git tag -s -m "<tag>" -a <tag> && git push`
     * Make sure to switch to master and pull first
-* Edit the `VERSION` file and change the date to the next planned release
-    * Releases are planned to happen every two months, so `22.05` would change to `22.07`
+* Edit the `Cargo.toml` file and change the date in the `version` field to the next planned release
+    * Due to Cargo having a strict requirement on SemVer with 3 or more version
+      numbers, a `0` is required in the micro version; however, unless we are
+      publishing a patch release after a major release, the `.0` is dropped in
+      the user facing version.
+    * Releases are planned to happen every two months, so `22.05.0` would change to `22.07.0`
+    * If we are pushing a patch/bugfix release in the same month as the previous
+      release, bump the micro version, e.g. `22.07.0` to `22.07.1`
 * Wait for the Release CI to finish
     * It will automatically turn the git tag into a GitHub release when it uploads artifacts
 * Edit the new release
@@ -57,4 +64,4 @@ versions for convenience:
 > release. For the full log, check out the git log.
 
 Typically, small changes like dependencies or documentation updates, refactors,
-or meta changes like GitHub Actions work are left out.
\ No newline at end of file
+or meta changes like GitHub Actions work are left out.
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index f3797af29..800b7a5d7 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -1,22 +1,22 @@
 [package]
 name = "helix-core"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+description = "Helix editor core editing primitives"
+include = ["src/**/*", "README.md"]
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-description = "Helix editor core editing primitives"
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
-include = ["src/**/*", "README.md"]
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 [features]
 unicode-lines = ["ropey/unicode_lines"]
 integration = []
 
 [dependencies]
-helix-loader = { version = "0.6", path = "../helix-loader" }
+helix-loader = { path = "../helix-loader" }
 
 ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
 smallvec = "1.11"
diff --git a/helix-dap/Cargo.toml b/helix-dap/Cargo.toml
index b4dd5177e..f7acb0032 100644
--- a/helix-dap/Cargo.toml
+++ b/helix-dap/Cargo.toml
@@ -1,19 +1,20 @@
 [package]
 name = "helix-dap"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+description = "DAP client implementation for Helix project"
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-description = "DAP client implementation for Helix project"
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-helix-core = { version = "0.6", path = "../helix-core" }
+helix-core = { path = "../helix-core" }
+
 anyhow = "1.0"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/helix-event/Cargo.toml b/helix-event/Cargo.toml
index 2dd4b512d..c20328246 100644
--- a/helix-event/Cargo.toml
+++ b/helix-event/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "helix-event"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index b32318d04..1a98e94be 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "helix-loader"
-version = "0.6.0"
-description = "A post-modern text editor."
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+description = "Build bootstrapping for Helix crates"
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 [[bin]]
 name = "hx-loader"
diff --git a/helix-loader/build.rs b/helix-loader/build.rs
index 74ba2a2be..a4562c00c 100644
--- a/helix-loader/build.rs
+++ b/helix-loader/build.rs
@@ -2,7 +2,17 @@ use std::borrow::Cow;
 use std::path::Path;
 use std::process::Command;
 
-const VERSION: &str = include_str!("../VERSION");
+const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR");
+const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");
+const PATCH: &str = env!("CARGO_PKG_VERSION_PATCH");
+
+fn get_calver() -> String {
+    if PATCH == "0" {
+        format!("{MAJOR}.{MINOR}")
+    } else {
+        format!("{MAJOR}.{MINOR}.{PATCH}")
+    }
+}
 
 fn main() {
     let git_hash = Command::new("git")
@@ -12,9 +22,10 @@ fn main() {
         .filter(|output| output.status.success())
         .and_then(|x| String::from_utf8(x.stdout).ok());
 
+    let calver = get_calver();
     let version: Cow<_> = match &git_hash {
-        Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
-        None => VERSION.into(),
+        Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(),
+        None => calver.into(),
     };
 
     println!(
@@ -22,7 +33,6 @@ fn main() {
         std::env::var("TARGET").unwrap()
     );
 
-    println!("cargo:rerun-if-changed=../VERSION");
     println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
 
     if git_hash.is_none() {
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index d9507f1b6..66b67f8e5 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -1,21 +1,21 @@
 [package]
 name = "helix-lsp"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+description = "LSP client implementation for Helix project"
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-description = "LSP client implementation for Helix project"
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-helix-core = { version = "0.6", path = "../helix-core" }
-helix-loader = { version = "0.6", path = "../helix-loader" }
-helix-parsec = { version = "0.6", path = "../helix-parsec" }
+helix-core = { path = "../helix-core" }
+helix-loader = { path = "../helix-loader" }
+helix-parsec = { path = "../helix-parsec" }
 
 anyhow = "1.0"
 futures-executor = "0.3"
diff --git a/helix-parsec/Cargo.toml b/helix-parsec/Cargo.toml
index d2b6105e6..217691219 100644
--- a/helix-parsec/Cargo.toml
+++ b/helix-parsec/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "helix-parsec"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+description = "Parser combinators for Helix"
+include = ["src/**/*", "README.md"]
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-description = "Parser combinators for Helix"
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
-include = ["src/**/*", "README.md"]
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 [dependencies]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index eaed83754..33594c0f7 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "helix-term"
-version = "0.6.0"
 description = "A post-modern text editor."
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-edition.workspace = true
-license.workspace = true
-categories = ["editor", "command-line-utilities"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
 include = ["src/**/*", "README.md"]
 default-run = "hx"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
 rust-version.workspace = true
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 [features]
 default = ["git"]
@@ -23,13 +23,13 @@ name = "hx"
 path = "src/main.rs"
 
 [dependencies]
-helix-core = { version = "0.6", path = "../helix-core" }
-helix-event = { version = "0.6", path = "../helix-event" }
-helix-view = { version = "0.6", path = "../helix-view" }
-helix-lsp = { version = "0.6", path = "../helix-lsp" }
-helix-dap = { version = "0.6", path = "../helix-dap" }
-helix-vcs = { version = "0.6", path = "../helix-vcs" }
-helix-loader = { version = "0.6", path = "../helix-loader" }
+helix-core = { path = "../helix-core" }
+helix-event = { path = "../helix-event" }
+helix-view = { path = "../helix-view" }
+helix-lsp = { path = "../helix-lsp" }
+helix-dap = { path = "../helix-dap" }
+helix-vcs = { path = "../helix-vcs" }
+helix-loader = { path = "../helix-loader" }
 
 anyhow = "1"
 once_cell = "1.18"
@@ -79,7 +79,7 @@ libc = "0.2.150"
 crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
 
 [build-dependencies]
-helix-loader = { version = "0.6", path = "../helix-loader" }
+helix-loader = { path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.11"
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 602fa3e5f..c6af90fc6 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -1,22 +1,23 @@
 [package]
 name = "helix-tui"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
-description = """
-A library to build rich terminal user interfaces or dashboards
-"""
+description = """A library to build rich terminal user interfaces or dashboards"""
+include = ["src/**/*", "README.md"]
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
-include = ["src/**/*", "README.md"]
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 [features]
 default = ["crossterm"]
 
 [dependencies]
+helix-view = { path = "../helix-view", features = ["term"] }
+helix-core = { path = "../helix-core" }
+
 bitflags = "2.4"
 cassowary = "0.3"
 unicode-segmentation = "1.10"
@@ -25,5 +26,3 @@ termini = "1.0"
 serde = { version = "1", "optional" = true, features = ["derive"]}
 once_cell = "1.18"
 log = "~0.4"
-helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
-helix-core = { version = "0.6", path = "../helix-core" }
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 1152cf9ab..ba38160fd 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "helix-vcs"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-helix-core = { version = "0.6", path = "../helix-core" }
-helix-event = { version = "0.6", path = "../helix-event" }
+helix-core = { path = "../helix-core" }
+helix-event = { path = "../helix-event" }
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 parking_lot = "0.12"
@@ -29,4 +29,4 @@ log = "0.4"
 git = ["gix"]
 
 [dev-dependencies]
-tempfile = "3.8"
\ No newline at end of file
+tempfile = "3.8"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 9fc83d4cf..5fb6d96b5 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -1,29 +1,30 @@
 [package]
 name = "helix-view"
-version = "0.6.0"
-authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+description = "UI abstractions for use in backends"
+version.workspace = true
+authors.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
-description = "UI abstractions for use in backends"
-categories = ["editor"]
-repository = "https://github.com/helix-editor/helix"
-homepage = "https://helix-editor.com"
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 [features]
 default = []
 term = ["crossterm"]
 
 [dependencies]
+helix-core = { path = "../helix-core" }
+helix-event = { path = "../helix-event" }
+helix-loader = { path = "../helix-loader" }
+helix-lsp = { path = "../helix-lsp" }
+helix-dap = { path = "../helix-dap" }
+helix-vcs = { path = "../helix-vcs" }
+
 bitflags = "2.4"
 anyhow = "1"
-helix-core = { version = "0.6", path = "../helix-core" }
-helix-event = { version = "0.6", path = "../helix-event" }
-helix-loader = { version = "0.6", path = "../helix-loader" }
-helix-lsp = { version = "0.6", path = "../helix-lsp" }
-helix-dap = { version = "0.6", path = "../helix-dap" }
 crossterm = { version = "0.27", optional = true }
-helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits
 once_cell = "1.18"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index ed1182947..0a61536fc 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -1,13 +1,19 @@
 [package]
 name = "xtask"
-version = "0.6.0"
-edition = "2021"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-helix-term = { version = "0.6", path = "../helix-term" }
-helix-core = { version = "0.6", path = "../helix-core" }
-helix-view = { version = "0.6", path = "../helix-view" }
-helix-loader = { version = "0.6", path = "../helix-loader" }
+helix-term = { path = "../helix-term" }
+helix-core = { path = "../helix-core" }
+helix-view = { path = "../helix-view" }
+helix-loader = { path = "../helix-loader" }
 toml = "0.7"

From 4c2bd4905e8cf1c3be8b80ee1095ab0ece61ef1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:28:32 +0900
Subject: [PATCH 530/967] build(deps): bump open from 5.0.0 to 5.0.1 (#8992)

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

diff --git a/Cargo.lock b/Cargo.lock
index 1e14ff02f..ea007bd4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1565,9 +1565,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "open"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8"
+checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
 dependencies = [
  "is-wsl",
  "libc",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 33594c0f7..ac5a8475d 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -58,7 +58,7 @@ pulldown-cmark = { version = "0.9", default-features = false }
 content_inspector = "0.2.4"
 
 # opening URLs
-open = "5.0.0"
+open = "5.0.1"
 url = "2.5.0"
 
 # config

From c3cb1795bfd2bfe1c01badd71ac101b0c8fdd379 Mon Sep 17 00:00:00 2001
From: Frederick Schwalbe <88447041+fschwalbe@users.noreply.github.com>
Date: Tue, 5 Dec 2023 14:54:00 +0100
Subject: [PATCH 531/967] Update gleam grammar and queries (#9003)

---
 languages.toml                       |  2 +-
 runtime/queries/gleam/highlights.scm | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/languages.toml b/languages.toml
index dd849c477..66b43472f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1624,7 +1624,7 @@ auto-format = true
 
 [[grammar]]
 name = "gleam"
-source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a" }
+source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "b2afa4fd6bb41a7bf912b034c653c90af7ae5122" }
 
 [[language]]
 name = "ron"
diff --git a/runtime/queries/gleam/highlights.scm b/runtime/queries/gleam/highlights.scm
index 56222b8fd..95a08141b 100644
--- a/runtime/queries/gleam/highlights.scm
+++ b/runtime/queries/gleam/highlights.scm
@@ -21,6 +21,8 @@
 
 ; Functions
 (unqualified_import (identifier) @function)
+(unqualified_import "type" (type_identifier) @type)
+(unqualified_import (type_identifier) @constructor)
 (function
   name: (identifier) @function)
 (external_function
@@ -43,6 +45,13 @@
 (tuple_access
   index: (integer) @variable.other.member)
 
+; Attributes
+(attribute
+  "@" @attribute
+  name: (identifier) @attribute)
+
+(attribute_value (identifier) @constant)
+
 ; Type names
 (remote_type_identifier) @type
 (type_identifier) @type
@@ -60,10 +69,6 @@
 (identifier) @variable
 (discard) @comment.unused
 
-; Operators
-(binary_expression
-  operator: _ @operator)
-
 ; Keywords
 [
   (visibility_modifier) ; "pub"
@@ -72,6 +77,7 @@
   "assert"
   "case"
   "const"
+  ; DEPRECATED: 'external' was removed in v0.30.
   "external"
   "fn"
   "if"
@@ -79,11 +85,16 @@
   "let"
   "panic"
   "todo"
-  "try"
   "type"
   "use"
 ] @keyword
 
+; Operators
+(binary_expression
+  operator: _ @operator)
+(boolean_negation "!" @operator)
+(integer_negation "-" @operator)
+
 ; Punctuation
 [
   "("

From b81aacc5e1332bb01043a18e55dd9e9543711ec6 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Wed, 6 Dec 2023 16:19:54 +0100
Subject: [PATCH 532/967] Join empty lines with only one space in
 `join_selections` (#8989)

* fix: #8977

fixes the issue that lines with only spaces are getting
joined as well

* reverting some renamings

* improve empty line check

* adding integration test

* reverting code block

* fix conditon check for line end

* applying suggested style
---
 helix-term/src/commands.rs        | 20 +++++++-------
 helix-term/tests/test/commands.rs | 46 +++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index cd053266c..e557977ad 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4391,10 +4391,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
     use movement::skip_while;
     let (view, doc) = current!(cx.editor);
     let text = doc.text();
-    let slice = doc.text().slice(..);
+    let slice = text.slice(..);
 
     let mut changes = Vec::new();
-    let fragment = Tendril::from(" ");
 
     for selection in doc.selection(view.id) {
         let (start, mut end) = selection.line_range(slice);
@@ -4410,9 +4409,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
             let mut end = text.line_to_char(line + 1);
             end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
 
-            // need to skip from start, not end
-            let change = (start, end, Some(fragment.clone()));
-            changes.push(change);
+            let separator = if end == line_end_char_index(&slice, line + 1) {
+                // the joining line contains only space-characters => don't include a whitespace when joining
+                None
+            } else {
+                Some(Tendril::from(" "))
+            };
+            changes.push((start, end, separator));
         }
     }
 
@@ -4424,9 +4427,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
     changes.sort_unstable_by_key(|(from, _to, _text)| *from);
     changes.dedup();
 
-    // TODO: joining multiple empty lines should be replaced by a single space.
-    // need to merge change ranges that touch
-
     // select inserted spaces
     let transaction = if select_space {
         let ranges: SmallVec<_> = changes
@@ -4438,9 +4438,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
             })
             .collect();
         let selection = Selection::new(ranges, 0);
-        Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
+        Transaction::change(text, changes.into_iter()).with_selection(selection)
     } else {
-        Transaction::change(doc.text(), changes.into_iter())
+        Transaction::change(text, changes.into_iter())
     };
 
     doc.apply(&transaction, view.id);
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index b3e135510..e52b142c6 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -480,3 +480,49 @@ fn bar() {#(\n|)#\
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_join_selections() -> anyhow::Result<()> {
+    // normal join
+    test((
+        platform_line(indoc! {"\
+            #[a|]#bc
+            def
+        "}),
+        "J",
+        platform_line(indoc! {"\
+            #[a|]#bc def
+        "}),
+    ))
+    .await?;
+
+    // join with empty line
+    test((
+        platform_line(indoc! {"\
+            #[a|]#bc
+
+            def
+        "}),
+        "JJ",
+        platform_line(indoc! {"\
+            #[a|]#bc def
+        "}),
+    ))
+    .await?;
+
+    // join with additional space in non-empty line
+    test((
+        platform_line(indoc! {"\
+            #[a|]#bc
+
+                def
+        "}),
+        "JJ",
+        platform_line(indoc! {"\
+            #[a|]#bc def
+        "}),
+    ))
+    .await?;
+
+    Ok(())
+}

From 510928618dfcddcd6d3086b278332fa93ee32998 Mon Sep 17 00:00:00 2001
From: Tanguy <Dragonink@users.noreply.github.com>
Date: Fri, 8 Dec 2023 19:04:09 +0100
Subject: [PATCH 533/967] Fix version of Nix package (#9013)

---
 flake.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 410c46155..e113d94b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,18 +121,18 @@
       rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
       craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
       craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
-      commonArgs =
-        {
-          inherit stdenv;
-          src = filteredSource;
-          # disable fetching and building of tree-sitter grammars in the helix-term build.rs
-          HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
-          buildInputs = [stdenv.cc.cc.lib];
-          # disable tests
-          doCheck = false;
-          meta.mainProgram = "hx";
-        }
-        // craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
+      commonArgs = {
+        inherit stdenv;
+        inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
+        inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
+        src = filteredSource;
+        # disable fetching and building of tree-sitter grammars in the helix-term build.rs
+        HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
+        buildInputs = [stdenv.cc.cc.lib];
+        # disable tests
+        doCheck = false;
+        meta.mainProgram = "hx";
+      };
       cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
     in {
       packages = {

From 53ad0f72a581fe2ac60077e5ca819ca5e11db8d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:05:10 +0900
Subject: [PATCH 534/967] build(deps): bump tokio from 1.34.0 to 1.35.0 (#9057)

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 ea007bd4d..6878ad5d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2109,9 +2109,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 66b67f8e5..7278d1fb8 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -26,7 +26,7 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.34", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
 which = "5.0.0"
 parking_lot = "0.12.1"

From 3e249829ee67b7fbe41b23a4b0cfca729360c8d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:05:20 +0900
Subject: [PATCH 535/967] build(deps): bump libc from 0.2.150 to 0.2.151
 (#9056)

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

diff --git a/Cargo.lock b/Cargo.lock
index 6878ad5d9..26d01f018 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1386,9 +1386,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index ac5a8475d..c868703e6 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -73,7 +73,7 @@ grep-searcher = "0.1.13"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.150"
+libc = "0.2.151"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }

From 7f44a6ad503bf51f2691ad2d6e5f091e9a41965c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:46:11 +0900
Subject: [PATCH 536/967] build(deps): bump once_cell from 1.18.0 to 1.19.0
 (#9053)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 4 ++--
 helix-core/Cargo.toml   | 2 +-
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-tui/Cargo.toml    | 2 +-
 helix-view/Cargo.toml   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 26d01f018..3a5cf387f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1559,9 +1559,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "open"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 800b7a5d7..d7fff6c6f 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -27,7 +27,7 @@ unicode-general-category = "0.6"
 # slab = "0.4.2"
 slotmap = "1.0"
 tree-sitter.workspace = true
-once_cell = "1.18"
+once_cell = "1.19"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 1a98e94be..c40bf4dbc 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.7"
 etcetera = "0.8"
 tree-sitter.workspace = true
-once_cell = "1.18"
+once_cell = "1.19"
 log = "0.4"
 which = "5.0.0"
 
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index c868703e6..4ff7fc0b1 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -32,7 +32,7 @@ helix-vcs = { path = "../helix-vcs" }
 helix-loader = { path = "../helix-loader" }
 
 anyhow = "1"
-once_cell = "1.18"
+once_cell = "1.19"
 
 which = "5.0.0"
 
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index c6af90fc6..abb6122af 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -24,5 +24,5 @@ unicode-segmentation = "1.10"
 crossterm = { version = "0.27", optional = true }
 termini = "1.0"
 serde = { version = "1", "optional" = true, features = ["derive"]}
-once_cell = "1.18"
+once_cell = "1.19"
 log = "~0.4"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 5fb6d96b5..db53b54cc 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -27,7 +27,7 @@ anyhow = "1"
 crossterm = { version = "0.27", optional = true }
 
 # Conversion traits
-once_cell = "1.18"
+once_cell = "1.19"
 url = "2.5.0"
 
 arc-swap = { version = "1.6.0" }

From f036451a0e5fc18880fa886c948b20d255e74d84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:46:21 +0900
Subject: [PATCH 537/967] build(deps): bump rustix from 0.38.26 to 0.38.28
 (#9054)

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 3a5cf387f..2aab70a9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1770,9 +1770,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.26"
+version = "0.38.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
 dependencies = [
  "bitflags 2.4.1",
  "errno",

From 49dffa7d24a6a8f08444b9f10b9f6398100f9d1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 02:29:43 +0100
Subject: [PATCH 538/967] build(deps): bump gix from 0.55.2 to 0.56.0 (#9055)

* build(deps): bump gix from 0.55.2 to 0.56.0

Bumps [gix](https://github.com/Byron/gitoxide) from 0.55.2 to 0.56.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.55.2...gix-v0.56.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

* Adapt to changes in gix EntryMode/EntryKind

The rest of the gix codebase now calls `.kind()` on the mode and uses
the renamed `EntryKind` enum.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 Cargo.lock           | 154 ++++++++++++++++++++-----------------------
 helix-vcs/Cargo.toml |   2 +-
 helix-vcs/src/git.rs |   8 +--
 3 files changed, 78 insertions(+), 86 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2aab70a9c..b0c4924f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -415,9 +415,9 @@ dependencies = [
 
 [[package]]
 name = "faster-hex"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a"
+checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
 dependencies = [
  "serde",
 ]
@@ -522,9 +522,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.55.2"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "002667cd1ebb789313d0d0afe3d23b2821cf3b0e91605095f0e6d8751f0ceeea"
+checksum = "5b0dcdc9c60d66535897fa40a7ea2a635e72f99456b1d9ae86b7e170e80618cb"
 dependencies = [
  "gix-actor",
  "gix-commitgraph",
@@ -563,46 +563,46 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "948a5f9e43559d16faf583694f1c742eb401ce24ce8e6f2238caedea7486433c"
+checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417"
 dependencies = [
  "bstr",
  "btoi",
  "gix-date",
  "itoa",
  "thiserror",
- "winnow 0.5.17",
+ "winnow 0.5.28",
 ]
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493"
+checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8bc78b1a6328fa6d8b3a53b6c73997af37fd6bfc1d6c49f149e63bda5cbb36"
+checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36"
 dependencies = [
  "bstr",
  "gix-chunk",
  "gix-features",
  "gix-hash",
- "memmap2 0.7.1",
+ "memmap2",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-config"
-version = "0.31.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cae98c6b4c66c09379bc35274b172587d6b0ac369a416c39128ad8c6454f9bb"
+checksum = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -616,14 +616,14 @@ dependencies = [
  "smallvec",
  "thiserror",
  "unicode-bom",
- "winnow 0.5.17",
+ "winnow 0.5.28",
 ]
 
 [[package]]
 name = "gix-config-value"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47"
+checksum = "6419db582ea84dfb58c7e7b0af7fd62c808aa14954af2936a33f89b0f4ed018e"
 dependencies = [
  "bitflags 2.4.1",
  "bstr",
@@ -634,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d"
+checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be"
 dependencies = [
  "bstr",
  "itoa",
@@ -646,10 +646,11 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.37.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931394f69fb8c9ed6afc0aae3487bd869e936339bcc13ed8884472af072e0554"
+checksum = "8119a985887cfe68f4bdf92e51bd64bc758a73882d82fcfc03ebcb164441c85d"
 dependencies = [
+ "bstr",
  "gix-hash",
  "gix-object",
  "thiserror",
@@ -657,9 +658,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a45d5cf0321178883e38705ab2b098f625d609a7d4c391b33ac952eff2c490f2"
+checksum = "6fad89416ebe0b3b7df78464124e2a02417b6cd3743d48ad93df86f4d2929c07"
 dependencies = [
  "bstr",
  "dunce",
@@ -672,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.36.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f4365ba17c4f218d7fd9ec102b8d2d3cb0ca200a835e81151ace7778aec827"
+checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -690,18 +691,18 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd171c0cae97cd0dc57e7b4601cb1ebf596450e263ef3c02be9107272c877bd"
+checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107"
 dependencies = [
  "gix-features",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4"
+checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19"
 dependencies = [
  "bitflags 2.4.1",
  "bstr",
@@ -711,9 +712,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60"
+checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0"
 dependencies = [
  "faster-hex",
  "thiserror",
@@ -721,9 +722,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16"
+checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca"
 dependencies = [
  "gix-hash",
  "hashbrown 0.14.3",
@@ -743,9 +744,9 @@ dependencies = [
 
 [[package]]
 name = "gix-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6"
+checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -754,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740f2a44267f58770a1cb3a3d01d14e67b089c7136c48d4bddbb3cfd2bf86a51"
+checksum = "febf79c5825720c1c63fe974c7bbe695d0cb54aabad73f45671c60ce0e501e33"
 dependencies = [
  "bstr",
  "btoi",
@@ -768,14 +769,14 @@ dependencies = [
  "itoa",
  "smallvec",
  "thiserror",
- "winnow 0.5.17",
+ "winnow 0.5.28",
 ]
 
 [[package]]
 name = "gix-odb"
-version = "0.54.0"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8630b56cb80d8fa684d383dad006a66401ee8314e12fbf0e566ddad8c115143b"
+checksum = "1fae5f971540c99c6ecc8d4368ecc9d18a9dc8b9391025c68c4399747dc93bac"
 dependencies = [
  "arc-swap",
  "gix-date",
@@ -792,9 +793,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.44.0"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1431ba2e30deff1405920693d54ab231c88d7c240dd6ccc936ee223d8f8697c3"
+checksum = "4569491c92446fddf373456ff360aff9a9effd627b40a70f2d7914dcd75a3205"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -804,7 +805,7 @@ dependencies = [
  "gix-object",
  "gix-path",
  "gix-tempfile",
- "memmap2 0.7.1",
+ "memmap2",
  "parking_lot",
  "smallvec",
  "thiserror",
@@ -812,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b"
+checksum = "d86d6fac2fabe07b67b7835f46d07571f68b11aa1aaecae94fe722ea4ef305e1"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -825,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "gix-quote"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905"
+checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2"
 dependencies = [
  "bstr",
  "btoi",
@@ -836,9 +837,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec2f6d07ac88d2fb8007ee3fa3e801856fb9d82e7366ec0ca332eb2c9d74a52"
+checksum = "1ac23ed741583c792f573c028785db683496a6dfcd672ec701ee54ba6a77e1ff"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -850,16 +851,16 @@ dependencies = [
  "gix-path",
  "gix-tempfile",
  "gix-validate",
- "memmap2 0.7.1",
+ "memmap2",
  "thiserror",
- "winnow 0.5.17",
+ "winnow 0.5.28",
 ]
 
 [[package]]
 name = "gix-refspec"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb0974cc41dbdb43a180c7f67aa481e1c1e160fcfa8f4a55291fd1126c1a6e7"
+checksum = "76d9d3b82e1ee78fc0dc1c37ea5ea76c2dbc73f407db155f0dfcea285e583bee"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -871,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ca97ac73459a7f3766aa4a5638a6e37d56d4c7962bc1986fbaf4883d0772588"
+checksum = "fe5dd51710ce5434bc315ea30394fab483c5377276494edd79222b321a5a9544"
 dependencies = [
  "bstr",
  "gix-date",
@@ -887,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a16d8c892e4cd676d86f0265bf9d40cefd73d8d94f86b213b8b77d50e77efae0"
+checksum = "69d4ed2493ca94a475fdf147138e1ef8bab3b6ebb56abf3d9bda1c05372ec1dd"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -902,9 +903,9 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28"
+checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2"
 dependencies = [
  "bitflags 2.4.1",
  "gix-path",
@@ -927,15 +928,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836"
+checksum = "b686a35799b53a9825575ca3f06481d0a053a409c4d97ffcf5ddd67a8760b497"
 
 [[package]]
 name = "gix-traverse"
-version = "0.34.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d050ec7d4e1bb76abf0636cf4104fb915b70e54e3ced9a4427c999100ff38a"
+checksum = "df2112088122a0206592c84fbd42020db63b2ccaed66a0293779f2e5fbf80474"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -949,9 +950,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1b9ac8ed32ad45f9fc6c5f8c0be2ed911e544a5a19afd62d95d524ebaa95671"
+checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005"
 dependencies = [
  "bstr",
  "gix-features",
@@ -963,18 +964,18 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f"
+checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e"
 dependencies = [
  "fastrand",
 ]
 
 [[package]]
 name = "gix-validate"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5"
+checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f"
 dependencies = [
  "bstr",
  "thiserror",
@@ -1027,7 +1028,7 @@ dependencies = [
  "grep-matcher",
  "log",
  "memchr",
- "memmap2 0.9.0",
+ "memmap2",
 ]
 
 [[package]]
@@ -1450,15 +1451,6 @@ version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
-[[package]]
-name = "memmap2"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.9.0"
@@ -2601,9 +2593,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.17"
+version = "0.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
 dependencies = [
  "memchr",
 ]
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index ba38160fd..bdf4b54d9 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.6.0" }
 
-gix = { version = "0.55.0", default-features = false , optional = true }
+gix = { version = "0.56.0", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 
diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs
index 88dba70c8..e4d45301a 100644
--- a/helix-vcs/src/git.rs
+++ b/helix-vcs/src/git.rs
@@ -3,7 +3,7 @@ use arc_swap::ArcSwap;
 use std::path::Path;
 use std::sync::Arc;
 
-use gix::objs::tree::EntryMode;
+use gix::objs::tree::EntryKind;
 use gix::sec::trust::DefaultForLevel;
 use gix::{Commit, ObjectId, Repository, ThreadSafeRepository};
 
@@ -128,12 +128,12 @@ fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Resul
     let tree_entry = tree
         .lookup_entry_by_path(rel_path, &mut Vec::new())?
         .context("file is untracked")?;
-    match tree_entry.mode() {
+    match tree_entry.mode().kind() {
         // not a file, everything is new, do not show diff
-        mode @ (EntryMode::Tree | EntryMode::Commit | EntryMode::Link) => {
+        mode @ (EntryKind::Tree | EntryKind::Commit | EntryKind::Link) => {
             bail!("entry at {} is not a file but a {mode:?}", file.display())
         }
         // found a file
-        EntryMode::Blob | EntryMode::BlobExecutable => Ok(tree_entry.object_id()),
+        EntryKind::Blob | EntryKind::BlobExecutable => Ok(tree_entry.object_id()),
     }
 }

From c2591445c90ae9c152cbc974122b77632de78e85 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <vadorovsky@protonmail.com>
Date: Wed, 13 Dec 2023 01:37:03 +0000
Subject: [PATCH 539/967] chore: Update tree-sitter-d (#9021)

One of the included changes is gdamore/tree-sitter-d#22 which
fixes the build of Helix when using clang as `CC`.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 66b43472f..7f1c6b769 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2220,7 +2220,7 @@ formatter = { command = "dfmt" }
 
 [[grammar]]
 name = "d"
-source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb2f3c43fa8a923d0d27497f3c04" }
+source = { git = "https://github.com/gdamore/tree-sitter-d", rev = "5566f8ce8fc24186fad06170bbb3c8d97c935d74" }
 
 [[language]]
 name = "vhs"

From 7c55190806f31595e18da2b56c8ca54d8f5b33b7 Mon Sep 17 00:00:00 2001
From: Valerii Petryniak <44531564+valerii15298@users.noreply.github.com>
Date: Wed, 13 Dec 2023 18:37:12 +0200
Subject: [PATCH 540/967] Update keymap.md: improve grammar (#9069)

* Update keymap.md: improve grammar

* Update keymap.md

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

---------

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>
---
 book/src/keymap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 0f41b3247..c6981b286 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -25,7 +25,7 @@
 
 ## Normal mode
 
-Normal mode is the default mode when you launch helix. Return to it from other modes by typing `Escape`.
+Normal mode is the default mode when you launch helix. You can return to it from other modes by pressing the `Escape` key.
 
 ### Movement
 

From 437fbee425874c83ac7c7b0d3c1ecfa34d0b2b16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:52:58 +0900
Subject: [PATCH 541/967] build(deps): bump zerocopy from 0.7.20 to 0.7.31
 (#9092)

Bumps [zerocopy](https://github.com/google/zerocopy) from 0.7.20 to 0.7.31.
- [Release notes](https://github.com/google/zerocopy/releases)
- [Changelog](https://github.com/google/zerocopy/blob/main/CHANGELOG.md)
- [Commits](https://github.com/google/zerocopy/compare/v0.7.20...v0.7.31)

---
updated-dependencies:
- dependency-name: zerocopy
  dependency-type: indirect
...

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 b0c4924f1..f58ac4ff0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2613,18 +2613,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.20"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.20"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",

From b4571c292e76382f98266322a025c6383bd02f30 Mon Sep 17 00:00:00 2001
From: Phil <me@pnelson.ca>
Date: Fri, 15 Dec 2023 06:54:25 +0000
Subject: [PATCH 542/967] Add initial support for janet-lang (#9081)

* Add initial support for janet-lang

* Use default roots for janet-lang
---
 book/src/generated/lang-support.md   | 1 +
 languages.toml                       | 9 +++++++++
 runtime/queries/janet/highlights.scm | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 runtime/queries/janet/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ed4014e30..1fad1017e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -73,6 +73,7 @@
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
 | ini | ✓ |  |  |  |
+| janet | ✓ |  |  |  |
 | java | ✓ | ✓ | ✓ | `jdtls` |
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jinja | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 7f1c6b769..2c2bfc612 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2952,3 +2952,12 @@ file-types = ["log"]
 [[grammar]]
 name = "log"
 source = { git = "https://github.com/Tudyx/tree-sitter-log", rev = "62cfe307e942af3417171243b599cc7deac5eab9" }
+
+[[language]]
+name = "janet"
+scope = "source.janet"
+injection-regex = "janet"
+file-types = ["janet"]
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+grammar = "clojure"
diff --git a/runtime/queries/janet/highlights.scm b/runtime/queries/janet/highlights.scm
new file mode 100644
index 000000000..a036368a1
--- /dev/null
+++ b/runtime/queries/janet/highlights.scm
@@ -0,0 +1 @@
+; inherits: clojure

From 11856329bf39cebf34c367bae6bc879b52f8d5e9 Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Fri, 15 Dec 2023 01:54:43 -0500
Subject: [PATCH 543/967] Change R markdown language name to fix language
 server detection (#9012)

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

diff --git a/languages.toml b/languages.toml
index 2c2bfc612..e184c8934 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1668,6 +1668,7 @@ source = { git = "https://github.com/r-lib/tree-sitter-r", rev = "cc04302e1bff76
 [[language]]
 name = "rmarkdown"
 scope = "source.rmd"
+language-id = "rmd"
 injection-regex = "(r|R)md"
 file-types = ["rmd", "Rmd"]
 indent = { tab-width = 2, unit = "  " }

From f1e34ce5a2214a3f44f021aea1546ba1b7376f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Gonz=C3=A1lez?= <ito123456789@gmail.com>
Date: Fri, 15 Dec 2023 03:54:59 -0300
Subject: [PATCH 544/967] Specify BG and FG cursor colors in Darcula themes
 (#9002)

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

diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index 495463744..b704d60ee 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -15,7 +15,7 @@
 "ui.statusline.select" = { bg = "orange", fg = "grey01" }
 "ui.help" = { fg = "grey04", bg = "grey01" }
 "ui.cursor" = { fg = "grey04", modifiers = ["reversed"] }
-"ui.cursor.primary" = { fg = "grey05", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "grey02", bg = "grey05" }
 "ui.cursor.match" = { fg = "white", modifiers = ["underlined"] }
 "ui.cursorline.primary" = { bg = "grey02" }
 "ui.cursorline.secondary" = { bg = "grey02" }

From e332c7d87545daea9d37fabda5f4a705e7a2dd80 Mon Sep 17 00:00:00 2001
From: JR <jerabaul29@users.noreply.github.com>
Date: Fri, 15 Dec 2023 07:57:28 +0100
Subject: [PATCH 545/967] Add tutor for match mode (#8751)

* Add tutor for match mode

* Improve the surround tutor

* Add missing == in header

* Reflow

* 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>

* Apply feedback

---------

Co-authored-by: David Else <12832280+David-Else@users.noreply.github.com>
---
 runtime/tutor | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/runtime/tutor b/runtime/tutor
index a781b5fe6..5892be85f 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -1186,6 +1186,160 @@ multiple cursors, they won't be uncommented but commented again.
 
 
 
+=================================================================
+=                   12.1 USING MATCH MODE JUMP                  =
+=================================================================
+
+To switch to match mode from normal mode, type m. This feature
+is particularly useful for handling bracket pairs and their
+contents.
+
+There are several actions that can be performed in match mode,
+as indicated by the help pop-up. To jump to a matching bracket pair,
+simply press mm. For example on the lines below (starting with
+-->), move the cursor in normal mode to (, and then press mm to jump
+to the matching ). You can do the same on the line below: for example
+move to ], and press mm to jump to [ .
+
+--> you can (jump between matching parenthesis)
+--> or between matching [ square brackets ]
+--> now { you know the drill: this works with brackets too }
+
+
+
+
+=================================================================
+=                   12.2 USING MATCH MODE SELECT INSIDE         =
+=================================================================
+
+Match mode also lets you select the "inside" content between a
+pair of brackets or other delimiters. In the lines below:
+
+- move to the --> line, put your cursor in normal mode at any
+location between the parenthesis, for example at 'x', and press
+mi( or mi) to select the whole content inside the parenthesis
+(parenthesis excluded). As usual, you can then do anything you want
+with the selection (for example, press c to change it)
+
+--> outside and (inside x parenthesis) - and outside again
+
+Test below that you can do the same with [], or {}, or with
+nested combinations of these (this will act on the immediately
+surrounding matching pair). This also works with "" and similar
+
+--> test [ with square brackets ] !
+--> try ( with nested [ pairs of ( parenthesis) and "brackets" ])
+
+=================================================================
+=                   12.3 USING MATCH MODE SELECT AROUND         =
+=================================================================
+
+You can also select the "around" content, i.e. both the inside
+content and the delimiters themselves, by using the ma select.
+For example, move to the line under, move your cursor in normal
+mode to any position between the (), and select the content of
+the (), including the surrounding (), by typing ma( or ma). As
+usual, you can do anything you want with the selection, for
+example delete it all with ma(d .
+
+--> you ( select x around ) to include delimiters in the select
+
+This naturally works with other delimiters too:
+
+--> try [ with 'square' brackets ] too!
+
+
+
+
+
+=================================================================
+=                   12.4 USING MATCH MODE SURROUND              =
+=================================================================
+
+The match mode can also be used to add surrounding around the
+current selection. For example, move to the line below, then:
+ * i) select the "select all of this" line segment (for example,
+move in normal mode the cursor to the start of select, then enter
+selection mode with v , then select the 4 next words with 4e ),
+ * ii) press ms( or ms) to surround the selection with a pair of
+parenthesis.
+
+--> so, select all of this, and surround it with ()
+
+You can do the same with other delimiters: for example, ms' on
+WORD below to surround it with a pair of ''. You can try also
+with adding a surrounding pair of "", or {}, or [].
+
+--> surround this WORD !
+
+
+
+=================================================================
+=                   12.5 USING MATCH MODE DELETE SURROUND       =
+=================================================================
+
+You can delete surrounding pair of delimiters with the md
+command. On the line below, move the cursor anywhere
+within the pair of (), for example to the 'x', then from there,
+in normal mode, press md( or md) to delete the surrounding
+pair of parenthesis.
+
+--> delete (the x pair of parenthesis) from within!
+
+You can naturally delete other kinds of surroundings:
+
+--> delete (nested [delimiters]): "this" will delete the nearest
+matching surrounding pair.
+--> delete "layers "of" quote marks" too: this will delete the
+nearest previous and following quote marks
+
+Trying to delete unexisting surrounding delimiters print an error
+at the bottom bar and does nothing.
+
+=================================================================
+=                   12.6 USING MATCH MODE REPLACE SURROUND      =
+=================================================================
+
+You can replace surrounding pairs of delimiters with the mr
+command. On the line below, move the cursor to
+anywhere within the pair of (), for example on the 'x', then in
+normal mode, press mr([ to replace the pair of () with a pair
+of [].
+
+--> replace the (pair from x within), with something else
+
+This command will act on the closest enclosing pair, so you
+can try replacing different surrounding in the following:
+
+--> some (nested surroundings [can be replaced])
+--> this "works with 'other surroundings' too"
+
+You can try to replace a non existing pair: this will show
+an error warning at the bottom bar and do nothing.
+
+
+=================================================================
+=                     CHAPTER 12 RECAP                       =
+=================================================================
+
+You can enter the match mode with the m key; this will show the
+actions available in a popup. This will allow you to:
+ * jump to matching pair of delimiters with mm (you must have a
+ delimiter belonging to a pair under your cursor)
+ * select inside a pair of delimiters surrounding your cursor
+ (i.e. select the content but not the delimiters) with mi(
+ and similar
+ * select around a pair of delimiters surrounding your cursor
+ (i.e. select the content and the delimiters) with ma( and
+ similar
+ * delete surrounding delimiters with md( and similar
+ * add surrounding delimiters around the selection with ms(
+ * replace a pair of delimiters surrounding your selection with
+ mr([ to replace for example surrounding () with []
+
+
+
+
 =================================================================
  This tutorial is still a work-in-progress.
  More sections are planned.

From 23fd145a56260293072622c4d64482fc6447af7c Mon Sep 17 00:00:00 2001
From: Susheel Thapa <sushilthapa9844242743@gmail.com>
Date: Fri, 15 Dec 2023 12:43:27 +0545
Subject: [PATCH 546/967] fix: typo in scm files inside runtime/queries/
 (#8630)

---
 runtime/queries/_typescript/highlights.scm | 6 +++---
 runtime/queries/yuck/highlights.scm        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/queries/_typescript/highlights.scm b/runtime/queries/_typescript/highlights.scm
index f9a672667..45c98ba82 100644
--- a/runtime/queries/_typescript/highlights.scm
+++ b/runtime/queries/_typescript/highlights.scm
@@ -39,11 +39,11 @@
     (identifier) @variable.parameter))
 
 ; (p?: t)
-; (p?: t = 1) // Invalid but still posible to hihglight.
+; (p?: t = 1) // Invalid but still possible to highlight.
 (optional_parameter 
   (identifier) @variable.parameter)
 
-; (...p?: t) // Invalid but still posible to hihglight.
+; (...p?: t) // Invalid but still possible to highlight.
 (optional_parameter
   (rest_pattern
     (identifier) @variable.parameter))
@@ -59,7 +59,7 @@
     (pair_pattern
       value: (identifier) @variable.parameter)))
 
-; ([ p ]?: t[]) // Invalid but still posible to hihglight.
+; ([ p ]?: t[]) // Invalid but still possible to highlight.
 (optional_parameter
   (array_pattern
     (identifier) @variable.parameter))
diff --git a/runtime/queries/yuck/highlights.scm b/runtime/queries/yuck/highlights.scm
index 9f116f153..70de4cbe6 100644
--- a/runtime/queries/yuck/highlights.scm
+++ b/runtime/queries/yuck/highlights.scm
@@ -101,7 +101,7 @@
 (list
   (symbol) @tag)
 
-; Other stuff that has not been catched by the previous queries yet
+; Other stuff that has not been caught by the previous queries yet
 
 (ident) @variable
 (index) @variable

From d29a66f267afd79f83c0ddc2e483bfb407f4ed98 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Sat, 16 Sep 2023 18:22:46 +0200
Subject: [PATCH 547/967] Implement relative indent queries, i.e. also take
 into account the indentation of a previous line when computing the
 indentation for a new line.

---
 helix-core/src/indent.rs   | 294 ++++++++++++++++++++++++++-----------
 helix-core/tests/indent.rs |   4 +-
 2 files changed, 213 insertions(+), 85 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index abf45d6fa..8dfc1f1ef 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -4,6 +4,7 @@ use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
 
 use crate::{
     chars::{char_is_line_ending, char_is_whitespace},
+    find_first_non_whitespace_char,
     graphemes::{grapheme_width, tab_width_at},
     syntax::{LanguageConfiguration, RopeProvider, Syntax},
     tree_sitter::Node,
@@ -196,6 +197,19 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
     len / indent_width
 }
 
+/// Create a string of tabs & spaces that has the same visual width as the given RopeSlice (independent of the tab width).
+fn whitespace_with_same_width(text: RopeSlice) -> String {
+    let mut s = String::new();
+    for grapheme in RopeGraphemes::new(text) {
+        if grapheme == "\t" {
+            s.push('\t');
+        } else {
+            s.extend(std::iter::repeat(' ').take(grapheme_width(&Cow::from(grapheme))));
+        }
+    }
+    s
+}
+
 /// Computes for node and all ancestors whether they are the first node on their line.
 /// The first entry in the return value represents the root node, the last one the node itself
 fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
@@ -241,21 +255,21 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
 /// - max(0, indent - outdent) tabs, if tabs are used for indentation
 /// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
 #[derive(Default, Debug, PartialEq, Eq, Clone)]
-pub struct Indentation {
+pub struct Indentation<'a> {
     indent: usize,
     indent_always: usize,
     outdent: usize,
     outdent_always: usize,
     /// The alignment, as a string containing only tabs & spaces. Storing this as a string instead of e.g.
     /// the (visual) width ensures that the alignment is preserved even if the tab width changes.
-    align: Option<String>,
+    align: Option<RopeSlice<'a>>,
 }
 
-impl Indentation {
+impl<'a> Indentation<'a> {
     /// Add some other [Indentation] to this.
     /// The added indent should be the total added indent from one line.
     /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).
-    fn add_line(&mut self, added: Indentation) {
+    fn add_line(&mut self, added: Indentation<'a>) {
         // Align overrides the indent from outer scopes.
         if self.align.is_some() {
             return;
@@ -274,7 +288,7 @@ impl Indentation {
     /// Only captures that apply to the same line should be added together in this way (otherwise use `add_line`)
     /// and the captures should be added starting from the innermost tree-sitter node (currently this only matters
     /// if multiple `@align` patterns occur on the same line).
-    fn add_capture(&mut self, added: IndentCaptureType) {
+    fn add_capture(&mut self, added: IndentCaptureType<'a>) {
         match added {
             IndentCaptureType::Indent => {
                 if self.indent_always == 0 {
@@ -303,7 +317,60 @@ impl Indentation {
             }
         }
     }
-    fn into_string(self, indent_style: &IndentStyle) -> String {
+    fn net_indent(&self) -> isize {
+        (self.indent + self.indent_always) as isize
+            - ((self.outdent + self.outdent_always) as isize)
+    }
+    /// Convert `self` into a string, taking into account the computed and actual indentation of some other line.
+    fn relative_indent(
+        &self,
+        other_computed_indent: &Self,
+        other_leading_whitespace: RopeSlice,
+        indent_style: &IndentStyle,
+        tab_width: usize,
+    ) -> Option<String> {
+        if self.align == other_computed_indent.align {
+            // If self and baseline are either not aligned to anything or both aligned the same way,
+            // we can simply take `other_leading_whitespace` and add some indent / outdent to it (in the second
+            // case, the alignment should already be accounted for in `other_leading_whitespace`).
+            let indent_diff = self.net_indent() - other_computed_indent.net_indent();
+            if indent_diff >= 0 {
+                let mut indent = other_leading_whitespace.to_string();
+                indent.push_str(&indent_style.as_str().repeat(indent_diff as usize));
+                Some(indent)
+            } else {
+                // It's not entirely clear how to subtract a given indent level from the other line if its indentation is
+                // complex (e.g. a weird alignment or a mixture of tabs and spaces). Therefore, we only consider the indent level
+                // of `baseline_leading_whitespace`, add `indent_diff` to it and convert this indent level back to a string. If we ever encounter
+                // cases where some other behavior is expected, the behavior for strings that don't exactly correspond to some indent
+                // level could be re-evaluated.
+                let actual_baseline_indent_level = indent_level_for_line(
+                    other_leading_whitespace,
+                    tab_width,
+                    indent_style.indent_width(tab_width),
+                );
+                let total_indent = actual_baseline_indent_level as isize + indent_diff;
+                if total_indent < 0 {
+                    log::warn!(
+                        "Computed negative indent during a relative indent computation (actual baseline indent: {}, computed baseline indent: {}, computed line indent: {})",
+                        actual_baseline_indent_level,
+                        other_computed_indent.net_indent(),
+                        self.net_indent(),
+                    );
+                    Some(String::new())
+                } else {
+                    Some(indent_style.as_str().repeat(total_indent as usize))
+                }
+            }
+        } else if self.align.is_some() {
+            Some(self.to_string(indent_style))
+        } else {
+            // If the other line has some alignment and `self` does not, there is no reasonable way to take
+            // into account `other_leading_whitespace`.
+            None
+        }
+    }
+    pub fn to_string(&self, indent_style: &IndentStyle) -> String {
         let indent = self.indent_always + self.indent;
         let outdent = self.outdent_always + self.outdent;
 
@@ -314,7 +381,7 @@ impl Indentation {
             0
         };
         let mut indent_string = if let Some(align) = self.align {
-            align
+            whitespace_with_same_width(align)
         } else {
             String::new()
         };
@@ -325,21 +392,21 @@ impl Indentation {
 
 /// An indent definition which corresponds to a capture from the indent query
 #[derive(Debug)]
-struct IndentCapture {
-    capture_type: IndentCaptureType,
+struct IndentCapture<'a> {
+    capture_type: IndentCaptureType<'a>,
     scope: IndentScope,
 }
 #[derive(Debug, Clone, PartialEq)]
-enum IndentCaptureType {
+enum IndentCaptureType<'a> {
     Indent,
     IndentAlways,
     Outdent,
     OutdentAlways,
     /// Alignment given as a string of whitespace
-    Align(String),
+    Align(RopeSlice<'a>),
 }
 
-impl IndentCaptureType {
+impl<'a> IndentCaptureType<'a> {
     fn default_scope(&self) -> IndentScope {
         match self {
             IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
@@ -371,8 +438,8 @@ enum ExtendCapture {
 /// each node (identified by its ID) the relevant captures (already filtered
 /// by predicates).
 #[derive(Debug)]
-struct IndentQueryResult {
-    indent_captures: HashMap<usize, Vec<IndentCapture>>,
+struct IndentQueryResult<'a> {
+    indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,
     extend_captures: HashMap<usize, Vec<ExtendCapture>>,
 }
 
@@ -393,14 +460,14 @@ fn get_node_end_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
     node_line
 }
 
-fn query_indents(
+fn query_indents<'a>(
     query: &Query,
     syntax: &Syntax,
     cursor: &mut QueryCursor,
-    text: RopeSlice,
+    text: RopeSlice<'a>,
     range: std::ops::Range<usize>,
     new_line_byte_pos: Option<usize>,
-) -> IndentQueryResult {
+) -> IndentQueryResult<'a> {
     let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
     let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
     cursor.set_byte_range(range);
@@ -488,7 +555,7 @@ fn query_indents(
                 "outdent" => IndentCaptureType::Outdent,
                 "outdent.always" => IndentCaptureType::OutdentAlways,
                 // The alignment will be updated to the correct value at the end, when the anchor is known.
-                "align" => IndentCaptureType::Align(String::from("")),
+                "align" => IndentCaptureType::Align(RopeSlice::from("")),
                 "anchor" => {
                     if anchor.is_some() {
                         log::error!("Invalid indent query: Encountered more than one @anchor in the same match.")
@@ -560,22 +627,10 @@ fn query_indents(
                     }
                     Some(anchor) => anchor,
                 };
-                // Create a string of tabs & spaces that should have the same width
-                // as the string that precedes the anchor (independent of the tab width).
-                let mut align = String::new();
-                for grapheme in RopeGraphemes::new(
+                capture.capture_type = IndentCaptureType::Align(
                     text.line(anchor.start_position().row)
                         .byte_slice(0..anchor.start_position().column),
-                ) {
-                    if grapheme == "\t" {
-                        align.push('\t');
-                    } else {
-                        align.extend(
-                            std::iter::repeat(' ').take(grapheme_width(&Cow::from(grapheme))),
-                        );
-                    }
-                }
-                capture.capture_type = IndentCaptureType::Align(align);
+                );
             }
             indent_captures
                 .entry(node_id)
@@ -661,56 +716,20 @@ fn extend_nodes<'a>(
     }
 }
 
-/// Use the syntax tree to determine the indentation for a given position.
-/// This can be used in 2 ways:
-///
-/// - To get the correct indentation for an existing line (new_line=false), not necessarily equal to the current indentation.
-///   - In this case, pos should be inside the first tree-sitter node on that line.
-///     In most cases, this can just be the first non-whitespace on that line.
-///   - To get the indentation for a new line (new_line=true). This behaves like the first usecase if the part of the current line
-///     after pos were moved to a new line.
-///
-/// The indentation is determined by traversing all the tree-sitter nodes containing the position.
-/// Each of these nodes produces some [Indentation] for:
-///
-/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
-/// - The line after the node. This is defined by:
-///   - The scope `tail`.
-///   - The scope `all` if this node is not the first node on its line.
-/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
-/// The indents from different nodes for the same line are then combined.
-/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
-///
-/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
-/// ```ignore
-/// some_function(|| {
-///     // Both the function parameters as well as the contained block should be indented.
-///     // Because they are on the same line, this only yields one indent level
-/// });
-/// ```
-///
-/// ```ignore
-/// some_function(
-///     param1,
-///     || {
-///         // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines
-///     },
-/// );
-/// ```
+/// Prepare an indent query by computing:
+/// - The node from which to start the query (this is non-trivial due to `@extend` captures)
+/// - The indent captures for all relevant nodes.
 #[allow(clippy::too_many_arguments)]
-pub fn treesitter_indent_for_pos(
+fn init_indent_query<'a, 'b>(
     query: &Query,
-    syntax: &Syntax,
-    indent_style: &IndentStyle,
+    syntax: &'a Syntax,
+    text: RopeSlice<'b>,
     tab_width: usize,
     indent_width: usize,
-    text: RopeSlice,
     line: usize,
-    pos: usize,
-    new_line: bool,
-) -> Option<String> {
-    let byte_pos = text.char_to_byte(pos);
-    let new_line_byte_pos = new_line.then_some(byte_pos);
+    byte_pos: usize,
+    new_line_byte_pos: Option<usize>,
+) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {
     // The innermost tree-sitter node which is considered for the indent
     // computation. It may change if some predeceding node is extended
     let mut node = syntax
@@ -754,7 +773,6 @@ pub fn treesitter_indent_for_pos(
             (query_result, deepest_preceding)
         })
     };
-    let mut indent_captures = query_result.indent_captures;
     let extend_captures = query_result.extend_captures;
 
     // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -769,6 +787,68 @@ pub fn treesitter_indent_for_pos(
             indent_width,
         );
     }
+    Some((node, query_result.indent_captures))
+}
+
+/// Use the syntax tree to determine the indentation for a given position.
+/// This can be used in 2 ways:
+///
+/// - To get the correct indentation for an existing line (new_line=false), not necessarily equal to the current indentation.
+///   - In this case, pos should be inside the first tree-sitter node on that line.
+///     In most cases, this can just be the first non-whitespace on that line.
+///   - To get the indentation for a new line (new_line=true). This behaves like the first usecase if the part of the current line
+///     after pos were moved to a new line.
+///
+/// The indentation is determined by traversing all the tree-sitter nodes containing the position.
+/// Each of these nodes produces some [Indentation] for:
+///
+/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
+/// - The line after the node. This is defined by:
+///   - The scope `tail`.
+///   - The scope `all` if this node is not the first node on its line.
+/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
+/// The indents from different nodes for the same line are then combined.
+/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
+///
+/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
+/// ```ignore
+/// some_function(|| {
+///     // Both the function parameters as well as the contained block should be indented.
+///     // Because they are on the same line, this only yields one indent level
+/// });
+/// ```
+///
+/// ```ignore
+/// some_function(
+///     param1,
+///     || {
+///         // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines
+///     },
+/// );
+/// ```
+#[allow(clippy::too_many_arguments)]
+pub fn treesitter_indent_for_pos<'a>(
+    query: &Query,
+    syntax: &Syntax,
+    tab_width: usize,
+    indent_width: usize,
+    text: RopeSlice<'a>,
+    line: usize,
+    pos: usize,
+    new_line: bool,
+) -> Option<Indentation<'a>> {
+    let byte_pos = text.char_to_byte(pos);
+    let new_line_byte_pos = new_line.then_some(byte_pos);
+    let (mut node, mut indent_captures) = init_indent_query(
+        query,
+        syntax,
+        text,
+        tab_width,
+        indent_width,
+        line,
+        byte_pos,
+        new_line_byte_pos,
+    )?;
     let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
 
     let mut result = Indentation::default();
@@ -836,7 +916,7 @@ pub fn treesitter_indent_for_pos(
             break;
         }
     }
-    Some(result.into_string(indent_style))
+    Some(result)
 }
 
 /// Returns the indentation for a new line.
@@ -860,7 +940,6 @@ pub fn indent_for_newline(
         if let Some(indent) = treesitter_indent_for_pos(
             query,
             syntax,
-            indent_style,
             tab_width,
             indent_width,
             text,
@@ -868,9 +947,55 @@ pub fn indent_for_newline(
             line_before_end_pos,
             true,
         ) {
-            return indent;
+            // We want to compute the indentation not only based on the
+            // syntax tree but also on the actual indentation of a previous
+            // line. This makes indentation computation more resilient to
+            // incomplete queries, incomplete source code & differing indentation
+            // styles for the same language.
+            // However, using the indent of a previous line as a baseline may not
+            // make sense, e.g. if it has a different alignment than the new line.
+            // In order to prevent edge cases with long running times, we only try
+            // a constant number of (non-empty) lines.
+            const MAX_ATTEMPTS: usize = 2;
+            let mut num_attempts = 0;
+            for line_idx in (0..=line_before).rev() {
+                let line = text.line(line_idx);
+                let first_non_whitespace_char = match find_first_non_whitespace_char(line) {
+                    Some(i) => i,
+                    None => {
+                        continue;
+                    }
+                };
+                if let Some(indent) = (|| {
+                    let computed_indent = treesitter_indent_for_pos(
+                        query,
+                        syntax,
+                        tab_width,
+                        indent_width,
+                        text,
+                        line_idx,
+                        text.line_to_char(line_idx) + first_non_whitespace_char,
+                        false,
+                    )?;
+                    let leading_whitespace = line.slice(0..first_non_whitespace_char);
+                    indent.relative_indent(
+                        &computed_indent,
+                        leading_whitespace,
+                        indent_style,
+                        tab_width,
+                    )
+                })() {
+                    return indent;
+                }
+                num_attempts += 1;
+                if num_attempts == MAX_ATTEMPTS {
+                    break;
+                }
+            }
+            return indent.to_string(indent_style);
         };
     }
+    // Fallback in case we either don't have indent queries or they failed for some reason
     let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
     indent_style.as_str().repeat(indent_level)
 }
@@ -962,10 +1087,13 @@ mod test {
             ..Default::default()
         };
 
-        let add_capture = |mut indent: Indentation, capture| {
+        fn add_capture<'a>(
+            mut indent: Indentation<'a>,
+            capture: IndentCaptureType<'a>,
+        ) -> Indentation<'a> {
             indent.add_capture(capture);
             indent
-        };
+        }
 
         // adding an indent to no indent makes an indent
         assert_eq!(
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index 26010c906..cd96fcff8 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -210,7 +210,6 @@ fn test_treesitter_indent(
             let suggested_indent = treesitter_indent_for_pos(
                 indent_query,
                 &syntax,
-                &indent_style,
                 tab_width,
                 indent_style.indent_width(tab_width),
                 text,
@@ -218,7 +217,8 @@ fn test_treesitter_indent(
                 text.line_to_char(i) + pos,
                 false,
             )
-            .unwrap();
+            .unwrap()
+            .to_string(&indent_style);
             assert!(
                 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
                 "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",

From 559bfc1f5ef1bd43fd94325c0363058e32c76df4 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Sun, 17 Sep 2023 17:34:23 +0200
Subject: [PATCH 548/967] Improve relative indent computation. Add tests to
 ensure that relative & absolute indent computation are consistent.

---
 helix-core/src/indent.rs   | 176 ++++++++++++++++++++++++++-----------
 helix-core/tests/indent.rs |   2 +-
 2 files changed, 127 insertions(+), 51 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 8dfc1f1ef..dfb33939d 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -210,6 +210,46 @@ fn whitespace_with_same_width(text: RopeSlice) -> String {
     s
 }
 
+fn add_indent_level(
+    mut base_indent: String,
+    added_indent_level: isize,
+    indent_style: &IndentStyle,
+    tab_width: usize,
+) -> String {
+    if added_indent_level >= 0 {
+        // Adding a non-negative indent is easy, we can simply append the indent string
+        base_indent.push_str(&indent_style.as_str().repeat(added_indent_level as usize));
+        base_indent
+    } else {
+        // In this case, we want to return a prefix of `base_indent`.
+        // Since the width of a tab depends on its offset, we cannot simply iterate over
+        // the chars of `base_indent` in reverse until we have the desired indent reduction,
+        // instead we iterate over them twice in forward direction.
+        let mut base_indent_width: usize = 0;
+        for c in base_indent.chars() {
+            base_indent_width += match c {
+                '\t' => tab_width_at(base_indent_width, tab_width as u16),
+                // This is only true since `base_indent` consists only of tabs and spaces
+                _ => 1,
+            };
+        }
+        let target_indent_width = base_indent_width
+            .saturating_sub((-added_indent_level) as usize * indent_style.indent_width(tab_width));
+        let mut reduced_indent_width = 0;
+        for (i, c) in base_indent.char_indices() {
+            if reduced_indent_width >= target_indent_width {
+                base_indent.truncate(i);
+                return base_indent;
+            }
+            reduced_indent_width += match c {
+                '\t' => tab_width_at(base_indent_width, tab_width as u16),
+                _ => 1,
+            };
+        }
+        base_indent
+    }
+}
+
 /// Computes for node and all ancestors whether they are the first node on their line.
 /// The first entry in the return value represents the root node, the last one the node itself
 fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
@@ -334,59 +374,25 @@ impl<'a> Indentation<'a> {
             // we can simply take `other_leading_whitespace` and add some indent / outdent to it (in the second
             // case, the alignment should already be accounted for in `other_leading_whitespace`).
             let indent_diff = self.net_indent() - other_computed_indent.net_indent();
-            if indent_diff >= 0 {
-                let mut indent = other_leading_whitespace.to_string();
-                indent.push_str(&indent_style.as_str().repeat(indent_diff as usize));
-                Some(indent)
-            } else {
-                // It's not entirely clear how to subtract a given indent level from the other line if its indentation is
-                // complex (e.g. a weird alignment or a mixture of tabs and spaces). Therefore, we only consider the indent level
-                // of `baseline_leading_whitespace`, add `indent_diff` to it and convert this indent level back to a string. If we ever encounter
-                // cases where some other behavior is expected, the behavior for strings that don't exactly correspond to some indent
-                // level could be re-evaluated.
-                let actual_baseline_indent_level = indent_level_for_line(
-                    other_leading_whitespace,
-                    tab_width,
-                    indent_style.indent_width(tab_width),
-                );
-                let total_indent = actual_baseline_indent_level as isize + indent_diff;
-                if total_indent < 0 {
-                    log::warn!(
-                        "Computed negative indent during a relative indent computation (actual baseline indent: {}, computed baseline indent: {}, computed line indent: {})",
-                        actual_baseline_indent_level,
-                        other_computed_indent.net_indent(),
-                        self.net_indent(),
-                    );
-                    Some(String::new())
-                } else {
-                    Some(indent_style.as_str().repeat(total_indent as usize))
-                }
-            }
-        } else if self.align.is_some() {
-            Some(self.to_string(indent_style))
+            Some(add_indent_level(
+                String::from(other_leading_whitespace),
+                indent_diff,
+                indent_style,
+                tab_width,
+            ))
         } else {
-            // If the other line has some alignment and `self` does not, there is no reasonable way to take
-            // into account `other_leading_whitespace`.
+            // If the alignment of both lines is different, we cannot compare their indentation in any meaningful way
             None
         }
     }
-    pub fn to_string(&self, indent_style: &IndentStyle) -> String {
-        let indent = self.indent_always + self.indent;
-        let outdent = self.outdent_always + self.outdent;
-
-        let indent_level = if indent >= outdent {
-            indent - outdent
-        } else {
-            log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
-            0
-        };
-        let mut indent_string = if let Some(align) = self.align {
-            whitespace_with_same_width(align)
-        } else {
-            String::new()
-        };
-        indent_string.push_str(&indent_style.as_str().repeat(indent_level));
-        indent_string
+    pub fn to_string(&self, indent_style: &IndentStyle, tab_width: usize) -> String {
+        add_indent_level(
+            self.align
+                .map_or_else(String::new, whitespace_with_same_width),
+            self.net_indent(),
+            indent_style,
+            tab_width,
+        )
     }
 }
 
@@ -992,7 +998,7 @@ pub fn indent_for_newline(
                     break;
                 }
             }
-            return indent.to_string(indent_style);
+            return indent.to_string(indent_style, tab_width);
         };
     }
     // Fallback in case we either don't have indent queries or they failed for some reason
@@ -1188,4 +1194,74 @@ mod test {
             )
         );
     }
+
+    #[test]
+    fn test_relative_indent() {
+        let indent_style = IndentStyle::Spaces(4);
+        let tab_width: usize = 4;
+        let no_align = [
+            Indentation::default(),
+            Indentation {
+                indent: 1,
+                ..Default::default()
+            },
+            Indentation {
+                indent: 5,
+                outdent: 1,
+                ..Default::default()
+            },
+        ];
+        let align = no_align.clone().map(|indent| Indentation {
+            align: Some(RopeSlice::from("12345")),
+            ..indent
+        });
+        let different_align = Indentation {
+            align: Some(RopeSlice::from("123456")),
+            ..Default::default()
+        };
+
+        // Check that relative and absolute indentation computation are the same when the line we compare to is
+        // indented as we expect.
+        let check_consistency = |indent: &Indentation, other: &Indentation| {
+            assert_eq!(
+                indent.relative_indent(
+                    other,
+                    RopeSlice::from(other.to_string(&indent_style, tab_width).as_str()),
+                    &indent_style,
+                    tab_width
+                ),
+                Some(indent.to_string(&indent_style, tab_width))
+            );
+        };
+        for a in &no_align {
+            for b in &no_align {
+                check_consistency(a, b);
+            }
+        }
+        for a in &align {
+            for b in &align {
+                check_consistency(a, b);
+            }
+        }
+
+        // Relative indent computation makes no sense if the alignment differs
+        assert_eq!(
+            align[0].relative_indent(
+                &no_align[0],
+                RopeSlice::from("      "),
+                &indent_style,
+                tab_width
+            ),
+            None
+        );
+        assert_eq!(
+            align[0].relative_indent(
+                &different_align,
+                RopeSlice::from("      "),
+                &indent_style,
+                tab_width
+            ),
+            None
+        );
+    }
 }
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index cd96fcff8..faf845c07 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -218,7 +218,7 @@ fn test_treesitter_indent(
                 false,
             )
             .unwrap()
-            .to_string(&indent_style);
+            .to_string(&indent_style, tab_width);
             assert!(
                 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
                 "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",

From 938a710904ae6d328d4008626d98acb9e907813a Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Tue, 19 Sep 2023 15:31:38 +0200
Subject: [PATCH 549/967] Make the indent heuristic configurable

---
 helix-core/src/indent.rs   | 96 +++++++++++++++++++++-----------------
 helix-core/src/syntax.rs   | 16 +++++++
 helix-term/src/commands.rs |  3 ++
 helix-view/src/editor.rs   |  6 ++-
 4 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index dfb33939d..26186ee83 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -6,7 +6,7 @@ use crate::{
     chars::{char_is_line_ending, char_is_whitespace},
     find_first_non_whitespace_char,
     graphemes::{grapheme_width, tab_width_at},
-    syntax::{LanguageConfiguration, RopeProvider, Syntax},
+    syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
     tree_sitter::Node,
     Rope, RopeGraphemes, RopeSlice,
 };
@@ -931,6 +931,7 @@ pub fn treesitter_indent_for_pos<'a>(
 pub fn indent_for_newline(
     language_config: Option<&LanguageConfiguration>,
     syntax: Option<&Syntax>,
+    indent_heuristic: &IndentationHeuristic,
     indent_style: &IndentStyle,
     tab_width: usize,
     text: RopeSlice,
@@ -939,7 +940,12 @@ pub fn indent_for_newline(
     current_line: usize,
 ) -> String {
     let indent_width = indent_style.indent_width(tab_width);
-    if let (Some(query), Some(syntax)) = (
+    if let (
+        IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,
+        Some(query),
+        Some(syntax),
+    ) = (
+        indent_heuristic,
         language_config.and_then(|config| config.indent_query()),
         syntax,
     ) {
@@ -953,49 +959,51 @@ pub fn indent_for_newline(
             line_before_end_pos,
             true,
         ) {
-            // We want to compute the indentation not only based on the
-            // syntax tree but also on the actual indentation of a previous
-            // line. This makes indentation computation more resilient to
-            // incomplete queries, incomplete source code & differing indentation
-            // styles for the same language.
-            // However, using the indent of a previous line as a baseline may not
-            // make sense, e.g. if it has a different alignment than the new line.
-            // In order to prevent edge cases with long running times, we only try
-            // a constant number of (non-empty) lines.
-            const MAX_ATTEMPTS: usize = 2;
-            let mut num_attempts = 0;
-            for line_idx in (0..=line_before).rev() {
-                let line = text.line(line_idx);
-                let first_non_whitespace_char = match find_first_non_whitespace_char(line) {
-                    Some(i) => i,
-                    None => {
-                        continue;
+            if let IndentationHeuristic::Hybrid = indent_heuristic {
+                // We want to compute the indentation not only based on the
+                // syntax tree but also on the actual indentation of a previous
+                // line. This makes indentation computation more resilient to
+                // incomplete queries, incomplete source code & differing indentation
+                // styles for the same language.
+                // However, using the indent of a previous line as a baseline may not
+                // make sense, e.g. if it has a different alignment than the new line.
+                // In order to prevent edge cases with long running times, we only try
+                // a constant number of (non-empty) lines.
+                const MAX_ATTEMPTS: usize = 2;
+                let mut num_attempts = 0;
+                for line_idx in (0..=line_before).rev() {
+                    let line = text.line(line_idx);
+                    let first_non_whitespace_char = match find_first_non_whitespace_char(line) {
+                        Some(i) => i,
+                        None => {
+                            continue;
+                        }
+                    };
+                    if let Some(indent) = (|| {
+                        let computed_indent = treesitter_indent_for_pos(
+                            query,
+                            syntax,
+                            tab_width,
+                            indent_width,
+                            text,
+                            line_idx,
+                            text.line_to_char(line_idx) + first_non_whitespace_char,
+                            false,
+                        )?;
+                        let leading_whitespace = line.slice(0..first_non_whitespace_char);
+                        indent.relative_indent(
+                            &computed_indent,
+                            leading_whitespace,
+                            indent_style,
+                            tab_width,
+                        )
+                    })() {
+                        return indent;
+                    }
+                    num_attempts += 1;
+                    if num_attempts == MAX_ATTEMPTS {
+                        break;
                     }
-                };
-                if let Some(indent) = (|| {
-                    let computed_indent = treesitter_indent_for_pos(
-                        query,
-                        syntax,
-                        tab_width,
-                        indent_width,
-                        text,
-                        line_idx,
-                        text.line_to_char(line_idx) + first_non_whitespace_char,
-                        false,
-                    )?;
-                    let leading_whitespace = line.slice(0..first_non_whitespace_char);
-                    indent.relative_indent(
-                        &computed_indent,
-                        leading_whitespace,
-                        indent_style,
-                        tab_width,
-                    )
-                })() {
-                    return indent;
-                }
-                num_attempts += 1;
-                if num_attempts == MAX_ATTEMPTS {
-                    break;
                 }
             }
             return indent.to_string(indent_style, tab_width);
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 8c7fc4e15..dd9223160 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -442,6 +442,22 @@ pub struct IndentationConfiguration {
     pub unit: String,
 }
 
+/// How the indentation for a newly inserted line should be determined.
+/// If the selected heuristic is not available (e.g. because the current
+/// language has no tree-sitter indent queries), a simpler one will be used.
+#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum IndentationHeuristic {
+    /// Just copy the indentation of the line that the cursor is currently on.
+    Simple,
+    /// Use tree-sitter indent queries to compute the expected absolute indentation level of the new line.
+    TreeSitter,
+    /// Use tree-sitter indent queries to compute the expected difference in indentation between the new line
+    /// and the line before. Add this to the actual indentation level of the line before.
+    #[default]
+    Hybrid,
+}
+
 /// Configuration for auto pairs
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e557977ad..1b8f9e1f5 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3053,6 +3053,7 @@ fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
             let indent = indent::indent_for_newline(
                 language_config,
                 syntax,
+                &doc.config.load().indent_heuristic,
                 &doc.indent_style,
                 tab_width,
                 text,
@@ -3181,6 +3182,7 @@ fn open(cx: &mut Context, open: Open) {
         let indent = indent::indent_for_newline(
             doc.language_config(),
             doc.syntax(),
+            &doc.config.load().indent_heuristic,
             &doc.indent_style,
             doc.tab_width(),
             text,
@@ -3720,6 +3722,7 @@ pub mod insert {
                 let indent = indent::indent_for_newline(
                     doc.language_config(),
                     doc.syntax(),
+                    &doc.config.load().indent_heuristic,
                     &doc.indent_style,
                     doc.tab_width(),
                     text,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 5a81cb5d6..f2e853071 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -42,7 +42,7 @@ use anyhow::{anyhow, bail, Error};
 pub use helix_core::diagnostic::Severity;
 use helix_core::{
     auto_pairs::AutoPairs,
-    syntax::{self, AutoPairConfig, SoftWrap},
+    syntax::{self, AutoPairConfig, IndentationHeuristic, SoftWrap},
     Change, LineEnding, NATIVE_LINE_ENDING,
 };
 use helix_core::{Position, Selection};
@@ -291,6 +291,9 @@ pub struct Config {
     pub insert_final_newline: bool,
     /// Enables smart tab
     pub smart_tab: Option<SmartTabConfig>,
+    /// Which indent heuristic to use when a new line is inserted
+    #[serde(default)]
+    pub indent_heuristic: IndentationHeuristic,
 }
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
@@ -841,6 +844,7 @@ impl Default for Config {
             default_line_ending: LineEndingConfig::default(),
             insert_final_newline: true,
             smart_tab: Some(SmartTabConfig::default()),
+            indent_heuristic: IndentationHeuristic::default(),
         }
     }
 }

From a5acfdbf104db82310b71da988ef8a5df43ffd49 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Tue, 19 Sep 2023 16:14:23 +0200
Subject: [PATCH 550/967] Add documentation for new indent computation

---
 book/src/configuration.md | 1 +
 book/src/guides/indent.md | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index f70ce5470..bbec40f2a 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -65,6 +65,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
 | `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
 | `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
+| `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 | `hybrid`
 
 ### `[editor.statusline]` Section
 
diff --git a/book/src/guides/indent.md b/book/src/guides/indent.md
index bd037bb05..a65ac5ac1 100644
--- a/book/src/guides/indent.md
+++ b/book/src/guides/indent.md
@@ -12,6 +12,15 @@ Note that it matters where these added indents begin. For example,
 multiple indent level increases that start on the same line only increase
 the total indent level by 1. See [Capture types](#capture-types).
 
+By default, Helix uses the `hybrid` indentation heuristic. This means that
+indent queries are not used to compute the expected absolute indentation of a
+line but rather the expected difference in indentation between the new and an
+already existing line. This difference is then added to the actual indentation
+of the already existing line. Since this makes errors in the indent queries
+harder to find, it is recommended to disable it when testing via
+`:set indent-heuristic tree-sitter`. The rest of this guide assumes that
+the `tree-sitter` heuristic is used.
+
 ## Indent queries
 
 When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine

From 3e79a35656461e7143134e0b65b2e78d30df7785 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Tue, 19 Sep 2023 16:29:52 +0200
Subject: [PATCH 551/967] Align arguments in a function call in C. Since the
 tree-sitter grammar is not very good at parsing function calls while they're
 being written, this is not yet super useful. However, it prevents the new
 `hybrid` indent heuristic from choosing these lines as a baseline, making it
 more robust.

---
 runtime/queries/c/indents.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/c/indents.scm b/runtime/queries/c/indents.scm
index 058d80316..0e97ed2b1 100644
--- a/runtime/queries/c/indents.scm
+++ b/runtime/queries/c/indents.scm
@@ -36,3 +36,6 @@
 (parameter_list
   . (parameter_declaration) @anchor
   (#set! "scope" "tail")) @align
+(argument_list
+  . (_) @anchor
+  (#set! "scope" "tail")) @align

From 723a132bdfdacaabc888e48b1c378cd76e7ba84d Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Sun, 15 Oct 2023 11:43:28 +0200
Subject: [PATCH 552/967] Simplify implementation of `add_indent_level`.
 Increase hybrid indent heuristic attempt limit to 4. Clarify the fallback
 logic in indent heuristic docs.

---
 book/src/configuration.md |  2 +-
 helix-core/src/indent.rs  | 41 ++++++++++++++++++---------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index bbec40f2a..34be7e8d7 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -65,7 +65,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
 | `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
 | `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
-| `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 | `hybrid`
+| `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`
 
 ### `[editor.statusline]` Section
 
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 26186ee83..9333460b4 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -8,7 +8,7 @@ use crate::{
     graphemes::{grapheme_width, tab_width_at},
     syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
     tree_sitter::Node,
-    Rope, RopeGraphemes, RopeSlice,
+    Position, Rope, RopeGraphemes, RopeSlice,
 };
 
 /// Enum representing indentation style.
@@ -225,27 +225,24 @@ fn add_indent_level(
         // Since the width of a tab depends on its offset, we cannot simply iterate over
         // the chars of `base_indent` in reverse until we have the desired indent reduction,
         // instead we iterate over them twice in forward direction.
-        let mut base_indent_width: usize = 0;
-        for c in base_indent.chars() {
-            base_indent_width += match c {
-                '\t' => tab_width_at(base_indent_width, tab_width as u16),
-                // This is only true since `base_indent` consists only of tabs and spaces
-                _ => 1,
-            };
-        }
+        let base_indent_rope = RopeSlice::from(base_indent.as_str());
+        #[allow(deprecated)]
+        let base_indent_width =
+            crate::visual_coords_at_pos(base_indent_rope, base_indent_rope.len_chars(), tab_width)
+                .col;
         let target_indent_width = base_indent_width
             .saturating_sub((-added_indent_level) as usize * indent_style.indent_width(tab_width));
-        let mut reduced_indent_width = 0;
-        for (i, c) in base_indent.char_indices() {
-            if reduced_indent_width >= target_indent_width {
-                base_indent.truncate(i);
-                return base_indent;
-            }
-            reduced_indent_width += match c {
-                '\t' => tab_width_at(base_indent_width, tab_width as u16),
-                _ => 1,
-            };
-        }
+        #[allow(deprecated)]
+        let char_end_idx = crate::pos_at_visual_coords(
+            base_indent_rope,
+            Position {
+                row: 0,
+                col: target_indent_width,
+            },
+            tab_width,
+        );
+        let byte_end_idx = base_indent_rope.char_to_byte(char_end_idx);
+        base_indent.truncate(byte_end_idx);
         base_indent
     }
 }
@@ -959,7 +956,7 @@ pub fn indent_for_newline(
             line_before_end_pos,
             true,
         ) {
-            if let IndentationHeuristic::Hybrid = indent_heuristic {
+            if *indent_heuristic == IndentationHeuristic::Hybrid {
                 // We want to compute the indentation not only based on the
                 // syntax tree but also on the actual indentation of a previous
                 // line. This makes indentation computation more resilient to
@@ -969,7 +966,7 @@ pub fn indent_for_newline(
                 // make sense, e.g. if it has a different alignment than the new line.
                 // In order to prevent edge cases with long running times, we only try
                 // a constant number of (non-empty) lines.
-                const MAX_ATTEMPTS: usize = 2;
+                const MAX_ATTEMPTS: usize = 4;
                 let mut num_attempts = 0;
                 for line_idx in (0..=line_before).rev() {
                     let line = text.line(line_idx);

From 33d85606cf36da074d91db498d12233ab4978509 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Sun, 3 Dec 2023 19:47:01 +0100
Subject: [PATCH 553/967] Add alignment indent queries for binary & ternary
 expressions in C.

---
 runtime/queries/c/indents.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/runtime/queries/c/indents.scm b/runtime/queries/c/indents.scm
index 0e97ed2b1..877b6670c 100644
--- a/runtime/queries/c/indents.scm
+++ b/runtime/queries/c/indents.scm
@@ -39,3 +39,13 @@
 (argument_list
   . (_) @anchor
   (#set! "scope" "tail")) @align
+; These are a bit opinionated since some people just indent binary/ternary expressions spanning multiple lines.
+; Since they are only triggered when a newline is inserted into an already complete binary/ternary expression,
+; this should happen rarely, so it is not a big deal either way.
+; Additionally, adding these queries has the advantage of preventing such continuation lines from being used
+; as the baseline when the `hybrid` indent heuristic is used (which is desirable since their indentation is so inconsistent). 
+(binary_expression
+  (#set! "scope" "tail")) @anchor @align
+(conditional_expression
+  "?" @anchor
+  (#set! "scope" "tail")) @align

From 914c83420b9901f596bf771ad5f20495de9a070c Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Fri, 15 Dec 2023 19:05:04 +0100
Subject: [PATCH 554/967] fix `:indent-style` crash (#9087)

* removing unreachable statement in `:indent-style`

* update checks when setting indent line and update docs

* `cargo xtask docgen`
---
 book/src/generated/typable-cmd.md | 2 +-
 helix-core/src/indent.rs          | 2 +-
 helix-term/src/commands/typed.rs  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 6280d3c72..f4fcb6f62 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -17,7 +17,7 @@
 | `:write-buffer-close!`, `:wbc!` | Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt) |
 | `:new`, `:n` | Create a new scratch buffer. |
 | `:format`, `:fmt` | Format the file using the LSP formatter. |
-| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.) |
+| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.) |
 | `:line-ending` | Set the document's default line ending. Options: crlf, lf. |
 | `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. |
 | `:later`, `:lat` | Jump to a later point in edit history. Accepts a number of steps or a time span. |
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 9333460b4..1e90db472 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -22,7 +22,7 @@ pub enum IndentStyle {
 
 // 16 spaces
 const INDENTS: &str = "                ";
-const MAX_INDENT: u8 = 16;
+pub const MAX_INDENT: u8 = 16;
 
 impl IndentStyle {
     /// Creates an `IndentStyle` from an indentation string.
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 4148257fc..1d4d65050 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -6,6 +6,7 @@ use crate::job::Job;
 use super::*;
 
 use helix_core::fuzzy::fuzzy_match;
+use helix_core::indent::MAX_INDENT;
 use helix_core::{encoding, line_ending, path::get_canonicalized_path, shellwords::Shellwords};
 use helix_lsp::{OffsetEncoding, Url};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
@@ -476,8 +477,7 @@ fn set_indent_style(
         cx.editor.set_status(match style {
             Tabs => "tabs".to_owned(),
             Spaces(1) => "1 space".to_owned(),
-            Spaces(n) if (2..=8).contains(&n) => format!("{} spaces", n),
-            _ => unreachable!(), // Shouldn't happen.
+            Spaces(n) => format!("{} spaces", n),
         });
         return Ok(());
     }
@@ -489,7 +489,7 @@ fn set_indent_style(
         Some(arg) => arg
             .parse::<u8>()
             .ok()
-            .filter(|n| (1..=8).contains(n))
+            .filter(|n| (1..=MAX_INDENT).contains(n))
             .map(Spaces),
         _ => None,
     };
@@ -2606,7 +2606,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
     TypableCommand {
         name: "indent-style",
         aliases: &[],
-        doc: "Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.)",
+        doc: "Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.)",
         fun: set_indent_style,
         signature: CommandSignature::none(),
     },

From c56cd6ee8b9312a620d4fc38eea90a49613f5d72 Mon Sep 17 00:00:00 2001
From: JJ <git@toki.la>
Date: Fri, 15 Dec 2023 20:29:26 -0800
Subject: [PATCH 555/967] Add support for Agda (#8285)

* agda language support (wip)

* improve highlights

* disable agda-language-server

* minor addendum to documentation

* cargo xtask docgen

* oh i can just do this neat

* minor comment cleanup

* upstream updated

* imports: missed a spot

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md  |   1 +
 book/src/guides/adding_languages.md |   2 +
 languages.toml                      |  27 ++++++
 runtime/queries/agda/highlights.scm | 124 ++++++++++++++++++++++++++++
 4 files changed, 154 insertions(+)
 create mode 100644 runtime/queries/agda/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 1fad1017e..0ec8f5bad 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 |
 | --- | --- | --- | --- | --- |
+| agda | ✓ |  |  |  |
 | astro | ✓ |  |  |  |
 | awk | ✓ | ✓ |  | `awk-language-server` |
 | bash | ✓ | ✓ | ✓ | `bash-language-server` |
diff --git a/book/src/guides/adding_languages.md b/book/src/guides/adding_languages.md
index 93ec013f5..0763a3c5c 100644
--- a/book/src/guides/adding_languages.md
+++ b/book/src/guides/adding_languages.md
@@ -36,6 +36,7 @@ below.
 3. Refer to the
    [tree-sitter website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)
    for more information on writing queries.
+4. A list of highlight captures can be found [on the themes page](https://docs.helix-editor.com/themes.html#scopes).
 
 > 💡 In Helix, the first matching query takes precedence when evaluating
 > queries, which is different from other editors such as Neovim where the last
@@ -51,3 +52,4 @@ below.
   grammars.
 - If a parser is causing a segfault, or you want to remove it, make sure to
   remove the compiled parser located at `runtime/grammars/<name>.so`.
+- If you are attempting to add queries and Helix is unable to locate them, ensure that the environment variable `HELIX_RUNTIME` is set to the location of the `runtime` folder you're developing in.
diff --git a/languages.toml b/languages.toml
index e184c8934..d05180ef1 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3,6 +3,7 @@
 
 [language-server]
 
+als = { command = "als" }
 awk-language-server = { command = "awk-language-server" }
 bash-language-server = { command = "bash-language-server", args = ["start"] }
 bass = { command = "bass", args = ["--lsp"] }
@@ -2920,6 +2921,32 @@ file-types = ["gmi"]
 name = "gemini"
 source = { git = "https://git.sr.ht/~nbsp/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
 
+[[language]]
+name = "agda"
+scope = "source.agda"
+injection-regex = "agda"
+file-types = ["agda"]
+roots = []
+comment-token = "--"
+# language-servers = [ "als" ]
+# the agda language server is of questionable functionality.
+auto-format = false
+indent = { tab-width = 2, unit = "  " }
+
+[language.auto-pairs]
+'"' = '"'
+"'" = "'"
+'{' = '}'
+'(' = ')'
+'[' = ']'
+
+# [language.debugger]
+# ?? can this be used for proof assistant support? explore
+
+[[grammar]]
+name = "agda"
+source = { git = "https://github.com/tree-sitter/tree-sitter-agda", rev = "c21c3a0f996363ed17b8ac99d827fe5a4821f217" }
+
 [[language]]
 name = "templ"
 scope = "source.templ"
diff --git a/runtime/queries/agda/highlights.scm b/runtime/queries/agda/highlights.scm
new file mode 100644
index 000000000..4ddf849d0
--- /dev/null
+++ b/runtime/queries/agda/highlights.scm
@@ -0,0 +1,124 @@
+;; Punctuation
+[ "." ";" ":"] @punctuation.delimiter
+[ "(" ")" "{" "}" ] @punctuation.bracket
+
+;; Constants
+(integer) @constant.numeric.integer
+; (float) @constant.numeric.float
+(literal) @string
+
+;; Pragmas and comments
+(comment) @comment
+(pragma) @attribute
+(macro) @function.macro
+
+;; Imports
+(module_name) @namespace
+(import_directive (id) @namespace)
+[(module) (import) (open)] @keyword.control.import
+
+;; Types
+(typed_binding (expr) @type)
+(record        (expr) @type)
+(data          (expr) @type)
+(signature     (expr) @type)
+(function (rhs (expr) @type))
+; todo: these are too general. ideally, any nested (atom)
+; https://github.com/tree-sitter/tree-sitter/issues/880
+
+;; Variables
+(untyped_binding (atom) @variable)
+(typed_binding   (atom) @variable)
+(field_name) @variable.other.member
+
+;; Functions
+(function_name) @function
+;(function (lhs
+;  . (atom) @function
+;    (atom) @variable.parameter))
+; todo: currently fails to parse, upstream tree-sitter bug
+
+;; Data
+[(data_name) (record_name)] @constructor
+((atom) @constant.builtin.boolean
+  (#any-of? @constant.builtin.boolean "true" "false" "True" "False"))
+
+"Set" @type.builtin
+
+; postulate
+; type_signature
+; pattern
+; id
+; bid
+; typed_binding
+; primitive
+; private
+; record_signature
+; record_assignments
+; field_assignment
+; module_assignment
+; renaming
+; import_directive
+; lambda
+; let
+; instance
+; generalize
+; record
+; fields
+; syntax
+; hole_name
+; data_signature
+
+;; Keywords
+[
+  "where"
+  "data"
+  "rewrite"
+  "postulate"
+  "public"
+  "private"
+  "tactic"
+  "Prop"
+  "quote"
+  "renaming"
+  "in"
+  "hiding"
+  "constructor"
+  "abstract"
+  "let"
+  "field"
+  "mutual"
+  "infix"
+  "infixl"
+  "infixr"
+  "record"
+  "overlap"
+  "instance"
+  "do"
+] @keyword
+
+[
+  "="
+] @operator
+
+; = | -> : ? \ .. ... λ ∀ →
+; (_LAMBDA) (_FORALL) (_ARROW)
+; "coinductive"
+; "eta-equality"
+; "field"
+; "inductive"
+; "interleaved"
+; "macro"
+; "no-eta-equality"
+; "pattern"
+; "primitive"
+; "quoteTerm"
+; "rewrite"
+; "syntax"
+; "unquote"
+; "unquoteDecl"
+; "unquoteDef"
+; "using"
+; "variable"
+; "with"
+

From a1a20d231f509a01b7e0e8e040ce96206276ffd4 Mon Sep 17 00:00:00 2001
From: Novus Nota <68142933+novusnota@users.noreply.github.com>
Date: Sun, 17 Dec 2023 22:40:29 +0100
Subject: [PATCH 556/967] book: Describe usage of `.ignore` and helix-specific
 ignore files in `[editor.file-picker]` section (#9102)

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

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 34be7e8d7..03948e2da 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -177,6 +177,21 @@ All git related options are only enabled in a git repository.
 |`git-exclude` | Enables reading `.git/info/exclude` files | `true`
 |`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
 
+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.
+
+Additionally, you can use Helix-specific ignore files by creating a local `.helix/ignore` file in the current workspace or a global `ignore` file located in your Helix config directory:
+- Linux and Mac: `~/.config/helix/ignore`
+- Windows: `%AppData%\helix\ignore`
+
+Example:
+
+```ini
+# unignore in file picker and global search
+!.github/
+!.gitignore
+!.gitattributes
+```
+
 ### `[editor.auto-pairs]` Section
 
 Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a

From f27fdb2bf4da1e9b1e0a0c8e7688e738379ba33b Mon Sep 17 00:00:00 2001
From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com>
Date: Sun, 17 Dec 2023 16:59:04 -0500
Subject: [PATCH 557/967] when text document sync capability is only kind send
 didSave without text (#9101)

see https://github.com/microsoft/language-server-protocol/issues/288 for details
---
 helix-lsp/src/client.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index e6e1f8a03..5266d4b0d 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -969,20 +969,19 @@ impl Client {
     ) -> Option<impl Future<Output = Result<()>>> {
         let capabilities = self.capabilities.get().unwrap();
 
-        let include_text = match &capabilities.text_document_sync {
-            Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
-                save: Some(options),
+        let include_text = match &capabilities.text_document_sync.as_ref()? {
+            lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
+                save: options,
                 ..
-            })) => match options {
+            }) => match options.as_ref()? {
                 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
                 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
                     include_text,
                 }) => include_text.unwrap_or(false),
-                // Supported(false)
-                _ => return None,
+                lsp::TextDocumentSyncSaveOptions::Supported(false) => return None,
             },
-            // unsupported
-            _ => return None,
+            // see: https://github.com/microsoft/language-server-protocol/issues/288
+            lsp::TextDocumentSyncCapability::Kind(..) => false,
         };
 
         Some(self.notify::<lsp::notification::DidSaveTextDocument>(

From c1ab94bbefd85bf2f0ec1e50052a7bb1b81e14ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 10:01:10 +0900
Subject: [PATCH 558/967] build(deps): bump thiserror from 1.0.50 to 1.0.51
 (#9116)

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 f58ac4ff0..42be9a140 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2028,18 +2028,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
 dependencies = [
  "proc-macro2",
  "quote",

From 80dd58596690de08f35b41f318264890b87fe5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Tue, 19 Dec 2023 02:03:26 +0100
Subject: [PATCH 559/967] feat(themes): add modus vivendi theme(s) (#8894)

---
 runtime/themes/licenses/modus_vivendi.LICENSE |   5 +
 .../modus_vivendi_deuteranopia.LICENSE        |   5 +
 .../licenses/modus_vivendi_tinted.LICENSE     |   5 +
 .../licenses/modus_vivendi_tritanopia.LICENSE |   5 +
 runtime/themes/modus_vivendi.toml             | 242 ++++++++++++++++++
 .../themes/modus_vivendi_deuteranopia.toml    | 158 ++++++++++++
 runtime/themes/modus_vivendi_tinted.toml      | 144 +++++++++++
 runtime/themes/modus_vivendi_tritanopia.toml  | 186 ++++++++++++++
 8 files changed, 750 insertions(+)
 create mode 100644 runtime/themes/licenses/modus_vivendi.LICENSE
 create mode 100644 runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSE
 create mode 100644 runtime/themes/licenses/modus_vivendi_tinted.LICENSE
 create mode 100644 runtime/themes/licenses/modus_vivendi_tritanopia.LICENSE
 create mode 100644 runtime/themes/modus_vivendi.toml
 create mode 100644 runtime/themes/modus_vivendi_deuteranopia.toml
 create mode 100644 runtime/themes/modus_vivendi_tinted.toml
 create mode 100644 runtime/themes/modus_vivendi_tritanopia.toml

diff --git a/runtime/themes/licenses/modus_vivendi.LICENSE b/runtime/themes/licenses/modus_vivendi.LICENSE
new file mode 100644
index 000000000..7e224507f
--- /dev/null
+++ b/runtime/themes/licenses/modus_vivendi.LICENSE
@@ -0,0 +1,5 @@
+Copyright (C) 2020-2023 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
+
+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
diff --git a/runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSE b/runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSE
new file mode 100644
index 000000000..7e224507f
--- /dev/null
+++ b/runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSE
@@ -0,0 +1,5 @@
+Copyright (C) 2020-2023 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
+
+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
diff --git a/runtime/themes/licenses/modus_vivendi_tinted.LICENSE b/runtime/themes/licenses/modus_vivendi_tinted.LICENSE
new file mode 100644
index 000000000..7e224507f
--- /dev/null
+++ b/runtime/themes/licenses/modus_vivendi_tinted.LICENSE
@@ -0,0 +1,5 @@
+Copyright (C) 2020-2023 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
+
+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
diff --git a/runtime/themes/licenses/modus_vivendi_tritanopia.LICENSE b/runtime/themes/licenses/modus_vivendi_tritanopia.LICENSE
new file mode 100644
index 000000000..7e224507f
--- /dev/null
+++ b/runtime/themes/licenses/modus_vivendi_tritanopia.LICENSE
@@ -0,0 +1,5 @@
+Copyright (C) 2020-2023 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
+
+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
diff --git a/runtime/themes/modus_vivendi.toml b/runtime/themes/modus_vivendi.toml
new file mode 100644
index 000000000..1ae64d894
--- /dev/null
+++ b/runtime/themes/modus_vivendi.toml
@@ -0,0 +1,242 @@
+# 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
+
+# Syntax highlighting
+# -------------------
+"type" = "cyan-cooler"
+"constructor" = "cyan-cooler"
+
+"constant" = "blue-cooler"
+"constant.character.escape" = "magenta"
+
+"string" = "blue-warmer"
+"string.regexp" = "magenta-faint"
+"string.special" = "blue-faint" # used for colors in CSS
+
+"comment" = "fg-dim"
+
+"variable.parameter" = "cyan"
+"variable.builtin" = "magenta-cooler"
+"label" = "fg-dim" # used for language in markdown code blocks
+"keyword" = "magenta-cooler"
+"keyword.directive" = "red-cooler"
+"function" = "magenta"
+"function.macro" = "magenta-warmer"
+
+punctuation = "fg-dim"
+"tag" = "magenta"
+"attribute" = "cyan-cooler"
+"namespace" = "blue-cooler"
+"special" = "red-cooler"
+
+"markup.heading.marker" = "fg-dim"
+"markup.heading.1" = { fg = "fg-main", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "yellow-faint", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "fg-alt", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "magenta", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "green-faint", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "red-faint", modifiers = ["bold"] }
+"markup.list" = "fg-dim"
+"markup.list.checked" = { fg = "yellow-warmer" }
+"markup.list.unchecked" = { fg = "yellow-warmer" }
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "cyan" }
+"markup.link.text" = { fg = "blue-warmer", modifiers = ["underlined"] }
+"markup.raw.block" = { bg = "bg-dim" }
+"markup.raw.inline" = { fg = "green-cooler" }
+
+"diff.plus" = { fg = "fg-added", bg = "bg-added" }
+"diff.plus.gutter" = "green-intense"
+"diff.minus" = { fg = "fg-removed", bg = "bg-removed" }
+"diff.minus.gutter" = "red-intense"
+"diff.delta" = { fg = "fg-changed", bg = "bg-changed" }
+"diff.delta.gutter" = "yellow-intense"
+
+# User Interface
+# --------------
+
+"ui.background" = { bg = "bg-main" }
+
+"ui.linenr" = { fg = "fg-dim", bg = "bg-dim" }
+"ui.linenr.selected" = { fg = "fg-main", bg = "bg-active" }
+
+"ui.statusline" = { fg = "fg-mode-line-active", bg = "bg-mode-line-active" }
+"ui.statusline.inactive" = { fg = "fg-mode-line-inactive", bg = "bg-mode-line-inactive" }
+"ui.statusline.normal" = { fg = "blue-warmer" }
+"ui.statusline.insert" = { fg = "green-warmer" }
+"ui.statusline.select" = { fg = "magenta-warmer" }
+
+"ui.bufferline" = { bg = "bg-tab-bar" }
+"ui.bufferline.active" = { bg = "bg-tab-current", fg = "fg-mode-line-active" }
+
+"ui.popup" = { fg = "fg-main", bg = "bg-dim" }
+"ui.window" = { fg = "fg-dim" }
+"ui.help" = { fg = "fg-main", bg = "bg-dim" }
+"ui.gutter" = { bg = "bg-dim" }
+"ui.text" = "fg-main"
+"ui.text.focus" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
+"ui.text.inactive" = { fg = "fg-dim" }
+"ui.virtual" = "bg-active"
+"ui.virtual.ruler" = { bg = "bg-dim" }
+"ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
+
+"ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
+"ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
+
+"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.cursorline.primary" = { bg = "bg-hl-line" }
+
+"ui.highlight" = { bg = "bg-hl-line" }
+
+"ui.menu" = { fg = "fg-main", bg = "bg-dim" }
+"ui.menu.selected" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
+"ui.menu.scroll" = { fg = "fg-dim", bg = "bg-cyan-intense" }
+
+"diagnostic.error" = { underline = { color = "red-intense", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
+"diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
+
+error = "red"
+warning = "yellow-warmer"
+info = "cyan-cooler"
+hint = "blue-cooler"
+
+[palette]
+# Basic values
+bg-main = "#000000"
+bg-dim = "#1e1e1e"
+fg-main = "#ffffff"
+fg-dim = "#989898"
+fg-alt = "#c6daff"
+bg-active = "#535353"
+bg-inactive = "#303030"
+
+# Common accent foregrounds
+red = "#ff5f59"
+red-warmer = "#ff6b55"
+red-cooler = "#ff7f9f"
+red-faint = "#ff9580"
+red-intense = "#ff5f5f"
+green = "#44bc44"
+green-warmer = "#70b900"
+green-cooler = "#00c06f"
+green-faint = "#88ca9f"
+green-intense = "#44df44"
+yellow = "#d0bc00"
+yellow-warmer = "#fec43f"
+yellow-cooler = "#dfaf7a"
+yellow-faint = "#d2b580"
+yellow-intense = "#efef00"
+blue = "#2fafff"
+blue-warmer = "#79a8ff"
+blue-cooler = "#00bcff"
+blue-faint = "#82b0ec"
+blue-intense = "#338fff"
+magenta = "#feacd0"
+magenta-warmer = "#f78fe7"
+magenta-cooler = "#b6a0ff"
+magenta-faint = "#caa6df"
+magenta-intense = "#ff66ff"
+cyan = "#00d3d0"
+cyan-warmer = "#4ae2f0"
+cyan-cooler = "#6ae4b9"
+cyan-faint = "#9ac8e0"
+cyan-intense = "#00eff0"
+
+# Uncommon accent foregrounds
+rust = "#db7b5f"
+gold = "#c0965b"
+olive = "#9cbd6f"
+slate = "#76afbf"
+indigo = "#9099d9"
+maroon = "#cf7fa7"
+pink = "#d09dc0"
+
+# Common accent backgrounds
+bg-red-intense = "#9d1f1f"
+bg-green-intense = "#2f822f"
+bg-yellow-intense = "#7a6100"
+bg-blue-intense = "#1640b0"
+bg-magenta-intense = "#7030af"
+bg-cyan-intense = "#2266ae"
+
+bg-red-subtle = "#620f2a"
+bg-green-subtle = "#00422a"
+bg-yellow-subtle = "#4a4000"
+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"
+
+# Uncommon accent backgrounds
+bg-ochre = "#442c2f"
+bg-lavender = "#38325c"
+bg-sage = "#0f3d30"
+
+# Special purpose
+bg-completion = "#2f447f"
+bg-hover = "#45605e"
+bg-hover-secondary = "#654a39"
+bg-hl-line = "#2f3849"
+bg-region = "#5a5a5a"
+fg-region = "#ffffff"
+
+bg-char-0 = "#0050af"
+bg-char-1 = "#7f1f7f"
+bg-char-2 = "#625a00"
+
+bg-mode-line-active = "#505050"
+fg-mode-line-active = "#ffffff"
+border-mode-line-active = "#959595"
+bg-mode-line-inactive = "#2d2d2d"
+fg-mode-line-inactive = "#969696"
+border-mode-line-inactive = "#606060"
+
+modeline-err = "#ffa9bf"
+modeline-warning = "#dfcf43"
+modeline-info = "#9fefff"
+
+bg-tab-bar = "#313131"
+bg-tab-current = "#000000"
+bg-tab-other = "#545454"
+
+# Diffs
+bg-added = "#00381f"
+bg-added-faint = "#002910"
+bg-added-refine = "#034f2f"
+bg-added-fringe = "#237f3f"
+fg-added = "#a0e0a0"
+fg-added-intense = "#80e080"
+
+bg-changed = "#363300"
+bg-changed-faint = "#2a1f00"
+bg-changed-refine = "#4a4a00"
+bg-changed-fringe = "#8a7a00"
+fg-changed = "#efef80"
+fg-changed-intense = "#c0b05f"
+
+bg-removed = "#4f1119"
+bg-removed-faint = "#380a0f"
+bg-removed-refine = "#781a1f"
+bg-removed-fringe = "#b81a1f"
+fg-removed = "#ffbfbf"
+fg-removed-intense = "#ff9095"
+
+bg-diff-context = "#1a1a1a"
+
+# Paren match
+bg-paren-match = "#2f7f9f"
+tg-paren-expression = "#453040"
diff --git a/runtime/themes/modus_vivendi_deuteranopia.toml b/runtime/themes/modus_vivendi_deuteranopia.toml
new file mode 100644
index 000000000..57c796cb7
--- /dev/null
+++ b/runtime/themes/modus_vivendi_deuteranopia.toml
@@ -0,0 +1,158 @@
+# 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-deuteranopia-theme.el
+# Version 4.3.0
+
+inherits = "modus_vivendi"
+
+"constant.character.escape" = "magenta"
+"comment" = "yellow-cooler"
+"function" = "magenta"
+"tag" = "magenta"
+
+"ui.cursor" = { fg = "bg-main", bg = "blue-intense" }
+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "blue-intense" }
+
+"diagnostic.error" = { underline = { color = "yellow-intense", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "magenta-faint", style = "curl" } }
+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
+
+error = "yellow-intense"
+warning = "magenta-faint"
+info = "cyan"
+hint = "blue"
+
+[palette]
+# Basic values
+bg-main = "#000000"
+bg-dim = "#1e1e1e"
+fg-main = "#ffffff"
+fg-dim = "#989898"
+fg-alt = "#c6daff"
+bg-active = "#535353"
+bg-inactive = "#303030"
+border = "#646464"
+
+# Common accent foregrounds
+red = "#ff5f59"
+red-warmer = "#ff6b55"
+red-cooler = "#ff7f9f"
+red-faint = "#ff9580"
+red-intense = "#ff5f5f"
+green = "#44bc44"
+green-warmer = "#70b900"
+green-cooler = "#00c06f"
+green-faint = "#88ca9f"
+green-intense = "#44df44"
+yellow = "#cabf00"
+yellow-warmer = "#ffa00f"
+yellow-cooler = "#d8af7a"
+yellow-faint = "#d2b580"
+yellow-intense = "#efef00"
+blue = "#2fafff"
+blue-warmer = "#79a8ff"
+blue-cooler = "#00bcff"
+blue-faint = "#82b0ec"
+blue-intense = "#338fff"
+magenta = "#feacd0"
+magenta-warmer = "#f78fe7"
+magenta-cooler = "#b6a0ff"
+magenta-faint = "#caa6df"
+magenta-intense = "#ff66ff"
+cyan = "#00d3d0"
+cyan-warmer = "#4ae2f0"
+cyan-cooler = "#6ae4b9"
+cyan-faint = "#9ac8e0"
+cyan-intense = "#00eff0"
+
+# Uncommon accent foregrounds
+rust = "#db7b5f"
+gold = "#c0965b"
+olive = "#9cbd6f"
+slate = "#76afbf"
+indigo = "#9099d9"
+maroon = "#cf7fa7"
+pink = "#d09dc0"
+
+# Common accent backgrounds
+bg-red-intense = "#9d1f1f"
+bg-green-intense = "#2f822f"
+bg-yellow-intense = "#7a6100"
+bg-blue-intense = "#1640b0"
+bg-magenta-intense = "#7030af"
+bg-cyan-intense = "#2266ae"
+
+bg-red-subtle = "#620f2a"
+bg-green-subtle = "#00422a"
+bg-yellow-subtle = "#4a4000"
+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"
+
+# Uncommon accent backgrounds
+bg-ochre = "#442c2f"
+bg-lavender = "#38325c"
+bg-sage = "#0f3d30"
+
+# Special purpose
+bg-completion = "#2f447f"
+bg-hover = "#45605e"
+bg-hover-secondary = "#654a39"
+bg-hl-line = "#2f3849"
+bg-region = "#5a5a5a"
+fg-region = "#ffffff"
+
+bg-char-0 = "#0050af"
+bg-char-1 = "#7f1f7f"
+bg-char-2 = "#625a00"
+
+bg-mode-line-active = "#2a2a6a"
+fg-mode-line-active = "#f0f0f0"
+border-mode-line-active = "#8080a7"
+bg-mode-line-inactive = "#2d2d2d"
+fg-mode-line-inactive = "#969696"
+border-mode-line-inactive = "#606060"
+
+modeline-err = "#e5bf00"
+modeline-warning = "#c0cf35"
+modeline-info = "#abeadf"
+
+bg-tab-bar = "#313131"
+bg-tab-current = "#000000"
+bg-tab-other = "#545454"
+
+# Diffs
+bg-added = "#003066"
+bg-added-faint = "#001a4f"
+bg-added-refine = "#0f4a77"
+bg-added-fringe = "#006fff"
+fg-added = "#c4d5ff"
+fg-added-intense = "#8080ff"
+
+bg-changed = "#2f123f"
+bg-changed-faint = "#1f022f"
+bg-changed-refine = "#3f325f"
+bg-changed-fringe = "#7f55a0"
+fg-changed = "#e3cfff"
+fg-changed-intense = "#cf9fe2"
+
+bg-removed = "#3d3d00"
+bg-removed-faint = "#281f00"
+bg-removed-refine = "#555500"
+bg-removed-fringe = "#d0c03f"
+fg-removed = "#d4d48f"
+fg-removed-intense = "#d0b05f"
+
+bg-diff-context = "#1a1a1a"
+
+# Paren match
+bg-paren-match = "#2f7f9f"
+bg-paren-expression = "#453040"
diff --git a/runtime/themes/modus_vivendi_tinted.toml b/runtime/themes/modus_vivendi_tinted.toml
new file mode 100644
index 000000000..624a261c9
--- /dev/null
+++ b/runtime/themes/modus_vivendi_tinted.toml
@@ -0,0 +1,144 @@
+# 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
+
+inherits = "modus_vivendi"
+
+"comment" = "red-faint"
+
+"ui.cursor.primary" = { fg = "bg-main", bg = "red" }
+
+[palette]
+# Basic values
+bg-main = "#0d0e1c"
+bg-dim = "#1d2235"
+fg-main = "#ffffff"
+fg-dim = "#989898"
+fg-alt = "#c6daff"
+bg-active = "#4a4f69"
+bg-inactive = "#2b3045"
+border = "#61647a"
+
+# Common accent foregrounds
+red = "#ff5f59"
+red-warmer = "#ff6b55"
+red-cooler = "#ff7f9f"
+red-faint = "#ff9f80"
+red-intense = "#ff5f5f"
+green = "#44bc44"
+green-warmer = "#70b900"
+green-cooler = "#00c06f"
+green-faint = "#88ca9f"
+green-intense = "#44df44"
+yellow = "#d0bc00"
+yellow-warmer = "#fec43f"
+yellow-cooler = "#dfaf7a"
+yellow-faint = "#d2b580"
+yellow-intense = "#efef00"
+blue = "#2fafff"
+blue-warmer = "#79a8ff"
+blue-cooler = "#00bcff"
+blue-faint = "#82b0ec"
+blue-intense = "#338fff"
+magenta = "#feacd0"
+magenta-warmer = "#f78fe7"
+magenta-cooler = "#b6a0ff"
+magenta-faint = "#caa6df"
+magenta-intense = "#ff66ff"
+cyan = "#00d3d0"
+cyan-warmer = "#4ae2f0"
+cyan-cooler = "#6ae4b9"
+cyan-faint = "#9ac8e0"
+cyan-intense = "#00eff0"
+
+# Uncommon accent foregrounds
+rust = "#db7b5f"
+gold = "#c0965b"
+olive = "#9cbd6f"
+slate = "#76afbf"
+indigo = "#9099d9"
+maroon = "#cf7fa7"
+pink = "#d09dc0"
+
+# Common accent backgrounds
+bg-red-intense = "#9d1f1f"
+bg-green-intense = "#2f822f"
+bg-yellow-intense = "#7a6100"
+bg-blue-intense = "#1640b0"
+bg-magenta-intense = "#7030af"
+bg-cyan-intense = "#2266ae"
+
+bg-red-subtle = "#620f2a"
+bg-green-subtle = "#00422a"
+bg-yellow-subtle = "#4a4000"
+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"
+
+# Special purpose
+bg-completion = "#483d8a"
+bg-hover = "#45605e"
+bg-hover-secondary = "#654a39"
+bg-hl-line = "#303a6f"
+bg-region = "#555a66"
+fg-region = "#ffffff"
+
+bg-char-0 = "#0050af"
+bg-char-1 = "#7f1f7f"
+bg-char-2 = "#625a00"
+
+bg-mode-line-active = "#484d67"
+fg-mode-line-active = "#ffffff"
+border-mode-line-active = "#979797"
+bg-mode-line-inactive = "#292d48"
+fg-mode-line-inactive = "#969696"
+border-mode-line-inactive = "#606270"
+
+modeline-err = "#ffa9bf"
+modeline-warning = "#dfcf43"
+modeline-info = "#9fefff"
+
+bg-tab-bar = "#2c3045"
+bg-tab-current = "#0d0e1c"
+bg-tab-other = "#4a4f6a"
+
+# Diffs
+bg-added = "#003a2f"
+bg-added-faint = "#002922"
+bg-added-refine = "#035542"
+bg-added-fringe = "#23884f"
+fg-added = "#a0e0a0"
+fg-added-intense = "#80e080"
+
+bg-changed = "#363300"
+bg-changed-faint = "#2a1f00"
+bg-changed-refine = "#4a4a00"
+bg-changed-fringe = "#8f7a30"
+fg-changed = "#efef80"
+fg-changed-intense = "#c0b05f"
+
+bg-removed = "#4f1127"
+bg-removed-faint = "#380a19"
+bg-removed-refine = "#781a3a"
+bg-removed-fringe = "#b81a26"
+fg-removed = "#ffbfbf"
+fg-removed-intense = "#ff9095"
+
+bg-diff-context = "#1a1f30"
+
+# Uncommon accent backgrounds
+bg-ochre = "#442c2f"
+bg-lavender = "#38325c"
+bg-sage = "#0f3d30"
+
+# Paren match
+bg-paren-match = "#2f7f9f"
+bg-paren-expression = "#453040"
diff --git a/runtime/themes/modus_vivendi_tritanopia.toml b/runtime/themes/modus_vivendi_tritanopia.toml
new file mode 100644
index 000000000..983bb7546
--- /dev/null
+++ b/runtime/themes/modus_vivendi_tritanopia.toml
@@ -0,0 +1,186 @@
+# 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-tritanopia-theme.el
+# Version 4.3.0
+
+inherits = "modus_vivendi"
+
+"type" = "blue-warmer"
+"constructor" = "blue-warmer"
+"constant" = "green-cooler"
+"constant.character.escape" = "red-cooler"
+"string" = "cyan"
+"comment" = "red-faint"
+"variable.parameter" = "cyan-cooler"
+"keyword" = "red-cooler"
+"keyword.directive" = "red-warmer"
+"function" = "cyan-warmer"
+"function.macro" = "magenta"
+"tag" = "red-cooler"
+
+"markup.heading.2" = { fg = "red-faint", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "cyan-faint", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "magenta-faint", modifiers = ["bold"] }
+"markup.link.url" = { fg = "cyan-cooler" }
+"markup.link.text" = { fg = "cyan", modifiers = ["underlined"] }
+
+"ui.cursor" = { fg = "bg-main", bg = "red-intense" }
+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "red-intense" }
+
+"diagnostic.error" = { underline = { color = "red-warmer", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "magenta", style = "curl" } }
+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
+
+error = "red-warmer"
+warning = "magenta"
+info = "cyan"
+hint = "blue"
+
+[palette]
+# Basic values
+bg-main = "#000000"
+bg-dim = "#1e1e1e"
+fg-main = "#ffffff"
+fg-dim = "#989898"
+fg-alt = "#c6daff"
+bg-active = "#535353"
+bg-inactive = "#303030"
+border = "#646464"
+
+# Common accent foregrounds
+red = "#ff5f59"
+red-warmer = "#ff6740"
+red-cooler = "#ff6f9f"
+red-faint = "#ff9070"
+red-intense = "#ff5f5f"
+green = "#44bc44"
+green-warmer = "#70b900"
+green-cooler = "#00c06f"
+green-faint = "#88ca9f"
+green-intense = "#44df44"
+yellow = "#cabf00"
+yellow-warmer = "#ffa00f"
+yellow-cooler = "#d8af7a"
+yellow-faint = "#d2b580"
+yellow-intense = "#efef00"
+blue = "#2fafff"
+blue-warmer = "#79a8ff"
+blue-cooler = "#00bcff"
+blue-faint = "#82b0ec"
+blue-intense = "#338fff"
+magenta = "#feacd0"
+magenta-warmer = "#f78fe7"
+magenta-cooler = "#b6a0ff"
+magenta-faint = "#caa6df"
+magenta-intense = "#ef7fff"
+cyan = "#00d3d0"
+cyan-warmer = "#4ae2ff"
+cyan-cooler = "#6ae4b9"
+cyan-faint = "#7fdbdf"
+cyan-intense = "#00eff0"
+
+# Uncommon accent foregrounds
+rust = "#db7b5f"
+gold = "#c0965b"
+olive = "#9cbd6f"
+slate = "#76afbf"
+indigo = "#9099d9"
+maroon = "#cf7fa7"
+pink = "#d09dc0"
+
+# Common accent backgrounds
+bg-red-intense = "#9d1f1f"
+bg-green-intense = "#2f822f"
+bg-yellow-intense = "#7a6100"
+bg-blue-intense = "#1640b0"
+bg-magenta-intense = "#7030af"
+bg-cyan-intense = "#2266ae"
+
+bg-red-subtle = "#620f2a"
+bg-green-subtle = "#00422a"
+bg-yellow-subtle = "#4a4000"
+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"
+
+# Uncommon accent backgrounds
+bg-ochre = "#442c2f"
+bg-lavender = "#38325c"
+bg-sage = "#0f3d30"
+
+# Graphs
+bg-graph-red-0 = "#b52c2c"
+bg-graph-red-1 = "#702020"
+bg-graph-green-0 = "#afd1c0"
+bg-graph-green-1 = "#607a8f"
+bg-graph-yellow-0 = "#facfd6"
+bg-graph-yellow-1 = "#b57b85"
+bg-graph-blue-0 = "#4f9fdf"
+bg-graph-blue-1 = "#004559"
+bg-graph-magenta-0 = "#b6427f"
+bg-graph-magenta-1 = "#7f506f"
+bg-graph-cyan-0 = "#57dfea"
+bg-graph-cyan-1 = "#00808f"
+
+# Special purpose
+bg-completion = "#004253"
+bg-hover = "#8e3e3b"
+bg-hover-secondary = "#00405f"
+bg-hl-line = "#2f3849"
+bg-region = "#5a5a5a"
+fg-region = "#ffffff"
+
+bg-char-0 = "#922a00"
+bg-char-1 = "#00709f"
+bg-char-2 = "#5f3faf"
+
+bg-mode-line-active = "#003c52"
+fg-mode-line-active = "#f0f0f0"
+border-mode-line-active = "#5f8fb4"
+bg-mode-line-inactive = "#2d2d2d"
+fg-mode-line-inactive = "#969696"
+border-mode-line-inactive = "#606060"
+
+modeline-err = "#ff7fbf"
+modeline-warning = "#df9f93"
+modeline-info = "#4fcfef"
+
+bg-tab-bar = "#313131"
+bg-tab-current = "#000000"
+bg-tab-other = "#545454"
+
+# Diffs
+bg-added = "#004254"
+bg-added-faint = "#003042"
+bg-added-refine = "#004f7f"
+bg-added-fringe = "#008fcf"
+fg-added = "#9fdfdf"
+fg-added-intense = "#50c0ef"
+
+bg-changed = "#2f123f"
+bg-changed-faint = "#1f022f"
+bg-changed-refine = "#3f325f"
+bg-changed-fringe = "#7f55a0"
+fg-changed = "#e3cfff"
+fg-changed-intense = "#cf9fe2"
+
+bg-removed = "#4f1119"
+bg-removed-faint = "#380a0f"
+bg-removed-refine = "#781a1f"
+bg-removed-fringe = "#b81a1f"
+fg-removed = "#ffbfbf"
+fg-removed-intense = "#ff9095"
+
+bg-diff-context = "#1a1a1a"
+
+# Paren match
+bg-paren-match = "#2f7f9f"
+bg-paren-expression = "#453040"

From 0a83d851248ee2782d18b41ab5814cb45516e22e Mon Sep 17 00:00:00 2001
From: 0rphee <0rph3e@proton.me>
Date: Mon, 18 Dec 2023 19:05:55 -0600
Subject: [PATCH 560/967] Add haskell-language-server as lsp for cabal files
 (#9111)

---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 0ec8f5bad..880b84e26 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -11,7 +11,7 @@
 | blueprint | ✓ |  |  | `blueprint-compiler` |
 | c | ✓ | ✓ | ✓ | `clangd` |
 | c-sharp | ✓ | ✓ |  | `OmniSharp` |
-| cabal |  |  |  |  |
+| cabal |  |  |  | `haskell-language-server-wrapper` |
 | cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
 | capnp | ✓ |  | ✓ |  |
 | clojure | ✓ |  |  | `clojure-lsp` |
diff --git a/languages.toml b/languages.toml
index d05180ef1..e735735ba 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2698,6 +2698,7 @@ file-types = [ "cabal" ]
 roots = ["cabal.project", "Setup.hs"]
 indent = { tab-width = 2, unit = "  " }
 comment-token = "--"
+language-servers = [ "haskell-language-server" ]
 
 [[language]]
 name = "hurl"

From 970f9e63335aff298c3cbc47b4392503f200761d Mon Sep 17 00:00:00 2001
From: Lucas Wagler <lucas@wagler.dev>
Date: Mon, 18 Dec 2023 20:05:58 -0500
Subject: [PATCH 561/967] Add Avro schema file support (#9113)

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

diff --git a/languages.toml b/languages.toml
index e735735ba..61dfdc41f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -346,7 +346,8 @@ file-types = [
   "jsonld",
   ".vuerc",
   "composer.lock",
-  ".watchmanconfig"
+  ".watchmanconfig",
+  "avsc"
 ]
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true

From 06d7dc628e5a5dac9bbfe4802c3b00754a9f7731 Mon Sep 17 00:00:00 2001
From: ves <28784043+vesdev@users.noreply.github.com>
Date: Tue, 19 Dec 2023 03:06:20 +0200
Subject: [PATCH 562/967] theme: add horizon-dark (#9008)

---
 runtime/themes/horizon-dark.toml | 80 ++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 runtime/themes/horizon-dark.toml

diff --git a/runtime/themes/horizon-dark.toml b/runtime/themes/horizon-dark.toml
new file mode 100644
index 000000000..aec113dfa
--- /dev/null
+++ b/runtime/themes/horizon-dark.toml
@@ -0,0 +1,80 @@
+# Syntax
+string = "orange"
+constant = "purple"
+"constant.numeric" = "orange"
+"constant.builtin" = "orange"
+variable = "red"
+comment = "light-gray"
+special = "purple"
+"punctuation.bracket" = "purple"
+keyword = "purple"
+function = "blue"
+label = "orange"
+type = "orange"
+namespace = "orange"
+
+# User Interface
+"ui.background" = { bg = "bg", fg = "gray" }
+"ui.background.separator" = "light-gray"
+"ui.text" = "white"
+"ui.text.focus" = "green"
+"ui.text.inactive" = "selection"
+"ui.text.info" = "orange"
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.primary" = { modifiers = ["reversed"] }
+"ui.cursor.match" = { bg = "selection" }
+"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.statusline" = { bg = "dark-bg", fg = "light-gray" }
+"ui.popup" = { bg = "dark-bg", fg = "orange" }
+"ui.help" = { bg = "dark-bg", fg = "orange" }
+"ui.menu" = { bg = "dark-bg", fg = "light-gray" }
+"ui.menu.selected" = { bg = "selection", fg = "orange" }
+"ui.window" = "selection"
+"ui.bufferline" = { bg = "dark-bg", fg = "light-gray" }
+"ui.bufferline.active" = { bg = "dark-bg", fg = "orange" }
+
+# 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"} }
+
+warning = { fg = "orange", modifiers = ["bold"] }
+error = { fg = "red", modifiers = ["bold"] }
+info = { fg = "blue", modifiers = ["bold"] }
+hint = { fg = "green", modifiers = ["bold"] }
+
+# Markup
+"markup.heading" = "pink"
+"markup.list" = "light-gray"
+"markup.list.checked" = "green"
+"markup.list.unchecked" = "light-gray"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link" = "blue"
+"markup.quote" = "orange"
+"markup.raw" = "orange"
+
+"diff.plus" =  "green"
+"diff.minus" = "red"
+"diff.delta" = "orange"
+
+[palette]
+white = "#D5D8DA"
+gray = "#2E303E"
+light-gray = "#6C6F93"
+bg = "#1C1E26"
+dark-bg = "#16161C"
+pink = "#EE64AE"
+selection = "#353747"
+green = "#27D796"
+orange = "#FAB795"
+purple = "#B877DB"
+red = "#E95678"
+blue = "#25B2BC"

From 9ba691cd3a8ffb021cb194bd3185317a65c3194a Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Tue, 19 Dec 2023 02:17:12 +0100
Subject: [PATCH 563/967] Support drawing popup frame (#4313)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 book/src/configuration.md        |  1 +
 helix-term/src/commands/dap.rs   |  9 ++++--
 helix-term/src/commands/lsp.rs   | 12 +++++++-
 helix-term/src/commands/typed.rs |  1 -
 helix-term/src/ui/completion.rs  | 18 +++++++++++-
 helix-term/src/ui/lsp.rs         |  4 ++-
 helix-term/src/ui/menu.rs        | 47 +++++++++++++++++++++++---------
 helix-term/src/ui/popup.rs       | 34 ++++++++++++++++++-----
 helix-view/src/editor.rs         | 25 +++++++++++++++--
 9 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 03948e2da..36e2fee2e 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -65,6 +65,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
 | `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
 | `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`
 
 ### `[editor.statusline]` Section
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index cc013d1e6..e9fde4767 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -8,7 +8,7 @@ use dap::{StackFrame, Thread, ThreadStates};
 use helix_core::syntax::{DebugArgumentValue, DebugConfigCompletion, DebugTemplate};
 use helix_dap::{self as dap, Client};
 use helix_lsp::block_on;
-use helix_view::editor::Breakpoint;
+use helix_view::{editor::Breakpoint, graphics::Margin};
 
 use serde_json::{to_value, Value};
 use tokio_stream::wrappers::UnboundedReceiverStream;
@@ -581,7 +581,12 @@ pub fn dap_variables(cx: &mut Context) {
     }
 
     let contents = Text::from(tui::text::Text::from(variables));
-    let popup = Popup::new("dap-variables", contents);
+    let margin = if cx.editor.popup_border() {
+        Margin::all(1)
+    } else {
+        Margin::none()
+    };
+    let popup = Popup::new("dap-variables", contents).margin(margin);
     cx.replace_or_push_layer("dap-variables", popup);
 }
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 874004616..ac6a1a213 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -23,6 +23,7 @@ use helix_core::{
 use helix_view::{
     document::{DocumentInlayHints, DocumentInlayHintsId, Mode},
     editor::Action,
+    graphics::Margin,
     theme::Style,
     Document, View,
 };
@@ -744,7 +745,16 @@ pub fn code_action(cx: &mut Context) {
             });
             picker.move_down(); // pre-select the first item
 
-            let popup = Popup::new("code-action", picker).with_scrollbar(false);
+            let margin = if editor.menu_border() {
+                Margin::vertical(1)
+            } else {
+                Margin::none()
+            };
+
+            let popup = Popup::new("code-action", picker)
+                .with_scrollbar(false)
+                .margin(margin);
+
             compositor.replace_or_push("code-action", popup);
         };
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 1d4d65050..f530ce10d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -574,7 +574,6 @@ fn set_line_ending(
 
     Ok(())
 }
-
 fn earlier(
     cx: &mut compositor::Context,
     args: &[Cow<str>],
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index e06147224..7c6a0055e 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -2,6 +2,7 @@ use crate::compositor::{Component, Context, Event, EventResult};
 use helix_view::{
     document::SavePoint,
     editor::CompleteAction,
+    graphics::Margin,
     theme::{Modifier, Style},
     ViewId,
 };
@@ -326,9 +327,18 @@ impl Completion {
                 }
             };
         });
+
+        let margin = if editor.menu_border() {
+            Margin::vertical(1)
+        } else {
+            Margin::none()
+        };
+
         let popup = Popup::new(Self::ID, menu)
             .with_scrollbar(false)
-            .ignore_escape_key(true);
+            .ignore_escape_key(true)
+            .margin(margin);
+
         let mut completion = Self {
             popup,
             start_offset,
@@ -569,6 +579,12 @@ impl Component for Completion {
         // clear area
         let background = cx.editor.theme.get("ui.popup");
         surface.clear_with(doc_area, background);
+
+        if cx.editor.popup_border() {
+            use tui::widgets::{Block, Borders, Widget};
+            Widget::render(Block::default().borders(Borders::ALL), doc_area, surface);
+        }
+
         markdown_doc.render(doc_area, surface, cx);
     }
 }
diff --git a/helix-term/src/ui/lsp.rs b/helix-term/src/ui/lsp.rs
index 880df6d8e..7037b1552 100644
--- a/helix-term/src/ui/lsp.rs
+++ b/helix-term/src/ui/lsp.rs
@@ -92,7 +92,9 @@ impl Component for SignatureHelp {
             Some(doc) => Markdown::new(doc.clone(), Arc::clone(&self.config_loader)),
         };
         let sig_doc = sig_doc.parse(Some(&cx.editor.theme));
-        let sig_doc_area = area.clip_top(sig_text_area.height + 2);
+        let sig_doc_area = area
+            .clip_top(sig_text_area.height + 2)
+            .clip_bottom(u16::from(cx.editor.popup_border()));
         let sig_doc_para = Paragraph::new(sig_doc)
             .wrap(Wrap { trim: false })
             .scroll((cx.scroll.unwrap_or_default() as u16, 0));
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 9704b1f2a..0ee64ce9e 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -7,11 +7,18 @@ use crate::{
 use helix_core::fuzzy::MATCHER;
 use nucleo::pattern::{Atom, AtomKind, CaseMatching};
 use nucleo::{Config, Utf32Str};
-use tui::{buffer::Buffer as Surface, widgets::Table};
+use tui::{
+    buffer::Buffer as Surface,
+    widgets::{Block, Borders, Table, Widget},
+};
 
 pub use tui::widgets::{Cell, Row};
 
-use helix_view::{editor::SmartTabConfig, graphics::Rect, Editor};
+use helix_view::{
+    editor::SmartTabConfig,
+    graphics::{Margin, Rect},
+    Editor,
+};
 use tui::layout::Constraint;
 
 pub trait Item: Sync + Send + 'static {
@@ -322,6 +329,15 @@ impl<T: Item + 'static> Component for Menu<T> {
         let selected = theme.get("ui.menu.selected");
         surface.clear_with(area, style);
 
+        let render_borders = cx.editor.menu_border();
+
+        let area = if render_borders {
+            Widget::render(Block::default().borders(Borders::ALL), area, surface);
+            area.inner(&Margin::vertical(1))
+        } else {
+            area
+        };
+
         let scroll = self.scroll;
 
         let options: Vec<_> = self
@@ -362,15 +378,19 @@ impl<T: Item + 'static> Component for Menu<T> {
             false,
         );
 
-        if let Some(cursor) = self.cursor {
-            let offset_from_top = cursor - scroll;
-            let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
-            left.set_style(selected);
-            let right = &mut surface[(
-                area.right().saturating_sub(1),
-                area.y + offset_from_top as u16,
-            )];
-            right.set_style(selected);
+        let render_borders = cx.editor.menu_border();
+
+        if !render_borders {
+            if let Some(cursor) = self.cursor {
+                let offset_from_top = cursor - scroll;
+                let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
+                left.set_style(selected);
+                let right = &mut surface[(
+                    area.right().saturating_sub(1),
+                    area.y + offset_from_top as u16,
+                )];
+                right.set_style(selected);
+            }
         }
 
         let fits = len <= win_height;
@@ -385,12 +405,13 @@ impl<T: Item + 'static> Component for Menu<T> {
             for i in 0..win_height {
                 cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
 
-                cell.set_symbol("▐"); // right half block
+                let half_block = if render_borders { "▌" } else { "▐" };
 
                 if scroll_line <= i && i < scroll_line + scroll_height {
                     // Draw scroll thumb
+                    cell.set_symbol(half_block);
                     cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
-                } else {
+                } else if !render_borders {
                     // Draw scroll track
                     cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
                 }
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index dff7b2319..7a6ffe9dd 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -3,7 +3,10 @@ use crate::{
     compositor::{Callback, Component, Context, Event, EventResult},
     ctrl, key,
 };
-use tui::buffer::Buffer as Surface;
+use tui::{
+    buffer::Buffer as Surface,
+    widgets::{Block, Borders, Widget},
+};
 
 use helix_core::Position;
 use helix_view::{
@@ -252,13 +255,29 @@ impl<T: Component> Component for Popup<T> {
         let background = cx.editor.theme.get("ui.popup");
         surface.clear_with(area, background);
 
-        let inner = area.inner(&self.margin);
+        let render_borders = cx.editor.popup_border();
+
+        let inner = if self
+            .contents
+            .type_name()
+            .starts_with("helix_term::ui::menu::Menu")
+        {
+            area
+        } else {
+            area.inner(&self.margin)
+        };
+
+        let border = usize::from(render_borders);
+        if render_borders {
+            Widget::render(Block::default().borders(Borders::ALL), area, surface);
+        }
+
         self.contents.render(inner, surface, cx);
 
         // render scrollbar if contents do not fit
         if self.has_scrollbar {
-            let win_height = inner.height as usize;
-            let len = self.child_size.1 as usize;
+            let win_height = (inner.height as usize).saturating_sub(2 * border);
+            let len = (self.child_size.1 as usize).saturating_sub(2 * border);
             let fits = len <= win_height;
             let scroll = self.scroll;
             let scroll_style = cx.editor.theme.get("ui.menu.scroll");
@@ -274,14 +293,15 @@ impl<T: Component> Component for Popup<T> {
 
                 let mut cell;
                 for i in 0..win_height {
-                    cell = &mut surface[(inner.right() - 1, inner.top() + i as u16)];
+                    cell = &mut surface[(inner.right() - 1, inner.top() + (border + i) as u16)];
 
-                    cell.set_symbol("▐"); // right half block
+                    let half_block = if render_borders { "▌" } else { "▐" };
 
                     if scroll_line <= i && i < scroll_line + scroll_height {
                         // Draw scroll thumb
+                        cell.set_symbol(half_block);
                         cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
-                    } else {
+                    } else if !render_borders {
                         // Draw scroll track
                         cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
                     }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index f2e853071..76429a876 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -43,9 +43,8 @@ pub use helix_core::diagnostic::Severity;
 use helix_core::{
     auto_pairs::AutoPairs,
     syntax::{self, AutoPairConfig, IndentationHeuristic, SoftWrap},
-    Change, LineEnding, NATIVE_LINE_ENDING,
+    Change, LineEnding, Position, Selection, NATIVE_LINE_ENDING,
 };
-use helix_core::{Position, Selection};
 use helix_dap as dap;
 use helix_lsp::lsp;
 
@@ -291,6 +290,8 @@ pub struct Config {
     pub insert_final_newline: bool,
     /// Enables smart tab
     pub smart_tab: Option<SmartTabConfig>,
+    /// Draw border around popups.
+    pub popup_border: PopupBorderConfig,
     /// Which indent heuristic to use when a new line is inserted
     #[serde(default)]
     pub indent_heuristic: IndentationHeuristic,
@@ -797,6 +798,15 @@ impl From<LineEndingConfig> for LineEnding {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum PopupBorderConfig {
+    None,
+    All,
+    Popup,
+    Menu,
+}
+
 impl Default for Config {
     fn default() -> Self {
         Self {
@@ -844,6 +854,7 @@ impl Default for Config {
             default_line_ending: LineEndingConfig::default(),
             insert_final_newline: true,
             smart_tab: Some(SmartTabConfig::default()),
+            popup_border: PopupBorderConfig::None,
             indent_heuristic: IndentationHeuristic::default(),
         }
     }
@@ -1064,6 +1075,16 @@ impl Editor {
         }
     }
 
+    pub fn popup_border(&self) -> bool {
+        self.config().popup_border == PopupBorderConfig::All
+            || self.config().popup_border == PopupBorderConfig::Popup
+    }
+
+    pub fn menu_border(&self) -> bool {
+        self.config().popup_border == PopupBorderConfig::All
+            || self.config().popup_border == PopupBorderConfig::Menu
+    }
+
     pub fn apply_motion<F: Fn(&mut Self) + 'static>(&mut self, motion: F) {
         motion(self);
         self.last_motion = Some(Box::new(motion));

From 8736ce388993e4a38d70c42c0c740f59371464a4 Mon Sep 17 00:00:00 2001
From: Passw <Passw@users.noreply.github.com>
Date: Tue, 19 Dec 2023 22:50:39 +0800
Subject: [PATCH 564/967] Update README.md to add link to Kakoune and Neovim
 (#9119)

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

diff --git a/README.md b/README.md
index 227e1c91f..3f166db1b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 
 ![Screenshot](./screenshot.png)
 
-A Kakoune / Neovim inspired editor, written in Rust.
+A [Kakoune](https://github.com/mawww/kakoune) / [Neovim](https://github.com/neovim/neovim) inspired editor, written in Rust.
 
 The editing model is very heavily based on Kakoune; during development I found
 myself agreeing with most of Kakoune's design decisions.

From 63218a512687cf6cfdbd11f088d0a2cb7d4dfcb8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Dec 2023 00:30:46 +0900
Subject: [PATCH 565/967] build(deps): bump lsp-types from 0.94.1 to 0.95.0
 (#9117)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 Cargo.lock              | 4 ++--
 helix-lsp/Cargo.toml    | 2 +-
 helix-lsp/src/client.rs | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 42be9a140..5ab0c3a95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1434,9 +1434,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lsp-types"
-version = "0.94.1"
+version = "0.95.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
 dependencies = [
  "bitflags 1.3.2",
  "serde",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 7278d1fb8..851351e0e 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -22,7 +22,7 @@ futures-executor = "0.3"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 globset = "0.4.14"
 log = "0.4"
-lsp-types = { version = "0.94" }
+lsp-types = { version = "0.95" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 5266d4b0d..682d4db66 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -667,6 +667,7 @@ impl Client {
                 version: Some(String::from(VERSION_AND_GIT_HASH)),
             }),
             locale: None, // TODO
+            work_done_progress_params: lsp::WorkDoneProgressParams::default(),
         };
 
         self.request::<lsp::request::Initialize>(params).await

From a98b8ddd1a0337b7d4bf1b9722066685e5d3f16e Mon Sep 17 00:00:00 2001
From: Evan Richter <evanjrichter@gmail.com>
Date: Tue, 19 Dec 2023 16:31:27 -0700
Subject: [PATCH 566/967] add smali language support (#9089)

---
 book/src/generated/lang-support.md   |   1 +
 languages.toml                       |  13 ++
 runtime/queries/smali/folds.scm      |  12 ++
 runtime/queries/smali/highlights.scm | 216 +++++++++++++++++++++++++++
 runtime/queries/smali/indents.scm    |  31 ++++
 runtime/queries/smali/injections.scm |   2 +
 runtime/queries/smali/locals.scm     |  42 ++++++
 7 files changed, 317 insertions(+)
 create mode 100644 runtime/queries/smali/folds.scm
 create mode 100644 runtime/queries/smali/highlights.scm
 create mode 100644 runtime/queries/smali/indents.scm
 create mode 100644 runtime/queries/smali/injections.scm
 create mode 100644 runtime/queries/smali/locals.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 880b84e26..0c5b35cc6 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -148,6 +148,7 @@
 | scheme | ✓ |  | ✓ |  |
 | scss | ✓ |  |  | `vscode-css-language-server` |
 | slint | ✓ |  | ✓ | `slint-lsp` |
+| smali | ✓ |  | ✓ |  |
 | smithy | ✓ |  |  | `cs` |
 | sml | ✓ |  |  |  |
 | solidity | ✓ |  |  | `solc` |
diff --git a/languages.toml b/languages.toml
index 61dfdc41f..796069efd 100644
--- a/languages.toml
+++ b/languages.toml
@@ -956,6 +956,19 @@ indent = { tab-width = 2, unit = "  " }
 name = "java"
 source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e" }
 
+[[language]]
+name = "smali"
+scope = "source.smali"
+injection-regex = "smali"
+file-types = ["smali"]
+comment-token = "#"
+roots = []
+indent = { tab-width = 4, unit = "    " }
+
+[[grammar]]
+name = "smali"
+source = { git = "https://github.com/amaanq/tree-sitter-smali", rev = "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c" }
+
 [[language]]
 name = "ledger"
 scope = "source.ledger"
diff --git a/runtime/queries/smali/folds.scm b/runtime/queries/smali/folds.scm
new file mode 100644
index 000000000..c2062e5ef
--- /dev/null
+++ b/runtime/queries/smali/folds.scm
@@ -0,0 +1,12 @@
+[
+  (annotation_directive)
+  (array_data_directive)
+  (field_definition)
+  (method_definition)
+  (packed_switch_directive)
+  (param_directive)
+  (parameter_directive)
+  (sparse_switch_directive)
+  (subannotation_directive)
+  (list)
+] @fold
diff --git a/runtime/queries/smali/highlights.scm b/runtime/queries/smali/highlights.scm
new file mode 100644
index 000000000..f49dce0a2
--- /dev/null
+++ b/runtime/queries/smali/highlights.scm
@@ -0,0 +1,216 @@
+; Types
+
+(class_identifier
+  (identifier) @type)
+
+(primitive_type) @type.builtin
+
+((class_identifier
+   . (identifier) @_first @type.builtin
+   (identifier) @type.builtin)
+  (#match? @_first "^(android|dalvik|java|kotlinx)$"))
+
+((class_identifier
+   . (identifier) @_first @type.builtin
+   . (identifier) @_second @type.builtin
+   (identifier) @type.builtin)
+  (#eq? @_first "com")
+  (#match? @_second "^(android|google)$"))
+
+; Methods
+
+(method_definition
+  (method_signature (method_identifier) @function.method))
+
+(expression
+  (opcode) @_invoke
+	(body
+	  (full_method_signature
+      (method_signature (method_identifier) @function.method)))
+  (#match? @_invoke "^invoke"))
+
+(expression
+  (opcode) @_field_access
+	(body
+	  (field_identifier) @variable.other.member)
+  (#match? @_field_access "^[is](get|put)-"))
+
+(method_handle
+  (full_method_signature
+	(method_signature (method_identifier) @function.method)))
+
+(custom_invoke
+  . (identifier) @function.method
+  (method_signature (method_identifier) @function.method))
+
+(annotation_value
+  (body
+    (method_signature (method_identifier) @function.method)))
+
+(annotation_value
+  (body
+    (full_method_signature
+      (method_signature (method_identifier) @function.method))))
+
+(field_definition
+	(body
+		(method_signature (method_identifier) @function.method)))
+
+(field_definition
+	(body
+	  (full_method_signature
+		  (method_signature (method_identifier) @function.method))))
+
+((method_identifier) @constructor
+  (#match? @constructor "^(<init>|<clinit>)$"))
+
+"constructor" @constructor
+
+; Fields
+
+[
+  (field_identifier)
+  (annotation_key)
+] @variable.other.member
+
+((field_identifier) @constant
+  (#match? @constant "^[%u_]*$"))
+
+; Variables
+
+(variable) @variable.builtin
+
+(local_directive
+  (identifier) @variable)
+
+; Parameters
+
+(parameter) @variable.parameter
+(param_identifier) @variable.parameter
+
+; Labels
+
+[
+  (label)
+  (jmp_label)
+] @label
+
+; Operators
+
+; (opcode) @keyword.operator
+
+((opcode) @keyword.control.return
+  (#match? @keyword.control.return "^return"))
+
+((opcode) @keyword.control.conditional
+  (#match? @keyword.control.conditional "^if"))
+
+((opcode) @keyword.control.conditional
+  (#match? @keyword.control.conditional "^cmp"))
+
+((opcode) @keyword.control.exception
+  (#match? @keyword.control.exception "^throw"))
+
+[
+  "="
+  ".."
+] @operator
+
+; Keywords
+
+[
+  ".class"
+  ".super"
+  ".implements"
+  ".field"
+  ".end field"
+  ".annotation"
+  ".end annotation"
+  ".subannotation"
+  ".end subannotation"
+  ".param"
+  ".end param"
+  ".parameter"
+  ".end parameter"
+  ".local"
+  ".end local"
+  ".restart local"
+  ".registers"
+  ".packed-switch"
+  ".end packed-switch"
+  ".sparse-switch"
+  ".end sparse-switch"
+  ".array-data"
+  ".end array-data"
+  ".enum"
+  (prologue_directive)
+  (epilogue_directive)
+] @keyword
+
+[
+  ".source"
+] @keyword.directive
+
+[
+  ".method"
+  ".end method"
+] @keyword.function
+
+[
+  ".catch"
+  ".catchall"
+] @keyword.control.exception
+
+; Literals
+
+(string) @string
+(source_directive (string "\"" _ @string.special.url "\""))
+(escape_sequence) @constant.character.escape
+
+(character) @constant.character
+
+"L" @punctuation
+
+(line_directive (number) @comment) @comment
+(".locals" (number) @comment) @comment
+
+(number) @constant.numeric.integer
+
+[
+ (float)
+ (NaN)
+ (Infinity)
+] @constant.numeric.float
+
+(boolean) @constant.builtin.boolean
+
+(null) @constant.builtin
+
+; Misc
+
+(annotation_visibility) @keyword.storage.modifier
+
+(access_modifier) @keyword.storage.type
+
+(array_type
+  "[" @punctuation.special)
+
+["{" "}"] @punctuation.bracket
+
+["(" ")"] @punctuation.bracket
+
+[
+  "->"
+  ","
+  ":"
+  ";"
+  "@"
+  "/"
+] @punctuation.delimiter
+
+; Comments
+
+(comment) @comment
+
+(class_definition
+  (comment) @comment.block.documentation)
diff --git a/runtime/queries/smali/indents.scm b/runtime/queries/smali/indents.scm
new file mode 100644
index 000000000..8fad650ad
--- /dev/null
+++ b/runtime/queries/smali/indents.scm
@@ -0,0 +1,31 @@
+[
+  (annotation_directive)
+  (array_data_directive)
+  (field_definition)
+  (method_definition)
+  (packed_switch_directive)
+  (param_directive)
+  (parameter_directive)
+  (sparse_switch_directive)
+  (subannotation_directive)
+  (list)
+  "\{"
+] @indent
+
+[
+  ".end annotation"
+  ".end array-data"
+  ".end field"
+  ".end method"
+  ".end packed-switch"
+  ".end param"
+  ".end parameter"
+  ".end sparse-switch"
+  ".end subannotation"
+  "\}"
+] @outdent
+
+[
+  (ERROR)
+  (comment)
+] @indent.always
diff --git a/runtime/queries/smali/injections.scm b/runtime/queries/smali/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/runtime/queries/smali/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/smali/locals.scm b/runtime/queries/smali/locals.scm
new file mode 100644
index 000000000..343694901
--- /dev/null
+++ b/runtime/queries/smali/locals.scm
@@ -0,0 +1,42 @@
+[
+  (class_directive)
+  (expression)
+  (annotation_directive)
+  (array_data_directive)
+  (method_definition)
+  (packed_switch_directive)
+  (sparse_switch_directive)
+  (subannotation_directive)
+] @local.scope
+
+[
+  (identifier)
+  (class_identifier)
+  (label)
+  (jmp_label)
+] @local.reference
+
+(enum_reference
+  (field_identifier) @local.definition)
+
+((field_definition
+  (access_modifiers) @_mod
+  (field_identifier) @local.definition)
+  (#eq? @_mod "enum"))
+
+(field_definition
+  (field_identifier) @local.definition
+  (field_type) @local.definition)
+
+(annotation_key) @local.definition
+
+(method_definition
+  (method_signature (method_identifier) @local.definition))
+
+(param_identifier) @local.definition
+
+(annotation_directive
+  (class_identifier) @local.definition)
+
+(class_directive
+  (class_identifier) @local.definition)

From 5f04d09f030da0711b92894bd8dd6623135882ac Mon Sep 17 00:00:00 2001
From: 0rphee <0rph3e@proton.me>
Date: Wed, 20 Dec 2023 02:09:35 -0600
Subject: [PATCH 567/967] theme: update noctis (#9123)

---
 runtime/themes/noctis.toml | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml
index f4c2d5b5a..c9f95f7fe 100644
--- a/runtime/themes/noctis.toml
+++ b/runtime/themes/noctis.toml
@@ -7,8 +7,8 @@
 
 'property' = { fg = "red" } # Regex group names.
 "warning" = { fg ="yellow", modifiers = ["bold"] } # Editor warnings.
-"error" = { bg = "mid-green", fg = "red", modifiers = ["bold"] } # Editor errors, like mis-typing a command.
-"info" = { fg = "mid-blue", bg = "mid-green" } # Code diagnostic info in gutter (LSP).
+"error" = { fg = "red", modifiers = ["bold"] } # Editor errors, like mis-typing a command.
+"info" = { fg = "mid-blue" } # Code diagnostic info in gutter (LSP).
 # ? Difference between info and hint ?
 "hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP).
 
@@ -21,14 +21,14 @@
 # UI ==============================
 # For styling helix itself.
 
-'ui.background' = { bg = "dark-green"} # Default background color.
+'ui.background' = { fg = "autocomp-green", bg = "dark-green" } # Default background color.
 'ui.window' = { fg = "mid-green" } # Window border between splits.
 
 'ui.gutter' = { } # Left gutter for diagnostics and breakpoints.
 
 'ui.text' = { fg = "white" } # Default text color.
 'ui.text.focus' = { fg = "white", bg = "mid-green", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker.
-'ui.text.info' = { } # Info popup contents (space mode menu).
+'ui.text.info' = { fg = "white" } # Info popup contents (space mode menu).
 
 'ui.cursor' = { fg = "dark-green", bg = "white" } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c).
 'ui.cursor.primary' = { fg = "dark-green", bg = "light-blue" } # The primary cursor when there are multiple (shift-c).
@@ -40,8 +40,8 @@
 'ui.selection.primary' = { bg = "autocomp-green" } # The primary selection when there are multiple.
 'ui.cursorline.primary' = { bg = 'mid-green' }
 
-'ui.linenr' = { bg = "dark-green", fg = "gray"  } # Line numbers.
-'ui.linenr.selected' = { bg = "mid-green", fg = "light-green", modifiers = [ "bold" ] } # Current line number.
+'ui.linenr' = {  fg = "gray"  } # Line numbers.
+'ui.linenr.selected' = { fg = "light-green", modifiers = [ "bold" ] } # Current line number.
 
 'ui.virtual' = { fg = "mid-green" } # Namespace for additions to the editing area.
 'ui.virtual.ruler' = { bg = "mid-green" } # Vertical rulers (colored columns in editing area).
@@ -75,9 +75,9 @@
 #'type.builtin' = { } # Primitive types of the language (string, int, float).
 #'type.enum.variant' = { } # A variant of an enum.
 
-'constructor' = { fg = "mid-blue", modifiers = ["bold"]} # Constructor method for a class or struct. And in some cases applies to module names
+'constructor' = { fg = "light-blue", modifiers = ["bold"]} # Constructor method for a class or struct. And in some cases applies to module names
 
-'constant' = { fg = "light-blue" } # Constant value
+'constant' = { fg = "light-blue", modifiers = ["bold"] } # Constant value
 'constant.builtin' = { fg = "mid-blue", modifiers = ["bold"] } # Special constants like `true`, `false`, `none`, etc.
 'constant.builtin.boolean' = { } # True or False.
 'constant.character' = { fg = "light-green"} # Constant of character type.
@@ -88,21 +88,20 @@
 
 'string' = { fg = "light-green" } # String literal.
 'string.regexp' = { } # Regular expression literal.
-'string.special' = { fg = "light-blue" } # Strings containing a path, URL, etc.
-'string.special.path' = { } # String containing a file path.
-'string.special.url' = { } # String containing a web URL.
-'string.special.symbol' = { } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords.
+'string.special' = { fg = "red" } # Strings containing a path, URL, etc.
+# 'string.special.path' = { } # String containing a file path.
+# 'string.special.url' = { } # String containing a web URL.
+# 'string.special.symbol' = { } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords.
 
 'comment' = { fg = "gray", modifiers = ["italic"] } # This is a comment.
 'comment.line' = { } # Line comments, like this.
 'comment.block' = { } # Block comments, like /* this */ in some languages.
 'comment.block.documentation' = { } # Doc comments, e.g '///' in rust.
 
-'variable' = { fg = "white" }  # Variable names.
-'variable.builtin' = { } # Language reserved variables: `this`, `self`, `super`, etc.
-'variable.parameter' = { } # Function parameters.
-'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions).
-'variable.function' = { } # ?
+'variable' = { fg = "light-orange" }  # Variable names.
+# 'variable.builtin' = { } # Language reserved variables: `this`, `self`, `super`, etc.
+# 'variable.parameter' = { } # Function parameters.
+'variable.other.member' = { fg = "orange" } # Fields of composite data types (e.g. structs, unions).
 
 'label' = { fg = "purple" } # Loop labels in rust.
 
@@ -113,17 +112,17 @@
 'keyword' = { fg = "pink", modifiers = ["bold"] } # Language reserved keywords.
 'keyword.control' = { fg = "pink", modifiers = ["bold"] } # Control keywords.
 'keyword.control.conditional' = { fg = "pink", modifiers = ["bold"] } # 'if', 'else', 'elif'.
-'keyword.control.repeat' = { } # 'for', 'while', 'loop'.
+# 'keyword.control.repeat' = { } # 'for', 'while', 'loop'.
 'keyword.control.import' = { fg = "pink", modifiers = ["italic"] } # 'import', 'export' ('use'?).
-'keyword.control.return' = { } # 'return' in most languages.
+# 'keyword.control.return' = { } # 'return' in most languages.
 'keyword.control.exception' = {fg = "pink", modifiers = ["bold"] } # 'raise' in python.
-'keyword.operator' = { } # 'or', 'and', 'in'.
+'keyword.operator' = { fg = "pink" } # 'or', 'and', 'in'.
 'keyword.directive' = { fg = "purple" } # Preprocessor directives (#if in C).
-'keyword.function' = { } # The keyword to define a function: 'def', 'fun', 'fn'.
+'keyword.function' = { fg= "red" } # The keyword to define a function: 'def', 'fun', 'fn'.
 
 'operator' = { fg = "pink", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators
 
-'function' = { fg = "dark-blue"}
+'function' = { fg = "mid-blue"}
 'function.builtin' = { fg = "dark-blue" }
 'function.method' = { fg = "dark-blue" } # Class / Struct methods.
 'function.macro' = { fg = "purple" } # Like macros in rust.
@@ -181,8 +180,8 @@
 # Version control changes.
 
 'diff.plus' = "light-green" # { } # Additions.
-'diff.minus' = "yellow" # { } # Deletions.
-'diff.delta' = "red" # { } # Modifications.
+'diff.minus' = "red" # { } # Deletions.
+'diff.delta' = "yellow" # { } # Modifications.
 # 'diff.delta.moved' = { } # Renamed or moved files / changes.
 
 
@@ -197,8 +196,9 @@ yellow = "#ffd800"
 purple = "#918cff"
 white = "#b1cace"
 orange = "#ffa864"
+light-orange = "#fff2c5"
 gray = "#5b858b" # mainly for comments/background text
-light-gray = "#354e51" # used when whitespace rendering is enabled and for indent-guides
+light-gray = "#2a3c41" # used when whitespace rendering is enabled and for indent-guides
 red = "#e34e1b"
 
 dark-blue = "#19a2b7"

From 585402d9ffa1d271e7c72fbb1c90d7e9d2d51482 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 20 Dec 2023 23:09:26 -0600
Subject: [PATCH 568/967] Update upload/download-artifact actions to v4 (#9120)

---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eceb57f46..b483e3af0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Bundle grammars
         run: tar cJf grammars.tar.xz -C runtime/grammars/sources .
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: grammars
           path: grammars.tar.xz
@@ -106,7 +106,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download grammars
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Move grammars under runtime
         if: "!startsWith(matrix.os, 'windows')"
@@ -220,7 +220,7 @@ jobs:
           fi
           cp -r runtime dist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: bins-${{ matrix.build }}
           path: dist
@@ -233,7 +233,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
 
       - name: Build archive
         shell: bash
@@ -288,7 +288,7 @@ jobs:
           overwrite: true
       
       - name: Upload binaries as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: env.preview == 'true'
         with:
           name: release

From ab50299efa6e8dcd29b45aab41f8242ab17ef35a Mon Sep 17 00:00:00 2001
From: romi <r@sansfontieres.com>
Date: Fri, 22 Dec 2023 04:51:21 +0000
Subject: [PATCH 569/967] Add .glif to XML file-types (#9130)

`.glif` files are standard files in the type design industry. From the
Unified Font Object specification website:

The Glyph Interchange Format (GLIF) is a simple and clear XML
representation of a single glyph. GLIF files typically have a .glif
extension.
https://unifiedfontobject.org/versions/ufo3/glyphs/glif/
---
 languages.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 796069efd..4c6c9447d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2320,7 +2320,8 @@ file-types = [
   "xpdl",
   "xul",
   "xoml",
-  "musicxml"
+  "musicxml",
+  "glif"
 ]
 indent = { tab-width = 2, unit = "  " }
 

From 7b0f92bb3a33aac8e664b711e0b386e8c6167c66 Mon Sep 17 00:00:00 2001
From: Sharpened Blade <sharpenedblade@proton.me>
Date: Thu, 21 Dec 2023 20:52:26 -0800
Subject: [PATCH 570/967] Add markup styling to nord theme (#9135)

Fixes https://github.com/helix-editor/helix/issues/9131
---
 runtime/themes/nord.toml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index bc78db71d..dab31610f 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -134,6 +134,15 @@
 "ui.bufferline" = { fg = "nord5", bg = "nord1" }
 "ui.bufferline.active" = { fg = "nord6", bg = "nord2", underline = { color = "nord8", style = "line" }, modifiers = [ "italic" ] }
 
+# Markup
+"markup.heading" = "nord8"
+"markup.list" = "nord9"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.text" = "nord8"
+"markup.raw" = "nord7"
+
 [palette]
 # Polar Night is made up of four darker colors that are commonly used for base elements like backgrounds or text color in bright ambiance designs.
 #

From d5e6749fa250f3a7be75c81c7b0611e3c3221d63 Mon Sep 17 00:00:00 2001
From: goyalyashpal <yashpalgoyal1304@gmail.com>
Date: Fri, 22 Dec 2023 04:52:53 +0000
Subject: [PATCH 571/967] Reduce logo.svg size (-93B) (#9106)

* chore(logo): PrettyPrint to reduce size by 93B ...

  * Current size:  2,755 B
  * Original size: 2,848 B
  * Add file's final newline (linux convention)
  * Remove tag separator spaces
  * Add newlines
  * Add tab indentation (instead of 2/4 spaces)
  * Prettify root svg's attribs

* style(logo): Bring style attrb to front

* chore(logo): Remove tab characters

* chore(logo): Remove \n, use LF as final newline

* chore(logo): Minify logo.svg ...

  * Remove final newline too
---
 logo.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logo.svg b/logo.svg
index 05dd73a8a..a2d1c1109 100644
--- a/logo.svg
+++ b/logo.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75">     <g transform="matrix(1,0,0,1,-31352.7,-1817.25)">                  <g transform="matrix(1,0,0,1,31062.7,-20.8972)">             <g transform="matrix(1,0,0,1,-130.173,0.00185558)">                 <path d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z" style="fill:#706bc8;"></path>             </g>             <g transform="matrix(1,0,0,1,-130.173,0.00185558)">                 <path d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z" style="fill:#55c5e4;"></path>             </g>             <g transform="matrix(1,0,0,1,216.062,984.098)">                 <path d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z" style="fill:#84ddea;"></path>             </g>             <g transform="matrix(1,0,0,1,216.062,984.098)">                 <path d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z" style="fill:#997bc8;"></path></g></g></g> </svg>
\ No newline at end of file
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75"><g transform="matrix(1,0,0,1,-31352.7,-1817.25)"><g transform="matrix(1,0,0,1,31062.7,-20.8972)"><g transform="matrix(1,0,0,1,-130.173,0.00185558)"><path style="fill:#706bc8;" d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z"></path></g><g transform="matrix(1,0,0,1,-130.173,0.00185558)"><path style="fill:#55c5e4;" d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z"></path></g><g transform="matrix(1,0,0,1,216.062,984.098)"><path style="fill:#84ddea;" d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z"></path></g><g transform="matrix(1,0,0,1,216.062,984.098)"><path style="fill:#997bc8;" d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z"></path></g></g></g></svg>
\ No newline at end of file

From 1fc20cd02b007dc75387dddc72b6e4742b5459b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 13:33:08 +0900
Subject: [PATCH 572/967] build(deps): bump thiserror from 1.0.51 to 1.0.52
 (#9172)

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

---
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 5ab0c3a95..da51eb396 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2028,18 +2028,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.51"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
+checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.51"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
+checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
 dependencies = [
  "proc-macro2",
  "quote",

From 2ec4d5004d6efa4fa4df85dcd11d020dbeac7346 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 13:33:23 +0900
Subject: [PATCH 573/967] build(deps): bump futures-util from 0.3.29 to 0.3.30
 (#9171)

Bumps [futures-util](https://github.com/rust-lang/futures-rs) from 0.3.29 to 0.3.30.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.29...0.3.30)

---
updated-dependencies:
- dependency-name: futures-util
  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 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index da51eb396..b62890c74 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -469,9 +469,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
@@ -486,15 +486,15 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
  "futures-task",

From 00367820598725ee5206bd7b3a3d48957ea92767 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 13:33:46 +0900
Subject: [PATCH 574/967] build(deps): bump anyhow from 1.0.75 to 1.0.76
 (#9170)

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

---
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 b62890c74..beab4cd22 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
 
 [[package]]
 name = "arc-swap"

From c874a896a5151043a5cd7336e12ebc3a928fc677 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 13:34:58 +0900
Subject: [PATCH 575/967] build(deps): bump tokio from 1.35.0 to 1.35.1 (#9169)

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

---
updated-dependencies:
- dependency-name: tokio
  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 beab4cd22..1488020a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2101,9 +2101,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",

From 8653e1b02f6193330f8b0f2afff0a2ff103bd6a4 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sun, 26 Mar 2023 18:10:09 +0200
Subject: [PATCH 576/967] Add config to mark diagnostic sources as persistent

---
 book/src/languages.md         |   1 +
 helix-core/src/syntax.rs      |   2 +
 helix-term/src/application.rs | 105 ++++++++++++++++++++++------------
 helix-view/src/document.rs    |  21 ++++++-
 languages.toml                |   1 +
 5 files changed, 90 insertions(+), 40 deletions(-)

diff --git a/book/src/languages.md b/book/src/languages.md
index 632a9146c..944ebf097 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -69,6 +69,7 @@ These configuration keys are available:
 | `soft-wrap` | [editor.softwrap](./configuration.md#editorsoft-wrap-section)
 | `text-width`          |  Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set, defaults to `editor.text-width`   |
 | `workspace-lsp-roots`     | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml`. Overwrites the setting of the same name in `config.toml` if set. |
+| `persistent-diagnostic-sources` | An array of LSP diagnostic sources assumed unchanged when the language server resends the same set of diagnostics. Helix can track the position for these diagnostics internally instead. Useful for diagnostics that are recomputed on save.
 
 ### File-type detection and the `file-types` key
 
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index dd9223160..8d433260e 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -155,6 +155,8 @@ pub struct LanguageConfiguration {
     /// Hardcoded LSP root directories relative to the workspace root, like `examples` or `tools/fuzz`.
     /// Falling back to the current working directory if none are configured.
     pub workspace_lsp_roots: Option<Vec<PathBuf>>,
+    #[serde(default)]
+    pub persistent_diagnostic_sources: Vec<String>,
 }
 
 #[derive(Debug, PartialEq, Eq, Hash)]
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index ed085749b..35111ca59 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -717,7 +717,7 @@ impl Application {
                             ));
                         }
                     }
-                    Notification::PublishDiagnostics(params) => {
+                    Notification::PublishDiagnostics(mut params) => {
                         let path = match params.uri.to_file_path() {
                             Ok(path) => path,
                             Err(_) => {
@@ -731,31 +731,69 @@ impl Application {
                             return;
                         }
                         let offset_encoding = language_server.offset_encoding();
-                        let doc = self.editor.document_by_path_mut(&path).filter(|doc| {
-                            if let Some(version) = params.version {
-                                if version != doc.version() {
-                                    log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
-                                    return false;
+                        // have to inline the function because of borrow checking...
+                        let doc = self.editor.documents.values_mut()
+                            .find(|doc| doc.path().map(|p| p == &path).unwrap_or(false))
+                            .filter(|doc| {
+                                if let Some(version) = params.version {
+                                    if version != doc.version() {
+                                        log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
+                                        return false;
+                                    }
                                 }
-                            }
-
-                            true
-                        });
+                                true
+                            });
 
                         if let Some(doc) = doc {
-                            let lang_conf = doc.language_config();
-                            let text = doc.text();
+                            let lang_conf = doc.language.clone();
+                            let text = doc.text().clone();
+
+                            let mut unchaged_diag_sources_ = Vec::new();
+                            if let Some(lang_conf) = &lang_conf {
+                                if let Some(old_diagnostics) =
+                                    self.editor.diagnostics.get(&params.uri)
+                                {
+                                    if !lang_conf.persistent_diagnostic_sources.is_empty() {
+                                        // Sort diagnostics first by severity and then by line numbers.
+                                        // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
+                                        params
+                                            .diagnostics
+                                            .sort_unstable_by_key(|d| (d.severity, d.range.start));
+                                    }
+                                    for source in &lang_conf.persistent_diagnostic_sources {
+                                        let new_diagnostics = params
+                                            .diagnostics
+                                            .iter()
+                                            .filter(|d| d.source.as_ref() == Some(source));
+                                        let old_diagnostics = old_diagnostics
+                                            .iter()
+                                            .filter(|(d, d_server)| {
+                                                *d_server == server_id
+                                                    && d.source.as_ref() == Some(source)
+                                            })
+                                            .map(|(d, _)| d);
+                                        if new_diagnostics.eq(old_diagnostics) {
+                                            unchaged_diag_sources_.push(source.clone())
+                                        }
+                                    }
+                                }
+                            }
 
-                            let diagnostics = params
-                                .diagnostics
-                                .iter()
-                                .filter_map(|diagnostic| {
+                            let unchaged_diag_sources = &unchaged_diag_sources_;
+                            let diagnostics =
+                                params.diagnostics.iter().filter_map(move |diagnostic| {
                                     use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
                                     use lsp::DiagnosticSeverity;
 
+                                    if diagnostic.source.as_ref().map_or(false, |source| {
+                                        unchaged_diag_sources.contains(source)
+                                    }) {
+                                        return None;
+                                    }
+
                                     // TODO: convert inside server
                                     let start = if let Some(start) = lsp_pos_to_pos(
-                                        text,
+                                        &text,
                                         diagnostic.range.start,
                                         offset_encoding,
                                     ) {
@@ -766,7 +804,7 @@ impl Application {
                                     };
 
                                     let end = if let Some(end) =
-                                        lsp_pos_to_pos(text, diagnostic.range.end, offset_encoding)
+                                        lsp_pos_to_pos(&text, diagnostic.range.end, offset_encoding)
                                     {
                                         end
                                     } else {
@@ -786,7 +824,7 @@ impl Application {
                                             ),
                                         });
 
-                                    if let Some(lang_conf) = lang_conf {
+                                    if let Some(lang_conf) = &lang_conf {
                                         if let Some(severity) = severity {
                                             if severity < lang_conf.diagnostic_severity {
                                                 return None;
@@ -836,38 +874,31 @@ impl Application {
                                         data: diagnostic.data.clone(),
                                         language_server_id: server_id,
                                     })
-                                })
-                                .collect();
+                                });
 
-                            doc.replace_diagnostics(diagnostics, server_id);
+                            doc.replace_diagnostics(diagnostics, unchaged_diag_sources, server_id);
                         }
 
-                        let mut diagnostics = params
-                            .diagnostics
-                            .into_iter()
-                            .map(|d| (d, server_id))
-                            .collect();
+                        let diagnostics = params.diagnostics.into_iter().map(|d| (d, server_id));
 
                         // Insert the original lsp::Diagnostics here because we may have no open document
                         // for diagnosic message and so we can't calculate the exact position.
                         // When using them later in the diagnostics picker, we calculate them on-demand.
-                        match self.editor.diagnostics.entry(params.uri) {
+                        let diagnostics = match self.editor.diagnostics.entry(params.uri) {
                             Entry::Occupied(o) => {
                                 let current_diagnostics = o.into_mut();
                                 // there may entries of other language servers, which is why we can't overwrite the whole entry
                                 current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
-                                current_diagnostics.append(&mut diagnostics);
-                                // Sort diagnostics first by severity and then by line numbers.
-                                // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
+                                current_diagnostics.extend(diagnostics);
                                 current_diagnostics
-                                    .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
-                            }
-                            Entry::Vacant(v) => {
-                                diagnostics
-                                    .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
-                                v.insert(diagnostics);
+                                // Sort diagnostics first by severity and then by line numbers.
                             }
+                            Entry::Vacant(v) => v.insert(diagnostics.collect()),
                         };
+
+                        // Sort diagnostics first by severity and then by line numbers.
+                        // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
+                        diagnostics.sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
                     }
                     Notification::ShowMessage(params) => {
                         log::warn!("unhandled window/showMessage: {:?}", params);
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index bb61eaa6a..37b8a0bf7 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1706,11 +1706,26 @@ impl Document {
 
     pub fn replace_diagnostics(
         &mut self,
-        mut diagnostics: Vec<Diagnostic>,
+        diagnostics: impl IntoIterator<Item = Diagnostic>,
+        unchanged_sources: &[String],
         language_server_id: usize,
     ) {
-        self.clear_diagnostics(language_server_id);
-        self.diagnostics.append(&mut diagnostics);
+        if unchanged_sources.is_empty() {
+            self.clear_diagnostics(language_server_id);
+        } else {
+            self.diagnostics.retain(|d| {
+                if d.language_server_id != language_server_id {
+                    return true;
+                }
+
+                if let Some(source) = &d.source {
+                    unchanged_sources.contains(source)
+                } else {
+                    false
+                }
+            });
+        }
+        self.diagnostics.extend(diagnostics);
         self.diagnostics
             .sort_unstable_by_key(|diagnostic| diagnostic.range);
     }
diff --git a/languages.toml b/languages.toml
index 4c6c9447d..b47fb4e2b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -191,6 +191,7 @@ auto-format = true
 comment-token = "//"
 language-servers = [ "rust-analyzer" ]
 indent = { tab-width = 4, unit = "    " }
+persistent-diagnostic-sources = ["rustc", "clippy"]
 
 [language.auto-pairs]
 '(' = ')'

From 515ef17207878b78e4f5eda8bf710fa0aa1eae87 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sun, 26 Mar 2023 18:14:42 +0200
Subject: [PATCH 577/967] make diagnostics stick to word boundaries

Diagnostics are currently extended if text is inserted at their end. This is
desirable when inserting text after an identifier. For example consider:

let foo = 2;
    --- unused variable

Renaming the identifier should extend the diagnostic:

let foobar = 2;
    ------ unused variable

This is currently implemented in helix but as a consequence adding whitespaces
or a type hint also extends the diagnostic:

let foo      = 2;
    -------- unused variable
let foo: Bar = 2;
    -------- unused variable

In these cases the diagnostic should remain unchanged:

let foo      = 2;
    --- unused variable
let foo: Bar = 2;
    --- unused variable

As a heuristic helix will now only extend diagnostics that end on a word char
if new chars are appended to the word (so not for punctuation/ whitespace).
The idea for this mapping was inspired for the word level tracking vscode uses
for many positions. While VSCode doesn't currently update diagnostics after
receiving publishDiagnostic it does use this system for inlay hints for example.
Similarly, the new association mechanism implemented here can be used for word
level tracking of inlay hints.

A similar mapping function is implemented for word starts. Together
these can be used to make a diagnostic stick to a word. If that word
is removed that diagnostic is automatically removed too. This is the exact
same behavior VSCode inlay hints eixibit.
---
 helix-core/src/diagnostic.rs  |  4 ++
 helix-core/src/transaction.rs | 87 +++++++++++++++++++++++++++++------
 helix-term/src/application.rs | 11 ++++-
 helix-view/src/document.rs    | 38 +++++++++------
 4 files changed, 112 insertions(+), 28 deletions(-)

diff --git a/helix-core/src/diagnostic.rs b/helix-core/src/diagnostic.rs
index 0b75d2a58..52d77a9aa 100644
--- a/helix-core/src/diagnostic.rs
+++ b/helix-core/src/diagnostic.rs
@@ -39,6 +39,10 @@ pub enum DiagnosticTag {
 #[derive(Debug, Clone)]
 pub struct Diagnostic {
     pub range: Range,
+    // whether this diagnostic ends at the end of(or inside) a word
+    pub ends_at_word: bool,
+    pub starts_at_word: bool,
+    pub zero_width: bool,
     pub line: usize,
     pub message: String,
     pub severity: Option<Severity>,
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 1cea69116..f5a49cc11 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -1,7 +1,7 @@
 use ropey::RopeSlice;
 use smallvec::SmallVec;
 
-use crate::{Range, Rope, Selection, Tendril};
+use crate::{chars::char_is_word, Range, Rope, Selection, Tendril};
 use std::{borrow::Cow, iter::once};
 
 /// (from, to, replacement)
@@ -23,6 +23,30 @@ pub enum Operation {
 pub enum Assoc {
     Before,
     After,
+    /// Acts like `After` if a word character is inserted
+    /// after the position, otherwise acts like `Before`
+    AfterWord,
+    /// Acts like `Before` if a word character is inserted
+    /// before the position, otherwise acts like `After`
+    BeforeWord,
+}
+
+impl Assoc {
+    /// Whether to stick to gaps
+    fn stay_at_gaps(self) -> bool {
+        !matches!(self, Self::BeforeWord | Self::AfterWord)
+    }
+
+    fn insert_offset(self, s: &str) -> usize {
+        let chars = s.chars().count();
+        match self {
+            Assoc::After => chars,
+            Assoc::AfterWord => s.chars().take_while(|&c| char_is_word(c)).count(),
+            // return position before inserted text
+            Assoc::Before => 0,
+            Assoc::BeforeWord => chars - s.chars().rev().take_while(|&c| char_is_word(c)).count(),
+        }
+    }
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -415,8 +439,6 @@ impl ChangeSet {
                     map!(|pos, _| (old_end > pos).then_some(new_pos), i);
                 }
                 Insert(s) => {
-                    let ins = s.chars().count();
-
                     // a subsequent delete means a replace, consume it
                     if let Some((_, Delete(len))) = iter.peek() {
                         iter.next();
@@ -424,13 +446,13 @@ impl ChangeSet {
                         old_end = old_pos + len;
                         // in range of replaced text
                         map!(
-                            |pos, assoc| (old_end > pos).then(|| {
+                            |pos, assoc: Assoc| (old_end > pos).then(|| {
                                 // at point or tracking before
-                                if pos == old_pos || assoc == Assoc::Before {
+                                if pos == old_pos && assoc.stay_at_gaps() {
                                     new_pos
                                 } else {
                                     // place to end of insert
-                                    new_pos + ins
+                                    new_pos + assoc.insert_offset(s)
                                 }
                             }),
                             i
@@ -438,20 +460,15 @@ impl ChangeSet {
                     } else {
                         // at insert point
                         map!(
-                            |pos, assoc| (old_pos == pos).then(|| {
+                            |pos, assoc: Assoc| (old_pos == pos).then(|| {
                                 // return position before inserted text
-                                if assoc == Assoc::Before {
-                                    new_pos
-                                } else {
-                                    // after text
-                                    new_pos + ins
-                                }
+                                new_pos + assoc.insert_offset(s)
                             }),
                             i
                         );
                     }
 
-                    new_pos += ins;
+                    new_pos += s.chars().count();
                 }
             }
             old_pos = old_end;
@@ -884,6 +901,48 @@ mod test {
         let mut positions = [4, 2];
         cs.update_positions(positions.iter_mut().map(|pos| (pos, Assoc::After)));
         assert_eq!(positions, [4, 2]);
+        // stays at word boundary
+        let cs = ChangeSet {
+            changes: vec![
+                Retain(2), // <space><space>
+                Insert(" ab".into()),
+                Retain(2), // cd
+                Insert("de ".into()),
+            ],
+            len: 4,
+            len_after: 10,
+        };
+        assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 3);
+        assert_eq!(cs.map_pos(4, Assoc::AfterWord), 9);
+        let cs = ChangeSet {
+            changes: vec![
+                Retain(1), // <space>
+                Insert(" b".into()),
+                Delete(1), // c
+                Retain(1), // d
+                Insert("e ".into()),
+                Delete(1), // <space>
+            ],
+            len: 5,
+            len_after: 7,
+        };
+        assert_eq!(cs.map_pos(1, Assoc::BeforeWord), 2);
+        assert_eq!(cs.map_pos(3, Assoc::AfterWord), 5);
+        let cs = ChangeSet {
+            changes: vec![
+                Retain(1), // <space>
+                Insert("a".into()),
+                Delete(2), // <space>b
+                Retain(1), // d
+                Insert("e".into()),
+                Delete(1), // f
+                Retain(1), // <space>
+            ],
+            len: 5,
+            len_after: 7,
+        };
+        assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 1);
+        assert_eq!(cs.map_pos(4, Assoc::AfterWord), 4);
     }
 
     #[test]
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 35111ca59..2dd97b428 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,6 +1,7 @@
 use arc_swap::{access::Map, ArcSwap};
 use futures_util::Stream;
 use helix_core::{
+    chars::char_is_word,
     diagnostic::{DiagnosticTag, NumberOrString},
     path::get_relative_path,
     pos_at_coords, syntax, Selection,
@@ -811,7 +812,6 @@ impl Application {
                                         log::warn!("lsp position out of bounds - {:?}", diagnostic);
                                         return None;
                                     };
-
                                     let severity =
                                         diagnostic.severity.map(|severity| match severity {
                                             DiagnosticSeverity::ERROR => Error,
@@ -863,8 +863,17 @@ impl Application {
                                         Vec::new()
                                     };
 
+                                    let ends_at_word = start != end
+                                        && end != 0
+                                        && text.get_char(end - 1).map_or(false, char_is_word);
+                                    let starts_at_word = start != end
+                                        && text.get_char(start).map_or(false, char_is_word);
+
                                     Some(Diagnostic {
                                         range: Range { start, end },
+                                        ends_at_word,
+                                        starts_at_word,
+                                        zero_width: start == end,
                                         line: diagnostic.range.start.line as usize,
                                         message: diagnostic.message.clone(),
                                         severity,
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 37b8a0bf7..b4971c8a8 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1213,20 +1213,32 @@ impl Document {
 
             let changes = transaction.changes();
 
-            changes.update_positions(
-                self.diagnostics
-                    .iter_mut()
-                    .map(|diagnostic| (&mut diagnostic.range.start, Assoc::After)),
-            );
-            changes.update_positions(
-                self.diagnostics
-                    .iter_mut()
-                    .map(|diagnostic| (&mut diagnostic.range.end, Assoc::After)),
-            );
-            // map state.diagnostics over changes::map_pos too
-            for diagnostic in &mut self.diagnostics {
+            // map diagnostics over changes too
+            changes.update_positions(self.diagnostics.iter_mut().map(|diagnostic| {
+                let assoc = if diagnostic.starts_at_word {
+                    Assoc::BeforeWord
+                } else {
+                    Assoc::After
+                };
+                (&mut diagnostic.range.start, assoc)
+            }));
+            changes.update_positions(self.diagnostics.iter_mut().map(|diagnostic| {
+                let assoc = if diagnostic.ends_at_word {
+                    Assoc::AfterWord
+                } else {
+                    Assoc::Before
+                };
+                (&mut diagnostic.range.end, assoc)
+            }));
+            self.diagnostics.retain_mut(|diagnostic| {
+                if diagnostic.range.start > diagnostic.range.end
+                    || (!diagnostic.zero_width && diagnostic.range.start == diagnostic.range.end)
+                {
+                    return false;
+                }
                 diagnostic.line = self.text.char_to_line(diagnostic.range.start);
-            }
+                true
+            });
 
             self.diagnostics
                 .sort_unstable_by_key(|diagnostic| diagnostic.range);

From 783ff27b1ba901e30dbf9897f4faaeb123bebb12 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 20 May 2023 21:29:23 +0200
Subject: [PATCH 578/967] consistent diagnostic sorting

---
 helix-term/src/application.rs |  4 +++-
 helix-view/src/document.rs    | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 2dd97b428..3abe9cae5 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -907,7 +907,9 @@ impl Application {
 
                         // Sort diagnostics first by severity and then by line numbers.
                         // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
-                        diagnostics.sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
+                        diagnostics.sort_unstable_by_key(|(d, server_id)| {
+                            (d.severity, d.range.start, *server_id)
+                        });
                     }
                     Notification::ShowMessage(params) => {
                         log::warn!("unhandled window/showMessage: {:?}", params);
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index b4971c8a8..af950a3fc 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1240,8 +1240,13 @@ impl Document {
                 true
             });
 
-            self.diagnostics
-                .sort_unstable_by_key(|diagnostic| diagnostic.range);
+            self.diagnostics.sort_unstable_by_key(|diagnostic| {
+                (
+                    diagnostic.range,
+                    diagnostic.severity,
+                    diagnostic.language_server_id,
+                )
+            });
 
             // Update the inlay hint annotations' positions, helping ensure they are displayed in the proper place
             let apply_inlay_hint_changes = |annotations: &mut Rc<[InlineAnnotation]>| {
@@ -1738,8 +1743,13 @@ impl Document {
             });
         }
         self.diagnostics.extend(diagnostics);
-        self.diagnostics
-            .sort_unstable_by_key(|diagnostic| diagnostic.range);
+        self.diagnostics.sort_unstable_by_key(|diagnostic| {
+            (
+                diagnostic.range,
+                diagnostic.severity,
+                diagnostic.language_server_id,
+            )
+        });
     }
 
     pub fn clear_diagnostics(&mut self, language_server_id: usize) {

From 85fce2f5b6c9f35ab9d3361f3933288a28db83d4 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Fri, 29 Dec 2023 20:46:01 +0100
Subject: [PATCH 579/967] build(deps): bump gix from 0.56.0 to 0.57.0 (#9188)

---
 Cargo.lock           | 155 ++++++++++++++++++++++++-------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 88 insertions(+), 69 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1488020a4..3bfe61320 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -522,9 +522,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.56.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0dcdc9c60d66535897fa40a7ea2a635e72f99456b1d9ae86b7e170e80618cb"
+checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
 dependencies = [
  "gix-actor",
  "gix-commitgraph",
@@ -563,9 +563,9 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417"
+checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
 dependencies = [
  "bstr",
  "btoi",
@@ -577,18 +577,18 @@ dependencies = [
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f"
+checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.22.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36"
+checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
 dependencies = [
  "bstr",
  "gix-chunk",
@@ -600,9 +600,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.32.1"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3"
+checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -621,9 +621,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6419db582ea84dfb58c7e7b0af7fd62c808aa14954af2936a33f89b0f4ed018e"
+checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
 dependencies = [
  "bitflags 2.4.1",
  "bstr",
@@ -634,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be"
+checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
 dependencies = [
  "bstr",
  "itoa",
@@ -646,9 +646,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8119a985887cfe68f4bdf92e51bd64bc758a73882d82fcfc03ebcb164441c85d"
+checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -658,9 +658,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fad89416ebe0b3b7df78464124e2a02417b6cd3743d48ad93df86f4d2929c07"
+checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
 dependencies = [
  "bstr",
  "dunce",
@@ -673,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.36.1"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2"
+checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -691,18 +691,18 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107"
+checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
 dependencies = [
  "gix-features",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19"
+checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
 dependencies = [
  "bitflags 2.4.1",
  "bstr",
@@ -712,9 +712,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.13.3"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0"
+checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
 dependencies = [
  "faster-hex",
  "thiserror",
@@ -722,9 +722,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca"
+checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
 dependencies = [
  "gix-hash",
  "hashbrown 0.14.3",
@@ -733,9 +733,9 @@ dependencies = [
 
 [[package]]
 name = "gix-lock"
-version = "11.0.0"
+version = "12.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37"
+checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
 dependencies = [
  "gix-tempfile",
  "gix-utils",
@@ -744,9 +744,9 @@ dependencies = [
 
 [[package]]
 name = "gix-macros"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae"
+checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -755,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "febf79c5825720c1c63fe974c7bbe695d0cb54aabad73f45671c60ce0e501e33"
+checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
 dependencies = [
  "bstr",
  "btoi",
@@ -774,9 +774,9 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.55.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fae5f971540c99c6ecc8d4368ecc9d18a9dc8b9391025c68c4399747dc93bac"
+checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
 dependencies = [
  "arc-swap",
  "gix-date",
@@ -793,9 +793,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.45.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569491c92446fddf373456ff360aff9a9effd627b40a70f2d7914dcd75a3205"
+checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -813,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d86d6fac2fabe07b67b7835f46d07571f68b11aa1aaecae94fe722ea4ef305e1"
+checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -826,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "gix-quote"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2"
+checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
 dependencies = [
  "bstr",
  "btoi",
@@ -837,9 +837,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac23ed741583c792f573c028785db683496a6dfcd672ec701ee54ba6a77e1ff"
+checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -858,9 +858,9 @@ dependencies = [
 
 [[package]]
 name = "gix-refspec"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d9d3b82e1ee78fc0dc1c37ea5ea76c2dbc73f407db155f0dfcea285e583bee"
+checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -872,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5dd51710ce5434bc315ea30394fab483c5377276494edd79222b321a5a9544"
+checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
 dependencies = [
  "bstr",
  "gix-date",
@@ -888,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d4ed2493ca94a475fdf147138e1ef8bab3b6ebb56abf3d9bda1c05372ec1dd"
+checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -903,21 +903,21 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2"
+checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
 dependencies = [
  "bitflags 2.4.1",
  "gix-path",
  "libc",
- "windows",
+ "windows 0.52.0",
 ]
 
 [[package]]
 name = "gix-tempfile"
-version = "11.0.0"
+version = "12.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cc2205cf10d99f70b96e04e16c55d4c7cf33efc151df1f793e29fd12a931f8"
+checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
 dependencies = [
  "gix-fs",
  "libc",
@@ -928,15 +928,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b686a35799b53a9825575ca3f06481d0a053a409c4d97ffcf5ddd67a8760b497"
+checksum = "bda62acb44dd86a40c7c3762a5403cfc1ac789ea559df54085cedf79864f809e"
 
 [[package]]
 name = "gix-traverse"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2112088122a0206592c84fbd42020db63b2ccaed66a0293779f2e5fbf80474"
+checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -950,9 +950,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.25.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005"
+checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
 dependencies = [
  "bstr",
  "gix-features",
@@ -964,18 +964,18 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e"
+checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
 dependencies = [
  "fastrand",
 ]
 
 [[package]]
 name = "gix-validate"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f"
+checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
 dependencies = [
  "bstr",
  "thiserror",
@@ -1286,7 +1286,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows",
+ "windows 0.48.0",
 ]
 
 [[package]]
@@ -1624,9 +1624,9 @@ dependencies = [
 
 [[package]]
 name = "prodash"
-version = "26.2.2"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf"
+checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
 
 [[package]]
 name = "pulldown-cmark"
@@ -2384,6 +2384,25 @@ dependencies = [
  "windows-targets 0.48.0",
 ]
 
+[[package]]
+name = "windows"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index bdf4b54d9..dae4c0237 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.6.0" }
 
-gix = { version = "0.56.0", default-features = false , optional = true }
+gix = { version = "0.57.0", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From 7fd266efa9b90861f585d0cd7366c94bbeeaa81a Mon Sep 17 00:00:00 2001
From: Gabriel Lopes Rodrigues <gabriel3giga@gmail.com>
Date: Tue, 2 Jan 2024 12:29:22 -0300
Subject: [PATCH 580/967] Avoid crashing with 2 instances of the same LSP
 (#9134)

---
 helix-lsp/src/lib.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index b6a990659..34278cd54 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -915,10 +915,17 @@ fn start_client(
         }
 
         // next up, notify<initialized>
-        _client
+        let notification_result = _client
             .notify::<lsp::notification::Initialized>(lsp::InitializedParams {})
-            .await
-            .unwrap();
+            .await;
+
+        if let Err(e) = notification_result {
+            log::error!(
+                "failed to notify language server of its initialization: {}",
+                e
+            );
+            return;
+        }
 
         initialize_notify.notify_one();
     });

From a680b2e409769bf387e5bb7469215b90775e01ba Mon Sep 17 00:00:00 2001
From: Rose Hudson <rose@krx.sh>
Date: Tue, 2 Jan 2024 15:38:13 +0000
Subject: [PATCH 581/967] rust highlights: clean up constructor logic (#8957)

Enum variants and (tuple) structs are indistinguishable in general, so we
mark any PascalCase pattern or expression as a "constructor", which
covers all three.
---
 runtime/queries/rust/highlights.scm | 64 +++++++++++++++++++----------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 47e57e800..3cda9d520 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -189,6 +189,33 @@
 
 ; TODO: variable.mut to highlight mutable identifiers via locals.scm
 
+; -------
+; Constructors
+; -------
+; TODO: this is largely guesswork, remove it once we get actual info from locals.scm or r-a
+
+(struct_expression
+  name: (type_identifier) @constructor)
+
+(tuple_struct_pattern
+  type: [
+    (identifier) @constructor
+    (scoped_identifier
+      name: (identifier) @constructor)
+  ])
+(struct_pattern
+  type: [
+    ((type_identifier) @constructor)
+    (scoped_type_identifier
+      name: (type_identifier) @constructor)
+  ])
+(match_pattern
+  ((identifier) @constructor) (#match? @constructor "^[A-Z]"))
+(or_pattern
+  ((identifier) @constructor)
+  ((identifier) @constructor)
+  (#match? @constructor "^[A-Z]"))
+
 ; -------
 ; Guess Other Types
 ; -------
@@ -203,33 +230,28 @@
 
 (call_expression
   function: [
-    ((identifier) @type.enum.variant
-      (#match? @type.enum.variant "^[A-Z]"))
+    ((identifier) @constructor
+      (#match? @constructor "^[A-Z]"))
     (scoped_identifier
-      name: ((identifier) @type.enum.variant
-        (#match? @type.enum.variant "^[A-Z]")))
+      name: ((identifier) @constructor
+        (#match? @constructor "^[A-Z]")))
   ])
 
 ; ---
-; Assume that types in match arms are enums and not
-; tuple structs. Same for `if let` expressions.
+; PascalCase identifiers under a path which is also PascalCase
+; are assumed to be constructors if they have methods or fields.
 ; ---
 
-(match_pattern
-    (scoped_identifier
-      name: (identifier) @constructor))
-(tuple_struct_pattern
-    type: [
-      ((identifier) @constructor)
-      (scoped_identifier  
-        name: (identifier) @constructor)
-      ])
-(struct_pattern
-  type: [
-    ((type_identifier) @constructor)
-    (scoped_type_identifier
-      name: (type_identifier) @constructor)
-    ])
+(field_expression
+  value: (scoped_identifier
+    path: [
+      (identifier) @type
+      (scoped_identifier
+        name: (identifier) @type)
+    ]
+    name: (identifier) @constructor
+      (#match? @type "^[A-Z]")
+      (#match? @constructor "^[A-Z]")))
 
 ; ---
 ; Other PascalCase identifiers are assumed to be structs.

From efc4865c783e86812e34fd18ac333d5215dce708 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <708570+mmlb@users.noreply.github.com>
Date: Tue, 2 Jan 2024 17:16:37 -0500
Subject: [PATCH 582/967] Reduce logo sizes even more (#9211)

* Reduce logo.svg even more

While reading through commits to helix I saw
https://github.com/helix-editor/helix/pull/9106 and wondered if the
relatively-new-to-me svgo would do better than -95B diff, indeed it
does. Seeing as this file is "a minified file we're basically treating
as binary" anyway I figured might as well minify it further.

* Minimize all the svg logos
---
 logo.svg       |   2 +-
 logo_dark.svg  | 116 +------------------------------------------------
 logo_light.svg | 116 +------------------------------------------------
 3 files changed, 3 insertions(+), 231 deletions(-)

diff --git a/logo.svg b/logo.svg
index a2d1c1109..1408f897f 100644
--- a/logo.svg
+++ b/logo.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75"><g transform="matrix(1,0,0,1,-31352.7,-1817.25)"><g transform="matrix(1,0,0,1,31062.7,-20.8972)"><g transform="matrix(1,0,0,1,-130.173,0.00185558)"><path style="fill:#706bc8;" d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z"></path></g><g transform="matrix(1,0,0,1,-130.173,0.00185558)"><path style="fill:#55c5e4;" d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z"></path></g><g transform="matrix(1,0,0,1,216.062,984.098)"><path style="fill:#84ddea;" d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z"></path></g><g transform="matrix(1,0,0,1,216.062,984.098)"><path style="fill:#997bc8;" d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z"></path></g></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" viewBox="663.38 37.57 575.35 903.75"><path d="m1083.58 1875.72 551.48 318.4a47.66 47.66 0 0 1 23.82 41.27v105.94c0 8.51-2.27 16.7-6.38 23.83 0 0-437.8-252.76-545.3-314.83a47.245 47.245 0 0 1-23.62-40.92z" style="fill:#706bc8" transform="translate(-420.173 -1838.145)"/><path d="M1635.26 2604.84a47.228 47.228 0 0 1 23.62 40.91v133.69l-551.47-318.39a47.66 47.66 0 0 1-23.83-41.27v-105.94c0-8.52 2.27-16.71 6.38-23.83 0 0 437.8 252.76 545.3 314.83" style="fill:#55c5e4" transform="translate(-420.173 -1838.145)"/><path d="M790.407 1432.56a35.033 35.033 0 0 0-12.898 12.9c-9.647 16.7-4.036 38.3 12.495 48.13h-.006l-28.825-16.64a47.644 47.644 0 0 1-23.829-41.27v-105.94c0-17.03 9.083-32.76 23.829-41.27l498.417-287.73.24-.14a34.962 34.962 0 0 0 12.65-12.756c9.65-16.708 4.04-38.3-12.49-48.137h.01l28.82 16.642a47.648 47.648 0 0 1 23.83 41.273v105.938c0 17.03-9.08 32.76-23.83 41.27l-29.63 17.11.4-.26z" style="fill:#84ddea" transform="translate(-73.938 -854.05)"/><path d="M790.407 1686.24a35.08 35.08 0 0 0-12.898 12.89c-9.647 16.71-4.036 38.3 12.495 48.14h-.006l-28.825-16.64a47.656 47.656 0 0 1-23.829-41.27v-105.94c0-17.03 9.083-32.76 23.829-41.27l498.417-287.73.24-.14c5.09-2.99 9.5-7.29 12.65-12.76 9.65-16.71 4.04-38.3-12.49-48.14h.01l28.82 16.65a47.636 47.636 0 0 1 23.83 41.27v105.94c0 17.02-9.08 32.76-23.83 41.27l-29.63 17.1.4-.25z" style="fill:#997bc8" transform="translate(-73.938 -854.05)"/></svg>
\ No newline at end of file
diff --git a/logo_dark.svg b/logo_dark.svg
index f6e94f1b4..30ff77963 100644
--- a/logo_dark.svg
+++ b/logo_dark.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   xml:space="preserve"
-   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"
-   viewBox="663.38 37.57 2087.006 903.71997"
-   id="svg22"
-   sodipodi:docname="logo_dark.svg"
-   width="2087.0059"
-   height="903.71997"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs26"><rect
-     x="713.02588"
-     y="-304.32538"
-     width="3615.2336"
-     height="1864.7544"
-     id="rect14663" /><rect
-     x="972.073"
-     y="151.15895"
-     width="2140.9646"
-     height="684.86273"
-     id="rect447" /><rect
-     x="897.0401"
-     y="217.45384"
-     width="837.72321"
-     height="631.59924"
-     id="rect435" /><rect
-     x="825.67834"
-     y="157.61452"
-     width="1496.2448"
-     height="861.45544"
-     id="rect429" /><rect
-     x="798.3819"
-     y="-42.157242"
-     width="2236.0837"
-     height="945.90723"
-     id="rect315" /><rect
-     x="661.30237"
-     y="48.087799"
-     width="769.15619"
-     height="828.46844"
-     id="rect309" /></defs><sodipodi:namedview
-   id="namedview24"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="0.28409405"
-   inkscape:cx="1904.2989"
-   inkscape:cy="633.59299"
-   inkscape:window-width="1908"
-   inkscape:window-height="2075"
-   inkscape:window-x="26"
-   inkscape:window-y="23"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg22" />     <g
-   transform="translate(-31352.726,-1817.2547)"
-   id="g20">                  <g
-   transform="translate(31062.7,-20.8972)"
-   id="g18">             <g
-   transform="translate(-130.173,0.00185558)"
-   id="g4">                 <path
-   d="m 1083.58,1875.72 551.48,318.4 c 14.74,8.51 23.82,24.25 23.82,41.27 0,29.59 0,76.35 0,105.94 0,8.51 -2.27,16.7 -6.38,23.83 0,0 -437.8,-252.76 -545.3,-314.83 -14.62,-8.44 -23.62,-24.04 -23.62,-40.92 0,-45.91 0,-133.69 0,-133.69 z"
-   style="fill:#706bc8"
-   id="path2" />             </g>             <g
-   transform="translate(-130.173,0.00185558)"
-   id="g8">                 <path
-   d="m 1635.26,2604.84 c 14.62,8.44 23.62,24.03 23.62,40.91 0,45.92 0,133.69 0,133.69 l -551.47,-318.39 c -14.75,-8.52 -23.83,-24.25 -23.83,-41.27 0,-29.59 0,-76.36 0,-105.94 0,-8.52 2.27,-16.71 6.38,-23.83 0,0 437.8,252.76 545.3,314.83 z"
-   style="fill:#55c5e4"
-   id="path6" />             </g>             <g
-   transform="translate(216.062,984.098)"
-   id="g12">                 <path
-   d="m 790.407,1432.56 c -5.193,2.99 -9.69,7.34 -12.898,12.9 -9.647,16.7 -4.036,38.3 12.495,48.13 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.24 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.983 9.5,-7.286 12.65,-12.756 9.65,-16.708 4.04,-38.3 -12.49,-48.137 h 0.01 l 28.82,16.642 c 14.75,8.513 23.83,24.246 23.83,41.273 0,29.588 0,76.348 0,105.938 0,17.03 -9.08,32.76 -23.83,41.27 l -29.63,17.11 0.4,-0.26 z"
-   style="fill:#84ddea"
-   id="path10" />             </g>             <g
-   transform="translate(216.062,984.098)"
-   id="g16">                 <path
-   d="m 790.407,1686.24 c -5.193,2.99 -9.69,7.34 -12.898,12.89 -9.647,16.71 -4.036,38.3 12.495,48.14 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.25 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.99 9.5,-7.29 12.65,-12.76 9.65,-16.71 4.04,-38.3 -12.49,-48.14 h 0.01 l 28.82,16.65 c 14.75,8.51 23.83,24.24 23.83,41.27 0,29.59 0,76.35 0,105.94 0,17.02 -9.08,32.76 -23.83,41.27 l -29.63,17.1 0.4,-0.25 z"
-   style="fill:#997bc8"
-   id="path14" /></g></g></g> <text
-   xml:space="preserve"
-   transform="translate(663.354,37.565425)"
-   id="text307"
-   style="font-size:4px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect309);display:inline;fill:#006400;stroke:#006400;stroke-width:2.66667" /><g
-   aria-label="Helix"
-   transform="matrix(1.3113898,0,0,1.3113898,142.0244,48.21073)"
-   id="text445"
-   style="font-size:4px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect447);display:inline;fill:#f0f6fc;stroke:#f0f6fc;stroke-width:2.66687;stroke-opacity:1;fill-opacity:1"><path
-     d="m 1242.0723,515.10828 h -60.4 v -123.2 h -113.2 v 123.2 h -60.4 v -285.6 h 60.4 v 112 h 113.2 v -112 h 60.4 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
-     id="path14794" /><path
-     d="m 1399.272,292.70828 q 30.4,0 52,11.6 22,11.6 34,33.6 12,22 12,54 v 28.8 h -140.8 q 0.8,25.2 14.8,39.6 14.4,14.4 39.6,14.4 21.2,0 38.4,-4 17.2,-4.4 35.6,-13.2 v 46 q -16,8 -34,11.6 -17.6,4 -42.8,4 -32.8,0 -58,-12 -25.2,-12.4 -39.6,-37.2 -14.4,-24.8 -14.4,-62.4 0,-38.4 12.8,-63.6 13.2,-25.6 36.4,-38.4 23.2,-12.8 54,-12.8 z m 0.4,42.4 q -17.2,0 -28.8,11.2 -11.2,11.2 -13.2,34.8 h 83.6 q 0,-13.2 -4.8,-23.6 -4.4,-10.4 -13.6,-16.4 -9.2,-6 -23.2,-6 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
-     id="path14796" /><path
-     d="m 1605.2719,515.10828 h -59.6 v -304 h 59.6 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
-     id="path14798" /><path
-     d="m 1727.272,296.70828 v 218.4 h -59.6 v -218.4 z m -29.6,-85.6 q 13.2,0 22.8,6.4 9.6,6 9.6,22.8 0,16.4 -9.6,22.8 -9.6,6.4 -22.8,6.4 -13.6,0 -23.2,-6.4 -9.2,-6.4 -9.2,-22.8 0,-16.8 9.2,-22.8 9.6,-6.4 23.2,-6.4 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
-     id="path14800" /><path
-     d="m 1834.4721,403.50828 -70.4,-106.8 h 67.6 l 42.4,69.6 42.8,-69.6 h 67.6 l -71.2,106.8 74.4,111.6 h -67.6 l -46,-74.8 -46,74.8 h -67.6 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
-     id="path14802" /></g><text
-   xml:space="preserve"
-   transform="translate(663.38,37.570044)"
-   id="text14661"
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:997.723px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, @wght=700';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 700;white-space:pre;shape-inside:url(#rect14663);display:inline;fill:#2a292f;fill-opacity:1;stroke:#2a292f;stroke-width:6.652;stroke-dasharray:none;stroke-opacity:1" /></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="2087.006" height="903.72" style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" viewBox="663.38 37.57 2087.006 903.72"><defs><path id="c" d="M713.026-304.325H4328.26v1864.754H713.026z"/><path id="b" d="M972.073 151.159h2140.965v684.863H972.073z"/><path id="a" d="M661.302 48.088h769.156v828.468H661.302z"/></defs><path d="m1083.58 1875.72 551.48 318.4a47.66 47.66 0 0 1 23.82 41.27v105.94c0 8.51-2.27 16.7-6.38 23.83 0 0-437.8-252.76-545.3-314.83a47.245 47.245 0 0 1-23.62-40.92v-133.69z" style="fill:#706bc8" transform="translate(-420.199 -1838.15)"/><path d="M1635.26 2604.84a47.228 47.228 0 0 1 23.62 40.91v133.69l-551.47-318.39a47.66 47.66 0 0 1-23.83-41.27v-105.94c0-8.52 2.27-16.71 6.38-23.83 0 0 437.8 252.76 545.3 314.83" style="fill:#55c5e4" transform="translate(-420.199 -1838.15)"/><path d="M790.407 1432.56a35.033 35.033 0 0 0-12.898 12.9c-9.647 16.7-4.036 38.3 12.495 48.13h-.006l-28.825-16.64a47.644 47.644 0 0 1-23.829-41.27v-105.94c0-17.03 9.083-32.76 23.829-41.27l498.417-287.73.24-.14a34.962 34.962 0 0 0 12.65-12.756c9.65-16.708 4.04-38.3-12.49-48.137h.01l28.82 16.642a47.648 47.648 0 0 1 23.83 41.273v105.938c0 17.03-9.08 32.76-23.83 41.27l-29.63 17.11.4-.26z" style="fill:#84ddea" transform="translate(-73.964 -854.054)"/><path d="M790.407 1686.24a35.08 35.08 0 0 0-12.898 12.89c-9.647 16.71-4.036 38.3 12.495 48.14h-.006l-28.825-16.64a47.656 47.656 0 0 1-23.829-41.27v-105.94c0-17.03 9.083-32.76 23.829-41.27l498.417-287.73.24-.14c5.09-2.99 9.5-7.29 12.65-12.76 9.65-16.71 4.04-38.3-12.49-48.14h.01l28.82 16.65a47.636 47.636 0 0 1 23.83 41.27v105.94c0 17.02-9.08 32.76-23.83 41.27l-29.63 17.1.4-.25z" style="fill:#997bc8" transform="translate(-73.964 -854.054)"/><g aria-label="Helix" style="font-size:4px;-inkscape-font-specification:&quot;sans-serif, Normal&quot;;white-space:pre;shape-inside:url(#b);display:inline;fill:#f0f6fc;stroke:#f0f6fc;stroke-width:2.66687;stroke-opacity:1;fill-opacity:1" transform="matrix(1.31139 0 0 1.31139 142.024 48.21)"><path d="M1242.072 515.108h-60.4v-123.2h-113.2v123.2h-60.4v-285.6h60.4v112h113.2v-112h60.4zM1399.272 292.708q30.4 0 52 11.6 22 11.6 34 33.6t12 54v28.8h-140.8q.8 25.2 14.8 39.6 14.4 14.4 39.6 14.4 21.2 0 38.4-4 17.2-4.4 35.6-13.2v46q-16 8-34 11.6-17.6 4-42.8 4-32.8 0-58-12-25.2-12.4-39.6-37.2-14.4-24.8-14.4-62.4 0-38.4 12.8-63.6 13.2-25.6 36.4-38.4 23.2-12.8 54-12.8zm.4 42.4q-17.2 0-28.8 11.2-11.2 11.2-13.2 34.8h83.6q0-13.2-4.8-23.6-4.4-10.4-13.6-16.4-9.2-6-23.2-6zM1605.272 515.108h-59.6v-304h59.6zM1727.272 296.708v218.4h-59.6v-218.4zm-29.6-85.6q13.2 0 22.8 6.4 9.6 6 9.6 22.8 0 16.4-9.6 22.8-9.6 6.4-22.8 6.4-13.6 0-23.2-6.4-9.2-6.4-9.2-22.8 0-16.8 9.2-22.8 9.6-6.4 23.2-6.4zM1834.472 403.508l-70.4-106.8h67.6l42.4 69.6 42.8-69.6h67.6l-71.2 106.8 74.4 111.6h-67.6l-46-74.8-46 74.8h-67.6z" style="font-size:400px;-inkscape-font-specification:&quot;sans-serif, @wght=700&quot;;font-variation-settings:&quot;wght&quot;700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"/></g></svg>
\ No newline at end of file
diff --git a/logo_light.svg b/logo_light.svg
index cdd5ddb8b..014443bce 100644
--- a/logo_light.svg
+++ b/logo_light.svg
@@ -1,115 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   xml:space="preserve"
-   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"
-   viewBox="663.38 37.57 2087.006 903.71997"
-   id="svg22"
-   sodipodi:docname="logo_light.svg"
-   width="2087.0059"
-   height="903.71997"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs26"><rect
-     x="713.02588"
-     y="-304.32538"
-     width="3615.2336"
-     height="1864.7544"
-     id="rect14663" /><rect
-     x="972.073"
-     y="151.15895"
-     width="2140.9646"
-     height="684.86273"
-     id="rect447" /><rect
-     x="897.0401"
-     y="217.45384"
-     width="837.72321"
-     height="631.59924"
-     id="rect435" /><rect
-     x="825.67834"
-     y="157.61452"
-     width="1496.2448"
-     height="861.45544"
-     id="rect429" /><rect
-     x="798.3819"
-     y="-42.157242"
-     width="2236.0837"
-     height="945.90723"
-     id="rect315" /><rect
-     x="661.30237"
-     y="48.087799"
-     width="769.15619"
-     height="828.46844"
-     id="rect309" /></defs><sodipodi:namedview
-   id="namedview24"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   showgrid="false"
-   inkscape:zoom="0.28409405"
-   inkscape:cx="1904.2989"
-   inkscape:cy="633.59299"
-   inkscape:window-width="1908"
-   inkscape:window-height="2075"
-   inkscape:window-x="26"
-   inkscape:window-y="23"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg22" />     <g
-   transform="translate(-31352.726,-1817.2547)"
-   id="g20">                  <g
-   transform="translate(31062.7,-20.8972)"
-   id="g18">             <g
-   transform="translate(-130.173,0.00185558)"
-   id="g4">                 <path
-   d="m 1083.58,1875.72 551.48,318.4 c 14.74,8.51 23.82,24.25 23.82,41.27 0,29.59 0,76.35 0,105.94 0,8.51 -2.27,16.7 -6.38,23.83 0,0 -437.8,-252.76 -545.3,-314.83 -14.62,-8.44 -23.62,-24.04 -23.62,-40.92 0,-45.91 0,-133.69 0,-133.69 z"
-   style="fill:#706bc8"
-   id="path2" />             </g>             <g
-   transform="translate(-130.173,0.00185558)"
-   id="g8">                 <path
-   d="m 1635.26,2604.84 c 14.62,8.44 23.62,24.03 23.62,40.91 0,45.92 0,133.69 0,133.69 l -551.47,-318.39 c -14.75,-8.52 -23.83,-24.25 -23.83,-41.27 0,-29.59 0,-76.36 0,-105.94 0,-8.52 2.27,-16.71 6.38,-23.83 0,0 437.8,252.76 545.3,314.83 z"
-   style="fill:#55c5e4"
-   id="path6" />             </g>             <g
-   transform="translate(216.062,984.098)"
-   id="g12">                 <path
-   d="m 790.407,1432.56 c -5.193,2.99 -9.69,7.34 -12.898,12.9 -9.647,16.7 -4.036,38.3 12.495,48.13 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.24 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.983 9.5,-7.286 12.65,-12.756 9.65,-16.708 4.04,-38.3 -12.49,-48.137 h 0.01 l 28.82,16.642 c 14.75,8.513 23.83,24.246 23.83,41.273 0,29.588 0,76.348 0,105.938 0,17.03 -9.08,32.76 -23.83,41.27 l -29.63,17.11 0.4,-0.26 z"
-   style="fill:#84ddea"
-   id="path10" />             </g>             <g
-   transform="translate(216.062,984.098)"
-   id="g16">                 <path
-   d="m 790.407,1686.24 c -5.193,2.99 -9.69,7.34 -12.898,12.89 -9.647,16.71 -4.036,38.3 12.495,48.14 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.25 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.99 9.5,-7.29 12.65,-12.76 9.65,-16.71 4.04,-38.3 -12.49,-48.14 h 0.01 l 28.82,16.65 c 14.75,8.51 23.83,24.24 23.83,41.27 0,29.59 0,76.35 0,105.94 0,17.02 -9.08,32.76 -23.83,41.27 l -29.63,17.1 0.4,-0.25 z"
-   style="fill:#997bc8"
-   id="path14" /></g></g></g> <text
-   xml:space="preserve"
-   transform="translate(663.354,37.565425)"
-   id="text307"
-   style="font-size:4px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect309);display:inline;fill:#006400;stroke:#006400;stroke-width:2.66667" /><g
-   aria-label="Helix"
-   transform="matrix(1.3113898,0,0,1.3113898,142.0244,48.21073)"
-   id="text445"
-   style="font-size:4px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect447);display:inline;fill:#2a292f;stroke:#2a292f;stroke-width:2.66687"><path
-     d="m 1242.0723,515.10828 h -60.4 v -123.2 h -113.2 v 123.2 h -60.4 v -285.6 h 60.4 v 112 h 113.2 v -112 h 60.4 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
-     id="path14794" /><path
-     d="m 1399.272,292.70828 q 30.4,0 52,11.6 22,11.6 34,33.6 12,22 12,54 v 28.8 h -140.8 q 0.8,25.2 14.8,39.6 14.4,14.4 39.6,14.4 21.2,0 38.4,-4 17.2,-4.4 35.6,-13.2 v 46 q -16,8 -34,11.6 -17.6,4 -42.8,4 -32.8,0 -58,-12 -25.2,-12.4 -39.6,-37.2 -14.4,-24.8 -14.4,-62.4 0,-38.4 12.8,-63.6 13.2,-25.6 36.4,-38.4 23.2,-12.8 54,-12.8 z m 0.4,42.4 q -17.2,0 -28.8,11.2 -11.2,11.2 -13.2,34.8 h 83.6 q 0,-13.2 -4.8,-23.6 -4.4,-10.4 -13.6,-16.4 -9.2,-6 -23.2,-6 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
-     id="path14796" /><path
-     d="m 1605.2719,515.10828 h -59.6 v -304 h 59.6 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
-     id="path14798" /><path
-     d="m 1727.272,296.70828 v 218.4 h -59.6 v -218.4 z m -29.6,-85.6 q 13.2,0 22.8,6.4 9.6,6 9.6,22.8 0,16.4 -9.6,22.8 -9.6,6.4 -22.8,6.4 -13.6,0 -23.2,-6.4 -9.2,-6.4 -9.2,-22.8 0,-16.8 9.2,-22.8 9.6,-6.4 23.2,-6.4 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
-     id="path14800" /><path
-     d="m 1834.4721,403.50828 -70.4,-106.8 h 67.6 l 42.4,69.6 42.8,-69.6 h 67.6 l -71.2,106.8 74.4,111.6 h -67.6 l -46,-74.8 -46,74.8 h -67.6 z"
-     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
-     id="path14802" /></g><text
-   xml:space="preserve"
-   transform="translate(663.38,37.570044)"
-   id="text14661"
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:997.723px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, @wght=700';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 700;white-space:pre;shape-inside:url(#rect14663);display:inline;fill:#2a292f;fill-opacity:1;stroke:#2a292f;stroke-width:6.652;stroke-dasharray:none;stroke-opacity:1" /></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="2087.006" height="903.72" style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" viewBox="663.38 37.57 2087.006 903.72"><defs><path id="c" d="M713.026-304.325H4328.26v1864.754H713.026z"/><path id="b" d="M972.073 151.159h2140.965v684.863H972.073z"/><path id="a" d="M661.302 48.088h769.156v828.468H661.302z"/></defs><path d="m1083.58 1875.72 551.48 318.4a47.66 47.66 0 0 1 23.82 41.27v105.94c0 8.51-2.27 16.7-6.38 23.83 0 0-437.8-252.76-545.3-314.83a47.245 47.245 0 0 1-23.62-40.92v-133.69z" style="fill:#706bc8" transform="translate(-420.199 -1838.15)"/><path d="M1635.26 2604.84a47.228 47.228 0 0 1 23.62 40.91v133.69l-551.47-318.39a47.66 47.66 0 0 1-23.83-41.27v-105.94c0-8.52 2.27-16.71 6.38-23.83 0 0 437.8 252.76 545.3 314.83" style="fill:#55c5e4" transform="translate(-420.199 -1838.15)"/><path d="M790.407 1432.56a35.033 35.033 0 0 0-12.898 12.9c-9.647 16.7-4.036 38.3 12.495 48.13h-.006l-28.825-16.64a47.644 47.644 0 0 1-23.829-41.27v-105.94c0-17.03 9.083-32.76 23.829-41.27l498.417-287.73.24-.14a34.962 34.962 0 0 0 12.65-12.756c9.65-16.708 4.04-38.3-12.49-48.137h.01l28.82 16.642a47.648 47.648 0 0 1 23.83 41.273v105.938c0 17.03-9.08 32.76-23.83 41.27l-29.63 17.11.4-.26z" style="fill:#84ddea" transform="translate(-73.964 -854.054)"/><path d="M790.407 1686.24a35.08 35.08 0 0 0-12.898 12.89c-9.647 16.71-4.036 38.3 12.495 48.14h-.006l-28.825-16.64a47.656 47.656 0 0 1-23.829-41.27v-105.94c0-17.03 9.083-32.76 23.829-41.27l498.417-287.73.24-.14c5.09-2.99 9.5-7.29 12.65-12.76 9.65-16.71 4.04-38.3-12.49-48.14h.01l28.82 16.65a47.636 47.636 0 0 1 23.83 41.27v105.94c0 17.02-9.08 32.76-23.83 41.27l-29.63 17.1.4-.25z" style="fill:#997bc8" transform="translate(-73.964 -854.054)"/><g aria-label="Helix" style="font-size:4px;-inkscape-font-specification:&quot;sans-serif, Normal&quot;;white-space:pre;shape-inside:url(#b);display:inline;fill:#2a292f;stroke:#2a292f;stroke-width:2.66687" transform="matrix(1.31139 0 0 1.31139 142.024 48.21)"><path d="M1242.072 515.108h-60.4v-123.2h-113.2v123.2h-60.4v-285.6h60.4v112h113.2v-112h60.4zM1399.272 292.708q30.4 0 52 11.6 22 11.6 34 33.6t12 54v28.8h-140.8q.8 25.2 14.8 39.6 14.4 14.4 39.6 14.4 21.2 0 38.4-4 17.2-4.4 35.6-13.2v46q-16 8-34 11.6-17.6 4-42.8 4-32.8 0-58-12-25.2-12.4-39.6-37.2-14.4-24.8-14.4-62.4 0-38.4 12.8-63.6 13.2-25.6 36.4-38.4 23.2-12.8 54-12.8zm.4 42.4q-17.2 0-28.8 11.2-11.2 11.2-13.2 34.8h83.6q0-13.2-4.8-23.6-4.4-10.4-13.6-16.4-9.2-6-23.2-6zM1605.272 515.108h-59.6v-304h59.6zM1727.272 296.708v218.4h-59.6v-218.4zm-29.6-85.6q13.2 0 22.8 6.4 9.6 6 9.6 22.8 0 16.4-9.6 22.8-9.6 6.4-22.8 6.4-13.6 0-23.2-6.4-9.2-6.4-9.2-22.8 0-16.8 9.2-22.8 9.6-6.4 23.2-6.4zM1834.472 403.508l-70.4-106.8h67.6l42.4 69.6 42.8-69.6h67.6l-71.2 106.8 74.4 111.6h-67.6l-46-74.8-46 74.8h-67.6z" style="font-size:400px;-inkscape-font-specification:&quot;sans-serif, @wght=700&quot;;font-variation-settings:&quot;wght&quot;700"/></g></svg>
\ No newline at end of file

From a6ed104ea2787b523379895b7eb23998aae121f4 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Wed, 3 Jan 2024 00:47:59 +0200
Subject: [PATCH 583/967] Add .prettierrc to json file types (#9214)

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

diff --git a/languages.toml b/languages.toml
index b47fb4e2b..7b4b5b8b5 100644
--- a/languages.toml
+++ b/languages.toml
@@ -348,7 +348,8 @@ file-types = [
   ".vuerc",
   "composer.lock",
   ".watchmanconfig",
-  "avsc"
+  "avsc",
+  ".prettierrc"
 ]
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true

From 5876b763e1d0787a773749a6b26a237c223216b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:37:22 +0900
Subject: [PATCH 584/967] build(deps): bump gix from 0.57.0 to 0.57.1 (#9202)

Bumps [gix](https://github.com/Byron/gitoxide) from 0.57.0 to 0.57.1.
- [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.57.0...gix-v0.57.1)

---
updated-dependencies:
- dependency-name: gix
  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           | 120 +++++++++++++++++++++----------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3bfe61320..4fdb4c46e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -522,9 +522,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.57.0"
+version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
+checksum = "6dd025382892c7b500a9ce1582cd803f9c2ebfe44aff52e9c7f86feee7ced75e"
 dependencies = [
  "gix-actor",
  "gix-commitgraph",
@@ -563,9 +563,9 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.29.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
+checksum = "da27b5ab4ab5c75ff891dccd48409f8cc53c28a79480f1efdd33184b2dc1d958"
 dependencies = [
  "bstr",
  "btoi",
@@ -577,18 +577,18 @@ dependencies = [
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
+checksum = "003ec6deacf68076a0c157271a127e0bb2c031c1a41f7168cbe5d248d9b85c78"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
+checksum = "8a39c675fd737cb43a2120eddf1aa652c19d76b28d79783a198ac1b398ed9ce6"
 dependencies = [
  "bstr",
  "gix-chunk",
@@ -600,9 +600,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.33.0"
+version = "0.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
+checksum = "367304855b369cadcac4ee5fb5a3a20da9378dd7905106141070b79f85241079"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -621,9 +621,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
+checksum = "52e0be46f4cf1f8f9e88d0e3eb7b29718aff23889563249f379119bd1ab6910e"
 dependencies = [
  "bitflags 2.4.1",
  "bstr",
@@ -634,9 +634,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
+checksum = "fb7f3dfb72bebe3449b5e642be64e3c6ccbe9821c8b8f19f487cf5bfbbf4067e"
 dependencies = [
  "bstr",
  "itoa",
@@ -646,9 +646,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.39.0"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
+checksum = "fd6a0454f8c42d686f17e7f084057c717c082b7dbb8209729e4e8f26749eb93a"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -658,9 +658,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
+checksum = "b8d7b2896edc3d899d28a646ccc6df729827a6600e546570b2783466404a42d6"
 dependencies = [
  "bstr",
  "dunce",
@@ -673,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.37.0"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
+checksum = "77a80f0fe688d654c2a741751578b11131071026d1934d03c1820d6d767525ce"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -691,18 +691,18 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
+checksum = "7555c23a005537434bbfcb8939694e18cad42602961d0de617f8477cc2adecdd"
 dependencies = [
  "gix-features",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
+checksum = "ae6232f18b262770e343dcdd461c0011c9b9ae27f0c805e115012aa2b902c1b8"
 dependencies = [
  "bitflags 2.4.1",
  "bstr",
@@ -712,9 +712,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
+checksum = "b0ed89cdc1dce26685c80271c4287077901de3c3dd90234d5fa47c22b2268653"
 dependencies = [
  "faster-hex",
  "thiserror",
@@ -722,9 +722,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hashtable"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
+checksum = "ebe47d8c0887f82355e2e9e16b6cecaa4d5e5346a7a474ca78ff94de1db35a5b"
 dependencies = [
  "gix-hash",
  "hashbrown 0.14.3",
@@ -744,9 +744,9 @@ dependencies = [
 
 [[package]]
 name = "gix-macros"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
+checksum = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -755,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
+checksum = "0c89402e8faa41b49fde348665a8f38589e461036475af43b6b70615a6a313a2"
 dependencies = [
  "bstr",
  "btoi",
@@ -774,9 +774,9 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.56.0"
+version = "0.56.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
+checksum = "46ae6da873de41c6c2b73570e82c571b69df5154dcd8f46dfafc6687767c33b1"
 dependencies = [
  "arc-swap",
  "gix-date",
@@ -793,9 +793,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.46.0"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
+checksum = "782b4d42790a14072d5c400deda9851f5765f50fe72bca6dece0da1cd6f05a9a"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -813,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
+checksum = "b8dd0998ab245f33d40ca2267e58d542fe54185ebd1dc41923346cf28d179fb6"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -826,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "gix-quote"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
+checksum = "9f7dc10303d73a960d10fb82f81188b036ac3e6b11b5795b20b1a60b51d1321f"
 dependencies = [
  "bstr",
  "btoi",
@@ -837,9 +837,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.40.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
+checksum = "64d9bd1984638d8f3511a2fcbe84fcedb8a5b5d64df677353620572383f42649"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -858,9 +858,9 @@ dependencies = [
 
 [[package]]
 name = "gix-refspec"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
+checksum = "be219df5092c1735abb2a53eccdf775e945eea6986ee1b6e7a5896dccc0be704"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -872,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
+checksum = "aa78e1df3633bc937d4db15f8dca2abdb1300ca971c0fabcf9fa97e38cf4cd9f"
 dependencies = [
  "bstr",
  "gix-date",
@@ -888,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
+checksum = "702de5fe5c2bbdde80219f3a8b9723eb927466e7ecd187cfd1b45d986408e45f"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -903,9 +903,9 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
+checksum = "78f6dce0c6683e2219e8169aac4b1c29e89540a8262fef7056b31d80d969408c"
 dependencies = [
  "bitflags 2.4.1",
  "gix-path",
@@ -928,15 +928,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda62acb44dd86a40c7c3762a5403cfc1ac789ea559df54085cedf79864f809e"
+checksum = "e8e1127ede0475b58f4fe9c0aaa0d9bb0bad2af90bbd93ccd307c8632b863d89"
 
 [[package]]
 name = "gix-traverse"
-version = "0.36.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
+checksum = "cb64213e52e1b726cb04581690c1e98b5910f983b977d5e9f2eb09f1a7fea6d2"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -950,9 +950,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
+checksum = "8f0f17cceb7552a231d1fec690bc2740c346554e3be6f5d2c41dfa809594dc44"
 dependencies = [
  "bstr",
  "gix-features",
@@ -964,18 +964,18 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
+checksum = "de6225e2de30b6e9bca2d9f1cc4731640fcef0fb3cabddceee366e7e85d3e94f"
 dependencies = [
  "fastrand",
 ]
 
 [[package]]
 name = "gix-validate"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
+checksum = "ac7cc36f496bd5d96cdca0f9289bb684480725d40db60f48194aa7723b883854"
 dependencies = [
  "bstr",
  "thiserror",
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index dae4c0237..aa601dcd1 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.6.0" }
 
-gix = { version = "0.57.0", default-features = false , optional = true }
+gix = { version = "0.57.1", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From 78d85eb13f4a6cd2201d4ce0fc020cc747829823 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:37:41 +0900
Subject: [PATCH 585/967] build(deps): bump futures-executor from 0.3.29 to
 0.3.30 (#9168)

Bumps [futures-executor](https://github.com/rust-lang/futures-rs) from 0.3.29 to 0.3.30.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.29...0.3.30)

---
updated-dependencies:
- dependency-name: futures-executor
  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 4fdb4c46e..90134a059 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -475,9 +475,9 @@ checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",

From b908abae2d3f5fff18c4836dc86fb4a1b5deb85c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:37:49 +0900
Subject: [PATCH 586/967] build(deps): bump anyhow from 1.0.76 to 1.0.78
 (#9200)

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

---
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 90134a059..164b6d792 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.76"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
+checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051"
 
 [[package]]
 name = "arc-swap"

From 2e3f330b127af7ce37539aa95e472dbccb7c492c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:38:05 +0900
Subject: [PATCH 587/967] build(deps): bump tempfile from 3.8.1 to 3.9.0
 (#9199)

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.1 to 3.9.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.8.1...v3.9.0)

---
updated-dependencies:
- dependency-name: tempfile
  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              | 6 +++---
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-vcs/Cargo.toml    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 164b6d792..85a4a4bde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1986,15 +1986,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.4.1",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index c40bf4dbc..187475385 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -29,7 +29,7 @@ which = "5.0.0"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.8.1"
+tempfile = "3.9.0"
 dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 4ff7fc0b1..32049a438 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -84,4 +84,4 @@ helix-loader = { path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.11"
 indoc = "2.0.4"
-tempfile = "3.8.1"
+tempfile = "3.9.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index aa601dcd1..f6dbe076d 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -29,4 +29,4 @@ log = "0.4"
 git = ["gix"]
 
 [dev-dependencies]
-tempfile = "3.8"
+tempfile = "3.9"

From 8f2e611b7e30d74546afe5ec6a16eed6d34f4c39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:38:12 +0900
Subject: [PATCH 588/967] build(deps): bump serde_json from 1.0.108 to 1.0.109
 (#9201)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.108 to 1.0.109.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.108...v1.0.109)

---
updated-dependencies:
- dependency-name: serde_json
  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 85a4a4bde..9c612a7e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1822,9 +1822,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
 dependencies = [
  "itoa",
  "ryu",

From da4afaf3daf6bc9355953c404d1766321ed9fd99 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Thu, 4 Jan 2024 08:51:00 +0200
Subject: [PATCH 589/967] remove build warnings (#9180)

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

diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs
index acdfc5b7e..55ebab577 100644
--- a/helix-dap/src/client.rs
+++ b/helix-dap/src/client.rs
@@ -9,7 +9,6 @@ use helix_core::syntax::DebuggerQuirks;
 use serde_json::Value;
 
 use anyhow::anyhow;
-pub use log::{error, info};
 use std::{
     collections::HashMap,
     future::Future,
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index 2f6ec12b1..a94c5e494 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -13,7 +13,6 @@ pub mod ui;
 use std::path::Path;
 
 use ignore::DirEntry;
-pub use keymap::macros::*;
 
 #[cfg(not(windows))]
 fn true_color() -> bool {

From 7e389b67c24dfe4466112c988b240c807e7e2414 Mon Sep 17 00:00:00 2001
From: "petrak@" <petrathekat@gmail.com>
Date: Thu, 4 Jan 2024 15:49:50 -0500
Subject: [PATCH 590/967] Add auto-pairs to scheme language support (#9232)

Currently, typing a single quote in a `.scm` file "helpfully" auto-
completes a closing quote. This is because there is no auto-pairs
section in the languages.toml. This commit adds that.
---
 languages.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/languages.toml b/languages.toml
index 7b4b5b8b5..a013dab8c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1914,6 +1914,12 @@ shebangs = ["scheme", "guile", "chicken"]
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+
 [[grammar]]
 name = "scheme"
 source = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af3af6c9356b936f8a515a1e449c32e804c2b1a8" }

From f8ae2bc61b0fee8b2820c07f10f25ee23c13af7f Mon Sep 17 00:00:00 2001
From: DuckDuckWhale <28813824+DuckDuckWhale@users.noreply.github.com>
Date: Sun, 7 Jan 2024 18:03:56 -0800
Subject: [PATCH 591/967] Fix: misleading active tab color in monokai_pro*
 (#9148)

---
 runtime/themes/monokai_pro.toml           | 5 +++++
 runtime/themes/monokai_pro_machine.toml   | 5 +++++
 runtime/themes/monokai_pro_octagon.toml   | 5 +++++
 runtime/themes/monokai_pro_ristretto.toml | 5 +++++
 runtime/themes/monokai_pro_spectrum.toml  | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index 57bede94a..a898671f6 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -30,6 +30,11 @@
 "ui.cursor.match" = { bg = "base4" }
 "ui.cursorline" = { bg = "base1" }
 
+# bufferline, inlay hints
+"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
+"ui.bufferline.active" = { fg = "base8", bg = "base4" }
+"ui.virtual.inlay-hint" = { fg = "base6" }
+
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
 "ui.linenr" = { fg = "base5" }
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index b292e6b02..519c9ed39 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -27,6 +27,11 @@
 "ui.cursor.match" = { bg = "base4" }
 "ui.cursorline" = { bg = "base1" }
 
+# bufferline, inlay hints
+"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
+"ui.bufferline.active" = { fg = "base8", bg = "base4" }
+"ui.virtual.inlay-hint" = { fg = "base6" }
+
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
 "ui.linenr" = { fg = "base5" }
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index 3236fc167..9be6bdc00 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -30,6 +30,11 @@
 "ui.cursor.match" = { bg = "base4" }
 "ui.cursorline" = { bg = "base1" }
 
+# bufferline, inlay hints
+"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
+"ui.bufferline.active" = { fg = "base8", bg = "base4" }
+"ui.virtual.inlay-hint" = { fg = "base6" }
+
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
 "ui.linenr" = { fg = "base5" }
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index f897bddbd..d002d13fa 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -27,6 +27,11 @@
 "ui.cursor.match" = { bg = "base4" }
 "ui.cursorline" = { bg = "base1" }
 
+# bufferline, inlay hints
+"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
+"ui.bufferline.active" = { fg = "base8", bg = "base4" }
+"ui.virtual.inlay-hint" = { fg = "base6" }
+
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
 "ui.linenr" = { fg = "base5" }
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 74533404e..3cec2f1a3 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -27,6 +27,11 @@
 "ui.cursor.match" = { bg = "base4" }
 "ui.cursorline" = { bg = "base1" }
 
+# bufferline, inlay hints
+"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
+"ui.bufferline.active" = { fg = "base8", bg = "base4" }
+"ui.virtual.inlay-hint" = { fg = "base6" }
+
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
 "ui.linenr" = { fg = "base5" }

From a32d537d0ab61c29dca556d6ffe35431d9f4f1d1 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Mon, 8 Jan 2024 04:04:43 +0200
Subject: [PATCH 592/967] Add HOCON language support (#9203)

* Add HOCON language support

* Remove error query

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

* Change include query

* Fix query error

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 12 +++++++++++
 runtime/queries/hocon/highlights.scm | 31 ++++++++++++++++++++++++++++
 runtime/queries/hocon/indents.scm    | 10 +++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 runtime/queries/hocon/highlights.scm
 create mode 100644 runtime/queries/hocon/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 0c5b35cc6..ba68e206a 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -68,6 +68,7 @@
 | haskell-persistent | ✓ |  |  |  |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
+| hocon | ✓ |  | ✓ |  |
 | hosts | ✓ |  |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
 | hurl | ✓ |  | ✓ |  |
diff --git a/languages.toml b/languages.toml
index a013dab8c..77ed0eb61 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3013,3 +3013,15 @@ file-types = ["janet"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 grammar = "clojure"
+
+[[language]]
+name = "hocon"
+scope = "source.conf"
+file-types = ["conf"]
+comment-token = "#"
+auto-format = true
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "hocon"
+source = { git = "https://github.com/antosha417/tree-sitter-hocon", rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc" }
diff --git a/runtime/queries/hocon/highlights.scm b/runtime/queries/hocon/highlights.scm
new file mode 100644
index 000000000..d1aa38a27
--- /dev/null
+++ b/runtime/queries/hocon/highlights.scm
@@ -0,0 +1,31 @@
+(comment) @comment
+
+(null) @constant.builtin
+[(true) (false)] @constant.builtin.boolean
+(number) @constant.numeric
+(string) @string
+(multiline_string) @string
+(string (escape_sequence) @constant.character.escape)
+(unquoted_string) @string
+
+(value [":" "=" "+=" ] @operator)
+
+(substitution (_) @string)
+(substitution ["${" "${?" "}"] @punctuation.special)
+
+[ 
+  "url"
+  "file"
+  "classpath"
+  "required"
+] @function.builtin
+
+(include) @keyword.directive
+
+[ "(" ")" "[" "]" "{" "}" ]  @punctuation.bracket
+
+(unit) @keyword
+(path (_) @keyword)
+(unquoted_path "." @punctuation.delimiter)
+[ "," ] @punctuation.delimiter
+
diff --git a/runtime/queries/hocon/indents.scm b/runtime/queries/hocon/indents.scm
new file mode 100644
index 000000000..27c2c988f
--- /dev/null
+++ b/runtime/queries/hocon/indents.scm
@@ -0,0 +1,10 @@
+[
+  (object)
+  (array)
+] @indent
+
+[
+  "]"
+  "}"
+] @outdent
+

From 73deba70443073c0171b292dba0e9f3ef2648754 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Mon, 8 Jan 2024 04:05:10 +0200
Subject: [PATCH 593/967] Add textobject queries for Scala (#9191)

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

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ba68e206a..d068f91c0 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -145,7 +145,7 @@
 | ruby | ✓ | ✓ | ✓ | `solargraph` |
 | rust | ✓ | ✓ | ✓ | `rust-analyzer` |
 | sage | ✓ | ✓ |  |  |
-| scala | ✓ |  | ✓ | `metals` |
+| scala | ✓ | ✓ | ✓ | `metals` |
 | scheme | ✓ |  | ✓ |  |
 | scss | ✓ |  |  | `vscode-css-language-server` |
 | slint | ✓ |  | ✓ | `slint-lsp` |
diff --git a/runtime/queries/scala/textobjects.scm b/runtime/queries/scala/textobjects.scm
new file mode 100644
index 000000000..fe0b8c255
--- /dev/null
+++ b/runtime/queries/scala/textobjects.scm
@@ -0,0 +1,59 @@
+; Function queries
+
+(function_definition
+  body: (_) @function.inside) @function.around
+
+; Does not match block lambdas or Scala 3 braceless lambdas
+(lambda_expression
+  (_) @function.inside) @function.around
+
+
+; Class queries
+
+(object_definition
+  body: (_)? @class.inside) @class.around
+
+(class_definition
+  body: (_)? @class.inside) @class.around
+
+(trait_definition
+  body: (_)? @class.inside) @class.around
+
+(type_definition) @class.around
+
+(enum_case_definitions) @class.around
+
+(enum_definition
+  body: (_)? @class.inside) @class.around
+
+
+; Parameter queries
+
+(parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(parameter_types
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(bindings
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+; Does not match context bounds or higher-kinded types
+(type_parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(type_arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+
+; Comment queries
+
+(comment) @comment.inside
+(comment) @comment.around ; Does not match consecutive block comments
+
+
+; Test queries
+; Not supported

From 154d9b6ed1e24aa846784a55c9d8bc1ba9506c7e Mon Sep 17 00:00:00 2001
From: Paul Graydon <148399603+UntimelyCreation@users.noreply.github.com>
Date: Sun, 7 Jan 2024 18:08:20 -0800
Subject: [PATCH 594/967] Update tokyonight themes (#9099)

---
 runtime/themes/tokyonight.toml       | 175 ++++++++++++++++-----------
 runtime/themes/tokyonight_day.toml   |  41 +++++++
 runtime/themes/tokyonight_moon.toml  |  41 +++++++
 runtime/themes/tokyonight_storm.toml |  12 +-
 4 files changed, 195 insertions(+), 74 deletions(-)
 create mode 100644 runtime/themes/tokyonight_day.toml
 create mode 100644 runtime/themes/tokyonight_moon.toml

diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index cc99689fc..95ebd4087 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -1,75 +1,96 @@
-# Author: Paul Graydon <p.y.graydon@gmail.com>
+# Author: Paul Graydon <untimely.creation97@proton.me>
 
-"comment" = { fg = "comment", modifiers = ["italic"] }
-"constant" = { fg = "orange" }
+attribute = { fg = "cyan" }
+comment = { fg = "comment", modifiers = ["italic"] }
+"comment.block.documentation" = { fg = "yellow" }
+constant = { fg = "orange" }
+"constant.builtin" = { fg = "aqua" }
+"constant.character" = { fg = "light-green" }
 "constant.character.escape" = { fg = "magenta" }
-"function" = { fg = "blue", modifiers = ["italic"] }
+constructor = { fg = "aqua" }
+function = { fg = "blue", modifiers = ["italic"] }
+"function.builtin" = { fg = "aqua" }
 "function.macro" = { fg = "cyan" }
-"keyword" = { fg = "cyan", modifiers = ["italic"] }
+"function.special" = { fg = "cyan" }
+keyword = { fg = "purple", modifiers = ["italic"] }
 "keyword.control" = { fg = "magenta" }
 "keyword.control.import" = { fg = "cyan" }
-"keyword.operator" = { fg = "turquoise" }
-"keyword.function" = { fg = "magenta", modifiers = ["italic"] }
-"operator" = { fg = "turquoise" }
-"punctuation" = { fg = "turquoise" }
-"string" = { fg = "light-green" }
-"string.regexp" = { fg = "light-blue" }
-"tag" = { fg = "red" }
-"type" = { fg = "teal" }
-"namespace" = { fg = "blue" }
-"variable" = { fg = "white" }
+"keyword.control.return" = { fg = "purple", modifiers = ["italic"] }
+"keyword.directive" = { fg = "cyan" }
+"keyword.function" = { fg = "magenta" }
+"keyword.operator" = { fg = "magenta" }
+label = { fg = "blue" }
+namespace = { fg = "cyan" }
+operator = { fg = "turquoise" }
+punctuation = { fg = "turquoise" }
+special = { fg = "aqua" }
+string = { fg = "light-green" }
+"string.regexp" = { fg = "light-cyan" }
+"string.special" = { fg = "aqua" }
+tag = { fg = "magenta" }
+type = { fg = "aqua" }
+"type.builtin" = { fg = "aqua" }
+"type.enum.variant" = { fg = "orange" }
+variable = { fg = "fg" }
 "variable.builtin" = { fg = "red" }
 "variable.other.member" = { fg = "green" }
 "variable.parameter" = { fg = "yellow", modifiers = ["italic"] }
 
-"diff.plus" = { fg = "green" }
-"diff.delta" = { fg = "orange" }
-"diff.minus" = { fg = "red" }
+"markup.bold" = { modifiers = ["bold"] }
+"markup.heading" = { fg = "blue", modifiers = ["bold"] }
+"markup.heading.completion" = { bg = "bg-menu", fg = "fg" }
+"markup.heading.hover" = { bg = "fg-selected" }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link" = { fg = "blue", underline = { style = "line" } }
+"markup.link.label" = { fg = "teal" }
+"markup.link.text" = { fg = "teal" }
+"markup.link.url" = { underline = { style = "line" } }
+"markup.list" = { fg = "orange", modifiers = ["bold"] }
+"markup.normal.completion" = { fg = "comment" }
+"markup.normal.hover" = { fg = "fg-dark" }
+"markup.raw" = { fg = "teal" }
+"markup.raw.inline" = { bg = "black", fg = "blue" }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 
-"ui.background" = { fg = "foreground", bg = "background" }
-"ui.cursor" = { modifiers = ["reversed"] }
-"ui.cursor.match" = { fg = "orange", modifiers = ["bold"] }
-"ui.cursor.primary" = { modifiers = ["reversed"] }
-"ui.cursorline.primary" = { bg = "background_menu" }
-"ui.help" = { fg = "foreground", bg = "background_menu" }
-"ui.linenr" = { fg = "foreground_gutter" }
-"ui.linenr.selected" = { fg = "foreground" }
-"ui.menu" = { fg = "foreground", bg = "background_menu" }
-"ui.menu.selected" = { bg = "background_highlight" }
-"ui.popup" = { fg = "foreground", bg = "background_menu" }
-"ui.selection" = { bg = "background_highlight" }
-"ui.selection.primary" = { bg = "background_highlight" }
-"ui.statusline" = { fg = "foreground", bg = "background_menu" }
-"ui.statusline.inactive" = { fg = "foreground_gutter", bg = "background_menu" }
-"ui.statusline.normal" = { fg = "black", bg = "blue" }
-"ui.statusline.insert" = { fg = "black", bg = "green" }
-"ui.statusline.select" = { fg = "black", bg = "magenta" }
-"ui.text" = { fg = "foreground" }
-"ui.text.focus" = { fg = "cyan" }
-"ui.virtual.ruler" = { bg = "foreground_gutter" }
-"ui.virtual.whitespace" = { fg = "foreground_gutter" }
-"ui.virtual.inlay-hint" = { fg = "comment" }
-"ui.window" = { fg = "black" }
+"diff.delta" = { fg = "change" }
+"diff.delta.moved" = { fg = "blue" }
+"diff.minus" = { fg = "delete" }
+"diff.plus" = { fg = "add" }
 
-"error" = { fg = "red" }
-"warning" = { fg = "yellow" }
-"info" = { fg = "blue" }
-"hint" = { fg = "teal" }
-"diagnostic.error" = { underline = { style = "curl", color = "red" } }
-"diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
-"diagnostic.info" = { underline = { style = "curl", color = "blue" } }
-"diagnostic.hint" = { underline = { style = "curl", color = "teal" } }
-"special" = { fg = "orange" }
+error = { fg = "error" }
+hint = { fg = "hint" }
+info = { fg = "info" }
+warning = { fg = "yellow" }
+"diagnostic.error" = { underline = { style = "curl" } }
+"diagnostic.warning" = { underline = { style = "curl" } }
+"diagnostic.info" = { underline = { style = "curl" } }
+"diagnostic.hint" = { underline = { style = "curl" } }
 
-"markup.heading" = { fg = "cyan", modifiers = ["bold"] }
-"markup.list" = { fg = "cyan" }
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "yellow", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "green" }
-"markup.link.text" = { fg = "light-gray" }
-"markup.quote" = { fg = "yellow", modifiers = ["italic"] }
-"markup.raw" = { fg = "cyan" }
+"ui.background" = { bg = "bg", fg = "fg" }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "orange", modifiers = ["bold"] }
+"ui.cursorline.primary" = { bg = "bg-menu" }
+"ui.help" = { bg = "bg-menu", fg = "fg" }
+"ui.linenr" = { fg = "fg-gutter" }
+"ui.linenr.selected" = { fg = "fg-linenr" }
+"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.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.inactive" = { fg = "comment", modifiers = ["italic"] }
+"ui.text.info" = { bg = "bg-menu", fg = "fg" }
+"ui.virtual.ruler" = { bg = "fg-gutter" }
+"ui.virtual.whitespace" = { fg = "fg-gutter" }
+"ui.virtual.inlay-hint" = {  bg = "bg-inlay", fg = "teal" }
+"ui.window" = { fg = "border", modifiers = ["bold"] }
 
 [palette]
 red = "#f7768e"
@@ -77,20 +98,34 @@ orange = "#ff9e64"
 yellow = "#e0af68"
 light-green = "#9ece6a"
 green = "#73daca"
+aqua = "#2ac3de"
+teal = "#1abc9c"
 turquoise = "#89ddff"
 light-cyan = "#b4f9f8"
-teal = "#2ac3de"
 cyan = "#7dcfff"
 blue = "#7aa2f7"
+purple = "#9d7cd8"
 magenta = "#bb9af7"
-white = "#c0caf5"
-light-gray = "#9aa5ce"
-parameters = "#cfc9c2"
 comment = "#565f89"
 black = "#414868"
-foreground = "#a9b1d6"
-foreground_highlight = "#c0caf5"
-foreground_gutter = "#363b54"
-background = "#1a1b26"
-background_highlight = "#30374b"
-background_menu = "#16161e"
+
+add = "#449dab"
+change = "#6183bb"
+delete = "#914c54"
+
+error = "#db4b4b"
+hint = "#1abc9c"
+info = "#0db9d7"
+
+fg = "#c0caf5"
+fg-dark = "#a9b1d6"
+fg-gutter = "#3b4261"
+fg-linenr = "#737aa2"
+fg-selected = "#343a55"
+border = "#15161e"
+border-highlight = "#27a1b9"
+bg = "#1a1b26"
+bg-inlay = "#1a2b32"
+bg-highlight = "#292e42"
+bg-menu = "#16161e"
+bg-visual = "#283457"
diff --git a/runtime/themes/tokyonight_day.toml b/runtime/themes/tokyonight_day.toml
new file mode 100644
index 000000000..54caf8d6f
--- /dev/null
+++ b/runtime/themes/tokyonight_day.toml
@@ -0,0 +1,41 @@
+# Author: Paul Graydon <untimely.creation97@proton.me>
+
+inherits = "tokyonight"
+
+[palette]
+red = "#f52a65"
+orange = "#b15c00"
+yellow = "#8c6c3e"
+light-green = "#587539"
+green = "#387068"
+aqua = "#188092"
+teal = "#118c74"
+turquoise = "#006a83"
+light-cyan = "#2e5857"
+cyan = "#007197"
+blue = "#2e7de9"
+purple = "#7847bd"
+magenta = "#9854f1"
+comment = "#848cb5"
+black = "#a1a6c5"
+
+add = "#aecde6"
+change = "#d6d8e3"
+delete = "#dfccd4"
+
+error = "#c64343"
+hint = "#118c74"
+info = "#07879d"
+
+fg = "#3760bf"
+fg-dark = "#6172b0"
+fg-gutter = "#a8aecb"
+fg-linenr = "#68709a"
+fg-selected = "#b3b8d1"
+border = "#e9e9ed"
+border-highlight = "#2496ac"
+bg = "#e1e2e7"
+bg-inlay = "#acd7eb"
+bg-highlight = "#c4c8da"
+bg-menu = "#e9e9ec"
+bg-visual = "#b6bfe2"
diff --git a/runtime/themes/tokyonight_moon.toml b/runtime/themes/tokyonight_moon.toml
new file mode 100644
index 000000000..8468051e6
--- /dev/null
+++ b/runtime/themes/tokyonight_moon.toml
@@ -0,0 +1,41 @@
+# Author: Paul Graydon <untimely.creation97@proton.me>
+
+inherits = "tokyonight"
+
+[palette]
+red = "#ff757f"
+orange = "#ff966c"
+yellow = "#ffc777"
+light-green = "#c3e88d"
+green = "#4fd6be"
+aqua = "#65bcff"
+teal = "#4fd6be"
+turquoise = "#89ddff"
+light-cyan = "#b4f9f8"
+cyan = "#86e1fc"
+blue = "#82aaff"
+purple = "#fca7ea"
+magenta = "#c099ff"
+comment = "#636da6"
+black = "#444a73"
+
+add = "#b8db87"
+change = "#7ca1f2"
+delete = "#e26a75"
+
+error = "#c53b53"
+hint = "#4fd6be"
+info = "#0db9d7"
+
+fg = "#c8d3f5"
+fg-dark = "#828bb8"
+fg-gutter = "#3b4261"
+fg-linenr = "#737aa2"
+fg-selected = "#363c58"
+border = "#1b1d2b"
+border-highlight = "#589ed7"
+bg = "#222436"
+bg-inlay = "#273644"
+bg-highlight = "#2f334d"
+bg-menu = "#1e2030"
+bg-visual = "#2d3f76"
diff --git a/runtime/themes/tokyonight_storm.toml b/runtime/themes/tokyonight_storm.toml
index e82c43409..5ec4a16a0 100644
--- a/runtime/themes/tokyonight_storm.toml
+++ b/runtime/themes/tokyonight_storm.toml
@@ -1,8 +1,12 @@
-# Author: Paul Graydon <p.y.graydon@gmail.com>
+# Author: Paul Graydon <untimely.creation97@proton.me>
 
 inherits = "tokyonight"
 
 [palette]
-background = "#24283b"
-background_highlight = "#373d5a"
-background_menu = "#1f2335"
+border = "#1d202f"
+bg = "#24283b"
+bg-inlay = "#233745"
+bg-highlight = "#373d5a"
+bg-menu = "#1f2335"
+bg-visual = "#2e3c64"
+border-highlight = "#29a4bd"

From c8e58304bf4b1b327067bd92ca6e3c9db897c572 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 7 Jan 2024 21:08:41 -0500
Subject: [PATCH 595/967] Add textobject queries for protobuf grammar. (#9184)

Given `message Foo {string s = 1;}`
- `mat` selects `message Foo {string s = 1}`
- `mit` selects `{string s = 1;}`

Given `service SearchService { rpc Search(Req) returns (Resp); }
- `mit` or `mat` selects `Req` or `Resp`
- `mif` or `maf` selects `rpc Search(Req) returns (Resp);`
- `mit` selects { rpc Search(Req) returns (Resp); }`
- `mat` selects `service SearchService { rpc Search(Req) returns (Resp); }`
---
 book/src/generated/lang-support.md       | 2 +-
 runtime/queries/protobuf/textobjects.scm | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/protobuf/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index d068f91c0..ee01c4030 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -128,7 +128,7 @@
 | ponylang | ✓ | ✓ | ✓ |  |
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
-| protobuf | ✓ |  | ✓ | `bufls`, `pb` |
+| protobuf | ✓ | ✓ | ✓ | `bufls`, `pb` |
 | prql | ✓ |  |  |  |
 | purescript | ✓ | ✓ |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `pylsp` |
diff --git a/runtime/queries/protobuf/textobjects.scm b/runtime/queries/protobuf/textobjects.scm
new file mode 100644
index 000000000..6f06b1349
--- /dev/null
+++ b/runtime/queries/protobuf/textobjects.scm
@@ -0,0 +1,9 @@
+(message (messageBody) @class.inside) @class.around
+(enum (enumBody) @class.inside) @class.around
+(service (serviceBody) @class.inside) @class.around
+
+(rpc (enumMessageType) @parameter.inside) @function.inside
+(rpc (enumMessageType) @parameter.around) @function.around
+
+(comment) @comment.inside
+(comment)+ @comment.around

From 00d681cc69fcc0d58f3603709400d26ea2647114 Mon Sep 17 00:00:00 2001
From: jw013 <jw013@users.noreply.github.com>
Date: Sun, 7 Jan 2024 21:11:18 -0500
Subject: [PATCH 596/967] Update goto_file docs (#8563) (#9001)

Make the pluralization of files and selections consistent to emphasize
the 1-to-1 relation between files and selections. The prior wording
with plural "files" and singular "selection" can mislead users into
thinking the command can open multiple files from a single selection.
---
 book/src/keymap.md         | 6 +++---
 helix-term/src/commands.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index c6981b286..a3e41666f 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -205,7 +205,7 @@ Jumps to various locations.
 | ----- | -----------                                      | -------                    |
 | `g`   | Go to line number `<n>` else start of file       | `goto_file_start`          |
 | `e`   | Go to the end of the file                        | `goto_last_line`           |
-| `f`   | Go to files in the selection                     | `goto_file`                |
+| `f`   | Go to files in the selections                    | `goto_file`                |
 | `h`   | Go to the start of the line                      | `goto_line_start`          |
 | `l`   | Go to the end of the line                        | `goto_line_end`            |
 | `s`   | Go to first non-whitespace character of the line | `goto_first_nonwhitespace` |
@@ -253,8 +253,8 @@ This layer is similar to Vim keybindings as Kakoune does not support windows.
 | `w`, `Ctrl-w`          | Switch to next window                                | `rotate_view`     |
 | `v`, `Ctrl-v`          | Vertical right split                                 | `vsplit`          |
 | `s`, `Ctrl-s`          | Horizontal bottom split                              | `hsplit`          |
-| `f`                    | Go to files in the selection in horizontal splits    | `goto_file`       |
-| `F`                    | Go to files in the selection in vertical splits      | `goto_file`       |
+| `f`                    | Go to files in the selections in horizontal splits   | `goto_file`       |
+| `F`                    | Go to files in the selections in vertical splits     | `goto_file`       |
 | `h`, `Ctrl-h`, `Left`  | Move to left split                                   | `jump_view_left`  |
 | `j`, `Ctrl-j`, `Down`  | Move to split below                                  | `jump_view_down`  |
 | `k`, `Ctrl-k`, `Up`    | Move to split above                                  | `jump_view_up`    |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1b8f9e1f5..ff0849f20 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -337,9 +337,9 @@ impl MappableCommand {
         goto_implementation, "Goto implementation",
         goto_file_start, "Goto line number <n> else file start",
         goto_file_end, "Goto file end",
-        goto_file, "Goto files/URLs in selection",
-        goto_file_hsplit, "Goto files in selection (hsplit)",
-        goto_file_vsplit, "Goto files in selection (vsplit)",
+        goto_file, "Goto files/URLs in selections",
+        goto_file_hsplit, "Goto files in selections (hsplit)",
+        goto_file_vsplit, "Goto files in selections (vsplit)",
         goto_reference, "Goto references",
         goto_window_top, "Goto window top",
         goto_window_center, "Goto window center",

From e46fb585954a131a8f96cfd71cf2705fe0ff1e02 Mon Sep 17 00:00:00 2001
From: NitinKM <70827815+NewtonChutney@users.noreply.github.com>
Date: Mon, 8 Jan 2024 08:16:53 +0530
Subject: [PATCH 597/967] Info on how to skip grammar build when building from
 source (#8698)

* info: no grammar compile

Added instructions on how to compile without compiling grammars

* Update book/src/install.md

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

---------

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

diff --git a/book/src/install.md b/book/src/install.md
index 897985013..2a4273b86 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -204,6 +204,8 @@ RUSTFLAGS="-C target-feature=-crt-static"
    This command will create the `hx` executable and construct the tree-sitter
    grammars in the local `runtime` folder.
 
+> 💡 If you do not want to fetch or build grammars, set an environment variable `HELIX_DISABLE_AUTO_GRAMMAR_BUILD`
+
 > 💡 Tree-sitter grammars can be fetched and compiled if not pre-packaged. Fetch
 > grammars with `hx --grammar fetch` and compile them with
 > `hx --grammar build`. This will install them in

From 918bd9c2b06934b5b0b1666f2228e219809130ac Mon Sep 17 00:00:00 2001
From: Greedwolf DSS <greedwolf.dss@gmail.com>
Date: Mon, 8 Jan 2024 10:54:16 +0800
Subject: [PATCH 598/967] feat: update wren tree-sitter grammar (#8544)

Co-authored-by: masai.dss <masai.dss@bytedance.com>
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 77ed0eb61..81f7974d9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2886,7 +2886,7 @@ source = { git = "https://github.com/varpeti/tree-sitter-jinja2", rev = "a533cd3
 
 [[grammar]]
 name = "wren"
-source = { git = "https://git.sr.ht/~jummit/tree-sitter-wren", rev = "793d58266924e6efcc40e411663393e9d72bec87"}
+source = { git = "https://git.sr.ht/~jummit/tree-sitter-wren", rev = "6748694be32f11e7ec6b5faeb1b48ca6156d4e06" }
 
 [[language]]
 name = "wren"

From 77ab792ac72698189120b2c62e26d2a26807a9ca Mon Sep 17 00:00:00 2001
From: Tomas <tomasruud@users.noreply.github.com>
Date: Mon, 8 Jan 2024 03:57:04 +0100
Subject: [PATCH 599/967] runtime/themes: adding "ttox" theme (#8524)

* runtime/themes: adding 'ttox' theme

* Improving primary selections
---
 runtime/themes/ttox.toml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 runtime/themes/ttox.toml

diff --git a/runtime/themes/ttox.toml b/runtime/themes/ttox.toml
new file mode 100644
index 000000000..16909cc70
--- /dev/null
+++ b/runtime/themes/ttox.toml
@@ -0,0 +1,31 @@
+# Author : Tomas Ruud <git@me.2ms.no>
+
+"ui.selection" = { fg = "white", bg = "gray" }
+"ui.cursor" = { fg = "black", bg = "light-gray" }
+"ui.cursor.primary" = { fg = "black", bg = "light-gray" }
+"ui.cursor.match" = { modifiers = ["underlined"] }
+"ui.background.separator" = "gray"
+"ui.linenr" = "gray"
+"ui.linenr.selected" = { fg = "white", bg = "gray" }
+"ui.statusline" = { bg = "black", fg = "white" }
+"ui.menu" = { fg = "white", bg = "black" }
+"ui.menu.selected" = { bg = "light-gray", fg = "black" }
+"ui.popup" = { fg = "white", bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.virtual.ruler" = { underline = { style = "line"} }
+
+"string" = { bg = "light-green", fg = "black" }
+"constant" = { bg = "light-cyan", fg = "black" }
+"comment" = { bg = "light-magenta", fg = "black" }
+
+"diff.plus" = "green"
+"diff.minus" = "red"
+"diff.delta" = "gray"
+
+"warning" = { fg = "black", bg = "light-yellow" }
+"error" = { fg = "black", bg = "light-red" }
+"hint" = { fg = "black", bg = "light-blue" }
+
+"diagnostic.warning" = { fg = "black", bg = "light-yellow" }
+"diagnostic.error" = { fg = "black", bg = "light-red" }
+"diagnostic.hint" = { fg = "black", bg = "light-blue" }

From e2e8d2739af5abdcc1f4af8745511e4c5ddbdc27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:51:25 +0900
Subject: [PATCH 600/967] build(deps): bump serde from 1.0.193 to 1.0.195
 (#9285)

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

diff --git a/Cargo.lock b/Cargo.lock
index 9c612a7e8..fdbd7e4c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -330,7 +330,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -347,7 +347,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -750,7 +750,7 @@ checksum = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1615,9 +1615,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
  "unicode-ident",
 ]
@@ -1650,9 +1650,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.29"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -1802,22 +1802,22 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1839,7 +1839,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1975,9 +1975,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2043,7 +2043,7 @@ checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2126,7 +2126,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2647,5 +2647,5 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.48",
 ]

From f4212421da66f30137fe2652fb1cfb3daf05f7ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:51:38 +0900
Subject: [PATCH 601/967] build(deps): bump ahash from 0.8.6 to 0.8.7 (#9281)

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

diff --git a/Cargo.lock b/Cargo.lock
index fdbd7e4c9..91407ca32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if",
  "getrandom",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index d7fff6c6f..ff0bbcc3e 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -31,7 +31,7 @@ once_cell = "1.19"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
-ahash = "0.8.6"
+ahash = "0.8.7"
 hashbrown = { version = "0.14.3", features = ["raw"] }
 dunce = "1.0"
 

From bad10a5ddd5d34bf8acaf5d49a81adadd1c9ac21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:51:58 +0900
Subject: [PATCH 602/967] build(deps): bump libc from 0.2.151 to 0.2.152
 (#9282)

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

diff --git a/Cargo.lock b/Cargo.lock
index 91407ca32..b1fafb618 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1387,9 +1387,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 32049a438..0859dbd74 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -73,7 +73,7 @@ grep-searcher = "0.1.13"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.151"
+libc = "0.2.152"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }

From 97145eaae6ad0347c8d13aeb19c1b6d3c7fe4fc6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:52:25 +0900
Subject: [PATCH 603/967] build(deps): bump ignore from 0.4.21 to 0.4.22
 (#9283)

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 b1fafb618..cb3cbd2d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1311,9 +1311,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
+checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
 dependencies = [
  "crossbeam-deque",
  "globset",

From 20b91fd99a91621d6153cd00f5527b7571290df4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:52:36 +0900
Subject: [PATCH 604/967] build(deps): bump serde_json from 1.0.109 to 1.0.111
 (#9284)

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 cb3cbd2d1..9f0e8dcdb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1822,9 +1822,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.109"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",

From 4da6191a1c821eaff580392b41a2eb7245a475b7 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 9 Jan 2024 01:54:55 +0100
Subject: [PATCH 605/967] don't automatically dismiss zero width diagnostics
 (#9280)

---
 helix-view/src/document.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index af950a3fc..51668ab16 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1222,18 +1222,23 @@ impl Document {
                 };
                 (&mut diagnostic.range.start, assoc)
             }));
-            changes.update_positions(self.diagnostics.iter_mut().map(|diagnostic| {
+            changes.update_positions(self.diagnostics.iter_mut().filter_map(|diagnostic| {
+                if diagnostic.zero_width {
+                    // for zero width diagnostics treat the diagnostic as a point
+                    // rather than a range
+                    return None;
+                }
                 let assoc = if diagnostic.ends_at_word {
                     Assoc::AfterWord
                 } else {
                     Assoc::Before
                 };
-                (&mut diagnostic.range.end, assoc)
+                Some((&mut diagnostic.range.end, assoc))
             }));
             self.diagnostics.retain_mut(|diagnostic| {
-                if diagnostic.range.start > diagnostic.range.end
-                    || (!diagnostic.zero_width && diagnostic.range.start == diagnostic.range.end)
-                {
+                if diagnostic.zero_width {
+                    diagnostic.range.end = diagnostic.range.start
+                } else if diagnostic.range.start >= diagnostic.range.end {
                     return false;
                 }
                 diagnostic.line = self.text.char_to_line(diagnostic.range.start);

From 0cbd8d3df1ec6faa088f4439e52865f8daf78dc3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 8 Jan 2024 19:55:11 -0500
Subject: [PATCH 606/967] Check for rename support before showing LSP rename
 prompt (#9277)

---
 helix-term/src/commands/lsp.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index ac6a1a213..34ffa529c 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1421,6 +1421,16 @@ pub fn rename_symbol(cx: &mut Context) {
 
     let (view, doc) = current_ref!(cx.editor);
 
+    if doc
+        .language_servers_with_feature(LanguageServerFeature::RenameSymbol)
+        .next()
+        .is_none()
+    {
+        cx.editor
+            .set_error("No configured language server supports symbol renaming");
+        return;
+    }
+
     let language_server_with_prepare_rename_support = doc
         .language_servers_with_feature(LanguageServerFeature::RenameSymbol)
         .find(|ls| {

From 48c49f02278712f20235f3ba3912fba9e55b8ebb Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 9 Jan 2024 01:56:09 +0100
Subject: [PATCH 607/967] update history of a newly focused view (#9271)

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

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index c808be175..ff267e42d 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1302,8 +1302,6 @@ impl Component for EditorView {
                 cx.editor.status_msg = None;
 
                 let mode = cx.editor.mode();
-                let (view, _) = current!(cx.editor);
-                let focus = view.id;
 
                 if let Some(on_next_key) = self.on_next_key.take() {
                     // if there's a command waiting input, do that first
@@ -1385,20 +1383,16 @@ impl Component for EditorView {
                     return EventResult::Ignored(None);
                 }
 
-                // if the focused view still exists and wasn't closed
-                if cx.editor.tree.contains(focus) {
-                    let config = cx.editor.config();
-                    let mode = cx.editor.mode();
-                    let view = view_mut!(cx.editor, focus);
-                    let doc = doc_mut!(cx.editor, &view.doc);
+                let config = cx.editor.config();
+                let mode = cx.editor.mode();
+                let (view, doc) = current!(cx.editor);
 
-                    view.ensure_cursor_in_view(doc, config.scrolloff);
+                view.ensure_cursor_in_view(doc, config.scrolloff);
 
-                    // Store a history state if not in insert mode. This also takes care of
-                    // committing changes when leaving insert mode.
-                    if mode != Mode::Insert {
-                        doc.append_changes_to_history(view);
-                    }
+                // Store a history state if not in insert mode. This also takes care of
+                // committing changes when leaving insert mode.
+                if mode != Mode::Insert {
+                    doc.append_changes_to_history(view);
                 }
 
                 EventResult::Consumed(callback)

From 7af78c7788eb0ab711df812fcdba44fc8742d7ca Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Mon, 8 Jan 2024 19:56:51 -0500
Subject: [PATCH 608/967] update comment grammar (#9253)

---
 languages.toml                         | 2 +-
 runtime/queries/comment/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 81f7974d9..2a0efb494 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1282,7 +1282,7 @@ injection-regex = "comment"
 
 [[grammar]]
 name = "comment"
-source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e" }
+source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1" }
 
 [[language]]
 name = "wgsl"
diff --git a/runtime/queries/comment/highlights.scm b/runtime/queries/comment/highlights.scm
index 9583f9c53..4cefcdf74 100644
--- a/runtime/queries/comment/highlights.scm
+++ b/runtime/queries/comment/highlights.scm
@@ -44,3 +44,5 @@
 ; User mention (@user)
 ("text" @tag
  (#match? @tag "^[@][a-zA-Z0-9_-]+$"))
+
+(uri) @markup.link.url

From 46ecc102ba6d6c2e6e707b551e24faa240752c87 Mon Sep 17 00:00:00 2001
From: rojebd <132220348+rojebd@users.noreply.github.com>
Date: Mon, 8 Jan 2024 17:57:14 -0700
Subject: [PATCH 609/967] added voxed theme (#9164)

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

diff --git a/runtime/themes/voxed.toml b/runtime/themes/voxed.toml
new file mode 100644
index 000000000..e55b46e5d
--- /dev/null
+++ b/runtime/themes/voxed.toml
@@ -0,0 +1,102 @@
+attribute = "buff"
+keyword = "sglow"
+"keyword.directive" = "defineish" 
+namespace = "blue"
+punctuation = "white"
+"punctuation.delimiter" = "functionish"
+operator = "greenish"
+special = "maize"
+"variable.other.member" = "bsienna"
+variable = "tan"
+"variable.parameter" = { fg = "parameters" }
+"variable.builtin" = "white"
+type = "light-blue"
+"type.builtin" = "functionish" 
+constructor = "typeish"
+function = "functionish"
+"function.macro" = "blue"
+"function.builtin" = "typeish" 
+tag = "functionish"
+comment = "bgrey"
+constant = "tan"
+"constant.builtin" = "#D38588"
+string = "redish"
+"constant.numeric" = "functionish"
+"constant.character.escape" = "cyan"
+label = "yellow"
+
+"markup.heading" = "functionish"
+"markup.list" = "status-two"
+"markup.quote" = "tan"
+"markup.bold" = { fg = "sglow", modifiers = ["bold"] }
+"markup.italic" = { fg = "sglow", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "sglow", modifiers = ["underlined"] }
+"markup.link.text" = "greenish"
+"markup.raw" = "light-grey"
+
+"diff.plus" = "#7DDF64"
+"diff.minus" = "#F22B29"
+"diff.delta" = "#6f44f0"
+
+"ui.background" = { fg = "#25262B", bg="#1f1f21" }
+"ui.background.separator" = { fg = "sglow" }
+"ui.linenr" = { fg = "light-grey", modifiers = ["italic"] }
+"ui.linenr.selected" = { fg = "bpink", modifiers = ["bold"] }
+"ui.statusline" = { fg = "black", bg = "light-grey", modifiers = ["bold"] }
+"ui.statusline.inactive" = { fg = "black", bg = "bgrey-two" }
+"ui.popup" = { fg = "bgrey", bg = "#25262B" }
+"ui.window" = { fg = "white" }
+"ui.help" = { bg = "#3f4047", fg = "light-grey" }
+
+"ui.text" = { fg = "white" }
+"ui.text.focus" = { fg = "maize", bg = "bgrey" }
+"ui.text.inactive" = "bgrey"
+"ui.virtual" = { fg = "blue" }
+"ui.virtual.ruler" = { bg = "bgrey-two" }
+"ui.virtual.indent-guide" = { fg = "bpink" }
+
+"ui.selection" = { bg = "maize" }
+"ui.selection.primary" = { fg = "white", bg = "bgrey" }
+"ui.cursor.select" = { bg = "white" }
+"ui.cursor.insert" = { bg = "white" }
+"ui.cursor.match" = { fg = "#212121", bg = "#6C6999" }
+"ui.cursor" = { bg = "bgrey-two", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { bg = "white" }
+"ui.highlight" = { bg = "white" }
+"ui.highlight.frameline" = { bg = "#634450" }
+"ui.debug" = { fg = "#634450" }
+"ui.debug.breakpoint" = { fg = "bpink" }
+"ui.menu" = { fg = "white", bg = "#23232d" }
+"ui.menu.selected" = { fg = "white", bg = "bgrey" }
+"ui.menu.scroll" = { fg = "white", bg = "white" }
+
+"diagnostic.hint" = { underline = { color = "maize", style = "curl" } }
+"diagnostic.info" = { underline = { color = "sglow", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "redish", style = "curl" } }
+"diagnostic.error" = { underline = { color = "bpink", style = "curl" } }
+
+warning = "bpink"
+error = "bsienna"
+info = "maize"
+hint = "tan"
+
+[palette]
+parameters = "#d89182"
+defineish = "#71c45c"
+buff = "#f0dc82"
+tan = "#DAB785"
+typeish = "#AAAAA5"
+greenish = "#458588"
+functionish = "#b784a3"
+bsienna = "#D5896F"
+bpink = "#FF5964"
+maize = "#FFE74C"
+bgrey = "#8c8681"
+sglow = "#FFCF56"
+status = "#15616D"
+status-two = "#3879A1"
+redish = "#E76B74"
+light-grey = "#b7afa8"
+bgrey-two = "#706b68"
+gruvgreen = "#B8BB26"

From 41ca46cf8ca65dbd98df7e038fc12a272f0c9e2a Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Tue, 9 Jan 2024 02:01:04 +0100
Subject: [PATCH 610/967] Initialize diagnostics when opening a document
 (#8873)

---
 helix-core/src/syntax.rs         |   1 -
 helix-term/src/application.rs    | 160 ++++++++-----------------------
 helix-term/src/commands.rs       |  26 +++--
 helix-term/src/commands/typed.rs |   6 +-
 helix-term/src/ui/editor.rs      |   4 +-
 helix-term/src/ui/picker.rs      |  13 ++-
 helix-term/src/ui/statusline.rs  |   3 +-
 helix-view/src/document.rs       | 116 ++++++++++++++++++----
 helix-view/src/editor.rs         |  60 +++++++++++-
 9 files changed, 231 insertions(+), 158 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 8d433260e..102ecb15d 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1795,7 +1795,6 @@ impl HighlightConfiguration {
                 let mut best_index = None;
                 let mut best_match_len = 0;
                 for (i, recognized_name) in recognized_names.iter().enumerate() {
-                    let recognized_name = recognized_name;
                     let mut len = 0;
                     let mut matches = true;
                     for (i, part) in recognized_name.split('.').enumerate() {
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 3abe9cae5..4eda8097c 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,14 +1,8 @@
 use arc_swap::{access::Map, ArcSwap};
 use futures_util::Stream;
-use helix_core::{
-    chars::char_is_word,
-    diagnostic::{DiagnosticTag, NumberOrString},
-    path::get_relative_path,
-    pos_at_coords, syntax, Selection,
-};
+use helix_core::{path::get_relative_path, pos_at_coords, syntax, Selection};
 use helix_lsp::{
     lsp::{self, notification::Notification},
-    util::lsp_pos_to_pos,
     LspProgressMap,
 };
 use helix_view::{
@@ -392,6 +386,12 @@ impl Application {
         self.editor.syn_loader = self.syn_loader.clone();
         for document in self.editor.documents.values_mut() {
             document.detect_language(self.syn_loader.clone());
+            let diagnostics = Editor::doc_diagnostics(
+                &self.editor.language_servers,
+                &self.editor.diagnostics,
+                document,
+            );
+            document.replace_diagnostics(diagnostics, &[], None);
         }
 
         Ok(())
@@ -567,6 +567,14 @@ impl Application {
             let id = doc.id();
             doc.detect_language(loader);
             self.editor.refresh_language_servers(id);
+            // and again a borrow checker workaround...
+            let doc = doc_mut!(self.editor, &doc_save_event.doc_id);
+            let diagnostics = Editor::doc_diagnostics(
+                &self.editor.language_servers,
+                &self.editor.diagnostics,
+                doc,
+            );
+            doc.replace_diagnostics(diagnostics, &[], None);
         }
 
         // TODO: fix being overwritten by lsp
@@ -731,7 +739,6 @@ impl Application {
                             log::error!("Discarding publishDiagnostic notification sent by an uninitialized server: {}", language_server.name());
                             return;
                         }
-                        let offset_encoding = language_server.offset_encoding();
                         // have to inline the function because of borrow checking...
                         let doc = self.editor.documents.values_mut()
                             .find(|doc| doc.path().map(|p| p == &path).unwrap_or(false))
@@ -745,11 +752,10 @@ impl Application {
                                 true
                             });
 
-                        if let Some(doc) = doc {
+                        let mut unchanged_diag_sources = Vec::new();
+                        if let Some(doc) = &doc {
                             let lang_conf = doc.language.clone();
-                            let text = doc.text().clone();
 
-                            let mut unchaged_diag_sources_ = Vec::new();
                             if let Some(lang_conf) = &lang_conf {
                                 if let Some(old_diagnostics) =
                                     self.editor.diagnostics.get(&params.uri)
@@ -774,118 +780,11 @@ impl Application {
                                             })
                                             .map(|(d, _)| d);
                                         if new_diagnostics.eq(old_diagnostics) {
-                                            unchaged_diag_sources_.push(source.clone())
+                                            unchanged_diag_sources.push(source.clone())
                                         }
                                     }
                                 }
                             }
-
-                            let unchaged_diag_sources = &unchaged_diag_sources_;
-                            let diagnostics =
-                                params.diagnostics.iter().filter_map(move |diagnostic| {
-                                    use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
-                                    use lsp::DiagnosticSeverity;
-
-                                    if diagnostic.source.as_ref().map_or(false, |source| {
-                                        unchaged_diag_sources.contains(source)
-                                    }) {
-                                        return None;
-                                    }
-
-                                    // TODO: convert inside server
-                                    let start = if let Some(start) = lsp_pos_to_pos(
-                                        &text,
-                                        diagnostic.range.start,
-                                        offset_encoding,
-                                    ) {
-                                        start
-                                    } else {
-                                        log::warn!("lsp position out of bounds - {:?}", diagnostic);
-                                        return None;
-                                    };
-
-                                    let end = if let Some(end) =
-                                        lsp_pos_to_pos(&text, diagnostic.range.end, offset_encoding)
-                                    {
-                                        end
-                                    } else {
-                                        log::warn!("lsp position out of bounds - {:?}", diagnostic);
-                                        return None;
-                                    };
-                                    let severity =
-                                        diagnostic.severity.map(|severity| match severity {
-                                            DiagnosticSeverity::ERROR => Error,
-                                            DiagnosticSeverity::WARNING => Warning,
-                                            DiagnosticSeverity::INFORMATION => Info,
-                                            DiagnosticSeverity::HINT => Hint,
-                                            severity => unreachable!(
-                                                "unrecognized diagnostic severity: {:?}",
-                                                severity
-                                            ),
-                                        });
-
-                                    if let Some(lang_conf) = &lang_conf {
-                                        if let Some(severity) = severity {
-                                            if severity < lang_conf.diagnostic_severity {
-                                                return None;
-                                            }
-                                        }
-                                    };
-
-                                    let code = match diagnostic.code.clone() {
-                                        Some(x) => match x {
-                                            lsp::NumberOrString::Number(x) => {
-                                                Some(NumberOrString::Number(x))
-                                            }
-                                            lsp::NumberOrString::String(x) => {
-                                                Some(NumberOrString::String(x))
-                                            }
-                                        },
-                                        None => None,
-                                    };
-
-                                    let tags = if let Some(tags) = &diagnostic.tags {
-                                        let new_tags = tags
-                                            .iter()
-                                            .filter_map(|tag| match *tag {
-                                                lsp::DiagnosticTag::DEPRECATED => {
-                                                    Some(DiagnosticTag::Deprecated)
-                                                }
-                                                lsp::DiagnosticTag::UNNECESSARY => {
-                                                    Some(DiagnosticTag::Unnecessary)
-                                                }
-                                                _ => None,
-                                            })
-                                            .collect();
-
-                                        new_tags
-                                    } else {
-                                        Vec::new()
-                                    };
-
-                                    let ends_at_word = start != end
-                                        && end != 0
-                                        && text.get_char(end - 1).map_or(false, char_is_word);
-                                    let starts_at_word = start != end
-                                        && text.get_char(start).map_or(false, char_is_word);
-
-                                    Some(Diagnostic {
-                                        range: Range { start, end },
-                                        ends_at_word,
-                                        starts_at_word,
-                                        zero_width: start == end,
-                                        line: diagnostic.range.start.line as usize,
-                                        message: diagnostic.message.clone(),
-                                        severity,
-                                        code,
-                                        tags,
-                                        source: diagnostic.source.clone(),
-                                        data: diagnostic.data.clone(),
-                                        language_server_id: server_id,
-                                    })
-                                });
-
-                            doc.replace_diagnostics(diagnostics, unchaged_diag_sources, server_id);
                         }
 
                         let diagnostics = params.diagnostics.into_iter().map(|d| (d, server_id));
@@ -910,6 +809,27 @@ impl Application {
                         diagnostics.sort_unstable_by_key(|(d, server_id)| {
                             (d.severity, d.range.start, *server_id)
                         });
+
+                        if let Some(doc) = doc {
+                            let diagnostic_of_language_server_and_not_in_unchanged_sources =
+                                |diagnostic: &lsp::Diagnostic, ls_id| {
+                                    ls_id == server_id
+                                        && diagnostic.source.as_ref().map_or(true, |source| {
+                                            !unchanged_diag_sources.contains(source)
+                                        })
+                                };
+                            let diagnostics = Editor::doc_diagnostics_with_filter(
+                                &self.editor.language_servers,
+                                &self.editor.diagnostics,
+                                doc,
+                                diagnostic_of_language_server_and_not_in_unchanged_sources,
+                            );
+                            doc.replace_diagnostics(
+                                diagnostics,
+                                &unchanged_diag_sources,
+                                Some(server_id),
+                            );
+                        }
                     }
                     Notification::ShowMessage(params) => {
                         log::warn!("unhandled window/showMessage: {:?}", params);
@@ -1017,7 +937,7 @@ impl Application {
 
                         // Clear any diagnostics for documents with this server open.
                         for doc in self.editor.documents_mut() {
-                            doc.clear_diagnostics(server_id);
+                            doc.clear_diagnostics(Some(server_id));
                         }
 
                         // Remove the language server from the registry.
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ff0849f20..c95933804 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3350,7 +3350,7 @@ fn exit_select_mode(cx: &mut Context) {
 
 fn goto_first_diag(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    let selection = match doc.shown_diagnostics().next() {
+    let selection = match doc.diagnostics().first() {
         Some(diag) => Selection::single(diag.range.start, diag.range.end),
         None => return,
     };
@@ -3359,7 +3359,7 @@ fn goto_first_diag(cx: &mut Context) {
 
 fn goto_last_diag(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    let selection = match doc.shown_diagnostics().last() {
+    let selection = match doc.diagnostics().last() {
         Some(diag) => Selection::single(diag.range.start, diag.range.end),
         None => return,
     };
@@ -3375,9 +3375,10 @@ fn goto_next_diag(cx: &mut Context) {
         .cursor(doc.text().slice(..));
 
     let diag = doc
-        .shown_diagnostics()
+        .diagnostics()
+        .iter()
         .find(|diag| diag.range.start > cursor_pos)
-        .or_else(|| doc.shown_diagnostics().next());
+        .or_else(|| doc.diagnostics().first());
 
     let selection = match diag {
         Some(diag) => Selection::single(diag.range.start, diag.range.end),
@@ -3395,10 +3396,11 @@ fn goto_prev_diag(cx: &mut Context) {
         .cursor(doc.text().slice(..));
 
     let diag = doc
-        .shown_diagnostics()
+        .diagnostics()
+        .iter()
         .rev()
         .find(|diag| diag.range.start < cursor_pos)
-        .or_else(|| doc.shown_diagnostics().last());
+        .or_else(|| doc.diagnostics().last());
 
     let selection = match diag {
         // NOTE: the selection is reversed because we're jumping to the
@@ -4185,9 +4187,13 @@ fn replace_with_yanked(cx: &mut Context) {
 }
 
 fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
-    let Some(values) = editor.registers
+    let Some(values) = editor
+        .registers
         .read(register, editor)
-        .filter(|values| values.len() > 0) else { return };
+        .filter(|values| values.len() > 0)
+    else {
+        return;
+    };
     let values: Vec<_> = values.map(|value| value.to_string()).collect();
 
     let (view, doc) = current!(editor);
@@ -4224,7 +4230,9 @@ fn replace_selections_with_primary_clipboard(cx: &mut Context) {
 }
 
 fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
-    let Some(values) = editor.registers.read(register, editor) else { return };
+    let Some(values) = editor.registers.read(register, editor) else {
+        return;
+    };
     let values: Vec<_> = values.map(|value| value.to_string()).collect();
 
     let (view, doc) = current!(editor);
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f530ce10d..208854e8a 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1502,7 +1502,7 @@ fn lsp_stop(
 
         for doc in cx.editor.documents_mut() {
             if let Some(client) = doc.remove_language_server_by_name(ls_name) {
-                doc.clear_diagnostics(client.id());
+                doc.clear_diagnostics(Some(client.id()));
             }
         }
     }
@@ -2008,6 +2008,10 @@ fn language(
 
     let id = doc.id();
     cx.editor.refresh_language_servers(id);
+    let doc = doc_mut!(cx.editor);
+    let diagnostics =
+        Editor::doc_diagnostics(&cx.editor.language_servers, &cx.editor.diagnostics, doc);
+    doc.replace_diagnostics(diagnostics, &[], None);
     Ok(())
 }
 
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index ff267e42d..24fcdb014 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -386,7 +386,7 @@ impl EditorView {
         let mut warning_vec = Vec::new();
         let mut error_vec = Vec::new();
 
-        for diagnostic in doc.shown_diagnostics() {
+        for diagnostic in doc.diagnostics() {
             // Separate diagnostics into different Vecs by severity.
             let (vec, scope) = match diagnostic.severity {
                 Some(Severity::Info) => (&mut info_vec, info),
@@ -684,7 +684,7 @@ impl EditorView {
             .primary()
             .cursor(doc.text().slice(..));
 
-        let diagnostics = doc.shown_diagnostics().filter(|diagnostic| {
+        let diagnostics = doc.diagnostics().iter().filter(|diagnostic| {
             diagnostic.range.start <= cursor && diagnostic.range.end >= cursor
         });
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 9ba453357..08a367ba9 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -480,8 +480,7 @@ impl<T: Item + 'static> Picker<T> {
                                 .find::<Overlay<DynamicPicker<T>>>()
                                 .map(|overlay| &mut overlay.content.file_picker),
                         };
-                        let Some(picker) = picker
-                        else {
+                        let Some(picker) = picker else {
                             log::info!("picker closed before syntax highlighting finished");
                             return;
                         };
@@ -489,7 +488,15 @@ impl<T: Item + 'static> Picker<T> {
                         let doc = match current_file {
                             PathOrId::Id(doc_id) => doc_mut!(editor, &doc_id),
                             PathOrId::Path(path) => match picker.preview_cache.get_mut(&path) {
-                                Some(CachedPreview::Document(ref mut doc)) => doc,
+                                Some(CachedPreview::Document(ref mut doc)) => {
+                                    let diagnostics = Editor::doc_diagnostics(
+                                        &editor.language_servers,
+                                        &editor.diagnostics,
+                                        doc,
+                                    );
+                                    doc.replace_diagnostics(diagnostics, &[], None);
+                                    doc
+                                }
                                 _ => return,
                             },
                         };
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 52dd49f9e..9871828ee 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -227,7 +227,8 @@ where
 {
     let (warnings, errors) = context
         .doc
-        .shown_diagnostics()
+        .diagnostics()
+        .iter()
         .fold((0, 0), |mut counts, diag| {
             use helix_core::diagnostic::Severity;
             match diag.severity {
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 51668ab16..0de0cd172 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -4,10 +4,12 @@ use arc_swap::ArcSwap;
 use futures_util::future::BoxFuture;
 use futures_util::FutureExt;
 use helix_core::auto_pairs::AutoPairs;
+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_lsp::util::lsp_pos_to_pos;
 use helix_vcs::{DiffHandle, DiffProviderRegistry};
 
 use ::parking_lot::Mutex;
@@ -1075,14 +1077,6 @@ impl Document {
         };
     }
 
-    /// Set the programming language for the file if you know the name (scope) but don't have the
-    /// [`syntax::LanguageConfiguration`] for it.
-    pub fn set_language2(&mut self, scope: &str, config_loader: Arc<syntax::Loader>) {
-        let language_config = config_loader.language_config_for_scope(scope);
-
-        self.set_language(language_config, Some(config_loader));
-    }
-
     /// Set the programming language for the file if you know the language but don't have the
     /// [`syntax::LanguageConfiguration`] for it.
     pub fn set_language_by_language_id(
@@ -1714,29 +1708,107 @@ impl Document {
         )
     }
 
+    pub fn lsp_diagnostic_to_diagnostic(
+        text: &Rope,
+        language_config: Option<&LanguageConfiguration>,
+        diagnostic: &helix_lsp::lsp::Diagnostic,
+        language_server_id: usize,
+        offset_encoding: helix_lsp::OffsetEncoding,
+    ) -> Option<Diagnostic> {
+        use helix_core::diagnostic::{Range, Severity::*};
+
+        // TODO: convert inside server
+        let start =
+            if let Some(start) = lsp_pos_to_pos(text, diagnostic.range.start, offset_encoding) {
+                start
+            } else {
+                log::warn!("lsp position out of bounds - {:?}", diagnostic);
+                return None;
+            };
+
+        let end = if let Some(end) = lsp_pos_to_pos(text, diagnostic.range.end, offset_encoding) {
+            end
+        } else {
+            log::warn!("lsp position out of bounds - {:?}", diagnostic);
+            return None;
+        };
+
+        let severity = diagnostic.severity.map(|severity| match severity {
+            lsp::DiagnosticSeverity::ERROR => Error,
+            lsp::DiagnosticSeverity::WARNING => Warning,
+            lsp::DiagnosticSeverity::INFORMATION => Info,
+            lsp::DiagnosticSeverity::HINT => Hint,
+            severity => unreachable!("unrecognized diagnostic severity: {:?}", severity),
+        });
+
+        if let Some(lang_conf) = language_config {
+            if let Some(severity) = severity {
+                if severity < lang_conf.diagnostic_severity {
+                    return None;
+                }
+            }
+        };
+        use helix_core::diagnostic::{DiagnosticTag, NumberOrString};
+
+        let code = match diagnostic.code.clone() {
+            Some(x) => match x {
+                lsp::NumberOrString::Number(x) => Some(NumberOrString::Number(x)),
+                lsp::NumberOrString::String(x) => Some(NumberOrString::String(x)),
+            },
+            None => None,
+        };
+
+        let tags = if let Some(tags) = &diagnostic.tags {
+            let new_tags = tags
+                .iter()
+                .filter_map(|tag| match *tag {
+                    lsp::DiagnosticTag::DEPRECATED => Some(DiagnosticTag::Deprecated),
+                    lsp::DiagnosticTag::UNNECESSARY => Some(DiagnosticTag::Unnecessary),
+                    _ => None,
+                })
+                .collect();
+
+            new_tags
+        } else {
+            Vec::new()
+        };
+
+        let ends_at_word =
+            start != end && end != 0 && text.get_char(end - 1).map_or(false, char_is_word);
+        let starts_at_word = start != end && text.get_char(start).map_or(false, char_is_word);
+
+        Some(Diagnostic {
+            range: Range { start, end },
+            ends_at_word,
+            starts_at_word,
+            zero_width: start == end,
+            line: diagnostic.range.start.line as usize,
+            message: diagnostic.message.clone(),
+            severity,
+            code,
+            tags,
+            source: diagnostic.source.clone(),
+            data: diagnostic.data.clone(),
+            language_server_id,
+        })
+    }
+
     #[inline]
     pub fn diagnostics(&self) -> &[Diagnostic] {
         &self.diagnostics
     }
 
-    pub fn shown_diagnostics(&self) -> impl Iterator<Item = &Diagnostic> + DoubleEndedIterator {
-        self.diagnostics.iter().filter(|d| {
-            self.language_servers_with_feature(LanguageServerFeature::Diagnostics)
-                .any(|ls| ls.id() == d.language_server_id)
-        })
-    }
-
     pub fn replace_diagnostics(
         &mut self,
         diagnostics: impl IntoIterator<Item = Diagnostic>,
         unchanged_sources: &[String],
-        language_server_id: usize,
+        language_server_id: Option<usize>,
     ) {
         if unchanged_sources.is_empty() {
             self.clear_diagnostics(language_server_id);
         } else {
             self.diagnostics.retain(|d| {
-                if d.language_server_id != language_server_id {
+                if language_server_id.map_or(false, |id| id != d.language_server_id) {
                     return true;
                 }
 
@@ -1757,9 +1829,13 @@ impl Document {
         });
     }
 
-    pub fn clear_diagnostics(&mut self, language_server_id: usize) {
-        self.diagnostics
-            .retain(|d| d.language_server_id != language_server_id);
+    /// clears diagnostics for a given language server id if set, otherwise all diagnostics are cleared
+    pub fn clear_diagnostics(&mut self, language_server_id: Option<usize>) {
+        if let Some(id) = language_server_id {
+            self.diagnostics.retain(|d| d.language_server_id != id);
+        } else {
+            self.diagnostics.clear();
+        }
     }
 
     /// Get the document's auto pairs. If the document has a recognized
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 76429a876..c018668cb 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -42,7 +42,7 @@ use anyhow::{anyhow, bail, Error};
 pub use helix_core::diagnostic::Severity;
 use helix_core::{
     auto_pairs::AutoPairs,
-    syntax::{self, AutoPairConfig, IndentationHeuristic, SoftWrap},
+    syntax::{self, AutoPairConfig, IndentationHeuristic, LanguageServerFeature, SoftWrap},
     Change, LineEnding, Position, Selection, NATIVE_LINE_ENDING,
 };
 use helix_dap as dap;
@@ -1477,6 +1477,10 @@ impl Editor {
                 self.config.clone(),
             )?;
 
+            let diagnostics =
+                Editor::doc_diagnostics(&self.language_servers, &self.diagnostics, &doc);
+            doc.replace_diagnostics(diagnostics, &[], None);
+
             if let Some(diff_base) = self.diff_providers.get_diff_base(&path) {
                 doc.set_diff_base(diff_base);
             }
@@ -1706,6 +1710,60 @@ impl Editor {
             .find(|doc| doc.path().map(|p| p == path.as_ref()).unwrap_or(false))
     }
 
+    /// Returns all supported diagnostics for the document
+    pub fn doc_diagnostics<'a>(
+        language_servers: &'a helix_lsp::Registry,
+        diagnostics: &'a BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
+        document: &Document,
+    ) -> impl Iterator<Item = helix_core::Diagnostic> + 'a {
+        Editor::doc_diagnostics_with_filter(language_servers, diagnostics, document, |_, _| true)
+    }
+
+    /// Returns all supported diagnostics for the document
+    /// filtered by `filter` which is invocated with the raw `lsp::Diagnostic` and the language server id it came from
+    pub fn doc_diagnostics_with_filter<'a>(
+        language_servers: &'a helix_lsp::Registry,
+        diagnostics: &'a BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
+
+        document: &Document,
+        filter: impl Fn(&lsp::Diagnostic, usize) -> bool + 'a,
+    ) -> impl Iterator<Item = helix_core::Diagnostic> + 'a {
+        let text = document.text().clone();
+        let language_config = document.language.clone();
+        document
+            .path()
+            .and_then(|path| url::Url::from_file_path(path).ok()) // TODO log error?
+            .and_then(|uri| diagnostics.get(&uri))
+            .map(|diags| {
+                diags.iter().filter_map(move |(diagnostic, lsp_id)| {
+                    let ls = language_servers.get_by_id(*lsp_id)?;
+                    language_config
+                        .as_ref()
+                        .and_then(|c| {
+                            c.language_servers.iter().find(|features| {
+                                features.name == ls.name()
+                                    && features.has_feature(LanguageServerFeature::Diagnostics)
+                            })
+                        })
+                        .and_then(|_| {
+                            if filter(diagnostic, *lsp_id) {
+                                Document::lsp_diagnostic_to_diagnostic(
+                                    &text,
+                                    language_config.as_deref(),
+                                    diagnostic,
+                                    *lsp_id,
+                                    ls.offset_encoding(),
+                                )
+                            } else {
+                                None
+                            }
+                        })
+                })
+            })
+            .into_iter()
+            .flatten()
+    }
+
     /// Gets the primary cursor position in screen coordinates,
     /// or `None` if the primary cursor is not visible on screen.
     pub fn cursor(&self) -> (Option<Position>, CursorKind) {

From 305d6e9c89c89037ae4ef0835c4b1dcc9a134584 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 8 Jan 2024 20:04:34 -0500
Subject: [PATCH 611/967] Normalize `S-<lower-ascii>` keymaps to uppercase
 ascii (#9213)

---
 helix-view/src/input.rs | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index 0f4ffaacf..5f5067eac 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -325,7 +325,7 @@ impl std::str::FromStr for KeyEvent {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut tokens: Vec<_> = s.split('-').collect();
-        let code = match tokens.pop().ok_or_else(|| anyhow!("Missing key code"))? {
+        let mut code = match tokens.pop().ok_or_else(|| anyhow!("Missing key code"))? {
             keys::BACKSPACE => KeyCode::Backspace,
             keys::ENTER => KeyCode::Enter,
             keys::LEFT => KeyCode::Left,
@@ -405,6 +405,18 @@ impl std::str::FromStr for KeyEvent {
             modifiers.insert(flag);
         }
 
+        // Normalize character keys so that characters like C-S-r and C-R
+        // are represented by equal KeyEvents.
+        match code {
+            KeyCode::Char(ch)
+                if ch.is_ascii_lowercase() && modifiers.contains(KeyModifiers::SHIFT) =>
+            {
+                code = KeyCode::Char(ch.to_ascii_uppercase());
+                modifiers.remove(KeyModifiers::SHIFT);
+            }
+            _ => (),
+        }
+
         Ok(KeyEvent { code, modifiers })
     }
 }
@@ -684,6 +696,19 @@ mod test {
                 modifiers: KeyModifiers::ALT | KeyModifiers::CONTROL
             }
         );
+
+        assert_eq!(
+            str::parse::<KeyEvent>("C-S-r").unwrap(),
+            str::parse::<KeyEvent>("C-R").unwrap(),
+        );
+
+        assert_eq!(
+            str::parse::<KeyEvent>("S-w").unwrap(),
+            KeyEvent {
+                code: KeyCode::Char('W'),
+                modifiers: KeyModifiers::NONE
+            }
+        );
     }
 
     #[test]

From 65d041288067f1d1bbcf659c8b73ae04d77afb02 Mon Sep 17 00:00:00 2001
From: Sammo98 <75253485+Sammo98@users.noreply.github.com>
Date: Tue, 9 Jan 2024 01:15:50 +0000
Subject: [PATCH 612/967] health - add formatter to display (#7986)

---
 helix-term/src/health.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
index dff903192..44ae2a2f7 100644
--- a/helix-term/src/health.rs
+++ b/helix-term/src/health.rs
@@ -145,7 +145,7 @@ pub fn languages_all() -> std::io::Result<()> {
         }
     };
 
-    let mut headings = vec!["Language", "LSP", "DAP"];
+    let mut headings = vec!["Language", "LSP", "DAP", "Formatter"];
 
     for feat in TsFeature::all() {
         headings.push(feat.short_title())
@@ -203,6 +203,12 @@ pub fn languages_all() -> std::io::Result<()> {
         let dap = lang.debugger.as_ref().map(|dap| dap.command.as_str());
         check_binary(dap);
 
+        let formatter = lang
+            .formatter
+            .as_ref()
+            .map(|formatter| formatter.command.as_str());
+        check_binary(formatter);
+
         for ts_feat in TsFeature::all() {
             match load_runtime_file(&lang.language_id, ts_feat.runtime_filename()).is_ok() {
                 true => column("✓", Color::Green),
@@ -285,6 +291,13 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
         lang.debugger.as_ref().map(|dap| dap.command.to_string()),
     )?;
 
+    probe_protocol(
+        "formatter",
+        lang.formatter
+            .as_ref()
+            .map(|formatter| formatter.command.to_string()),
+    )?;
+
     for ts_feat in TsFeature::all() {
         probe_treesitter_feature(&lang_str, *ts_feat)?
     }

From 84e24b33dcda16d1d64805f34dcc02d82d0de8f1 Mon Sep 17 00:00:00 2001
From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com>
Date: Mon, 8 Jan 2024 20:21:16 -0500
Subject: [PATCH 613/967] make sure to sync views when applying edits to
 unfocused views (#9173)

---
 helix-term/src/commands/lsp.rs   | 17 +++--------------
 helix-term/src/commands/typed.rs | 29 +++++++++--------------------
 helix-view/src/editor.rs         | 24 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 34ffa529c..0096e6aa9 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -896,7 +896,6 @@ pub fn apply_workspace_edit(
             }
         };
 
-        let current_view_id = view!(editor).id;
         let doc_id = match editor.open(&path, Action::Load) {
             Ok(doc_id) => doc_id,
             Err(err) => {
@@ -907,7 +906,7 @@ pub fn apply_workspace_edit(
             }
         };
 
-        let doc = doc_mut!(editor, &doc_id);
+        let doc = doc!(editor, &doc_id);
         if let Some(version) = version {
             if version != doc.version() {
                 let err = format!("outdated workspace edit for {path:?}");
@@ -918,18 +917,8 @@ pub fn apply_workspace_edit(
         }
 
         // Need to determine a view for apply/append_changes_to_history
-        let selections = doc.selections();
-        let view_id = if selections.contains_key(&current_view_id) {
-            // use current if possible
-            current_view_id
-        } else {
-            // Hack: we take the first available view_id
-            selections
-                .keys()
-                .next()
-                .copied()
-                .expect("No view_id available")
-        };
+        let view_id = editor.get_synced_view_id(doc_id);
+        let doc = doc_mut!(editor, &doc_id);
 
         let transaction = helix_lsp::util::generate_transaction_from_edits(
             doc.text(),
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 208854e8a..f1c3cb71c 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -674,13 +674,15 @@ pub fn write_all_impl(
     let mut errors: Vec<&'static str> = Vec::new();
     let config = cx.editor.config();
     let jobs = &mut cx.jobs;
-    let current_view = view!(cx.editor);
-
     let saves: Vec<_> = cx
         .editor
         .documents
-        .values_mut()
-        .filter_map(|doc| {
+        .keys()
+        .cloned()
+        .collect::<Vec<_>>()
+        .into_iter()
+        .filter_map(|id| {
+            let doc = doc!(cx.editor, &id);
             if !doc.is_modified() {
                 return None;
             }
@@ -691,22 +693,9 @@ pub fn write_all_impl(
                 return None;
             }
 
-            // Look for a view to apply the formatting change to. If the document
-            // is in the current view, just use that. Otherwise, since we don't
-            // have any other metric available for better selection, just pick
-            // the first view arbitrarily so that we still commit the document
-            // state for undos. If somehow we have a document that has not been
-            // initialized with any view, initialize it with the current view.
-            let target_view = if doc.selections().contains_key(&current_view.id) {
-                current_view.id
-            } else if let Some(view) = doc.selections().keys().next() {
-                *view
-            } else {
-                doc.ensure_view_init(current_view.id);
-                current_view.id
-            };
-
-            Some((doc.id(), target_view))
+            // Look for a view to apply the formatting change to.
+            let target_view = cx.editor.get_synced_view_id(doc.id());
+            Some((id, target_view))
         })
         .collect();
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index c018668cb..f13df2135 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1910,6 +1910,30 @@ impl Editor {
             .as_ref()
             .and_then(|debugger| debugger.current_stack_frame())
     }
+
+    /// Returns the id of a view that this doc contains a selection for,
+    /// making sure it is synced with the current changes
+    /// if possible or there are no selections returns current_view
+    /// otherwise uses an arbitrary view
+    pub fn get_synced_view_id(&mut self, id: DocumentId) -> ViewId {
+        let current_view = view_mut!(self);
+        let doc = self.documents.get_mut(&id).unwrap();
+        if doc.selections().contains_key(&current_view.id) {
+            // only need to sync current view if this is not the current doc
+            if current_view.doc != id {
+                current_view.sync_changes(doc);
+            }
+            current_view.id
+        } else if let Some(view_id) = doc.selections().keys().next() {
+            let view_id = *view_id;
+            let view = self.tree.get_mut(view_id);
+            view.sync_changes(doc);
+            view_id
+        } else {
+            doc.ensure_view_init(current_view.id);
+            current_view.id
+        }
+    }
 }
 
 fn try_restore_indent(doc: &mut Document, view: &mut View) {

From 7739d3ece1828506bbf2ab87233d10e36c3f6098 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 11 Jan 2024 14:13:39 +0100
Subject: [PATCH 614/967] Revert "build(deps): bump ahash from 0.8.6 to 0.8.7"
 (#9294)

---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9f0e8dcdb..a7e06b6ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
  "cfg-if",
  "getrandom",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index ff0bbcc3e..d7fff6c6f 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -31,7 +31,7 @@ once_cell = "1.19"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
-ahash = "0.8.7"
+ahash = "0.8.6"
 hashbrown = { version = "0.14.3", features = ["raw"] }
 dunce = "1.0"
 

From 17dd102e5cccbb2a9a0f0224af63e52f3dab846b Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 11 Jan 2024 10:26:25 -0500
Subject: [PATCH 615/967] Remove sourcehut tree-sitter grammars from default
 build (#9316)

Sourcehut has outages occasionally that cause the CI and from-source
builds to fail. It also doesn't setup redirects when a user renames
themselves, so if a user that publishes a tree-sitter grammar we use
changes their sourcehut name then it breaks the build and any prior
builds using that grammar.

For now let's remove them from the default build. It's a bandaid over
a larger reliability and trust problem with the grammar repositories
but it should fix the build for now.
---
 languages.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/languages.toml b/languages.toml
index 2a0efb494..7983e75ac 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1,6 +1,8 @@
 # Language support configuration.
 # See the languages documentation: https://docs.helix-editor.com/master/languages.html
 
+use-grammars = { except = [ "hare", "wren", "gemini" ] }
+
 [language-server]
 
 als = { command = "als" }

From 054ce3961af4006d66529fe5fbbc44b47e2ee079 Mon Sep 17 00:00:00 2001
From: jw013 <jw013@users.noreply.github.com>
Date: Sun, 14 Jan 2024 09:11:18 -0500
Subject: [PATCH 616/967] Fallback to filename for +arg (#9333)

---
 helix-term/src/args.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
index 6a49889b6..0b1c9cde0 100644
--- a/helix-term/src/args.rs
+++ b/helix-term/src/args.rs
@@ -90,10 +90,9 @@ impl Args {
                     }
                 }
                 arg if arg.starts_with('+') => {
-                    let arg = &arg[1..];
-                    line_number = match arg.parse::<usize>() {
-                        Ok(n) => n.saturating_sub(1),
-                        _ => anyhow::bail!("bad line number after +"),
+                    match arg[1..].parse::<usize>() {
+                        Ok(n) => line_number = n.saturating_sub(1),
+                        _ => args.files.push(parse_file(arg)),
                     };
                 }
                 arg => args.files.push(parse_file(arg)),

From a0b02106c35ede95438bd23069d2b7f999ed8684 Mon Sep 17 00:00:00 2001
From: Sebastian Zivota <loewenheim@users.noreply.github.com>
Date: Sun, 14 Jan 2024 15:11:40 +0100
Subject: [PATCH 617/967] Make nix flake respect unused grammars (#9326)

* Make nix flake respect unused grammars

* Use default value

* Refactor

* Take use-grammars.only into account

---------

Co-authored-by: Sebastian Zivota <sebastian.zivota@mailbox.org>
---
 grammars.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/grammars.nix b/grammars.nix
index 843fa02ad..5152b5204 100644
--- a/grammars.nix
+++ b/grammars.nix
@@ -28,7 +28,17 @@
     owner = builtins.elemAt match 0;
     repo = builtins.elemAt match 1;
   };
-  gitGrammars = builtins.filter isGitGrammar languagesConfig.grammar;
+  # If `use-grammars.only` is set, use only those grammars.
+  # If `use-grammars.except` is set, use all other grammars.
+  # Otherwise use all grammars.
+  useGrammar = grammar:
+    if languagesConfig?use-grammars.only then
+      builtins.elem grammar.name languagesConfig.use-grammars.only
+    else if languagesConfig?use-grammars.except then
+      !(builtins.elem grammar.name languagesConfig.use-grammars.except)
+    else true;
+  grammarsToUse = builtins.filter useGrammar languagesConfig.grammar;
+  gitGrammars = builtins.filter isGitGrammar grammarsToUse;
   buildGrammar = grammar: let
     gh = toGitHubFetcher grammar.source.git;
     sourceGit = builtins.fetchTree {

From 3f88a3f4e6f75bf04246a8015652931e640e0821 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Sun, 14 Jan 2024 16:46:32 +0200
Subject: [PATCH 618/967] Change path normalization strategy to not resolve
 symlinks (#9330)

---
 Cargo.lock               |   1 +
 helix-core/Cargo.toml    |   1 +
 helix-core/src/path.rs   |  71 ++++++++++++++--------
 helix-core/tests/path.rs | 124 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 171 insertions(+), 26 deletions(-)
 create mode 100644 helix-core/tests/path.rs

diff --git a/Cargo.lock b/Cargo.lock
index a7e06b6ef..3643b9532 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1074,6 +1074,7 @@ dependencies = [
  "slotmap",
  "smallvec",
  "smartstring",
+ "tempfile",
  "textwrap",
  "toml",
  "tree-sitter",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index d7fff6c6f..be41fa010 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -55,3 +55,4 @@ parking_lot = "0.12"
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
 indoc = "2.0.4"
+tempfile = "3.7.0"
diff --git a/helix-core/src/path.rs b/helix-core/src/path.rs
index ede37e044..0cf6f812f 100644
--- a/helix-core/src/path.rs
+++ b/helix-core/src/path.rs
@@ -30,31 +30,10 @@ pub fn expand_tilde(path: &Path) -> PathBuf {
     path.to_path_buf()
 }
 
-/// Normalize a path, removing things like `.` and `..`.
-///
-/// CAUTION: This does not resolve symlinks (unlike
-/// [`std::fs::canonicalize`]). This may cause incorrect or surprising
-/// behavior at times. This should be used carefully. Unfortunately,
-/// [`std::fs::canonicalize`] can be hard to use correctly, since it can often
-/// fail, or on Windows returns annoying device paths. This is a problem Cargo
-/// needs to improve on.
-/// Copied from cargo: <https://github.com/rust-lang/cargo/blob/070e459c2d8b79c5b2ac5218064e7603329c92ae/crates/cargo-util/src/paths.rs#L81>
+/// Normalize a path without resolving symlinks.
+// Strategy: start from the first component and move up. Cannonicalize previous path,
+// join component, cannonicalize new path, strip prefix and join to the final result.
 pub fn get_normalized_path(path: &Path) -> PathBuf {
-    // normalization strategy is to canonicalize first ancestor path that exists (i.e., canonicalize as much as possible),
-    // then run handrolled normalization on the non-existent remainder
-    let (base, path) = path
-        .ancestors()
-        .find_map(|base| {
-            let canonicalized_base = dunce::canonicalize(base).ok()?;
-            let remainder = path.strip_prefix(base).ok()?.into();
-            Some((canonicalized_base, remainder))
-        })
-        .unwrap_or_else(|| (PathBuf::new(), PathBuf::from(path)));
-
-    if path.as_os_str().is_empty() {
-        return base;
-    }
-
     let mut components = path.components().peekable();
     let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
         components.next();
@@ -70,20 +49,60 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
                 ret.push(component.as_os_str());
             }
             Component::CurDir => {}
+            #[cfg(not(windows))]
             Component::ParentDir => {
                 ret.pop();
             }
+            #[cfg(windows)]
+            Component::ParentDir => {
+                if let Some(head) = ret.components().next_back() {
+                    match head {
+                        Component::Prefix(_) | Component::RootDir => {}
+                        Component::CurDir => unreachable!(),
+                        // If we left previous component as ".." it means we met a symlink before and we can't pop path.
+                        Component::ParentDir => {
+                            ret.push("..");
+                        }
+                        Component::Normal(_) => {
+                            if ret.is_symlink() {
+                                ret.push("..");
+                            } else {
+                                ret.pop();
+                            }
+                        }
+                    }
+                }
+            }
+            #[cfg(not(windows))]
             Component::Normal(c) => {
                 ret.push(c);
             }
+            #[cfg(windows)]
+            Component::Normal(c) => 'normal: {
+                use std::fs::canonicalize;
+
+                let new_path = ret.join(c);
+                if new_path.is_symlink() {
+                    ret = new_path;
+                    break 'normal;
+                }
+                let (can_new, can_old) = (canonicalize(&new_path), canonicalize(&ret));
+                match (can_new, can_old) {
+                    (Ok(can_new), Ok(can_old)) => {
+                        let striped = can_new.strip_prefix(can_old);
+                        ret.push(striped.unwrap_or_else(|_| c.as_ref()));
+                    }
+                    _ => ret.push(c),
+                }
+            }
         }
     }
-    base.join(ret)
+    dunce::simplified(&ret).to_path_buf()
 }
 
 /// Returns the canonical, absolute form of a path with all intermediate components normalized.
 ///
-/// This function is used instead of `std::fs::canonicalize` because we don't want to verify
+/// This function is used instead of [`std::fs::canonicalize`] because we don't want to verify
 /// here if the path exists, just normalize it's components.
 pub fn get_canonicalized_path(path: &Path) -> PathBuf {
     let path = expand_tilde(path);
diff --git a/helix-core/tests/path.rs b/helix-core/tests/path.rs
new file mode 100644
index 000000000..cbda5e1ab
--- /dev/null
+++ b/helix-core/tests/path.rs
@@ -0,0 +1,124 @@
+#![cfg(windows)]
+
+use std::{
+    env::set_current_dir,
+    error::Error,
+    path::{Component, Path, PathBuf},
+};
+
+use helix_core::path::get_normalized_path;
+use tempfile::Builder;
+
+// Paths on Windows are almost always case-insensitive.
+// Normalization should return the original path.
+// E.g. mkdir `CaSe`, normalize(`case`) = `CaSe`.
+#[test]
+fn test_case_folding_windows() -> Result<(), Box<dyn Error>> {
+    // tmp/root/case
+    let tmp_prefix = std::env::temp_dir();
+    set_current_dir(&tmp_prefix)?;
+
+    let root = Builder::new().prefix("root-").tempdir()?;
+    let case = Builder::new().prefix("CaSe-").tempdir_in(&root)?;
+
+    let root_without_prefix = root.path().strip_prefix(&tmp_prefix)?;
+
+    let lowercase_case = format!(
+        "case-{}",
+        case.path()
+            .file_name()
+            .unwrap()
+            .to_string_lossy()
+            .split_at(5)
+            .1
+    );
+    let test_path = root_without_prefix.join(lowercase_case);
+    assert_eq!(
+        get_normalized_path(&test_path),
+        case.path().strip_prefix(&tmp_prefix)?
+    );
+
+    Ok(())
+}
+
+#[test]
+fn test_normalize_path() -> Result<(), Box<dyn Error>> {
+    /*
+    tmp/root/
+    ├── link -> dir1/orig_file
+    ├── dir1/
+    │   └── orig_file
+    └── dir2/
+        └── dir_link -> ../dir1/
+    */
+
+    let tmp_prefix = std::env::temp_dir();
+    set_current_dir(&tmp_prefix)?;
+
+    // Create a tree structure as shown above
+    let root = Builder::new().prefix("root-").tempdir()?;
+    let dir1 = Builder::new().prefix("dir1-").tempdir_in(&root)?;
+    let orig_file = Builder::new().prefix("orig_file-").tempfile_in(&dir1)?;
+    let dir2 = Builder::new().prefix("dir2-").tempdir_in(&root)?;
+
+    // Create path and delete existing file
+    let dir_link = Builder::new()
+        .prefix("dir_link-")
+        .tempfile_in(&dir2)?
+        .path()
+        .to_owned();
+    let link = Builder::new()
+        .prefix("link-")
+        .tempfile_in(&root)?
+        .path()
+        .to_owned();
+
+    use std::os::windows;
+    windows::fs::symlink_dir(&dir1, &dir_link)?;
+    windows::fs::symlink_file(&orig_file, &link)?;
+
+    // root/link
+    let path = link.strip_prefix(&tmp_prefix)?;
+    assert_eq!(
+        get_normalized_path(path),
+        path,
+        "input {:?} and symlink last component shouldn't be resolved",
+        path
+    );
+
+    // root/dir2/dir_link/orig_file/../..
+    let path = dir_link
+        .strip_prefix(&tmp_prefix)
+        .unwrap()
+        .join(orig_file.path().file_name().unwrap())
+        .join(Component::ParentDir)
+        .join(Component::ParentDir);
+    let expected = dir_link
+        .strip_prefix(&tmp_prefix)
+        .unwrap()
+        .join(Component::ParentDir);
+    assert_eq!(
+        get_normalized_path(&path),
+        expected,
+        "input {:?} and \"..\" should not erase the simlink that goes ahead",
+        &path
+    );
+
+    // root/link/.././../dir2/../
+    let path = link
+        .strip_prefix(&tmp_prefix)
+        .unwrap()
+        .join(Component::ParentDir)
+        .join(Component::CurDir)
+        .join(Component::ParentDir)
+        .join(dir2.path().file_name().unwrap())
+        .join(Component::ParentDir);
+    let expected = link
+        .strip_prefix(&tmp_prefix)
+        .unwrap()
+        .join(Component::ParentDir)
+        .join(Component::ParentDir);
+    assert_eq!(get_normalized_path(&path), expected, "input {:?}", &path);
+
+    Ok(())
+}

From 2fb7e50b549842999639434dc433f22928678082 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Sun, 14 Jan 2024 00:00:31 +0100
Subject: [PATCH 619/967] don't crash in plaintext bracket match (mm) on empty
 file

---
 helix-core/src/match_brackets.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index f6d9885e4..e49b408a8 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -141,7 +141,7 @@ fn find_pair(
 #[must_use]
 pub fn find_matching_bracket_plaintext(doc: RopeSlice, cursor_pos: usize) -> Option<usize> {
     // Don't do anything when the cursor is not on top of a bracket.
-    let bracket = doc.char(cursor_pos);
+    let bracket = doc.get_char(cursor_pos)?;
     if !is_valid_bracket(bracket) {
         return None;
     }
@@ -265,6 +265,12 @@ fn as_char(doc: RopeSlice, node: &Node) -> Option<(usize, char)> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn find_matching_bracket_empty_file() {
+        let actual = find_matching_bracket_plaintext("".into(), 0);
+        assert_eq!(actual, None);
+    }
+
     #[test]
     fn test_find_matching_bracket_current_line_plaintext() {
         let assert = |input: &str, pos, expected| {

From 445f7a273a27d74d8168eab7941dcb3479d31ebe Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Sun, 14 Jan 2024 00:21:49 +0100
Subject: [PATCH 620/967] ignore empty TS nodes in match bracket

---
 helix-core/src/match_brackets.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index e49b408a8..150679b5c 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -60,7 +60,7 @@ fn find_pair(
     let tree = syntax.tree();
     let pos = doc.char_to_byte(pos_);
 
-    let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;
+    let mut node = tree.root_node().descendant_for_byte_range(pos, pos + 1)?;
 
     loop {
         if node.is_named() {
@@ -118,7 +118,9 @@ fn find_pair(
         };
         node = parent;
     }
-    let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
+    let node = tree
+        .root_node()
+        .named_descendant_for_byte_range(pos, pos + 1)?;
     if node.child_count() != 0 {
         return None;
     }

From 3011df4f35e43f9f7690b236c85ab54f210c8b3a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 15 Jan 2024 01:33:26 -0500
Subject: [PATCH 621/967] Bump tree-sitter to latest master (#9317)

* query capture names now return `&str`s rather than `String`s
* the `#any-of?` predicate is now supported
---
 Cargo.lock                         | 2 +-
 Cargo.toml                         | 2 +-
 book/src/guides/indent.md          | 6 +++++-
 book/src/guides/injection.md       | 3 +++
 helix-core/src/indent.rs           | 2 +-
 helix-core/src/syntax.rs           | 6 +++---
 runtime/queries/tsq/highlights.scm | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3643b9532..d07d5fa91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2178,7 +2178,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter"
 version = "0.20.10"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
+source = "git+https://github.com/helix-editor/tree-sitter?rev=660481dbf71413eba5a928b0b0ab8da50c1109e0#660481dbf71413eba5a928b0b0ab8da50c1109e0"
 dependencies = [
  "cc",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index 6c006fbb4..f59896ecb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ package.helix-tui.opt-level = 2
 package.helix-term.opt-level = 2
 
 [workspace.dependencies]
-tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
+tree-sitter = { version = "0.20", git = "https://github.com/helix-editor/tree-sitter", rev = "660481dbf71413eba5a928b0b0ab8da50c1109e0" }
 nucleo = "0.2.0"
 
 [workspace.package]
diff --git a/book/src/guides/indent.md b/book/src/guides/indent.md
index a65ac5ac1..be140384a 100644
--- a/book/src/guides/indent.md
+++ b/book/src/guides/indent.md
@@ -315,6 +315,10 @@ The first argument (a capture) must/must not be equal to the second argument
 The first argument (a capture) must/must not match the regex given in the
 second argument (a string).
 
+- `#any-of?`/`#not-any-of?`:
+The first argument (a capture) must/must not be one of the other arguments
+(strings).
+
 Additionally, we support some custom predicates for indent queries:
 
 - `#not-kind-eq?`:
@@ -366,4 +370,4 @@ Everything up to and including the closing brace gets an indent level of 1.
 Then, on the closing brace, we encounter an outdent with a scope of "all", which
 means the first line is included, and the indent level is cancelled out on this
 line. (Note these scopes are the defaults for `@indent` and `@outdent`—they are
-written explicitly for demonstration.)
\ No newline at end of file
+written explicitly for demonstration.)
diff --git a/book/src/guides/injection.md b/book/src/guides/injection.md
index e842ae303..0a1d2c9a2 100644
--- a/book/src/guides/injection.md
+++ b/book/src/guides/injection.md
@@ -54,4 +54,7 @@ The first argument (a capture) must be equal to the second argument
 The first argument (a capture) must match the regex given in the
 second argument (a string).
 
+- `#any-of?` (standard):
+The first argument (a capture) must be one of the other arguments (strings).
+
 [upstream-docs]: http://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 1e90db472..c29bb3a0b 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -551,7 +551,7 @@ fn query_indents<'a>(
         // The row/column position of the optional anchor in this query
         let mut anchor: Option<tree_sitter::Node> = None;
         for capture in m.captures {
-            let capture_name = query.capture_names()[capture.index as usize].as_str();
+            let capture_name = query.capture_names()[capture.index as usize];
             let capture_type = match capture_name {
                 "indent" => IndentCaptureType::Indent,
                 "indent.always" => IndentCaptureType::IndentAlways,
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 102ecb15d..4e44c4866 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1727,7 +1727,7 @@ impl HighlightConfiguration {
         let mut local_scope_capture_index = None;
         for (i, name) in query.capture_names().iter().enumerate() {
             let i = Some(i as u32);
-            match name.as_str() {
+            match *name {
                 "local.definition" => local_def_capture_index = i,
                 "local.definition-value" => local_def_value_capture_index = i,
                 "local.reference" => local_ref_capture_index = i,
@@ -1738,7 +1738,7 @@ impl HighlightConfiguration {
 
         for (i, name) in injections_query.capture_names().iter().enumerate() {
             let i = Some(i as u32);
-            match name.as_str() {
+            match *name {
                 "injection.content" => injection_content_capture_index = i,
                 "injection.language" => injection_language_capture_index = i,
                 "injection.filename" => injection_filename_capture_index = i,
@@ -1768,7 +1768,7 @@ impl HighlightConfiguration {
     }
 
     /// Get a slice containing all of the highlight names used in the configuration.
-    pub fn names(&self) -> &[String] {
+    pub fn names(&self) -> &[&str] {
         self.query.capture_names()
     }
 
diff --git a/runtime/queries/tsq/highlights.scm b/runtime/queries/tsq/highlights.scm
index b59514bc2..5ef6bf4c8 100644
--- a/runtime/queries/tsq/highlights.scm
+++ b/runtime/queries/tsq/highlights.scm
@@ -41,7 +41,7 @@
 (capture) @label
 
 ((predicate_name) @function
- (#match? @function "^#(eq\\?|match\\?|is\\?|is-not\\?|not-same-line\\?|not-kind-eq\\?|set!|select-adjacent!|strip!)$"))
+ (#any-of? @function "#eq?" "#match?" "#any-of?" "#not-any-of?" "#is?" "#is-not?" "#not-same-line?" "#not-kind-eq?" "#set!" "#select-adjacent!" "#strip!"))
 (predicate_name) @error
 
 (escape_sequence) @constant.character.escape

From eca3ccff76b9f45dd2b266215764fe7630dee884 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 15 Jan 2024 01:34:38 -0500
Subject: [PATCH 622/967] Select subtree within injections in
 :tree-sitter-subtree (#9309)

`:tree-sitter-subtree` could previously only print subtrees of nodes
in the root injection layer. We can improve on that by finding the layer
that contains the given byte range and printing the subtree within that
layer. That gives more useful results when a selection is within an
injection layer.
---
 helix-core/src/syntax.rs         | 43 ++++++++++++++++++++++++++++++++
 helix-term/src/commands/typed.rs |  6 +----
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 4e44c4866..83bd09b4d 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1338,6 +1338,23 @@ impl Syntax {
         result
     }
 
+    pub fn descendant_for_byte_range(&self, start: usize, end: usize) -> Option<Node<'_>> {
+        let mut container_id = self.root;
+
+        for (layer_id, layer) in self.layers.iter() {
+            if layer.depth > self.layers[container_id].depth
+                && layer.contains_byte_range(start, end)
+            {
+                container_id = layer_id;
+            }
+        }
+
+        self.layers[container_id]
+            .tree()
+            .root_node()
+            .descendant_for_byte_range(start, end)
+    }
+
     // Commenting
     // comment_strings_for_pos
     // is_commented
@@ -1434,6 +1451,32 @@ impl LanguageLayer {
         self.tree = Some(tree);
         Ok(())
     }
+
+    /// Whether the layer contains the given byte range.
+    ///
+    /// If the layer has multiple ranges (i.e. combined injections), the
+    /// given range is considered contained if it is within the start and
+    /// end bytes of the first and last ranges **and** if the given range
+    /// starts or ends within any of the layer's ranges.
+    fn contains_byte_range(&self, start: usize, end: usize) -> bool {
+        let layer_start = self
+            .ranges
+            .first()
+            .expect("ranges should not be empty")
+            .start_byte;
+        let layer_end = self
+            .ranges
+            .last()
+            .expect("ranges should not be empty")
+            .end_byte;
+
+        layer_start <= start
+            && layer_end >= end
+            && self.ranges.iter().any(|range| {
+                let byte_range = range.start_byte..range.end_byte;
+                byte_range.contains(&start) || byte_range.contains(&end)
+            })
+    }
 }
 
 pub(crate) fn generate_edits(
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f1c3cb71c..b13af03a2 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2117,11 +2117,7 @@ fn tree_sitter_subtree(
         let text = doc.text();
         let from = text.char_to_byte(primary_selection.from());
         let to = text.char_to_byte(primary_selection.to());
-        if let Some(selected_node) = syntax
-            .tree()
-            .root_node()
-            .descendant_for_byte_range(from, to)
-        {
+        if let Some(selected_node) = syntax.descendant_for_byte_range(from, to) {
             let mut contents = String::from("```tsq\n");
             helix_core::syntax::pretty_print_tree(&mut contents, selected_node)?;
             contents.push_str("\n```");

From 6ce57b7924fc52ee9800637e4f0eae72d123fec6 Mon Sep 17 00:00:00 2001
From: JR <jerabaul29@users.noreply.github.com>
Date: Mon, 15 Jan 2024 21:43:23 +0100
Subject: [PATCH 623/967] Fix export instructions in installation doc (#9306)

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

diff --git a/book/src/install.md b/book/src/install.md
index 2a4273b86..1f200e2ed 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -216,12 +216,12 @@ RUSTFLAGS="-C target-feature=-crt-static"
 
 #### Linux and macOS
 
-The **runtime** directory is one below the Helix source, so either set a
+The **runtime** directory is one below the Helix source, so either export a
 `HELIX_RUNTIME` environment variable to point to that directory and add it to
 your `~/.bashrc` or equivalent:
 
 ```sh
-HELIX_RUNTIME=~/src/helix/runtime
+export HELIX_RUNTIME=~/src/helix/runtime
 ```
 
 Or, create a symbolic link:

From 8a00620a7116e3804b481af41a1252e6170ccc28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:12:15 +0900
Subject: [PATCH 624/967] build(deps): bump smallvec from 1.11.2 to 1.12.0
 (#9341)

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

diff --git a/Cargo.lock b/Cargo.lock
index d07d5fa91..3dd25ed49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1920,9 +1920,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"
 
 [[package]]
 name = "smartstring"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index be41fa010..eb14cda6c 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -19,7 +19,7 @@ integration = []
 helix-loader = { path = "../helix-loader" }
 
 ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
-smallvec = "1.11"
+smallvec = "1.12"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"
 unicode-width = "0.1"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 0859dbd74..80bda2b6c 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -82,6 +82,6 @@ crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
 helix-loader = { path = "../helix-loader" }
 
 [dev-dependencies]
-smallvec = "1.11"
+smallvec = "1.12"
 indoc = "2.0.4"
 tempfile = "3.9.0"

From 2d8d16ff5ef149c659aaa5b805db542cbd839c38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:12:25 +0900
Subject: [PATCH 625/967] build(deps): bump rustix from 0.38.28 to 0.38.30
 (#9342)

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 3dd25ed49..d4c348f03 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1413,9 +1413,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
 [[package]]
 name = "lock_api"
@@ -1763,9 +1763,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
  "bitflags 2.4.1",
  "errno",

From fa1d8dfabc0b8ee0b074928412ddd4083412c20d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:12:32 +0900
Subject: [PATCH 626/967] build(deps): bump anyhow from 1.0.78 to 1.0.79
 (#9344)

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 d4c348f03..78b650b13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "arc-swap"

From 0e7f5d604ed411439c1cb3b73d11eae1223b2203 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:12:39 +0900
Subject: [PATCH 627/967] build(deps): bump thiserror from 1.0.52 to 1.0.56
 (#9345)

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 78b650b13..da0dc3612 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2029,18 +2029,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.52"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.52"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",

From bd9eef1f90409fda5790e4b560ef68b7f9df672a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:13:04 +0900
Subject: [PATCH 628/967] build(deps): bump cachix/install-nix-action from 24
 to 25 (#9346)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 0620cbf12..08f24e1e5 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install nix
-      uses: cachix/install-nix-action@v24
+      uses: cachix/install-nix-action@v25
 
     - name: Authenticate with Cachix
       uses: cachix/cachix-action@v13

From eef46b1aeda8b7061657622c19867663193ecb4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:13:12 +0900
Subject: [PATCH 629/967] build(deps): bump cachix/cachix-action from 13 to 14
 (#9347)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 08f24e1e5..57f0a0db4 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -17,7 +17,7 @@ jobs:
       uses: cachix/install-nix-action@v25
 
     - name: Authenticate with Cachix
-      uses: cachix/cachix-action@v13
+      uses: cachix/cachix-action@v14
       with:
         name: helix
         authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

From 44cb8e547550648bf942b452acaac0268e30afa9 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:32:05 -0500
Subject: [PATCH 630/967] update tempfile dev-dependency to 3.9 (#9359)

---
 helix-core/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index eb14cda6c..07c801b89 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -55,4 +55,4 @@ parking_lot = "0.12"
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
 indoc = "2.0.4"
-tempfile = "3.7.0"
+tempfile = "3.9"

From 6339a8c95a969a40a0db92d6dddd48a1617a1b37 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:15:09 -0500
Subject: [PATCH 631/967] Delete .ignore (#9363)

This isn't being used for anything anymore.
---
 .ignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .ignore

diff --git a/.ignore b/.ignore
deleted file mode 100644
index 0c4493ee8..000000000
--- a/.ignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Things that we don't want ripgrep to search that we do want in git
-# https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#automatic-filtering

From f41727cc9c3a71ccaec837f358cb3b2362c4c303 Mon Sep 17 00:00:00 2001
From: Jeremy Brudvik <jeremy@brudvik.me>
Date: Wed, 17 Jan 2024 09:15:38 -0500
Subject: [PATCH 632/967] Support PureScript's new spago.yaml configs (#9362)

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

diff --git a/languages.toml b/languages.toml
index 7983e75ac..1638cac49 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1119,7 +1119,7 @@ name = "purescript"
 scope = "source.purescript"
 injection-regex = "purescript"
 file-types = ["purs"]
-roots = ["spago.dhall", "bower.json"]
+roots = ["spago.yaml", "spago.dhall", "bower.json"]
 comment-token = "--"
 language-servers = [ "purescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }

From dcdecaab22e87ae8046e15aa461dc2604b1c67ad Mon Sep 17 00:00:00 2001
From: Ben Dennis <bendennis@users.noreply.github.com>
Date: Wed, 17 Jan 2024 08:49:25 -0600
Subject: [PATCH 633/967] Exit a language server if it sends a message with
 invalid json (#9332)

* Keep lsp event listener thread alive when malformed json is encountered from the lsp server

* Update unexpected error flow in recv() to close outstanding requests and close the language server

* Log malformed notifications as info instead of error

* Make close_language_server a nested function inside recv, similar to what's done in send

* Update malformed notification log text

* Clean up new log text a bit

* Initialize recv_buffer closer to where it's used

* Use "exit" instead of "close"

* Remove whitespace

* Remove the need for a helper method to exit the language server

* Match on Unhandled error explicitly and keep catch-all error case around
---
 helix-lsp/src/transport.rs    | 13 ++++++++-----
 helix-term/src/application.rs | 10 +++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/helix-lsp/src/transport.rs b/helix-lsp/src/transport.rs
index 9fdd30aa0..f2f35d6ab 100644
--- a/helix-lsp/src/transport.rs
+++ b/helix-lsp/src/transport.rs
@@ -270,7 +270,14 @@ impl Transport {
                         }
                     };
                 }
-                Err(Error::StreamClosed) => {
+                Err(err) => {
+                    if !matches!(err, Error::StreamClosed) {
+                        error!(
+                            "Exiting {} after unexpected error: {err:?}",
+                            &transport.name
+                        );
+                    }
+
                     // Close any outstanding requests.
                     for (id, tx) in transport.pending_requests.lock().await.drain() {
                         match tx.send(Err(Error::StreamClosed)).await {
@@ -300,10 +307,6 @@ impl Transport {
                     }
                     break;
                 }
-                Err(err) => {
-                    error!("{} err: <- {err:?}", transport.name);
-                    break;
-                }
             }
         }
     }
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 4eda8097c..01c120d06 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -27,7 +27,7 @@ use crate::{
     ui::{self, overlay::overlaid},
 };
 
-use log::{debug, error, warn};
+use log::{debug, error, info, warn};
 #[cfg(not(feature = "integration"))]
 use std::io::stdout;
 use std::{collections::btree_map::Entry, io::stdin, path::Path, sync::Arc};
@@ -683,9 +683,13 @@ impl Application {
             Call::Notification(helix_lsp::jsonrpc::Notification { method, params, .. }) => {
                 let notification = match Notification::parse(&method, params) {
                     Ok(notification) => notification,
+                    Err(helix_lsp::Error::Unhandled) => {
+                        info!("Ignoring Unhandled notification from Language Server");
+                        return;
+                    }
                     Err(err) => {
-                        log::error!(
-                            "received malformed notification from Language Server: {}",
+                        error!(
+                            "Ignoring unknown notification from Language Server: {}",
                             err
                         );
                         return;

From 6754acd83ff0f6edf837611679c5f4424e14492e Mon Sep 17 00:00:00 2001
From: HumanEntity <102693471+HumanEntity@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:23:46 +0100
Subject: [PATCH 634/967] Made inlay-hints not look like normal code (#9370)

Added `"ui.virtual.whitespace" = { fg = "grey_dim" }` line
---
 runtime/themes/sonokai.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index f60bd4dbf..c7c9adc06 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -72,6 +72,7 @@
 "ui.menu.selected" = { fg = "bg0", bg = "green" }
 "ui.virtual.whitespace" = { fg = "grey_dim" }
 "ui.virtual.ruler" = { bg = "grey_dim" }
+"ui.virtual.inlay-hint" = { fg = "grey_dim" }
 
 info = { fg = 'green', bg = 'bg2' }
 hint = { fg = 'blue', bg = 'bg2', modifiers = ['bold'] }

From c60ba4ba04de56f37f4f4b19051bc4a1e68b3484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Wed, 17 Jan 2024 17:24:38 +0000
Subject: [PATCH 635/967] feat(lsp): implement show document request (#8865)

* feat(lsp): implement show document request

Implement [window.showDocument](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#window_showDocument)
LSP server-sent request.

This PR builds on top of helix-editor#5820,
moves the external-URL opening functionality into shared crate-level
function that returns a callback that is now used by both the
`open_file` command as well as the window.showDocument handler if
the URL is marked as external.

* add return

* use vertical split

* refactor

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-lsp/src/lib.rs          |  5 +++
 helix-term/src/application.rs | 70 +++++++++++++++++++++++++++++++++++
 helix-term/src/commands.rs    | 23 ++----------
 helix-term/src/lib.rs         | 23 ++++++++++++
 4 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 34278cd54..83625897e 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -549,6 +549,7 @@ pub enum MethodCall {
     WorkspaceConfiguration(lsp::ConfigurationParams),
     RegisterCapability(lsp::RegistrationParams),
     UnregisterCapability(lsp::UnregistrationParams),
+    ShowDocument(lsp::ShowDocumentParams),
 }
 
 impl MethodCall {
@@ -576,6 +577,10 @@ impl MethodCall {
                 let params: lsp::UnregistrationParams = params.parse()?;
                 Self::UnregisterCapability(params)
             }
+            lsp::request::ShowDocument::METHOD => {
+                let params: lsp::ShowDocumentParams = params.parse()?;
+                Self::ShowDocument(params)
+            }
             _ => {
                 return Err(Error::Unhandled);
             }
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 01c120d06..1b0a06dd9 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -3,6 +3,7 @@ use futures_util::Stream;
 use helix_core::{path::get_relative_path, pos_at_coords, syntax, Selection};
 use helix_lsp::{
     lsp::{self, notification::Notification},
+    util::lsp_range_to_range,
     LspProgressMap,
 };
 use helix_view::{
@@ -1100,6 +1101,13 @@ impl Application {
                         }
                         Ok(serde_json::Value::Null)
                     }
+                    Ok(MethodCall::ShowDocument(params)) => {
+                        let language_server = language_server!();
+                        let offset_encoding = language_server.offset_encoding();
+
+                        let result = self.handle_show_document(params, offset_encoding);
+                        Ok(json!(result))
+                    }
                 };
 
                 tokio::spawn(language_server!().reply(id, reply));
@@ -1108,6 +1116,68 @@ impl Application {
         }
     }
 
+    fn handle_show_document(
+        &mut self,
+        params: lsp::ShowDocumentParams,
+        offset_encoding: helix_lsp::OffsetEncoding,
+    ) -> lsp::ShowDocumentResult {
+        if let lsp::ShowDocumentParams {
+            external: Some(true),
+            uri,
+            ..
+        } = params
+        {
+            self.jobs.callback(crate::open_external_url_callback(uri));
+            return lsp::ShowDocumentResult { success: true };
+        };
+
+        let lsp::ShowDocumentParams {
+            uri,
+            selection,
+            take_focus,
+            ..
+        } = params;
+
+        let path = match uri.to_file_path() {
+            Ok(path) => path,
+            Err(err) => {
+                log::error!("unsupported file URI: {}: {:?}", uri, err);
+                return lsp::ShowDocumentResult { success: false };
+            }
+        };
+
+        let action = match take_focus {
+            Some(true) => helix_view::editor::Action::Replace,
+            _ => helix_view::editor::Action::VerticalSplit,
+        };
+
+        let doc_id = match self.editor.open(&path, action) {
+            Ok(id) => id,
+            Err(err) => {
+                log::error!("failed to open path: {:?}: {:?}", uri, err);
+                return lsp::ShowDocumentResult { success: false };
+            }
+        };
+
+        let doc = doc_mut!(self.editor, &doc_id);
+        if let Some(range) = selection {
+            // TODO: convert inside server
+            if let Some(new_range) = lsp_range_to_range(doc.text(), range, offset_encoding) {
+                let view = view_mut!(self.editor);
+
+                // we flip the range so that the cursor sits on the start of the symbol
+                // (for example start of the function).
+                doc.set_selection(view.id, Selection::single(new_range.head, new_range.anchor));
+                if action.align_view(view, doc.id()) {
+                    align_view(doc, view, Align::Center);
+                }
+            } else {
+                log::warn!("lsp position out of bounds - {:?}", range);
+            };
+        };
+        lsp::ShowDocumentResult { success: true }
+    }
+
     async fn claim_term(&mut self) -> std::io::Result<()> {
         let terminal_config = self.config.load().editor.clone().into();
         self.terminal.claim(terminal_config)
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index c95933804..e436e1cfc 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1227,7 +1227,7 @@ fn open_url(cx: &mut Context, url: Url, action: Action) {
         .unwrap_or_default();
 
     if url.scheme() != "file" {
-        return open_external_url(cx, url);
+        return cx.jobs.callback(crate::open_external_url_callback(url));
     }
 
     let content_type = std::fs::File::open(url.path()).and_then(|file| {
@@ -1240,7 +1240,9 @@ fn open_url(cx: &mut Context, url: Url, action: Action) {
     // we attempt to open binary files - files that can't be open in helix - using external
     // program as well, e.g. pdf files or images
     match content_type {
-        Ok(content_inspector::ContentType::BINARY) => open_external_url(cx, url),
+        Ok(content_inspector::ContentType::BINARY) => {
+            cx.jobs.callback(crate::open_external_url_callback(url))
+        }
         Ok(_) | Err(_) => {
             let path = &rel_path.join(url.path());
             if path.is_dir() {
@@ -1253,23 +1255,6 @@ fn open_url(cx: &mut Context, url: Url, action: Action) {
     }
 }
 
-/// Opens URL in external program.
-fn open_external_url(cx: &mut Context, url: Url) {
-    let commands = open::commands(url.as_str());
-    cx.jobs.callback(async {
-        for cmd in commands {
-            let mut command = tokio::process::Command::new(cmd.get_program());
-            command.args(cmd.get_args());
-            if command.output().await.is_ok() {
-                return Ok(job::Callback::Editor(Box::new(|_| {})));
-            }
-        }
-        Ok(job::Callback::Editor(Box::new(move |editor| {
-            editor.set_error("Opening URL in external program failed")
-        })))
-    });
-}
-
 fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
 where
     F: Fn(RopeSlice, Range, usize) -> Range,
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index a94c5e494..a1d603298 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -12,7 +12,11 @@ pub mod keymap;
 pub mod ui;
 use std::path::Path;
 
+use futures_util::Future;
 use ignore::DirEntry;
+use url::Url;
+
+pub use keymap::macros::*;
 
 #[cfg(not(windows))]
 fn true_color() -> bool {
@@ -46,3 +50,22 @@ fn filter_picker_entry(entry: &DirEntry, root: &Path, dedup_symlinks: bool) -> b
 
     true
 }
+
+/// Opens URL in external program.
+fn open_external_url_callback(
+    url: Url,
+) -> impl Future<Output = Result<job::Callback, anyhow::Error>> + Send + 'static {
+    let commands = open::commands(url.as_str());
+    async {
+        for cmd in commands {
+            let mut command = tokio::process::Command::new(cmd.get_program());
+            command.args(cmd.get_args());
+            if command.output().await.is_ok() {
+                return Ok(job::Callback::Editor(Box::new(|_| {})));
+            }
+        }
+        Ok(job::Callback::Editor(Box::new(move |editor| {
+            editor.set_error("Opening URL in external program failed")
+        })))
+    }
+}

From af8e524a7d06253fa854bf8954f64312e11d0ea0 Mon Sep 17 00:00:00 2001
From: Daniel Sedlak <daniel@sedlak.dev>
Date: Wed, 17 Jan 2024 19:40:45 +0100
Subject: [PATCH 636/967] Address clippy lints (#9371)

---
 helix-term/src/commands.rs       | 4 ++--
 helix-term/src/commands/dap.rs   | 4 ++--
 helix-term/src/commands/typed.rs | 6 +++---
 helix-term/src/keymap.rs         | 2 +-
 helix-term/src/ui/spinner.rs     | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e436e1cfc..937326f6e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -795,7 +795,7 @@ fn goto_buffer(editor: &mut Editor, direction: Direction) {
             let iter = editor.documents.keys();
             let mut iter = iter.rev().skip_while(|id| *id != &current);
             iter.next(); // skip current item
-            iter.next().or_else(|| editor.documents.keys().rev().next())
+            iter.next().or_else(|| editor.documents.keys().next_back())
         }
     }
     .unwrap();
@@ -2789,7 +2789,7 @@ fn buffer_picker(cx: &mut Context) {
         .editor
         .documents
         .values()
-        .map(|doc| new_meta(doc))
+        .map(new_meta)
         .collect::<Vec<BufferMeta>>();
 
     // mru
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index e9fde4767..dec25cbd9 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -78,7 +78,7 @@ fn thread_picker(
             })
             .with_preview(move |editor, thread| {
                 let frames = editor.debugger.as_ref()?.stack_frames.get(&thread.id)?;
-                let frame = frames.get(0)?;
+                let frame = frames.first()?;
                 let path = frame.source.as_ref()?.path.clone()?;
                 let pos = Some((
                     frame.line.saturating_sub(1),
@@ -166,7 +166,7 @@ pub fn dap_start_impl(
     // TODO: avoid refetching all of this... pass a config in
     let template = match name {
         Some(name) => config.templates.iter().find(|t| t.name == name),
-        None => config.templates.get(0),
+        None => config.templates.first(),
     }
     .ok_or_else(|| anyhow!("No debug config with given name"))?;
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index b13af03a2..eb88e0411 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -483,7 +483,7 @@ fn set_indent_style(
     }
 
     // Attempt to parse argument as an indent style.
-    let style = match args.get(0) {
+    let style = match args.first() {
         Some(arg) if "tabs".starts_with(&arg.to_lowercase()) => Some(Tabs),
         Some(Cow::Borrowed("0")) => Some(Tabs),
         Some(arg) => arg
@@ -535,7 +535,7 @@ fn set_line_ending(
     }
 
     let arg = args
-        .get(0)
+        .first()
         .context("argument missing")?
         .to_ascii_lowercase();
 
@@ -2078,7 +2078,7 @@ fn reflow(
     //   - The configured text-width for this language in languages.toml
     //   - The configured text-width in the config.toml
     let text_width: usize = args
-        .get(0)
+        .first()
         .map(|num| num.parse::<usize>())
         .transpose()?
         .or_else(|| doc.language_config().and_then(|config| config.text_width))
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 598be55b5..d9297e08d 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -319,7 +319,7 @@ impl Keymaps {
             self.sticky = None;
         }
 
-        let first = self.state.get(0).unwrap_or(&key);
+        let first = self.state.first().unwrap_or(&key);
         let trie_node = match self.sticky {
             Some(ref trie) => Cow::Owned(KeyTrie::Node(trie.clone())),
             None => Cow::Borrowed(keymap),
diff --git a/helix-term/src/ui/spinner.rs b/helix-term/src/ui/spinner.rs
index 68965469d..379c4489f 100644
--- a/helix-term/src/ui/spinner.rs
+++ b/helix-term/src/ui/spinner.rs
@@ -11,7 +11,7 @@ impl ProgressSpinners {
     }
 
     pub fn get_or_create(&mut self, id: usize) -> &mut Spinner {
-        self.inner.entry(id).or_insert_with(Spinner::default)
+        self.inner.entry(id).or_default()
     }
 }
 

From 1f916e65cff4459698d465b2f4558da1e1bf6e44 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 16 Jan 2024 13:59:48 -0500
Subject: [PATCH 637/967] Create helix-stdx crate for stdlib extensions

helix-stdx is meant to carry extensions to the stdlib or low-level
dependencies that are useful in all other crates. This commit starts
with all of the path functions from helix-core and the CWD tracking that
lived in helix-loader.

The CWD tracking in helix-loader was previously unable to call the
canonicalization functions in helix-core. Switching to our custom
canonicalization code should make no noticeable difference though
since `std::env::current_dir` returns a canonicalized path with
symlinks resolved (at least on unix).
---
 Cargo.lock                               | 14 ++++++-
 Cargo.toml                               |  1 +
 helix-core/Cargo.toml                    |  2 +-
 helix-core/src/lib.rs                    |  1 -
 helix-loader/src/lib.rs                  | 44 ++--------------------
 helix-lsp/Cargo.toml                     |  1 +
 helix-lsp/src/client.rs                  |  7 ++--
 helix-lsp/src/lib.rs                     | 12 +++---
 helix-stdx/Cargo.toml                    | 19 ++++++++++
 helix-stdx/src/env.rs                    | 48 ++++++++++++++++++++++++
 helix-stdx/src/lib.rs                    |  2 +
 {helix-core => helix-stdx}/src/path.rs   | 34 +++++++++--------
 {helix-core => helix-stdx}/tests/path.rs | 10 ++---
 helix-term/Cargo.toml                    |  1 +
 helix-term/src/application.rs            |  3 +-
 helix-term/src/commands.rs               | 10 ++---
 helix-term/src/commands/dap.rs           |  2 +-
 helix-term/src/commands/lsp.rs           |  7 ++--
 helix-term/src/commands/typed.rs         | 16 ++++----
 helix-term/src/main.rs                   |  6 +--
 helix-term/src/ui/mod.rs                 |  4 +-
 helix-term/src/ui/picker.rs              |  2 +-
 helix-term/tests/test/commands/write.rs  | 11 +++---
 helix-term/tests/test/splits.rs          |  8 ++--
 helix-view/Cargo.toml                    |  1 +
 helix-view/src/document.rs               |  6 +--
 helix-view/src/editor.rs                 |  2 +-
 27 files changed, 163 insertions(+), 111 deletions(-)
 create mode 100644 helix-stdx/Cargo.toml
 create mode 100644 helix-stdx/src/env.rs
 create mode 100644 helix-stdx/src/lib.rs
 rename {helix-core => helix-stdx}/src/path.rs (88%)
 rename {helix-core => helix-stdx}/tests/path.rs (93%)

diff --git a/Cargo.lock b/Cargo.lock
index da0dc3612..09bec59f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1060,6 +1060,7 @@ dependencies = [
  "etcetera",
  "hashbrown 0.14.3",
  "helix-loader",
+ "helix-stdx",
  "imara-diff",
  "indoc",
  "log",
@@ -1074,7 +1075,6 @@ dependencies = [
  "slotmap",
  "smallvec",
  "smartstring",
- "tempfile",
  "textwrap",
  "toml",
  "tree-sitter",
@@ -1136,6 +1136,7 @@ dependencies = [
  "helix-core",
  "helix-loader",
  "helix-parsec",
+ "helix-stdx",
  "log",
  "lsp-types",
  "parking_lot",
@@ -1151,6 +1152,15 @@ dependencies = [
 name = "helix-parsec"
 version = "23.10.0"
 
+[[package]]
+name = "helix-stdx"
+version = "23.10.0"
+dependencies = [
+ "dunce",
+ "etcetera",
+ "tempfile",
+]
+
 [[package]]
 name = "helix-term"
 version = "23.10.0"
@@ -1169,6 +1179,7 @@ dependencies = [
  "helix-event",
  "helix-loader",
  "helix-lsp",
+ "helix-stdx",
  "helix-tui",
  "helix-vcs",
  "helix-view",
@@ -1241,6 +1252,7 @@ dependencies = [
  "helix-event",
  "helix-loader",
  "helix-lsp",
+ "helix-stdx",
  "helix-tui",
  "helix-vcs",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index f59896ecb..91f6e7cae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ members = [
   "helix-loader",
   "helix-vcs",
   "helix-parsec",
+  "helix-stdx",
   "xtask",
 ]
 
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 07c801b89..42c88f4bc 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -16,6 +16,7 @@ unicode-lines = ["ropey/unicode_lines"]
 integration = []
 
 [dependencies]
+helix-stdx = { path = "../helix-stdx" }
 helix-loader = { path = "../helix-loader" }
 
 ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
@@ -55,4 +56,3 @@ parking_lot = "0.12"
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
 indoc = "2.0.4"
-tempfile = "3.9"
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 0acdb2380..94802eba9 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -17,7 +17,6 @@ pub mod macros;
 pub mod match_brackets;
 pub mod movement;
 pub mod object;
-pub mod path;
 mod position;
 pub mod search;
 pub mod selection;
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 5337d6027..991504fb8 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -1,14 +1,13 @@
 pub mod config;
 pub mod grammar;
 
+use helix_stdx::{env::current_working_dir, path};
+
 use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
 use std::path::{Path, PathBuf};
-use std::sync::RwLock;
 
 pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
 
-static CWD: RwLock<Option<PathBuf>> = RwLock::new(None);
-
 static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
     once_cell::sync::Lazy::new(prioritize_runtime_dirs);
 
@@ -16,31 +15,6 @@ static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCe
 
 static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
 
-// Get the current working directory.
-// This information is managed internally as the call to std::env::current_dir
-// might fail if the cwd has been deleted.
-pub fn current_working_dir() -> PathBuf {
-    if let Some(path) = &*CWD.read().unwrap() {
-        return path.clone();
-    }
-
-    let path = std::env::current_dir()
-        .and_then(dunce::canonicalize)
-        .expect("Couldn't determine current working directory");
-    let mut cwd = CWD.write().unwrap();
-    *cwd = Some(path.clone());
-
-    path
-}
-
-pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
-    let path = dunce::canonicalize(path)?;
-    std::env::set_current_dir(&path)?;
-    let mut cwd = CWD.write().unwrap();
-    *cwd = Some(path);
-    Ok(())
-}
-
 pub fn initialize_config_file(specified_file: Option<PathBuf>) {
     let config_file = specified_file.unwrap_or_else(default_config_file);
     ensure_parent_dir(&config_file);
@@ -280,21 +254,9 @@ fn ensure_parent_dir(path: &Path) {
 mod merge_toml_tests {
     use std::str;
 
-    use super::{current_working_dir, merge_toml_values, set_current_working_dir};
+    use super::merge_toml_values;
     use toml::Value;
 
-    #[test]
-    fn current_dir_is_set() {
-        let new_path = dunce::canonicalize(std::env::temp_dir()).unwrap();
-        let cwd = current_working_dir();
-        assert_ne!(cwd, new_path);
-
-        set_current_working_dir(&new_path).expect("Couldn't set new path");
-
-        let cwd = current_working_dir();
-        assert_eq!(cwd, new_path);
-    }
-
     #[test]
     fn language_toml_map_merges() {
         const USER: &str = r#"
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 851351e0e..510be6eec 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -13,6 +13,7 @@ homepage.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+helix-stdx = { path = "../helix-stdx" }
 helix-core = { path = "../helix-core" }
 helix-loader = { path = "../helix-loader" }
 helix-parsec = { path = "../helix-parsec" }
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 682d4db66..1af27c1d4 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -4,8 +4,9 @@ use crate::{
     Call, Error, OffsetEncoding, Result,
 };
 
-use helix_core::{find_workspace, path, syntax::LanguageServerFeature, ChangeSet, Rope};
+use helix_core::{find_workspace, syntax::LanguageServerFeature, ChangeSet, Rope};
 use helix_loader::{self, VERSION_AND_GIT_HASH};
+use helix_stdx::path;
 use lsp::{
     notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
     DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, WorkspaceFolder,
@@ -68,7 +69,7 @@ impl Client {
         may_support_workspace: bool,
     ) -> bool {
         let (workspace, workspace_is_cwd) = find_workspace();
-        let workspace = path::get_normalized_path(&workspace);
+        let workspace = path::normalize(workspace);
         let root = find_lsp_workspace(
             doc_path
                 .and_then(|x| x.parent().and_then(|x| x.to_str()))
@@ -204,7 +205,7 @@ impl Client {
         let (server_rx, server_tx, initialize_notify) =
             Transport::start(reader, writer, stderr, id, name.clone());
         let (workspace, workspace_is_cwd) = find_workspace();
-        let workspace = path::get_normalized_path(&workspace);
+        let workspace = path::normalize(workspace);
         let root = find_lsp_workspace(
             doc_path
                 .and_then(|x| x.parent().and_then(|x| x.to_str()))
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 83625897e..c99ec217b 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -11,10 +11,10 @@ pub use lsp::{Position, Url};
 pub use lsp_types as lsp;
 
 use futures_util::stream::select_all::SelectAll;
-use helix_core::{
-    path,
-    syntax::{LanguageConfiguration, LanguageServerConfiguration, LanguageServerFeatures},
+use helix_core::syntax::{
+    LanguageConfiguration, LanguageServerConfiguration, LanguageServerFeatures,
 };
+use helix_stdx::path;
 use tokio::sync::mpsc::UnboundedReceiver;
 
 use std::{
@@ -958,10 +958,10 @@ pub fn find_lsp_workspace(
     let mut file = if file.is_absolute() {
         file.to_path_buf()
     } else {
-        let current_dir = helix_loader::current_working_dir();
+        let current_dir = helix_stdx::env::current_working_dir();
         current_dir.join(file)
     };
-    file = path::get_normalized_path(&file);
+    file = path::normalize(&file);
 
     if !file.starts_with(workspace) {
         return None;
@@ -978,7 +978,7 @@ pub fn find_lsp_workspace(
 
         if root_dirs
             .iter()
-            .any(|root_dir| path::get_normalized_path(&workspace.join(root_dir)) == ancestor)
+            .any(|root_dir| path::normalize(workspace.join(root_dir)) == ancestor)
         {
             // if the worskapce is the cwd do not search any higher for workspaces
             // but specify
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
new file mode 100644
index 000000000..216a3b407
--- /dev/null
+++ b/helix-stdx/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "helix-stdx"
+description = "Standard library extensions"
+include = ["src/**/*", "README.md"]
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+categories.workspace = true
+repository.workspace = true
+homepage.workspace = true
+
+[dependencies]
+dunce = "1.0"
+etcetera = "0.8"
+
+[dev-dependencies]
+tempfile = "3.9"
diff --git a/helix-stdx/src/env.rs b/helix-stdx/src/env.rs
new file mode 100644
index 000000000..864ba828b
--- /dev/null
+++ b/helix-stdx/src/env.rs
@@ -0,0 +1,48 @@
+use std::{
+    path::{Path, PathBuf},
+    sync::RwLock,
+};
+
+static CWD: RwLock<Option<PathBuf>> = RwLock::new(None);
+
+// Get the current working directory.
+// This information is managed internally as the call to std::env::current_dir
+// might fail if the cwd has been deleted.
+pub fn current_working_dir() -> PathBuf {
+    if let Some(path) = &*CWD.read().unwrap() {
+        return path.clone();
+    }
+
+    let path = std::env::current_dir()
+        .map(crate::path::normalize)
+        .expect("Couldn't determine current working directory");
+    let mut cwd = CWD.write().unwrap();
+    *cwd = Some(path.clone());
+
+    path
+}
+
+pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
+    let path = crate::path::canonicalize(path);
+    std::env::set_current_dir(&path)?;
+    let mut cwd = CWD.write().unwrap();
+    *cwd = Some(path);
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{current_working_dir, set_current_working_dir};
+
+    #[test]
+    fn current_dir_is_set() {
+        let new_path = dunce::canonicalize(std::env::temp_dir()).unwrap();
+        let cwd = current_working_dir();
+        assert_ne!(cwd, new_path);
+
+        set_current_working_dir(&new_path).expect("Couldn't set new path");
+
+        let cwd = current_working_dir();
+        assert_eq!(cwd, new_path);
+    }
+}
diff --git a/helix-stdx/src/lib.rs b/helix-stdx/src/lib.rs
new file mode 100644
index 000000000..ae3c3a981
--- /dev/null
+++ b/helix-stdx/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod env;
+pub mod path;
diff --git a/helix-core/src/path.rs b/helix-stdx/src/path.rs
similarity index 88%
rename from helix-core/src/path.rs
rename to helix-stdx/src/path.rs
index 0cf6f812f..5746657c3 100644
--- a/helix-core/src/path.rs
+++ b/helix-stdx/src/path.rs
@@ -1,6 +1,9 @@
-use etcetera::home_dir;
+pub use etcetera::home_dir;
+
 use std::path::{Component, Path, PathBuf};
 
+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 {
@@ -16,7 +19,8 @@ pub fn fold_home_dir(path: &Path) -> PathBuf {
 /// Expands tilde `~` into users home directory if available, otherwise returns the path
 /// unchanged. The tilde will only be expanded when present as the first component of the path
 /// and only slash follows it.
-pub fn expand_tilde(path: &Path) -> PathBuf {
+pub fn expand_tilde(path: impl AsRef<Path>) -> PathBuf {
+    let path = path.as_ref();
     let mut components = path.components().peekable();
     if let Some(Component::Normal(c)) = components.peek() {
         if c == &"~" {
@@ -33,8 +37,8 @@ pub fn expand_tilde(path: &Path) -> PathBuf {
 /// Normalize a path without resolving symlinks.
 // Strategy: start from the first component and move up. Cannonicalize previous path,
 // join component, cannonicalize new path, strip prefix and join to the final result.
-pub fn get_normalized_path(path: &Path) -> PathBuf {
-    let mut components = path.components().peekable();
+pub fn normalize(path: impl AsRef<Path>) -> PathBuf {
+    let mut components = path.as_ref().components().peekable();
     let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
         components.next();
         PathBuf::from(c.as_os_str())
@@ -104,22 +108,22 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
 ///
 /// This function is used instead of [`std::fs::canonicalize`] because we don't want to verify
 /// here if the path exists, just normalize it's components.
-pub fn get_canonicalized_path(path: &Path) -> PathBuf {
+pub fn canonicalize(path: impl AsRef<Path>) -> PathBuf {
     let path = expand_tilde(path);
     let path = if path.is_relative() {
-        helix_loader::current_working_dir().join(path)
+        current_working_dir().join(path)
     } else {
         path
     };
 
-    get_normalized_path(path.as_path())
+    normalize(path)
 }
 
-pub fn get_relative_path(path: &Path) -> PathBuf {
-    let path = PathBuf::from(path);
+pub fn get_relative_path(path: impl AsRef<Path>) -> PathBuf {
+    let path = PathBuf::from(path.as_ref());
     let path = if path.is_absolute() {
-        let cwdir = get_normalized_path(&helix_loader::current_working_dir());
-        get_normalized_path(&path)
+        let cwdir = normalize(current_working_dir());
+        normalize(&path)
             .strip_prefix(cwdir)
             .map(PathBuf::from)
             .unwrap_or(path)
@@ -135,8 +139,8 @@ pub fn get_relative_path(path: &Path) -> PathBuf {
 /// Also strip the current working directory from the beginning of the path.
 /// Note that this function does not check if the truncated path is unambiguous.
 ///
-/// ```   
-///    use helix_core::path::get_truncated_path;
+/// ```
+///    use helix_stdx::path::get_truncated_path;
 ///    use std::path::Path;
 ///
 ///    assert_eq!(
@@ -158,8 +162,8 @@ pub fn get_relative_path(path: &Path) -> PathBuf {
 ///     assert_eq!(get_truncated_path("").as_path(), Path::new(""));
 /// ```
 ///
-pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {
-    let cwd = helix_loader::current_working_dir();
+pub fn get_truncated_path(path: impl AsRef<Path>) -> PathBuf {
+    let cwd = current_working_dir();
     let path = path
         .as_ref()
         .strip_prefix(cwd)
diff --git a/helix-core/tests/path.rs b/helix-stdx/tests/path.rs
similarity index 93%
rename from helix-core/tests/path.rs
rename to helix-stdx/tests/path.rs
index cbda5e1ab..cc3c15cba 100644
--- a/helix-core/tests/path.rs
+++ b/helix-stdx/tests/path.rs
@@ -6,7 +6,7 @@ use std::{
     path::{Component, Path, PathBuf},
 };
 
-use helix_core::path::get_normalized_path;
+use helix_stdx::path;
 use tempfile::Builder;
 
 // Paths on Windows are almost always case-insensitive.
@@ -34,7 +34,7 @@ fn test_case_folding_windows() -> Result<(), Box<dyn Error>> {
     );
     let test_path = root_without_prefix.join(lowercase_case);
     assert_eq!(
-        get_normalized_path(&test_path),
+        path::normalize(&test_path),
         case.path().strip_prefix(&tmp_prefix)?
     );
 
@@ -80,7 +80,7 @@ fn test_normalize_path() -> Result<(), Box<dyn Error>> {
     // root/link
     let path = link.strip_prefix(&tmp_prefix)?;
     assert_eq!(
-        get_normalized_path(path),
+        path::normalize(path),
         path,
         "input {:?} and symlink last component shouldn't be resolved",
         path
@@ -98,7 +98,7 @@ fn test_normalize_path() -> Result<(), Box<dyn Error>> {
         .unwrap()
         .join(Component::ParentDir);
     assert_eq!(
-        get_normalized_path(&path),
+        path::normalize(&path),
         expected,
         "input {:?} and \"..\" should not erase the simlink that goes ahead",
         &path
@@ -118,7 +118,7 @@ fn test_normalize_path() -> Result<(), Box<dyn Error>> {
         .unwrap()
         .join(Component::ParentDir)
         .join(Component::ParentDir);
-    assert_eq!(get_normalized_path(&path), expected, "input {:?}", &path);
+    assert_eq!(path::normalize(&path), expected, "input {:?}", &path);
 
     Ok(())
 }
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 80bda2b6c..21c35553c 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -23,6 +23,7 @@ name = "hx"
 path = "src/main.rs"
 
 [dependencies]
+helix-stdx = { path = "../helix-stdx" }
 helix-core = { path = "../helix-core" }
 helix-event = { path = "../helix-event" }
 helix-view = { path = "../helix-view" }
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 1b0a06dd9..290441b41 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,11 +1,12 @@
 use arc_swap::{access::Map, ArcSwap};
 use futures_util::Stream;
-use helix_core::{path::get_relative_path, pos_at_coords, syntax, Selection};
+use helix_core::{pos_at_coords, syntax, Selection};
 use helix_lsp::{
     lsp::{self, notification::Notification},
     util::lsp_range_to_range,
     LspProgressMap,
 };
+use helix_stdx::path::get_relative_path;
 use helix_view::{
     align_view,
     document::DocumentSavedEventResult,
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 937326f6e..53783e4e3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2169,7 +2169,7 @@ fn global_search(cx: &mut Context) {
         type Data = Option<PathBuf>;
 
         fn format(&self, current_path: &Self::Data) -> Row {
-            let relative_path = helix_core::path::get_relative_path(&self.path)
+            let relative_path = helix_stdx::path::get_relative_path(&self.path)
                 .to_string_lossy()
                 .into_owned();
             if current_path
@@ -2218,7 +2218,7 @@ fn global_search(cx: &mut Context) {
                 .case_smart(smart_case)
                 .build(regex.as_str())
             {
-                let search_root = helix_loader::current_working_dir();
+                let search_root = helix_stdx::env::current_working_dir();
                 if !search_root.exists() {
                     cx.editor
                         .set_error("Current working directory does not exist");
@@ -2731,7 +2731,7 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
 }
 
 fn file_picker_in_current_directory(cx: &mut Context) {
-    let cwd = helix_loader::current_working_dir();
+    let cwd = helix_stdx::env::current_working_dir();
     if !cwd.exists() {
         cx.editor
             .set_error("Current working directory does not exist");
@@ -2759,7 +2759,7 @@ fn buffer_picker(cx: &mut Context) {
             let path = self
                 .path
                 .as_deref()
-                .map(helix_core::path::get_relative_path);
+                .map(helix_stdx::path::get_relative_path);
             let path = match path.as_deref().and_then(Path::to_str) {
                 Some(path) => path,
                 None => SCRATCH_BUFFER_NAME,
@@ -2826,7 +2826,7 @@ fn jumplist_picker(cx: &mut Context) {
             let path = self
                 .path
                 .as_deref()
-                .map(helix_core::path::get_relative_path);
+                .map(helix_stdx::path::get_relative_path);
             let path = match path.as_deref().and_then(Path::to_str) {
                 Some(path) => path,
                 None => SCRATCH_BUFFER_NAME,
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index dec25cbd9..d62b0a4e5 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -217,7 +217,7 @@ pub fn dap_start_impl(
         }
     }
 
-    args.insert("cwd", to_value(helix_loader::current_working_dir())?);
+    args.insert("cwd", to_value(helix_stdx::env::current_working_dir())?);
 
     let args = to_value(args).unwrap();
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 0096e6aa9..051cdcd35 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -17,9 +17,8 @@ use tui::{
 
 use super::{align_view, push_jump, Align, Context, Editor, Open};
 
-use helix_core::{
-    path, syntax::LanguageServerFeature, text_annotations::InlineAnnotation, Selection,
-};
+use helix_core::{syntax::LanguageServerFeature, text_annotations::InlineAnnotation, Selection};
+use helix_stdx::path;
 use helix_view::{
     document::{DocumentInlayHints, DocumentInlayHintsId, Mode},
     editor::Action,
@@ -1018,7 +1017,7 @@ fn goto_impl(
     locations: Vec<lsp::Location>,
     offset_encoding: OffsetEncoding,
 ) {
-    let cwdir = helix_loader::current_working_dir();
+    let cwdir = helix_stdx::env::current_working_dir();
 
     match locations.as_slice() {
         [location] => {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index eb88e0411..ee02a7d25 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -7,7 +7,7 @@ use super::*;
 
 use helix_core::fuzzy::fuzzy_match;
 use helix_core::indent::MAX_INDENT;
-use helix_core::{encoding, line_ending, path::get_canonicalized_path, shellwords::Shellwords};
+use helix_core::{encoding, line_ending, shellwords::Shellwords};
 use helix_lsp::{OffsetEncoding, Url};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
@@ -111,7 +111,7 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     ensure!(!args.is_empty(), "wrong argument count");
     for arg in args {
         let (path, pos) = args::parse_file(arg);
-        let path = helix_core::path::expand_tilde(&path);
+        let path = helix_stdx::path::expand_tilde(&path);
         // If the path is a directory, open a file picker on that directory and update the status
         // message
         if let Ok(true) = std::fs::canonicalize(&path).map(|p| p.is_dir()) {
@@ -1079,18 +1079,17 @@ fn change_current_directory(
         return Ok(());
     }
 
-    let dir = helix_core::path::expand_tilde(
+    let dir = helix_stdx::path::expand_tilde(
         args.first()
             .context("target directory not provided")?
-            .as_ref()
             .as_ref(),
     );
 
-    helix_loader::set_current_working_dir(dir)?;
+    helix_stdx::env::set_current_working_dir(dir)?;
 
     cx.editor.set_status(format!(
         "Current working directory is now {}",
-        helix_loader::current_working_dir().display()
+        helix_stdx::env::current_working_dir().display()
     ));
     Ok(())
 }
@@ -1104,7 +1103,7 @@ fn show_current_directory(
         return Ok(());
     }
 
-    let cwd = helix_loader::current_working_dir();
+    let cwd = helix_stdx::env::current_working_dir();
     let message = format!("Current working directory is {}", cwd.display());
 
     if cwd.exists() {
@@ -2409,7 +2408,8 @@ fn move_buffer(
     ensure!(args.len() == 1, format!(":move takes one argument"));
     let doc = doc!(cx.editor);
 
-    let new_path = get_canonicalized_path(&PathBuf::from(args.first().unwrap().to_string()));
+    let new_path =
+        helix_stdx::path::canonicalize(&PathBuf::from(args.first().unwrap().to_string()));
     let old_path = doc
         .path()
         .ok_or_else(|| anyhow!("Scratch buffer cannot be moved. Use :write instead"))?
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index a62c54a40..132ee796f 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -118,16 +118,16 @@ FLAGS:
 
     // Before setting the working directory, resolve all the paths in args.files
     for (path, _) in args.files.iter_mut() {
-        *path = helix_core::path::get_canonicalized_path(path);
+        *path = helix_stdx::path::canonicalize(&path);
     }
 
     // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
     // Application::new() depends on this logic so it must be updated if this changes.
     if let Some(path) = &args.working_directory {
-        helix_loader::set_current_working_dir(path)?;
+        helix_stdx::env::set_current_working_dir(path)?;
     } else if let Some((path, _)) = args.files.first().filter(|p| p.0.is_dir()) {
         // If the first file is a directory, it will be the working directory unless -w was specified
-        helix_loader::set_current_working_dir(path)?;
+        helix_stdx::env::set_current_working_dir(path)?;
     }
 
     let config = match Config::load_default() {
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 660bbfea3..efa2473e0 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -409,7 +409,7 @@ pub mod completers {
         use std::path::Path;
 
         let is_tilde = input == "~";
-        let path = helix_core::path::expand_tilde(Path::new(input));
+        let path = helix_stdx::path::expand_tilde(Path::new(input));
 
         let (dir, file_name) = if input.ends_with(std::path::MAIN_SEPARATOR) {
             (path, None)
@@ -430,7 +430,7 @@ pub mod completers {
                 match path.parent() {
                     Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
                     // Path::new("h")'s parent is Some("")...
-                    _ => helix_loader::current_working_dir(),
+                    _ => helix_stdx::env::current_working_dir(),
                 }
             };
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 08a367ba9..4be5a11ef 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -63,7 +63,7 @@ impl PathOrId {
     fn get_canonicalized(self) -> Self {
         use PathOrId::*;
         match self {
-            Path(path) => Path(helix_core::path::get_canonicalized_path(&path)),
+            Path(path) => Path(helix_stdx::path::canonicalize(path)),
             Id(id) => Id(id),
         }
     }
diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index 376ba5e7b..adc721c5f 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs
@@ -3,7 +3,8 @@ use std::{
     ops::RangeInclusive,
 };
 
-use helix_core::{diagnostic::Severity, path::get_normalized_path};
+use helix_core::diagnostic::Severity;
+use helix_stdx::path;
 use helix_view::doc;
 
 use super::*;
@@ -23,7 +24,7 @@ async fn test_write_quit_fail() -> anyhow::Result<()> {
             assert_eq!(1, docs.len());
 
             let doc = docs.pop().unwrap();
-            assert_eq!(Some(&get_normalized_path(file.path())), doc.path());
+            assert_eq!(Some(&path::normalize(file.path())), doc.path());
             assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
         }),
         false,
@@ -269,7 +270,7 @@ async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {
             assert_eq!(1, docs.len());
 
             let doc = docs.pop().unwrap();
-            assert_eq!(Some(&get_normalized_path(file.path())), doc.path());
+            assert_eq!(Some(&path::normalize(file.path())), doc.path());
         }),
         false,
     )
@@ -341,7 +342,7 @@ async fn test_write_new_path() -> anyhow::Result<()> {
                 Some(&|app| {
                     let doc = doc!(app.editor);
                     assert!(!app.editor.is_err());
-                    assert_eq!(&get_normalized_path(file1.path()), doc.path().unwrap());
+                    assert_eq!(&path::normalize(file1.path()), doc.path().unwrap());
                 }),
             ),
             (
@@ -349,7 +350,7 @@ async fn test_write_new_path() -> anyhow::Result<()> {
                 Some(&|app| {
                     let doc = doc!(app.editor);
                     assert!(!app.editor.is_err());
-                    assert_eq!(&get_normalized_path(file2.path()), doc.path().unwrap());
+                    assert_eq!(&path::normalize(file2.path()), doc.path().unwrap());
                     assert!(app.editor.document_by_path(file1.path()).is_none());
                 }),
             ),
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index f010c86ba..3b66c0486 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-use helix_core::path::get_normalized_path;
+use helix_stdx::path;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_split_write_quit_all() -> anyhow::Result<()> {
@@ -27,21 +27,21 @@ async fn test_split_write_quit_all() -> anyhow::Result<()> {
 
                     let doc1 = docs
                         .iter()
-                        .find(|doc| doc.path().unwrap() == &get_normalized_path(file1.path()))
+                        .find(|doc| doc.path().unwrap() == &path::normalize(file1.path()))
                         .unwrap();
 
                     assert_eq!("hello1", doc1.text().to_string());
 
                     let doc2 = docs
                         .iter()
-                        .find(|doc| doc.path().unwrap() == &get_normalized_path(file2.path()))
+                        .find(|doc| doc.path().unwrap() == &path::normalize(file2.path()))
                         .unwrap();
 
                     assert_eq!("hello2", doc2.text().to_string());
 
                     let doc3 = docs
                         .iter()
-                        .find(|doc| doc.path().unwrap() == &get_normalized_path(file3.path()))
+                        .find(|doc| doc.path().unwrap() == &path::normalize(file3.path()))
                         .unwrap();
 
                     assert_eq!("hello3", doc3.text().to_string());
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index db53b54cc..0dc18b373 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -15,6 +15,7 @@ default = []
 term = ["crossterm"]
 
 [dependencies]
+helix-stdx = { path = "../helix-stdx" }
 helix-core = { path = "../helix-core" }
 helix-event = { path = "../helix-event" }
 helix-loader = { path = "../helix-loader" }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 0de0cd172..6473c2d18 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -855,7 +855,7 @@ impl Document {
         let text = self.text().clone();
 
         let path = match path {
-            Some(path) => helix_core::path::get_canonicalized_path(&path),
+            Some(path) => helix_stdx::path::canonicalize(path),
             None => {
                 if self.path.is_none() {
                     bail!("Can't save with no path set!");
@@ -1049,7 +1049,7 @@ impl Document {
     }
 
     pub fn set_path(&mut self, path: Option<&Path>) {
-        let path = path.map(helix_core::path::get_canonicalized_path);
+        let path = path.map(helix_stdx::path::canonicalize);
 
         // if parent doesn't exist we still want to open the document
         // and error out when document is saved
@@ -1672,7 +1672,7 @@ impl Document {
     pub fn relative_path(&self) -> Option<PathBuf> {
         self.path
             .as_deref()
-            .map(helix_core::path::get_relative_path)
+            .map(helix_stdx::path::get_relative_path)
     }
 
     pub fn display_name(&self) -> Cow<'static, str> {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index f13df2135..0ab4be8b2 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1464,7 +1464,7 @@ impl Editor {
 
     // ??? possible use for integration tests
     pub fn open(&mut self, path: &Path, action: Action) -> Result<DocumentId, Error> {
-        let path = helix_core::path::get_canonicalized_path(path);
+        let path = helix_stdx::path::canonicalize(path);
         let id = self.document_by_path(&path).map(|doc| doc.id);
 
         let id = if let Some(id) = id {

From 1bc7aac7805285cea9ef6dc8adcaabf87a18ce67 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 16 Jan 2024 14:00:06 -0500
Subject: [PATCH 638/967] Use helix-stdx tilde expansion and normalization for
 HELIX_RUNTIME paths

Previously this wasn't possible since helix-core depends on helix-loader,
so helix-loader couldn't use helix-core's path extensions.

We use the path normalization/canonicalization for the runtime directory
provided by the HELIX_RUNTIME environment variable. This improves a
scenario where you set a path containing a tilde. Now that path will be
expanded and normalized.
---
 Cargo.lock              | 1 +
 helix-loader/Cargo.toml | 2 ++
 helix-loader/src/lib.rs | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 09bec59f0..9884dadfb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1114,6 +1114,7 @@ dependencies = [
  "cc",
  "dunce",
  "etcetera",
+ "helix-stdx",
  "libloading",
  "log",
  "once_cell",
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 187475385..08da7f295 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -15,6 +15,8 @@ name = "hx-loader"
 path = "src/main.rs"
 
 [dependencies]
+helix-stdx = { path = "../helix-stdx" }
+
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.7"
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 991504fb8..f8fac6703 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -53,7 +53,8 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
     rt_dirs.push(conf_rt_dir);
 
     if let Ok(dir) = std::env::var("HELIX_RUNTIME") {
-        rt_dirs.push(dir.into());
+        let dir = path::expand_tilde(dir);
+        rt_dirs.push(path::normalize(dir));
     }
 
     // If this variable is set during build time, it will always be included

From 9c56afeff36489ff73a9b160fe7d57360a3f9952 Mon Sep 17 00:00:00 2001
From: Ahmed Hagi <ahmedosman@mac.com>
Date: Thu, 18 Jan 2024 12:34:06 +0000
Subject: [PATCH 639/967] Handle failure when enabling bracketed paste (#9353)

* match instead of crash

* pulling bracketedpaste out, refactor, tracking for bracketed paste

* sending disable bracketed paste only when supports true

* move disable bracketed paste to throwaway
---
 helix-tui/src/backend/crossterm.rs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index c55ab6bbd..88e70f32e 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -79,6 +79,7 @@ pub struct CrosstermBackend<W: Write> {
     capabilities: Capabilities,
     supports_keyboard_enhancement_protocol: OnceCell<bool>,
     mouse_capture_enabled: bool,
+    supports_bracketed_paste: bool,
 }
 
 impl<W> CrosstermBackend<W>
@@ -91,6 +92,7 @@ where
             capabilities: Capabilities::from_env_or_default(config),
             supports_keyboard_enhancement_protocol: OnceCell::new(),
             mouse_capture_enabled: false,
+            supports_bracketed_paste: true,
         }
     }
 
@@ -134,9 +136,16 @@ where
         execute!(
             self.buffer,
             terminal::EnterAlternateScreen,
-            EnableBracketedPaste,
             EnableFocusChange
         )?;
+        match execute!(self.buffer, EnableBracketedPaste,) {
+            Err(err) if err.kind() == io::ErrorKind::Unsupported => {
+                log::warn!("Bracketed paste is not supported on this terminal.");
+                self.supports_bracketed_paste = false;
+            }
+            Err(err) => return Err(err),
+            Ok(_) => (),
+        };
         execute!(self.buffer, terminal::Clear(terminal::ClearType::All))?;
         if config.enable_mouse_capture {
             execute!(self.buffer, EnableMouseCapture)?;
@@ -177,9 +186,11 @@ where
         if self.supports_keyboard_enhancement_protocol() {
             execute!(self.buffer, PopKeyboardEnhancementFlags)?;
         }
+        if self.supports_bracketed_paste {
+            execute!(self.buffer, DisableBracketedPaste,)?;
+        }
         execute!(
             self.buffer,
-            DisableBracketedPaste,
             DisableFocusChange,
             terminal::LeaveAlternateScreen
         )?;
@@ -195,12 +206,8 @@ where
         // disable without calling enable previously
         let _ = execute!(stdout, DisableMouseCapture);
         let _ = execute!(stdout, PopKeyboardEnhancementFlags);
-        execute!(
-            stdout,
-            DisableBracketedPaste,
-            DisableFocusChange,
-            terminal::LeaveAlternateScreen
-        )?;
+        let _ = execute!(stdout, DisableBracketedPaste);
+        execute!(stdout, DisableFocusChange, terminal::LeaveAlternateScreen)?;
         terminal::disable_raw_mode()
     }
 

From f5f08becef0c27f183a7772f6ec6f5442eca2bab Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Mon, 22 Jan 2024 09:06:20 -0500
Subject: [PATCH 640/967] Fix typo in string representation of GotoReference
 (#9395)

---
 helix-core/src/syntax.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 83bd09b4d..e543df06e 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -263,7 +263,7 @@ impl Display for LanguageServerFeature {
             GotoDeclaration => "goto-declaration",
             GotoDefinition => "goto-definition",
             GotoTypeDefinition => "goto-type-definition",
-            GotoReference => "goto-type-definition",
+            GotoReference => "goto-reference",
             GotoImplementation => "goto-implementation",
             SignatureHelp => "signature-help",
             Hover => "hover",

From 52a43bcdfcc258a2871be468a3e31496dd2d80c8 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Mon, 22 Jan 2024 20:51:12 +0200
Subject: [PATCH 641/967] bash, make, css: highlight and indent queries
 improvement (#9393)

* highlights(bash): rework keywords section

* Use more specified scope when possible for keywords like @keyword.repeat.
* Add more keywords like "local" or "unsetenv".

Limitation:
* Bash doesn't allow you to have a local variable outside of a function, so maybe we need to have better queries to not highlight the local in this case.
* If we name a function with a keyword (such as unset or local), it will use the highlight scope "keyword" instead of "function".

* indents(css, make): add basic queries

* Despite the fact that queries look simple, they improve indentation in some edge cases that helix couldn't handle correctly by default.
---
 book/src/generated/lang-support.md  |  4 ++--
 runtime/queries/bash/highlights.scm | 34 ++++++++++++++++++++---------
 runtime/queries/css/indents.scm     |  7 ++++++
 runtime/queries/make/indents.scm    |  8 +++++++
 4 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 runtime/queries/css/indents.scm
 create mode 100644 runtime/queries/make/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ee01c4030..6fedace63 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -21,7 +21,7 @@
 | cpon | ✓ |  | ✓ |  |
 | cpp | ✓ | ✓ | ✓ | `clangd` |
 | crystal | ✓ | ✓ |  | `crystalline` |
-| css | ✓ |  |  | `vscode-css-language-server` |
+| css | ✓ |  | ✓ | `vscode-css-language-server` |
 | cue | ✓ |  |  | `cuelsp` |
 | d | ✓ | ✓ | ✓ | `serve-d` |
 | dart | ✓ |  | ✓ | `dart` |
@@ -97,7 +97,7 @@
 | log | ✓ |  |  |  |
 | lpf | ✓ |  |  |  |
 | lua | ✓ | ✓ | ✓ | `lua-language-server` |
-| make | ✓ |  |  |  |
+| make | ✓ |  | ✓ |  |
 | markdoc | ✓ |  |  | `markdoc-ls` |
 | markdown | ✓ |  |  | `marksman` |
 | markdown.inline | ✓ |  |  |  |
diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
index 3f2df6386..92d61e8b8 100644
--- a/runtime/queries/bash/highlights.scm
+++ b/runtime/queries/bash/highlights.scm
@@ -10,23 +10,37 @@
 (variable_name) @variable.other.member
 
 [
+  "if"
+  "then"
+  "else"
+  "elif"
+  "fi"
   "case"
+  "in"
+  "esac"
+] @keyword.control.conditional
+
+[
+  "for"
   "do"
   "done"
-  "elif"
-  "else"
-  "esac"
+  "select"
+  "until"
+  "while"
+] @keyword.control.repeat
+
+[
+  "declare"
+  "typeset"
   "export"
-  "fi"
-  "for"
-  "function"
-  "if"
-  "in"
+  "readonly"
+  "local"
   "unset"
-  "while"
-  "then"
+  "unsetenv"
 ] @keyword
 
+"function" @keyword.function
+
 (comment) @comment
 
 (function_definition name: (word) @function)
diff --git a/runtime/queries/css/indents.scm b/runtime/queries/css/indents.scm
new file mode 100644
index 000000000..1dfd977d9
--- /dev/null
+++ b/runtime/queries/css/indents.scm
@@ -0,0 +1,7 @@
+[
+  (block)
+] @indent
+
+[
+ "}"
+] @outdent
diff --git a/runtime/queries/make/indents.scm b/runtime/queries/make/indents.scm
new file mode 100644
index 000000000..42b2c60e6
--- /dev/null
+++ b/runtime/queries/make/indents.scm
@@ -0,0 +1,8 @@
+[
+  (define_directive)
+  (rule)
+] @indent
+
+[
+  "endef"
+] @outdent

From 9ed3dc52e0d56f0f0fd721d7f10da5f935f56ef9 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Mon, 22 Jan 2024 20:51:56 +0200
Subject: [PATCH 642/967] Update Scala tree-sitter grammar (#9348)

* Update Scala tree-sitter grammar

* Support block comments

Modify comment handling in textobjects and highlights to support new TS-scala node type 'block_comment'
---
 languages.toml                        | 2 +-
 runtime/queries/scala/highlights.scm  | 2 +-
 runtime/queries/scala/textobjects.scm | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/languages.toml b/languages.toml
index 1638cac49..a785828c1 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1393,7 +1393,7 @@ language-servers = [ "metals" ]
 
 [[grammar]]
 name = "scala"
-source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "23d21310fe4ab4b3273e7a6810e781224a3e7fe1" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "7891815f42dca9ed6aeb464c2edc39d479ab965c" }
 
 [[language]]
 name = "dockerfile"
diff --git a/runtime/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
index 67603fdda..40b230ec4 100644
--- a/runtime/queries/scala/highlights.scm
+++ b/runtime/queries/scala/highlights.scm
@@ -263,7 +263,7 @@
 
 "return" @keyword.control.return
 
-(comment) @comment
+[(comment) (block_comment)] @comment
 
 ;; `case` is a conditional keyword in case_block
 
diff --git a/runtime/queries/scala/textobjects.scm b/runtime/queries/scala/textobjects.scm
index fe0b8c255..6e551c417 100644
--- a/runtime/queries/scala/textobjects.scm
+++ b/runtime/queries/scala/textobjects.scm
@@ -51,8 +51,8 @@
 
 ; Comment queries
 
-(comment) @comment.inside
-(comment) @comment.around ; Does not match consecutive block comments
+[(comment) (block_comment)] @comment.inside
+[(comment) (block_comment)] @comment.around ; Does not match consecutive block comments
 
 
 ; Test queries

From 7d7ace551cd58f0b6d65af7a6dfa8f896d94724a Mon Sep 17 00:00:00 2001
From: Boris Verkhovskiy <boris.verk@gmail.com>
Date: Mon, 22 Jan 2024 15:19:28 -0800
Subject: [PATCH 643/967] Highlight .bash_history as bash (#9401)

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

diff --git a/languages.toml b/languages.toml
index a785828c1..4ff529c47 100644
--- a/languages.toml
+++ b/languages.toml
@@ -796,6 +796,7 @@ file-types = [
   "sh",
   "bash",
   "zsh",
+  ".bash_history",
   ".bash_login",
   ".bash_logout",
   ".bash_profile",

From 13ed4f6c4748019787d24c2b686d417b71604242 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Fri, 1 Dec 2023 00:03:26 +0100
Subject: [PATCH 644/967] Add hook/event system

---
 .cargo/config.toml             |  14 +++
 Cargo.lock                     |   6 +
 helix-event/Cargo.toml         |  17 ++-
 helix-event/src/cancel.rs      |  19 ++++
 helix-event/src/debounce.rs    |  67 +++++++++++
 helix-event/src/hook.rs        |  91 +++++++++++++++
 helix-event/src/lib.rs         | 201 ++++++++++++++++++++++++++++++++-
 helix-event/src/redraw.rs      |  24 ++--
 helix-event/src/registry.rs    | 131 +++++++++++++++++++++
 helix-event/src/runtime.rs     |  88 +++++++++++++++
 helix-event/src/status.rs      |  68 +++++++++++
 helix-event/src/test.rs        |  90 +++++++++++++++
 helix-term/Cargo.toml          |   2 +-
 helix-term/src/application.rs  |  24 +++-
 helix-term/src/commands.rs     |  26 +++--
 helix-term/src/events.rs       |  20 ++++
 helix-term/src/handlers.rs     |  15 +++
 helix-term/src/job.rs          |  55 +++++++--
 helix-term/src/lib.rs          |   4 +
 helix-term/src/ui/editor.rs    |  24 +++-
 helix-view/src/document.rs     |  18 +++
 helix-view/src/editor.rs       |   2 +
 helix-view/src/events.rs       |   9 ++
 helix-view/src/handlers.rs     |  12 ++
 helix-view/src/handlers/lsp.rs |  39 +++++++
 helix-view/src/lib.rs          |   8 +-
 26 files changed, 1024 insertions(+), 50 deletions(-)
 create mode 100644 helix-event/src/cancel.rs
 create mode 100644 helix-event/src/debounce.rs
 create mode 100644 helix-event/src/hook.rs
 create mode 100644 helix-event/src/registry.rs
 create mode 100644 helix-event/src/runtime.rs
 create mode 100644 helix-event/src/status.rs
 create mode 100644 helix-event/src/test.rs
 create mode 100644 helix-term/src/events.rs
 create mode 100644 helix-term/src/handlers.rs
 create mode 100644 helix-view/src/events.rs
 create mode 100644 helix-view/src/handlers.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index b016eca31..af4312dc8 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,3 +1,17 @@
+# we use tokio_unstable to enable runtime::Handle::id so we can separate
+# globals from multiple parallel tests. If that function ever does get removed
+# its possible to replace (with some additional overhead and effort)
+# Annoyingly build.rustflags doesn't work here because it gets overwritten
+# if people have their own global target.<..> config (for example to enable mold)
+# specifying flags this way is more robust as they get merged
+# This still gets overwritten by RUST_FLAGS though, luckily it shouldn't be necessary
+# to set those most of the time. If downstream does overwrite this its not a huge
+# deal since it will only break tests anyway
+[target."cfg(all())"]
+rustflags = ["--cfg", "tokio_unstable", "-C", "target-feature=-crt-static"]
+
+
 [alias]
 xtask = "run --package xtask --"
 integration-test = "test --features integration --profile integration --workspace --test integration"
+
diff --git a/Cargo.lock b/Cargo.lock
index 9884dadfb..4969ef46b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1102,6 +1102,12 @@ dependencies = [
 name = "helix-event"
 version = "23.10.0"
 dependencies = [
+ "ahash",
+ "anyhow",
+ "futures-executor",
+ "hashbrown 0.14.3",
+ "log",
+ "once_cell",
  "parking_lot",
  "tokio",
 ]
diff --git a/helix-event/Cargo.toml b/helix-event/Cargo.toml
index c20328246..a5c88e93d 100644
--- a/helix-event/Cargo.toml
+++ b/helix-event/Cargo.toml
@@ -12,5 +12,18 @@ homepage.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot"] }
-parking_lot = { version = "0.12", features = ["send_guard"] }
+ahash = "0.8.3"
+hashbrown = "0.14.0"
+tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
+# the event registry is essentially read only but must be an rwlock so we can
+# setup new events on initialization, hardware-lock-elision hugely benefits this case
+# as it essentially makes the lock entirely free as long as there is no writes 
+parking_lot = { version = "0.12", features = ["hardware-lock-elision"] }
+once_cell = "1.18"
+
+anyhow = "1"
+log = "0.4"
+futures-executor = "0.3.28"
+
+[features]
+integration_test = []
diff --git a/helix-event/src/cancel.rs b/helix-event/src/cancel.rs
new file mode 100644
index 000000000..f027be80e
--- /dev/null
+++ b/helix-event/src/cancel.rs
@@ -0,0 +1,19 @@
+use std::future::Future;
+
+pub use oneshot::channel as cancelation;
+use tokio::sync::oneshot;
+
+pub type CancelTx = oneshot::Sender<()>;
+pub type CancelRx = oneshot::Receiver<()>;
+
+pub async fn cancelable_future<T>(future: impl Future<Output = T>, cancel: CancelRx) -> Option<T> {
+    tokio::select! {
+        biased;
+        _ = cancel => {
+            None
+        }
+        res = future => {
+            Some(res)
+        }
+    }
+}
diff --git a/helix-event/src/debounce.rs b/helix-event/src/debounce.rs
new file mode 100644
index 000000000..30b6f671b
--- /dev/null
+++ b/helix-event/src/debounce.rs
@@ -0,0 +1,67 @@
+//! Utilities for declaring an async (usually debounced) hook
+
+use std::time::Duration;
+
+use futures_executor::block_on;
+use tokio::sync::mpsc::{self, error::TrySendError, Sender};
+use tokio::time::Instant;
+
+/// Async hooks provide a convenient framework for implementing (debounced)
+/// async event handlers. Most synchronous event hooks will likely need to
+/// debounce their events, coordinate multiple different hooks and potentially
+/// track some state. `AsyncHooks` facilitate these use cases by running as
+/// a background tokio task that waits for events (usually an enum) to be
+/// sent through a channel.
+pub trait AsyncHook: Sync + Send + 'static + Sized {
+    type Event: Sync + Send + 'static;
+    /// Called immediately whenever an event is received, this function can
+    /// consume the event immediately or debounce it. In case of debouncing,
+    /// it can either define a new debounce timeout or continue the current one
+    fn handle_event(&mut self, event: Self::Event, timeout: Option<Instant>) -> Option<Instant>;
+
+    /// Called whenever the debounce timeline is reached
+    fn finish_debounce(&mut self);
+
+    fn spawn(self) -> mpsc::Sender<Self::Event> {
+        // the capacity doesn't matter too much here, unless the cpu is totally overwhelmed
+        // the cap will never be reached since we always immediately drain the channel
+        // so it should only be reached in case of total CPU overload.
+        // However, a bounded channel is much more efficient so it's nice to use here
+        let (tx, rx) = mpsc::channel(128);
+        tokio::spawn(run(self, rx));
+        tx
+    }
+}
+
+async fn run<Hook: AsyncHook>(mut hook: Hook, mut rx: mpsc::Receiver<Hook::Event>) {
+    let mut deadline = None;
+    loop {
+        let event = match deadline {
+            Some(deadline_) => {
+                let res = tokio::time::timeout_at(deadline_, rx.recv()).await;
+                match res {
+                    Ok(event) => event,
+                    Err(_) => {
+                        hook.finish_debounce();
+                        deadline = None;
+                        continue;
+                    }
+                }
+            }
+            None => rx.recv().await,
+        };
+        let Some(event) = event else {
+            break;
+        };
+        deadline = hook.handle_event(event, deadline);
+    }
+}
+
+pub fn send_blocking<T>(tx: &Sender<T>, data: T) {
+    // block_on has some overhead and in practice the channel should basically
+    // never be full anyway so first try sending without blocking
+    if let Err(TrySendError::Full(data)) = tx.try_send(data) {
+        // set a timeout so that we just drop a message instead of freezing the editor in the worst case
+        let _ = block_on(tx.send_timeout(data, Duration::from_millis(10)));
+    }
+}
diff --git a/helix-event/src/hook.rs b/helix-event/src/hook.rs
new file mode 100644
index 000000000..7fb681483
--- /dev/null
+++ b/helix-event/src/hook.rs
@@ -0,0 +1,91 @@
+//! rust dynamic dispatch is extremely limited so we have to build our
+//! own vtable implementation. Otherwise implementing the event system would not be possible.
+//! A nice bonus of this approach is that we can optimize the vtable a bit more. Normally
+//! a dyn Trait fat pointer contains two pointers: A pointer to the data itself and a
+//! pointer to a global (static) vtable entry which itself contains multiple other pointers
+//! (the various functions of the trait, drop, size and align). That makes dynamic
+//! dispatch pretty slow (double pointer indirections). However, we only have a single function
+//! in the hook trait and don't need a drop implementation (event system is global anyway
+//! and never dropped) so we can just store the entire vtable inline.
+
+use anyhow::Result;
+use std::ptr::{self, NonNull};
+
+use crate::Event;
+
+/// Opaque handle type that represents an erased type parameter.
+///
+/// If extern types were stable, this could be implemented as `extern { pub type Opaque; }` but
+/// until then we can use this.
+///
+/// Care should be taken that we don't use a concrete instance of this. It should only be used
+/// through a reference, so we can maintain something else's lifetime.
+struct Opaque(());
+
+pub(crate) struct ErasedHook {
+    data: NonNull<Opaque>,
+    call: unsafe fn(NonNull<Opaque>, NonNull<Opaque>, NonNull<Opaque>),
+}
+
+impl ErasedHook {
+    pub(crate) fn new_dynamic<H: Fn() -> Result<()> + 'static + Send + Sync>(
+        hook: H,
+    ) -> ErasedHook {
+        unsafe fn call<F: Fn() -> Result<()> + 'static + Send + Sync>(
+            hook: NonNull<Opaque>,
+            _event: NonNull<Opaque>,
+            result: NonNull<Opaque>,
+        ) {
+            let hook: NonNull<F> = hook.cast();
+            let result: NonNull<Result<()>> = result.cast();
+            let hook: &F = hook.as_ref();
+            let res = hook();
+            ptr::write(result.as_ptr(), res)
+        }
+
+        unsafe {
+            ErasedHook {
+                data: NonNull::new_unchecked(Box::into_raw(Box::new(hook)) as *mut Opaque),
+                call: call::<H>,
+            }
+        }
+    }
+
+    pub(crate) fn new<E: Event, F: Fn(&mut E) -> Result<()>>(hook: F) -> ErasedHook {
+        unsafe fn call<E: Event, F: Fn(&mut E) -> Result<()>>(
+            hook: NonNull<Opaque>,
+            event: NonNull<Opaque>,
+            result: NonNull<Opaque>,
+        ) {
+            let hook: NonNull<F> = hook.cast();
+            let mut event: NonNull<E> = event.cast();
+            let result: NonNull<Result<()>> = result.cast();
+            let hook: &F = hook.as_ref();
+            let res = hook(event.as_mut());
+            ptr::write(result.as_ptr(), res)
+        }
+
+        unsafe {
+            ErasedHook {
+                data: NonNull::new_unchecked(Box::into_raw(Box::new(hook)) as *mut Opaque),
+                call: call::<E, F>,
+            }
+        }
+    }
+
+    pub(crate) unsafe fn call<E: Event>(&self, event: &mut E) -> Result<()> {
+        let mut res = Ok(());
+
+        unsafe {
+            (self.call)(
+                self.data,
+                NonNull::from(event).cast(),
+                NonNull::from(&mut res).cast(),
+            );
+        }
+        res
+    }
+}
+
+unsafe impl Sync for ErasedHook {}
+unsafe impl Send for ErasedHook {}
diff --git a/helix-event/src/lib.rs b/helix-event/src/lib.rs
index 9c082b93a..894de5e8d 100644
--- a/helix-event/src/lib.rs
+++ b/helix-event/src/lib.rs
@@ -1,8 +1,203 @@
 //! `helix-event` contains systems that allow (often async) communication between
-//! different editor components without strongly coupling them. Currently this
-//! crate only contains some smaller facilities but the intend is to add more
-//! functionality in the future ( like a generic hook system)
+//! different editor components without strongly coupling them. Specifically
+//! it allows defining synchronous hooks that run when certain editor events
+//! occur.
+//!
+//! The core of the event system are hook callbacks and the [`Event`] trait. A
+//! hook is essentially just a closure `Fn(event: &mut impl Event) -> Result<()>`
+//! that gets called every time an appropriate event is dispatched. The implementation
+//! details of the [`Event`] trait are considered private. The [`events`] macro is
+//! provided which automatically declares event types. Similarly the `register_hook`
+//! macro should be used to (safely) declare event hooks.
+//!
+//! Hooks run synchronously which can be advantageous since they can modify the
+//! current editor state right away (for example to immediately hide the completion
+//! popup). However, they can not contain their own state without locking since
+//! they only receive immutable references. For handler that want to track state, do
+//! expensive background computations or debouncing an [`AsyncHook`] is preferable.
+//! Async hooks are based around a channels that receive events specific to
+//! that `AsyncHook` (usually an enum). These events can be sent by synchronous
+//! hooks. Due to some limitations around tokio channels the [`send_blocking`]
+//! function exported in this crate should be used instead of the builtin
+//! `blocking_send`.
+//!
+//! In addition to the core event system, this crate contains some message queues
+//! that allow transfer of data back to the main event loop from async hooks and
+//! hooks that may not have access to all application data (for example in helix-view).
+//! This include the ability to control rendering ([`lock_frame`], [`request_redraw`]) and
+//! display status messages ([`status`]).
+//!
+//! Hooks declared in helix-term can furthermore dispatch synchronous jobs to be run on the
+//! main loop (including access to the compositor). Ideally that queue will be moved
+//! to helix-view in the future if we manage to detach the compositor from its rendering backend.
 
+use anyhow::Result;
+pub use cancel::{cancelable_future, cancelation, CancelRx, CancelTx};
+pub use debounce::{send_blocking, AsyncHook};
 pub use redraw::{lock_frame, redraw_requested, request_redraw, start_frame, RenderLockGuard};
+pub use registry::Event;
 
+mod cancel;
+mod debounce;
+mod hook;
 mod redraw;
+mod registry;
+#[doc(hidden)]
+pub mod runtime;
+pub mod status;
+
+#[cfg(test)]
+mod test;
+
+pub fn register_event<E: Event + 'static>() {
+    registry::with_mut(|registry| registry.register_event::<E>())
+}
+
+/// Registers a hook that will be called when an event of type `E` is dispatched.
+/// This function should usually not be used directly, use the [`register_hook`]
+/// macro instead.
+///
+///
+/// # Safety
+///
+/// `hook` must be totally generic over all lifetime parameters of `E`. For
+/// example if `E` was a known type `Foo<'a, 'b>`, then the correct trait bound
+/// would be `F: for<'a, 'b, 'c> Fn(&'a mut Foo<'b, 'c>)`, but there is no way to
+/// express that kind of constraint for a generic type with the Rust type system
+/// as of this writing.
+pub unsafe fn register_hook_raw<E: Event>(
+    hook: impl Fn(&mut E) -> Result<()> + 'static + Send + Sync,
+) {
+    registry::with_mut(|registry| registry.register_hook(hook))
+}
+
+/// Register a hook solely by event name
+pub fn register_dynamic_hook(
+    hook: impl Fn() -> Result<()> + 'static + Send + Sync,
+    id: &str,
+) -> Result<()> {
+    registry::with_mut(|reg| reg.register_dynamic_hook(hook, id))
+}
+
+pub fn dispatch(e: impl Event) {
+    registry::with(|registry| registry.dispatch(e));
+}
+
+/// Macro to declare events
+///
+/// # Examples
+///
+/// ``` no-compile
+/// events! {
+///     FileWrite(&Path)
+///     ViewScrolled{ view: View, new_pos: ViewOffset }
+///     DocumentChanged<'a> { old_doc: &'a Rope, doc: &'a mut Document, changes: &'a ChangeSet  }
+/// }
+///
+/// fn init() {
+///    register_event::<FileWrite>();
+///    register_event::<ViewScrolled>();
+///    register_event::<DocumentChanged>();
+/// }
+///
+/// fn save(path: &Path, content: &str){
+///     std::fs::write(path, content);
+///     dispatch(FileWrite(path));
+/// }
+/// ```
+#[macro_export]
+macro_rules! events {
+    ($name: ident<$($lt: lifetime),*> { $($data:ident : $data_ty:ty),* } $($rem:tt)*) => {
+        pub struct $name<$($lt),*> { $(pub $data: $data_ty),* }
+        unsafe impl<$($lt),*> $crate::Event for $name<$($lt),*> {
+            const ID: &'static str = stringify!($name);
+            const LIFETIMES: usize = $crate::events!(@sum $(1, $lt),*);
+            type Static = $crate::events!(@replace_lt $name, $('static, $lt),*);
+        }
+        $crate::events!{ $($rem)* }
+    };
+    ($name: ident { $($data:ident : $data_ty:ty),* } $($rem:tt)*) => {
+        pub struct $name { $(pub $data: $data_ty),* }
+        unsafe impl $crate::Event for $name {
+            const ID: &'static str = stringify!($name);
+            const LIFETIMES: usize = 0;
+            type Static = Self;
+        }
+        $crate::events!{ $($rem)* }
+    };
+    () => {};
+    (@replace_lt $name: ident, $($lt1: lifetime, $lt2: lifetime),* ) => {$name<$($lt1),*>};
+    (@sum $($val: expr, $lt1: lifetime),* ) => {0 $(+ $val)*};
+}
+
+/// Safely register statically typed event hooks
+#[macro_export]
+macro_rules! register_hook {
+    // Safety: this is safe because we fully control the type of the event here and
+    // ensure all lifetime arguments are fully generic and the correct number of lifetime arguments
+    // is present
+    (move |$event:ident: &mut $event_ty: ident<$($lt: lifetime),*>| $body: expr) => {
+        let val = move |$event: &mut $event_ty<$($lt),*>| $body;
+        unsafe {
+            // Lifetimes are a bit of a pain. We want to allow events being
+            // non-static. Lifetimes don't actually exist at runtime so its
+            // fine to essentially transmute the lifetimes as long as we can
+            // prove soundness. The hook must therefore accept any combination
+            // of lifetimes. In other words fn(&'_ mut Event<'_, '_>) is ok
+            // but examples like fn(&'_ mut Event<'_, 'static>) or fn<'a>(&'a
+            // mut Event<'a, 'a>) are not. To make this safe we use a macro to
+            // forbid the user from specifying lifetimes manually (all lifetimes
+            // specified are always function generics and passed to the event so
+            // lifetimes can't be used multiple times and using 'static causes a
+            // syntax error).
+            //
+            // There is one soundness hole tough: Type Aliases allow
+            // "accidentally" creating these problems. For example:
+            //
+            // type Event2  = Event<'static>.
+            // type Event2<'a>  = Event<'a, a>.
+            //
+            // These cases can be caught by counting the number of lifetimes
+            // parameters at the parameter declaration site and then at the hook
+            // declaration site. By asserting the number of lifetime parameters
+            // are equal we can catch all bad type aliases under one assumption:
+            // There are no unused lifetime parameters. Introducing a static
+            // would reduce the number of arguments of the alias by one in the
+            // above example Event2 has zero lifetime arguments while the original
+            // event has one lifetime argument. Similar logic applies to using
+            // a lifetime argument multiple times. The ASSERT below performs a
+            // a compile time assertion to ensure exactly this property.
+            //
+            // With unused lifetime arguments it is still one way to cause unsound code:
+            //
+            // type Event2<'a, 'b> = Event<'a, 'a>;
+            //
+            // However, this case will always emit a compiler warning/cause CI
+            // failures so a user would have to introduce #[allow(unused)] which
+            // is easily caught in review (and a very theoretical case anyway).
+            // If we want to be pedantic we can simply compile helix with
+            // forbid(unused). All of this is just a safety net to prevent
+            // very theoretical misuse. This won't come up in real code (and is
+            // easily caught in review).
+            #[allow(unused)]
+            const ASSERT: () = {
+                if <$event_ty as $crate::Event>::LIFETIMES != 0 + $crate::events!(@sum $(1, $lt),*){
+                    panic!("invalid type alias");
+                }
+            };
+            $crate::register_hook_raw::<$crate::events!(@replace_lt $event_ty, $('static, $lt),*)>(val);
+        }
+    };
+    (move |$event:ident: &mut $event_ty: ident| $body: expr) => {
+        let val = move |$event: &mut $event_ty| $body;
+        unsafe {
+            #[allow(unused)]
+            const ASSERT: () = {
+                if <$event_ty as $crate::Event>::LIFETIMES != 0{
+                    panic!("invalid type alias");
+                }
+            };
+            $crate::register_hook_raw::<$event_ty>(val);
+        }
+    };
+}
diff --git a/helix-event/src/redraw.rs b/helix-event/src/redraw.rs
index a99152238..8fadb8aea 100644
--- a/helix-event/src/redraw.rs
+++ b/helix-event/src/redraw.rs
@@ -5,16 +5,20 @@ use std::future::Future;
 use parking_lot::{RwLock, RwLockReadGuard};
 use tokio::sync::Notify;
 
-/// A `Notify` instance that can be used to (asynchronously) request
-/// the editor the render a new frame.
-static REDRAW_NOTIFY: Notify = Notify::const_new();
-
-/// A `RwLock` that prevents the next frame from being
-/// drawn until an exclusive (write) lock can be acquired.
-/// This allows asynchsonous tasks to acquire `non-exclusive`
-/// locks (read) to prevent the next frame from being drawn
-/// until a certain computation has finished.
-static RENDER_LOCK: RwLock<()> = RwLock::new(());
+use crate::runtime_local;
+
+runtime_local! {
+    /// A `Notify` instance that can be used to (asynchronously) request
+    /// the editor to render a new frame.
+    static REDRAW_NOTIFY: Notify = Notify::const_new();
+
+    /// A `RwLock` that prevents the next frame from being
+    /// drawn until an exclusive (write) lock can be acquired.
+    /// This allows asynchronous tasks to acquire `non-exclusive`
+    /// locks (read) to prevent the next frame from being drawn
+    /// until a certain computation has finished.
+    static RENDER_LOCK: RwLock<()> = RwLock::new(());
+}
 
 pub type RenderLockGuard = RwLockReadGuard<'static, ()>;
 
diff --git a/helix-event/src/registry.rs b/helix-event/src/registry.rs
new file mode 100644
index 000000000..d43c48ac4
--- /dev/null
+++ b/helix-event/src/registry.rs
@@ -0,0 +1,131 @@
+//! A global registry where events are registered and can be
+//! subscribed to by registering hooks. The registry identifies event
+//! types using their type name so multiple event with the same type name
+//! may not be registered (will cause a panic to ensure soundness)
+
+use std::any::TypeId;
+
+use anyhow::{bail, Result};
+use hashbrown::hash_map::Entry;
+use hashbrown::HashMap;
+use parking_lot::RwLock;
+
+use crate::hook::ErasedHook;
+use crate::runtime_local;
+
+pub struct Registry {
+    events: HashMap<&'static str, TypeId, ahash::RandomState>,
+    handlers: HashMap<&'static str, Vec<ErasedHook>, ahash::RandomState>,
+}
+
+impl Registry {
+    pub fn register_event<E: Event + 'static>(&mut self) {
+        let ty = TypeId::of::<E>();
+        assert_eq!(ty, TypeId::of::<E::Static>());
+        match self.events.entry(E::ID) {
+            Entry::Occupied(entry) => {
+                if entry.get() == &ty {
+                    // don't warn during tests to avoid log spam
+                    #[cfg(not(feature = "integration_test"))]
+                    panic!("Event {} was registered multiple times", E::ID);
+                } else {
+                    panic!("Multiple events with ID {} were registered", E::ID);
+                }
+            }
+            Entry::Vacant(ent) => {
+                ent.insert(ty);
+                self.handlers.insert(E::ID, Vec::new());
+            }
+        }
+    }
+
+    /// # Safety
+    ///
+    /// `hook` must be totally generic over all lifetime parameters of `E`. For
+    /// example if `E` was a known type `Foo<'a, 'b> then the correct trait bound
+    /// would be `F: for<'a, 'b, 'c> Fn(&'a mut Foo<'b, 'c>)` but there is no way to
+    /// express that kind of constraint for a generic type with the rust type system
+    /// right now.
+    pub unsafe fn register_hook<E: Event>(
+        &mut self,
+        hook: impl Fn(&mut E) -> Result<()> + 'static + Send + Sync,
+    ) {
+        // ensure event type ids match so we can rely on them always matching
+        let id = E::ID;
+        let Some(&event_id) = self.events.get(id) else {
+            panic!("Tried to register handler for unknown event {id}");
+        };
+        assert!(
+            TypeId::of::<E::Static>() == event_id,
+            "Tried to register invalid hook for event {id}"
+        );
+        let hook = ErasedHook::new(hook);
+        self.handlers.get_mut(id).unwrap().push(hook);
+    }
+
+    pub fn register_dynamic_hook(
+        &mut self,
+        hook: impl Fn() -> Result<()> + 'static + Send + Sync,
+        id: &str,
+    ) -> Result<()> {
+        // ensure event type ids match so we can rely on them always matching
+        if self.events.get(id).is_none() {
+            bail!("Tried to register handler for unknown event {id}");
+        };
+        let hook = ErasedHook::new_dynamic(hook);
+        self.handlers.get_mut(id).unwrap().push(hook);
+        Ok(())
+    }
+
+    pub fn dispatch<E: Event>(&self, mut event: E) {
+        let Some(hooks) = self.handlers.get(E::ID) else {
+            log::error!("Dispatched unknown event {}", E::ID);
+            return;
+        };
+        let event_id = self.events[E::ID];
+
+        assert_eq!(
+            TypeId::of::<E::Static>(),
+            event_id,
+            "Tried to dispatch invalid event {}",
+            E::ID
+        );
+
+        for hook in hooks {
+            // safety: event type is the same
+            if let Err(err) = unsafe { hook.call(&mut event) } {
+                log::error!("{} hook failed: {err:#?}", E::ID);
+                crate::status::report_blocking(err);
+            }
+        }
+    }
+}
+
+runtime_local! {
+    static REGISTRY: RwLock<Registry> = RwLock::new(Registry {
+        // hardcoded random number is good enough here we don't care about DOS resistance
+        // and avoids the additional complexity of `Option<Registry>`
+        events: HashMap::with_hasher(ahash::RandomState::with_seeds(423, 9978, 38322, 3280080)),
+        handlers: HashMap::with_hasher(ahash::RandomState::with_seeds(423, 99078, 382322, 3282938)),
+    });
+}
+
+pub(crate) fn with<T>(f: impl FnOnce(&Registry) -> T) -> T {
+    f(&REGISTRY.read())
+}
+
+pub(crate) fn with_mut<T>(f: impl FnOnce(&mut Registry) -> T) -> T {
+    f(&mut REGISTRY.write())
+}
+
+/// # Safety
+/// The number of specified lifetimes and the static type *must* be correct.
+/// This is ensured automatically by the [`events`](crate::events)
+/// macro.
+pub unsafe trait Event: Sized {
+    /// Globally unique (case sensitive)  string that identifies this type.
+    /// A good candidate is the events type name
+    const ID: &'static str;
+    const LIFETIMES: usize;
+    type Static: Event + 'static;
+}
diff --git a/helix-event/src/runtime.rs b/helix-event/src/runtime.rs
new file mode 100644
index 000000000..8da465ef3
--- /dev/null
+++ b/helix-event/src/runtime.rs
@@ -0,0 +1,88 @@
+//! The event system makes use of global to decouple different systems.
+//! However, this can cause problems for the integration test system because
+//! it runs multiple helix applications in parallel. Making the globals
+//! thread-local does not work because a applications can/does have multiple
+//! runtime threads. Instead this crate implements a similar notion to a thread
+//! local but instead of being local to a single thread, the statics are local to
+//! a single tokio-runtime. The implementation requires locking so it's not exactly efficient.
+//!
+//! Therefore this function is only enabled during integration tests and behaves like
+//! a normal static otherwise. I would prefer this module to be fully private and to only
+//! export the macro but the macro still need to construct these internals so it's marked
+//! `doc(hidden)` instead
+
+use std::ops::Deref;
+
+#[cfg(not(feature = "integration_test"))]
+pub struct RuntimeLocal<T: 'static> {
+    /// inner API used in the macro, not part of public API
+    #[doc(hidden)]
+    pub __data: T,
+}
+
+#[cfg(not(feature = "integration_test"))]
+impl<T> Deref for RuntimeLocal<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.__data
+    }
+}
+
+#[cfg(not(feature = "integration_test"))]
+#[macro_export]
+macro_rules! runtime_local {
+    ($($(#[$attr:meta])* $vis: vis static $name:ident: $ty: ty = $init: expr;)*) => {
+        $($(#[$attr])* $vis static $name: $crate::runtime::RuntimeLocal<$ty> = $crate::runtime::RuntimeLocal {
+            __data: $init
+        };)*
+    };
+}
+
+#[cfg(feature = "integration_test")]
+pub struct RuntimeLocal<T: 'static> {
+    data:
+        parking_lot::RwLock<hashbrown::HashMap<tokio::runtime::Id, &'static T, ahash::RandomState>>,
+    init: fn() -> T,
+}
+
+#[cfg(feature = "integration_test")]
+impl<T> RuntimeLocal<T> {
+    /// inner API used in the macro, not part of public API
+    #[doc(hidden)]
+    pub const fn __new(init: fn() -> T) -> Self {
+        Self {
+            data: parking_lot::RwLock::new(hashbrown::HashMap::with_hasher(
+                ahash::RandomState::with_seeds(423, 9978, 38322, 3280080),
+            )),
+            init,
+        }
+    }
+}
+
+#[cfg(feature = "integration_test")]
+impl<T> Deref for RuntimeLocal<T> {
+    type Target = T;
+    fn deref(&self) -> &T {
+        let id = tokio::runtime::Handle::current().id();
+        let guard = self.data.read();
+        match guard.get(&id) {
+            Some(res) => res,
+            None => {
+                drop(guard);
+                let data = Box::leak(Box::new((self.init)()));
+                let mut guard = self.data.write();
+                guard.insert(id, data);
+                data
+            }
+        }
+    }
+}
+
+#[cfg(feature = "integration_test")]
+#[macro_export]
+macro_rules! runtime_local {
+    ($($(#[$attr:meta])* $vis: vis static $name:ident: $ty: ty = $init: expr;)*) => {
+         $($(#[$attr])* $vis static $name: $crate::runtime::RuntimeLocal<$ty> = $crate::runtime::RuntimeLocal::__new(|| $init);)*
+    };
+}
diff --git a/helix-event/src/status.rs b/helix-event/src/status.rs
new file mode 100644
index 000000000..fdca67624
--- /dev/null
+++ b/helix-event/src/status.rs
@@ -0,0 +1,68 @@
+//! A queue of async messages/errors that will be shown in the editor
+
+use std::borrow::Cow;
+use std::time::Duration;
+
+use crate::{runtime_local, send_blocking};
+use once_cell::sync::OnceCell;
+use tokio::sync::mpsc::{Receiver, Sender};
+
+/// Describes the severity level of a [`StatusMessage`].
+#[derive(Debug, Clone, Copy, Eq, PartialEq, PartialOrd, Ord)]
+pub enum Severity {
+    Hint,
+    Info,
+    Warning,
+    Error,
+}
+
+pub struct StatusMessage {
+    pub severity: Severity,
+    pub message: Cow<'static, str>,
+}
+
+impl From<anyhow::Error> for StatusMessage {
+    fn from(err: anyhow::Error) -> Self {
+        StatusMessage {
+            severity: Severity::Error,
+            message: err.to_string().into(),
+        }
+    }
+}
+
+impl From<&'static str> for StatusMessage {
+    fn from(msg: &'static str) -> Self {
+        StatusMessage {
+            severity: Severity::Info,
+            message: msg.into(),
+        }
+    }
+}
+
+runtime_local! {
+    static MESSAGES: OnceCell<Sender<StatusMessage>> = OnceCell::new();
+}
+
+pub async fn report(msg: impl Into<StatusMessage>) {
+    // if the error channel overflows just ignore it
+    let _ = MESSAGES
+        .wait()
+        .send_timeout(msg.into(), Duration::from_millis(10))
+        .await;
+}
+
+pub fn report_blocking(msg: impl Into<StatusMessage>) {
+    let messages = MESSAGES.wait();
+    send_blocking(messages, msg.into())
+}
+
+/// Must be called once during editor startup exactly once
+/// before any of the messages in this module can be used
+///
+/// # Panics
+/// If called multiple times
+pub fn setup() -> Receiver<StatusMessage> {
+    let (tx, rx) = tokio::sync::mpsc::channel(128);
+    let _ = MESSAGES.set(tx);
+    rx
+}
diff --git a/helix-event/src/test.rs b/helix-event/src/test.rs
new file mode 100644
index 000000000..a1283ada1
--- /dev/null
+++ b/helix-event/src/test.rs
@@ -0,0 +1,90 @@
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+use std::time::Duration;
+
+use parking_lot::Mutex;
+
+use crate::{dispatch, events, register_dynamic_hook, register_event, register_hook};
+#[test]
+fn smoke_test() {
+    events! {
+        Event1 { content: String }
+        Event2 { content: usize }
+    }
+    register_event::<Event1>();
+    register_event::<Event2>();
+
+    // setup hooks
+    let res1: Arc<Mutex<String>> = Arc::default();
+    let acc = Arc::clone(&res1);
+    register_hook!(move |event: &mut Event1| {
+        acc.lock().push_str(&event.content);
+        Ok(())
+    });
+    let res2: Arc<AtomicUsize> = Arc::default();
+    let acc = Arc::clone(&res2);
+    register_hook!(move |event: &mut Event2| {
+        acc.fetch_add(event.content, Ordering::Relaxed);
+        Ok(())
+    });
+
+    // triggers events
+    let thread = std::thread::spawn(|| {
+        for i in 0..1000 {
+            dispatch(Event2 { content: i });
+        }
+    });
+    std::thread::sleep(Duration::from_millis(1));
+    dispatch(Event1 {
+        content: "foo".to_owned(),
+    });
+    dispatch(Event2 { content: 42 });
+    dispatch(Event1 {
+        content: "bar".to_owned(),
+    });
+    dispatch(Event1 {
+        content: "hello world".to_owned(),
+    });
+    thread.join().unwrap();
+
+    // check output
+    assert_eq!(&**res1.lock(), "foobarhello world");
+    assert_eq!(
+        res2.load(Ordering::Relaxed),
+        42 + (0..1000usize).sum::<usize>()
+    );
+}
+
+#[test]
+fn dynamic() {
+    events! {
+        Event3 {}
+        Event4 { count: usize }
+    };
+    register_event::<Event3>();
+    register_event::<Event4>();
+
+    let count = Arc::new(AtomicUsize::new(0));
+    let count1 = count.clone();
+    let count2 = count.clone();
+    register_dynamic_hook(
+        move || {
+            count1.fetch_add(2, Ordering::Relaxed);
+            Ok(())
+        },
+        "Event3",
+    )
+    .unwrap();
+    register_dynamic_hook(
+        move || {
+            count2.fetch_add(3, Ordering::Relaxed);
+            Ok(())
+        },
+        "Event4",
+    )
+    .unwrap();
+    dispatch(Event3 {});
+    dispatch(Event4 { count: 0 });
+    dispatch(Event3 {});
+    assert_eq!(count.load(Ordering::Relaxed), 7)
+}
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 21c35553c..7bdd433ed 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -15,7 +15,7 @@ homepage.workspace = true
 [features]
 default = ["git"]
 unicode-lines = ["helix-core/unicode-lines"]
-integration = []
+integration = ["helix-event/integration_test"]
 git = ["helix-vcs/git"]
 
 [[bin]]
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 290441b41..8215eeaa5 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,6 +1,10 @@
 use arc_swap::{access::Map, ArcSwap};
 use futures_util::Stream;
-use helix_core::{pos_at_coords, syntax, Selection};
+use helix_core::{
+    chars::char_is_word,
+    diagnostic::{DiagnosticTag, NumberOrString},
+    pos_at_coords, syntax, Selection,
+};
 use helix_lsp::{
     lsp::{self, notification::Notification},
     util::lsp_range_to_range,
@@ -24,6 +28,7 @@ use crate::{
     commands::apply_workspace_edit,
     compositor::{Compositor, Event},
     config::Config,
+    handlers,
     job::Jobs,
     keymap::Keymaps,
     ui::{self, overlay::overlaid},
@@ -138,6 +143,7 @@ impl Application {
         let area = terminal.size().expect("couldn't get terminal size");
         let mut compositor = Compositor::new(area);
         let config = Arc::new(ArcSwap::from_pointee(config));
+        let handlers = handlers::setup(config.clone());
         let mut editor = Editor::new(
             area,
             theme_loader.clone(),
@@ -145,6 +151,7 @@ impl Application {
             Arc::new(Map::new(Arc::clone(&config), |config: &Config| {
                 &config.editor
             })),
+            handlers,
         );
 
         let keys = Box::new(Map::new(Arc::clone(&config), |config: &Config| {
@@ -321,10 +328,21 @@ impl Application {
                 Some(event) = input_stream.next() => {
                     self.handle_terminal_events(event).await;
                 }
-                Some(callback) = self.jobs.futures.next() => {
-                    self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
+                Some(callback) = self.jobs.callbacks.recv() => {
+                    self.jobs.handle_callback(&mut self.editor, &mut self.compositor, Ok(Some(callback)));
                     self.render().await;
                 }
+                Some(msg) = self.jobs.status_messages.recv() => {
+                    let severity = match msg.severity{
+                        helix_event::status::Severity::Hint => Severity::Hint,
+                        helix_event::status::Severity::Info => Severity::Info,
+                        helix_event::status::Severity::Warning => Severity::Warning,
+                        helix_event::status::Severity::Error => Severity::Error,
+                    };
+                    // TODO: show multiple status messages at once to avoid clobbering
+                    self.editor.status_msg = Some((msg.message, severity));
+                    helix_event::request_redraw();
+                }
                 Some(callback) = self.jobs.wait_futures.next() => {
                     self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
                     self.render().await;
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 53783e4e3..48ceb23ba 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -88,7 +88,7 @@ pub struct Context<'a> {
     pub count: Option<NonZeroUsize>,
     pub editor: &'a mut Editor,
 
-    pub callback: Option<crate::compositor::Callback>,
+    pub callback: Vec<crate::compositor::Callback>,
     pub on_next_key_callback: Option<OnKeyCallback>,
     pub jobs: &'a mut Jobs,
 }
@@ -96,16 +96,18 @@ pub struct Context<'a> {
 impl<'a> Context<'a> {
     /// Push a new component onto the compositor.
     pub fn push_layer(&mut self, component: Box<dyn Component>) {
-        self.callback = Some(Box::new(|compositor: &mut Compositor, _| {
-            compositor.push(component)
-        }));
+        self.callback
+            .push(Box::new(|compositor: &mut Compositor, _| {
+                compositor.push(component)
+            }));
     }
 
     /// Call `replace_or_push` on the Compositor
     pub fn replace_or_push_layer<T: Component>(&mut self, id: &'static str, component: T) {
-        self.callback = Some(Box::new(move |compositor: &mut Compositor, _| {
-            compositor.replace_or_push(id, component);
-        }));
+        self.callback
+            .push(Box::new(move |compositor: &mut Compositor, _| {
+                compositor.replace_or_push(id, component);
+            }));
     }
 
     #[inline]
@@ -2934,7 +2936,7 @@ pub fn command_palette(cx: &mut Context) {
     let register = cx.register;
     let count = cx.count;
 
-    cx.callback = Some(Box::new(
+    cx.callback.push(Box::new(
         move |compositor: &mut Compositor, cx: &mut compositor::Context| {
             let keymap = compositor.find::<ui::EditorView>().unwrap().keymaps.map()
                 [&cx.editor.mode]
@@ -2954,7 +2956,7 @@ pub fn command_palette(cx: &mut Context) {
                     register,
                     count,
                     editor: cx.editor,
-                    callback: None,
+                    callback: Vec::new(),
                     on_next_key_callback: None,
                     jobs: cx.jobs,
                 };
@@ -2982,7 +2984,7 @@ pub fn command_palette(cx: &mut Context) {
 
 fn last_picker(cx: &mut Context) {
     // TODO: last picker does not seem to work well with buffer_picker
-    cx.callback = Some(Box::new(|compositor, cx| {
+    cx.callback.push(Box::new(|compositor, cx| {
         if let Some(picker) = compositor.last_picker.take() {
             compositor.push(picker);
         } else {
@@ -3494,6 +3496,7 @@ fn hunk_range(hunk: Hunk, text: RopeSlice) -> Range {
 }
 
 pub mod insert {
+    use crate::events::PostInsertChar;
     use super::*;
     pub type Hook = fn(&Rope, &Selection, char) -> Option<Transaction>;
     pub type PostHook = fn(&mut Context, char);
@@ -3627,6 +3630,7 @@ pub mod insert {
         for hook in &[language_server_completion, signature_help] {
             hook(cx, c);
         }
+        helix_event::dispatch(PostInsertChar { c, cx });
     }
 
     pub fn smart_tab(cx: &mut Context) {
@@ -5820,7 +5824,7 @@ fn replay_macro(cx: &mut Context) {
     cx.editor.macro_replaying.push(reg);
 
     let count = cx.count();
-    cx.callback = Some(Box::new(move |compositor, cx| {
+    cx.callback.push(Box::new(move |compositor, cx| {
         for _ in 0..count {
             for &key in keys.iter() {
                 compositor.handle_event(&compositor::Event::Key(key), cx);
diff --git a/helix-term/src/events.rs b/helix-term/src/events.rs
new file mode 100644
index 000000000..49b44f775
--- /dev/null
+++ b/helix-term/src/events.rs
@@ -0,0 +1,20 @@
+use helix_event::{events, register_event};
+use helix_view::document::Mode;
+use helix_view::events::{DocumentDidChange, SelectionDidChange};
+
+use crate::commands;
+use crate::keymap::MappableCommand;
+
+events! {
+    OnModeSwitch<'a, 'cx> { old_mode: Mode, new_mode: Mode, cx: &'a mut commands::Context<'cx> }
+    PostInsertChar<'a, 'cx> { c: char, cx: &'a mut commands::Context<'cx> }
+    PostCommand<'a, 'cx> { command: & 'a MappableCommand, cx: &'a mut commands::Context<'cx> }
+}
+
+pub fn register() {
+    register_event::<OnModeSwitch>();
+    register_event::<PostInsertChar>();
+    register_event::<PostCommand>();
+    register_event::<DocumentDidChange>();
+    register_event::<SelectionDidChange>();
+}
diff --git a/helix-term/src/handlers.rs b/helix-term/src/handlers.rs
new file mode 100644
index 000000000..ab2d724ff
--- /dev/null
+++ b/helix-term/src/handlers.rs
@@ -0,0 +1,15 @@
+use std::sync::Arc;
+
+use arc_swap::ArcSwap;
+
+use crate::config::Config;
+use crate::events;
+
+
+    }
+pub fn setup(config: Arc<ArcSwap<Config>>) -> Handlers {
+    events::register();
+    let handlers = Handlers {
+    };
+    handlers
+}
diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
index 19f2521a5..72ed892dd 100644
--- a/helix-term/src/job.rs
+++ b/helix-term/src/job.rs
@@ -1,13 +1,37 @@
+use helix_event::status::StatusMessage;
+use helix_event::{runtime_local, send_blocking};
 use helix_view::Editor;
+use once_cell::sync::OnceCell;
 
 use crate::compositor::Compositor;
 
 use futures_util::future::{BoxFuture, Future, FutureExt};
 use futures_util::stream::{FuturesUnordered, StreamExt};
+use tokio::sync::mpsc::{channel, Receiver, Sender};
 
 pub type EditorCompositorCallback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>;
 pub type EditorCallback = Box<dyn FnOnce(&mut Editor) + Send>;
 
+runtime_local! {
+    static JOB_QUEUE: OnceCell<Sender<Callback>> = OnceCell::new();
+}
+
+pub async fn dispatch_callback(job: Callback) {
+    let _ = JOB_QUEUE.wait().send(job).await;
+}
+
+pub async fn dispatch(job: impl FnOnce(&mut Editor, &mut Compositor) + Send + 'static) {
+    let _ = JOB_QUEUE
+        .wait()
+        .send(Callback::EditorCompositor(Box::new(job)))
+        .await;
+}
+
+pub fn dispatch_blocking(job: impl FnOnce(&mut Editor, &mut Compositor) + Send + 'static) {
+    let jobs = JOB_QUEUE.wait();
+    send_blocking(jobs, Callback::EditorCompositor(Box::new(job)))
+}
+
 pub enum Callback {
     EditorCompositor(EditorCompositorCallback),
     Editor(EditorCallback),
@@ -21,11 +45,11 @@ pub struct Job {
     pub wait: bool,
 }
 
-#[derive(Default)]
 pub struct Jobs {
-    pub futures: FuturesUnordered<JobFuture>,
-    /// These are the ones that need to complete before we exit.
+    /// jobs that need to complete before we exit.
     pub wait_futures: FuturesUnordered<JobFuture>,
+    pub callbacks: Receiver<Callback>,
+    pub status_messages: Receiver<StatusMessage>,
 }
 
 impl Job {
@@ -52,8 +76,16 @@ impl Job {
 }
 
 impl Jobs {
+    #[allow(clippy::new_without_default)]
     pub fn new() -> Self {
-        Self::default()
+        let (tx, rx) = channel(1024);
+        let _ = JOB_QUEUE.set(tx);
+        let status_messages = helix_event::status::setup();
+        Self {
+            wait_futures: FuturesUnordered::new(),
+            callbacks: rx,
+            status_messages,
+        }
     }
 
     pub fn spawn<F: Future<Output = anyhow::Result<()>> + Send + 'static>(&mut self, f: F) {
@@ -85,18 +117,17 @@ impl Jobs {
         }
     }
 
-    pub async fn next_job(&mut self) -> Option<anyhow::Result<Option<Callback>>> {
-        tokio::select! {
-            event = self.futures.next() => {  event }
-            event = self.wait_futures.next() => { event }
-        }
-    }
-
     pub fn add(&self, j: Job) {
         if j.wait {
             self.wait_futures.push(j.future);
         } else {
-            self.futures.push(j.future);
+            tokio::spawn(async move {
+                match j.future.await {
+                    Ok(Some(cb)) => dispatch_callback(cb).await,
+                    Ok(None) => (),
+                    Err(err) => helix_event::status::report(err).await,
+                }
+            });
         }
     }
 
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index a1d603298..b1413ed0d 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -6,13 +6,17 @@ pub mod args;
 pub mod commands;
 pub mod compositor;
 pub mod config;
+pub mod events;
 pub mod health;
 pub mod job;
 pub mod keymap;
 pub mod ui;
+
 use std::path::Path;
 
 use futures_util::Future;
+mod handlers;
+
 use ignore::DirEntry;
 use url::Url;
 
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 24fcdb014..9f186d148 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -2,6 +2,7 @@ use crate::{
     commands::{self, OnKeyCallback},
     compositor::{Component, Context, Event, EventResult},
     job::{self, Callback},
+    events::{OnModeSwitch, PostCommand},
     key,
     keymap::{KeymapResult, Keymaps},
     ui::{
@@ -835,11 +836,18 @@ impl EditorView {
 
         let mut execute_command = |command: &commands::MappableCommand| {
             command.execute(cxt);
+            helix_event::dispatch(PostCommand { command, cx: cxt });
             let current_mode = cxt.editor.mode();
             match (last_mode, current_mode) {
                 (Mode::Normal, Mode::Insert) => {
                     // HAXX: if we just entered insert mode from normal, clear key buf
                     // and record the command that got us into this mode.
+            if current_mode != last_mode {
+                helix_event::dispatch(OnModeSwitch {
+                    old_mode: last_mode,
+                    new_mode: current_mode,
+                    cx: cxt,
+                });
 
                     // how we entered insert mode is important, and we should track that so
                     // we can repeat the side effect.
@@ -1004,7 +1012,7 @@ impl EditorView {
         }
 
         let area = completion.area(size, editor);
-        editor.last_completion = None;
+        editor.last_completion = Some(CompleteAction::Triggered);
         self.last_insert.1.push(InsertEvent::TriggerCompletion);
 
         // TODO : propagate required size on resize to completion too
@@ -1265,7 +1273,7 @@ impl Component for EditorView {
             editor: context.editor,
             count: None,
             register: None,
-            callback: None,
+            callback: Vec::new(),
             on_next_key_callback: None,
             jobs: context.jobs,
         };
@@ -1375,7 +1383,7 @@ impl Component for EditorView {
                 }
 
                 // appease borrowck
-                let callback = cx.callback.take();
+                let callbacks = take(&mut cx.callback);
 
                 // if the command consumed the last view, skip the render.
                 // on the next loop cycle the Application will then terminate.
@@ -1394,6 +1402,16 @@ impl Component for EditorView {
                 if mode != Mode::Insert {
                     doc.append_changes_to_history(view);
                 }
+                let callback = if callbacks.is_empty() {
+                    None
+                } else {
+                    let callback: crate::compositor::Callback = Box::new(move |compositor, cx| {
+                        for callback in callbacks {
+                            callback(compositor, cx)
+                        }
+                    });
+                    Some(callback)
+                };
 
                 EventResult::Consumed(callback)
             }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 6473c2d18..93b83da4f 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -36,6 +36,7 @@ use helix_core::{
 };
 
 use crate::editor::Config;
+use crate::events::{DocumentDidChange, SelectionDidChange};
 use crate::{DocumentId, Editor, Theme, View, ViewId};
 
 /// 8kB of buffer space for encoding and decoding `Rope`s.
@@ -1096,6 +1097,10 @@ impl Document {
         // TODO: use a transaction?
         self.selections
             .insert(view_id, selection.ensure_invariants(self.text().slice(..)));
+        helix_event::dispatch(SelectionDidChange {
+            doc: self,
+            view: view_id,
+        })
     }
 
     /// Find the origin selection of the text in a document, i.e. where
@@ -1149,6 +1154,14 @@ impl Document {
         let success = transaction.changes().apply(&mut self.text);
 
         if success {
+            if emit_lsp_notification {
+                helix_event::dispatch(DocumentDidChange {
+                    doc: self,
+                    view: view_id,
+                    old_text: &old_doc,
+                });
+            }
+
             for selection in self.selections.values_mut() {
                 *selection = selection
                     .clone()
@@ -1164,6 +1177,10 @@ impl Document {
                     view_id,
                     selection.clone().ensure_invariants(self.text.slice(..)),
                 );
+                helix_event::dispatch(SelectionDidChange {
+                    doc: self,
+                    view: view_id,
+                });
             }
 
             self.modified_since_accessed = true;
@@ -1276,6 +1293,7 @@ impl Document {
             }
 
             if emit_lsp_notification {
+                // TODO: move to hook
                 // emit lsp notification
                 for language_server in self.language_servers() {
                     let notify = language_server.text_document_did_change(
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 0ab4be8b2..44c706d7d 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -2,6 +2,7 @@ use crate::{
     align_view,
     document::{DocumentSavedEventFuture, DocumentSavedEventResult, Mode, SavePoint},
     graphics::{CursorKind, Rect},
+    handlers::Handlers,
     info::Info,
     input::KeyEvent,
     register::Registers,
@@ -960,6 +961,7 @@ pub struct Editor {
     /// field is set and any old requests are automatically
     /// canceled as a result
     pub completion_request_handle: Option<oneshot::Sender<()>>,
+    pub handlers: Handlers,
 }
 
 pub type Motion = Box<dyn Fn(&mut Editor)>;
diff --git a/helix-view/src/events.rs b/helix-view/src/events.rs
new file mode 100644
index 000000000..8b789cc0d
--- /dev/null
+++ b/helix-view/src/events.rs
@@ -0,0 +1,9 @@
+use helix_core::Rope;
+use helix_event::events;
+
+use crate::{Document, ViewId};
+
+events! {
+    DocumentDidChange<'a> { doc: &'a mut Document, view: ViewId, old_text: &'a Rope  }
+    SelectionDidChange<'a> { doc: &'a mut Document, view: ViewId }
+}
diff --git a/helix-view/src/handlers.rs b/helix-view/src/handlers.rs
new file mode 100644
index 000000000..ae3eb545a
--- /dev/null
+++ b/helix-view/src/handlers.rs
@@ -0,0 +1,12 @@
+use std::sync::Arc;
+
+use helix_event::send_blocking;
+use tokio::sync::mpsc::Sender;
+
+use crate::handlers::lsp::SignatureHelpInvoked;
+use crate::Editor;
+
+pub mod dap;
+pub mod lsp;
+
+pub struct Handlers {}
diff --git a/helix-view/src/handlers/lsp.rs b/helix-view/src/handlers/lsp.rs
index 8b1378917..958385646 100644
--- a/helix-view/src/handlers/lsp.rs
+++ b/helix-view/src/handlers/lsp.rs
@@ -1 +1,40 @@
+use crate::{DocumentId, ViewId};
 
+#[derive(Debug, Clone, Copy)]
+pub struct CompletionTrigger {
+    /// The char position of the primary cursor when the
+    /// completion was triggered
+    pub trigger_pos: usize,
+    pub doc: DocumentId,
+    pub view: ViewId,
+    /// Whether the cause of the trigger was an automatic completion (any word
+    /// char for words longer than minimum word length).
+    /// This is false for trigger chars send by the LS
+    pub auto: bool,
+}
+
+pub enum CompletionEvent {
+    /// Auto completion was triggered by typing a word char
+    /// or a completion trigger
+    Trigger(CompletionTrigger),
+    /// A completion was manually requested (c-x)
+    Manual,
+    /// Some text was deleted and the cursor is now at `pos`
+    DeleteText { pos: usize },
+    /// Invalidate the current auto completion trigger
+    Cancel,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum SignatureHelpInvoked {
+    Automatic,
+    Manual,
+}
+
+pub enum SignatureHelpEvent {
+    Invoked,
+    Trigger,
+    ReTrigger,
+    Cancel,
+    RequestComplete { open: bool },
+}
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 6a68e7d6f..82827b5d5 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -1,17 +1,15 @@
 #[macro_use]
 pub mod macros;
 
+pub mod base64;
 pub mod clipboard;
 pub mod document;
 pub mod editor;
 pub mod env;
+pub mod events;
 pub mod graphics;
 pub mod gutter;
-pub mod handlers {
-    pub mod dap;
-    pub mod lsp;
-}
-pub mod base64;
+pub mod handlers;
 pub mod info;
 pub mod input;
 pub mod keyboard;

From 8e592a151fe7adfbf3fb35ae134b7f2a70700f09 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascalkuthe@pm.me>
Date: Fri, 1 Dec 2023 00:03:27 +0100
Subject: [PATCH 645/967] refactor completion and signature help using hooks

---
 Cargo.lock                                |   1 +
 book/src/configuration.md                 |   3 +-
 helix-lsp/src/client.rs                   |  11 +-
 helix-stdx/Cargo.toml                     |   1 +
 helix-stdx/src/lib.rs                     |   1 +
 helix-stdx/src/rope.rs                    |  26 ++
 helix-term/src/application.rs             |   6 +-
 helix-term/src/commands.rs                | 259 +-----------
 helix-term/src/commands/lsp.rs            | 156 +-------
 helix-term/src/handlers.rs                |  17 +-
 helix-term/src/handlers/completion.rs     | 465 ++++++++++++++++++++++
 helix-term/src/handlers/signature_help.rs | 335 ++++++++++++++++
 helix-term/src/ui/completion.rs           |  87 ++--
 helix-term/src/ui/editor.rs               |  59 +--
 helix-term/src/ui/menu.rs                 |  34 +-
 helix-view/src/document.rs                |  14 -
 helix-view/src/editor.rs                  |  35 +-
 helix-view/src/handlers.rs                |  37 +-
 helix-view/src/handlers/lsp.rs            |  35 +-
 19 files changed, 1022 insertions(+), 560 deletions(-)
 create mode 100644 helix-stdx/src/rope.rs
 create mode 100644 helix-term/src/handlers/completion.rs
 create mode 100644 helix-term/src/handlers/signature_help.rs

diff --git a/Cargo.lock b/Cargo.lock
index 4969ef46b..96496125a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1165,6 +1165,7 @@ version = "23.10.0"
 dependencies = [
  "dunce",
  "etcetera",
+ "ropey",
  "tempfile",
 ]
 
diff --git a/book/src/configuration.md b/book/src/configuration.md
index 36e2fee2e..a43ede76a 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -51,7 +51,8 @@ Its settings will be merged with the configuration directory `config.toml` and t
 | `auto-completion` | Enable automatic pop up of auto-completion | `true` |
 | `auto-format` | Enable automatic formatting on save | `true` |
 | `auto-save` | Enable automatic saving on the focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal | `false` |
-| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `250` |
+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. | `250` |
+| `completion-timeout` | Time in milliseconds after typing a word character before completions are shown, set to 5 for instant.  | `250` |
 | `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |
 | `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
 | `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 1af27c1d4..7eef2bf7a 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -9,7 +9,7 @@ use helix_loader::{self, VERSION_AND_GIT_HASH};
 use helix_stdx::path;
 use lsp::{
     notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
-    DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, WorkspaceFolder,
+    DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, SignatureHelp, WorkspaceFolder,
     WorkspaceFoldersChangeEvent,
 };
 use lsp_types as lsp;
@@ -999,6 +999,7 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
+        context: lsp::CompletionContext,
     ) -> Option<impl Future<Output = Result<Value>>> {
         let capabilities = self.capabilities.get().unwrap();
 
@@ -1010,13 +1011,12 @@ impl Client {
                 text_document,
                 position,
             },
+            context: Some(context),
             // TODO: support these tokens by async receiving and updating the choice list
             work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
             partial_result_params: lsp::PartialResultParams {
                 partial_result_token: None,
             },
-            context: None,
-            // lsp::CompletionContext { trigger_kind: , trigger_character: Some(), }
         };
 
         Some(self.call::<lsp::request::Completion>(params))
@@ -1063,7 +1063,7 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> Option<impl Future<Output = Result<Value>>> {
+    ) -> Option<impl Future<Output = Result<Option<SignatureHelp>>>> {
         let capabilities = self.capabilities.get().unwrap();
 
         // Return early if the server does not support signature help.
@@ -1079,7 +1079,8 @@ impl Client {
             // lsp::SignatureHelpContext
         };
 
-        Some(self.call::<lsp::request::SignatureHelpRequest>(params))
+        let res = self.call::<lsp::request::SignatureHelpRequest>(params);
+        Some(async move { Ok(serde_json::from_value(res.await?)?) })
     }
 
     pub fn text_document_range_inlay_hints(
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index 216a3b407..9b4de9fef 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -14,6 +14,7 @@ homepage.workspace = true
 [dependencies]
 dunce = "1.0"
 etcetera = "0.8"
+ropey = { version = "1.6.1", default-features = false }
 
 [dev-dependencies]
 tempfile = "3.9"
diff --git a/helix-stdx/src/lib.rs b/helix-stdx/src/lib.rs
index ae3c3a981..68fe3ec37 100644
--- a/helix-stdx/src/lib.rs
+++ b/helix-stdx/src/lib.rs
@@ -1,2 +1,3 @@
 pub mod env;
 pub mod path;
+pub mod rope;
diff --git a/helix-stdx/src/rope.rs b/helix-stdx/src/rope.rs
new file mode 100644
index 000000000..4ee39d4a8
--- /dev/null
+++ b/helix-stdx/src/rope.rs
@@ -0,0 +1,26 @@
+use ropey::RopeSlice;
+
+pub trait RopeSliceExt: Sized {
+    fn ends_with(self, text: &str) -> bool;
+    fn starts_with(self, text: &str) -> bool;
+}
+
+impl RopeSliceExt for RopeSlice<'_> {
+    fn ends_with(self, text: &str) -> bool {
+        let len = self.len_bytes();
+        if len < text.len() {
+            return false;
+        }
+        self.get_byte_slice(len - text.len()..)
+            .map_or(false, |end| end == text)
+    }
+
+    fn starts_with(self, text: &str) -> bool {
+        let len = self.len_bytes();
+        if len < text.len() {
+            return false;
+        }
+        self.get_byte_slice(..len - text.len())
+            .map_or(false, |start| start == text)
+    }
+}
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 8215eeaa5..3f3e59c6a 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,10 +1,6 @@
 use arc_swap::{access::Map, ArcSwap};
 use futures_util::Stream;
-use helix_core::{
-    chars::char_is_word,
-    diagnostic::{DiagnosticTag, NumberOrString},
-    pos_at_coords, syntax, Selection,
-};
+use helix_core::{diagnostic::Severity, pos_at_coords, syntax, Selection};
 use helix_lsp::{
     lsp::{self, notification::Notification},
     util::lsp_range_to_range,
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 48ceb23ba..4df3278b8 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5,7 +5,6 @@ pub(crate) mod typed;
 pub use dap::*;
 use helix_vcs::Hunk;
 pub use lsp::*;
-use tokio::sync::oneshot;
 use tui::widgets::Row;
 pub use typed::*;
 
@@ -33,7 +32,7 @@ use helix_core::{
 };
 use helix_view::{
     document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
-    editor::{Action, CompleteAction},
+    editor::Action,
     info::Info,
     input::KeyEvent,
     keyboard::KeyCode,
@@ -52,14 +51,10 @@ use crate::{
     filter_picker_entry,
     job::Callback,
     keymap::ReverseKeymap,
-    ui::{
-        self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem, Picker,
-        Popup, Prompt, PromptEvent,
-    },
+    ui::{self, overlay::overlaid, Picker, Popup, Prompt, PromptEvent},
 };
 
 use crate::job::{self, Jobs};
-use futures_util::{stream::FuturesUnordered, TryStreamExt};
 use std::{
     collections::{HashMap, HashSet},
     fmt,
@@ -2593,7 +2588,6 @@ fn delete_by_selection_insert_mode(
         );
     }
     doc.apply(&transaction, view.id);
-    lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
 }
 
 fn delete_selection(cx: &mut Context) {
@@ -2667,10 +2661,6 @@ fn insert_mode(cx: &mut Context) {
         .transform(|range| Range::new(range.to(), range.from()));
 
     doc.set_selection(view.id, selection);
-
-    // [TODO] temporary workaround until we're not using the idle timer to
-    //        trigger auto completions any more
-    cx.editor.clear_idle_timer();
 }
 
 // inserts at the end of each selection
@@ -3497,9 +3487,9 @@ fn hunk_range(hunk: Hunk, text: RopeSlice) -> Range {
 
 pub mod insert {
     use crate::events::PostInsertChar;
+
     use super::*;
     pub type Hook = fn(&Rope, &Selection, char) -> Option<Transaction>;
-    pub type PostHook = fn(&mut Context, char);
 
     /// Exclude the cursor in range.
     fn exclude_cursor(text: RopeSlice, range: Range, cursor: Range) -> Range {
@@ -3513,88 +3503,6 @@ pub mod insert {
         }
     }
 
-    // It trigger completion when idle timer reaches deadline
-    // Only trigger completion if the word under cursor is longer than n characters
-    pub fn idle_completion(cx: &mut Context) {
-        let config = cx.editor.config();
-        let (view, doc) = current!(cx.editor);
-        let text = doc.text().slice(..);
-        let cursor = doc.selection(view.id).primary().cursor(text);
-
-        use helix_core::chars::char_is_word;
-        let mut iter = text.chars_at(cursor);
-        iter.reverse();
-        for _ in 0..config.completion_trigger_len {
-            match iter.next() {
-                Some(c) if char_is_word(c) => {}
-                _ => return,
-            }
-        }
-        super::completion(cx);
-    }
-
-    fn language_server_completion(cx: &mut Context, ch: char) {
-        let config = cx.editor.config();
-        if !config.auto_completion {
-            return;
-        }
-
-        use helix_lsp::lsp;
-        // if ch matches completion char, trigger completion
-        let doc = doc_mut!(cx.editor);
-        let trigger_completion = doc
-            .language_servers_with_feature(LanguageServerFeature::Completion)
-            .any(|ls| {
-                // TODO: what if trigger is multiple chars long
-                matches!(&ls.capabilities().completion_provider, Some(lsp::CompletionOptions {
-                    trigger_characters: Some(triggers),
-                    ..
-                }) if triggers.iter().any(|trigger| trigger.contains(ch)))
-            });
-
-        if trigger_completion {
-            cx.editor.clear_idle_timer();
-            super::completion(cx);
-        }
-    }
-
-    fn signature_help(cx: &mut Context, ch: char) {
-        use helix_lsp::lsp;
-        // if ch matches signature_help char, trigger
-        let doc = doc_mut!(cx.editor);
-        // TODO support multiple language servers (not just the first that is found), likely by merging UI somehow
-        let Some(language_server) = doc
-            .language_servers_with_feature(LanguageServerFeature::SignatureHelp)
-            .next()
-        else {
-            return;
-        };
-
-        let capabilities = language_server.capabilities();
-
-        if let lsp::ServerCapabilities {
-            signature_help_provider:
-                Some(lsp::SignatureHelpOptions {
-                    trigger_characters: Some(triggers),
-                    // TODO: retrigger_characters
-                    ..
-                }),
-            ..
-        } = capabilities
-        {
-            // TODO: what if trigger is multiple chars long
-            let is_trigger = triggers.iter().any(|trigger| trigger.contains(ch));
-            // lsp doesn't tell us when to close the signature help, so we request
-            // the help information again after common close triggers which should
-            // return None, which in turn closes the popup.
-            let close_triggers = &[')', ';', '.'];
-
-            if is_trigger || close_triggers.contains(&ch) {
-                super::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
-            }
-        }
-    }
-
     // The default insert hook: simply insert the character
     #[allow(clippy::unnecessary_wraps)] // need to use Option<> because of the Hook signature
     fn insert(doc: &Rope, selection: &Selection, ch: char) -> Option<Transaction> {
@@ -3624,12 +3532,6 @@ pub mod insert {
             doc.apply(&t, view.id);
         }
 
-        // TODO: need a post insert hook too for certain triggers (autocomplete, signature help, etc)
-        // this could also generically look at Transaction, but it's a bit annoying to look at
-        // Operation instead of Change.
-        for hook in &[language_server_completion, signature_help] {
-            hook(cx, c);
-        }
         helix_event::dispatch(PostInsertChar { c, cx });
     }
 
@@ -3855,8 +3757,6 @@ pub mod insert {
             });
         let (view, doc) = current!(cx.editor);
         doc.apply(&transaction, view.id);
-
-        lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
     }
 
     pub fn delete_char_forward(cx: &mut Context) {
@@ -4510,151 +4410,14 @@ fn remove_primary_selection(cx: &mut Context) {
 }
 
 pub fn completion(cx: &mut Context) {
-    use helix_lsp::{lsp, util::pos_to_lsp_pos};
-
     let (view, doc) = current!(cx.editor);
+    let range = doc.selection(view.id).primary();
+    let text = doc.text().slice(..);
+    let cursor = range.cursor(text);
 
-    let savepoint = if let Some(CompleteAction::Selected { savepoint }) = &cx.editor.last_completion
-    {
-        savepoint.clone()
-    } else {
-        doc.savepoint(view)
-    };
-
-    let text = savepoint.text.clone();
-    let cursor = savepoint.cursor();
-
-    let mut seen_language_servers = HashSet::new();
-
-    let mut futures: FuturesUnordered<_> = doc
-        .language_servers_with_feature(LanguageServerFeature::Completion)
-        .filter(|ls| seen_language_servers.insert(ls.id()))
-        .map(|language_server| {
-            let language_server_id = language_server.id();
-            let offset_encoding = language_server.offset_encoding();
-            let pos = pos_to_lsp_pos(&text, cursor, offset_encoding);
-            let doc_id = doc.identifier();
-            let completion_request = language_server.completion(doc_id, pos, None).unwrap();
-
-            async move {
-                let json = completion_request.await?;
-                let response: Option<lsp::CompletionResponse> = serde_json::from_value(json)?;
-
-                let items = match response {
-                    Some(lsp::CompletionResponse::Array(items)) => items,
-                    // TODO: do something with is_incomplete
-                    Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                        is_incomplete: _is_incomplete,
-                        items,
-                    })) => items,
-                    None => Vec::new(),
-                }
-                .into_iter()
-                .map(|item| CompletionItem {
-                    item,
-                    language_server_id,
-                    resolved: false,
-                })
-                .collect();
-
-                anyhow::Ok(items)
-            }
-        })
-        .collect();
-
-    // setup a channel that allows the request to be canceled
-    let (tx, rx) = oneshot::channel();
-    // set completion_request so that this request can be canceled
-    // by setting completion_request, the old channel stored there is dropped
-    // and the associated request is automatically dropped
-    cx.editor.completion_request_handle = Some(tx);
-    let future = async move {
-        let items_future = async move {
-            let mut items = Vec::new();
-            // TODO if one completion request errors, all other completion requests are discarded (even if they're valid)
-            while let Some(mut lsp_items) = futures.try_next().await? {
-                items.append(&mut lsp_items);
-            }
-            anyhow::Ok(items)
-        };
-        tokio::select! {
-            biased;
-            _ = rx => {
-                Ok(Vec::new())
-            }
-            res = items_future => {
-                res
-            }
-        }
-    };
-
-    let trigger_offset = cursor;
-
-    // TODO: trigger_offset should be the cursor offset but we also need a starting offset from where we want to apply
-    // completion filtering. For example logger.te| should filter the initial suggestion list with "te".
-
-    use helix_core::chars;
-    let mut iter = text.chars_at(cursor);
-    iter.reverse();
-    let offset = iter.take_while(|ch| chars::char_is_word(*ch)).count();
-    let start_offset = cursor.saturating_sub(offset);
-
-    let trigger_doc = doc.id();
-    let trigger_view = view.id;
-
-    // FIXME: The commands Context can only have a single callback
-    // which means it gets overwritten when executing keybindings
-    // with multiple commands or macros. This would mean that completion
-    // might be incorrectly applied when repeating the insertmode action
-    //
-    // TODO: to solve this either make cx.callback a Vec of callbacks or
-    // alternatively move `last_insert` to `helix_view::Editor`
-    cx.callback = Some(Box::new(
-        move |compositor: &mut Compositor, _cx: &mut compositor::Context| {
-            let ui = compositor.find::<ui::EditorView>().unwrap();
-            ui.last_insert.1.push(InsertEvent::RequestCompletion);
-        },
-    ));
-
-    cx.jobs.callback(async move {
-        let items = future.await?;
-        let call = move |editor: &mut Editor, compositor: &mut Compositor| {
-            let (view, doc) = current_ref!(editor);
-            // check if the completion request is stale.
-            //
-            // Completions are completed asynchronously and therefore the user could
-            //switch document/view or leave insert mode. In all of thoise cases the
-            // completion should be discarded
-            if editor.mode != Mode::Insert || view.id != trigger_view || doc.id() != trigger_doc {
-                return;
-            }
-
-            if items.is_empty() {
-                // editor.set_error("No completion available");
-                return;
-            }
-            let size = compositor.size();
-            let ui = compositor.find::<ui::EditorView>().unwrap();
-            let completion_area = ui.set_completion(
-                editor,
-                savepoint,
-                items,
-                start_offset,
-                trigger_offset,
-                size,
-            );
-            let size = compositor.size();
-            let signature_help_area = compositor
-                .find_id::<Popup<SignatureHelp>>(SignatureHelp::ID)
-                .map(|signature_help| signature_help.area(size, editor));
-            // Delete the signature help popup if they intersect.
-            if matches!((completion_area, signature_help_area),(Some(a), Some(b)) if a.intersects(b))
-            {
-                compositor.remove(SignatureHelp::ID);
-            }
-        };
-        Ok(Callback::EditorCompositor(Box::new(call)))
-    });
+    cx.editor
+        .handlers
+        .trigger_completions(cursor, doc.id(), view.id);
 }
 
 // comments
@@ -4833,10 +4596,6 @@ fn move_node_bound_impl(cx: &mut Context, dir: Direction, movement: Movement) {
             );
 
             doc.set_selection(view.id, selection);
-
-            // [TODO] temporary workaround until we're not using the idle timer to
-            //        trigger auto completions any more
-            editor.clear_idle_timer();
         }
     };
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 051cdcd35..de2f0e5ec 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1,4 +1,4 @@
-use futures_util::{future::BoxFuture, stream::FuturesUnordered, FutureExt};
+use futures_util::{stream::FuturesUnordered, FutureExt};
 use helix_lsp::{
     block_on,
     lsp::{
@@ -8,21 +8,21 @@ use helix_lsp::{
     util::{diagnostic_to_lsp_diagnostic, lsp_range_to_range, range_to_lsp_range},
     Client, OffsetEncoding,
 };
-use serde_json::Value;
 use tokio_stream::StreamExt;
 use tui::{
     text::{Span, Spans},
     widgets::Row,
 };
 
-use super::{align_view, push_jump, Align, Context, Editor, Open};
+use super::{align_view, push_jump, Align, Context, Editor};
 
 use helix_core::{syntax::LanguageServerFeature, text_annotations::InlineAnnotation, Selection};
 use helix_stdx::path;
 use helix_view::{
-    document::{DocumentInlayHints, DocumentInlayHintsId, Mode},
+    document::{DocumentInlayHints, DocumentInlayHintsId},
     editor::Action,
     graphics::Margin,
+    handlers::lsp::SignatureHelpInvoked,
     theme::Style,
     Document, View,
 };
@@ -30,10 +30,7 @@ use helix_view::{
 use crate::{
     compositor::{self, Compositor},
     job::Callback,
-    ui::{
-        self, lsp::SignatureHelp, overlay::overlaid, DynamicPicker, FileLocation, Picker, Popup,
-        PromptEvent,
-    },
+    ui::{self, overlay::overlaid, DynamicPicker, FileLocation, Picker, Popup, PromptEvent},
 };
 
 use std::{
@@ -42,7 +39,6 @@ use std::{
     fmt::Write,
     future::Future,
     path::PathBuf,
-    sync::Arc,
 };
 
 /// Gets the first language server that is attached to a document which supports a specific feature.
@@ -1132,146 +1128,10 @@ pub fn goto_reference(cx: &mut Context) {
     );
 }
 
-#[derive(PartialEq, Eq, Clone, Copy)]
-pub enum SignatureHelpInvoked {
-    Manual,
-    Automatic,
-}
-
 pub fn signature_help(cx: &mut Context) {
-    signature_help_impl(cx, SignatureHelpInvoked::Manual)
-}
-
-pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
-    let (view, doc) = current!(cx.editor);
-
-    // TODO merge multiple language server signature help into one instead of just taking the first language server that supports it
-    let future = doc
-        .language_servers_with_feature(LanguageServerFeature::SignatureHelp)
-        .find_map(|language_server| {
-            let pos = doc.position(view.id, language_server.offset_encoding());
-            language_server.text_document_signature_help(doc.identifier(), pos, None)
-        });
-
-    let Some(future) = future else {
-        // Do not show the message if signature help was invoked
-        // automatically on backspace, trigger characters, etc.
-        if invoked == SignatureHelpInvoked::Manual {
-            cx.editor
-                .set_error("No configured language server supports signature-help");
-        }
-        return;
-    };
-    signature_help_impl_with_future(cx, future.boxed(), invoked);
-}
-
-pub fn signature_help_impl_with_future(
-    cx: &mut Context,
-    future: BoxFuture<'static, helix_lsp::Result<Value>>,
-    invoked: SignatureHelpInvoked,
-) {
-    cx.callback(
-        future,
-        move |editor, compositor, response: Option<lsp::SignatureHelp>| {
-            let config = &editor.config();
-
-            if !(config.lsp.auto_signature_help
-                || SignatureHelp::visible_popup(compositor).is_some()
-                || invoked == SignatureHelpInvoked::Manual)
-            {
-                return;
-            }
-
-            // If the signature help invocation is automatic, don't show it outside of Insert Mode:
-            // it very probably means the server was a little slow to respond and the user has
-            // already moved on to something else, making a signature help popup will just be an
-            // annoyance, see https://github.com/helix-editor/helix/issues/3112
-            if invoked == SignatureHelpInvoked::Automatic && editor.mode != Mode::Insert {
-                return;
-            }
-
-            let response = match response {
-                // According to the spec the response should be None if there
-                // are no signatures, but some servers don't follow this.
-                Some(s) if !s.signatures.is_empty() => s,
-                _ => {
-                    compositor.remove(SignatureHelp::ID);
-                    return;
-                }
-            };
-            let doc = doc!(editor);
-            let language = doc.language_name().unwrap_or("");
-
-            let signature = match response
-                .signatures
-                .get(response.active_signature.unwrap_or(0) as usize)
-            {
-                Some(s) => s,
-                None => return,
-            };
-            let mut contents = SignatureHelp::new(
-                signature.label.clone(),
-                language.to_string(),
-                Arc::clone(&editor.syn_loader),
-            );
-
-            let signature_doc = if config.lsp.display_signature_help_docs {
-                signature.documentation.as_ref().map(|doc| match doc {
-                    lsp::Documentation::String(s) => s.clone(),
-                    lsp::Documentation::MarkupContent(markup) => markup.value.clone(),
-                })
-            } else {
-                None
-            };
-
-            contents.set_signature_doc(signature_doc);
-
-            let active_param_range = || -> Option<(usize, usize)> {
-                let param_idx = signature
-                    .active_parameter
-                    .or(response.active_parameter)
-                    .unwrap_or(0) as usize;
-                let param = signature.parameters.as_ref()?.get(param_idx)?;
-                match &param.label {
-                    lsp::ParameterLabel::Simple(string) => {
-                        let start = signature.label.find(string.as_str())?;
-                        Some((start, start + string.len()))
-                    }
-                    lsp::ParameterLabel::LabelOffsets([start, end]) => {
-                        // LS sends offsets based on utf-16 based string representation
-                        // but highlighting in helix is done using byte offset.
-                        use helix_core::str_utils::char_to_byte_idx;
-                        let from = char_to_byte_idx(&signature.label, *start as usize);
-                        let to = char_to_byte_idx(&signature.label, *end as usize);
-                        Some((from, to))
-                    }
-                }
-            };
-            contents.set_active_param_range(active_param_range());
-
-            let old_popup = compositor.find_id::<Popup<SignatureHelp>>(SignatureHelp::ID);
-            let mut popup = Popup::new(SignatureHelp::ID, contents)
-                .position(old_popup.and_then(|p| p.get_position()))
-                .position_bias(Open::Above)
-                .ignore_escape_key(true);
-
-            // Don't create a popup if it intersects the auto-complete menu.
-            let size = compositor.size();
-            if compositor
-                .find::<ui::EditorView>()
-                .unwrap()
-                .completion
-                .as_mut()
-                .map(|completion| completion.area(size, editor))
-                .filter(|area| area.intersects(popup.area(size, editor)))
-                .is_some()
-            {
-                return;
-            }
-
-            compositor.replace_or_push(SignatureHelp::ID, popup);
-        },
-    );
+    cx.editor
+        .handlers
+        .trigger_signature_help(SignatureHelpInvoked::Manual, cx.editor)
 }
 
 pub fn hover(cx: &mut Context) {
diff --git a/helix-term/src/handlers.rs b/helix-term/src/handlers.rs
index ab2d724ff..ef5369f85 100644
--- a/helix-term/src/handlers.rs
+++ b/helix-term/src/handlers.rs
@@ -1,15 +1,30 @@
 use std::sync::Arc;
 
 use arc_swap::ArcSwap;
+use helix_event::AsyncHook;
 
 use crate::config::Config;
 use crate::events;
+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;
+mod signature_help;
 
-    }
 pub fn setup(config: Arc<ArcSwap<Config>>) -> Handlers {
     events::register();
+
+    let completions = CompletionHandler::new(config).spawn();
+    let signature_hints = SignatureHelpHandler::new().spawn();
     let handlers = Handlers {
+        completions,
+        signature_hints,
     };
+    completion::register_hooks(&handlers);
+    signature_help::register_hooks(&handlers);
     handlers
 }
diff --git a/helix-term/src/handlers/completion.rs b/helix-term/src/handlers/completion.rs
new file mode 100644
index 000000000..d71fd24fc
--- /dev/null
+++ b/helix-term/src/handlers/completion.rs
@@ -0,0 +1,465 @@
+use std::collections::HashSet;
+use std::sync::Arc;
+use std::time::Duration;
+
+use arc_swap::ArcSwap;
+use futures_util::stream::FuturesUnordered;
+use helix_core::chars::char_is_word;
+use helix_core::syntax::LanguageServerFeature;
+use helix_event::{
+    cancelable_future, cancelation, register_hook, send_blocking, CancelRx, CancelTx,
+};
+use helix_lsp::lsp;
+use helix_lsp::util::pos_to_lsp_pos;
+use helix_stdx::rope::RopeSliceExt;
+use helix_view::document::{Mode, SavePoint};
+use helix_view::handlers::lsp::CompletionEvent;
+use helix_view::{DocumentId, Editor, ViewId};
+use tokio::sync::mpsc::Sender;
+use tokio::time::Instant;
+use tokio_stream::StreamExt;
+
+use crate::commands;
+use crate::compositor::Compositor;
+use crate::config::Config;
+use crate::events::{OnModeSwitch, PostCommand, PostInsertChar};
+use crate::job::{dispatch, dispatch_blocking};
+use crate::keymap::MappableCommand;
+use crate::ui::editor::InsertEvent;
+use crate::ui::lsp::SignatureHelp;
+use crate::ui::{self, CompletionItem, Popup};
+
+use super::Handlers;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+enum TriggerKind {
+    Auto,
+    TriggerChar,
+    Manual,
+}
+
+#[derive(Debug, Clone, Copy)]
+struct Trigger {
+    pos: usize,
+    view: ViewId,
+    doc: DocumentId,
+    kind: TriggerKind,
+}
+
+#[derive(Debug)]
+pub(super) struct CompletionHandler {
+    /// currently active trigger which will cause a
+    /// completion request after the timeout
+    trigger: Option<Trigger>,
+    /// A handle for currently active completion request.
+    /// This can be used to determine whether the current
+    /// request is still active (and new triggers should be
+    /// ignored) and can also be used to abort the current
+    /// request (by dropping the handle)
+    request: Option<CancelTx>,
+    config: Arc<ArcSwap<Config>>,
+}
+
+impl CompletionHandler {
+    pub fn new(config: Arc<ArcSwap<Config>>) -> CompletionHandler {
+        Self {
+            config,
+            request: None,
+            trigger: None,
+        }
+    }
+}
+
+impl helix_event::AsyncHook for CompletionHandler {
+    type Event = CompletionEvent;
+
+    fn handle_event(
+        &mut self,
+        event: Self::Event,
+        _old_timeout: Option<Instant>,
+    ) -> Option<Instant> {
+        match event {
+            CompletionEvent::AutoTrigger {
+                cursor: trigger_pos,
+                doc,
+                view,
+            } => {
+                // techically it shouldn't be possible to switch views/documents in insert mode
+                // but people may create weird keymaps/use the mouse so lets be extra careful
+                if self
+                    .trigger
+                    .as_ref()
+                    .map_or(true, |trigger| trigger.doc != doc || trigger.view != view)
+                {
+                    self.trigger = Some(Trigger {
+                        pos: trigger_pos,
+                        view,
+                        doc,
+                        kind: TriggerKind::Auto,
+                    });
+                }
+            }
+            CompletionEvent::TriggerChar { cursor, doc, view } => {
+                // immediately request completions and drop all auto completion requests
+                self.request = None;
+                self.trigger = Some(Trigger {
+                    pos: cursor,
+                    view,
+                    doc,
+                    kind: TriggerKind::TriggerChar,
+                });
+            }
+            CompletionEvent::ManualTrigger { cursor, doc, view } => {
+                // immediately request completions and drop all auto completion requests
+                self.request = None;
+                self.trigger = Some(Trigger {
+                    pos: cursor,
+                    view,
+                    doc,
+                    kind: TriggerKind::Manual,
+                });
+                // stop debouncing immediately and request the completion
+                self.finish_debounce();
+                return None;
+            }
+            CompletionEvent::Cancel => {
+                self.trigger = None;
+                self.request = None;
+            }
+            CompletionEvent::DeleteText { cursor } => {
+                // if we deleted the original trigger, abort the completion
+                if matches!(self.trigger, Some(Trigger{ pos, .. }) if cursor < pos) {
+                    self.trigger = None;
+                    self.request = None;
+                }
+            }
+        }
+        self.trigger.map(|trigger| {
+            // if the current request was closed forget about it
+            // otherwise immediately restart the completion request
+            let cancel = self.request.take().map_or(false, |req| !req.is_closed());
+            let timeout = if trigger.kind == TriggerKind::Auto && !cancel {
+                self.config.load().editor.completion_timeout
+            } else {
+                // we want almost instant completions for trigger chars
+                // and restarting completion requests. The small timeout here mainly
+                // serves to better handle cases where the completion handler
+                // may fall behind (so multiple events in the channel) and macros
+                Duration::from_millis(5)
+            };
+            Instant::now() + timeout
+        })
+    }
+
+    fn finish_debounce(&mut self) {
+        let trigger = self.trigger.take().expect("debounce always has a trigger");
+        let (tx, rx) = cancelation();
+        self.request = Some(tx);
+        dispatch_blocking(move |editor, compositor| {
+            request_completion(trigger, rx, editor, compositor)
+        });
+    }
+}
+
+fn request_completion(
+    mut trigger: Trigger,
+    cancel: CancelRx,
+    editor: &mut Editor,
+    compositor: &mut Compositor,
+) {
+    let (view, doc) = current!(editor);
+
+    if compositor
+        .find::<ui::EditorView>()
+        .unwrap()
+        .completion
+        .is_some()
+        || editor.mode != Mode::Insert
+    {
+        return;
+    }
+
+    let text = doc.text();
+    let cursor = doc.selection(view.id).primary().cursor(text.slice(..));
+    if trigger.view != view.id || trigger.doc != doc.id() || cursor < trigger.pos {
+        return;
+    }
+    // this looks odd... Why are we not using the trigger position from
+    // the `trigger` here? Won't that mean that the trigger char doesn't get
+    // send to the LS if we type fast enougn? Yes that is true but it's
+    // not actually a problem. The LSP will resolve the completion to the identifier
+    // anyway (in fact sending the later position is necessary to get the right results
+    // from LSPs that provide incomplete completion list). We rely on trigger offset
+    // and primary cursor matching for multi-cursor completions so this is definitely
+    // necessary from our side too.
+    trigger.pos = cursor;
+    let trigger_text = text.slice(..cursor);
+
+    let mut seen_language_servers = HashSet::new();
+    let mut futures: FuturesUnordered<_> = doc
+        .language_servers_with_feature(LanguageServerFeature::Completion)
+        .filter(|ls| seen_language_servers.insert(ls.id()))
+        .map(|ls| {
+            let language_server_id = ls.id();
+            let offset_encoding = ls.offset_encoding();
+            let pos = pos_to_lsp_pos(text, cursor, offset_encoding);
+            let doc_id = doc.identifier();
+            let context = if trigger.kind == TriggerKind::Manual {
+                lsp::CompletionContext {
+                    trigger_kind: lsp::CompletionTriggerKind::INVOKED,
+                    trigger_character: None,
+                }
+            } else {
+                let trigger_char =
+                    ls.capabilities()
+                        .completion_provider
+                        .as_ref()
+                        .and_then(|provider| {
+                            provider
+                                .trigger_characters
+                                .as_deref()?
+                                .iter()
+                                .find(|&trigger| trigger_text.ends_with(trigger))
+                        });
+                lsp::CompletionContext {
+                    trigger_kind: lsp::CompletionTriggerKind::TRIGGER_CHARACTER,
+                    trigger_character: trigger_char.cloned(),
+                }
+            };
+
+            let completion_response = ls.completion(doc_id, pos, None, context).unwrap();
+            async move {
+                let json = completion_response.await?;
+                let response: Option<lsp::CompletionResponse> = serde_json::from_value(json)?;
+                let items = match response {
+                    Some(lsp::CompletionResponse::Array(items)) => items,
+                    // TODO: do something with is_incomplete
+                    Some(lsp::CompletionResponse::List(lsp::CompletionList {
+                        is_incomplete: _is_incomplete,
+                        items,
+                    })) => items,
+                    None => Vec::new(),
+                }
+                .into_iter()
+                .map(|item| CompletionItem {
+                    item,
+                    language_server_id,
+                    resolved: false,
+                })
+                .collect();
+                anyhow::Ok(items)
+            }
+        })
+        .collect();
+
+    let future = async move {
+        let mut items = Vec::new();
+        while let Some(lsp_items) = futures.next().await {
+            match lsp_items {
+                Ok(mut lsp_items) => items.append(&mut lsp_items),
+                Err(err) => {
+                    log::debug!("completion request failed: {err:?}");
+                }
+            };
+        }
+        items
+    };
+
+    let savepoint = doc.savepoint(view);
+
+    let ui = compositor.find::<ui::EditorView>().unwrap();
+    ui.last_insert.1.push(InsertEvent::RequestCompletion);
+    tokio::spawn(async move {
+        let items = cancelable_future(future, cancel).await.unwrap_or_default();
+        if items.is_empty() {
+            return;
+        }
+        dispatch(move |editor, compositor| {
+            show_completion(editor, compositor, items, trigger, savepoint)
+        })
+        .await
+    });
+}
+
+fn show_completion(
+    editor: &mut Editor,
+    compositor: &mut Compositor,
+    items: Vec<CompletionItem>,
+    trigger: Trigger,
+    savepoint: Arc<SavePoint>,
+) {
+    let (view, doc) = current_ref!(editor);
+    // check if the completion request is stale.
+    //
+    // Completions are completed asynchronously and therefore the user could
+    //switch document/view or leave insert mode. In all of thoise cases the
+    // completion should be discarded
+    if editor.mode != Mode::Insert || view.id != trigger.view || doc.id() != trigger.doc {
+        return;
+    }
+
+    let size = compositor.size();
+    let ui = compositor.find::<ui::EditorView>().unwrap();
+    if ui.completion.is_some() {
+        return;
+    }
+
+    let completion_area = ui.set_completion(editor, savepoint, items, trigger.pos, size);
+    let signature_help_area = compositor
+        .find_id::<Popup<SignatureHelp>>(SignatureHelp::ID)
+        .map(|signature_help| signature_help.area(size, editor));
+    // Delete the signature help popup if they intersect.
+    if matches!((completion_area, signature_help_area),(Some(a), Some(b)) if a.intersects(b)) {
+        compositor.remove(SignatureHelp::ID);
+    }
+}
+
+pub fn trigger_auto_completion(
+    tx: &Sender<CompletionEvent>,
+    editor: &Editor,
+    trigger_char_only: bool,
+) {
+    let config = editor.config.load();
+    if !config.auto_completion {
+        return;
+    }
+    let (view, doc): (&helix_view::View, &helix_view::Document) = current_ref!(editor);
+    let mut text = doc.text().slice(..);
+    let cursor = doc.selection(view.id).primary().cursor(text);
+    text = doc.text().slice(..cursor);
+
+    let is_trigger_char = doc
+        .language_servers_with_feature(LanguageServerFeature::Completion)
+        .any(|ls| {
+            matches!(&ls.capabilities().completion_provider, Some(lsp::CompletionOptions {
+                        trigger_characters: Some(triggers),
+                        ..
+                    }) if triggers.iter().any(|trigger| text.ends_with(trigger)))
+        });
+    if is_trigger_char {
+        send_blocking(
+            tx,
+            CompletionEvent::TriggerChar {
+                cursor,
+                doc: doc.id(),
+                view: view.id,
+            },
+        );
+        return;
+    }
+
+    let is_auto_trigger = !trigger_char_only
+        && doc
+            .text()
+            .chars_at(cursor)
+            .reversed()
+            .take(config.completion_trigger_len as usize)
+            .all(char_is_word);
+
+    if is_auto_trigger {
+        send_blocking(
+            tx,
+            CompletionEvent::AutoTrigger {
+                cursor,
+                doc: doc.id(),
+                view: view.id,
+            },
+        );
+    }
+}
+
+fn update_completions(cx: &mut commands::Context, c: Option<char>) {
+    cx.callback.push(Box::new(move |compositor, cx| {
+        let editor_view = compositor.find::<ui::EditorView>().unwrap();
+        if let Some(completion) = &mut editor_view.completion {
+            completion.update_filter(c);
+            if completion.is_empty() {
+                editor_view.clear_completion(cx.editor);
+                // clearing completions might mean we want to immediately rerequest them (usually
+                // this occurs if typing a trigger char)
+                if c.is_some() {
+                    trigger_auto_completion(&cx.editor.handlers.completions, cx.editor, false);
+                }
+            }
+        }
+    }))
+}
+
+fn clear_completions(cx: &mut commands::Context) {
+    cx.callback.push(Box::new(|compositor, cx| {
+        let editor_view = compositor.find::<ui::EditorView>().unwrap();
+        editor_view.clear_completion(cx.editor);
+    }))
+}
+
+fn completion_post_command_hook(
+    tx: &Sender<CompletionEvent>,
+    PostCommand { command, cx }: &mut PostCommand<'_, '_>,
+) -> anyhow::Result<()> {
+    if cx.editor.mode == Mode::Insert {
+        if cx.editor.last_completion.is_some() {
+            match command {
+                MappableCommand::Static {
+                    name: "delete_word_forward" | "delete_char_forward" | "completion",
+                    ..
+                } => (),
+                MappableCommand::Static {
+                    name: "delete_char_backward",
+                    ..
+                } => update_completions(cx, None),
+                _ => clear_completions(cx),
+            }
+        } else {
+            let event = match command {
+                MappableCommand::Static {
+                    name: "delete_char_backward" | "delete_word_forward" | "delete_char_forward",
+                    ..
+                } => {
+                    let (view, doc) = current!(cx.editor);
+                    let primary_cursor = doc
+                        .selection(view.id)
+                        .primary()
+                        .cursor(doc.text().slice(..));
+                    CompletionEvent::DeleteText {
+                        cursor: primary_cursor,
+                    }
+                }
+                // hacks: some commands are handeled elsewhere and we don't want to
+                // cancel in that case
+                MappableCommand::Static {
+                    name: "completion" | "insert_mode" | "append_mode",
+                    ..
+                } => return Ok(()),
+                _ => CompletionEvent::Cancel,
+            };
+            send_blocking(tx, event);
+        }
+    }
+    Ok(())
+}
+
+pub(super) fn register_hooks(handlers: &Handlers) {
+    let tx = handlers.completions.clone();
+    register_hook!(move |event: &mut PostCommand<'_, '_>| completion_post_command_hook(&tx, event));
+
+    let tx = handlers.completions.clone();
+    register_hook!(move |event: &mut OnModeSwitch<'_, '_>| {
+        if event.old_mode == Mode::Insert {
+            send_blocking(&tx, CompletionEvent::Cancel);
+            clear_completions(event.cx);
+        } else if event.new_mode == Mode::Insert {
+            trigger_auto_completion(&tx, event.cx.editor, false)
+        }
+        Ok(())
+    });
+
+    let tx = handlers.completions.clone();
+    register_hook!(move |event: &mut PostInsertChar<'_, '_>| {
+        if event.cx.editor.last_completion.is_some() {
+            update_completions(event.cx, Some(event.c))
+        } else {
+            trigger_auto_completion(&tx, event.cx.editor, false);
+        }
+        Ok(())
+    });
+}
diff --git a/helix-term/src/handlers/signature_help.rs b/helix-term/src/handlers/signature_help.rs
new file mode 100644
index 000000000..3c746548a
--- /dev/null
+++ b/helix-term/src/handlers/signature_help.rs
@@ -0,0 +1,335 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use helix_core::syntax::LanguageServerFeature;
+use helix_event::{
+    cancelable_future, cancelation, register_hook, send_blocking, CancelRx, CancelTx,
+};
+use helix_lsp::lsp;
+use helix_stdx::rope::RopeSliceExt;
+use helix_view::document::Mode;
+use helix_view::events::{DocumentDidChange, SelectionDidChange};
+use helix_view::handlers::lsp::{SignatureHelpEvent, SignatureHelpInvoked};
+use helix_view::Editor;
+use tokio::sync::mpsc::Sender;
+use tokio::time::Instant;
+
+use crate::commands::Open;
+use crate::compositor::Compositor;
+use crate::events::{OnModeSwitch, PostInsertChar};
+use crate::handlers::Handlers;
+use crate::ui::lsp::SignatureHelp;
+use crate::ui::Popup;
+use crate::{job, ui};
+
+#[derive(Debug)]
+enum State {
+    Open,
+    Closed,
+    Pending { request: CancelTx },
+}
+
+/// debounce timeout in ms, value taken from VSCode
+/// TODO: make this configurable?
+const TIMEOUT: u64 = 120;
+
+#[derive(Debug)]
+pub(super) struct SignatureHelpHandler {
+    trigger: Option<SignatureHelpInvoked>,
+    state: State,
+}
+
+impl SignatureHelpHandler {
+    pub fn new() -> SignatureHelpHandler {
+        SignatureHelpHandler {
+            trigger: None,
+            state: State::Closed,
+        }
+    }
+}
+
+impl helix_event::AsyncHook for SignatureHelpHandler {
+    type Event = SignatureHelpEvent;
+
+    fn handle_event(
+        &mut self,
+        event: Self::Event,
+        timeout: Option<tokio::time::Instant>,
+    ) -> Option<Instant> {
+        match event {
+            SignatureHelpEvent::Invoked => {
+                self.trigger = Some(SignatureHelpInvoked::Manual);
+                self.state = State::Closed;
+                self.finish_debounce();
+                return None;
+            }
+            SignatureHelpEvent::Trigger => {}
+            SignatureHelpEvent::ReTrigger => {
+                // don't retrigger if we aren't open/pending yet
+                if matches!(self.state, State::Closed) {
+                    return timeout;
+                }
+            }
+            SignatureHelpEvent::Cancel => {
+                self.state = State::Closed;
+                return None;
+            }
+            SignatureHelpEvent::RequestComplete { open } => {
+                // don't cancel rerequest that was already triggered
+                if let State::Pending { request } = &self.state {
+                    if !request.is_closed() {
+                        return timeout;
+                    }
+                }
+                self.state = if open { State::Open } else { State::Closed };
+                return timeout;
+            }
+        }
+        if self.trigger.is_none() {
+            self.trigger = Some(SignatureHelpInvoked::Automatic)
+        }
+        Some(Instant::now() + Duration::from_millis(TIMEOUT))
+    }
+
+    fn finish_debounce(&mut self) {
+        let invocation = self.trigger.take().unwrap();
+        let (tx, rx) = cancelation();
+        self.state = State::Pending { request: tx };
+        job::dispatch_blocking(move |editor, _| request_signature_help(editor, invocation, rx))
+    }
+}
+
+pub fn request_signature_help(
+    editor: &mut Editor,
+    invoked: SignatureHelpInvoked,
+    cancel: CancelRx,
+) {
+    let (view, doc) = current!(editor);
+
+    // TODO merge multiple language server signature help into one instead of just taking the first language server that supports it
+    let future = doc
+        .language_servers_with_feature(LanguageServerFeature::SignatureHelp)
+        .find_map(|language_server| {
+            let pos = doc.position(view.id, language_server.offset_encoding());
+            language_server.text_document_signature_help(doc.identifier(), pos, None)
+        });
+
+    let Some(future) = future else {
+        // Do not show the message if signature help was invoked
+        // automatically on backspace, trigger characters, etc.
+        if invoked == SignatureHelpInvoked::Manual {
+            editor
+                .set_error("No configured language server supports signature-help");
+        }
+        return;
+    };
+
+    tokio::spawn(async move {
+        match cancelable_future(future, cancel).await {
+            Some(Ok(res)) => {
+                job::dispatch(move |editor, compositor| {
+                    show_signature_help(editor, compositor, invoked, res)
+                })
+                .await
+            }
+            Some(Err(err)) => log::error!("signature help request failed: {err}"),
+            None => (),
+        }
+    });
+}
+
+pub fn show_signature_help(
+    editor: &mut Editor,
+    compositor: &mut Compositor,
+    invoked: SignatureHelpInvoked,
+    response: Option<lsp::SignatureHelp>,
+) {
+    let config = &editor.config();
+
+    if !(config.lsp.auto_signature_help
+        || SignatureHelp::visible_popup(compositor).is_some()
+        || invoked == SignatureHelpInvoked::Manual)
+    {
+        return;
+    }
+
+    // If the signature help invocation is automatic, don't show it outside of Insert Mode:
+    // it very probably means the server was a little slow to respond and the user has
+    // already moved on to something else, making a signature help popup will just be an
+    // annoyance, see https://github.com/helix-editor/helix/issues/3112
+    // For the most part this should not be needed as the request gets canceled automatically now
+    // but it's technically possible for the mode change to just preempt this callback so better safe than sorry
+    if invoked == SignatureHelpInvoked::Automatic && editor.mode != Mode::Insert {
+        return;
+    }
+
+    let response = match response {
+        // According to the spec the response should be None if there
+        // are no signatures, but some servers don't follow this.
+        Some(s) if !s.signatures.is_empty() => s,
+        _ => {
+            send_blocking(
+                &editor.handlers.signature_hints,
+                SignatureHelpEvent::RequestComplete { open: false },
+            );
+            compositor.remove(SignatureHelp::ID);
+            return;
+        }
+    };
+    send_blocking(
+        &editor.handlers.signature_hints,
+        SignatureHelpEvent::RequestComplete { open: true },
+    );
+
+    let doc = doc!(editor);
+    let language = doc.language_name().unwrap_or("");
+
+    let signature = match response
+        .signatures
+        .get(response.active_signature.unwrap_or(0) as usize)
+    {
+        Some(s) => s,
+        None => return,
+    };
+    let mut contents = SignatureHelp::new(
+        signature.label.clone(),
+        language.to_string(),
+        Arc::clone(&editor.syn_loader),
+    );
+
+    let signature_doc = if config.lsp.display_signature_help_docs {
+        signature.documentation.as_ref().map(|doc| match doc {
+            lsp::Documentation::String(s) => s.clone(),
+            lsp::Documentation::MarkupContent(markup) => markup.value.clone(),
+        })
+    } else {
+        None
+    };
+
+    contents.set_signature_doc(signature_doc);
+
+    let active_param_range = || -> Option<(usize, usize)> {
+        let param_idx = signature
+            .active_parameter
+            .or(response.active_parameter)
+            .unwrap_or(0) as usize;
+        let param = signature.parameters.as_ref()?.get(param_idx)?;
+        match &param.label {
+            lsp::ParameterLabel::Simple(string) => {
+                let start = signature.label.find(string.as_str())?;
+                Some((start, start + string.len()))
+            }
+            lsp::ParameterLabel::LabelOffsets([start, end]) => {
+                // LS sends offsets based on utf-16 based string representation
+                // but highlighting in helix is done using byte offset.
+                use helix_core::str_utils::char_to_byte_idx;
+                let from = char_to_byte_idx(&signature.label, *start as usize);
+                let to = char_to_byte_idx(&signature.label, *end as usize);
+                Some((from, to))
+            }
+        }
+    };
+    contents.set_active_param_range(active_param_range());
+
+    let old_popup = compositor.find_id::<Popup<SignatureHelp>>(SignatureHelp::ID);
+    let mut popup = Popup::new(SignatureHelp::ID, contents)
+        .position(old_popup.and_then(|p| p.get_position()))
+        .position_bias(Open::Above)
+        .ignore_escape_key(true);
+
+    // Don't create a popup if it intersects the auto-complete menu.
+    let size = compositor.size();
+    if compositor
+        .find::<ui::EditorView>()
+        .unwrap()
+        .completion
+        .as_mut()
+        .map(|completion| completion.area(size, editor))
+        .filter(|area| area.intersects(popup.area(size, editor)))
+        .is_some()
+    {
+        return;
+    }
+
+    compositor.replace_or_push(SignatureHelp::ID, popup);
+}
+
+fn signature_help_post_insert_char_hook(
+    tx: &Sender<SignatureHelpEvent>,
+    PostInsertChar { cx, .. }: &mut PostInsertChar<'_, '_>,
+) -> anyhow::Result<()> {
+    if !cx.editor.config().lsp.auto_signature_help {
+        return Ok(());
+    }
+    let (view, doc) = current!(cx.editor);
+    // TODO support multiple language servers (not just the first that is found), likely by merging UI somehow
+    let Some(language_server) = doc
+            .language_servers_with_feature(LanguageServerFeature::SignatureHelp)
+            .next()
+        else {
+            return Ok(());
+        };
+
+    let capabilities = language_server.capabilities();
+
+    if let lsp::ServerCapabilities {
+        signature_help_provider:
+            Some(lsp::SignatureHelpOptions {
+                trigger_characters: Some(triggers),
+                // TODO: retrigger_characters
+                ..
+            }),
+        ..
+    } = capabilities
+    {
+        let mut text = doc.text().slice(..);
+        let cursor = doc.selection(view.id).primary().cursor(text);
+        text = text.slice(..cursor);
+        if triggers.iter().any(|trigger| text.ends_with(trigger)) {
+            send_blocking(tx, SignatureHelpEvent::Trigger)
+        }
+    }
+    Ok(())
+}
+
+pub(super) fn register_hooks(handlers: &Handlers) {
+    let tx = handlers.signature_hints.clone();
+    register_hook!(move |event: &mut OnModeSwitch<'_, '_>| {
+        match (event.old_mode, event.new_mode) {
+            (Mode::Insert, _) => {
+                send_blocking(&tx, SignatureHelpEvent::Cancel);
+                event.cx.callback.push(Box::new(|compositor, _| {
+                    compositor.remove(SignatureHelp::ID);
+                }));
+            }
+            (_, Mode::Insert) => {
+                if event.cx.editor.config().lsp.auto_signature_help {
+                    send_blocking(&tx, SignatureHelpEvent::Trigger);
+                }
+            }
+            _ => (),
+        }
+        Ok(())
+    });
+
+    let tx = handlers.signature_hints.clone();
+    register_hook!(
+        move |event: &mut PostInsertChar<'_, '_>| signature_help_post_insert_char_hook(&tx, event)
+    );
+
+    let tx = handlers.signature_hints.clone();
+    register_hook!(move |event: &mut DocumentDidChange<'_>| {
+        if event.doc.config.load().lsp.auto_signature_help {
+            send_blocking(&tx, SignatureHelpEvent::ReTrigger);
+        }
+        Ok(())
+    });
+
+    let tx = handlers.signature_hints.clone();
+    register_hook!(move |event: &mut SelectionDidChange<'_>| {
+        if event.doc.config.load().lsp.auto_signature_help {
+            send_blocking(&tx, SignatureHelpEvent::ReTrigger);
+        }
+        Ok(())
+    });
+}
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 7c6a0055e..48d97fbd8 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,8 +1,12 @@
-use crate::compositor::{Component, Context, Event, EventResult};
+use crate::{
+    compositor::{Component, Context, Event, EventResult},
+    handlers::trigger_auto_completion,
+};
 use helix_view::{
     document::SavePoint,
     editor::CompleteAction,
     graphics::Margin,
+    handlers::lsp::SignatureHelpInvoked,
     theme::{Modifier, Style},
     ViewId,
 };
@@ -10,7 +14,7 @@ use tui::{buffer::Buffer as Surface, text::Span};
 
 use std::{borrow::Cow, sync::Arc};
 
-use helix_core::{Change, Transaction};
+use helix_core::{chars, Change, Transaction};
 use helix_view::{graphics::Rect, Document, Editor};
 
 use crate::commands;
@@ -95,10 +99,9 @@ pub struct CompletionItem {
 /// Wraps a Menu.
 pub struct Completion {
     popup: Popup<Menu<CompletionItem>>,
-    start_offset: usize,
     #[allow(dead_code)]
     trigger_offset: usize,
-    // TODO: maintain a completioncontext with trigger kind & trigger char
+    filter: String,
 }
 
 impl Completion {
@@ -108,7 +111,6 @@ impl Completion {
         editor: &Editor,
         savepoint: Arc<SavePoint>,
         mut items: Vec<CompletionItem>,
-        start_offset: usize,
         trigger_offset: usize,
     ) -> Self {
         let preview_completion_insert = editor.config().preview_completion_insert;
@@ -246,7 +248,7 @@ impl Completion {
                     // (also without sending the transaction to the LS) *before any further transaction is applied*.
                     // Otherwise incremental sync breaks (since the state of the LS doesn't match the state the transaction
                     // is applied to).
-                    if editor.last_completion.is_none() {
+                    if matches!(editor.last_completion, Some(CompleteAction::Triggered)) {
                         editor.last_completion = Some(CompleteAction::Selected {
                             savepoint: doc.savepoint(view),
                         })
@@ -324,8 +326,18 @@ impl Completion {
                             doc.apply(&transaction, view.id);
                         }
                     }
+                    // we could have just inserted a trigger char (like a `crate::` completion for rust
+                    // so we want to retrigger immediately when accepting a completion.
+                    trigger_auto_completion(&editor.handlers.completions, editor, true);
                 }
             };
+
+            // In case the popup was deleted because of an intersection w/ the auto-complete menu.
+            if event != PromptEvent::Update {
+                editor
+                    .handlers
+                    .trigger_signature_help(SignatureHelpInvoked::Automatic, editor);
+            }
         });
 
         let margin = if editor.menu_border() {
@@ -339,14 +351,30 @@ impl Completion {
             .ignore_escape_key(true)
             .margin(margin);
 
+        let (view, doc) = current_ref!(editor);
+        let text = doc.text().slice(..);
+        let cursor = doc.selection(view.id).primary().cursor(text);
+        let offset = text
+            .chars_at(cursor)
+            .reversed()
+            .take_while(|ch| chars::char_is_word(*ch))
+            .count();
+        let start_offset = cursor.saturating_sub(offset);
+
+        let fragment = doc.text().slice(start_offset..cursor);
         let mut completion = Self {
             popup,
-            start_offset,
             trigger_offset,
+            // TODO: expand nucleo api to allow moving straight to a Utf32String here
+            // and avoid allocation during matching
+            filter: String::from(fragment),
         };
 
         // need to recompute immediately in case start_offset != trigger_offset
-        completion.recompute_filter(editor);
+        completion
+            .popup
+            .contents_mut()
+            .score(&completion.filter, false);
 
         completion
     }
@@ -366,39 +394,22 @@ impl Completion {
         }
     }
 
-    pub fn recompute_filter(&mut self, editor: &Editor) {
+    /// Appends (`c: Some(c)`) or removes (`c: None`) a character to/from the filter
+    /// this should be called whenever the user types or deletes a character in insert mode.
+    pub fn update_filter(&mut self, c: Option<char>) {
         // recompute menu based on matches
         let menu = self.popup.contents_mut();
-        let (view, doc) = current_ref!(editor);
-
-        // cx.hooks()
-        // cx.add_hook(enum type,  ||)
-        // cx.trigger_hook(enum type, &str, ...) <-- there has to be enough to identify doc/view
-        // callback with editor & compositor
-        //
-        // trigger_hook sends event into channel, that's consumed in the global loop and
-        // triggers all registered callbacks
-        // TODO: hooks should get processed immediately so maybe do it after select!(), before
-        // looping?
-
-        let cursor = doc
-            .selection(view.id)
-            .primary()
-            .cursor(doc.text().slice(..));
-        if self.trigger_offset <= cursor {
-            let fragment = doc.text().slice(self.start_offset..cursor);
-            let text = Cow::from(fragment);
-            // TODO: logic is same as ui/picker
-            menu.score(&text);
-        } else {
-            // we backspaced before the start offset, clear the menu
-            // this will cause the editor to remove the completion popup
-            menu.clear();
+        match c {
+            Some(c) => self.filter.push(c),
+            None => {
+                self.filter.pop();
+                if self.filter.is_empty() {
+                    menu.clear();
+                    return;
+                }
+            }
         }
-    }
-
-    pub fn update(&mut self, cx: &mut commands::Context) {
-        self.recompute_filter(cx.editor)
+        menu.score(&self.filter, c.is_some());
     }
 
     pub fn is_empty(&self) -> bool {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 9f186d148..fef62a292 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1,7 +1,6 @@
 use crate::{
     commands::{self, OnKeyCallback},
     compositor::{Component, Context, Event, EventResult},
-    job::{self, Callback},
     events::{OnModeSwitch, PostCommand},
     key,
     keymap::{KeymapResult, Keymaps},
@@ -34,8 +33,8 @@ use std::{mem::take, num::NonZeroUsize, path::PathBuf, rc::Rc, sync::Arc};
 
 use tui::{buffer::Buffer as Surface, text::Span};
 
+use super::document::LineDecoration;
 use super::{completion::CompletionItem, statusline};
-use super::{document::LineDecoration, lsp::SignatureHelp};
 
 pub struct EditorView {
     pub keymaps: Keymaps,
@@ -837,11 +836,8 @@ impl EditorView {
         let mut execute_command = |command: &commands::MappableCommand| {
             command.execute(cxt);
             helix_event::dispatch(PostCommand { command, cx: cxt });
+
             let current_mode = cxt.editor.mode();
-            match (last_mode, current_mode) {
-                (Mode::Normal, Mode::Insert) => {
-                    // HAXX: if we just entered insert mode from normal, clear key buf
-                    // and record the command that got us into this mode.
             if current_mode != last_mode {
                 helix_event::dispatch(OnModeSwitch {
                     old_mode: last_mode,
@@ -849,29 +845,16 @@ impl EditorView {
                     cx: cxt,
                 });
 
+                // HAXX: if we just entered insert mode from normal, clear key buf
+                // and record the command that got us into this mode.
+                if current_mode == Mode::Insert {
                     // how we entered insert mode is important, and we should track that so
                     // we can repeat the side effect.
                     self.last_insert.0 = command.clone();
                     self.last_insert.1.clear();
-
-                    commands::signature_help_impl(cxt, commands::SignatureHelpInvoked::Automatic);
-                }
-                (Mode::Insert, Mode::Normal) => {
-                    // if exiting insert mode, remove completion
-                    self.clear_completion(cxt.editor);
-                    cxt.editor.completion_request_handle = None;
-
-                    // TODO: Use an on_mode_change hook to remove signature help
-                    cxt.jobs.callback(async {
-                        let call: job::Callback =
-                            Callback::EditorCompositor(Box::new(|_editor, compositor| {
-                                compositor.remove(SignatureHelp::ID);
-                            }));
-                        Ok(call)
-                    });
                 }
-                _ => (),
             }
+
             last_mode = current_mode;
         };
 
@@ -999,12 +982,10 @@ impl EditorView {
         editor: &mut Editor,
         savepoint: Arc<SavePoint>,
         items: Vec<CompletionItem>,
-        start_offset: usize,
         trigger_offset: usize,
         size: Rect,
     ) -> Option<Rect> {
-        let mut completion =
-            Completion::new(editor, savepoint, items, start_offset, trigger_offset);
+        let mut completion = Completion::new(editor, savepoint, items, trigger_offset);
 
         if completion.is_empty() {
             // skip if we got no completion results
@@ -1025,6 +1006,7 @@ impl EditorView {
         self.completion = None;
         if let Some(last_completion) = editor.last_completion.take() {
             match last_completion {
+                CompleteAction::Triggered => (),
                 CompleteAction::Applied {
                     trigger_offset,
                     changes,
@@ -1038,9 +1020,6 @@ impl EditorView {
                 }
             }
         }
-
-        // Clear any savepoints
-        editor.clear_idle_timer(); // don't retrigger
     }
 
     pub fn handle_idle_timeout(&mut self, cx: &mut commands::Context) -> EventResult {
@@ -1054,13 +1033,7 @@ impl EditorView {
             };
         }
 
-        if cx.editor.mode != Mode::Insert || !cx.editor.config().auto_completion {
-            return EventResult::Ignored(None);
-        }
-
-        crate::commands::insert::idle_completion(cx);
-
-        EventResult::Consumed(None)
+        EventResult::Ignored(None)
     }
 }
 
@@ -1346,12 +1319,6 @@ impl Component for EditorView {
                                     if callback.is_some() {
                                         // assume close_fn
                                         self.clear_completion(cx.editor);
-
-                                        // In case the popup was deleted because of an intersection w/ the auto-complete menu.
-                                        commands::signature_help_impl(
-                                            &mut cx,
-                                            commands::SignatureHelpInvoked::Automatic,
-                                        );
                                     }
                                 }
                             }
@@ -1362,14 +1329,6 @@ impl Component for EditorView {
 
                                 // record last_insert key
                                 self.last_insert.1.push(InsertEvent::Key(key));
-
-                                // lastly we recalculate completion
-                                if let Some(completion) = &mut self.completion {
-                                    completion.update(&mut cx);
-                                    if completion.is_empty() {
-                                        self.clear_completion(cx.editor);
-                                    }
-                                }
                             }
                         }
                         mode => self.command_mode(mode, &mut cx, key),
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 0ee64ce9e..64127e3af 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -96,20 +96,34 @@ impl<T: Item> Menu<T> {
         }
     }
 
-    pub fn score(&mut self, pattern: &str) {
-        // reuse the matches allocation
-        self.matches.clear();
+    pub fn score(&mut self, pattern: &str, incremental: bool) {
         let mut matcher = MATCHER.lock();
         matcher.config = Config::DEFAULT;
         let pattern = Atom::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy, false);
         let mut buf = Vec::new();
-        let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
-            let text = option.filter_text(&self.editor_data);
-            pattern
-                .score(Utf32Str::new(&text, &mut buf), &mut matcher)
-                .map(|score| (i as u32, score as u32))
-        });
-        self.matches.extend(matches);
+        if incremental {
+            self.matches.retain_mut(|(index, score)| {
+                let option = &self.options[*index as usize];
+                let text = option.filter_text(&self.editor_data);
+                let new_score = pattern.score(Utf32Str::new(&text, &mut buf), &mut matcher);
+                match new_score {
+                    Some(new_score) => {
+                        *score = new_score as u32;
+                        true
+                    }
+                    None => false,
+                }
+            })
+        } else {
+            self.matches.clear();
+            let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
+                let text = option.filter_text(&self.editor_data);
+                pattern
+                    .score(Utf32Str::new(&text, &mut buf), &mut matcher)
+                    .map(|score| (i as u32, score as u32))
+            });
+            self.matches.extend(matches);
+        }
         self.matches
             .sort_unstable_by_key(|&(i, score)| (Reverse(score), i));
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 93b83da4f..388810b13 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -115,19 +115,6 @@ pub struct SavePoint {
     /// The view this savepoint is associated with
     pub view: ViewId,
     revert: Mutex<Transaction>,
-    pub text: Rope,
-}
-
-impl SavePoint {
-    pub fn cursor(&self) -> usize {
-        // we always create transactions with selections
-        self.revert
-            .lock()
-            .selection()
-            .unwrap()
-            .primary()
-            .cursor(self.text.slice(..))
-    }
 }
 
 pub struct Document {
@@ -1404,7 +1391,6 @@ impl Document {
         let savepoint = Arc::new(SavePoint {
             view: view.id,
             revert: Mutex::new(revert),
-            text: self.text.clone(),
         });
         self.savepoints.push(Arc::downgrade(&savepoint));
         savepoint
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 44c706d7d..dc10a6044 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -31,10 +31,7 @@ use std::{
 };
 
 use tokio::{
-    sync::{
-        mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
-        oneshot,
-    },
+    sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
     time::{sleep, Duration, Instant, Sleep},
 };
 
@@ -244,12 +241,19 @@ pub struct Config {
     /// Set a global text_width
     pub text_width: usize,
     /// Time in milliseconds since last keypress before idle timers trigger.
-    /// Used for autocompletion, set to 0 for instant. Defaults to 250ms.
+    /// Used for various UI timeouts. Defaults to 250ms.
     #[serde(
         serialize_with = "serialize_duration_millis",
         deserialize_with = "deserialize_duration_millis"
     )]
     pub idle_timeout: Duration,
+    /// Time in milliseconds after typing a word character before auto completions
+    /// are shown, set to 5 for instant. Defaults to 250ms.
+    #[serde(
+        serialize_with = "serialize_duration_millis",
+        deserialize_with = "deserialize_duration_millis"
+    )]
+    pub completion_timeout: Duration,
     /// Whether to insert the completion suggestion on hover. Defaults to true.
     pub preview_completion_insert: bool,
     pub completion_trigger_len: u8,
@@ -829,6 +833,7 @@ impl Default for Config {
             auto_format: true,
             auto_save: false,
             idle_timeout: Duration::from_millis(250),
+            completion_timeout: Duration::from_millis(250),
             preview_completion_insert: true,
             completion_trigger_len: 2,
             auto_info: true,
@@ -953,14 +958,6 @@ pub struct Editor {
     /// avoid calculating the cursor position multiple
     /// times during rendering and should not be set by other functions.
     pub cursor_cache: Cell<Option<Option<Position>>>,
-    /// When a new completion request is sent to the server old
-    /// unfinished request must be dropped. Each completion
-    /// request is associated with a channel that cancels
-    /// when the channel is dropped. That channel is stored
-    /// here. When a new completion request is sent this
-    /// field is set and any old requests are automatically
-    /// canceled as a result
-    pub completion_request_handle: Option<oneshot::Sender<()>>,
     pub handlers: Handlers,
 }
 
@@ -989,13 +986,16 @@ enum ThemeAction {
 
 #[derive(Debug, Clone)]
 pub enum CompleteAction {
+    Triggered,
+    /// A savepoint of the currently selected completion. The savepoint
+    /// MUST be restored before sending any event to the LSP
+    Selected {
+        savepoint: Arc<SavePoint>,
+    },
     Applied {
         trigger_offset: usize,
         changes: Vec<Change>,
     },
-    /// A savepoint of the currently selected completion. The savepoint
-    /// MUST be restored before sending any event to the LSP
-    Selected { savepoint: Arc<SavePoint> },
 }
 
 #[derive(Debug, Copy, Clone)]
@@ -1029,6 +1029,7 @@ impl Editor {
         theme_loader: Arc<theme::Loader>,
         syn_loader: Arc<syntax::Loader>,
         config: Arc<dyn DynAccess<Config>>,
+        handlers: Handlers,
     ) -> Self {
         let language_servers = helix_lsp::Registry::new(syn_loader.clone());
         let conf = config.load();
@@ -1073,7 +1074,7 @@ impl Editor {
             config_events: unbounded_channel(),
             needs_redraw: false,
             cursor_cache: Cell::new(None),
-            completion_request_handle: None,
+            handlers,
         }
     }
 
diff --git a/helix-view/src/handlers.rs b/helix-view/src/handlers.rs
index ae3eb545a..724e7b192 100644
--- a/helix-view/src/handlers.rs
+++ b/helix-view/src/handlers.rs
@@ -1,12 +1,41 @@
-use std::sync::Arc;
-
 use helix_event::send_blocking;
 use tokio::sync::mpsc::Sender;
 
 use crate::handlers::lsp::SignatureHelpInvoked;
-use crate::Editor;
+use crate::{DocumentId, Editor, ViewId};
 
 pub mod dap;
 pub mod lsp;
 
-pub struct Handlers {}
+pub struct Handlers {
+    // only public because most of the actual implementation is in helix-term right now :/
+    pub completions: Sender<lsp::CompletionEvent>,
+    pub signature_hints: Sender<lsp::SignatureHelpEvent>,
+}
+
+impl Handlers {
+    /// Manually trigger completion (c-x)
+    pub fn trigger_completions(&self, trigger_pos: usize, doc: DocumentId, view: ViewId) {
+        send_blocking(
+            &self.completions,
+            lsp::CompletionEvent::ManualTrigger {
+                cursor: trigger_pos,
+                doc,
+                view,
+            },
+        );
+    }
+
+    pub fn trigger_signature_help(&self, invocation: SignatureHelpInvoked, editor: &Editor) {
+        let event = match invocation {
+            SignatureHelpInvoked::Automatic => {
+                if !editor.config().lsp.auto_signature_help {
+                    return;
+                }
+                lsp::SignatureHelpEvent::Trigger
+            }
+            SignatureHelpInvoked::Manual => lsp::SignatureHelpEvent::Invoked,
+        };
+        send_blocking(&self.signature_hints, event)
+    }
+}
diff --git a/helix-view/src/handlers/lsp.rs b/helix-view/src/handlers/lsp.rs
index 958385646..1dae45dd5 100644
--- a/helix-view/src/handlers/lsp.rs
+++ b/helix-view/src/handlers/lsp.rs
@@ -1,26 +1,27 @@
 use crate::{DocumentId, ViewId};
 
-#[derive(Debug, Clone, Copy)]
-pub struct CompletionTrigger {
-    /// The char position of the primary cursor when the
-    /// completion was triggered
-    pub trigger_pos: usize,
-    pub doc: DocumentId,
-    pub view: ViewId,
-    /// Whether the cause of the trigger was an automatic completion (any word
-    /// char for words longer than minimum word length).
-    /// This is false for trigger chars send by the LS
-    pub auto: bool,
-}
-
 pub enum CompletionEvent {
     /// Auto completion was triggered by typing a word char
-    /// or a completion trigger
-    Trigger(CompletionTrigger),
+    AutoTrigger {
+        cursor: usize,
+        doc: DocumentId,
+        view: ViewId,
+    },
+    /// Auto completion was triggered by typing a trigger char
+    /// specified by the LSP
+    TriggerChar {
+        cursor: usize,
+        doc: DocumentId,
+        view: ViewId,
+    },
     /// A completion was manually requested (c-x)
-    Manual,
+    ManualTrigger {
+        cursor: usize,
+        doc: DocumentId,
+        view: ViewId,
+    },
     /// Some text was deleted and the cursor is now at `pos`
-    DeleteText { pos: usize },
+    DeleteText { cursor: usize },
     /// Invalidate the current auto completion trigger
     Cancel,
 }

From 960cda60abf8eb84a7369079f906a0bc53e8088c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 11:22:42 +0900
Subject: [PATCH 646/967] build(deps): bump chrono from 0.4.31 to 0.4.32
 (#9409)

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

diff --git a/Cargo.lock b/Cargo.lock
index 96496125a..4226e06ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,14 +171,14 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.48.0",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]

From e85507ccac5ad6771b66d2b85e7de29fa08a5b49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 11:24:29 +0900
Subject: [PATCH 647/967] build(deps): bump regex from 1.10.2 to 1.10.3 (#9408)

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 4226e06ac..839245f60 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1738,9 +1738,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1750,9 +1750,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
 dependencies = [
  "aho-corasick",
  "memchr",

From ae8042bb83e34b7cf085ec8792fcbf529896d998 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 11:24:38 +0900
Subject: [PATCH 648/967] build(deps): bump bitflags from 2.4.1 to 2.4.2
 (#9404)

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

diff --git a/Cargo.lock b/Cargo.lock
index 839245f60..d9519aa21 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -101,9 +101,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bstr"
@@ -285,7 +285,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "crossterm_winapi",
  "filedescriptor",
  "futures-core",
@@ -625,7 +625,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e0be46f4cf1f8f9e88d0e3eb7b29718aff23889563249f379119bd1ab6910e"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bstr",
  "gix-path",
  "libc",
@@ -704,7 +704,7 @@ version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae6232f18b262770e343dcdd461c0011c9b9ae27f0c805e115012aa2b902c1b8"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bstr",
  "gix-features",
  "gix-path",
@@ -907,7 +907,7 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78f6dce0c6683e2219e8169aac4b1c29e89540a8262fef7056b31d80d969408c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "gix-path",
  "libc",
  "windows 0.52.0",
@@ -1053,7 +1053,7 @@ version = "23.10.0"
 dependencies = [
  "ahash",
  "arc-swap",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "chrono",
  "dunce",
  "encoding_rs",
@@ -1216,7 +1216,7 @@ dependencies = [
 name = "helix-tui"
 version = "23.10.0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "cassowary",
  "crossterm",
  "helix-core",
@@ -1250,7 +1250,7 @@ version = "23.10.0"
 dependencies = [
  "anyhow",
  "arc-swap",
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "chardetng",
  "clipboard-win",
  "crossterm",
@@ -1787,7 +1787,7 @@ version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",

From 4168864572ac29c64d82031ba9edfbda0a521839 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Tue, 23 Jan 2024 16:19:22 +0200
Subject: [PATCH 649/967] Add bufferline config for onedark & onedarker themes
 (#9397)

---
 runtime/themes/onedark.toml   | 4 ++++
 runtime/themes/onedarker.toml | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 1db2aff86..a50b5d354 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -77,6 +77,10 @@
 "ui.statusline.insert" = { fg = "light-black", bg = "green" }
 "ui.statusline.select" = { fg = "light-black", bg = "purple" }
 
+"ui.bufferline" = { fg = "light-gray", bg = "light-black" }
+"ui.bufferline.active" = { fg = "light-black", bg = "blue", underline = { color = "light-black", style = "line" } }
+"ui.bufferline.background" = { bg = "light-black" }
+
 "ui.text" = { fg = "white" }
 "ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
 
diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
index 88b2871ab..307871445 100644
--- a/runtime/themes/onedarker.toml
+++ b/runtime/themes/onedarker.toml
@@ -75,6 +75,11 @@
 "ui.statusline.normal" = { fg = "light-black", bg = "purple" }
 "ui.statusline.insert" = { fg = "light-black", bg = "green" }
 "ui.statusline.select" = { fg = "light-black", bg = "cyan" }
+
+"ui.bufferline" = { fg = "light-gray", bg = "light-black" }
+"ui.bufferline.active" = { fg = "light-black", bg = "blue", underline = { color = "light-black", style = "line" } }
+"ui.bufferline.background" = { bg = "light-black" }
+
 "ui.text" = { fg = "white" }
 "ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
 

From cbd8602018efd90506fe684ea58a35dd4b40518f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:19:36 +0900
Subject: [PATCH 650/967] build(deps): bump smallvec from 1.12.0 to 1.13.1
 (#9405)

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

diff --git a/Cargo.lock b/Cargo.lock
index d9519aa21..d3da63613 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1940,9 +1940,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "smartstring"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 42c88f4bc..8c63af8ef 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -20,7 +20,7 @@ helix-stdx = { path = "../helix-stdx" }
 helix-loader = { path = "../helix-loader" }
 
 ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
-smallvec = "1.12"
+smallvec = "1.13"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"
 unicode-width = "0.1"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 7bdd433ed..683d6dc53 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -83,6 +83,6 @@ crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
 helix-loader = { path = "../helix-loader" }
 
 [dev-dependencies]
-smallvec = "1.12"
+smallvec = "1.13"
 indoc = "2.0.4"
 tempfile = "3.9.0"

From 7caae13465dd14ae105c69280bbe40774956eda1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:56:16 +0100
Subject: [PATCH 651/967] build(deps): bump gix from 0.57.1 to 0.58.0 (#9407)

Bumps [gix](https://github.com/Byron/gitoxide) from 0.57.1 to 0.58.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.57.1...gix-v0.58.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           | 130 +++++++++++++++++++------------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3da63613..9f62947f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -522,9 +522,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
 name = "gix"
-version = "0.57.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd025382892c7b500a9ce1582cd803f9c2ebfe44aff52e9c7f86feee7ced75e"
+checksum = "31887c304d9a935f3e5494fb5d6a0106c34e965168ec0db9b457424eedd0c741"
 dependencies = [
  "gix-actor",
  "gix-commitgraph",
@@ -558,14 +558,13 @@ dependencies = [
  "parking_lot",
  "smallvec",
  "thiserror",
- "unicode-normalization",
 ]
 
 [[package]]
 name = "gix-actor"
-version = "0.29.1"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da27b5ab4ab5c75ff891dccd48409f8cc53c28a79480f1efdd33184b2dc1d958"
+checksum = "0a7bb9fad6125c81372987c06469601d37e1a2d421511adb69971b9083517a8a"
 dependencies = [
  "bstr",
  "btoi",
@@ -586,9 +585,9 @@ dependencies = [
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a39c675fd737cb43a2120eddf1aa652c19d76b28d79783a198ac1b398ed9ce6"
+checksum = "82dbd7fb959862e3df2583331f0ad032ac93533e8a52f1b0694bc517f5d292bc"
 dependencies = [
  "bstr",
  "gix-chunk",
@@ -600,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.33.1"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "367304855b369cadcac4ee5fb5a3a20da9378dd7905106141070b79f85241079"
+checksum = "e62bf2073b6ce3921ffa6d8326f645f30eec5fc4a8e8a4bc0fcb721a2f3f69dc"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -621,9 +620,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e0be46f4cf1f8f9e88d0e3eb7b29718aff23889563249f379119bd1ab6910e"
+checksum = "5b8a1e7bfb37a46ed0b8468db37a6d8a0a61d56bdbe4603ae492cb322e5f3958"
 dependencies = [
  "bitflags 2.4.2",
  "bstr",
@@ -646,9 +645,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.39.1"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6a0454f8c42d686f17e7f084057c717c082b7dbb8209729e4e8f26749eb93a"
+checksum = "cbdcb5e49c4b9729dd1c361040ae5c3cd7c497b2260b18c954f62db3a63e98cf"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -658,12 +657,13 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d7b2896edc3d899d28a646ccc6df729827a6600e546570b2783466404a42d6"
+checksum = "b4669218f3ec0cbbf8f16857b32200890f8ca585f36f5817242e4115fe4551af"
 dependencies = [
  "bstr",
  "dunce",
+ "gix-fs",
  "gix-hash",
  "gix-path",
  "gix-ref",
@@ -673,14 +673,15 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.37.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a80f0fe688d654c2a741751578b11131071026d1934d03c1820d6d767525ce"
+checksum = "184f7f7d4e45db0e2a362aeaf12c06c5e84817d0ef91d08e8e90170dad9f0b07"
 dependencies = [
  "crc32fast",
  "flate2",
  "gix-hash",
  "gix-trace",
+ "gix-utils",
  "libc",
  "once_cell",
  "prodash",
@@ -691,18 +692,19 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7555c23a005537434bbfcb8939694e18cad42602961d0de617f8477cc2adecdd"
+checksum = "4436e883d5769f9fb18677b8712b49228357815f9e4104174a6fc2d8461a437b"
 dependencies = [
  "gix-features",
+ "gix-utils",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae6232f18b262770e343dcdd461c0011c9b9ae27f0c805e115012aa2b902c1b8"
+checksum = "4965a1d06d0ab84a29d4a67697a97352ab14ae1da821084e5afb1fd6d8191ca0"
 dependencies = [
  "bitflags 2.4.2",
  "bstr",
@@ -733,9 +735,9 @@ dependencies = [
 
 [[package]]
 name = "gix-lock"
-version = "12.0.0"
+version = "13.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
+checksum = "651e46174dc5e7d18b7b809d31937b6de3681b1debd78618c99162cc30fcf3e1"
 dependencies = [
  "gix-tempfile",
  "gix-utils",
@@ -755,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.40.1"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c89402e8faa41b49fde348665a8f38589e461036475af43b6b70615a6a313a2"
+checksum = "693ce9d30741506cb082ef2d8b797415b48e032cce0ab23eff894c19a7e4777b"
 dependencies = [
  "bstr",
  "btoi",
@@ -774,13 +776,14 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.56.1"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46ae6da873de41c6c2b73570e82c571b69df5154dcd8f46dfafc6687767c33b1"
+checksum = "8ba2fa9e81f2461b78b4d81a807867667326c84cdab48e0aed7b73a593aa1be4"
 dependencies = [
  "arc-swap",
  "gix-date",
  "gix-features",
+ "gix-fs",
  "gix-hash",
  "gix-object",
  "gix-pack",
@@ -793,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.46.1"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "782b4d42790a14072d5c400deda9851f5765f50fe72bca6dece0da1cd6f05a9a"
+checksum = "8da5f3e78c96b76c4e6fe5e8e06b76221e4a0ee9a255aa935ed1fdf68988dfd8"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -813,9 +816,9 @@ dependencies = [
 
 [[package]]
 name = "gix-path"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dd0998ab245f33d40ca2267e58d542fe54185ebd1dc41923346cf28d179fb6"
+checksum = "14a6282621aed1becc3f83d64099a564b3b9063f22783d9a87ea502a3e9f2e40"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -837,9 +840,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.40.1"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d9bd1984638d8f3511a2fcbe84fcedb8a5b5d64df677353620572383f42649"
+checksum = "5818958994ad7879fa566f5441ebcc48f0926aa027b28948e6fbf6578894dc31"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -850,6 +853,7 @@ dependencies = [
  "gix-object",
  "gix-path",
  "gix-tempfile",
+ "gix-utils",
  "gix-validate",
  "memmap2",
  "thiserror",
@@ -858,9 +862,9 @@ dependencies = [
 
 [[package]]
 name = "gix-refspec"
-version = "0.21.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be219df5092c1735abb2a53eccdf775e945eea6986ee1b6e7a5896dccc0be704"
+checksum = "613aa4d93034c5791d13bdc635e530f4ddab1412ddfb4a8215f76213177b61c7"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -872,9 +876,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa78e1df3633bc937d4db15f8dca2abdb1300ca971c0fabcf9fa97e38cf4cd9f"
+checksum = "288f6549d7666db74dc3f169a9a333694fc28ecd2f5aa7b2c979c89eb556751a"
 dependencies = [
  "bstr",
  "gix-date",
@@ -888,9 +892,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702de5fe5c2bbdde80219f3a8b9723eb927466e7ecd187cfd1b45d986408e45f"
+checksum = "5b9b4d91dfc5c14fee61a28c65113ded720403b65a0f46169c0460f731a5d03c"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -903,21 +907,21 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f6dce0c6683e2219e8169aac4b1c29e89540a8262fef7056b31d80d969408c"
+checksum = "f8d9bf462feaf05f2121cba7399dbc6c34d88a9cad58fc1e95027791d6a3c6d2"
 dependencies = [
  "bitflags 2.4.2",
  "gix-path",
  "libc",
- "windows 0.52.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "gix-tempfile"
-version = "12.0.0"
+version = "13.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
+checksum = "2d337955b7af00fb87120d053d87cdfb422a80b9ff7a3aa4057a99c79422dc30"
 dependencies = [
  "gix-fs",
  "libc",
@@ -928,15 +932,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e1127ede0475b58f4fe9c0aaa0d9bb0bad2af90bbd93ccd307c8632b863d89"
+checksum = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1"
 
 [[package]]
 name = "gix-traverse"
-version = "0.36.1"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb64213e52e1b726cb04581690c1e98b5910f983b977d5e9f2eb09f1a7fea6d2"
+checksum = "bfc30c5b5e4e838683b59e1b0574ce6bc1c35916df9709aaab32bb7751daf08b"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -950,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.26.1"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0f17cceb7552a231d1fec690bc2740c346554e3be6f5d2c41dfa809594dc44"
+checksum = "26f1981ecc700f4fd73ae62b9ca2da7c8816c8fd267f0185e3f8c21e967984ac"
 dependencies = [
  "bstr",
  "gix-features",
@@ -964,11 +968,12 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de6225e2de30b6e9bca2d9f1cc4731640fcef0fb3cabddceee366e7e85d3e94f"
+checksum = "56e839f3d0798b296411263da6bee780a176ef8008a5dfc31287f7eda9266ab8"
 dependencies = [
  "fastrand",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -1307,7 +1312,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows 0.48.0",
+ "windows",
 ]
 
 [[package]]
@@ -2405,25 +2410,6 @@ dependencies = [
  "windows-targets 0.48.0",
 ]
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core",
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index f6dbe076d..051134e4a 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.6.0" }
 
-gix = { version = "0.57.1", default-features = false , optional = true }
+gix = { version = "0.58.0", default-features = false , optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 

From 2058b3732c340f5bc29eee2aca1d8edae15e1314 Mon Sep 17 00:00:00 2001
From: melted-brownie <66597133+melted-brownie@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:27:09 +0000
Subject: [PATCH 652/967] Add text object queries for dart (#9411)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add text object queries for dart

* Update runtime/queries/dart/textobjects.scm

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

* Clean up internal capture name

---------

Co-authored-by: Sébastien Blondiau <sebastien.blondiau@iot-d.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md   |  2 +-
 runtime/queries/dart/textobjects.scm | 68 ++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/dart/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 6fedace63..a78dd7935 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -24,7 +24,7 @@
 | css | ✓ |  | ✓ | `vscode-css-language-server` |
 | cue | ✓ |  |  | `cuelsp` |
 | d | ✓ | ✓ | ✓ | `serve-d` |
-| dart | ✓ |  | ✓ | `dart` |
+| dart | ✓ | ✓ | ✓ | `dart` |
 | dbml | ✓ |  |  |  |
 | devicetree | ✓ |  |  |  |
 | dhall | ✓ | ✓ |  | `dhall-lsp-server` |
diff --git a/runtime/queries/dart/textobjects.scm b/runtime/queries/dart/textobjects.scm
new file mode 100644
index 000000000..028276156
--- /dev/null
+++ b/runtime/queries/dart/textobjects.scm
@@ -0,0 +1,68 @@
+(class_definition
+  body: (_) @class.inside) @class.around
+
+(mixin_declaration
+  (class_body) @class.inside) @class.around
+
+(extension_declaration
+  (extension_body) @class.inside) @class.around
+
+(enum_declaration
+  body: (_) @class.inside) @class.around
+
+(type_alias) @class.around
+
+(_
+  (
+    [
+      (getter_signature)
+      (setter_signature)
+      (function_signature)
+      (method_signature)
+      (constructor_signature)
+    ]
+    .
+    (function_body) @function.inside @function.around
+  )  @function.around
+)
+
+(declaration
+  [
+    (constant_constructor_signature)
+    (constructor_signature)
+    (factory_constructor_signature)
+    (redirecting_factory_constructor_signature)
+    (getter_signature)
+    (setter_signature)
+    (operator_signature)
+    (function_signature)
+  ]
+) @function.around
+
+(lambda_expression
+    body: (_) @function.inside
+) @function.around
+
+(function_expression
+    body: (_) @function.inside
+) @function.around
+
+[
+  (comment)
+  (documentation_comment)
+] @comment.inside
+
+(comment)+ @comment.around
+
+(documentation_comment)+ @comment.around
+
+(formal_parameter) @parameter.inside
+
+(formal_parameter_list) @parameter.around
+
+(expression_statement
+  ((identifier) @_name (#any-of? @_name "test" "testWidgets"))
+  .
+  (selector (argument_part (arguments . (_) . (argument) @test.inside)))
+) @test.around
+

From 299bcce481abe7e13f2023ec6e82c59b43f12f47 Mon Sep 17 00:00:00 2001
From: Idobenhamo <135357971+Idobenhamo@users.noreply.github.com>
Date: Tue, 23 Jan 2024 19:27:46 +0200
Subject: [PATCH 653/967] Update Typst Tree-Sitter grammar (#9403)

Co-authored-by: Idobenhamo <idobenhamo@users.noreply.github.com>
---
 languages.toml                       | 2 +-
 runtime/queries/typst/highlights.scm | 7 ++++++-
 runtime/queries/typst/injections.scm | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 4ff529c47..83c770479 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2865,7 +2865,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "typst"
-source = { git = "https://github.com/uben0/tree-sitter-typst", rev = "e35aa22395fdde82bbc4b5700c324ce346dfc9e5" }
+source = { git = "https://github.com/uben0/tree-sitter-typst", rev = "ecf8596336857adfcd5f7cbb3b2aa11a67badc37" }
 
 [[language]]
 name = "nunjucks"
diff --git a/runtime/queries/typst/highlights.scm b/runtime/queries/typst/highlights.scm
index b422e05b3..0bbccede0 100644
--- a/runtime/queries/typst/highlights.scm
+++ b/runtime/queries/typst/highlights.scm
@@ -55,7 +55,12 @@
 ; MARKUP
 (item "-" @markup.list)
 (term ["/" ":"] @markup.list)
-(heading ["=" "==" "===" "====" "====="] @markup.heading.marker) @markup.heading
+(heading "=" @markup.heading.marker) @markup.heading.1
+(heading "==" @markup.heading.marker) @markup.heading.2
+(heading "===" @markup.heading.marker) @markup.heading.3
+(heading "====" @markup.heading.marker) @markup.heading.4
+(heading "=====" @markup.heading.marker) @markup.heading.5
+(heading "======" @markup.heading.marker) @markup.heading.6
 (url) @tag
 (emph) @markup.italic
 (strong) @markup.bold
diff --git a/runtime/queries/typst/injections.scm b/runtime/queries/typst/injections.scm
index 8039b4cab..06a250979 100644
--- a/runtime/queries/typst/injections.scm
+++ b/runtime/queries/typst/injections.scm
@@ -3,4 +3,5 @@
 
 (raw_blck
 	lang: (ident) @injection.language
-  (blob) @injection.content)
\ No newline at end of file
+  (blob) @injection.content)
+

From b606c052467396042b1dbba10f19fd3c114fd42a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 20:23:39 +0100
Subject: [PATCH 654/967] build(deps): bump actions/cache from 3 to 4 (#9402)

Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22151c378..3d47c2088 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
           shared-key: "build"
 
       - name: Cache test tree-sitter grammar
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: runtime/grammars
           key: ${{ runner.os }}-stable-v${{ env.CACHE_VERSION }}-tree-sitter-grammars-${{ hashFiles('languages.toml') }}

From 6bfe1ddc53f542d62e242fd4aaf6748dda1b0e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 24 Jan 2024 15:31:16 +0900
Subject: [PATCH 655/967] minor: Silence noisy set_error log

Outside of debugging tests, it makes no sense to log this.
---
 helix-view/src/editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dc10a6044..fbfcb3560 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1147,7 +1147,7 @@ impl Editor {
     #[inline]
     pub fn set_error<T: Into<Cow<'static, str>>>(&mut self, error: T) {
         let error = error.into();
-        log::error!("editor error: {}", error);
+        log::debug!("editor error: {}", error);
         self.status_msg = Some((error, Severity::Error));
     }
 

From 6d724a8f331f4b2a8f1a001e990cf6129dc50b00 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 23 Jan 2024 09:29:07 -0500
Subject: [PATCH 656/967] Re-export `which` from `helix-stdx::env`

We use `which::which` in many crates, so `which` was a separate
dependency across all of them. We can centralize `which` into the
stdx crate so it's easy for all crates to depend on it.

I also moved the rest of `helix-view/src/env.rs` into helix-stdx's
`env` module since it only contained a thin wrapper around `which`
and `std::env`.
---
 Cargo.lock                  | 23 ++++++++++-------------
 helix-dap/Cargo.toml        |  2 +-
 helix-dap/src/client.rs     |  2 +-
 helix-loader/Cargo.toml     |  1 -
 helix-loader/src/grammar.rs |  2 +-
 helix-lsp/Cargo.toml        |  1 -
 helix-lsp/src/client.rs     |  2 +-
 helix-stdx/Cargo.toml       |  1 +
 helix-stdx/src/env.rs       | 10 ++++++++++
 helix-term/Cargo.toml       |  2 --
 helix-term/src/health.rs    |  6 +++---
 helix-view/Cargo.toml       |  1 -
 helix-view/src/clipboard.rs |  4 ++--
 helix-view/src/document.rs  |  7 ++++++-
 helix-view/src/editor.rs    |  4 ++--
 helix-view/src/env.rs       |  8 --------
 helix-view/src/lib.rs       |  1 -
 17 files changed, 38 insertions(+), 39 deletions(-)
 delete mode 100644 helix-view/src/env.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9f62947f0..d4ac12e43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -358,9 +358,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "encoding_rs"
@@ -1095,12 +1095,12 @@ dependencies = [
  "anyhow",
  "fern",
  "helix-core",
+ "helix-stdx",
  "log",
  "serde",
  "serde_json",
  "thiserror",
  "tokio",
- "which",
 ]
 
 [[package]]
@@ -1134,7 +1134,6 @@ dependencies = [
  "threadpool",
  "toml",
  "tree-sitter",
- "which",
 ]
 
 [[package]]
@@ -1157,7 +1156,6 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "which",
 ]
 
 [[package]]
@@ -1172,6 +1170,7 @@ dependencies = [
  "etcetera",
  "ropey",
  "tempfile",
+ "which",
 ]
 
 [[package]]
@@ -1214,7 +1213,6 @@ dependencies = [
  "tokio-stream",
  "toml",
  "url",
- "which",
 ]
 
 [[package]]
@@ -1280,7 +1278,6 @@ dependencies = [
  "tokio-stream",
  "toml",
  "url",
- "which",
 ]
 
 [[package]]
@@ -1294,11 +1291,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.5"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2359,15 +2356,15 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "which"
-version = "5.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
+checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c"
 dependencies = [
  "either",
  "home",
  "once_cell",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/helix-dap/Cargo.toml b/helix-dap/Cargo.toml
index f7acb0032..3521f5890 100644
--- a/helix-dap/Cargo.toml
+++ b/helix-dap/Cargo.toml
@@ -13,6 +13,7 @@ homepage.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+helix-stdx = { path = "../helix-stdx" }
 helix-core = { path = "../helix-core" }
 
 anyhow = "1.0"
@@ -21,7 +22,6 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
-which = "5.0.0"
 
 [dev-dependencies]
 fern = "0.6"
diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs
index 55ebab577..579811df7 100644
--- a/helix-dap/src/client.rs
+++ b/helix-dap/src/client.rs
@@ -113,7 +113,7 @@ impl Client {
         id: usize,
     ) -> Result<(Self, UnboundedReceiver<Payload>)> {
         // Resolve path to the binary
-        let cmd = which::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
+        let cmd = helix_stdx::env::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
 
         let process = Command::new(cmd)
             .args(args)
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 08da7f295..469bedc10 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -24,7 +24,6 @@ etcetera = "0.8"
 tree-sitter.workspace = true
 once_cell = "1.19"
 log = "0.4"
-which = "5.0.0"
 
 # TODO: these two should be on !wasm32 only
 
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 66111aebb..537e12828 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -86,7 +86,7 @@ pub fn get_language(name: &str) -> Result<Language> {
 }
 
 fn ensure_git_is_available() -> Result<()> {
-    match which::which("git") {
+    match helix_stdx::env::which("git") {
         Ok(_cmd) => Ok(()),
         Err(err) => Err(anyhow::anyhow!("'git' could not be found ({err})")),
     }
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 510be6eec..8e9e3407c 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -29,5 +29,4 @@ serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.14"
-which = "5.0.0"
 parking_lot = "0.12.1"
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 7eef2bf7a..f8c2912e7 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -183,7 +183,7 @@ impl Client {
         doc_path: Option<&std::path::PathBuf>,
     ) -> Result<(Self, UnboundedReceiver<(usize, Call)>, Arc<Notify>)> {
         // Resolve path to the binary
-        let cmd = which::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
+        let cmd = helix_stdx::env::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
 
         let process = Command::new(cmd)
             .envs(server_environment)
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index 9b4de9fef..e77f8b91f 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -15,6 +15,7 @@ homepage.workspace = true
 dunce = "1.0"
 etcetera = "0.8"
 ropey = { version = "1.6.1", default-features = false }
+which = "6.0"
 
 [dev-dependencies]
 tempfile = "3.9"
diff --git a/helix-stdx/src/env.rs b/helix-stdx/src/env.rs
index 864ba828b..3676727f2 100644
--- a/helix-stdx/src/env.rs
+++ b/helix-stdx/src/env.rs
@@ -1,3 +1,5 @@
+pub use which::which;
+
 use std::{
     path::{Path, PathBuf},
     sync::RwLock,
@@ -30,6 +32,14 @@ pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
     Ok(())
 }
 
+pub fn env_var_is_set(env_var_name: &str) -> bool {
+    std::env::var_os(env_var_name).is_some()
+}
+
+pub fn binary_exists(binary_name: &str) -> bool {
+    which::which(binary_name).is_ok()
+}
+
 #[cfg(test)]
 mod tests {
     use super::{current_working_dir, set_current_working_dir};
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 683d6dc53..9a7162ac1 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -35,8 +35,6 @@ helix-loader = { path = "../helix-loader" }
 anyhow = "1"
 once_cell = "1.19"
 
-which = "5.0.0"
-
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
 crossterm = { version = "0.27", features = ["event-stream"] }
diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
index 44ae2a2f7..5f2019265 100644
--- a/helix-term/src/health.rs
+++ b/helix-term/src/health.rs
@@ -182,7 +182,7 @@ pub fn languages_all() -> std::io::Result<()> {
         .sort_unstable_by_key(|l| l.language_id.clone());
 
     let check_binary = |cmd: Option<&str>| match cmd {
-        Some(cmd) => match which::which(cmd) {
+        Some(cmd) => match helix_stdx::env::which(cmd) {
             Ok(_) => column(&format!("✓ {}", cmd), Color::Green),
             Err(_) => column(&format!("✘ {}", cmd), Color::Red),
         },
@@ -322,7 +322,7 @@ fn probe_protocols<'a, I: Iterator<Item = &'a str> + 'a>(
     writeln!(stdout)?;
 
     for cmd in server_cmds {
-        let (path, icon) = match which::which(cmd) {
+        let (path, icon) = match helix_stdx::env::which(cmd) {
             Ok(path) => (path.display().to_string().green(), "✓".green()),
             Err(_) => (format!("'{}' not found in $PATH", cmd).red(), "✘".red()),
         };
@@ -344,7 +344,7 @@ fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::R
     writeln!(stdout, "Configured {}: {}", protocol_name, cmd_name)?;
 
     if let Some(cmd) = server_cmd {
-        let path = match which::which(&cmd) {
+        let path = match helix_stdx::env::which(&cmd) {
             Ok(path) => path.display().to_string().green(),
             Err(_) => format!("'{}' not found in $PATH", cmd).red(),
         };
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 0dc18b373..2e6893414 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -46,7 +46,6 @@ serde_json = "1.0"
 toml = "0.7"
 log = "~0.4"
 
-which = "5.0.0"
 parking_lot = "0.12.1"
 
 
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index 812c803e9..9ff2fd788 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -73,7 +73,7 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
 
 #[cfg(target_os = "macos")]
 pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
-    use crate::env::{binary_exists, env_var_is_set};
+    use helix_stdx::env::{binary_exists, env_var_is_set};
 
     if env_var_is_set("TMUX") && binary_exists("tmux") {
         command_provider! {
@@ -98,7 +98,7 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
 
 #[cfg(not(any(windows, target_os = "wasm32", target_os = "macos")))]
 pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
-    use crate::env::{binary_exists, env_var_is_set};
+    use helix_stdx::env::{binary_exists, env_var_is_set};
     use provider::command::is_exit_success;
     // TODO: support for user-defined provider, probably when we have plugin support by setting a
     // variable?
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 388810b13..88653948c 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -726,7 +726,12 @@ impl Document {
         if let Some((fmt_cmd, fmt_args)) = self
             .language_config()
             .and_then(|c| c.formatter.as_ref())
-            .and_then(|formatter| Some((which::which(&formatter.command).ok()?, &formatter.args)))
+            .and_then(|formatter| {
+                Some((
+                    helix_stdx::env::which(&formatter.command).ok()?,
+                    &formatter.args,
+                ))
+            })
         {
             use std::process::Stdio;
             let text = self.text().clone();
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index fbfcb3560..f605cbb5f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -329,7 +329,7 @@ pub struct TerminalConfig {
 
 #[cfg(windows)]
 pub fn get_terminal_provider() -> Option<TerminalConfig> {
-    use crate::env::binary_exists;
+    use helix_stdx::env::binary_exists;
 
     if binary_exists("wt") {
         return Some(TerminalConfig {
@@ -352,7 +352,7 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
 
 #[cfg(not(any(windows, target_os = "wasm32")))]
 pub fn get_terminal_provider() -> Option<TerminalConfig> {
-    use crate::env::{binary_exists, env_var_is_set};
+    use helix_stdx::env::{binary_exists, env_var_is_set};
 
     if env_var_is_set("TMUX") && binary_exists("tmux") {
         return Some(TerminalConfig {
diff --git a/helix-view/src/env.rs b/helix-view/src/env.rs
deleted file mode 100644
index c68cc609a..000000000
--- a/helix-view/src/env.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub fn binary_exists(binary_name: &str) -> bool {
-    which::which(binary_name).is_ok()
-}
-
-#[cfg(not(windows))]
-pub fn env_var_is_set(env_var_name: &str) -> bool {
-    std::env::var_os(env_var_name).is_some()
-}
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 82827b5d5..14b6e1ce8 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -5,7 +5,6 @@ pub mod base64;
 pub mod clipboard;
 pub mod document;
 pub mod editor;
-pub mod env;
 pub mod events;
 pub mod graphics;
 pub mod gutter;

From cb25d13028ec1cdf986a3567ea52562ea654a7b8 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 23 Jan 2024 13:36:53 -0500
Subject: [PATCH 657/967] Improve error handling for `which::which` failures

Co-authored-by: Pascal Kuthe <pascalkuthe@pm.me>
---
 helix-dap/src/client.rs     |  2 +-
 helix-dap/src/lib.rs        |  2 ++
 helix-loader/src/grammar.rs |  6 ++----
 helix-lsp/src/client.rs     |  2 +-
 helix-lsp/src/lib.rs        |  2 ++
 helix-stdx/src/env.rs       | 28 +++++++++++++++++++++++++---
 6 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs
index 579811df7..18af13ae7 100644
--- a/helix-dap/src/client.rs
+++ b/helix-dap/src/client.rs
@@ -113,7 +113,7 @@ impl Client {
         id: usize,
     ) -> Result<(Self, UnboundedReceiver<Payload>)> {
         // Resolve path to the binary
-        let cmd = helix_stdx::env::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
+        let cmd = helix_stdx::env::which(cmd)?;
 
         let process = Command::new(cmd)
             .args(args)
diff --git a/helix-dap/src/lib.rs b/helix-dap/src/lib.rs
index 21162cb86..d0229249d 100644
--- a/helix-dap/src/lib.rs
+++ b/helix-dap/src/lib.rs
@@ -19,6 +19,8 @@ pub enum Error {
     #[error("server closed the stream")]
     StreamClosed,
     #[error(transparent)]
+    ExecutableNotFound(#[from] helix_stdx::env::ExecutableNotFoundError),
+    #[error(transparent)]
     Other(#[from] anyhow::Error),
 }
 pub type Result<T> = core::result::Result<T, Error>;
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 537e12828..7977c6df8 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -86,10 +86,8 @@ pub fn get_language(name: &str) -> Result<Language> {
 }
 
 fn ensure_git_is_available() -> Result<()> {
-    match helix_stdx::env::which("git") {
-        Ok(_cmd) => Ok(()),
-        Err(err) => Err(anyhow::anyhow!("'git' could not be found ({err})")),
-    }
+    helix_stdx::env::which("git")?;
+    Ok(())
 }
 
 pub fn fetch_grammars() -> Result<()> {
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index f8c2912e7..fb32f6eb3 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -183,7 +183,7 @@ impl Client {
         doc_path: Option<&std::path::PathBuf>,
     ) -> Result<(Self, UnboundedReceiver<(usize, Call)>, Arc<Notify>)> {
         // Resolve path to the binary
-        let cmd = helix_stdx::env::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
+        let cmd = helix_stdx::env::which(cmd)?;
 
         let process = Command::new(cmd)
             .envs(server_environment)
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index c99ec217b..53b2712d0 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -44,6 +44,8 @@ pub enum Error {
     #[error("Unhandled")]
     Unhandled,
     #[error(transparent)]
+    ExecutableNotFound(#[from] helix_stdx::env::ExecutableNotFoundError),
+    #[error(transparent)]
     Other(#[from] anyhow::Error),
 }
 
diff --git a/helix-stdx/src/env.rs b/helix-stdx/src/env.rs
index 3676727f2..90a0aee87 100644
--- a/helix-stdx/src/env.rs
+++ b/helix-stdx/src/env.rs
@@ -1,6 +1,5 @@
-pub use which::which;
-
 use std::{
+    ffi::OsStr,
     path::{Path, PathBuf},
     sync::RwLock,
 };
@@ -36,10 +35,33 @@ pub fn env_var_is_set(env_var_name: &str) -> bool {
     std::env::var_os(env_var_name).is_some()
 }
 
-pub fn binary_exists(binary_name: &str) -> bool {
+pub fn binary_exists<T: AsRef<OsStr>>(binary_name: T) -> bool {
     which::which(binary_name).is_ok()
 }
 
+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(),
+        inner: err,
+    })
+}
+
+#[derive(Debug)]
+pub struct ExecutableNotFoundError {
+    command: String,
+    inner: which::Error,
+}
+
+impl std::fmt::Display for ExecutableNotFoundError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "command '{}' not found: {}", self.command, self.inner)
+    }
+}
+
+impl std::error::Error for ExecutableNotFoundError {}
+
 #[cfg(test)]
 mod tests {
     use super::{current_working_dir, set_current_working_dir};

From 83f09ecbff5160e4350c8099be1ad4c64513f665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 24 Jan 2024 16:00:21 +0900
Subject: [PATCH 658/967] minor: Silence noisy language server not found error
 in log

---
 helix-view/src/editor.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index f605cbb5f..eca488e74 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1238,12 +1238,19 @@ impl Editor {
                 .filter_map(|(lang, client)| match client {
                     Ok(client) => Some((lang, client)),
                     Err(err) => {
-                        log::error!(
-                            "Failed to initialize the language servers for `{}` - `{}` {{ {} }}",
-                            language.scope(),
-                            lang,
-                            err
-                        );
+                        if let helix_lsp::Error::ExecutableNotFound(err) = err {
+                            // Silence by default since some language servers might just not be installed
+                            log::debug!(
+                                "Language server not found for `{}` {} {}", language.scope(), lang, err,
+                            );
+                        } else {
+                            log::error!(
+                                "Failed to initialize the language servers for `{}` - `{}` {{ {} }}",
+                                language.scope(),
+                                lang,
+                                err
+                            );
+                        }
                         None
                     }
                 })

From cda8ea991e885a84f03d7ffcf4cf046bfbf77490 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Jan 2024 00:10:58 -0500
Subject: [PATCH 659/967] highlighting: Gate multiple captures behind `#is-not?
 local` predicates (#9390)

---
 helix-core/src/syntax.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index e543df06e..a5a85c575 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -2306,6 +2306,7 @@ impl<'a> Iterator for HighlightIter<'a> {
             // highlighting patterns that are disabled for local variables.
             if definition_highlight.is_some() || reference_highlight.is_some() {
                 while layer.config.non_local_variable_patterns[match_.pattern_index] {
+                    match_.remove();
                     if let Some((next_match, next_capture_index)) = captures.peek() {
                         let next_capture = next_match.captures[*next_capture_index];
                         if next_capture.node == capture.node {

From d8b8d2fda6a10f25c9704fc95c069a4c457752e6 Mon Sep 17 00:00:00 2001
From: Nick <sop.theteachr@gmail.com>
Date: Thu, 25 Jan 2024 10:41:12 +0530
Subject: [PATCH 660/967] Fix error message shown for goto references (#9382)

---
 helix-term/src/commands/lsp.rs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index de2f0e5ec..c694ba25c 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1007,6 +1007,7 @@ pub fn apply_workspace_edit(
     Ok(())
 }
 
+/// Precondition: `locations` should be non-empty.
 fn goto_impl(
     editor: &mut Editor,
     compositor: &mut Compositor,
@@ -1019,9 +1020,7 @@ fn goto_impl(
         [location] => {
             jump_to_location(editor, location, offset_encoding, Action::Replace);
         }
-        [] => {
-            editor.set_error("No definition found.");
-        }
+        [] => unreachable!("`locations` should be non-empty for `goto_impl`"),
         _locations => {
             let picker = Picker::new(locations, cwdir, move |cx, location, action| {
                 jump_to_location(cx.editor, location, offset_encoding, action)
@@ -1063,7 +1062,11 @@ where
         future,
         move |editor, compositor, response: Option<lsp::GotoDefinitionResponse>| {
             let items = to_locations(response);
-            goto_impl(editor, compositor, items, offset_encoding);
+            if items.is_empty() {
+                editor.set_error("No definition found.");
+            } else {
+                goto_impl(editor, compositor, items, offset_encoding);
+            }
         },
     );
 }
@@ -1123,7 +1126,11 @@ pub fn goto_reference(cx: &mut Context) {
         future,
         move |editor, compositor, response: Option<Vec<lsp::Location>>| {
             let items = response.unwrap_or_default();
-            goto_impl(editor, compositor, items, offset_encoding);
+            if items.is_empty() {
+                editor.set_error("No references found.");
+            } else {
+                goto_impl(editor, compositor, items, offset_encoding);
+            }
         },
     );
 }

From 2661e05b3405c216a2303c20e71830b4bde7ac35 Mon Sep 17 00:00:00 2001
From: blinxen <h-k-81@hotmail.com>
Date: Thu, 25 Jan 2024 06:12:17 +0100
Subject: [PATCH 661/967] Update some grammars to a commit where the license
 file is included (#9279)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml                        |   8 +-
 runtime/queries/pod/highlights.scm    | 122 +++++++++++++++++---------
 runtime/queries/unison/highlights.scm |   2 +-
 runtime/queries/vhs/highlights.scm    |  21 +++--
 4 files changed, 99 insertions(+), 54 deletions(-)

diff --git a/languages.toml b/languages.toml
index 83c770479..87d4ae235 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1249,7 +1249,7 @@ file-types = ["pod"]
 
 [[grammar]]
 name = "pod"
-source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "d466b84009a63986834498073ec05d58d727d55f" }
+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "39da859947b94abdee43e431368e1ae975c0a424" }
 
 [[language]]
 name = "racket"
@@ -2259,7 +2259,7 @@ grammar = "vhs"
 
 [[grammar]]
 name = "vhs"
-source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "c6d81f34c011c29ee86dd73b45a8ecc9f2e2bdaf" }
+source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "9534865e614c95eb9418e5e73f061c32fa4d9540" }
 
 [[language]]
 name = "kdl"
@@ -2666,7 +2666,7 @@ language-servers = [ "cs" ]
 
 [[grammar]]
 name = "smithy"
-source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0" }
+source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "8327eb84d55639ffbe08c9dc82da7fff72a1ad07" }
 
 [[language]]
 name = "vhdl"
@@ -2917,7 +2917,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "unison"
-source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "98c4e8bc5c9f5989814a720457cf36963cf4043d" }
+source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "aaec316774c8b50d367ec7cf26523aac5ef0cfc5" }
 
 [[language]]
 name = "todotxt"
diff --git a/runtime/queries/pod/highlights.scm b/runtime/queries/pod/highlights.scm
index e8bd4b546..d88d9ffa7 100644
--- a/runtime/queries/pod/highlights.scm
+++ b/runtime/queries/pod/highlights.scm
@@ -1,61 +1,97 @@
-[(pod_directive)
- (head_directive)
- (over_directive)
- (item_directive)
- (back_directive)
- (encoding_directive)
- (cut_directive)] @tag
-
-(head_paragraph
-  (head_directive) @directive
-  (#eq? @directive "=head1")
+; A highlight file for nvim-treesitter to use
+
+[(pod_command)
+ (command)
+ (cut_command)] @keyword
+
+(command_paragraph
+  (command) @keyword
+  (#eq? @keyword "=head1")
   (content) @markup.heading.1)
-(head_paragraph
-  (head_directive) @directive
-  (#eq? @directive "=head2")
+
+(command_paragraph
+  (command) @keyword
+  (#eq? @keyword "=head2")
   (content) @markup.heading.2)
-(head_paragraph
-  (head_directive) @directive
-  (#eq? @directive "=head3")
+
+(command_paragraph
+  (command) @keyword
+  (#eq? @keyword "=head3")
   (content) @markup.heading.3)
-(head_paragraph
-  (head_directive) @directive
-  (#eq? @directive "=head4")
+
+(command_paragraph
+  (command) @keyword
+  (#eq? @keyword "=head4")
   (content) @markup.heading.4)
-(head_paragraph
-  (head_directive) @directive
-  (#eq? @directive "=head5")
+
+(command_paragraph
+  (command) @keyword
+  (#eq? @keyword "=head5")
   (content) @markup.heading.5)
-(head_paragraph
-  (head_directive) @directive
-  (#eq? @directive "=head6")
+
+(command_paragraph
+  (command) @keyword
+  (#eq? @keyword "=head6")
   (content) @markup.heading.6)
 
-(over_paragraph (content) @constant.numeric.integer)
-(item_paragraph (content) @markup.list)
-(encoding_paragraph (content) @string)
+(command_paragraph
+  (command) @keyword
+  (#match? @keyword "^=over")
+  (content) @constant.numeric)
+
+(command_paragraph
+  (command) @keyword
+  (#match? @keyword "^=item")
+  (content) @markup)
+
+(command_paragraph
+  (command) @keyword
+  (#match? @keyword "^=encoding")
+  (content) @string.special)
+
+(command_paragraph
+  (command) @keyword
+  (#not-match? @keyword "^=(head|over|item|encoding)")
+  (content) @string)
 
 (verbatim_paragraph (content) @markup.raw)
 
-(interior_sequence) @tag
+(interior_sequence
+  (sequence_letter) @constant.character
+  ["<" ">"] @punctuation.delimiter
+)
 
 (interior_sequence
-  (sequence_letter) @letter
-  (#eq? @letter "B")
+  (sequence_letter) @character
+  (#eq? @character "B")
   (content) @markup.bold)
+
 (interior_sequence
-  (sequence_letter) @letter
-  (#eq? @letter "C")
-  (content) @markup.raw)
+  (sequence_letter) @character
+  (#eq? @character "C")
+  (content) @markup.literal)
+
 (interior_sequence
-  (sequence_letter) @letter
-  (#eq? @letter "F")
-  (content) @markup.italic)
+  (sequence_letter) @character
+  (#eq? @character "F")
+  (content) @markup.underline @string.special)
+
 (interior_sequence
-  (sequence_letter) @letter
-  (#eq? @letter "I")
-  (content) @markup.italic)
+  (sequence_letter) @character
+  (#eq? @character "I")
+  (content) @markup.bold)
+
 (interior_sequence
-  (sequence_letter) @letter
-  (#eq? @letter "L")
+  (sequence_letter) @character
+  (#eq? @character "L")
   (content) @markup.link.url)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "X")
+  (content) @markup.reference)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "E")
+  (content) @string.special.escape)
diff --git a/runtime/queries/unison/highlights.scm b/runtime/queries/unison/highlights.scm
index 956dc5824..d58285ed8 100644
--- a/runtime/queries/unison/highlights.scm
+++ b/runtime/queries/unison/highlights.scm
@@ -63,7 +63,7 @@
 ;; Terms
 (type_signature term_name: (path)? @variable term_name: (wordy_id) @variable)
 (type_signature (wordy_id) @type)
-(type_signature (delayed (wordy_id)) @type)
+(type_signature (term_type(delayed(wordy_id))) @type)
 
 (term_definition param: (wordy_id) @variable.parameter)
 
diff --git a/runtime/queries/vhs/highlights.scm b/runtime/queries/vhs/highlights.scm
index 9a2d05cf4..a7e1af301 100644
--- a/runtime/queries/vhs/highlights.scm
+++ b/runtime/queries/vhs/highlights.scm
@@ -1,4 +1,4 @@
-[ 
+[
   "Output"
   "Backspace"
   "Down"
@@ -15,22 +15,31 @@
   "Hide"
   "Show" ] @keyword
 
-[ "FontFamily"
+[ "Shell"
+  "FontFamily"
   "FontSize"
   "Framerate"
+  "PlaybackSpeed"
   "Height"
   "LetterSpacing"
   "TypingSpeed"
   "LineHeight"
   "Padding"
   "Theme"
-  "Width" ] @type
+  "LoopOffset"
+  "Width"
+  "BorderRadius"
+  "Margin"
+  "MarginFill"
+  "WindowBar"
+  "WindowBarSize"
+  "CursorBlink" ] @type
 
 [ "@" ] @operator
 (control) @function.macro
 (float) @constant.numeric.float
 (integer) @constant.numeric.integer
 (comment) @comment
-(path) @string.special.path
-[(string) (json)] @string
-(time) @string.special.symbol
\ No newline at end of file
+[(path) (string) (json)] @string.special.path
+(time) @string.special.symbol
+(boolean) @constant.builtin.boolean

From 0d09fb4f550eb87a02f5f17dffb0800220f2e937 Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:17:37 +0100
Subject: [PATCH 662/967] lang(git-ignore): add `helix/ignore` to git-ignore
 file types (#9447)

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

diff --git a/languages.toml b/languages.toml
index 87d4ae235..785bc9701 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1484,7 +1484,7 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-gitattributes", rev =
 [[language]]
 name = "git-ignore"
 scope = "source.gitignore"
-file-types = [".gitignore", ".gitignore_global", ".ignore", ".prettierignore", ".eslintignore", ".npmignore", "CODEOWNERS"]
+file-types = [".gitignore", ".gitignore_global", ".ignore", ".prettierignore", ".eslintignore", ".npmignore", "CODEOWNERS", { suffix = ".config/helix/ignore" }, { suffix = ".helix/ignore" }]
 injection-regex = "git-ignore"
 comment-token = "#"
 grammar = "gitignore"

From 1616021a5a5378118678b57bca0ae844af5922ab Mon Sep 17 00:00:00 2001
From: Chirikumbrah <78883260+Chirikumbrah@users.noreply.github.com>
Date: Sun, 28 Jan 2024 12:11:05 +0300
Subject: [PATCH 663/967] Make status line modes bold (#9449)

---
 runtime/themes/dracula.toml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 1253544f2..1473c1a83 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -60,10 +60,10 @@
 "diff.minus"                      = { fg    = "red"                                                         }
 "ui.background"                   = { fg    = "foreground",      bg = "background"                          }
 "ui.cursor.match"                 = { fg    = "foreground",      bg = "grey"                                }
-"ui.cursor"                       = { fg    = "background",      bg = "purple",         modifiers = ["dim"] }
-"ui.cursor.normal"                = { fg    = "background",      bg = "purple",         modifiers = ["dim"] }	
-"ui.cursor.insert"                = { fg    = "background",      bg = "green",          modifiers = ["dim"] }	
-"ui.cursor.select"                = { fg    = "background",      bg = "cyan",           modifiers = ["dim"] }
+"ui.cursor"                       = { fg    = "background",      bg = "purple",        modifiers = ["dim"]  }
+"ui.cursor.normal"                = { fg    = "background",      bg = "purple",        modifiers = ["dim"]  }	
+"ui.cursor.insert"                = { fg    = "background",      bg = "green",         modifiers = ["dim"]  }	
+"ui.cursor.select"                = { fg    = "background",      bg = "cyan",          modifiers = ["dim"]  }
 "ui.cursor.primary.normal"        = { fg    = "background",      bg = "purple"                              }	
 "ui.cursor.primary.insert"        = { fg    = "background",      bg = "green"                               }	
 "ui.cursor.primary.select"        = { fg    = "background",      bg = "cyan"                                }
@@ -74,16 +74,16 @@
 "ui.linenr"                       = { fg    = "comment"                                                     }
 "ui.linenr.selected"              = { fg    = "foreground"                                                  }
 "ui.menu"                         = { fg    = "foreground",      bg = "current_line"                        }
-"ui.menu.selected"                = { fg    = "current_line",    bg = "purple",         modifiers = ["dim"] }
+"ui.menu.selected"                = { fg    = "current_line",    bg = "purple",        modifiers = ["dim"]  }
 "ui.menu.scroll"                  = { fg    = "foreground",      bg = "current_line"                        }
 "ui.popup"                        = { fg    = "foreground",      bg = "black"                               }
 "ui.selection.primary"            = {                            bg = "current_line"                        }
 "ui.selection"                    = {                            bg = "selection"                           }
 "ui.statusline"                   = { fg    = "foreground",      bg = "darker"                              }
 "ui.statusline.inactive"          = { fg    = "comment",         bg = "darker"                              }
-"ui.statusline.normal"            = { fg    = "black",           bg = "purple"                              }
-"ui.statusline.insert"            = { fg    = "black",           bg = "green"                               }
-"ui.statusline.select"            = { fg    = "black",           bg = "cyan"                                }
+"ui.statusline.normal"            = { fg    = "black",           bg = "purple",        modifiers = ["bold"] }
+"ui.statusline.insert"            = { fg    = "black",           bg = "green",         modifiers = ["bold"] }
+"ui.statusline.select"            = { fg    = "black",           bg = "cyan",          modifiers = ["bold"] }
 "ui.text"                         = { fg    = "foreground"                                                  }
 "ui.text.focus"                   = { fg    = "cyan"                                                        }
 "ui.window"                       = { fg    = "foreground"                                                  }
@@ -133,3 +133,4 @@ green             = "#50fa7b"
 purple            = "#BD93F9" 
 cyan              = "#8be9fd"
 pink              = "#ff79c6"
+

From f0be0c6d4a6c253e258b977436144796b8bd086f Mon Sep 17 00:00:00 2001
From: Travis Harmon <harmtrav@gmail.com>
Date: Sun, 28 Jan 2024 03:11:31 -0600
Subject: [PATCH 664/967] Make status line modes bold for theme onedark (#9435)

* Make status line modes bold

* Revert change to onedarker
---
 runtime/themes/onedark.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index a50b5d354..eae11172e 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -73,9 +73,9 @@
 
 "ui.statusline" = { fg = "white", bg = "light-black" }
 "ui.statusline.inactive" = { fg = "light-gray", bg = "light-black" }
-"ui.statusline.normal" = { fg = "light-black", bg = "blue" }
-"ui.statusline.insert" = { fg = "light-black", bg = "green" }
-"ui.statusline.select" = { fg = "light-black", bg = "purple" }
+"ui.statusline.normal" = { fg = "light-black", bg = "blue", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "light-black", bg = "green", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "light-black", bg = "purple", modifiers = ["bold"] }
 
 "ui.bufferline" = { fg = "light-gray", bg = "light-black" }
 "ui.bufferline.active" = { fg = "light-black", bg = "blue", underline = { color = "light-black", style = "line" } }

From 9978d421fe7237c74932c34263d91445728d65d1 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Sun, 28 Jan 2024 11:12:07 +0200
Subject: [PATCH 665/967] Include interpolated SQL strings in Scala injection
 queries (#9428)

* Change Scala injection queries to include SQL strings

* Include block comments in comment injection

* Change #match predicate to #any-of

Co-authored-by: Kirawi <67773714+kirawi@users.noreply.github.com>

---------

Co-authored-by: Kirawi <67773714+kirawi@users.noreply.github.com>
---
 runtime/queries/scala/injections.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/scala/injections.scm b/runtime/queries/scala/injections.scm
index 321c90add..1ad68557e 100644
--- a/runtime/queries/scala/injections.scm
+++ b/runtime/queries/scala/injections.scm
@@ -1,2 +1,16 @@
-((comment) @injection.content
+([(comment) (block_comment)] @injection.content
  (#set! injection.language "comment"))
+
+
+; TODO for some reason multiline string (triple quotes) interpolation works only if it contains interpolated value
+; Matches these SQL interpolators:
+;  - Doobie: 'sql', 'fr'
+;  - Quill: 'sql', 'infix'
+;  - Slick: 'sql', 'sqlu'
+(interpolated_string_expression 
+  interpolator: 
+    ((identifier) @interpolator 
+     (#any-of? @interpolator "fr" "infix" "sql" "sqlu"))
+  (interpolated_string) @injection.content
+  (#set! injection.language "sql"))
+

From 5e0b3cc28b8ae6da1f41b47080a695c99bbc844a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Jan 2024 14:05:42 -0500
Subject: [PATCH 666/967] Use injection syntax trees for bracket matching

Previously we used the root syntax tree for bracket matching. We can use
the new functionality in `Syntax` for finding the correct syntax tree
for a given byte range though so we use the correct syntax tree within
injections. This improves bracket matching behavior within HTML
injections like script or style tags for example.
---
 helix-core/src/match_brackets.rs | 8 +++-----
 helix-core/src/syntax.rs         | 9 ++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs
index 150679b5c..b8bcc28ca 100644
--- a/helix-core/src/match_brackets.rs
+++ b/helix-core/src/match_brackets.rs
@@ -57,10 +57,10 @@ fn find_pair(
     pos_: usize,
     traverse_parents: bool,
 ) -> Option<usize> {
-    let tree = syntax.tree();
     let pos = doc.char_to_byte(pos_);
 
-    let mut node = tree.root_node().descendant_for_byte_range(pos, pos + 1)?;
+    let root = syntax.tree_for_byte_range(pos, pos + 1).root_node();
+    let mut node = root.descendant_for_byte_range(pos, pos + 1)?;
 
     loop {
         if node.is_named() {
@@ -118,9 +118,7 @@ fn find_pair(
         };
         node = parent;
     }
-    let node = tree
-        .root_node()
-        .named_descendant_for_byte_range(pos, pos + 1)?;
+    let node = root.named_descendant_for_byte_range(pos, pos + 1)?;
     if node.child_count() != 0 {
         return None;
     }
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index a5a85c575..a403e7ccf 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1338,7 +1338,7 @@ impl Syntax {
         result
     }
 
-    pub fn descendant_for_byte_range(&self, start: usize, end: usize) -> Option<Node<'_>> {
+    pub fn tree_for_byte_range(&self, start: usize, end: usize) -> &Tree {
         let mut container_id = self.root;
 
         for (layer_id, layer) in self.layers.iter() {
@@ -1349,8 +1349,11 @@ impl Syntax {
             }
         }
 
-        self.layers[container_id]
-            .tree()
+        self.layers[container_id].tree()
+    }
+
+    pub fn descendant_for_byte_range(&self, start: usize, end: usize) -> Option<Node<'_>> {
+        self.tree_for_byte_range(start, end)
             .root_node()
             .descendant_for_byte_range(start, end)
     }

From 8b6565c83924e7ef9176ae4611ec368fbf75ab8a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Jan 2024 14:29:49 -0500
Subject: [PATCH 667/967] Respect injections in :tree-sitter-highlight-name

---
 helix-term/src/commands/typed.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index ee02a7d25..81ffdf875 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1546,10 +1546,7 @@ fn tree_sitter_highlight_name(
         let text = doc.text().slice(..);
         let cursor = doc.selection(view.id).primary().cursor(text);
         let byte = text.char_to_byte(cursor);
-        let node = syntax
-            .tree()
-            .root_node()
-            .descendant_for_byte_range(byte, byte)?;
+        let node = syntax.descendant_for_byte_range(byte, byte)?;
         // Query the same range as the one used in syntax highlighting.
         let range = {
             // Calculate viewport byte ranges:

From 035b8eabdbad02bdcf4f254162623f14767e62de Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Jan 2024 14:33:37 -0500
Subject: [PATCH 668/967] Respect injections in movement::move_parent_node_end

---
 helix-core/src/movement.rs | 7 +------
 helix-core/src/syntax.rs   | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index 6c4f3f535..54eb02fd0 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -573,16 +573,11 @@ pub fn move_parent_node_end(
     dir: Direction,
     movement: Movement,
 ) -> Selection {
-    let tree = syntax.tree();
-
     selection.transform(|range| {
         let start_from = text.char_to_byte(range.from());
         let start_to = text.char_to_byte(range.to());
 
-        let mut node = match tree
-            .root_node()
-            .named_descendant_for_byte_range(start_from, start_to)
-        {
+        let mut node = match syntax.named_descendant_for_byte_range(start_from, start_to) {
             Some(node) => node,
             None => {
                 log::debug!(
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index a403e7ccf..24de1a338 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1352,6 +1352,12 @@ impl Syntax {
         self.layers[container_id].tree()
     }
 
+    pub fn named_descendant_for_byte_range(&self, start: usize, end: usize) -> Option<Node<'_>> {
+        self.tree_for_byte_range(start, end)
+            .root_node()
+            .named_descendant_for_byte_range(start, end)
+    }
+
     pub fn descendant_for_byte_range(&self, start: usize, end: usize) -> Option<Node<'_>> {
         self.tree_for_byte_range(start, end)
             .root_node()

From 0328fa4d02ff7fcab221fcc6d9051bdafce63a79 Mon Sep 17 00:00:00 2001
From: Abderrahmane TAHRI JOUTI <302837+atahrijouti@users.noreply.github.com>
Date: Sun, 28 Jan 2024 10:14:12 +0100
Subject: [PATCH 669/967] adjust color darkness on ruler & inlay-hints (#9375)

---
 runtime/themes/cyan_light.toml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/cyan_light.toml b/runtime/themes/cyan_light.toml
index e18c46a9f..45cb6539d 100644
--- a/runtime/themes/cyan_light.toml
+++ b/runtime/themes/cyan_light.toml
@@ -95,7 +95,8 @@
 "ui.text" = "shade05"
 "ui.text.focus" = { fg = "shade07", bg = "light_blue" }
 "ui.virtual" = "shade03"
-"ui.virtual.ruler" = { bg = "shade04" }
+"ui.virtual.ruler" = { bg = "shade01" }
+"ui.virtual.inlay-hint" = { fg = "shade03_darker" }
 "ui.menu" = { fg = "shade05", bg = "shade01" }
 "ui.menu.selected" = { fg = "shade07", bg = "light_blue" }
 
@@ -119,6 +120,9 @@ shade05 = "#434b6c"
 shade06 = "#343a54"
 shade07 = "#25293c"
 
+shade03_darker = "#9199bb"
+shade04_lighter = "#616d9d"
+
 background = "#f2f3f7"
 foreground = "#25293c"
 
@@ -133,7 +137,6 @@ blue = "#0073E6"
 dark_blue = "#185b93"
 darker_blue = "#000080"
 
-
 purple = "#660E7A"
 light_purple = "#ED9CFF"
 
@@ -142,7 +145,6 @@ green = "#00733B"
 light_green = "#5DCE87"
 green_blue = "#458383"
 
-
 yellow = "#808000"
 dark_yellow = "#7A7A43"
 

From ee68fd09ac51b613061d6eb0680d8d42cc21260e Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Sun, 28 Jan 2024 11:18:35 +0200
Subject: [PATCH 670/967] highlight(scala): highlight abstract methods in
 traits and classes (#9340)

---
 runtime/queries/scala/highlights.scm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/runtime/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
index 40b230ec4..4f90bfda6 100644
--- a/runtime/queries/scala/highlights.scm
+++ b/runtime/queries/scala/highlights.scm
@@ -57,13 +57,21 @@
 
 (class_definition
   body: (template_body
-    (function_definition
-      name: (identifier) @function.method)))
-(object_definition
-  body: (template_body
-    (function_definition
-      name: (identifier) @function.method)))
+    [
+      (function_definition
+        name: (identifier) @function.method)
+      (function_declaration
+        name: (identifier) @function.method)
+    ]))
 (trait_definition
+  body: (template_body
+    [
+      (function_definition
+        name: (identifier) @function.method)
+      (function_declaration
+        name: (identifier) @function.method)
+    ]))
+(object_definition
   body: (template_body
     (function_definition
       name: (identifier) @function.method)))

From fe443910160e145c69f32a028b313d6f596e3fbe Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 28 Jan 2024 04:19:25 -0500
Subject: [PATCH 671/967] Add argument to textobject in gdscript. (#9288)

Currently `maa` only selects parameters in a function definition.
Allow it to also select arguments inside a function call.
---
 runtime/queries/gdscript/textobjects.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/queries/gdscript/textobjects.scm b/runtime/queries/gdscript/textobjects.scm
index 089544682..47512bba7 100644
--- a/runtime/queries/gdscript/textobjects.scm
+++ b/runtime/queries/gdscript/textobjects.scm
@@ -13,5 +13,7 @@
     (typed_default_parameter)  
   ] @parameter.inside @parameter.around)
 
+(arguments (_expression) @parameter.inside @parameter.around)
+
 (comment) @comment.inside
 (comment)+ @comment.around

From eb3c4e9f005d323ea8de828c23b4a7c0903a5702 Mon Sep 17 00:00:00 2001
From: Twinkle <saintwinkle@gmail.com>
Date: Sun, 28 Jan 2024 17:20:51 +0800
Subject: [PATCH 672/967] feat: add hard/soft contrast for gruvbox light mode
 (#9266)

---
 runtime/themes/gruvbox_light_hard.toml | 7 +++++++
 runtime/themes/gruvbox_light_soft.toml | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 runtime/themes/gruvbox_light_hard.toml
 create mode 100644 runtime/themes/gruvbox_light_soft.toml

diff --git a/runtime/themes/gruvbox_light_hard.toml b/runtime/themes/gruvbox_light_hard.toml
new file mode 100644
index 000000000..4a48116ed
--- /dev/null
+++ b/runtime/themes/gruvbox_light_hard.toml
@@ -0,0 +1,7 @@
+# Author : Twinkle <saintwinkle@gmail.com>
+# The theme uses the gruvbox light palette with hard contrast: github.com/morhetz/gruvbox
+
+inherits = "gruvbox_light"
+
+[palette]
+bg0 = "#f9f5d7" # main background
diff --git a/runtime/themes/gruvbox_light_soft.toml b/runtime/themes/gruvbox_light_soft.toml
new file mode 100644
index 000000000..a29b23734
--- /dev/null
+++ b/runtime/themes/gruvbox_light_soft.toml
@@ -0,0 +1,7 @@
+# Author : Twinkle <saintwinkle@gmail.com>
+# The theme uses the gruvbox light palette with soft contrast: github.com/morhetz/gruvbox
+
+inherits = "gruvbox_light"
+
+[palette]
+bg0 = "#f2e5bc" # main background

From 4ab70295352f6e4f86c4d170a04ceb858ee79d5b Mon Sep 17 00:00:00 2001
From: NitinKM <70827815+NewtonChutney@users.noreply.github.com>
Date: Sun, 28 Jan 2024 15:01:10 +0530
Subject: [PATCH 673/967] Add icon to Windows executable (#9104)

* injecting the icon through a resource file, no extra deps

* formatted

* scripted rc compilation

* formatted and restructured

* simplified conditional func call
---
 contrib/helix-256p.ico | Bin 0 -> 270398 bytes
 helix-term/build.rs    | 146 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 contrib/helix-256p.ico

diff --git a/contrib/helix-256p.ico b/contrib/helix-256p.ico
new file mode 100644
index 0000000000000000000000000000000000000000..16781cc10b53d50b51f56c7a1d95473eec2a8fb8
GIT binary patch
literal 270398
zcmeHw4Qv!wwx)-N7!)BEp$J7N!U#nXiXs$6(FmbYKoN=%LTr{8md7w`CNGa6#$f(2
zZHI1bLm0wj2w}kXFj<zz=JA+pmY0{8$75K=kMU325W)}wj<KD_Kj1bDi%=A?2vPf;
zs=nP--PPSy-Bs09)yL?gyX#cld+Xfuox1ndJ@=NB{0RT(??)w5OQug9T`~#Zrz;0a
zN=7Ni=_miO23P~uX<)FmY{Fp6;<baVi(j)YRZfXDz#4F~25z*zJ{p{#3w#Fr093fS
zyj(Wc0BgV+4S?&<0|$Y-fD{As-x~FDDy#ulY5+Wc3fKbl#5gawPoK<xSJoOAiZzg*
z1_oNno&dj>0&P0H7e0XbpP!ofYSw_OG;pJ3(J1i!W#AKl`uKwDdY{aHSJfUDhBc78
z1_oQoo(13E2S&2+Uibp$f9~q$D_H}s&;YppBtY-;x(xE3`R|IF<3g|oa@W96>*BHC
z`)fcm@W>?h$p`TBKX>)>m8^k+X#m{)32+R!4~XZv*-z$w!D^5*W(}Cv0JuIC*ah6o
zgZIKuF#pY00bjuya9jiOoZZ&NE5Z587Vw_=?|2PzhO7be8W?I_G6sB~2b=;PTF8C!
z0sQ<oUnK>(qP6<asMeYf5EaFL#i9Z5^9A5Aa1RjAY%4#R|1LMCwm{RUaCPIe;p&FT
zZGqo1|6N{RRum6he;U{hL~P={@FC29D=N&UG&-sqr-A!hfcYIYjiYVKhLd%P2Eg@k
zzzX1k&Aey+yQI$biUGb)09FB)fZDb|19M+bQ9d~~pv2|A0?t!h?gNLoPd<R3|1Pp2
zaD5CgA2<y>0>bUpjZe9#h+GtlH89Y+_&M<K0C2}a-t+U{;(E+CIdJ`X;3ME3AOXbx
z@_f_f>)ojV@O~2bz6sEa%N6{z`;(vl1vZb?t@8NZ5^%jM#(UyEA%bWBa|JFQXK%3v
z23udJxZEW`3y{m4T`PS8^WWn7HIrOtppnM*sh@u*#(BYg`aBDaH<KQp>s}2Ew90Y0
zv%vWi!1sWaJkB*O=6?ZA2K-(M=y9L;f3&@Z$NdUeJ(guX&|3Bk_`Vkyb_wr=zhM4b
zR?FrR0>5Vf$!&i1^Z#&oTLZuEH>XxtosBhkC@!}Gxau<AGye-{Dec=D$AbGb)~Dus
z^7rH6K;xJK7L&8iQ3K#T#pNyp&H{z*;|s3qee&}^$2!jEGVp#5kgnY?{6HJV|0d>>
z4`1uN2Eg~1fTKV@ak+Y2wc{A`-(eH!*m{V@{Ptye_LC170cJT|JkBmh4S?@cfO=pM
zu!F01q{;lxvA%P?EF5Tf3cS8xfdAwJcIBE6U+0Vl!1W2hTfij`@m}~6=D#y$63+$v
zp9x-PYx|2nKp)P1A$~D`ag7ELk3SlGe--!wusSYR@YC*3=D))h1wPYUp9g^8c(%_^
z+5<ce;BYl%%np2?0W<-30lPVBXZp<lj5Te&5WHV$g8SqfXdZAwxVnkQ0<EtOQz;I#
zES?O$2Y^10^IrHA=D#Tm$p2(;x!ffGg%3E1_W>{EUjk0StOmgKalmq*(<i)V{+l%d
zi_XuH|Duo3kL$N%Ucl296^E0_pn;)tavy&VIDZoO!DrkjAHdK54E1k^C{O+iKS1vf
zR&)d!$JtRvPP3#0<9pM=kNrR);&R3F+3ru~zr)6E5&y{#&=}%pz$@*%K8R(th`IWc
z!1)b8H()pa3Y|Xl-!jWFmXL+~7i|H0mv{i+SYcyTpnDd$PI0+qKnvjJIlET+4CcSC
zHQ0C12L1~_(1WzMU~GWb3o=oCLoNRW`{kC+0_TqdZi&malH-}uV*Z=36)R4)k^kfe
z=v`qOuoQiQC#)#1pVI)}rvZBax5edV;;fZ2=D))RZZrQyTi^%ea{~Bj3&#+r)bK#t
z;)&pVIdBEAl22Ysi`SP+u?~9=IK+S92ZoW~Uf>yf@5&pg5B+&D?WMB-I0HN^a_*C_
zTIG$J^G_)q=D+X*SCMZ8#s;4Bk0#CC32dF>a*qIBh|6`N9YO1iFEyt{K099x6o~&~
zY=G7jTnIlfHsAa3%Jr~uip#A9`T-|+<&``rc7fx|9X8|w@?W$C?xPGx0bkE0#+d$i
z*!P>jMdrP(-=lct$qt);(P!rZ{tG`ah_ck9Eilzjm4dam)N#2^?xo|E=e{WCfdRbx
z^i$n?;a*(Cf8hsckFk~T0~5TUzf5Js^Xz$`0q}ZUuHdL$pQN9;nRLlAdo<ue{*xbg
z2%G}uVcvk})*KybUHla6xeD-0T&`Wb7wH~D|A^;@*hBG*sk)T^qAfssk2Rq!FeBql
zxI_pWrnuZ?Ko}6V&7YZd(F0w*=#nZdx?;GT|H2PMP|g~xRp!d^Aw2I#!G>Q3J_Y<3
zmur^~qjvv_q9dJ)ZrCII7k;1<<y{UxFwQM1g#A)n?ml1yu!|>tOqaM{G1OMZd&w8j
zm_5dS@&h!N_#`kVyzNlIY-g}V-Y=Kpa=V!Kru`npGB4|ITg>DA1>`<u?Lq#FwgAN$
z?+2zkslq{JFP%lO-*Z5*#N}Gm{-C*zH0RM1<2g>+RiX0oF#m-g=*B&404CX~!{L@P
z>f_G@J_d>{E;nEPQ*6UoVBtVpS<%e(w9_7~O4|qgCqF=O#x1}S>}6>AdnAnOPlN65
z25tiRa-rC+r<leHtX0hGMO#H$3)Arl|3zEid)yE0Q#vcW?O@)0OYnXIY<CrKnR##8
z?+rs|dxl!dIM&lbzFM7>&-gF=0L2;afgi}p_As_bak=w>(*U(yi|v`6&;3&0=r}N|
zzvK11eX!N`&gp42;8Xq!KX664zXro?PuT4Xz(>G6ARitS+qE<nN^2D^LCk~YeK4)n
z@-M42;B)?yAE3F!XMlz6fkSEM62oqv2DStJK(TQ*-}|Nad7B1W7uz}pYn9D&ItdLF
z0slo?fZ~jg0Ghd`u-oy#8^A>%Umg_O^|Tkk0gRJ8m#`@Q<|Pdj5&wlBpgoI17k0k?
z%usmI+`+cRpTmY9F!xRQKGN4o;FUq1zvm^or<An_`7ir{&d`Cru8-H>>Hm+vm0-ig
z_T0|remlYY<$!DEV5b;0A26(eV&y;XTk3e{kaTI^PO0bQDrul)3HyP}{htUpUjtw1
z$`~xe2G1vIGyoo~A}$my0!>n9=(p0>4cn#fPW?i8F1DF!3+MAJ^}@CE9;69<e4ewb
zVU9n3fcMJ)8Y3@WA3*mGKXAT&pLF%;X6eS+<=hrf<~^JO_vZ~@opOIzJKsgJ2Eh9{
z0Ijo8-29LE0Mf(7_uiAb|FA|HIJdM|{lF#gekIm5@cbHV$@b2_wHkoEPXTB>e&)Z>
z0onpIHt?7IbyDxY{Jk_-JYxfc;C($XRcj^u%dZ;fsBRh!?$dj5=6|vdXl!7|0qM%`
zs-?)kzu|?xdah-pxLmBkxA-T1wR66&^cn#77XcJI!#*I54leBajdbnUMydZ#Kl4+c
zfadHr1FvCxkK=OFQ^eO2T5B8J|D5@s!T+Hx5Uy#EzWVjAr0f4{HO2=1tJnR&Rq%c-
zcwe-8u=$$QCT|Yhp9_qz56IvHsBJ)F1KSTumw&rM>igHXl=il_<_}R^?p`3L*hrIR
z#ix5j1MPvPQQ&?R@PK_l79SAv1Lte^OW%C7O^W<+g%{cav@Y=p;HM+J&yGh}>1;9E
zs~evH_i2A_o)3^_96--Ee!2VC66O+1{mskV=m)5e--dSnQq0}sxLju`<+<Fj-_AJL
zcnxq@&(`^vPTN3?4gBU^spo&cEe-tHHDd!k;QkhH|0&NIA{V$|8fe?rI2vPu3&C|-
zQ;*ix<M#qabU^P5gP2QvC@A&)+na?P8=$z{gNVoHxZHxV$om<$S2s)o_csCE>;p{r
zK=^_4bstDqk8G80ocXzveFBQh{S43hxr42*7i@0??^{0Kfm#FL{&axW+NU-5xh-Hs
z2h=CPd0+l&uk`IdRZ0%T8D9YR-@w|1<JEP?-&q4zXaM~InkPuH0<`xIzauc>1Lz$1
z0Xfe2gPl_EKmXE>IAdC`jMgoC+KPJSG*|<fG!PCPqVd7y0PV%cZ2_Y?ps|6_0qN_;
zcM@^Nnd9xV&E=)I+{3^Nnd*yWtN}YTfOmzH!GC&B5Me)H!Vkg^T-do!x|VyKF|9{_
z8o>JGuX9|k9mdUR8rA@~KLcn2IEL6nTY!A##rO7@jWecwNLHbb&vChiEtF5RTLYcd
zjbmWX^MF$T&mA)12jn>853|M@)4pT7fN6HuC8y6C$W;S)Ur2F8D}hS@j|~{r0gVmp
z_)xlX7;(m@|C_qsPkZTn3~*d-u13k%Ij(`WEx(_FSh-yt!Grf`{F{A&abHMr#$Eq&
zBdtMp0qc{$cI*5?j>~o2f;q!{G;p)?KR=CURz2e5?p;0@lHdpA_h9S?4EO=^mxwd&
z2>$j$d)4n2wro7Y{LjZ2`C7*`0M1VU-U4X-IC<V1&4s`IX*uHNcguFo?EwQmAklB2
zJ&TS3-2QjWia8^*8W?I>JQ{qT2Ydn0`zduFR`vt^e_Doi?FQ+>yYF*<Ai-~=y0{4+
zunTjrrkbrAKA$yUrv||F835LYUwk)(_sM<$ziE7n#<^&`i`xRG+5+S&E(0rRy(T;B
zl+$JnWYfUS^KVQUY+X_V&i5JNef%6+D+lZ8(z?2T!Fw-SONae{DL+8(S5E`;JGM3Q
z{GV)w%5qCJFmgRO;nwA~D~G~AQ~LNi&-ggkGs)lwXnp<eKUB!`U|`Se2h8;gXuj29
zfam{OYT=xio(7^{Zx}OjJv1-cwe9rK`8QJg_?ft#Nd`Y~<Lu9*YyYrGo)^n)0aI-O
z>J!lX>+R?haQu&+;qtM(H4yE7=Y^5$I}VTZ?6`OHt5w>uy-eITDf<p<>|bemM~;(W
zKVaGqT!0@~0YAX|^5$*voB(Mc`fc^oc;?rP^wdR0dh4a(t6MOZk3F$W^4jqEVr<~E
zUrLt{FH3V{*$<fV0~DA28SqN`wnM!B2h%tw4Gdqd93Ac6zGS4Q_5$%<Mo*n|^UIas
zKF06t;=f22et_1?`1YUHN*DLMr@SNMd4xva71DXMPRjv+*Z<0i0mXaKa97oMJo9(q
znSVddefWUrx9><8^Ru7(!UxbNjSc*t<?=dOw4N5X1x&RC$Pe@YSih}lQt?_e-?>o@
z+`6`PeDr$g0C@jM&Ha(yooM@S1s}1lt(u=se5XDE^7#(yY0|oyw7w?$0aJe95qtox
z<GKX#S-k$YQ8E<Sc{eYi&3`=<8tJWjsO3Jj|H1z&8^FUQ&huaR82AC2OHAu)e}#3n
zX^uSm0aJe9d-#A8z^sny#!*FP-h8`RG=Tp80<`(>rgC55|E)svU*!jApN+16TrbhS
z8?a}FIUNi`XL|wO|0@e8ibWjl3OtFizO(w=k3Ijt*^Kso0iXYZ|Kbzv0or$q_TQp?
zxVSA~+7DiZ52(O?FTDR}u@F7YeMY;3%h2wBkct1%u4-wh9s64e{<+~ZHa0-}aMFI9
zJeSzC51_Guv%o^k8{jzOH2m=M;alHq9vki1aUwnU#rwY<(#;FBr;P*e|IGRp8XLfV
z+_Wz@#~GXU0n~q@IOC(hOMbR>zPD5jM8B<h25tYIto+A2K-Y``r1KB(1O0#cnbdV`
zqeScIz@8cAbT9~=)wc&4r=(g6AMv9GFzz=GZU66$@E`97+}j37@(FUB@$Wd!I7c5y
z>o>j?4m5C_u^&mVx~J&%;7agcnd2ws`epcxUfYIwK+E0P4^aC68XHi@8S`9Xvuz=Y
zGyVd2HN35X=Mt+p<EO7^`&Srw_N&jKxj;i59`FI=59F}{iZforamMEQ0>WR=KJZN#
zADrPQyXSjRG=OKnY5tQhp!Weczx?~yoIn?j398!yF+YGcb>)3`X#XA9G{c+@D9*SB
zeqb_l$3Gg#mH%>kpr=+E{$`Uj)Tvps-d*nqll=gGe|PE^wDwRR?3tcz><7&0fcAY{
zj<ErbGxmWS$cz8-IKfVd#s#q^kn{0DI@~reKVfjFt*rLOAAkM~?07ElIl%iFoAUub
zKxZd`IqlncF0q&0K>qxX%@3eH!M8P%ygo=ftr6h5KEZwXhNFPy9XD)vJn#l^5#Y9f
zIUP`(@&0gi!*nlmpqR^UCI6K%!a8aA+E%<L{JYqE;ez{tN8tQfVBtW^;<R(z(4Ku7
zwj2Wb*$<fZgWb^C28<1GoUzB8iS_(f;svl)m>e@W)VZRN;{jK}`wHxrJJD#hz>Z%8
zjsUd2CbtKS>wxAGpF>-qEF3t*amGdsuE6Kn!+%wupgSnt`b!1I1{{qY7zXe6q7RZ&
zj9Xja5bbBY05}8CdvNvx#&tk(#>atK9f3m}XIx-@XUpDh{)>47^83PzzeJzF*0BNF
zFZTp^KP%F@IB(m74NnBhfhz#}0CPH^IO9F&6XfKBv)L`nt<iu}{HHZUu)cu2hUn1w
zU!YH5X)H1I@mqi;{Vj_vZ+pUyrvbYG+J}q%fH@t=amLV_;Xar(md&Xc(SURO7kvWw
zf$KY@TVJoo9KxSlF*eW*-ftReEwgp(sdMXxqtLgV2|NB6pf)c10pmKLK9n41jP(Z6
zj=>tSS3bvD4LHw#;Ro=(uzS07>(XkhEAY3uyf3^1-X8!QUE{XBx^XOQc@coIu0|U3
zVn1M92lt^b8e4tdS}W$%a@9Z~`JWgY2$-2m`~aN)40z>6%j*S;OMwkf0yY5j?u&hZ
zIUSJBmSSum?=hNO?VhhwG~fpQD`NvRmw2;;y~Q$(4O{^4R}8e4xn}MuY<N0sc^@#s
ze!!F;q`B9tIs#4X0}AMj+`)g*ClGUqD`WA6h~HD@_(t%Fy@tzNxyM~Na1dhyjV}YA
z0yH<4+XKdQK=TKe7SQ~QK5KXJU-$uKzmZ#Cl|RCsBcBZXd66gji&!^j9PD{H5N01>
z*avn&SG<RDfjp60`7g!>P`;LtzMTsJ&x{+xo+kqVfMN`}Es#wIfrex4TYqEud)oq0
z%2V08pZ{{3fc7Fg2K>ZJ$_4jl01W{3b=eQ3)j`9(@U{c<yi~V-DXT~LFV-i!2_LWv
znCcb%gZHC>SAj18jx$c@0|Ez|!W-)g_CCie_GEQAJ;s0G2QI@0tc>>7duDw~aDP1T
z7H|>Zwm`BD0*9`2RDHnf4qHv|Ea`ca|KtZ~pTg6?{Af?zm@K#H8Zo#(1*ioE*$=4w
zpxg(T<C=;pl7e`c|Dr8$4?f^9+5(;$Lk9O>0%$HA&57goKy||-i~+n^B(!tQZTf)!
z!Vg5?2eyy&)Vp$yfL?`%w>46n@j`&+#y>22KM*)np{FN4W}gOp#DC!jF2E1009-Ri
zFk9^*u4p2-&vC}sk2IUESZ=Kbe8_+D1GJavXTU2XJv%)!rVJl24cG$=1I5@UVE$W6
z@2si$l>eeFa0fo%0LBI!jS<YM^b9AoZ*8Qx#Iu0oK(WOcGygN#h8-fG^I!M@+TU~&
z#s+L%Bf!e~32!^}1o&SDv;f5tXUzP!(ufSCRV4f;Kkx`>1C|1wnQPi!-B3(%#>{^M
zoVD_lBI3Vj3;Y27p8$S(tGC`Wv8QMQP@M68fMVwSIyS)kx02ij(kep!3qLRnAFvnj
z%=(n)mAS-oz<=6%$B%P~ng0ejYvn0L%zxnruEGaYU~IrM>r-M4JrQTz>9e)~^WREx
z8%Qgc{lCE%!5zPR(p=)Rz`|&6op<7lu@^7+PjSW(pZEdhzX8r#c?#Cxd=qT|8XNNq
zm-D#~iZeb6X!Z!SQr~u@1@6xPnt;0=_XEs-I}9X4n&AH&@So<;=ffMnT{{SU)B~Q0
zN9zd4amMq&|5Lz2kNN@Te+I7FA&Pd@OhF%j`oMnUuod@n33_=8@KBs_!vt`j;*2kO
z&<8O8?I3xEG^3Z-j>di*hnfFr{U41Dd;!e6-RGV4DZu@yKt154IAi922CmvAigpL*
zV{b0%`&#kL^lKV-p`RvThF$ewN4nrY#Tg$3ybx#1{I|mhvZNWkR`mq>03S2|4f#Kc
zGY$Zgv#8ZIVsL+KxTa|V;tbE>yPM|@G5-r>HL&LwfNsFA&u^>ms}s6fKGIh=u0U00
zD%<ee70-p&Y(5^|Q2Qucwco8ifcbB#R;@i5?*W#<rm3B4HCOza9?c~_3CxN1?sVl`
z;_&KqlYuIr50GT6*&>BE?UKTQ-@45YF#oNkw5il?_tcGoEtdoA1I+nAiZk91OgE))
z8&7Uuy>1-1z6=P*c`x`cJ}b9L;VtjM4;*rfA7K95XcI<~j`oJg2T+V0_XW)P0BYlq
z&NcuAi!%<dsvHHrzYKf|{E(LW!Ut4rkizS>OX02i+~5P4|3*maz&Wtt8Nf#X&kZu?
z2WT$kIiPIhy0dY{;nkJX!S{W@NLJnp{)^9wO;UJ6ofO{oVIlnh^WOn(8_fdy@{WNW
zF96N}4*|dS<L$Vw@1d{bz|7&kI$OsE!mHOm3BGRtx=iz4@Lznc-HNe+-RKh>gdb>f
z+7~eYjgr&B^KSRnPlO%QxWE;_4zBn)O^P$#16Uqs+`hVUEcjjqoC6-^&3)kmR<D=B
zmDLy<_%-<7;G_>={yWHPvsuB0rvbZxn}DA=YsbBj?<~hYrg_I1cdRU@KK@MLW8i!1
zcprN|Ap8K04Xh7J;i?au@&U|$v!rzR{J-|q()i#^fZDdy#<hbheod45P}G-N5WQZX
z)1F1(`ZQoSaML#43;v7GH5eP%SdX!R19tlX=D)*y&NaK+*pC}_Tn4lNH0I@3&f0Nb
zG}rnF@S;)uV{C6C_`V9b;u!A*|HbFpDk;4ASF!hnwu}uh|BV`iOU}EEHFaUf^v;Xl
z7n=8h{m@%2)*eb5XWUV-ZVdQ7A2<y>EExBN51_Gubv1Zj_`V%u1I&My@Y-xKV8_#e
zeZUA{$1~H<X<mfR-i-Ftk5}s*Tz?Vx2)I{x-Y1U@Y{b|=2x9}5&Lw94s|~<o-w{KI
zv4J|QCsO|@KyzdL%vr1NjrJ`19GLrMVB@s*Rh8Sp`F_{&KHd%xbBQ-&Y+xtG1}vFN
z%>4Hl=k<yUKQIn<yc`GvR`bN~>D~SA-?#T&4C47pTq{p{?k4lkEx*@dF7f6)`OYO~
z{_7FSqsQO}CWHS0ppX54IX`&w;tr|ne{7S^Z^1h_ulN9YYyfkKbAMmR{P!r=GZh=$
zr@6#Uz+LtO2K_)E&g-d{23kYXl>=L)&UF}f^NJs!IfU}~pvkocc>nKAH1f18inX)A
z{Z|26OY0%~0pork`fZ(rK7n-UUG%jpywE48l)@BaY$~P*^9;8gSm|ja=fY>z0LBN$
zgZs3m<|Xz427LgHp`bl*>q@P3{gZ0x%Xcs~Ky3lHw+Cnru^dNWq#e-kJ@`K_s{!!|
zzR&=;KLw}-2H6i7^aIo<0ERB?kgok6V*{JqJ~n_p3(XfYvgTNzp$G30Esv4#1zCK2
z6X5<!0L_J?IdOg;+qdTaVq*jS=YrDL`?g3Om2MpyKtDik0~lCeByjLV$L9Auv-gsZ
zDe3sF-R`ZUIOBx??ZL%k14jKI{J?Nmoz(ZQ??_+OV~)NX#|CI!fvoQX8XjQ&z%s`T
zk27?Y24Zo>74QL90c)O>#gGpCz^%)*Qupy{=|aG5V*_ZLY}t!GK!$jMz@f7kD}2&b
z#>j;!m<GW8X8?+sA7(#b&<|3d0KRUpBP3mIs**Z4x}{Gb#sJdszu_*%{T3F?*f?WX
zY9NX=b70T2fa3ti85?cKzz-m{Si142pmh1y7#mny==TJ~f6NQief~E*M7zJXedDgt
zt~5d}RKYa>?mq!60a^f#GdAG|hOgC0y`R-cU+q92yijwAX$=v19if!x|0BE`JQ&{c
zz9#0W;0DJ9aHR%r_wJko{%-=h0UjGLsspqKZeFUDzC9L@E>soZec>9+SxQ+`6z}>2
z2X`~~T}d@p7Yf{`IOF{Qt+~&Bz=#fFV*>;2A?cfgm`l9gsj&gP|67lE0QDMzfkPM3
z-(QM(0XeOI<Z9#O!a1UWXm8zUaG&CgY4071n`J*>L<clB&|N1*{<vNG%da*|9cyeJ
z8;H04G5;^n(2u@;D7^K9ryVg8&cyc`z+7UAGhP97vJWuf1K|gTzp0aYKCO{1ZnrVc
zc>NBF2fmNC{*iFihlbZW^S$Bn4O*%JaDOsT14P&l81w_wCjf>h&iIH8amJN_hj^!d
z2G9Hj;Z5&yTi;TP=fw0h0Pa(q@nL}XEHcs`pmWF%AkMhI1#!mvw@MvW#2K&Id^x;v
zS9!SVK;CPe>(w(KV-2L!0Ju+ciRS^Q0G>;1!Vk!C#;4wqF73)W&KT>Jtq+AO15?x0
z4<Ba@IH3WI4NL(4R|1y-9v?KS1GEQjeT_Kd6NodeF+7);)+eQPN?&lIZaELufKd&=
z4@?FB>w!V`0|xz|7#pBC<HH%_jA=b`T9<r&xV)14_(qMA&vRS@;6B9}9|bth*hE`E
z9vk=%#2No4CC>OVc)tp~pWt|9a)zvd95nEMM|O_6ePibW%!>_UZ*FDm%P1F$`8>1-
z<T&HcF*Z=Y=|19&_q6?8<<uOifG=SU6ifrHE7pu@Us<^TYwCut9<Gvx&hJos0JV3E
zncqh5o&3PHx_i;<b-VvMv@`9VMFp#1&X_fjMgwT8z62Zv?u)haXnc#txoEsgeh+4p
z2Yep+OBz?j_-Y-u|I^qUA1=HG!1t*@JunC;ad6_3*3ZP6IrP5kyMKE}qW53y2TZkv
z=>00aXPpPV@%Ufi&7DgS(*TW2f$whtmr{5y_%A-;2WZ|4&41}{3Ci<f*bkWU12o@?
z=3VjoKW1P-HPBhUmiEh?2b==T?UxHbK>O{`eAuBcd29fDHajjt^RKr99OF|^78GaZ
z;QI`q3AhVr+xkX-$JW%RxEP9$xrI0xZVQ<90~g=}-T-)QkK&}Fqj%lDdfjC3y#|Qn
z%=={jKz#zl$5Nau#miFMEc*ddet_b#KLcKgUf;><dpXL8;>Zkr{Bhv>a-h>P-s|`Q
zS}%jv%@}A4DeYl?UudRZK<l&|jP}+)R~%N!cWJi<@Vp-dzRv+p0zcTseYGz@dw|x@
z`t~0J@_JfwTY&w589&eiKd=RRLO*4<eQ^5z)d09Y9oP?yIKulRA3%B1dYZJZCatf@
zeF9T`f=BQHw2te-k?*)q;9r(ne`n#<m6O1|4M4Z!yjS}G`c7j5SXcY<-YwFNvq5>i
zZT17E`~d9(UxT?rPgrj$oT8sJfIj{c;CmU+0z4`>_tm}tet`Dbp#3%mJMg}c-j{Ko
zz-XU<<__(N_SCZv@DpJzx|jBfjnv1V1sn&ycNOoGd;qlvXy2{we+<a`aIp_C+!mmB
z1Y7R(){e5sY&aPoXaHQF2J8WbUCVp54~X>%Xf84B!%6#bQoJ1d0YiR(_IR7?1GD8@
z$WsI8<4*+N%YiGN;k}L@p#8WhUcMi3^AtbNejuwK_#8UoIHElH<JHT-b(*ug05}6Y
z1ah0Z=cen>Cpf=pgLLipm`jXxbYvgEV*}~N255iB*Su=KT<+X80It6X90Bh8g7<14
z1Rp?S19F`49}s7Jh2xCD^K?GoNVKPp=LzOcB~M)mu1^6%K)>&Jul51-o%{gB8NZ7-
zW2~>samKnn;3|9ruPNdw7Mm|DxIP|u6S(Mm-s|`QInMY)%q7Np`#d(F@dFe?{IYqA
z;w!wMf%fvs(HP%*6`cP9cu;iQSNj4Q8xV2E*nfw|24p`#^8uE5!Irs<<}?7_KM%e)
z0J+EIs`=xG@6;#2eOwGGamKVCAHOH4UuDj+_-r?80QOCBxm7?P**Zf<2k--OobevS
z8J~&88K)m3OE-4rm*W*~wr4JzF%7h@mg91lf$w4FybkB}d?EY*#Tj31th$ReNBT01
zllz71diTNnH%2j6p4IX8TAH)_GVm$jOkA!Wm%MrGA>I>wf%VB>9qb4_1OA7A{vz`O
z%zsxhJA0wP_h*59fb(&=-sHQwKSXPkVy#l`UOM3Zi@--fvFvBe{LfA`SDgX7eG*s)
zbOCCc=I`0{F$kU20%_lS-|pKv2JZ<Mzz3WG{Jx(t^WRnMPG6Xg^2)KW+eN@Rz+G{<
z*?CuJ-$ZjAj{+~H*RWP{yQh94_+JiO0rdLLemKVb*H*hLf5C2N0v`kJjmveX51`nF
zv%o^EYcMvK$_4kQ0lR^lKJ)|3|6Gj1p=)5b(}3N;O`y=vP_N~G6*{ZH+JzJIt*()t
z9izbgnZU;Y#m@NQ*-!Vt{Lj}oY`7kFI{{b)Tn4<xyF!<D7&_aFvAt)kt{SYRIToB*
z1e^nCZ9T910p`EeMv_N*9m-xh^I^ZI0cyJznoC~FpZZ28(9WOL@yoTgu5SZBFbUk>
z0CaiW2QdHh;H#CF;$1Y&+5HH($GkV?_h>AX)+$_rXTGCr+kyMjfqlS;NBscv-%1ka
zkXGBO%2BZ0r2xOrGvD6nhTb-{m#>?YgX%50WTdYSV*_<Bga4lbKX}X!F#j#Fg4_}b
zzb$j0*5Bed9dq2j1Dzc}Ti-Q%+`tEn1NWB$ogVT5%>Ue|Yspox;pNPIQ*C{k<9rgp
zUPP6yT)PI`pA1w1UWh4R{#(Li^NGNQUj%vpFO9JkvaFrZ75U3?=C$qo72yB#Km$N~
zZ@Be60rTH^(<s5(95k1Y=A#voPhQD80zK6LlM7H)d1ZOKw{|qR|0?hW@W6$Bfcc+S
z4d-?-Y<Vugeg4e;kKThEMj!u$+_dbTt8Vw!j|cbP1TMPF2QdE~Hj}n;IcE0&Y}+f(
zU#H7S^BztC^TKbh8{=^G*qR-<KLw}-23_I@nE$rccxvK!o=t{rUt<32`ahcQxDx#%
zU++x;?!N>a0qz&r4>12zDQfEx%=4KA8|Svaw*5nKx%I$QTb1vk#KHS9z(SyqamLJl
zhiw8jPIG-808Y27-IyQ6<sJim;&3&%COfP(Kyk(uKq2Ccng0%30&Jb)dfdoGC(HB*
zI%o!719FPXb-3DW&kkdR)8GU40JJ}+Q|}9z|F+kxHUro@&G&PXYi`Sn;&RslPii&8
zzoPP7;`&+O|8c;HIAi9&!)8~+{2#%+zYjd?u*yA`9p(~00sfZ(Er6YI#>{_*t)mF}
zPjhxZ0e;%Hy294DT!*XD_UyoY5og?u?{@SFnE$rdqBesf<9{3OcWJnMt)p?dT8(@E
z7r0Mx#`}Rg7W)C_zr*HHB>bnihAqHT4y)I<*<oE`noB$fI0;x4XUzO}*kXLnf11~D
z5P05UwH8fw7RMPg{~fj*pYosPGkgxrZC|z4m2tTaSF`Qe!4FWJaR7(_xsDAm|81`+
zZ3aH%|3%!>8<?{@UVEqf%LxsD`!532C&=YJ0rTI9N>b(FBmVc}UbbWJ(Wh0n$6pJe
z0dW6GfYur?>jPF6ptwbyr4RT|ak*Hh)cbL{elo<UGLQHZ_yD7Q0a}k>iJx@fg?sTZ
z|0yo_G%z1+eP6}pdckgtlo5QUzJSqn$LL++Oe5*?Io4^wqx`>ua#P$w-h1g-r%6sp
zPXpleZoo(zfYu`6_p^FRwDFk7_)q(e?ZzHj(`-};CvBkyz-fvfFtQ)PzQ6YD<oTEu
z>fT6F9^pUjr9=CT&J4f3hHb=1#k%AiyceXgz%Y=h4M1)GIW8%3Q5D1G{HM6wb6BHf
zQMe+v{c?+{GF^DH;6JS^av}@=j|}(JbKG?S>d(de??Tzu6>=|~0#t|ZvK;BF#ePKf
zhcob>Vu?Jzrm9yf&V~G^xZHifbg$}^%bm~wp8pgla4Ze~@8bBf#M%7KX$`oD{}h+|
zDeyADeSD`4!KVCTYmJ}P;XiSIRkV-C{A^Oap=4dc|1iq23~l{!h6>Fmc}4?x{yztv
zC&vU(n}6v@Z!P=z0@q}L`QL~9t1!OD?|lnw2X<u-o|gk+9`Jp9r*+1kw<|wR*PI3l
z#D9v*Z2;H~%vG1C&IZq)0>ryN>H{pi(^t=PHC<GT4)dSla=*ZyBd=o4F307%$PTP7
zN>my53xV^OfeKnz-0D0yz5F%cApa>Y_f2r0<8t$_Hdm)G(kGAk&jatV9zfkQt}bkm
z7tR6xQ(SH>`uJ0dT-8N!`!uEp-cJUe9l2i5Z9JFPx{ds&y>yNMFS%R=Ts#Xk@Yk-|
zQPJ)?9@n=}r*<Y~1OF*5_YC6k7j$r3uANoKX|o3M)_}$Qr?}j5^znJDC-0i!1Xu(1
zYrrD@4<nsDz%=_y%sH?ISOZpRAW!~NT<&pTR?Dij+~>2ZQaByffI}L{k^dBz+X9pU
zyqAtcb;a4R2CUXV4*c)NH5<^!pJa7eI6c+?Yrt6znBe~%oVy?3xLjweh;w5N*rovk
z{HM6wlbF9Vr?Y%L&*!kMCOBc%fb$y2!v9Xlm!qxEak<V{4d=)juw4Ub_)l@U0bsK2
z1>g)=1FV69X&{OJ6qnls%qUoaIAhiTYrruLfa?{25|_Jr-K!m|IWE^R<#R@?fdXp)
zduc2J|2H5WpXclrxGp$*?`lBG_3v>o^OX;>$nRy5H)oNTWR^e5B7cxY9?2pPWtKlK
z$t-`AMSd@fyg7?Jlv$4AY0LNDCC%T1B>Cgn8nF~fk|$SobCNu{vLV*w9|>yGhjz5`
zX006B(aJ+wc_dk`$xM<$ndPJ%P5O_u*OPXV<g?Y~my4&q<Z+2c-kf@Usrq_ZtiAp}
zspLxWwDKRT<Vx|h^1o5ZBRc7qsN^9%`Rv3AiddU|Nuq#q<>8!Q;tG^FQ9wmI$?_k?
z&u-RDKapHWUtStZAf}z<^y3ALX(vT4G!%&?pU6;><TPXHH>Z=&R!$J&l<P}nxzJ9D
zTH|v1iiYCFOOY!Yiiq?R3X7FbxgaFu;(jPsMJKc4-{_n~g$OxSVWN163KeonQB+<@
zNhyAbKP7!CQM1TiefzQe=}=s(F20bLiZ3`zU3_u)$5KK&>f#Cc-$;>o`m;sZ=u;^l
zRNfqytHp8o?6_D{ytq8^Hc73$MEdc|HQLdW2X*sLT(1$w^N-6l+R;g0qa7W2X_oYZ
zT6v<{loDvQgLC5rQ@&`m19?b$LQ?V6W+R_CJ1Kiry~*-qvC1q-o}?X|ov<5{rxY(q
z!KEqbYi}@^DsQHAV}B{y!RZO!=oL@RyOOx4Qs*Kpn6j9y7KrbmSmyW$ieu`}NL;R0
zJaqw6wL|G7Za`n2E&WhDf8FwByT62A($`O-c>4NnPGn!ArvQ~$Pl4*<X<eV9<81a7
z(WIYhpUoP%+Vv~xhqUt9%F)FCN%9naX)jMDK$1LJL)zQN$-zX{^eshRnnj*ez?AEg
zG?XGw(om{As3}0ITw6dP&*tB=Js(tlPA~s#&!=q9w^Eg&H5!VQA2%JZNKF+gayrx;
zKLIDl{}eeTncz`rTq^39DlNf7brmYt&xSl!66B(G6UtFJ!H_6``UYgVQsRh^t8YLh
zPcThRPWewsKS)0k1yn@x|BAd+{w~s2+pr>6?x<Ou5R^}s|5M~ji6d#{ic!W3m~y?6
zqmmX9NtKt%nT28*q{<bQHm8*<Dic+hdc9IWp&=dlY>EETrXPDUg_IM5^2zdl;+`}b
z(vd3#jA=+muF;U5yi}sUwE4%3u30`ID4#3;C(0LV87LakldG#xB^N4*J$sepbmgTI
z{e`FiLHVolpL~E0Dpe@|RLh%5Mt_Qi<gaRZL_R|Q(NU!a)pAkiN&!>uPu2b*BX5>d
zQ(qrfkgTClid^H^VkfJw*Z7sx`qlcCh@8AeKPuY(Sfr&%KT!ie5?{4)rOcGFj(tm#
z6d{rPH#7FBy*^gxn2bKO@`Q%ODO$NGm5?T1FYYR>JW++QQ<Bn8DPWR3rGQCtRTU~3
zNJ)Q@MA77LNn+KbK^Ck1vwW)1dn}n0d6I_I{$I(eId-M;p?-cS@`y%WsvK1Puhr0O
zl|=cf)liC9+e=9;p5TpA3iabpB&DvxQgKlAsn$?XbzFQ^6);tMbW$j;fmH2~JQA1d
z6)(FyOZwT$m+k)4`k77TP5Nt&7hk`TpD3PgBVScKB$SjkeroL_m~uiym3>J`X^OmA
zBTv<^Mx5FSRci;QrWlx7JCLVXKt!8<$_<7x%eC6Uxk(DpYA02mRJ@eyo0GCnPCr?k
zBu^<`l02n&N%BZM{TE{2wD%W^%SAnC<#Dn8^F>@lPw-~tT+Q_f?UV`@YUHtNaAi=~
zp++83(!~GqHnduv&<>f6a<W>U(2oA|JyE>bxL*0CzCIGqo{lOvtClwlxnh;_FSR@*
z<Z0SBLL6gNgnp~9kIQFE^e5j=Q2r|am$-f9m|Q?Txgb?i`tj?9+ice6AD5RZ>B}0@
zOJ5wL0*ddrL|h-|EFI91i{i;us3TAKl!)&2vyqqbhbjz;?}_{qN1&lpdAxWyPfsqi
zL&-GjTwh9p*k43P9uz`+-qVq*#HeD`*^2%W+QEsM_jigsp&fmBDGtZ~G_P!w>w|G2
zzC2d@Pg$<kj-Fht9mv(E%hzj)Cp}i*jVzz7&R%+~PEM9<#L{DRawJ!$N98Y7olkOg
zdJsJdCdo@xzw!0|sejV-LG^*8?<7w;r1=SXQt>om;)nWnv_kxXe0It~)d9$Zs-G!e
zAE!PoHRn7|){aI>`Ijag(f&+&f2S4Vm&TY<q>yLS4&)iN19_=VqN+pL-o>j<P5%1-
E0Tz)WlK=n!

literal 0
HcmV?d00001

diff --git a/helix-term/build.rs b/helix-term/build.rs
index b47dae8ef..6bebf00c6 100644
--- a/helix-term/build.rs
+++ b/helix-term/build.rs
@@ -6,4 +6,150 @@ fn main() {
         build_grammars(Some(std::env::var("TARGET").unwrap()))
             .expect("Failed to compile tree-sitter grammars");
     }
+
+    #[cfg(windows)]
+    windows_rc::link_icon_in_windows_exe("../contrib/helix-256p.ico");
+}
+
+#[cfg(windows)]
+mod windows_rc {
+    use std::io::prelude::Write;
+    use std::{env, io, path::Path, path::PathBuf, process};
+
+    pub(crate) fn link_icon_in_windows_exe(icon_path: &str) {
+        let rc_exe = find_rc_exe().expect("Windows SDK is to be installed along with MSVC");
+
+        let output = env::var("OUT_DIR").expect("Env var OUT_DIR should have been set by compiler");
+        let output_dir = PathBuf::from(output);
+
+        let rc_path = output_dir.join("resource.rc");
+        write_resource_file(&rc_path, icon_path).unwrap();
+
+        let resource_file = PathBuf::from(&output_dir).join("resource.lib");
+        compile_with_toolkit_msvc(rc_exe, resource_file, rc_path);
+
+        println!("cargo:rustc-link-search=native={}", output_dir.display());
+        println!("cargo:rustc-link-lib=dylib=resource");
+    }
+
+    fn compile_with_toolkit_msvc(rc_exe: PathBuf, output: PathBuf, input: PathBuf) {
+        let mut command = process::Command::new(rc_exe);
+        let command = command.arg(format!(
+            "/I{}",
+            env::var("CARGO_MANIFEST_DIR")
+                .expect("CARGO_MANIFEST_DIR should have been set by Cargo")
+        ));
+
+        let status = command
+            .arg(format!("/fo{}", output.display()))
+            .arg(format!("{}", input.display()))
+            .output()
+            .unwrap();
+
+        println!(
+            "RC Output:\n{}\n------",
+            String::from_utf8_lossy(&status.stdout)
+        );
+        println!(
+            "RC Error:\n{}\n------",
+            String::from_utf8_lossy(&status.stderr)
+        );
+    }
+
+    fn find_rc_exe() -> io::Result<PathBuf> {
+        let find_reg_key = process::Command::new("reg")
+            .arg("query")
+            .arg(r"HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots")
+            .arg("/reg:32")
+            .arg("/v")
+            .arg("KitsRoot10")
+            .output();
+
+        match find_reg_key {
+            Err(find_reg_key) => {
+                return Err(io::Error::new(
+                    io::ErrorKind::Other,
+                    format!("Failed to run registry query: {}", find_reg_key),
+                ))
+            }
+            Ok(find_reg_key) => {
+                if find_reg_key.status.code().unwrap() != 0 {
+                    return Err(io::Error::new(
+                        io::ErrorKind::Other,
+                        "Can not find Windows SDK",
+                    ));
+                } else {
+                    let lines = String::from_utf8(find_reg_key.stdout)
+                        .expect("Should be able to parse the output");
+                    let mut lines: Vec<&str> = lines.lines().collect();
+                    let mut rc_exe_paths: Vec<PathBuf> = Vec::new();
+                    lines.reverse();
+                    for line in lines {
+                        if line.trim().starts_with("KitsRoot") {
+                            let kit: String = line
+                                .chars()
+                                .skip(line.find("REG_SZ").unwrap() + 6)
+                                .skip_while(|c| c.is_whitespace())
+                                .collect();
+
+                            let p = PathBuf::from(&kit);
+                            let rc = if cfg!(target_arch = "x86_64") {
+                                p.join(r"bin\x64\rc.exe")
+                            } else {
+                                p.join(r"bin\x86\rc.exe")
+                            };
+
+                            if rc.exists() {
+                                println!("{:?}", rc);
+                                rc_exe_paths.push(rc.to_owned());
+                            }
+
+                            if let Ok(bin) = p.join("bin").read_dir() {
+                                for e in bin.filter_map(|e| e.ok()) {
+                                    let p = if cfg!(target_arch = "x86_64") {
+                                        e.path().join(r"x64\rc.exe")
+                                    } else {
+                                        e.path().join(r"x86\rc.exe")
+                                    };
+                                    if p.exists() {
+                                        println!("{:?}", p);
+                                        rc_exe_paths.push(p.to_owned());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if rc_exe_paths.is_empty() {
+                        return Err(io::Error::new(
+                            io::ErrorKind::Other,
+                            "Can not find Windows SDK",
+                        ));
+                    }
+
+                    println!("{:?}", rc_exe_paths);
+                    let rc_path = rc_exe_paths.pop().unwrap();
+
+                    let rc_exe = if !rc_path.exists() {
+                        if cfg!(target_arch = "x86_64") {
+                            PathBuf::from(rc_path.parent().unwrap()).join(r"bin\x64\rc.exe")
+                        } else {
+                            PathBuf::from(rc_path.parent().unwrap()).join(r"bin\x86\rc.exe")
+                        }
+                    } else {
+                        rc_path
+                    };
+
+                    println!("Selected RC path: '{}'", rc_exe.display());
+                    Ok(rc_exe)
+                }
+            }
+        }
+    }
+
+    fn write_resource_file(rc_path: &Path, icon_path: &str) -> io::Result<()> {
+        let mut f = std::fs::File::create(rc_path)?;
+        writeln!(f, "{} ICON \"{}\"", 1, icon_path)?;
+
+        Ok(())
+    }
 }

From f5b67d9acb89ea54e7226111e3e4d8c3a008144b Mon Sep 17 00:00:00 2001
From: sogaiu <33044872+sogaiu@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:17:46 +0900
Subject: [PATCH 674/967] Use janet-simple grammar for Janet (#9247)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use janet-simple grammar for Janet

* Update book

* Tweak language name and related

* Rename janet-simple to janet in book

* Remove spurious language section for janet

* Drop quote_lit and qq_lit related highlighting

---------

Co-authored-by: sogaiu <983021772@users.noreply.github.com>
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 languages.toml                       | 32 +++++++++----
 runtime/queries/janet/highlights.scm | 67 +++++++++++++++++++++++++++-
 2 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/languages.toml b/languages.toml
index 785bc9701..ba3b19066 100644
--- a/languages.toml
+++ b/languages.toml
@@ -326,6 +326,29 @@ comment-token = "//"
 language-servers = [ "mint" ]
 indent = { tab-width = 2, unit = "  " }
 
+[[language]]
+name = "janet"
+scope = "source.janet"
+injection-regex = "janet"
+file-types = ["cgen", "janet", "jdn"]
+shebangs = ["janet"]
+roots = ["project.janet"]
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+formatter = { command = "janet-format" }
+grammar = "janet-simple"
+
+[language.auto-pairs]
+'"' = '"'
+'(' = ')'
+'[' = ']'
+'{' = '}'
+"`" = "`"
+
+[[grammar]]
+name = "janet-simple"
+source = { git = "https://github.com/sogaiu/tree-sitter-janet-simple", rev = "51271e260346878e1a1aa6c506ce6a797b7c25e2" }
+
 [[language]]
 name = "json"
 scope = "source.json"
@@ -3008,15 +3031,6 @@ file-types = ["log"]
 name = "log"
 source = { git = "https://github.com/Tudyx/tree-sitter-log", rev = "62cfe307e942af3417171243b599cc7deac5eab9" }
 
-[[language]]
-name = "janet"
-scope = "source.janet"
-injection-regex = "janet"
-file-types = ["janet"]
-comment-token = "#"
-indent = { tab-width = 2, unit = "  " }
-grammar = "clojure"
-
 [[language]]
 name = "hocon"
 scope = "source.conf"
diff --git a/runtime/queries/janet/highlights.scm b/runtime/queries/janet/highlights.scm
index a036368a1..133559439 100644
--- a/runtime/queries/janet/highlights.scm
+++ b/runtime/queries/janet/highlights.scm
@@ -1 +1,66 @@
-; inherits: clojure
+(kwd_lit) @string.special.symbol
+
+(str_lit) @string
+
+(long_str_lit) @string
+
+(buf_lit) @string
+
+(long_buf_lit) @string
+
+(num_lit) @constant.numeric
+
+[(bool_lit) (nil_lit)] @constant.builtin
+
+(comment) @comment
+
+((sym_lit) @variable
+ (#match? @variable "^\\*.+\\*$"))
+
+(short_fn_lit
+ .
+ (sym_lit) @function)
+
+;; special forms
+(par_tup_lit
+ .
+ (sym_lit) @function.macro
+ (#match? @function.macro
+  "^(break|def|do|fn|if|quasiquote|quote|set|splice|unquote|upscope|var|while)$"))
+
+;; for macros
+;;
+;; (each name (all-bindings)
+;;   (when-let [info (dyn (symbol name))]
+;;     (when (info :macro)
+;;       (print name))))
+(par_tup_lit
+ .
+ (sym_lit) @function.macro
+ (#match? @function.macro
+  "^(%=|\\*=|\\+\\+|\\+=|\\-\\-|\\-=|\\->|\\->>|\\-\\?>|\\-\\?>>|/=|and|as\\->|as\\-macro|as\\?\\->|assert|case|catseq|chr|comment|compif|comptime|compwhen|cond|coro|def\\-|default|defdyn|defer|defmacro|defmacro\\-|defn|defn\\-|delay|doc|each|eachk|eachp|edefer|ev/do\\-thread|ev/gather|ev/spawn|ev/spawn\\-thread|ev/with\\-deadline|ffi/defbind|fiber\\-fn|for|forever|forv|generate|if\\-let|if\\-not|if\\-with|import|juxt|label|let|loop|match|or|prompt|protect|repeat|seq|short\\-fn|tabseq|toggle|tracev|try|unless|use|var\\-|varfn|when|when\\-let|when\\-with|with|with\\-dyns|with\\-syms|with\\-vars)$"))
+
+;; builtin functions
+;;
+;; (each name (all-bindings)
+;;   (when-let [info (dyn (symbol name))]
+;;     (when (and (nil? (info :macro))
+;;                (or (function? (info :value))
+;;                    (cfunction? (info :value))))
+;;       (print name))))
+((sym_lit) @function.builtin
+ (#match? @function.builtin
+  "^(%|\\*|\\+|\\-|/|<|<=|=|>|>=|\\.break|\\.breakall|\\.bytecode|\\.clear|\\.clearall|\\.disasm|\\.fiber|\\.fn|\\.frame|\\.locals|\\.next|\\.nextc|\\.ppasm|\\.signal|\\.slot|\\.slots|\\.source|\\.stack|\\.step|abstract\\?|accumulate|accumulate2|all|all\\-bindings|all\\-dynamics|any\\?|apply|array|array/clear|array/concat|array/ensure|array/fill|array/insert|array/new|array/new\\-filled|array/peek|array/pop|array/push|array/remove|array/slice|array/trim|array/weak|array\\?|asm|bad\\-compile|bad\\-parse|band|blshift|bnot|boolean\\?|bor|brshift|brushift|buffer|buffer/bit|buffer/bit\\-clear|buffer/bit\\-set|buffer/bit\\-toggle|buffer/blit|buffer/clear|buffer/fill|buffer/format|buffer/from\\-bytes|buffer/new|buffer/new\\-filled|buffer/popn|buffer/push|buffer/push\\-at|buffer/push\\-byte|buffer/push\\-string|buffer/push\\-word|buffer/slice|buffer/trim|buffer\\?|bxor|bytes\\?|cancel|cfunction\\?|cli\\-main|cmp|comp|compare|compare<|compare<=|compare=|compare>|compare>=|compile|complement|count|curenv|debug|debug/arg\\-stack|debug/break|debug/fbreak|debug/lineage|debug/stack|debug/stacktrace|debug/step|debug/unbreak|debug/unfbreak|debugger|debugger\\-on\\-status|dec|deep\\-not=|deep=|defglobal|describe|dictionary\\?|disasm|distinct|div|doc\\*|doc\\-format|doc\\-of|dofile|drop|drop\\-until|drop\\-while|dyn|eflush|empty\\?|env\\-lookup|eprin|eprinf|eprint|eprintf|error|errorf|ev/acquire\\-lock|ev/acquire\\-rlock|ev/acquire\\-wlock|ev/all\\-tasks|ev/call|ev/cancel|ev/capacity|ev/chan|ev/chan\\-close|ev/chunk|ev/close|ev/count|ev/deadline|ev/full|ev/give|ev/give\\-supervisor|ev/go|ev/lock|ev/read|ev/release\\-lock|ev/release\\-rlock|ev/release\\-wlock|ev/rselect|ev/rwlock|ev/select|ev/sleep|ev/take|ev/thread|ev/thread\\-chan|ev/write|eval|eval\\-string|even\\?|every\\?|extreme|false\\?|ffi/align|ffi/call|ffi/calling\\-conventions|ffi/close|ffi/context|ffi/free|ffi/jitfn|ffi/lookup|ffi/malloc|ffi/native|ffi/pointer\\-buffer|ffi/pointer\\-cfunction|ffi/read|ffi/signature|ffi/size|ffi/struct|ffi/trampoline|ffi/write|fiber/can\\-resume\\?|fiber/current|fiber/getenv|fiber/last\\-value|fiber/maxstack|fiber/new|fiber/root|fiber/setenv|fiber/setmaxstack|fiber/status|fiber\\?|file/close|file/flush|file/lines|file/open|file/read|file/seek|file/tell|file/temp|file/write|filter|find|find\\-index|first|flatten|flatten\\-into|flush|flycheck|freeze|frequencies|from\\-pairs|function\\?|gccollect|gcinterval|gcsetinterval|gensym|get|get\\-in|getline|getproto|group\\-by|has\\-key\\?|has\\-value\\?|hash|idempotent\\?|identity|import\\*|in|inc|index\\-of|indexed\\?|int/s64|int/to\\-bytes|int/to\\-number|int/u64|int\\?|interleave|interpose|invert|juxt\\*|keep|keep\\-syntax|keep\\-syntax!|keys|keyword|keyword/slice|keyword\\?|kvs|last|length|lengthable\\?|load\\-image|macex|macex1|maclintf|make\\-env|make\\-image|map|mapcat|marshal|math/abs|math/acos|math/acosh|math/asin|math/asinh|math/atan|math/atan2|math/atanh|math/cbrt|math/ceil|math/cos|math/cosh|math/erf|math/erfc|math/exp|math/exp2|math/expm1|math/floor|math/gamma|math/gcd|math/hypot|math/lcm|math/log|math/log\\-gamma|math/log10|math/log1p|math/log2|math/next|math/pow|math/random|math/rng|math/rng\\-buffer|math/rng\\-int|math/rng\\-uniform|math/round|math/seedrandom|math/sin|math/sinh|math/sqrt|math/tan|math/tanh|math/trunc|max|max\\-of|mean|memcmp|merge|merge\\-into|merge\\-module|min|min\\-of|mod|module/add\\-paths|module/expand\\-path|module/find|module/value|nan\\?|nat\\?|native|neg\\?|net/accept|net/accept\\-loop|net/address|net/address\\-unpack|net/chunk|net/close|net/connect|net/flush|net/listen|net/localname|net/peername|net/read|net/recv\\-from|net/send\\-to|net/server|net/setsockopt|net/shutdown|net/write|next|nil\\?|not|not=|number\\?|odd\\?|one\\?|os/arch|os/cd|os/chmod|os/clock|os/compiler|os/cpu\\-count|os/cryptorand|os/cwd|os/date|os/dir|os/environ|os/execute|os/exit|os/getenv|os/isatty|os/link|os/lstat|os/mkdir|os/mktime|os/open|os/perm\\-int|os/perm\\-string|os/pipe|os/posix\\-exec|os/posix\\-fork|os/proc\\-close|os/proc\\-kill|os/proc\\-wait|os/readlink|os/realpath|os/rename|os/rm|os/rmdir|os/setenv|os/shell|os/sigaction|os/sleep|os/spawn|os/stat|os/strftime|os/symlink|os/time|os/touch|os/umask|os/which|pairs|parse|parse\\-all|parser/byte|parser/clone|parser/consume|parser/eof|parser/error|parser/flush|parser/has\\-more|parser/insert|parser/new|parser/produce|parser/state|parser/status|parser/where|partial|partition|partition\\-by|peg/compile|peg/find|peg/find\\-all|peg/match|peg/replace|peg/replace\\-all|pos\\?|postwalk|pp|prewalk|prin|prinf|print|printf|product|propagate|put|put\\-in|quit|range|reduce|reduce2|repl|require|resume|return|reverse|reverse!|run\\-context|sandbox|scan\\-number|setdyn|signal|slice|slurp|some|sort|sort\\-by|sorted|sorted\\-by|spit|string|string/ascii\\-lower|string/ascii\\-upper|string/bytes|string/check\\-set|string/find|string/find\\-all|string/format|string/from\\-bytes|string/has\\-prefix\\?|string/has\\-suffix\\?|string/join|string/repeat|string/replace|string/replace\\-all|string/reverse|string/slice|string/split|string/trim|string/triml|string/trimr|string\\?|struct|struct/getproto|struct/proto\\-flatten|struct/to\\-table|struct/with\\-proto|struct\\?|sum|symbol|symbol/slice|symbol\\?|table|table/clear|table/clone|table/getproto|table/new|table/proto\\-flatten|table/rawget|table/setproto|table/to\\-struct|table/weak|table/weak\\-keys|table/weak\\-values|table\\?|take|take\\-until|take\\-while|tarray/buffer|tarray/copy\\-bytes|tarray/length|tarray/new|tarray/properties|tarray/slice|tarray/swap\\-bytes|thread/close|thread/current|thread/exit|thread/new|thread/receive|thread/send|thaw|trace|true\\?|truthy\\?|tuple|tuple/brackets|tuple/setmap|tuple/slice|tuple/sourcemap|tuple/type|tuple\\?|type|unmarshal|untrace|update|update\\-in|values|varglobal|walk|warn\\-compile|xprin|xprinf|xprint|xprintf|yield|zero\\?|zipcoll)$"))
+
+;; other calls
+(par_tup_lit
+ .
+ (sym_lit) @function)
+
+(sym_lit) @variable
+
+["{" "@{" "}"
+ "[" "@[" "]"
+ "(" "@(" ")"] @punctuation.bracket
+
+["~" "'" "|" ";" ","] @operator

From 87a720c3a13ccc7245f5b0befc008db5bd039032 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sun, 28 Jan 2024 17:34:45 +0100
Subject: [PATCH 675/967] make path changes LSP spec conform (#8949)

Currently, helix implements operations which change the paths of files
incorrectly and inconsistently. This PR ensures that we do the following
whenever a buffer is renamed (`:move` and workspace edits)

* always send did_open/did_close notifications
* send will_rename/did_rename requests correctly
  * send them to all LSP servers not just those that are active for a
    buffer
  * also send these requests for paths that are not yet open in a buffer (if
    triggered from workspace edit).
  * only send these if the server registered interests in the path
* autodetect language, indent, line ending, ..

This PR also centralizes the infrastructure for path setting and
therefore `:w <path>` benefits from similar fixed (but without didRename)
---
 helix-lsp/src/client.rs          |  83 ++++++-----
 helix-lsp/src/file_operations.rs | 105 ++++++++++++++
 helix-lsp/src/lib.rs             |   1 +
 helix-term/src/application.rs    |  31 +----
 helix-term/src/commands/lsp.rs   | 198 +-------------------------
 helix-term/src/commands/typed.rs |  62 +--------
 helix-view/src/document.rs       |   3 +
 helix-view/src/editor.rs         |  90 +++++++++++-
 helix-view/src/handlers/lsp.rs   | 229 +++++++++++++++++++++++++++++++
 9 files changed, 483 insertions(+), 319 deletions(-)
 create mode 100644 helix-lsp/src/file_operations.rs

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index fb32f6eb3..94bad6faf 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -1,4 +1,5 @@
 use crate::{
+    file_operations::FileOperationsInterest,
     find_lsp_workspace, jsonrpc,
     transport::{Payload, Transport},
     Call, Error, OffsetEncoding, Result,
@@ -9,20 +10,20 @@ use helix_loader::{self, VERSION_AND_GIT_HASH};
 use helix_stdx::path;
 use lsp::{
     notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
-    DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, SignatureHelp, WorkspaceFolder,
-    WorkspaceFoldersChangeEvent,
+    DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, SignatureHelp, Url,
+    WorkspaceFolder, WorkspaceFoldersChangeEvent,
 };
 use lsp_types as lsp;
 use parking_lot::Mutex;
 use serde::Deserialize;
 use serde_json::Value;
-use std::future::Future;
-use std::process::Stdio;
 use std::sync::{
     atomic::{AtomicU64, Ordering},
     Arc,
 };
 use std::{collections::HashMap, path::PathBuf};
+use std::{future::Future, sync::OnceLock};
+use std::{path::Path, process::Stdio};
 use tokio::{
     io::{BufReader, BufWriter},
     process::{Child, Command},
@@ -51,6 +52,7 @@ pub struct Client {
     server_tx: UnboundedSender<Payload>,
     request_counter: AtomicU64,
     pub(crate) capabilities: OnceCell<lsp::ServerCapabilities>,
+    pub(crate) file_operation_interest: OnceLock<FileOperationsInterest>,
     config: Option<Value>,
     root_path: std::path::PathBuf,
     root_uri: Option<lsp::Url>,
@@ -233,6 +235,7 @@ impl Client {
             server_tx,
             request_counter: AtomicU64::new(0),
             capabilities: OnceCell::new(),
+            file_operation_interest: OnceLock::new(),
             config,
             req_timeout,
             root_path,
@@ -278,6 +281,11 @@ impl Client {
             .expect("language server not yet initialized!")
     }
 
+    pub(crate) fn file_operations_intests(&self) -> &FileOperationsInterest {
+        self.file_operation_interest
+            .get_or_init(|| FileOperationsInterest::new(self.capabilities()))
+    }
+
     /// Client has to be initialized otherwise this function panics
     #[inline]
     pub fn supports_feature(&self, feature: LanguageServerFeature) -> bool {
@@ -717,27 +725,27 @@ impl Client {
         })
     }
 
-    pub fn prepare_file_rename(
+    pub fn will_rename(
         &self,
-        old_uri: &lsp::Url,
-        new_uri: &lsp::Url,
+        old_path: &Path,
+        new_path: &Path,
+        is_dir: bool,
     ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
-        let capabilities = self.capabilities.get().unwrap();
-
-        // Return early if the server does not support willRename feature
-        match &capabilities.workspace {
-            Some(workspace) => match &workspace.file_operations {
-                Some(op) => {
-                    op.will_rename.as_ref()?;
-                }
-                _ => return None,
-            },
-            _ => return None,
+        let capabilities = self.file_operations_intests();
+        if !capabilities.will_rename.has_interest(old_path, is_dir) {
+            return None;
         }
-
+        let url_from_path = |path| {
+            let url = if is_dir {
+                Url::from_directory_path(path)
+            } else {
+                Url::from_file_path(path)
+            };
+            Some(url.ok()?.to_string())
+        };
         let files = vec![lsp::FileRename {
-            old_uri: old_uri.to_string(),
-            new_uri: new_uri.to_string(),
+            old_uri: url_from_path(old_path)?,
+            new_uri: url_from_path(new_path)?,
         }];
         let request = self.call_with_timeout::<lsp::request::WillRenameFiles>(
             lsp::RenameFilesParams { files },
@@ -751,27 +759,28 @@ impl Client {
         })
     }
 
-    pub fn did_file_rename(
+    pub fn did_rename(
         &self,
-        old_uri: &lsp::Url,
-        new_uri: &lsp::Url,
+        old_path: &Path,
+        new_path: &Path,
+        is_dir: bool,
     ) -> Option<impl Future<Output = std::result::Result<(), Error>>> {
-        let capabilities = self.capabilities.get().unwrap();
-
-        // Return early if the server does not support DidRename feature
-        match &capabilities.workspace {
-            Some(workspace) => match &workspace.file_operations {
-                Some(op) => {
-                    op.did_rename.as_ref()?;
-                }
-                _ => return None,
-            },
-            _ => return None,
+        let capabilities = self.file_operations_intests();
+        if !capabilities.did_rename.has_interest(new_path, is_dir) {
+            return None;
         }
+        let url_from_path = |path| {
+            let url = if is_dir {
+                Url::from_directory_path(path)
+            } else {
+                Url::from_file_path(path)
+            };
+            Some(url.ok()?.to_string())
+        };
 
         let files = vec![lsp::FileRename {
-            old_uri: old_uri.to_string(),
-            new_uri: new_uri.to_string(),
+            old_uri: url_from_path(old_path)?,
+            new_uri: url_from_path(new_path)?,
         }];
         Some(self.notify::<lsp::notification::DidRenameFiles>(lsp::RenameFilesParams { files }))
     }
diff --git a/helix-lsp/src/file_operations.rs b/helix-lsp/src/file_operations.rs
new file mode 100644
index 000000000..98ac32a40
--- /dev/null
+++ b/helix-lsp/src/file_operations.rs
@@ -0,0 +1,105 @@
+use std::path::Path;
+
+use globset::{GlobBuilder, GlobSet};
+
+use crate::lsp;
+
+#[derive(Default, Debug)]
+pub(crate) struct FileOperationFilter {
+    dir_globs: GlobSet,
+    file_globs: GlobSet,
+}
+
+impl FileOperationFilter {
+    fn new(capability: Option<&lsp::FileOperationRegistrationOptions>) -> FileOperationFilter {
+        let Some(cap) = capability else {
+            return FileOperationFilter::default();
+        };
+        let mut dir_globs = GlobSet::builder();
+        let mut file_globs = GlobSet::builder();
+        for filter in &cap.filters {
+            // TODO: support other url schemes
+            let is_non_file_schema = filter
+                .scheme
+                .as_ref()
+                .is_some_and(|schema| schema != "file");
+            if is_non_file_schema {
+                continue;
+            }
+            let ignore_case = filter
+                .pattern
+                .options
+                .as_ref()
+                .and_then(|opts| opts.ignore_case)
+                .unwrap_or(false);
+            let mut glob_builder = GlobBuilder::new(&filter.pattern.glob);
+            glob_builder.case_insensitive(!ignore_case);
+            let glob = match glob_builder.build() {
+                Ok(glob) => glob,
+                Err(err) => {
+                    log::error!("invalid glob send by LS: {err}");
+                    continue;
+                }
+            };
+            match filter.pattern.matches {
+                Some(lsp::FileOperationPatternKind::File) => {
+                    file_globs.add(glob);
+                }
+                Some(lsp::FileOperationPatternKind::Folder) => {
+                    dir_globs.add(glob);
+                }
+                None => {
+                    file_globs.add(glob.clone());
+                    dir_globs.add(glob);
+                }
+            };
+        }
+        let file_globs = file_globs.build().unwrap_or_else(|err| {
+            log::error!("invalid globs send by LS: {err}");
+            GlobSet::empty()
+        });
+        let dir_globs = dir_globs.build().unwrap_or_else(|err| {
+            log::error!("invalid globs send by LS: {err}");
+            GlobSet::empty()
+        });
+        FileOperationFilter {
+            dir_globs,
+            file_globs,
+        }
+    }
+
+    pub(crate) fn has_interest(&self, path: &Path, is_dir: bool) -> bool {
+        if is_dir {
+            self.dir_globs.is_match(path)
+        } else {
+            self.file_globs.is_match(path)
+        }
+    }
+}
+
+#[derive(Default, Debug)]
+pub(crate) struct FileOperationsInterest {
+    // TODO: support other notifications
+    // did_create: FileOperationFilter,
+    // will_create: FileOperationFilter,
+    pub did_rename: FileOperationFilter,
+    pub will_rename: FileOperationFilter,
+    // did_delete: FileOperationFilter,
+    // will_delete: FileOperationFilter,
+}
+
+impl FileOperationsInterest {
+    pub fn new(capabilities: &lsp::ServerCapabilities) -> FileOperationsInterest {
+        let capabilities = capabilities
+            .workspace
+            .as_ref()
+            .and_then(|capabilities| capabilities.file_operations.as_ref());
+        let Some(capabilities) = capabilities else {
+            return FileOperationsInterest::default();
+        };
+        FileOperationsInterest {
+            did_rename: FileOperationFilter::new(capabilities.did_rename.as_ref()),
+            will_rename: FileOperationFilter::new(capabilities.will_rename.as_ref()),
+        }
+    }
+}
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 53b2712d0..4ce445aee 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -1,5 +1,6 @@
 mod client;
 pub mod file_event;
+mod file_operations;
 pub mod jsonrpc;
 pub mod snippet;
 mod transport;
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 3f3e59c6a..b5150a13a 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -21,7 +21,6 @@ use tui::backend::Backend;
 
 use crate::{
     args::Args,
-    commands::apply_workspace_edit,
     compositor::{Compositor, Event},
     config::Config,
     handlers,
@@ -573,26 +572,8 @@ impl Application {
         let lines = doc_save_event.text.len_lines();
         let bytes = doc_save_event.text.len_bytes();
 
-        if doc.path() != Some(&doc_save_event.path) {
-            doc.set_path(Some(&doc_save_event.path));
-
-            let loader = self.editor.syn_loader.clone();
-
-            // borrowing the same doc again to get around the borrow checker
-            let doc = doc_mut!(self.editor, &doc_save_event.doc_id);
-            let id = doc.id();
-            doc.detect_language(loader);
-            self.editor.refresh_language_servers(id);
-            // and again a borrow checker workaround...
-            let doc = doc_mut!(self.editor, &doc_save_event.doc_id);
-            let diagnostics = Editor::doc_diagnostics(
-                &self.editor.language_servers,
-                &self.editor.diagnostics,
-                doc,
-            );
-            doc.replace_diagnostics(diagnostics, &[], None);
-        }
-
+        self.editor
+            .set_doc_path(doc_save_event.doc_id, &doc_save_event.path);
         // TODO: fix being overwritten by lsp
         self.editor.set_status(format!(
             "'{}' written, {}L {}B",
@@ -1011,11 +992,9 @@ impl Application {
                         let language_server = language_server!();
                         if language_server.is_initialized() {
                             let offset_encoding = language_server.offset_encoding();
-                            let res = apply_workspace_edit(
-                                &mut self.editor,
-                                offset_encoding,
-                                &params.edit,
-                            );
+                            let res = self
+                                .editor
+                                .apply_workspace_edit(offset_encoding, &params.edit);
 
                             Ok(json!(lsp::ApplyWorkspaceEditResponse {
                                 applied: res.is_ok(),
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index c694ba25c..a1f7bf17d 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -726,8 +726,7 @@ pub fn code_action(cx: &mut Context) {
                             resolved_code_action.as_ref().unwrap_or(code_action);
 
                         if let Some(ref workspace_edit) = resolved_code_action.edit {
-                            log::debug!("edit: {:?}", workspace_edit);
-                            let _ = apply_workspace_edit(editor, offset_encoding, workspace_edit);
+                            let _ = editor.apply_workspace_edit(offset_encoding, workspace_edit);
                         }
 
                         // if code action provides both edit and command first the edit
@@ -787,63 +786,6 @@ pub fn execute_lsp_command(editor: &mut Editor, language_server_id: usize, cmd:
     });
 }
 
-pub fn apply_document_resource_op(op: &lsp::ResourceOp) -> std::io::Result<()> {
-    use lsp::ResourceOp;
-    use std::fs;
-    match op {
-        ResourceOp::Create(op) => {
-            let path = op.uri.to_file_path().unwrap();
-            let ignore_if_exists = op.options.as_ref().map_or(false, |options| {
-                !options.overwrite.unwrap_or(false) && options.ignore_if_exists.unwrap_or(false)
-            });
-            if ignore_if_exists && path.exists() {
-                Ok(())
-            } else {
-                // Create directory if it does not exist
-                if let Some(dir) = path.parent() {
-                    if !dir.is_dir() {
-                        fs::create_dir_all(dir)?;
-                    }
-                }
-
-                fs::write(&path, [])
-            }
-        }
-        ResourceOp::Delete(op) => {
-            let path = op.uri.to_file_path().unwrap();
-            if path.is_dir() {
-                let recursive = op
-                    .options
-                    .as_ref()
-                    .and_then(|options| options.recursive)
-                    .unwrap_or(false);
-
-                if recursive {
-                    fs::remove_dir_all(&path)
-                } else {
-                    fs::remove_dir(&path)
-                }
-            } else if path.is_file() {
-                fs::remove_file(&path)
-            } else {
-                Ok(())
-            }
-        }
-        ResourceOp::Rename(op) => {
-            let from = op.old_uri.to_file_path().unwrap();
-            let to = op.new_uri.to_file_path().unwrap();
-            let ignore_if_exists = op.options.as_ref().map_or(false, |options| {
-                !options.overwrite.unwrap_or(false) && options.ignore_if_exists.unwrap_or(false)
-            });
-            if ignore_if_exists && to.exists() {
-                Ok(())
-            } else {
-                fs::rename(from, &to)
-            }
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct ApplyEditError {
     pub kind: ApplyEditErrorKind,
@@ -871,142 +813,6 @@ impl ToString for ApplyEditErrorKind {
     }
 }
 
-///TODO make this transactional (and set failureMode to transactional)
-pub fn apply_workspace_edit(
-    editor: &mut Editor,
-    offset_encoding: OffsetEncoding,
-    workspace_edit: &lsp::WorkspaceEdit,
-) -> Result<(), ApplyEditError> {
-    let mut apply_edits = |uri: &helix_lsp::Url,
-                           version: Option<i32>,
-                           text_edits: Vec<lsp::TextEdit>|
-     -> Result<(), ApplyEditErrorKind> {
-        let path = match uri.to_file_path() {
-            Ok(path) => path,
-            Err(_) => {
-                let err = format!("unable to convert URI to filepath: {}", uri);
-                log::error!("{}", err);
-                editor.set_error(err);
-                return Err(ApplyEditErrorKind::UnknownURISchema);
-            }
-        };
-
-        let doc_id = match editor.open(&path, Action::Load) {
-            Ok(doc_id) => doc_id,
-            Err(err) => {
-                let err = format!("failed to open document: {}: {}", uri, err);
-                log::error!("{}", err);
-                editor.set_error(err);
-                return Err(ApplyEditErrorKind::FileNotFound);
-            }
-        };
-
-        let doc = doc!(editor, &doc_id);
-        if let Some(version) = version {
-            if version != doc.version() {
-                let err = format!("outdated workspace edit for {path:?}");
-                log::error!("{err}, expected {} but got {version}", doc.version());
-                editor.set_error(err);
-                return Err(ApplyEditErrorKind::DocumentChanged);
-            }
-        }
-
-        // Need to determine a view for apply/append_changes_to_history
-        let view_id = editor.get_synced_view_id(doc_id);
-        let doc = doc_mut!(editor, &doc_id);
-
-        let transaction = helix_lsp::util::generate_transaction_from_edits(
-            doc.text(),
-            text_edits,
-            offset_encoding,
-        );
-        let view = view_mut!(editor, view_id);
-        doc.apply(&transaction, view.id);
-        doc.append_changes_to_history(view);
-        Ok(())
-    };
-
-    if let Some(ref document_changes) = workspace_edit.document_changes {
-        match document_changes {
-            lsp::DocumentChanges::Edits(document_edits) => {
-                for (i, document_edit) in document_edits.iter().enumerate() {
-                    let edits = document_edit
-                        .edits
-                        .iter()
-                        .map(|edit| match edit {
-                            lsp::OneOf::Left(text_edit) => text_edit,
-                            lsp::OneOf::Right(annotated_text_edit) => {
-                                &annotated_text_edit.text_edit
-                            }
-                        })
-                        .cloned()
-                        .collect();
-                    apply_edits(
-                        &document_edit.text_document.uri,
-                        document_edit.text_document.version,
-                        edits,
-                    )
-                    .map_err(|kind| ApplyEditError {
-                        kind,
-                        failed_change_idx: i,
-                    })?;
-                }
-            }
-            lsp::DocumentChanges::Operations(operations) => {
-                log::debug!("document changes - operations: {:?}", operations);
-                for (i, operation) in operations.iter().enumerate() {
-                    match operation {
-                        lsp::DocumentChangeOperation::Op(op) => {
-                            apply_document_resource_op(op).map_err(|io| ApplyEditError {
-                                kind: ApplyEditErrorKind::IoError(io),
-                                failed_change_idx: i,
-                            })?;
-                        }
-
-                        lsp::DocumentChangeOperation::Edit(document_edit) => {
-                            let edits = document_edit
-                                .edits
-                                .iter()
-                                .map(|edit| match edit {
-                                    lsp::OneOf::Left(text_edit) => text_edit,
-                                    lsp::OneOf::Right(annotated_text_edit) => {
-                                        &annotated_text_edit.text_edit
-                                    }
-                                })
-                                .cloned()
-                                .collect();
-                            apply_edits(
-                                &document_edit.text_document.uri,
-                                document_edit.text_document.version,
-                                edits,
-                            )
-                            .map_err(|kind| ApplyEditError {
-                                kind,
-                                failed_change_idx: i,
-                            })?;
-                        }
-                    }
-                }
-            }
-        }
-
-        return Ok(());
-    }
-
-    if let Some(ref changes) = workspace_edit.changes {
-        log::debug!("workspace changes: {:?}", changes);
-        for (i, (uri, text_edits)) in changes.iter().enumerate() {
-            let text_edits = text_edits.to_vec();
-            apply_edits(uri, None, text_edits).map_err(|kind| ApplyEditError {
-                kind,
-                failed_change_idx: i,
-            })?;
-        }
-    }
-
-    Ok(())
-}
-
 /// Precondition: `locations` should be non-empty.
 fn goto_impl(
     editor: &mut Editor,
@@ -1263,7 +1069,7 @@ pub fn rename_symbol(cx: &mut Context) {
 
                 match block_on(future) {
                     Ok(edits) => {
-                        let _ = apply_workspace_edit(cx.editor, offset_encoding, &edits);
+                        let _ = cx.editor.apply_workspace_edit(offset_encoding, &edits);
                     }
                     Err(err) => cx.editor.set_error(err.to_string()),
                 }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 81ffdf875..b7ceeba59 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -8,7 +8,6 @@ use super::*;
 use helix_core::fuzzy::fuzzy_match;
 use helix_core::indent::MAX_INDENT;
 use helix_core::{encoding, line_ending, shellwords::Shellwords};
-use helix_lsp::{OffsetEncoding, Url};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
 use serde_json::Value;
@@ -2404,67 +2403,14 @@ fn move_buffer(
 
     ensure!(args.len() == 1, format!(":move takes one argument"));
     let doc = doc!(cx.editor);
-
-    let new_path =
-        helix_stdx::path::canonicalize(&PathBuf::from(args.first().unwrap().to_string()));
     let old_path = doc
         .path()
-        .ok_or_else(|| anyhow!("Scratch buffer cannot be moved. Use :write instead"))?
+        .context("Scratch buffer cannot be moved. Use :write instead")?
         .clone();
-    let old_path_as_url = doc.url().unwrap();
-    let new_path_as_url = Url::from_file_path(&new_path).unwrap();
-
-    let edits: Vec<(
-        helix_lsp::Result<helix_lsp::lsp::WorkspaceEdit>,
-        OffsetEncoding,
-        String,
-    )> = doc
-        .language_servers()
-        .map(|lsp| {
-            (
-                lsp.prepare_file_rename(&old_path_as_url, &new_path_as_url),
-                lsp.offset_encoding(),
-                lsp.name().to_owned(),
-            )
-        })
-        .filter(|(f, _, _)| f.is_some())
-        .map(|(f, encoding, name)| (helix_lsp::block_on(f.unwrap()), encoding, name))
-        .collect();
-
-    for (lsp_reply, encoding, name) in edits {
-        match lsp_reply {
-            Ok(edit) => {
-                if let Err(e) = apply_workspace_edit(cx.editor, encoding, &edit) {
-                    log::error!(
-                        ":move command failed to apply edits from lsp {}: {:?}",
-                        name,
-                        e
-                    );
-                };
-            }
-            Err(e) => {
-                log::error!("LSP {} failed to treat willRename request: {:?}", name, e);
-            }
-        };
+    let new_path = args.first().unwrap().to_string();
+    if let Err(err) = cx.editor.move_path(&old_path, new_path.as_ref()) {
+        bail!("Could not move file: {err}");
     }
-
-    let doc = doc_mut!(cx.editor);
-
-    doc.set_path(Some(new_path.as_path()));
-    if let Err(e) = std::fs::rename(&old_path, &new_path) {
-        doc.set_path(Some(old_path.as_path()));
-        bail!("Could not move file: {}", e);
-    };
-
-    doc.language_servers().for_each(|lsp| {
-        lsp.did_file_rename(&old_path_as_url, &new_path_as_url);
-    });
-
-    cx.editor
-        .language_servers
-        .file_event_handler
-        .file_changed(new_path);
-
     Ok(())
 }
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 88653948c..33137c6c9 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1041,6 +1041,9 @@ impl Document {
         self.encoding
     }
 
+    /// sets the document path without sending events to various
+    /// observers (like LSP), in most cases `Editor::set_doc_path`
+    /// should be used instead
     pub fn set_path(&mut self, path: Option<&Path>) {
         let path = path.map(helix_stdx::path::canonicalize);
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index eca488e74..db0d4030b 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -23,7 +23,8 @@ use std::{
     borrow::Cow,
     cell::Cell,
     collections::{BTreeMap, HashMap},
-    io::stdin,
+    fs,
+    io::{self, stdin},
     num::NonZeroUsize,
     path::{Path, PathBuf},
     pin::Pin,
@@ -45,6 +46,7 @@ use helix_core::{
 };
 use helix_dap as dap;
 use helix_lsp::lsp;
+use helix_stdx::path::canonicalize;
 
 use serde::{ser::SerializeMap, Deserialize, Deserializer, Serialize, Serializer};
 
@@ -1215,6 +1217,90 @@ impl Editor {
         self.launch_language_servers(doc_id)
     }
 
+    /// moves/renames a path, invoking any event handlers (currently only lsp)
+    /// and calling `set_doc_path` if the file is open in the editor
+    pub fn move_path(&mut self, old_path: &Path, new_path: &Path) -> io::Result<()> {
+        let new_path = canonicalize(new_path);
+        // sanity check
+        if old_path == new_path {
+            return Ok(());
+        }
+        let is_dir = old_path.is_dir();
+        let language_servers: Vec<_> = self
+            .language_servers
+            .iter_clients()
+            .filter(|client| client.is_initialized())
+            .cloned()
+            .collect();
+        for language_server in language_servers {
+            let Some(request) = language_server.will_rename(old_path, &new_path, is_dir) else {
+                continue;
+            };
+            let edit = match helix_lsp::block_on(request) {
+                Ok(edit) => edit,
+                Err(err) => {
+                    log::error!("invalid willRename response: {err:?}");
+                    continue;
+                }
+            };
+            if let Err(err) = self.apply_workspace_edit(language_server.offset_encoding(), &edit) {
+                log::error!("failed to apply workspace edit: {err:?}")
+            }
+        }
+        fs::rename(old_path, &new_path)?;
+        if let Some(doc) = self.document_by_path(old_path) {
+            self.set_doc_path(doc.id(), &new_path);
+        }
+        let is_dir = new_path.is_dir();
+        for ls in self.language_servers.iter_clients() {
+            if let Some(notification) = ls.did_rename(old_path, &new_path, is_dir) {
+                tokio::spawn(notification);
+            };
+        }
+        self.language_servers
+            .file_event_handler
+            .file_changed(old_path.to_owned());
+        self.language_servers
+            .file_event_handler
+            .file_changed(new_path);
+        Ok(())
+    }
+
+    pub fn set_doc_path(&mut self, doc_id: DocumentId, path: &Path) {
+        let doc = doc_mut!(self, &doc_id);
+        let old_path = doc.path();
+
+        if let Some(old_path) = old_path {
+            // sanity check, should not occur but some callers (like an LSP) may
+            // create bogus calls
+            if old_path == path {
+                return;
+            }
+            // if we are open in LSPs send did_close notification
+            for language_server in doc.language_servers() {
+                tokio::spawn(language_server.text_document_did_close(doc.identifier()));
+            }
+        }
+        // we need to clear the list of language servers here so that
+        // refresh_doc_language/refresh_language_servers doesn't resend
+        // text_document_did_close. Since we called `text_document_did_close`
+        // we have fully unregistered this document from its LS
+        doc.language_servers.clear();
+        doc.set_path(Some(path));
+        self.refresh_doc_language(doc_id)
+    }
+
+    pub fn refresh_doc_language(&mut self, doc_id: DocumentId) {
+        let loader = self.syn_loader.clone();
+        let doc = doc_mut!(self, &doc_id);
+        doc.detect_language(loader);
+        doc.detect_indent_and_line_ending();
+        self.refresh_language_servers(doc_id);
+        let doc = doc_mut!(self, &doc_id);
+        let diagnostics = Editor::doc_diagnostics(&self.language_servers, &self.diagnostics, doc);
+        doc.replace_diagnostics(diagnostics, &[], None);
+    }
+
     /// Launch a language server for a given document
     fn launch_language_servers(&mut self, doc_id: DocumentId) {
         if !self.config().lsp.enable {
@@ -1257,7 +1343,7 @@ impl Editor {
                 .collect::<HashMap<_, _>>()
         });
 
-        if language_servers.is_empty() {
+        if language_servers.is_empty() && doc.language_servers.is_empty() {
             return;
         }
 
diff --git a/helix-view/src/handlers/lsp.rs b/helix-view/src/handlers/lsp.rs
index 1dae45dd5..beb106b2b 100644
--- a/helix-view/src/handlers/lsp.rs
+++ b/helix-view/src/handlers/lsp.rs
@@ -1,4 +1,8 @@
+use crate::editor::Action;
+use crate::Editor;
 use crate::{DocumentId, ViewId};
+use helix_lsp::util::generate_transaction_from_edits;
+use helix_lsp::{lsp, OffsetEncoding};
 
 pub enum CompletionEvent {
     /// Auto completion was triggered by typing a word char
@@ -39,3 +43,228 @@ pub enum SignatureHelpEvent {
     Cancel,
     RequestComplete { open: bool },
 }
+
+#[derive(Debug)]
+pub struct ApplyEditError {
+    pub kind: ApplyEditErrorKind,
+    pub failed_change_idx: usize,
+}
+
+#[derive(Debug)]
+pub enum ApplyEditErrorKind {
+    DocumentChanged,
+    FileNotFound,
+    UnknownURISchema,
+    IoError(std::io::Error),
+    // TODO: check edits before applying and propagate failure
+    // InvalidEdit,
+}
+
+impl ToString for ApplyEditErrorKind {
+    fn to_string(&self) -> String {
+        match self {
+            ApplyEditErrorKind::DocumentChanged => "document has changed".to_string(),
+            ApplyEditErrorKind::FileNotFound => "file not found".to_string(),
+            ApplyEditErrorKind::UnknownURISchema => "URI schema not supported".to_string(),
+            ApplyEditErrorKind::IoError(err) => err.to_string(),
+        }
+    }
+}
+
+impl Editor {
+    fn apply_text_edits(
+        &mut self,
+        uri: &helix_lsp::Url,
+        version: Option<i32>,
+        text_edits: Vec<lsp::TextEdit>,
+        offset_encoding: OffsetEncoding,
+    ) -> Result<(), ApplyEditErrorKind> {
+        let path = match uri.to_file_path() {
+            Ok(path) => path,
+            Err(_) => {
+                let err = format!("unable to convert URI to filepath: {}", uri);
+                log::error!("{}", err);
+                self.set_error(err);
+                return Err(ApplyEditErrorKind::UnknownURISchema);
+            }
+        };
+
+        let doc_id = match self.open(&path, Action::Load) {
+            Ok(doc_id) => doc_id,
+            Err(err) => {
+                let err = format!("failed to open document: {}: {}", uri, err);
+                log::error!("{}", err);
+                self.set_error(err);
+                return Err(ApplyEditErrorKind::FileNotFound);
+            }
+        };
+
+        let doc = doc_mut!(self, &doc_id);
+        if let Some(version) = version {
+            if version != doc.version() {
+                let err = format!("outdated workspace edit for {path:?}");
+                log::error!("{err}, expected {} but got {version}", doc.version());
+                self.set_error(err);
+                return Err(ApplyEditErrorKind::DocumentChanged);
+            }
+        }
+
+        // Need to determine a view for apply/append_changes_to_history
+        let view_id = self.get_synced_view_id(doc_id);
+        let doc = doc_mut!(self, &doc_id);
+
+        let transaction = generate_transaction_from_edits(doc.text(), text_edits, offset_encoding);
+        let view = view_mut!(self, view_id);
+        doc.apply(&transaction, view.id);
+        doc.append_changes_to_history(view);
+        Ok(())
+    }
+
+    // TODO make this transactional (and set failureMode to transactional)
+    pub fn apply_workspace_edit(
+        &mut self,
+        offset_encoding: OffsetEncoding,
+        workspace_edit: &lsp::WorkspaceEdit,
+    ) -> Result<(), ApplyEditError> {
+        if let Some(ref document_changes) = workspace_edit.document_changes {
+            match document_changes {
+                lsp::DocumentChanges::Edits(document_edits) => {
+                    for (i, document_edit) in document_edits.iter().enumerate() {
+                        let edits = document_edit
+                            .edits
+                            .iter()
+                            .map(|edit| match edit {
+                                lsp::OneOf::Left(text_edit) => text_edit,
+                                lsp::OneOf::Right(annotated_text_edit) => {
+                                    &annotated_text_edit.text_edit
+                                }
+                            })
+                            .cloned()
+                            .collect();
+                        self.apply_text_edits(
+                            &document_edit.text_document.uri,
+                            document_edit.text_document.version,
+                            edits,
+                            offset_encoding,
+                        )
+                        .map_err(|kind| ApplyEditError {
+                            kind,
+                            failed_change_idx: i,
+                        })?;
+                    }
+                }
+                lsp::DocumentChanges::Operations(operations) => {
+                    log::debug!("document changes - operations: {:?}", operations);
+                    for (i, operation) in operations.iter().enumerate() {
+                        match operation {
+                            lsp::DocumentChangeOperation::Op(op) => {
+                                self.apply_document_resource_op(op).map_err(|io| {
+                                    ApplyEditError {
+                                        kind: ApplyEditErrorKind::IoError(io),
+                                        failed_change_idx: i,
+                                    }
+                                })?;
+                            }
+
+                            lsp::DocumentChangeOperation::Edit(document_edit) => {
+                                let edits = document_edit
+                                    .edits
+                                    .iter()
+                                    .map(|edit| match edit {
+                                        lsp::OneOf::Left(text_edit) => text_edit,
+                                        lsp::OneOf::Right(annotated_text_edit) => {
+                                            &annotated_text_edit.text_edit
+                                        }
+                                    })
+                                    .cloned()
+                                    .collect();
+                                self.apply_text_edits(
+                                    &document_edit.text_document.uri,
+                                    document_edit.text_document.version,
+                                    edits,
+                                    offset_encoding,
+                                )
+                                .map_err(|kind| {
+                                    ApplyEditError {
+                                        kind,
+                                        failed_change_idx: i,
+                                    }
+                                })?;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return Ok(());
+        }
+
+        if let Some(ref changes) = workspace_edit.changes {
+            log::debug!("workspace changes: {:?}", changes);
+            for (i, (uri, text_edits)) in changes.iter().enumerate() {
+                let text_edits = text_edits.to_vec();
+                self.apply_text_edits(uri, None, text_edits, offset_encoding)
+                    .map_err(|kind| ApplyEditError {
+                        kind,
+                        failed_change_idx: i,
+                    })?;
+            }
+        }
+
+        Ok(())
+    }
+
+    fn apply_document_resource_op(&mut self, op: &lsp::ResourceOp) -> std::io::Result<()> {
+        use lsp::ResourceOp;
+        use std::fs;
+        match op {
+            ResourceOp::Create(op) => {
+                let path = op.uri.to_file_path().unwrap();
+                let ignore_if_exists = op.options.as_ref().map_or(false, |options| {
+                    !options.overwrite.unwrap_or(false) && options.ignore_if_exists.unwrap_or(false)
+                });
+                if !ignore_if_exists || !path.exists() {
+                    // Create directory if it does not exist
+                    if let Some(dir) = path.parent() {
+                        if !dir.is_dir() {
+                            fs::create_dir_all(dir)?;
+                        }
+                    }
+
+                    fs::write(&path, [])?;
+                    self.language_servers.file_event_handler.file_changed(path);
+                }
+            }
+            ResourceOp::Delete(op) => {
+                let path = op.uri.to_file_path().unwrap();
+                if path.is_dir() {
+                    let recursive = op
+                        .options
+                        .as_ref()
+                        .and_then(|options| options.recursive)
+                        .unwrap_or(false);
+
+                    if recursive {
+                        fs::remove_dir_all(&path)?
+                    } else {
+                        fs::remove_dir(&path)?
+                    }
+                    self.language_servers.file_event_handler.file_changed(path);
+                } else if path.is_file() {
+                    fs::remove_file(&path)?;
+                }
+            }
+            ResourceOp::Rename(op) => {
+                let from = op.old_uri.to_file_path().unwrap();
+                let to = op.new_uri.to_file_path().unwrap();
+                let ignore_if_exists = op.options.as_ref().map_or(false, |options| {
+                    !options.overwrite.unwrap_or(false) && options.ignore_if_exists.unwrap_or(false)
+                });
+                if !ignore_if_exists || !to.exists() {
+                    self.move_path(&from, &to)?;
+                }
+            }
+        }
+        Ok(())
+    }
+}

From cf4492174d0ee27bd3c73a5fa57fe3a26aa064be Mon Sep 17 00:00:00 2001
From: Waleed Dahshan <58462210+wmstack@users.noreply.github.com>
Date: Tue, 30 Jan 2024 08:58:33 +1100
Subject: [PATCH 676/967] Use range positions to determine insert_newline
 motion (#9448)

* use anchor and head positions to determine motion

* use range cursor to decide extending or shifting

* add condition to cursor moving back on normal
---
 helix-term/src/commands.rs |  2 +-
 helix-view/src/editor.rs   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4df3278b8..d44f477b7 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3651,7 +3651,7 @@ pub mod insert {
                 (pos, pos, local_offs)
             };
 
-            let new_range = if doc.restore_cursor {
+            let new_range = if range.cursor(text) > range.anchor {
                 // when appending, extend the range by local_offs
                 Range::new(
                     range.anchor + global_offs,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index db0d4030b..0fa6d67c9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1990,10 +1990,12 @@ impl Editor {
         if doc.restore_cursor {
             let text = doc.text().slice(..);
             let selection = doc.selection(view.id).clone().transform(|range| {
-                Range::new(
-                    range.from(),
-                    graphemes::prev_grapheme_boundary(text, range.to()),
-                )
+                let mut head = range.to();
+                if range.head > range.anchor {
+                    head = graphemes::prev_grapheme_boundary(text, head);
+                }
+
+                Range::new(range.from(), head)
             });
 
             doc.set_selection(view.id, selection);

From dbac78bb3c06717f1f83984da3035e28f39d49a5 Mon Sep 17 00:00:00 2001
From: Andrew Carter <ascarter@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:18:53 -0800
Subject: [PATCH 677/967] Set ui.virtual.ruler background for GitHub themes
 (#9487)

Turning on a ruler does not show a visible ruler
line for the GitHub themes. This change renders
rulers using the `canvas.subtle` color. This
matches the color used for the `cursorline` and
creates a visible ruler that fits the theme.
---
 runtime/themes/github_dark.toml  | 1 +
 runtime/themes/github_light.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/runtime/themes/github_dark.toml b/runtime/themes/github_dark.toml
index 4f9aa562b..6b3354848 100644
--- a/runtime/themes/github_dark.toml
+++ b/runtime/themes/github_dark.toml
@@ -60,6 +60,7 @@ label = "scale.red.3"
 "ui.text.focus" = { fg = "fg.default" }
 "ui.text.inactive" = "fg.subtle"
 "ui.virtual" = { fg = "scale.gray.6" }
+"ui.virtual.ruler" = { bg = "canvas.subtle" }
 
 "ui.selection" = { bg = "scale.blue.8" }
 "ui.selection.primary" = { bg = "scale.blue.7" }
diff --git a/runtime/themes/github_light.toml b/runtime/themes/github_light.toml
index 3e2269698..e6912a987 100644
--- a/runtime/themes/github_light.toml
+++ b/runtime/themes/github_light.toml
@@ -60,6 +60,7 @@ label = "scale.red.5"
 "ui.text.focus" = { fg = "fg.default" }
 "ui.text.inactive" = "fg.subtle"
 "ui.virtual" = { fg = "scale.gray.2" }
+"ui.virtual.ruler" = { bg = "canvas.subtle" }
 
 "ui.selection" = { bg = "scale.blue.0" }
 "ui.selection.primary" = { bg = "scale.blue.1" }

From dd596028099ea8bc2aa01f980137b22b5ff7b0b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:33:46 -0700
Subject: [PATCH 678/967] build(deps): bump pulldown-cmark from 0.9.3 to 0.9.6
 (#9474)

---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d4ac12e43..76213cf0a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1653,11 +1653,11 @@ checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.9.3"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
+checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "memchr",
  "unicase",
 ]

From 5ec9565ddb352744aa4d5a8d4017033d899db01d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:34:05 -0700
Subject: [PATCH 679/967] build(deps): bump serde from 1.0.195 to 1.0.196
 (#9473)

---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 76213cf0a..dae1bece5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1825,18 +1825,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.195"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.195"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",

From aa4241c973d0f5f69ab034ce54a6d2d372e38c3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:34:24 -0700
Subject: [PATCH 680/967] build(deps): bump chrono from 0.4.32 to 0.4.33
 (#9472)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dae1bece5..09a019dc9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.32"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",

From 70cea93bff2ae94c4da5676cb1e157a0d8117e66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:34:49 -0700
Subject: [PATCH 681/967] build(deps): bump serde_json from 1.0.111 to 1.0.113
 (#9471)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 09a019dc9..a0986dcc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1845,9 +1845,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.111"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
  "itoa",
  "ryu",

From 81ae768a4ea20543bc16246a46552a69204fd7c1 Mon Sep 17 00:00:00 2001
From: Shoyu Vanilla <modulo641@gmail.com>
Date: Sun, 4 Feb 2024 03:23:33 +0900
Subject: [PATCH 682/967] Use gix pipeline filter instead of manual crlf
 implementation (#9503)

---
 Cargo.lock           | 192 +++++++++++++++++++++++++++++++++++++++++++
 helix-vcs/Cargo.toml |   2 +-
 helix-vcs/src/git.rs |  38 ++++-----
 3 files changed, 209 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0986dcc7..cb815ee3e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -448,6 +448,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "filetime"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "flate2"
 version = "1.0.27"
@@ -527,33 +539,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31887c304d9a935f3e5494fb5d6a0106c34e965168ec0db9b457424eedd0c741"
 dependencies = [
  "gix-actor",
+ "gix-attributes",
+ "gix-command",
  "gix-commitgraph",
  "gix-config",
  "gix-date",
  "gix-diff",
  "gix-discover",
  "gix-features",
+ "gix-filter",
  "gix-fs",
  "gix-glob",
  "gix-hash",
  "gix-hashtable",
+ "gix-ignore",
+ "gix-index",
  "gix-lock",
  "gix-macros",
  "gix-object",
  "gix-odb",
  "gix-pack",
  "gix-path",
+ "gix-pathspec",
  "gix-ref",
  "gix-refspec",
  "gix-revision",
  "gix-revwalk",
  "gix-sec",
+ "gix-submodule",
  "gix-tempfile",
  "gix-trace",
  "gix-traverse",
  "gix-url",
  "gix-utils",
  "gix-validate",
+ "gix-worktree",
  "once_cell",
  "parking_lot",
  "smallvec",
@@ -574,6 +594,32 @@ dependencies = [
  "winnow 0.5.28",
 ]
 
+[[package]]
+name = "gix-attributes"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "214ee3792e504ee1ce206b36dcafa4f328ca313d1e2ac0b41433d68ef4e14260"
+dependencies = [
+ "bstr",
+ "gix-glob",
+ "gix-path",
+ "gix-quote",
+ "gix-trace",
+ "kstring",
+ "smallvec",
+ "thiserror",
+ "unicode-bom",
+]
+
+[[package]]
+name = "gix-bitmap"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b6cd0f246180034ddafac9b00a112f19178135b21eb031b3f79355891f7325"
+dependencies = [
+ "thiserror",
+]
+
 [[package]]
 name = "gix-chunk"
 version = "0.4.7"
@@ -583,6 +629,18 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gix-command"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce1ffc7db3fb50b7dae6ecd937a3527cb725f444614df2ad8988d81806f13f09"
+dependencies = [
+ "bstr",
+ "gix-path",
+ "gix-trace",
+ "shell-words",
+]
+
 [[package]]
 name = "gix-commitgraph"
 version = "0.24.0"
@@ -690,6 +748,27 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "gix-filter"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9240862840fb740d209422937195e129e4ed3da49af212383260134bea8f6c1a"
+dependencies = [
+ "bstr",
+ "encoding_rs",
+ "gix-attributes",
+ "gix-command",
+ "gix-hash",
+ "gix-object",
+ "gix-packetline-blocking",
+ "gix-path",
+ "gix-quote",
+ "gix-trace",
+ "gix-utils",
+ "smallvec",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-fs"
 version = "0.10.0"
@@ -733,6 +812,44 @@ dependencies = [
  "parking_lot",
 ]
 
+[[package]]
+name = "gix-ignore"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f7069aaca4a05784c4cb44e392f0eaf627c6e57e05d3100c0e2386a37a682f0"
+dependencies = [
+ "bstr",
+ "gix-glob",
+ "gix-path",
+ "gix-trace",
+ "unicode-bom",
+]
+
+[[package]]
+name = "gix-index"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7152181ba8f0a3addc5075dd612cea31fc3e252b29c8be8c45f4892bf87426"
+dependencies = [
+ "bitflags 2.4.2",
+ "bstr",
+ "btoi",
+ "filetime",
+ "gix-bitmap",
+ "gix-features",
+ "gix-fs",
+ "gix-hash",
+ "gix-lock",
+ "gix-object",
+ "gix-traverse",
+ "itoa",
+ "libc",
+ "memmap2",
+ "rustix",
+ "smallvec",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-lock"
 version = "13.0.0"
@@ -814,6 +931,18 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gix-packetline-blocking"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca8ef6dd3ea50e26f3bf572e90c034d033c804d340cd1eb386392f184a9ba2f7"
+dependencies = [
+ "bstr",
+ "faster-hex",
+ "gix-trace",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-path"
 version = "0.10.4"
@@ -827,6 +956,21 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gix-pathspec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cbd49750edb26b0a691e5246fc635fa554d344da825cd20fa9ee0da9c1b761f"
+dependencies = [
+ "bitflags 2.4.2",
+ "bstr",
+ "gix-attributes",
+ "gix-config-value",
+ "gix-glob",
+ "gix-path",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-quote"
 version = "0.4.10"
@@ -917,6 +1061,21 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "gix-submodule"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73182f6c1f5ed1ed94ba16581ac62593d5e29cd1c028b2af618f836283b8f8d4"
+dependencies = [
+ "bstr",
+ "gix-config",
+ "gix-path",
+ "gix-pathspec",
+ "gix-refspec",
+ "gix-url",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-tempfile"
 version = "13.0.0"
@@ -986,6 +1145,24 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gix-worktree"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca36bb3dc54038c66507dc75c4d8edbee2d6d5cc45227b4eb508ad13dd60a006"
+dependencies = [
+ "bstr",
+ "gix-attributes",
+ "gix-features",
+ "gix-fs",
+ "gix-glob",
+ "gix-hash",
+ "gix-ignore",
+ "gix-index",
+ "gix-object",
+ "gix-path",
+]
+
 [[package]]
 name = "globset"
 version = "0.4.14"
@@ -1408,6 +1585,15 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "kstring"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
+dependencies = [
+ "static_assertions",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.152"
@@ -1880,6 +2066,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.17"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 051134e4a..6aa50dcf7 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.6.0" }
 
-gix = { version = "0.58.0", default-features = false , optional = true }
+gix = { version = "0.58.0", features = ["attributes"], default-features = false, optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 
diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs
index e4d45301a..995bade06 100644
--- a/helix-vcs/src/git.rs
+++ b/helix-vcs/src/git.rs
@@ -1,5 +1,7 @@
 use anyhow::{bail, Context, Result};
 use arc_swap::ArcSwap;
+use gix::filter::plumbing::driver::apply::Delay;
+use std::io::Read;
 use std::path::Path;
 use std::sync::Arc;
 
@@ -76,29 +78,21 @@ impl DiffProvider for Git {
         let file_oid = find_file_in_commit(&repo, &head, file)?;
 
         let file_object = repo.find_object(file_oid)?;
-        let mut data = file_object.detach().data;
-        // convert LF to CRLF if configured to avoid showing every line as changed
-        if repo
-            .config_snapshot()
-            .boolean("core.autocrlf")
-            .unwrap_or(false)
-        {
-            let mut normalized_file = Vec::with_capacity(data.len());
-            let mut at_cr = false;
-            for &byte in &data {
-                if byte == b'\n' {
-                    // if this is a LF instead of a CRLF (last byte was not a CR)
-                    // insert a new CR to generate a CRLF
-                    if !at_cr {
-                        normalized_file.push(b'\r');
-                    }
-                }
-                at_cr = byte == b'\r';
-                normalized_file.push(byte)
-            }
-            data = normalized_file
+        let data = file_object.detach().data;
+        // Get the actual data that git would make out of the git object.
+        // This will apply the user's git config or attributes like crlf conversions.
+        if let Some(work_dir) = repo.work_dir() {
+            let rela_path = file.strip_prefix(work_dir)?;
+            let rela_path = gix::path::try_into_bstr(rela_path)?;
+            let (mut pipeline, _) = repo.filter_pipeline(None)?;
+            let mut worktree_outcome =
+                pipeline.convert_to_worktree(&data, rela_path.as_ref(), Delay::Forbid)?;
+            let mut buf = Vec::with_capacity(data.len());
+            worktree_outcome.read_to_end(&mut buf)?;
+            Ok(buf)
+        } else {
+            Ok(data)
         }
-        Ok(data)
     }
 
     fn get_current_head_name(&self, file: &Path) -> Result<Arc<ArcSwap<Box<str>>>> {

From d54545281956bd92f52aad0ced008ae093df2b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Sat, 3 Feb 2024 23:27:40 +0000
Subject: [PATCH 683/967] feat(queries): regex injection for golang (#9510)

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

diff --git a/runtime/queries/go/injections.scm b/runtime/queries/go/injections.scm
index 321c90add..d7b03da35 100644
--- a/runtime/queries/go/injections.scm
+++ b/runtime/queries/go/injections.scm
@@ -1,2 +1,14 @@
 ((comment) @injection.content
  (#set! injection.language "comment"))
+
+
+(call_expression
+  (selector_expression) @_function
+  (#any-of? @_function "regexp.Match" "regexp.MatchReader" "regexp.MatchString" "regexp.Compile" "regexp.CompilePOSIX" "regexp.MustCompile" "regexp.MustCompilePOSIX")
+  (argument_list
+    .
+    [
+      (raw_string_literal)
+      (interpreted_string_literal)
+    ] @injection.content
+    (#set! injection.language "regex")))

From 3f380722fbb2fd676ccc0a9dbbea4ddc4871c6ea Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Sat, 3 Feb 2024 17:04:51 -0800
Subject: [PATCH 684/967] Update grammars for Nushell to rev 358c4f50 (#9502)

---
 languages.toml                    | 2 +-
 runtime/queries/nu/highlights.scm | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/languages.toml b/languages.toml
index ba3b19066..1f26f1680 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1832,7 +1832,7 @@ language-servers = [ "nu-lsp" ]
 
 [[grammar]]
 name = "nu"
-source = { git = "https://github.com/nushell/tree-sitter-nu", rev = "98c11c491e3405c75affa1cf004097692da3dda2" }
+source = { git = "https://github.com/nushell/tree-sitter-nu", rev = "358c4f509eb97f0148bbd25ad36acc729819b9c1" }
 
 [[language]]
 name = "vala"
diff --git a/runtime/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
index 746c50251..66a305840 100644
--- a/runtime/queries/nu/highlights.scm
+++ b/runtime/queries/nu/highlights.scm
@@ -2,7 +2,6 @@
 ;;; keywords
 [
     "def"
-    "def-env"
     "alias"
     "export-env"
     "export"
@@ -73,7 +72,6 @@
         "tb" "tB" "Tb" "TB"
         "pb" "pB" "Pb" "PB"
         "eb" "eB" "Eb" "EB"
-        "zb" "zB" "Zb" "ZB"
 
         "kib" "kiB" "kIB" "kIb" "Kib" "KIb" "KIB"
         "mib" "miB" "mIB" "mIb" "Mib" "MIb" "MIB"
@@ -81,7 +79,6 @@
         "tib" "tiB" "tIB" "tIb" "Tib" "TIb" "TIB"
         "pib" "piB" "pIB" "pIb" "Pib" "PIb" "PIB"
         "eib" "eiB" "eIB" "eIb" "Eib" "EIb" "EIB"
-        "zib" "ziB" "zIB" "zIb" "Zib" "ZIb" "ZIB"
     ] @variable.parameter
 )
 (val_binary

From d1054de3ced44903c7bdcf5886d8481eb40a948f Mon Sep 17 00:00:00 2001
From: Novus Nota <68142933+novusnota@users.noreply.github.com>
Date: Sun, 4 Feb 2024 02:09:11 +0100
Subject: [PATCH 685/967] feat: Add `Tact` language support (#9512)

Re-submitting
---
 book/src/generated/lang-support.md   |   1 +
 languages.toml                       |  19 ++
 runtime/queries/tact/highlights.scm  | 298 +++++++++++++++++++++++++++
 runtime/queries/tact/indents.scm     |  38 ++++
 runtime/queries/tact/injections.scm  |   5 +
 runtime/queries/tact/locals.scm      |  35 ++++
 runtime/queries/tact/textobjects.scm |  58 ++++++
 7 files changed, 454 insertions(+)
 create mode 100644 runtime/queries/tact/highlights.scm
 create mode 100644 runtime/queries/tact/indents.scm
 create mode 100644 runtime/queries/tact/injections.scm
 create mode 100644 runtime/queries/tact/locals.scm
 create mode 100644 runtime/queries/tact/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a78dd7935..e7d29cc73 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -162,6 +162,7 @@
 | swift | ✓ |  |  | `sourcekit-lsp` |
 | t32 | ✓ |  |  |  |
 | tablegen | ✓ | ✓ | ✓ |  |
+| tact | ✓ | ✓ | ✓ |  |
 | task | ✓ |  |  |  |
 | templ | ✓ |  |  | `templ` |
 | tfvars | ✓ |  | ✓ | `terraform-ls` |
diff --git a/languages.toml b/languages.toml
index 1f26f1680..e601c20d9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3042,3 +3042,22 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "hocon"
 source = { git = "https://github.com/antosha417/tree-sitter-hocon", rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc" }
+
+[[language]]
+name = "tact"
+scope = "source.tact"
+injection-regex = "tact"
+file-types = ["tact"]
+comment-token = "//"
+indent = { tab-width = 4, unit = "    " }
+
+[language.auto-pairs]
+'"' = '"'
+'{' = '}'
+'(' = ')'
+'<' = '>'
+
+[[grammar]]
+name = "tact"
+source = { git = "https://github.com/tact-lang/tree-sitter-tact", rev = "ec57ab29c86d632639726631fb2bb178d23e1c91" }
+
diff --git a/runtime/queries/tact/highlights.scm b/runtime/queries/tact/highlights.scm
new file mode 100644
index 000000000..53bf985b5
--- /dev/null
+++ b/runtime/queries/tact/highlights.scm
@@ -0,0 +1,298 @@
+; See: https://docs.helix-editor.com/master/themes.html#syntax-highlighting
+; -------------------------------------------------------------------------
+
+; attribute
+; ---------
+
+[
+  "@name"
+  "@interface"
+] @attribute
+
+; comment.line
+; ------------
+
+((comment) @comment.line
+  (#match? @comment.line "^//"))
+
+; comment.block
+; -------------
+
+(comment) @comment.block
+
+; function.builtin
+; ----------------
+
+((identifier) @function.builtin
+  (#any-of? @function.builtin
+    "send" "sender" "require" "now"
+    "myBalance" "myAddress" "newAddress"
+    "contractAddress" "contractAddressExt"
+    "emit" "cell" "ton"
+    "beginString" "beginComment" "beginTailString" "beginStringFromBuilder" "beginCell" "emptyCell"
+    "randomInt" "random"
+    "checkSignature" "checkDataSignature" "sha256"
+    "min" "max" "abs" "pow"
+    "throw" "dump" "getConfigParam"
+    "nativeThrowWhen" "nativeThrowUnless" "nativeReserve"
+    "nativeRandomize" "nativeRandomizeLt" "nativePrepareRandom" "nativeRandom" "nativeRandomInterval")
+  (#is-not? local))
+
+; function.method
+; ---------------
+
+(method_call_expression
+  name: (identifier) @function.method)
+
+; function
+; --------
+
+(func_identifier) @function
+
+(native_function
+  name: (identifier) @function)
+
+(static_function
+  name: (identifier) @function)
+
+(static_call_expression
+  name: (identifier) @function)
+
+(init_function
+  "init" @function.method)
+
+(receive_function
+  "receive" @function.method)
+
+(bounced_function
+  "bounced" @function.method)
+
+(external_function
+  "external" @function.method)
+
+(function
+  name: (identifier) @function.method)
+
+; keyword.control.conditional
+; ---------------------------
+
+[
+  "if" "else"
+] @keyword.control.conditional
+
+; keyword.control.repeat
+; ----------------------
+
+[
+  "while" "repeat" "do" "until"
+] @keyword.control.repeat
+
+; keyword.control.import
+; ----------------------
+
+"import" @keyword.control.import
+
+; keyword.control.return
+; ----------------------
+
+"return" @keyword.control.return
+
+; keyword.operator
+; ----------------
+
+"initOf" @keyword.operator
+
+; keyword.directive
+; -----------------
+
+"primitive" @keyword.directive
+
+; keyword.function
+; ----------------
+
+[
+  "fun"
+  "native"
+] @keyword.function
+
+; keyword.storage.type
+; --------------------
+
+[
+  "contract" "trait" "struct" "message" "with"
+  "const" "let"
+] @keyword.storage.type
+
+; keyword.storage.modifier
+; ------------------------
+
+[
+  "get" "mutates" "extends" "virtual" "override" "inline" "abstract"
+] @keyword.storage.modifier
+
+; keyword
+; -------
+
+[
+  "with"
+  ; "public" ; -- not used, but declared in grammar.ohm
+  ; "extend" ; -- not used, but declared in grammar.ohm
+] @keyword
+
+; constant.builtin.boolean
+; ------------------------
+
+(boolean) @constant.builtin.boolean
+
+; constant.builtin
+; ----------------
+
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin
+    "SendPayGasSeparately"
+    "SendIgnoreErrors"
+    "SendDestroyIfZero"
+    "SendRemainingValue"
+    "SendRemainingBalance")
+  (#is-not? local))
+
+(null) @constant.builtin
+
+; constant.numeric.integer
+; ------------------------
+
+(integer) @constant.numeric.integer
+
+; constant
+; --------
+
+(constant
+  name: (identifier) @constant)
+
+; string.special.path
+; -------------------
+
+(import_statement
+  library: (string) @string.special.path)
+
+; string
+; ------
+
+(string) @string
+
+; type.builtin
+; ------------
+
+(tlb_serialization
+  "as" @keyword
+  type: (identifier) @type.builtin
+  (#any-of? @type.builtin
+    "int8" "int16" "int32" "int64" "int128" "int256" "int257"
+    "uint8" "uint16" "uint32" "uint64" "uint128" "uint256"
+    "coins" "remaining" "bytes32" "bytes64"))
+
+((type_identifier) @type.builtin
+  (#any-of? @type.builtin
+    "Address" "Bool" "Builder" "Cell" "Int" "Slice" "String" "StringBuilder"))
+
+(map_type
+  "map" @type.builtin
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+(bounced_type
+  "bounced" @type.builtin
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+((identifier) @type.builtin
+  (#eq? @type.builtin "SendParameters")
+  (#is-not? local))
+
+; type
+; ----
+
+(type_identifier) @type
+
+; constructor
+; -----------
+
+(instance_expression
+  name: (identifier) @constructor)
+
+(initOf
+  name: (identifier) @constructor)
+
+; operator
+; --------
+
+[
+  "-" "-="
+  "+" "+="
+  "*" "*="
+  "/" "/="
+  "%" "%="
+  "=" "=="
+  "!" "!=" "!!"
+  "<" "<=" "<<"
+  ">" ">=" ">>"
+  "&" "|"
+  "&&" "||"
+] @operator
+
+; punctuation.bracket
+; -------------------
+
+[
+  "(" ")"
+  "{" "}"
+] @punctuation.bracket
+
+; punctuation.delimiter
+; ---------------------
+
+[
+  ";"
+  ","
+  "."
+  ":"
+  "?"
+] @punctuation.delimiter
+
+; variable.other.member
+; ---------------------
+
+(field
+  name: (identifier) @variable.other.member)
+
+(contract_body
+  (constant
+    name: (identifier) @variable.other.member))
+
+(trait_body
+  (constant
+    name: (identifier) @variable.other.member))
+
+(field_access_expression
+  name: (identifier) @variable.other.member)
+
+(lvalue (_) (_) @variable.other.member)
+
+(instance_argument
+  name: (identifier) @variable.other.member)
+
+; variable.parameter
+; ------------------
+
+(parameter
+  name: (identifier) @variable.parameter)
+
+; variable.builtin
+; ----------------
+
+(self) @variable.builtin
+
+; variable
+; --------
+
+(identifier) @variable
diff --git a/runtime/queries/tact/indents.scm b/runtime/queries/tact/indents.scm
new file mode 100644
index 000000000..62c532b22
--- /dev/null
+++ b/runtime/queries/tact/indents.scm
@@ -0,0 +1,38 @@
+; indent
+; ------
+
+[
+  ; (..., ...)
+  (parameter_list)
+  (argument_list)
+
+  ; {..., ...}
+  (instance_argument_list)
+
+  ; {...; ...}
+  (message_body)
+  (struct_body)
+  (contract_body)
+  (trait_body)
+  (function_body)
+  (block_statement)
+
+  ; misc.
+  (binary_expression)
+  (return_statement)
+] @indent
+
+; outdent
+; -------
+
+[
+  "}"
+  ")"
+  ">"
+] @outdent
+
+; indent.always
+; outdent.always
+; align
+; extend
+; extend.prevent-once
\ No newline at end of file
diff --git a/runtime/queries/tact/injections.scm b/runtime/queries/tact/injections.scm
new file mode 100644
index 000000000..e61db3a56
--- /dev/null
+++ b/runtime/queries/tact/injections.scm
@@ -0,0 +1,5 @@
+; See: https://docs.helix-editor.com/guides/injection.html
+
+((comment) @injection.content
+ (#set! injection.language "comment")
+ (#match? @injection.content "^//"))
\ No newline at end of file
diff --git a/runtime/queries/tact/locals.scm b/runtime/queries/tact/locals.scm
new file mode 100644
index 000000000..f1b3e8de5
--- /dev/null
+++ b/runtime/queries/tact/locals.scm
@@ -0,0 +1,35 @@
+; See: https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables
+
+; Scopes       @local.scope
+; -------------------------
+
+[
+  (static_function)
+  (init_function)
+  (bounced_function)
+  (receive_function)
+  (external_function)
+  (function)
+  (block_statement)
+] @local.scope
+
+; Definitions  @local.definition
+; ------------------------------
+
+(let_statement
+  name: (identifier) @local.definition)
+
+(parameter
+  name: (identifier) @local.definition)
+
+(constant
+  name: (identifier) @local.definition)
+
+; References   @local.reference
+; -----------------------------
+
+(self) @local.reference
+
+(value_expression (identifier) @local.reference)
+
+(lvalue (identifier) @local.reference)
diff --git a/runtime/queries/tact/textobjects.scm b/runtime/queries/tact/textobjects.scm
new file mode 100644
index 000000000..54d07014e
--- /dev/null
+++ b/runtime/queries/tact/textobjects.scm
@@ -0,0 +1,58 @@
+; function.inside & around
+; ------------------------
+
+(static_function
+  body: (_) @function.inside) @function.around
+
+(init_function
+  body: (_) @function.inside) @function.around
+
+(bounced_function
+  body: (_) @function.inside) @function.around
+
+(receive_function
+  body: (_) @function.inside) @function.around
+
+(external_function
+  body: (_) @function.inside) @function.around
+
+(function
+  body: (_) @function.inside) @function.around
+
+; class.inside & around
+; ---------------------
+
+(struct
+  body: (_) @class.inside) @class.around
+
+(message
+  body: (_) @class.inside) @class.around
+
+(contract
+  body: (_) @class.inside) @class.around
+
+; NOTE: Marked as @definition.interface in tags, as it's semantically correct
+(trait
+  body: (_) @class.inside) @class.around
+
+; parameter.inside & around
+; -------------------------
+
+(parameter_list
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(argument_list
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(instance_argument_list
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+; comment.inside
+; --------------
+
+(comment) @comment.inside
+
+; comment.around
+; --------------
+
+(comment)+ @comment.around
\ No newline at end of file

From 75d61d8149d1e55d25f0bc34d95f01d6a3f1f526 Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Sun, 4 Feb 2024 03:09:42 +0200
Subject: [PATCH 686/967] Improve tree-sitter queries for Scala (#9475)

- Simplify function highlighting
- Highlight extension methods
- Textobject query (mia/maa) for class/trait constructor parameters/arguments
- Textobject query (mif/maf) for Scala 3 braceless lambdas
---
 runtime/queries/scala/highlights.scm  | 27 ++++++---------------------
 runtime/queries/scala/textobjects.scm | 10 ++++++++--
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/runtime/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
index 4f90bfda6..e21a3909d 100644
--- a/runtime/queries/scala/highlights.scm
+++ b/runtime/queries/scala/highlights.scm
@@ -53,28 +53,13 @@
 (var_declaration
   name: (identifier) @variable)
 
-; method definition
+; function definitions/declarations
 
-(class_definition
-  body: (template_body
-    [
-      (function_definition
-        name: (identifier) @function.method)
-      (function_declaration
-        name: (identifier) @function.method)
-    ]))
-(trait_definition
-  body: (template_body
-    [
-      (function_definition
-        name: (identifier) @function.method)
-      (function_declaration
-        name: (identifier) @function.method)
-    ]))
-(object_definition
-  body: (template_body
-    (function_definition
-      name: (identifier) @function.method)))
+(function_declaration
+    name: (identifier) @function.method)
+
+(function_definition
+      name: (identifier) @function.method)
 
 ; imports/exports
 
diff --git a/runtime/queries/scala/textobjects.scm b/runtime/queries/scala/textobjects.scm
index 6e551c417..21286b3ef 100644
--- a/runtime/queries/scala/textobjects.scm
+++ b/runtime/queries/scala/textobjects.scm
@@ -1,12 +1,15 @@
 ; Function queries
 
 (function_definition
-  body: (_) @function.inside) @function.around
+  body: (_) @function.inside) @function.around ; Does not include end marker
 
-; Does not match block lambdas or Scala 3 braceless lambdas
 (lambda_expression
   (_) @function.inside) @function.around
 
+; Scala 3 braceless lambda
+(colon_argument
+  (_) @function.inside) @function.around
+
 
 ; Class queries
 
@@ -32,6 +35,9 @@
 (parameters
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
 
+(class_parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
 (parameter_types
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
 

From 6e3ed7f0fa91a3adc01f33e182999f606b48ce6a Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Sun, 4 Feb 2024 02:10:20 +0100
Subject: [PATCH 687/967] Update Unison tree-sitter grammar for type changes
 and add indent queries (#9505)

* Update Unison tree-sitter grammar for type changes

* Add indent queries for Unison

* Improve Unison indent queries
---
 book/src/generated/lang-support.md    |  2 +-
 languages.toml                        |  2 +-
 runtime/queries/unison/highlights.scm |  4 +---
 runtime/queries/unison/indents.scm    | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 runtime/queries/unison/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index e7d29cc73..ddd480536 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -174,7 +174,7 @@
 | typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | typst | ✓ |  |  | `typst-lsp` |
 | ungrammar | ✓ |  |  |  |
-| unison | ✓ |  |  |  |
+| unison | ✓ |  | ✓ |  |
 | uxntal | ✓ |  |  |  |
 | v | ✓ | ✓ | ✓ | `v-analyzer` |
 | vala | ✓ |  |  | `vala-language-server` |
diff --git a/languages.toml b/languages.toml
index e601c20d9..11afea0ca 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2940,7 +2940,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "unison"
-source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "aaec316774c8b50d367ec7cf26523aac5ef0cfc5" }
+source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "1f505e2447fa876a87aee47ff3d70b9e141c744f" }
 
 [[language]]
 name = "todotxt"
diff --git a/runtime/queries/unison/highlights.scm b/runtime/queries/unison/highlights.scm
index d58285ed8..711779295 100644
--- a/runtime/queries/unison/highlights.scm
+++ b/runtime/queries/unison/highlights.scm
@@ -9,8 +9,6 @@
 ;; Keywords
 [
   (kw_forall)
-  (unique_kw)
-  (structural_kw)
   (type_kw)
   (kw_equals)
   (do)
@@ -51,7 +49,7 @@
 (blank_pattern) @variable.builtin
 
 ;; Types
-(record_field name: (wordy_id) @variable.other.member type: (wordy_id) @type)
+(record_field name: (wordy_id) @variable.other.member type: (_) @type)
 (type_constructor (type_name (wordy_id) @constructor))
 (ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @variable.parameter)
 (effect (wordy_id) @special) ;; NOTE: an effect is just like a type, but in signature we special case it
diff --git a/runtime/queries/unison/indents.scm b/runtime/queries/unison/indents.scm
new file mode 100644
index 000000000..6cb15517c
--- /dev/null
+++ b/runtime/queries/unison/indents.scm
@@ -0,0 +1,15 @@
+[
+  (term_definition)
+  (type_declaration)
+  (pattern)
+  (tuple_or_parenthesized)
+  (literal_list)
+  (tuple_pattern)
+  (function_application)
+  (exp_if)
+  (constructor)
+  (delay_block)
+  (type_signature)
+] @indent
+
+[(kw_then) (kw_else) (cases)] @indent.always @extend

From 5c567f31e236134c0e27dc689c8ad07ef5f9b5d1 Mon Sep 17 00:00:00 2001
From: Doug Kelkhoff <18220321+dgkf@users.noreply.github.com>
Date: Sat, 3 Feb 2024 20:11:20 -0500
Subject: [PATCH 688/967] Adding two themes using only colors from 16-color
 terminal themes (#9477)

* adding 16-color terminal themes

* minor consistency update

* minor consistency update

* rename to be more consistent with other helix theme name conventions

* fixing improper theme inherits name
---
 runtime/themes/term16_dark.toml  | 80 ++++++++++++++++++++++++++++++
 runtime/themes/term16_light.toml | 85 ++++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 runtime/themes/term16_dark.toml
 create mode 100644 runtime/themes/term16_light.toml

diff --git a/runtime/themes/term16_dark.toml b/runtime/themes/term16_dark.toml
new file mode 100644
index 000000000..b34a4b4e2
--- /dev/null
+++ b/runtime/themes/term16_dark.toml
@@ -0,0 +1,80 @@
+# Author: dgkf
+
+"ui.background" = { }
+"ui.background.separator" = { fg = "red" }
+"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "light-yellow", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.secondary" = { fg = "gray", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { bg = "black" }
+"ui.gutter" = { }
+"ui.gutter.selected" = { bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.linenr" = { fg = "gray", modifiers = ["bold"] }
+"ui.linenr.selected" = { fg = "white", modifiers = ["bold"] }
+"ui.menu" = { fg = "light-gray", bg = "gray" }
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.menu.scroll" = { fg = "light-blue" }
+"ui.popup" = { bg = "black" }
+"ui.selection" = { bg = "gray" }
+"ui.statusline" = { fg = "light-gray", bg = "gray" }
+"ui.statusline.inactive" = { bg = "black" }
+"ui.virtual" = { bg = "black" }
+"ui.virtual.indent-guide" = { fg = "gray" }
+"ui.virtual.whitespace" = {}
+"ui.virtual.wrap" = { fg = "gray" }
+"ui.virtual.inlay-hint" = { fg = "light-gray", modifiers = ["dim", "italic"] }
+"ui.virtual.inlay-hint.parameter" = { fg = "yellow", modifiers = ["dim", "italic"] }
+"ui.virtual.inlay-hint.type" = { fg = "blue", modifiers = ["dim", "italic"] }
+"ui.window" = { fg = "gray", modifiers = ["dim"] }
+
+"comment" = { fg = "light-gray", modifiers = ["italic", "dim"] }
+
+"attribute" = "light-yellow"
+"constant" = { fg = "light-yellow", modifiers = ["bold", "dim"] }
+"constant.numeric" = "light-yellow"
+"constant.character.escape" = "light-cyan"
+"constructor" = "light-blue"
+"function" = "light-blue"
+"function.macro" = "light-red"
+"function.builtin" = { fg = "light-blue", modifiers = ["bold"] }
+"tag" = { fg = "light-magenta", modifiers = ["dim"] }
+"type" = "blue"
+"type.builtin" = { fg = "blue", modifiers = ["bold"] }
+"type.enum.variant" = { fg = "light-magenta", modifiers = ["dim"] }
+"string"  = "light-green"
+"special" = "light-red"
+"variable" = "white"
+"variable.parameter" = { fg = "light-yellow", modifiers = ["italic"] }
+"variable.other.member" = "light-green"
+"keyword" = "light-magenta"
+"keyword.control.exception" = "light-red"
+"keyword.directive" = { fg = "light-yellow", modifiers = ["bold"] }
+"keyword.operator" = { fg = "light-blue", modifiers = ["bold"] }
+"label" = "light-green"
+"namespace" = { fg = "blue", modifiers = ["dim"] }
+
+"markup.heading" = "light-blue"
+"markup.list" = "light-red"
+"markup.bold" = { fg = "light-cyan", modifiers = ["bold"] }
+"markup.italic" = { fg = "light-blue", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "magenta", modifiers = ["dim"] }
+"markup.link.text" = "light-magenta"
+"markup.quote" = "light-cyan"
+"markup.raw" = "light-green"
+
+"diff.plus" = "light-green"
+"diff.delta" = "light-yellow"
+"diff.minus" = "light-red"
+
+"diagnostic.hint" = { underline = { color = "gray", style = "curl" } }
+"diagnostic.info" = { underline = { color = "light-cyan", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "light-yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "light-red", style = "curl" } }
+
+"info" = "light-cyan"
+"hint" = { fg = "light-gray", modifiers = ["dim"] }
+"debug" = "white"
+"warning" = "yellow"
+"error" = "light-red"
diff --git a/runtime/themes/term16_light.toml b/runtime/themes/term16_light.toml
new file mode 100644
index 000000000..a02784b25
--- /dev/null
+++ b/runtime/themes/term16_light.toml
@@ -0,0 +1,85 @@
+# Author: dgkf
+# Modified from base16_terminal, Author: NNB <nnbnh@protonmail.com>
+
+inherits = "term16_dark"
+
+"ui.background.separator" = "light-gray"
+"ui.cursor" = { fg = "gray", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "yellow", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "black", modifiers = ["reversed"] }
+"ui.cursor.secondary" = { fg = "gray", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { bg = "white" }
+"ui.cursorline.secondary" = { bg = "white" }
+"ui.cursorcolumn.primary" = { bg = "white" }
+"ui.cursorcolumn.secondary" = { bg = "white" }
+"ui.gutter" = { }
+"ui.gutter.selected" = { bg = "white" }
+"ui.linenr" = { fg = "gray", modifiers = ["dim"] }
+"ui.linenr.selected" = { fg = "black",  modifiers = ["bold"] }
+"ui.menu" = { bg = "light-gray" }
+"ui.menu.selected" = { fg = "white", bg = "gray", modifiers = ["bold"] }
+"ui.menu.scroll" = { fg = "light-blue" }
+"ui.help" = { }
+"ui.text" = { }
+"ui.text.focus" = { }
+"ui.popup" = { bg = "white" }
+"ui.selection" = { bg = "light-gray" }
+"ui.statusline" = { bg = "white" }
+"ui.statusline.inactive" = { fg = "gray", modifiers = ["underlined"] }
+"ui.statusline.insert" = { fg = "white", bg = "blue" }
+"ui.statusline.select" = { fg = "white", bg = "magenta" }
+"ui.virtual" = { fg = "light-gray" }
+"ui.virtual.indent-guide" = { fg = "light-gray", modifiers = ["dim"] }
+"ui.virtual.ruler" = { bg = "white" }
+"ui.virtual.wrap" = { fg = "light-gray" }
+"ui.window" = { fg = "gray", modifiers = ["dim"] }
+
+"comment" = { fg = "gray", modifiers = ["italic", "dim"] }
+
+"attribute" = "yellow"
+"constant" = { fg = "yellow", modifiers = ["bold"] }
+"constant.numeric" = { fg = "yellow", modifiers = ["bold"] }
+"constant.character.escape" = "blue"
+"constructor" = "blue"
+"function" = "blue"
+"function.builtin" = { fg = "blue", modifiers = ["bold"] }
+"tag" = { fg = "magenta", modifiers = ["dim"] }
+"type" = "blue"
+"type.builtin" = { fg = "blue", modifiers = ["bold"] }
+"type.enum.variant" = { fg = "magenta", modifiers = ["dim"] }
+"string"  = "green"
+"special" = "red"
+"variable" = { fg = "black", modifiers = ["dim"] }
+"variable.parameter" = { fg = "red", modifiers = ["italic", "dim"] }
+"variable.other.member" = "green"
+"keyword" = "magenta"
+"keyword.control.exception" = "red"
+"keyword.directive" = { fg = "yellow", modifiers = ["bold"] }
+"keyword.operator" = { fg = "blue", modifiers = ["bold"] }
+"label" = "red"
+"namespace" = { fg = "blue", modifiers = ["dim"] }
+
+"markup.heading" = { fg = "blue", modifiers = ["bold"] }
+"markup.list" = "red"
+"markup.bold" = { fg = "cyan", modifiers = ["bold"] }
+"markup.italic" = { fg = "blue", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "magenta", modifiers = ["dim"] }
+"markup.link.text" = { fg = "magenta", modifiers = ["bold"] }
+"markup.quote" = "cyan"
+"markup.raw" = "blue"
+
+"diff.plus" = "green"
+"diff.delta" = "yellow"
+"diff.minus" = "red"
+
+"diagnostic.hint" = { underline = { color = "cyan", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+
+"hint" = "cyan"
+"info" = "blue"
+"debug" = "light-yellow"
+"warning" = "yellow"
+"error" = "red"

From 0975d9c5e7e4caf08d1c1204f09ab6d2f718105d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Tue, 6 Feb 2024 00:55:56 +0000
Subject: [PATCH 689/967] feat(languages): golang comments and numeric types
 (#9525)

---
 runtime/queries/go/highlights.scm | 32 ++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index fba2df99e..8eed12afb 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -183,9 +183,12 @@
 
 [
   (int_literal)
+] @constant.numeric.integer
+
+[
   (float_literal)
   (imaginary_literal)
-] @constant.numeric.integer
+] @constant.numeric.float
 
 [
   (true)
@@ -197,4 +200,31 @@
   (iota)
 ] @constant.builtin
 
+; Comments
+
 (comment) @comment
+
+; Doc Comments
+(source_file
+  .
+  (comment)+ @comment.block.documentation)
+
+(source_file
+  (comment)+ @comment.block.documentation
+  .
+  (const_declaration))
+
+(source_file
+  (comment)+ @comment.block.documentation
+  .
+  (function_declaration))
+
+(source_file
+  (comment)+ @comment.block.documentation
+  .
+  (type_declaration))
+
+(source_file
+  (comment)+ @comment.block.documentation
+  .
+  (var_declaration))

From 1d87c6a999d389011cf8a5849a6096d981c93e33 Mon Sep 17 00:00:00 2001
From: eh <correia.eh@gmail.com>
Date: Tue, 6 Feb 2024 01:13:20 -0500
Subject: [PATCH 690/967] Update colors used for zed themes (#9544)

Official colors used is now publically available: https://github.com/zed-industries/zed/blob/main/assets/themes/one/one.json
Modified the theme to more accurately reflect the actual colors being used.

Co-authored-by: e4 <eric.correia@dronesense.com>
---
 runtime/themes/zed_onedark.toml  | 83 ++++++++++++++++----------------
 runtime/themes/zed_onelight.toml | 39 +++++++++------
 2 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/runtime/themes/zed_onedark.toml b/runtime/themes/zed_onedark.toml
index 5fda576f3..300b3c9c5 100644
--- a/runtime/themes/zed_onedark.toml
+++ b/runtime/themes/zed_onedark.toml
@@ -4,22 +4,20 @@
 "comment" = { fg = "light-gray", modifiers = ["italic"] }
 "constant" = { fg = "yellow" }
 "constant.numeric" = { fg = "orange" }
-"constant.builtin" = { fg = "orange" }
+"constant.builtin" = { fg = "yellow" }
 "constant.builtin.boolean" = { fg = "yellow" }
-"constant.character.escape" = { fg = "orange" }
+"constant.character.escape" = { fg = "yellow" }
 "constructor" = { fg = "blue" }
 "function" = { fg = "blue" }
 "function.builtin" = { fg = "blue" }
-"function.macro" = { fg = "purple" }
+"function.method" = { fg = "blue" }
+"function.macro" = { fg = "blue" }
 "keyword" = { fg = "purple" }
-"keyword.control" = { fg = "purple" }
-"keyword.control.import" = { fg = "purple" }
-"keyword.directive" = { fg = "purple" }
 "label" = { fg = "ui-text" }
 "namespace" = { fg = "ui-text" }
 "operator" = { fg = "ui-text" }
-"keyword.operator" = { fg = "purple" }
-"special" = { fg = "blue" }
+"puncuation" = { fg = "ui-text" }
+"special" = { fg = "ui-text" }
 "string" = { fg = "green" }
 "type" = { fg = "cyan" }
 "variable.builtin" = { fg = "orange" }
@@ -28,41 +26,43 @@
 
 "markup.heading" = { fg = "red" }
 "markup.raw.inline" = { fg = "green" }
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "purple", modifiers = ["italic"] }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.list" = { fg = "red" }
 "markup.quote" = { fg = "yellow" }
-"markup.link.url" = { fg = "cyan", modifiers = ["underlined"]}
+"markup.link.url" = { fg = "cyan", modifiers = ["underlined"] }
 "markup.link.text" = { fg = "purple" }
 
 "diff.plus" = "green"
-"diff.delta" = "orange"
+"diff.delta" = "yellow"
 "diff.minus" = "red"
 
-"diagnostic.info".underline = { color = "blue", style = "curl" } 
-"diagnostic.hint".underline = { color = "green", style = "curl" } 
-"diagnostic.warning".underline = { color = "yellow", style = "curl" } 
-"diagnostic.error".underline = { color = "red", style = "curl" } 
+"diagnostic.info".underline = { color = "blue", style = "curl" }
+"diagnostic.hint".underline = { color = "green", style = "curl" }
+"diagnostic.warning".underline = { color = "yellow", style = "curl" }
+"diagnostic.error".underline = { color = "red", style = "curl" }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }
 "error" = { fg = "red", modifiers = ["bold"] }
 
 "ui.background" = { bg = "ui-text-reversed" }
+"ui.gutter" = { bg = "gray" }
 "ui.virtual" = { fg = "faint-gray" }
-"ui.virtual.indent-guide" = { fg = "faint-gray" }
+"ui.virtual.indent-guidje" = { fg = "faint-gray" }
 "ui.virtual.whitespace" = { fg = "light-gray" }
 "ui.virtual.ruler" = { bg = "gray" }
-"ui.virtual.inlay-hint" = { fg = "light-gray" }
+"ui.virtual.inlay-hint" = { fg = "blue-gray", modifiers = ["bold"] }
 
 "ui.cursor" = { fg = "white", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
-"ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]}
+"ui.cursor.match" = { fg = "blue", modifiers = ["underlined"] }
+"ui.cursor.insert" = { fg = "dark-blue" }
 
 "ui.selection" = { bg = "faint-gray" }
-"ui.selection.primary" = { bg = "gray" }
-"ui.cursorline.primary" = { bg = "light-black" }
+"ui.selection.primary" = { bg = "#293b5bff" }
+"ui.cursorline.primary" = { bg = "black" }
 
 "ui.highlight" = { bg = "gray" }
 "ui.highlight.frameline" = { bg = "#97202a" }
@@ -70,14 +70,14 @@
 "ui.linenr" = { fg = "linenr" }
 "ui.linenr.selected" = { fg = "ui-text" }
 
-"ui.statusline" = { fg = "white", bg = "light-black" }
-"ui.statusline.inactive" = { fg = "light-gray", bg = "light-black" }
-"ui.statusline.normal" = { fg = "light-black", bg = "blue" }
-"ui.statusline.insert" = { fg = "light-black", bg = "green" }
-"ui.statusline.select" = { fg = "light-black", bg = "purple" }
+"ui.statusline" = { fg = "white", bg = "gray" }
+"ui.statusline.inactive" = { fg = "light-gray", bg = "black" }
+"ui.statusline.normal" = { fg = "black", bg = "blue" }
+"ui.statusline.insert" = { fg = "black", bg = "green" }
+"ui.statusline.select" = { fg = "black", bg = "purple" }
 
 "ui.text" = { fg = "ui-text" }
-"ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
+"ui.text.focus" = { fg = "white", bg = "black", modifiers = ["bold"] }
 
 "ui.help" = { fg = "white", bg = "gray" }
 "ui.popup" = { bg = "gray" }
@@ -89,22 +89,21 @@
 "ui.debug" = { fg = "red" }
 
 [palette]
-
-yellow = "#dac18c"
-blue = "#7ca8dd"
-red = "#bd7476"
-purple = "#9d74b9"
-green = "#a0b783"
-orange = "#b4926e" 
-cyan = "#7eb2be"
-light-black = "#2e323a"
-gray = "#363f4c"
-light-gray = "#5c606b"
+yellow = "#dfc184ff"
+orange = "#bf956aff"
+blue = "#73ade9ff"
+blue-gray = "#5a6f89ff"
+red = "#d07277ff"
+purple = "#b477cfff"
+green = "#a1c181ff"
+cyan = "#6eb4bfff"
+gray = "#2f343ebf"
+light-gray = "#5d636fff"
 faint-gray = "#3B4048"
-linenr = "#4B5263"
+linenr = "#5d636fff"
 
-white = "#a8adb7"
-black = "#292c33"
+white = "#c8ccd4ff"
+black = "#282c33ff"
 # black and white are used for a lot of the UI text
-ui-text = "#a8adb7" #white
-ui-text-reversed = "#292c33" #black
+ui-text = "#c8ccd4ff"          #white
+ui-text-reversed = "#282c33ff" #black
diff --git a/runtime/themes/zed_onelight.toml b/runtime/themes/zed_onelight.toml
index 2b54cd5be..f3da11676 100644
--- a/runtime/themes/zed_onelight.toml
+++ b/runtime/themes/zed_onelight.toml
@@ -16,9 +16,13 @@ inherits = "zed_onedark"
 
 "ui.cursor" = { fg = "dark-blue", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "dark-blue", modifiers = ["reversed"] }
+"ui.cursor.insert" = { fg = "dark-blue" }
 
+"ui.selection.primary" = { bg = "blue-gray" }
 "ui.cursorline.primary" = { bg = "faint-gray" }
 
+"ui.virtual.inlay-hint" = { fg = "violet", modifiers = ["bold"] }
+
 "ui.statusline" = { fg = "black", bg = "gray" }
 "ui.statusline.inactive" = { fg = "white", bg = "light-black" }
 "ui.statusline.normal" = { fg = "white", bg = "blue" }
@@ -33,23 +37,26 @@ inherits = "zed_onedark"
 
 [palette]
 
-yellow = "#dac18c"
-blue = "#5185b5"
-red = "#bd7476"
-dark-blue = "#607bdb"
-orange = "#ca7667"
-purple = "#a160ac"
-green = "#739d60"
-gold = "#a8763c"
-cyan = "#4b80b2"
+yellow = "#dabb7e"
+red = "#d36151ff"
+orange = "#d3604fff"
+blue = "#5b79e3ff"
+dark-blue = "#4a62db"
+purple = "#a449abff"
+violet = "#9294beff"
+green = "#649f57ff"
+gold = "#ad6e25ff"
+cyan = "#3882b7ff"
 light-black = "#2e323a"
-gray = "#dcdcdd"
+# gray = "#dcdcdd"
+gray = "#eaeaed"
 dark-gray = "#ebebec"
-light-gray = "#a6a6aa"
+light-gray = "#a2a3a7ff"
+blue-gray = "#d9dcea"
 faint-gray = "#efefef"
-linenr = "#4B5263"
+linenr = "#b0b1b3"
 
-black = "#404248"
-white = "#fafafa"
-ui-text = "#404248"
-ui-text-reversed = "#fafafa"
+black = "#383a41ff"
+white = "#fafafaff"
+ui-text = "#383a41ff"
+ui-text-reversed = "#fafafaff"

From a37af2dcbf57b6b800946115b4156fefc199ce7a Mon Sep 17 00:00:00 2001
From: Diego <dstafa.dev@gmail.com>
Date: Tue, 6 Feb 2024 14:45:57 +0100
Subject: [PATCH 691/967] fix division by zero when prompt completion area is
 too small (#9524)

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

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 702a6e671..3764bba60 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -393,7 +393,7 @@ impl Prompt {
             height,
         );
 
-        if !self.completion.is_empty() {
+        if completion_area.height > 0 && !self.completion.is_empty() {
             let area = completion_area;
             let background = theme.get("ui.menu");
 

From 28a39e6efc79b9aac53d49ac8325e8e32fb127e2 Mon Sep 17 00:00:00 2001
From: eh <correia.eh@gmail.com>
Date: Tue, 6 Feb 2024 11:47:13 -0500
Subject: [PATCH 692/967] Fix cursorline Zed OneDark (#9549)

Co-authored-by: e4 <eric.correia@dronesense.com>
---
 runtime/themes/zed_onedark.toml  | 6 +++---
 runtime/themes/zed_onelight.toml | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/runtime/themes/zed_onedark.toml b/runtime/themes/zed_onedark.toml
index 300b3c9c5..7ac1e73cc 100644
--- a/runtime/themes/zed_onedark.toml
+++ b/runtime/themes/zed_onedark.toml
@@ -50,7 +50,7 @@
 "ui.background" = { bg = "ui-text-reversed" }
 "ui.gutter" = { bg = "gray" }
 "ui.virtual" = { fg = "faint-gray" }
-"ui.virtual.indent-guidje" = { fg = "faint-gray" }
+"ui.virtual.indent-guide" = { fg = "faint-gray" }
 "ui.virtual.whitespace" = { fg = "light-gray" }
 "ui.virtual.ruler" = { bg = "gray" }
 "ui.virtual.inlay-hint" = { fg = "blue-gray", modifiers = ["bold"] }
@@ -62,7 +62,7 @@
 
 "ui.selection" = { bg = "faint-gray" }
 "ui.selection.primary" = { bg = "#293b5bff" }
-"ui.cursorline.primary" = { bg = "black" }
+"ui.cursorline.primary" = { bg = "gray" }
 
 "ui.highlight" = { bg = "gray" }
 "ui.highlight.frameline" = { bg = "#97202a" }
@@ -77,7 +77,7 @@
 "ui.statusline.select" = { fg = "black", bg = "purple" }
 
 "ui.text" = { fg = "ui-text" }
-"ui.text.focus" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.text.focus" = { fg = "white", bg = "gray", modifiers = ["bold"] }
 
 "ui.help" = { fg = "white", bg = "gray" }
 "ui.popup" = { bg = "gray" }
diff --git a/runtime/themes/zed_onelight.toml b/runtime/themes/zed_onelight.toml
index f3da11676..086fce34b 100644
--- a/runtime/themes/zed_onelight.toml
+++ b/runtime/themes/zed_onelight.toml
@@ -36,7 +36,6 @@ inherits = "zed_onedark"
 "ui.window" = { fg = "dark-gray" }
 
 [palette]
-
 yellow = "#dabb7e"
 red = "#d36151ff"
 orange = "#d3604fff"

From c64a0e615b3b8e182c02efdb7c67162ec269619f Mon Sep 17 00:00:00 2001
From: Bogdan Agica <bogdan.agica@gmail.com>
Date: Tue, 6 Feb 2024 23:50:14 -0800
Subject: [PATCH 693/967] Revert "build(deps): bump cc from 1.0.83 to 1.0.84
 (#8809)" (#9548)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb815ee3e..3871768f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -145,9 +145,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.84"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "libc",
 ]

From 72c508de248e363d8a3481ad9d028320361df1fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 17:34:49 +0900
Subject: [PATCH 694/967] build(deps): bump libc from 0.2.152 to 0.2.153
 (#9541)

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

diff --git a/Cargo.lock b/Cargo.lock
index 3871768f8..d25bd373c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1596,9 +1596,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 9a7162ac1..295782976 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -72,7 +72,7 @@ grep-searcher = "0.1.13"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
-libc = "0.2.152"
+libc = "0.2.153"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }

From 630d91168a7aa2a3da72a55266dee663565f6edf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 23:56:26 +0000
Subject: [PATCH 695/967] build(deps): bump pulldown-cmark from 0.9.6 to 0.10.0

Bumps [pulldown-cmark](https://github.com/raphlinus/pulldown-cmark) from 0.9.6 to 0.10.0.
- [Release notes](https://github.com/raphlinus/pulldown-cmark/releases)
- [Commits](https://github.com/raphlinus/pulldown-cmark/compare/v0.9.6...v0.10.0)

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

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

diff --git a/Cargo.lock b/Cargo.lock
index d25bd373c..73e548ae5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1839,9 +1839,9 @@ checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.9.6"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
+checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7"
 dependencies = [
  "bitflags 2.4.2",
  "memchr",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 295782976..a0d6754d0 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -52,7 +52,7 @@ log = "0.4"
 nucleo.workspace = true
 ignore = "0.4"
 # markdown doc rendering
-pulldown-cmark = { version = "0.9", default-features = false }
+pulldown-cmark = { version = "0.10", default-features = false }
 # file type detection
 content_inspector = "0.2.4"
 

From bbcc89241fd63b460ea7b1661a550f5b9eacba4c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 5 Feb 2024 19:32:25 -0500
Subject: [PATCH 696/967] Fix pulldown_cmark breaking changes to tag types

* Tags and TagEnd are now separate enums since
  <https://redirect.github.com/raphlinus/pulldown-cmark/pull/517>.
* The `Tag::Heading` member has been changed from a tuple variant to a
  struct variant.
---
 helix-term/src/ui/markdown.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 4d0c0d4a5..5cf530ad8 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -6,7 +6,7 @@ use tui::{
 
 use std::sync::Arc;
 
-use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
+use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag, TagEnd};
 
 use helix_core::{
     syntax::{self, HighlightEvent, InjectionLanguageMarker, Syntax},
@@ -209,7 +209,7 @@ impl Markdown {
 
                     list_stack.push(list);
                 }
-                Event::End(Tag::List(_)) => {
+                Event::End(TagEnd::List(_)) => {
                     list_stack.pop();
 
                     // whenever top-level list closes, empty line
@@ -249,7 +249,10 @@ impl Markdown {
                 Event::End(tag) => {
                     tags.pop();
                     match tag {
-                        Tag::Heading(_, _, _) | Tag::Paragraph | Tag::CodeBlock(_) | Tag::Item => {
+                        TagEnd::Heading(_)
+                        | TagEnd::Paragraph
+                        | TagEnd::CodeBlock
+                        | TagEnd::Item => {
                             push_line(&mut spans, &mut lines);
                         }
                         _ => (),
@@ -257,7 +260,7 @@ impl Markdown {
 
                     // whenever heading, code block or paragraph closes, empty line
                     match tag {
-                        Tag::Heading(_, _, _) | Tag::Paragraph | Tag::CodeBlock(_) => {
+                        TagEnd::Heading(_) | TagEnd::Paragraph | TagEnd::CodeBlock => {
                             lines.push(Spans::default());
                         }
                         _ => (),
@@ -279,7 +282,7 @@ impl Markdown {
                         lines.extend(tui_text.lines.into_iter());
                     } else {
                         let style = match tags.last() {
-                            Some(Tag::Heading(level, ..)) => match level {
+                            Some(Tag::Heading { level, .. }) => match level {
                                 HeadingLevel::H1 => heading_styles[0],
                                 HeadingLevel::H2 => heading_styles[1],
                                 HeadingLevel::H3 => heading_styles[2],

From a1272bdb17a63361342a318982e46129d558743c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@slint-ui.com>
Date: Wed, 7 Feb 2024 19:36:29 +0100
Subject: [PATCH 697/967] slint: Update treesitter parser and queries (#9551)

* slint: Update treesitter parser and queries

* slint: Port over suggestions from nvim review
---
 book/src/generated/lang-support.md    |   2 +-
 languages.toml                        |   2 +-
 runtime/queries/rust/injections.scm   |  20 +-
 runtime/queries/slint/highlights.scm  | 339 ++++++++++++++++----------
 runtime/queries/slint/indents.scm     |  17 +-
 runtime/queries/slint/locals.scm      |   9 +-
 runtime/queries/slint/textobjects.scm |  35 +++
 7 files changed, 278 insertions(+), 146 deletions(-)
 create mode 100644 runtime/queries/slint/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ddd480536..279acc4fb 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -148,7 +148,7 @@
 | scala | ✓ | ✓ | ✓ | `metals` |
 | scheme | ✓ |  | ✓ |  |
 | scss | ✓ |  |  | `vscode-css-language-server` |
-| slint | ✓ |  | ✓ | `slint-lsp` |
+| slint | ✓ | ✓ | ✓ | `slint-lsp` |
 | smali | ✓ |  | ✓ |  |
 | smithy | ✓ |  |  | `cs` |
 | sml | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 11afea0ca..bad221299 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2139,7 +2139,7 @@ language-servers = [ "slint-lsp" ]
 
 [[grammar]]
 name = "slint"
-source = { git = "https://github.com/jrmoulton/tree-sitter-slint", rev = "00c8a2d3645766f68c0d0460086c0a994e5b0d85" }
+source = { git = "https://github.com/slint-ui/tree-sitter-slint", rev = "15618215b79b9db08f824a5c97a12d073dcc1c00" }
 
 [[language]]
 name = "task"
diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
index ae9e587fd..b05b9d975 100644
--- a/runtime/queries/rust/injections.scm
+++ b/runtime/queries/rust/injections.scm
@@ -2,11 +2,29 @@
  (#set! injection.language "comment"))
 
 ((macro_invocation
-   macro: (identifier) @_html (#eq? @_html "html")
+   macro:
+     [
+       (scoped_identifier
+         name: (_) @_macro_name)
+       (identifier) @_macro_name
+     ]
    (token_tree) @injection.content)
+ (#eq? @_macro_name "html")
  (#set! injection.language "html")
  (#set! injection.include-children))
 
+((macro_invocation
+   macro:
+     [
+       (scoped_identifier
+         name: (_) @_macro_name)
+       (identifier) @_macro_name
+     ]
+   (token_tree) @injection.content)
+ (#eq? @_macro_name "slint")
+ (#set! injection.language "slint")
+ (#set! injection.include-children))
+
 ((macro_invocation
   (token_tree) @injection.content)
  (#set! injection.language "rust")
diff --git a/runtime/queries/slint/highlights.scm b/runtime/queries/slint/highlights.scm
index c0ef3dd88..06d82a413 100644
--- a/runtime/queries/slint/highlights.scm
+++ b/runtime/queries/slint/highlights.scm
@@ -1,122 +1,109 @@
+(comment) @comment
+
+; Different types:
+(string_value) @string
+(bool_value) @constant.builtin.boolean
+
+; Constants
+
+(escape_sequence) @constant.character.escape
+
+(color_value) @constant
 
-(identifier) @variable
 [
-  (type_identifier) 
-  (units)
-]@type
+  (children_identifier)
+  (easing_kind_identifier)
+] @constant.builtin
 
-(array_literal 
-  (identifier) @type)
+[
+  (int_value)
+  (physical_length_value)
+] @constant.numeric.integer
 
-(function_identifier) @function
 [
-  (image_macro)
-  (children_macro)
-  (radial_grad_macro)
-  (linear_grad_macro)
-] @function.macro
+  (float_value)
+  (percent_value)
+  (length_value)
+  (duration_value)
+  (angle_value)
+  (relative_font_size_value)
+] @constant.numeric.float
 
-(call_expression
-  function: (identifier) @function)
-(call_expression
-  function: (field_expression
-    field: (identifier) @function))
+(purity) @keyword.storage.modifier
 
-(vis) @keyword.control.import
+(function_visibility) @keyword.storage.modifier
 
-(transition_statement state: (identifier) @variable.other.member)
-(state_expression state: (identifier) @variable.other.member)
-(struct_block_definition field: (identifier) @variable.other.member)
-(assign_property (identifier) @attribute)
+(property_visibility) @keyword.storage.modifier
 
-(comment) @comment
+(builtin_type_identifier) @type.builtin
 
-(string_literal) @string
-(int_literal) @constant.numeric.integer
-(float_literal) @constant.numeric.float
+(reference_identifier) @variable.builtin
 
-[
-  "in"
-  "in-out"
-  "for"
-] @keyword.control.repeat
+(type
+  [
+    (type_list)
+    (user_type_identifier)
+    (anon_struct_block)
+  ]) @type
 
-[
-  "import"
-  "export"
-  "from"
-] @keyword.control.import
+(user_type_identifier) @type
 
-[
-  "if"
-  "else"
-  "when"
-] @keyword.control.conditional
+; Functions and callbacks
+(argument) @variable.parameter
 
-[
-  "struct"
-  "property"
-] @keyword.storage.type
+(function_call
+  name: (_) @function.call)
 
-[
-  "global"
-] @keyword.storage.modifier
+; definitions
+(callback
+  name: (_) @function)
 
+(callback_alias
+  name: (_) @function)
 
-[
-  "root"
-  "parent"
-  "duration"
-  "easing"
-] @variable.builtin
+(callback_event
+  name: (simple_identifier) @function.call)
 
+(enum_definition
+  name: (_) @type.enum)
 
-[
-  "callback"
-  "animate"
-  "states"
-  "out"
-  "transitions"
-  "component"
-  "inherits"
-] @keyword
+(function_definition
+  name: (_) @function)
 
-[
-  "black"
-  "transparent"
-  "blue"
-  "ease"
-  "ease_in"
-  "ease-in"
-  "ease_in_out"
-  "ease-in-out"
-  "ease_out"
-  "ease-out"
-  "end"
-  "green"
-  "red"
-  "start"
-  "yellow"
-  "white"
-  "gray"
- ] @constant.builtin
+(struct_definition
+  name: (_) @type)
+
+(typed_identifier
+  type: (_) @type)
+
+; Operators
+(binary_expression
+  op: (_) @operator)
+
+(unary_expression
+  op: (_) @operator)
 
 [
-  "true"
-  "false"
-] @constant.builtin.boolean
+  (comparison_operator)
+  (mult_prec_operator)
+  (add_prec_operator)
+  (unary_prec_operator)
+  (assignment_prec_operator)
+] @operator
 
-"@" @keyword
+[
+  ":="
+  "=>"
+  "->"
+  "<=>"
+] @operator
 
-; ; Punctuation
 [
-  ","
-  "."
   ";"
-  ":"
+  "."
+  ","
 ] @punctuation.delimiter
 
-; ; Brackets
 [
   "("
   ")"
@@ -126,46 +113,136 @@
   "}"
 ] @punctuation.bracket
 
-(define_property ["<" ">"] @punctuation.bracket)
+(property
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
-[
-  "angle"
-  "bool"
-  "brush"
-  "color" 
-  "duration"
-  "easing"
-  "float"
-  "image"
-  "int"
-  "length"
-  "percent"
-  "physical-length"
-  "physical_length"
-  "string"
-] @type.builtin
+; Properties, constants and variables
+(component
+  id: (simple_identifier) @constant)
+
+(property
+  name: (simple_identifier) @variable)
+
+(binding_alias
+  name: (simple_identifier) @variable)
+
+(binding
+  name: (simple_identifier) @variable)
+
+(struct_block
+  (simple_identifier) @variable.other.member)
+
+(anon_struct_block
+  (simple_identifier) @variable.other.member)
+
+(property_assignment
+  property: (simple_identifier) @variable)
+
+(states_definition
+  name: (simple_identifier) @variable)
+
+(callback
+  name: (simple_identifier) @variable)
+
+(typed_identifier
+  name: (_) @variable)
+
+(simple_indexed_identifier
+  (simple_identifier) @variable)
+
+(expression
+  (simple_identifier) @variable)
 
+; Attributes
 [
- ":="
- "<=>"
- "!"
- "-"
- "+"
- "*"
- "/"
- "&&"
- "||"
- ">"
- "<"
- ">="
- "<="
- "="
- ":"
- "+="
- "-="
- "*="
- "/="
- "?"
- "=>" ] @operator
-
-(ternary_expression [":" "?"] @keyword.control.conditional)
\ No newline at end of file
+  (linear_gradient_identifier)
+  (radial_gradient_identifier)
+  (radial_gradient_kind)
+] @attribute
+
+(image_call
+  "@image-url" @attribute)
+
+(tr
+  "@tr" @attribute)
+
+; Keywords
+(animate_option_identifier) @keyword
+
+(export) @keyword.control.import
+
+(if_statement
+  "if" @keyword.control.conditional)
+
+(if_expr
+  [
+    "if"
+    "else"
+  ] @keyword.control.conditional)
+
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.control.conditional)
+
+(animate_statement
+  "animate" @keyword)
+
+(callback
+  "callback" @keyword.function)
+
+(component_definition
+  [
+    "component"
+    "inherits"
+  ] @keyword.storage.type)
+
+(enum_definition
+  "enum" @keyword.storage.type)
+
+(for_loop
+  [
+    "for"
+    "in"
+  ] @keyword.control.repeat)
+
+(function_definition
+  "function" @keyword.function)
+
+(global_definition
+  "global" @keyword.storage.type)
+
+(imperative_block
+  "return" @keyword.control.return)
+
+(import_statement
+  [
+    "import"
+    "from"
+  ] @keyword.control.import)
+
+(import_type
+  "as" @keyword.control.import)
+
+(property
+  "property" @keyword.storage.type)
+
+(states_definition
+  [
+    "states"
+    "when"
+  ] @keyword)
+
+(struct_definition
+  "struct" @keyword.storage.type)
+
+(transitions_definition
+  [
+    "transitions"
+    "in"
+    "out"
+  ] @keyword)
diff --git a/runtime/queries/slint/indents.scm b/runtime/queries/slint/indents.scm
index 4b5ce41b8..189f8a0e5 100644
--- a/runtime/queries/slint/indents.scm
+++ b/runtime/queries/slint/indents.scm
@@ -1,12 +1,11 @@
 [
-  (comp_body) 
-  (state_statement)
-  (transition_statement)
-  (handler_body)
-  (consequence_body)
-  (global_single)
+  (anon_struct_block)
+  (assignment_block)
+  (block)
+  (enum_block)
+  (global_block)
+  (imperative_block)
+  (struct_block)
 ] @indent
 
-[
-  "}"
-] @outdent
+"}" @outdent
diff --git a/runtime/queries/slint/locals.scm b/runtime/queries/slint/locals.scm
index a115f0c69..06601b05d 100644
--- a/runtime/queries/slint/locals.scm
+++ b/runtime/queries/slint/locals.scm
@@ -1,3 +1,6 @@
-; locals.scm
-
-(component_item) @local.scope
+[
+  (component)
+  (component_definition)
+  (function_definition)
+  (imperative_block)
+] @local.scope
diff --git a/runtime/queries/slint/textobjects.scm b/runtime/queries/slint/textobjects.scm
new file mode 100644
index 000000000..7e2f36096
--- /dev/null
+++ b/runtime/queries/slint/textobjects.scm
@@ -0,0 +1,35 @@
+(function_definition
+  (imperative_block) @funtion.inside) @function.around
+
+(callback_event
+  (imperative_block) @function.inside) @function.around
+
+(property
+  (imperative_block) @function.inside) @function.around
+
+(struct_definition
+  (struct_block) @class.inside) @class.around
+
+(enum_definition
+  (enum_block) @class.inside) @class.around
+
+(global_definition
+  (global_block) @class.inside) @class.around
+
+(component_definition
+  (block) @class.inside) @class.around
+
+(component_definition
+  (block) @class.inside) @class.around
+
+(comment) @comment.around
+
+(typed_identifier
+  name: (_) @parameter.inside) @parameter.around
+
+(callback
+  arguments: (_) @parameter.inside)
+
+(string_value
+  "\"" . (_) @text.inside . "\"") @text.around
+

From f8e2d822ba3716aa986acee003f3093268344160 Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Fri, 9 Feb 2024 03:24:45 +0100
Subject: [PATCH 698/967] Fix scroll track (#9508)

---
 helix-term/src/ui/menu.rs  | 1 +
 helix-term/src/ui/popup.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 64127e3af..c0e60b33e 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -427,6 +427,7 @@ impl<T: Item + 'static> Component for Menu<T> {
                     cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
                 } else if !render_borders {
                     // Draw scroll track
+                    cell.set_symbol(half_block);
                     cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
                 }
             }
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index 7a6ffe9dd..b38b8b6e3 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -303,6 +303,7 @@ impl<T: Component> Component for Popup<T> {
                         cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
                     } else if !render_borders {
                         // Draw scroll track
+                        cell.set_symbol(half_block);
                         cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
                     }
                 }

From d137a08231515b0a1694a3841081331e529ce953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Fri, 9 Feb 2024 10:44:46 +0000
Subject: [PATCH 699/967] feat(languages): pkl (#9515)

* feat(languages): pkl

Add [pkl](https://github.com/apple/pkl) language.
Official documentation: https://pkl-lang.org/

* remove branch indent
---
 book/src/generated/lang-support.md |   1 +
 languages.toml                     |  11 ++
 runtime/queries/pkl/highlights.scm | 179 +++++++++++++++++++++++++++++
 runtime/queries/pkl/indents.scm    |  23 ++++
 runtime/queries/pkl/injections.scm |  30 +++++
 5 files changed, 244 insertions(+)
 create mode 100644 runtime/queries/pkl/highlights.scm
 create mode 100644 runtime/queries/pkl/indents.scm
 create mode 100644 runtime/queries/pkl/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 279acc4fb..c91b9ae11 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -123,6 +123,7 @@
 | pem | ✓ |  |  |  |
 | perl | ✓ | ✓ | ✓ | `perlnavigator` |
 | php | ✓ | ✓ | ✓ | `intelephense` |
+| pkl | ✓ |  | ✓ |  |
 | po | ✓ | ✓ |  |  |
 | pod | ✓ |  |  |  |
 | ponylang | ✓ | ✓ | ✓ |  |
diff --git a/languages.toml b/languages.toml
index bad221299..30b411571 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3061,3 +3061,14 @@ indent = { tab-width = 4, unit = "    " }
 name = "tact"
 source = { git = "https://github.com/tact-lang/tree-sitter-tact", rev = "ec57ab29c86d632639726631fb2bb178d23e1c91" }
 
+[[language]]
+name = "pkl"
+scope = "source.pkl"
+injection-regex = "pkl"
+file-types = ["pkl", "pcf"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "pkl"
+source = { git = "https://github.com/apple/tree-sitter-pkl", rev = "c03f04a313b712f8ab00a2d862c10b37318699ae" }
diff --git a/runtime/queries/pkl/highlights.scm b/runtime/queries/pkl/highlights.scm
new file mode 100644
index 000000000..501c94859
--- /dev/null
+++ b/runtime/queries/pkl/highlights.scm
@@ -0,0 +1,179 @@
+; Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     https://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+; this definition is imprecise in that 
+; * any qualified or unqualified call to a method named "Regex" is considered a regex
+; * string delimiters are considered part of the regex
+
+; Operators
+
+[
+  "??"
+  "@"
+  "="
+  "<"
+  ">"
+  "!"
+  "=="
+  "!="
+  "<="
+  ">="
+  "&&"
+  "||"
+  "+"
+  "-"
+  "**"
+  "*"
+  "/"
+  "~/"
+  "%"
+  "|>"
+] @keyword.operator
+
+[
+  "?"
+  "|"
+  "->"
+] @operator.type
+
+[
+  ","
+  ":"
+  "."
+  "?."
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "]"
+  "{"
+  "}"
+  ; "[" @punctuation.bracket TODO: FIGURE OUT HOW TO REFER TO CUSTOM TOKENS
+] @punctuation.bracket
+
+; Keywords
+
+[
+  "abstract"
+  "amends"
+  "as"
+  "class"
+  "extends"
+  "external"
+  "function"
+  "hidden"
+  "import"
+  "import*"
+  "in"
+  "let"
+  "local"
+  "module"
+  "new"
+  "open"
+  "out"
+  "typealias"
+  "when"
+] @keyword
+
+[
+  "if"
+  "is"
+  "else"
+] @keyword.control.conditional
+
+[
+  "for"
+] @keyword.control.repeat
+
+(importExpr "import" @keyword.control.import)
+(importGlobExpr "import*" @keyword.control.import)
+
+"read" @function.builtin
+"read?" @function.builtin
+"read*" @function.builtin
+"throw" @function.builtin
+"trace" @function.builtin
+
+(moduleExpr "module" @type.builtin)
+"nothing" @type.builtin
+"unknown" @type.builtin
+
+(outerExpr) @variable.builtin
+"super" @variable.builtin
+(thisExpr) @variable.builtin
+
+[
+  (falseLiteral)
+  (nullLiteral)
+  (trueLiteral)
+] @constant.builtin
+
+; Literals
+
+(stringConstant) @string
+(slStringLiteral) @string
+(mlStringLiteral) @string
+
+(escapeSequence) @constent.character.escape
+
+(intLiteral) @constant.numeric.integer
+(floatLiteral) @constant.numeric.float
+
+(interpolationExpr
+  "\\(" @punctuation.special
+  ")" @punctuation.special) @embedded
+
+(interpolationExpr
+ "\\#(" @punctuation.special
+ ")" @punctuation.special) @embedded
+
+(interpolationExpr
+  "\\##(" @punctuation.special
+  ")" @punctuation.special) @embedded
+
+(lineComment) @comment
+(blockComment) @comment
+(docComment) @comment
+
+; Identifiers
+
+(classProperty (identifier) @variable.other.member)
+(objectProperty (identifier) @variable.other.member)
+
+(parameterList (typedIdentifier (identifier) @variable.parameter))
+(objectBodyParameters (typedIdentifier (identifier) @variable.parameter))
+
+(identifier) @variable
+
+; Method definitions
+
+(classMethod (methodHeader (identifier)) @function.method)
+(objectMethod (methodHeader (identifier)) @function.method)
+
+; Method calls
+
+(methodCallExpr
+  (identifier) @function.method)
+
+; Types
+
+(clazz (identifier) @type)
+(typeAlias (identifier) @type)
+((identifier) @type
+ (match? @type "^[A-Z]"))
+
+(typeArgumentList
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
diff --git a/runtime/queries/pkl/indents.scm b/runtime/queries/pkl/indents.scm
new file mode 100644
index 000000000..d2a9be1ab
--- /dev/null
+++ b/runtime/queries/pkl/indents.scm
@@ -0,0 +1,23 @@
+; Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     https://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+; this definition is imprecise in that 
+; * any qualified or unqualified call to a method named "Regex" is considered a regex
+; * string delimiters are considered part of the regex
+[
+  (objectBody)
+  (classBody)
+  (ifExpr)
+  (mlStringLiteral) ; This isn't perfect; newlines are too indented but it's better than if omitted.
+] @indent
diff --git a/runtime/queries/pkl/injections.scm b/runtime/queries/pkl/injections.scm
new file mode 100644
index 000000000..15867f35e
--- /dev/null
+++ b/runtime/queries/pkl/injections.scm
@@ -0,0 +1,30 @@
+; Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     https://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+; this definition is imprecise in that 
+; * any qualified or unqualified call to a method named "Regex" is considered a regex
+; * string delimiters are considered part of the regex
+(
+  ((methodCallExpr (identifier) @methodName (argumentList (slStringLiteral) @injection.content))
+    (#set! injection.language "regex"))
+  (eq? @methodName "Regex"))
+ 
+((lineComment) @injection.content
+ (#set! injection.language "comment"))
+
+((blockComment) @injection.content
+ (#set! injection.language "comment"))
+
+((docComment) @injection.content
+ (#set! injection.language "markdown"))

From d570c29ce37ffbb46a9c49708c31dfd81daa27cf Mon Sep 17 00:00:00 2001
From: Android789515 <derflug@mailfence.com>
Date: Fri, 9 Feb 2024 14:29:11 +0000
Subject: [PATCH 700/967] expand upon the arch linux install instructions
 (#9574)

Signed-off-by: Android789515 <derflug@mailfence.com>
---
 book/src/install.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/book/src/install.md b/book/src/install.md
index 1f200e2ed..07865e698 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -76,6 +76,15 @@ Releases are available in the `extra` repository:
 ```sh
 sudo pacman -S helix
 ```
+
+> 💡 When installed from the `extra` repository, run Helix with `helix` instead of `hx`.
+>
+> For example:
+> ```sh
+> helix --health
+> ```
+> to check health
+
 Additionally, a [helix-git](https://aur.archlinux.org/packages/helix-git/) package is available
 in the AUR, which builds the master branch.
 

From 581a1ebf5d327c1128fe6c283578e8f36a4b5fb5 Mon Sep 17 00:00:00 2001
From: Galen Abell <galen@galenabell.com>
Date: Sun, 11 Feb 2024 18:24:20 +0100
Subject: [PATCH 701/967] Add glob file type support (#8006)

* Replace FileType::Suffix with FileType::Glob

Suffix is rather limited and cannot be used to match files which have
semantic meaning based on location + file type (for example, Github
Action workflow files). This patch adds support for a Glob FileType to
replace Suffix, which encompasses the existing behavior & adds
additional file matching functionality.

Globs are standard Unix-style path globs, which are matched against the
absolute path of the file. If the configured glob for a language is a
relative glob (that is, it isn't an absolute path or already starts with
a glob pattern), a glob pattern will be prepended to allow matching
relative paths from any directory.

The order of file type matching is also updated to first match on globs
and then on extension. This is necessary as most cases where
glob-matching is useful will have already been matched by an extension
if glob matching is done last.

* Convert file-types suffixes to globs

* Use globs for filename matching

Trying to match the file-type raw strings against both filename and
extension leads to files with the same name as the extension having the
incorrect syntax.

* Match dockerfiles with suffixes

It's common practice to add a suffix to dockerfiles based on their
context, e.g. `Dockerfile.dev`, `Dockerfile.prod`, etc.

* Make env filetype matching more generic

Match on `.env` or any `.env.*` files.

* Update docs

* Use GlobSet to match all file type globs at once

* Update todo.txt glob patterns

* Consolidate language Configuration and Loader creation

This is a refactor that improves the error handling for creating
the `helix_core::syntax::Loader` from the default and user language
configuration.

* Fix integration tests

* Add additional starlark file-type glob

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 Cargo.lock                              |   1 +
 book/src/languages.md                   |  28 ++--
 helix-core/Cargo.toml                   |   1 +
 helix-core/src/config.rs                |  45 ++++++-
 helix-core/src/syntax.rs                | 150 +++++++++++++--------
 helix-core/tests/indent.rs              |   2 +-
 helix-term/src/application.rs           |  14 +-
 helix-term/src/health.rs                |  10 +-
 helix-term/src/main.rs                  |  10 +-
 helix-term/tests/test/commands/write.rs |   2 +-
 helix-term/tests/test/helpers.rs        |  18 +--
 languages.toml                          | 168 ++++++++++++------------
 12 files changed, 262 insertions(+), 187 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 73e548ae5..a7ef8eb05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1240,6 +1240,7 @@ dependencies = [
  "dunce",
  "encoding_rs",
  "etcetera",
+ "globset",
  "hashbrown 0.14.3",
  "helix-loader",
  "helix-stdx",
diff --git a/book/src/languages.md b/book/src/languages.md
index 944ebf097..7e49a6036 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -78,24 +78,26 @@ from the above section. `file-types` is a list of strings or tables, for
 example:
 
 ```toml
-file-types = ["Makefile", "toml", { suffix = ".git/config" }]
+file-types = ["toml", { glob = "Makefile" }, { glob = ".git/config" }, { glob = ".github/workflows/*.yaml" } ]
 ```
 
 When determining a language configuration to use, Helix searches the file-types
 with the following priorities:
 
-1. Exact match: if the filename of a file is an exact match of a string in a
-   `file-types` list, that language wins. In the example above, `"Makefile"`
-   will match against `Makefile` files.
-2. Extension: if there are no exact matches, any `file-types` string that
-   matches the file extension of a given file wins. In the example above, the
-   `"toml"` matches files like `Cargo.toml` or `languages.toml`.
-3. Suffix: if there are still no matches, any values in `suffix` tables
-   are checked against the full path of the given file. In the example above,
-   the `{ suffix = ".git/config" }` would match against any `config` files
-   in `.git` directories. Note: `/` is used as the directory separator but is
-   replaced at runtime with the appropriate path separator for the operating
-   system, so this rule would match against `.git\config` files on Windows.
+1. Glob: values in `glob` tables are checked against the full path of the given
+   file. Globs are standard Unix-style path globs (e.g. the kind you use in Shell)
+   and can be used to match paths for a specific prefix, suffix, directory, etc.
+   In the above example, the `{ glob = "Makefile" }` config would match files
+   with the name `Makefile`, the `{ glob = ".git/config" }` config would match
+   `config` files in `.git` directories, and the `{ glob = ".github/workflows/*.yaml" }`
+   config would match any `yaml` files in `.github/workflow` directories. Note
+   that globs should always use the Unix path separator `/` even on Windows systems;
+   the matcher will automatically take the machine-specific separators into account.
+   If the glob isn't an absolute path or doesn't already start with a glob prefix,
+   `*/` will automatically be added to ensure it matches for any subdirectory.
+2. Extension: if there are no glob matches, any `file-types` string that matches
+   the file extension of a given file wins. In the example above, the `"toml"`
+   config matches files like `Cargo.toml` or `languages.toml`.
 
 ## Language Server configuration
 
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 8c63af8ef..bdc879caa 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -49,6 +49,7 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"
 
 etcetera = "0.8"
 textwrap = "0.16.0"
+globset = "0.4.14"
 
 nucleo.workspace = true
 parking_lot = "0.12"
diff --git a/helix-core/src/config.rs b/helix-core/src/config.rs
index 2076fc224..27cd4e297 100644
--- a/helix-core/src/config.rs
+++ b/helix-core/src/config.rs
@@ -1,10 +1,45 @@
-/// Syntax configuration loader based on built-in languages.toml.
-pub fn default_syntax_loader() -> crate::syntax::Configuration {
+use crate::syntax::{Configuration, Loader, LoaderError};
+
+/// Language configuration based on built-in languages.toml.
+pub fn default_lang_config() -> Configuration {
     helix_loader::config::default_lang_config()
         .try_into()
-        .expect("Could not serialize built-in languages.toml")
+        .expect("Could not deserialize built-in languages.toml")
 }
-/// Syntax configuration loader based on user configured languages.toml.
-pub fn user_syntax_loader() -> Result<crate::syntax::Configuration, toml::de::Error> {
+
+/// Language configuration loader based on built-in languages.toml.
+pub fn default_lang_loader() -> Loader {
+    Loader::new(default_lang_config()).expect("Could not compile loader for default config")
+}
+
+#[derive(Debug)]
+pub enum LanguageLoaderError {
+    DeserializeError(toml::de::Error),
+    LoaderError(LoaderError),
+}
+
+impl std::fmt::Display for LanguageLoaderError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::DeserializeError(err) => write!(f, "Failed to parse language config: {err}"),
+            Self::LoaderError(err) => write!(f, "Failed to compile language config: {err}"),
+        }
+    }
+}
+
+impl std::error::Error for LanguageLoaderError {}
+
+/// Language configuration based on user configured languages.toml.
+pub fn user_lang_config() -> Result<Configuration, toml::de::Error> {
     helix_loader::config::user_lang_config()?.try_into()
 }
+
+/// Language configuration loader based on user configured languages.toml.
+pub fn user_lang_loader() -> Result<Loader, LanguageLoaderError> {
+    let config: Configuration = helix_loader::config::user_lang_config()
+        .map_err(LanguageLoaderError::DeserializeError)?
+        .try_into()
+        .map_err(LanguageLoaderError::DeserializeError)?;
+
+    Loader::new(config).map_err(LanguageLoaderError::LoaderError)
+}
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 24de1a338..99b5a3d10 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -82,12 +82,6 @@ pub struct Configuration {
     pub language_server: HashMap<String, LanguageServerConfiguration>,
 }
 
-impl Default for Configuration {
-    fn default() -> Self {
-        crate::config::default_syntax_loader()
-    }
-}
-
 // largely based on tree-sitter/cli/src/loader.rs
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields)]
@@ -164,9 +158,11 @@ pub enum FileType {
     /// The extension of the file, either the `Path::extension` or the full
     /// filename if the file does not have an extension.
     Extension(String),
-    /// The suffix of a file. This is compared to a given file's absolute
-    /// path, so it can be used to detect files based on their directories.
-    Suffix(String),
+    /// A Unix-style path glob. This is compared to the file's absolute path, so
+    /// it can be used to detect files based on their directories. If the glob
+    /// is not an absolute path and does not already start with a glob pattern,
+    /// a glob pattern will be prepended to it.
+    Glob(globset::Glob),
 }
 
 impl Serialize for FileType {
@@ -178,9 +174,9 @@ impl Serialize for FileType {
 
         match self {
             FileType::Extension(extension) => serializer.serialize_str(extension),
-            FileType::Suffix(suffix) => {
+            FileType::Glob(glob) => {
                 let mut map = serializer.serialize_map(Some(1))?;
-                map.serialize_entry("suffix", &suffix.replace(std::path::MAIN_SEPARATOR, "/"))?;
+                map.serialize_entry("glob", glob.glob())?;
                 map.end()
             }
         }
@@ -213,9 +209,20 @@ impl<'de> Deserialize<'de> for FileType {
                 M: serde::de::MapAccess<'de>,
             {
                 match map.next_entry::<String, String>()? {
-                    Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
-                        suffix.replace('/', std::path::MAIN_SEPARATOR_STR)
-                    })),
+                    Some((key, mut glob)) if key == "glob" => {
+                        // If the glob isn't an absolute path or already starts
+                        // with a glob pattern, add a leading glob so we
+                        // properly match relative paths.
+                        if !glob.starts_with('/') && !glob.starts_with("*/") {
+                            glob.insert_str(0, "*/");
+                        }
+
+                        globset::Glob::new(glob.as_str())
+                            .map(FileType::Glob)
+                            .map_err(|err| {
+                                serde::de::Error::custom(format!("invalid `glob` pattern: {}", err))
+                            })
+                    }
                     Some((key, _value)) => Err(serde::de::Error::custom(format!(
                         "unknown key in `file-types` list: {}",
                         key
@@ -752,6 +759,47 @@ pub struct SoftWrap {
     pub wrap_at_text_width: Option<bool>,
 }
 
+#[derive(Debug)]
+struct FileTypeGlob {
+    glob: globset::Glob,
+    language_id: usize,
+}
+
+impl FileTypeGlob {
+    fn new(glob: globset::Glob, language_id: usize) -> Self {
+        Self { glob, language_id }
+    }
+}
+
+#[derive(Debug)]
+struct FileTypeGlobMatcher {
+    matcher: globset::GlobSet,
+    file_types: Vec<FileTypeGlob>,
+}
+
+impl FileTypeGlobMatcher {
+    fn new(file_types: Vec<FileTypeGlob>) -> Result<Self, globset::Error> {
+        let mut builder = globset::GlobSetBuilder::new();
+        for file_type in &file_types {
+            builder.add(file_type.glob.clone());
+        }
+
+        Ok(Self {
+            matcher: builder.build()?,
+            file_types,
+        })
+    }
+
+    fn language_id_for_path(&self, path: &Path) -> Option<&usize> {
+        self.matcher
+            .matches(path)
+            .iter()
+            .filter_map(|idx| self.file_types.get(*idx))
+            .max_by_key(|file_type| file_type.glob.glob().len())
+            .map(|file_type| &file_type.language_id)
+    }
+}
+
 // Expose loader as Lazy<> global since it's always static?
 
 #[derive(Debug)]
@@ -759,7 +807,7 @@ pub struct Loader {
     // highlight_names ?
     language_configs: Vec<Arc<LanguageConfiguration>>,
     language_config_ids_by_extension: HashMap<String, usize>, // Vec<usize>
-    language_config_ids_by_suffix: HashMap<String, usize>,
+    language_config_ids_glob_matcher: FileTypeGlobMatcher,
     language_config_ids_by_shebang: HashMap<String, usize>,
 
     language_server_configs: HashMap<String, LanguageServerConfiguration>,
@@ -767,66 +815,57 @@ pub struct Loader {
     scopes: ArcSwap<Vec<String>>,
 }
 
+pub type LoaderError = globset::Error;
+
 impl Loader {
-    pub fn new(config: Configuration) -> Self {
-        let mut loader = Self {
-            language_configs: Vec::new(),
-            language_server_configs: config.language_server,
-            language_config_ids_by_extension: HashMap::new(),
-            language_config_ids_by_suffix: HashMap::new(),
-            language_config_ids_by_shebang: HashMap::new(),
-            scopes: ArcSwap::from_pointee(Vec::new()),
-        };
+    pub fn new(config: Configuration) -> Result<Self, LoaderError> {
+        let mut language_configs = Vec::new();
+        let mut language_config_ids_by_extension = HashMap::new();
+        let mut language_config_ids_by_shebang = HashMap::new();
+        let mut file_type_globs = Vec::new();
 
         for config in config.language {
             // get the next id
-            let language_id = loader.language_configs.len();
+            let language_id = language_configs.len();
 
             for file_type in &config.file_types {
                 // entry().or_insert(Vec::new).push(language_id);
                 match file_type {
-                    FileType::Extension(extension) => loader
-                        .language_config_ids_by_extension
-                        .insert(extension.clone(), language_id),
-                    FileType::Suffix(suffix) => loader
-                        .language_config_ids_by_suffix
-                        .insert(suffix.clone(), language_id),
+                    FileType::Extension(extension) => {
+                        language_config_ids_by_extension.insert(extension.clone(), language_id);
+                    }
+                    FileType::Glob(glob) => {
+                        file_type_globs.push(FileTypeGlob::new(glob.to_owned(), language_id));
+                    }
                 };
             }
             for shebang in &config.shebangs {
-                loader
-                    .language_config_ids_by_shebang
-                    .insert(shebang.clone(), language_id);
+                language_config_ids_by_shebang.insert(shebang.clone(), language_id);
             }
 
-            loader.language_configs.push(Arc::new(config));
+            language_configs.push(Arc::new(config));
         }
 
-        loader
+        Ok(Self {
+            language_configs,
+            language_config_ids_by_extension,
+            language_config_ids_glob_matcher: FileTypeGlobMatcher::new(file_type_globs)?,
+            language_config_ids_by_shebang,
+            language_server_configs: config.language_server,
+            scopes: ArcSwap::from_pointee(Vec::new()),
+        })
     }
 
     pub fn language_config_for_file_name(&self, path: &Path) -> Option<Arc<LanguageConfiguration>> {
         // Find all the language configurations that match this file name
         // or a suffix of the file name.
-        let configuration_id = path
-            .file_name()
-            .and_then(|n| n.to_str())
-            .and_then(|file_name| self.language_config_ids_by_extension.get(file_name))
+        let configuration_id = self
+            .language_config_ids_glob_matcher
+            .language_id_for_path(path)
             .or_else(|| {
                 path.extension()
                     .and_then(|extension| extension.to_str())
                     .and_then(|extension| self.language_config_ids_by_extension.get(extension))
-            })
-            .or_else(|| {
-                self.language_config_ids_by_suffix
-                    .iter()
-                    .find_map(|(file_type, id)| {
-                        if path.to_str()?.ends_with(file_type) {
-                            Some(id)
-                        } else {
-                            None
-                        }
-                    })
             });
 
         configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
@@ -2592,7 +2631,8 @@ mod test {
         let loader = Loader::new(Configuration {
             language: vec![],
             language_server: HashMap::new(),
-        });
+        })
+        .unwrap();
         let language = get_language("rust").unwrap();
 
         let query = Query::new(language, query_str).unwrap();
@@ -2654,7 +2694,8 @@ mod test {
         let loader = Loader::new(Configuration {
             language: vec![],
             language_server: HashMap::new(),
-        });
+        })
+        .unwrap();
 
         let language = get_language("rust").unwrap();
         let config = HighlightConfiguration::new(
@@ -2760,7 +2801,8 @@ mod test {
         let loader = Loader::new(Configuration {
             language: vec![],
             language_server: HashMap::new(),
-        });
+        })
+        .unwrap();
         let language = get_language(language_name).unwrap();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index faf845c07..de1434f72 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -186,7 +186,7 @@ fn test_treesitter_indent(
     lang_scope: &str,
     ignored_lines: Vec<std::ops::Range<usize>>,
 ) {
-    let loader = Loader::new(indent_tests_config());
+    let loader = Loader::new(indent_tests_config()).unwrap();
 
     // set runtime path so we can find the queries
     let mut runtime = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index b5150a13a..b844b5f05 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -96,11 +96,7 @@ fn setup_integration_logging() {
 }
 
 impl Application {
-    pub fn new(
-        args: Args,
-        config: Config,
-        syn_loader_conf: syntax::Configuration,
-    ) -> Result<Self, Error> {
+    pub fn new(args: Args, config: Config, lang_loader: syntax::Loader) -> Result<Self, Error> {
         #[cfg(feature = "integration")]
         setup_integration_logging();
 
@@ -126,7 +122,7 @@ impl Application {
             })
             .unwrap_or_else(|| theme_loader.default_theme(true_color));
 
-        let syn_loader = std::sync::Arc::new(syntax::Loader::new(syn_loader_conf));
+        let syn_loader = std::sync::Arc::new(lang_loader);
 
         #[cfg(not(feature = "integration"))]
         let backend = CrosstermBackend::new(stdout(), &config.editor);
@@ -394,10 +390,8 @@ impl Application {
 
     /// refresh language config after config change
     fn refresh_language_config(&mut self) -> Result<(), Error> {
-        let syntax_config = helix_core::config::user_syntax_loader()
-            .map_err(|err| anyhow::anyhow!("Failed to load language config: {}", err))?;
-
-        self.syn_loader = std::sync::Arc::new(syntax::Loader::new(syntax_config));
+        let lang_loader = helix_core::config::user_lang_loader()?;
+        self.syn_loader = std::sync::Arc::new(lang_loader);
         self.editor.syn_loader = self.syn_loader.clone();
         for document in self.editor.documents.values_mut() {
             document.detect_language(self.syn_loader.clone());
diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
index 5f2019265..0bbb5735c 100644
--- a/helix-term/src/health.rs
+++ b/helix-term/src/health.rs
@@ -2,7 +2,7 @@ use crossterm::{
     style::{Color, Print, Stylize},
     tty::IsTty,
 };
-use helix_core::config::{default_syntax_loader, user_syntax_loader};
+use helix_core::config::{default_lang_config, user_lang_config};
 use helix_loader::grammar::load_runtime_file;
 use helix_view::clipboard::get_clipboard_provider;
 use std::io::Write;
@@ -128,7 +128,7 @@ pub fn languages_all() -> std::io::Result<()> {
     let stdout = std::io::stdout();
     let mut stdout = stdout.lock();
 
-    let mut syn_loader_conf = match user_syntax_loader() {
+    let mut syn_loader_conf = match user_lang_config() {
         Ok(conf) => conf,
         Err(err) => {
             let stderr = std::io::stderr();
@@ -141,7 +141,7 @@ pub fn languages_all() -> std::io::Result<()> {
                 err
             )?;
             writeln!(stderr, "{}", "Using default language config".yellow())?;
-            default_syntax_loader()
+            default_lang_config()
         }
     };
 
@@ -234,7 +234,7 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
     let stdout = std::io::stdout();
     let mut stdout = stdout.lock();
 
-    let syn_loader_conf = match user_syntax_loader() {
+    let syn_loader_conf = match user_lang_config() {
         Ok(conf) => conf,
         Err(err) => {
             let stderr = std::io::stderr();
@@ -247,7 +247,7 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
                 err
             )?;
             writeln!(stderr, "{}", "Using default language config".yellow())?;
-            default_syntax_loader()
+            default_lang_config()
         }
     };
 
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 132ee796f..fbe1a8460 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -145,18 +145,18 @@ FLAGS:
         }
     };
 
-    let syn_loader_conf = helix_core::config::user_syntax_loader().unwrap_or_else(|err| {
-        eprintln!("Bad language config: {}", err);
+    let lang_loader = helix_core::config::user_lang_loader().unwrap_or_else(|err| {
+        eprintln!("{}", err);
         eprintln!("Press <ENTER> to continue with default language config");
         use std::io::Read;
         // This waits for an enter press.
         let _ = std::io::stdin().read(&mut []);
-        helix_core::config::default_syntax_loader()
+        helix_core::config::default_lang_loader()
     });
 
     // TODO: use the thread local executor to spawn the application task separately from the work pool
-    let mut app = Application::new(args, config, syn_loader_conf)
-        .context("unable to create new application")?;
+    let mut app =
+        Application::new(args, config, lang_loader).context("unable to create new application")?;
 
     let exit_code = app.run(&mut EventStream::new()).await?;
 
diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index adc721c5f..f65352c7e 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs
@@ -315,7 +315,7 @@ async fn test_write_auto_format_fails_still_writes() -> anyhow::Result<()> {
     let mut app = helpers::AppBuilder::new()
         .with_file(file.path(), None)
         .with_input_text("#[l|]#et foo = 0;\n")
-        .with_lang_config(helpers::test_syntax_conf(Some(lang_conf.into())))
+        .with_lang_loader(helpers::test_syntax_loader(Some(lang_conf.into())))
         .build()?;
 
     test_key_sequences(&mut app, vec![(Some(":w<ret>"), None)], false).await?;
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 112b5e358..a978f386e 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -139,7 +139,7 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     let test_case = test_case.into();
     let mut app = match app {
         Some(app) => app,
-        None => Application::new(Args::default(), test_config(), test_syntax_conf(None))?,
+        None => Application::new(Args::default(), test_config(), test_syntax_loader(None))?,
     };
 
     let (view, doc) = helix_view::current!(app.editor);
@@ -162,9 +162,9 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     .await
 }
 
-/// Generates language configs that merge in overrides, like a user language
+/// Generates language config loader that merge in overrides, like a user language
 /// config. The argument string must be a raw TOML document.
-pub fn test_syntax_conf(overrides: Option<String>) -> helix_core::syntax::Configuration {
+pub fn test_syntax_loader(overrides: Option<String>) -> helix_core::syntax::Loader {
     let mut lang = helix_loader::config::default_lang_config();
 
     if let Some(overrides) = overrides {
@@ -172,7 +172,7 @@ pub fn test_syntax_conf(overrides: Option<String>) -> helix_core::syntax::Config
         lang = helix_loader::merge_toml_values(lang, override_toml, 3);
     }
 
-    lang.try_into().unwrap()
+    helix_core::syntax::Loader::new(lang.try_into().unwrap()).unwrap()
 }
 
 /// Use this for very simple test cases where there is one input
@@ -271,7 +271,7 @@ pub fn new_readonly_tempfile() -> anyhow::Result<NamedTempFile> {
 pub struct AppBuilder {
     args: Args,
     config: Config,
-    syn_conf: helix_core::syntax::Configuration,
+    syn_loader: helix_core::syntax::Loader,
     input: Option<(String, Selection)>,
 }
 
@@ -280,7 +280,7 @@ impl Default for AppBuilder {
         Self {
             args: Args::default(),
             config: test_config(),
-            syn_conf: test_syntax_conf(None),
+            syn_loader: test_syntax_loader(None),
             input: None,
         }
     }
@@ -314,8 +314,8 @@ impl AppBuilder {
         self
     }
 
-    pub fn with_lang_config(mut self, syn_conf: helix_core::syntax::Configuration) -> Self {
-        self.syn_conf = syn_conf;
+    pub fn with_lang_loader(mut self, syn_loader: helix_core::syntax::Loader) -> Self {
+        self.syn_loader = syn_loader;
         self
     }
 
@@ -328,7 +328,7 @@ impl AppBuilder {
             bail!("Having the directory {path:?} in args.files[0] is not yet supported for integration tests");
         }
 
-        let mut app = Application::new(self.args, self.config, self.syn_conf)?;
+        let mut app = Application::new(self.args, self.config, self.syn_loader)?;
 
         if let Some((text, selection)) = self.input {
             let (view, doc) = helix_view::current!(app.editor);
diff --git a/languages.toml b/languages.toml
index 30b411571..084d4932c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -253,7 +253,7 @@ source = { git = "https://github.com/FuelLabs/tree-sitter-sway", rev = "e491a005
 name = "toml"
 scope = "source.toml"
 injection-regex = "toml"
-file-types = ["toml", "poetry.lock", "Cargo.lock"]
+file-types = ["toml", { glob = "poetry.lock" }, { glob = "Cargo.lock" }]
 comment-token = "#"
 language-servers = [ "taplo" ]
 indent = { tab-width = 2, unit = "  " }
@@ -292,7 +292,7 @@ source = { git = "https://github.com/yusdacra/tree-sitter-protobuf", rev = "19c2
 name = "elixir"
 scope = "source.elixir"
 injection-regex = "(elixir|ex)"
-file-types = ["ex", "exs", "mix.lock"]
+file-types = ["ex", "exs", { glob = "mix.lock" }]
 shebangs = ["elixir"]
 roots = ["mix.exs", "mix.lock"]
 comment-token = "#"
@@ -361,20 +361,20 @@ file-types = [
   "geojson",
   "gltf",
   "webmanifest",
-  "flake.lock",
-  ".babelrc",
-  ".bowerrc",
-  ".jscrc",
+  { glob = "flake.lock" },
+  { glob = ".babelrc" },
+  { glob = ".bowerrc" },
+  { glob = ".jscrc" },
   "js.map",
   "ts.map",
   "css.map",
-  ".jslintrc",
+  { glob = ".jslintrc" },
   "jsonld",
-  ".vuerc",
-  "composer.lock",
-  ".watchmanconfig",
+  { glob = ".vuerc" },
+  { glob = "composer.lock" },
+  { glob = ".watchmanconfig" },
   "avsc",
-  ".prettierrc"
+  { glob = ".prettierrc" },
 ]
 language-servers = [ "vscode-json-language-server" ]
 auto-format = true
@@ -439,7 +439,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd
 name = "cpp"
 scope = "source.cpp"
 injection-regex = "cpp"
-file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm", "h++", "ii", "inl", { suffix = ".hpp.in" }, { suffix = ".h.in" }]
+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm", "h++", "ii", "inl", { glob = ".hpp.in" }, { glob = ".h.in" }]
 comment-token = "//"
 language-servers = [ "clangd" ]
 indent = { tab-width = 2, unit = "  " }
@@ -571,7 +571,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "64457ea
 name = "gomod"
 scope = "source.gomod"
 injection-regex = "gomod"
-file-types = ["go.mod"]
+file-types = [{ glob = "go.mod" }]
 auto-format = true
 comment-token = "//"
 language-servers = [ "gopls" ]
@@ -598,7 +598,7 @@ source = { git = "https://github.com/dannylongeuay/tree-sitter-go-template", rev
 name = "gowork"
 scope = "source.gowork"
 injection-regex = "gowork"
-file-types = ["go.work"]
+file-types = [{ glob = "go.work" }]
 auto-format = true
 comment-token = "//"
 language-servers = [ "gopls" ]
@@ -613,7 +613,7 @@ name = "javascript"
 scope = "source.js"
 injection-regex = "(js|javascript)"
 language-id = "javascript"
-file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", "jakefile"]
+file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", { glob = "jakefile" }]
 shebangs = ["node"]
 comment-token = "//"
 language-servers = [ "typescript-language-server" ]
@@ -716,7 +716,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53
 name = "python"
 scope = "source.python"
 injection-regex = "python"
-file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct", "rpy", "cpy", "ipy", "pyt", "SConscript"]
+file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { glob = ".pythonstartup" }, { glob = ".pythonrc" }, { glob = "SConstruct" }, { glob = "SConscript" }]
 shebangs = ["python"]
 roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
 comment-token = "#"
@@ -769,38 +769,38 @@ injection-regex = "ruby"
 file-types = [
   "rb",
   "rake",
-  "rakefile",
   "irb",
-  "gemfile",
   "gemspec",
-  "Rakefile",
-  "Gemfile",
   "rabl",
   "jbuilder",
   "jb",
-  "Podfile",
   "podspec",
-  "Vagrantfile",
-  "Brewfile",
   "rjs",
   "rbi",
-  "Guardfile",
-  "Capfile",
-  "Cheffile",
-  "Hobofile",
-  "Appraisals",
-  "Rantfile",
-  "Berksfile",
-  "Berksfile.lock",
-  "Thorfile",
-  "Puppetfile",
-  "Fastfile",
-  "Appfile",
-  "Deliverfile",
-  "Matchfile",
-  "Scanfile",
-  "Snapfile",
-  "Gymfile"
+  { glob = "rakefile" },
+  { glob = "gemfile" },
+  { glob = "Rakefile" },
+  { glob = "Gemfile" },
+  { glob = "Podfile" },
+  { glob = "Vagrantfile" },
+  { glob = "Brewfile" },
+  { glob = "Guardfile" },
+  { glob = "Capfile" },
+  { glob = "Cheffile" },
+  { glob = "Hobofile" },
+  { glob = "Appraisals" },
+  { glob = "Rantfile" },
+  { glob = "Berksfile" },
+  { glob = "Berksfile.lock" },
+  { glob = "Thorfile" },
+  { glob = "Puppetfile" },
+  { glob = "Fastfile" },
+  { glob = "Appfile" },
+  { glob = "Deliverfile" },
+  { glob = "Matchfile" },
+  { glob = "Scanfile" },
+  { glob = "Snapfile" },
+  { glob = "Gymfile" },
 ]
 shebangs = ["ruby"]
 comment-token = "#"
@@ -819,43 +819,43 @@ file-types = [
   "sh",
   "bash",
   "zsh",
-  ".bash_history",
-  ".bash_login",
-  ".bash_logout",
-  ".bash_profile",
-  ".bashrc",
-  ".profile",
-  ".zshenv",
   "zshenv",
-  ".zlogin",
   "zlogin",
-  ".zlogout",
   "zlogout",
-  ".zprofile",
   "zprofile",
-  ".zshrc",
   "zshrc",
-  ".zimrc",
-  "APKBUILD",
-  "PKGBUILD",
   "eclass",
   "ebuild",
   "bazelrc",
-  ".bash_aliases",
   "Renviron",
-  ".Renviron",
-  ".xprofile",
-  ".xsession",
-  ".xsessionrc",
   "zsh-theme",
   "ksh",
   "cshrc",
   "tcshrc",
-  ".yashrc",
-  ".yash_profile",
-  ".hushlogin",
   "bashrc_Apple_Terminal",
-  "zshrc_Apple_Terminal"
+  "zshrc_Apple_Terminal",
+  { glob = ".bash_history" },
+  { glob = ".bash_login" },
+  { glob = ".bash_logout" },
+  { glob = ".bash_profile" },
+  { glob = ".bashrc" },
+  { glob = ".profile" },
+  { glob = ".zshenv" },
+  { glob = ".zlogin" },
+  { glob = ".zlogout" },
+  { glob = ".zprofile" },
+  { glob = ".zshrc" },
+  { glob = ".zimrc" },
+  { glob = "APKBUILD" },
+  { glob = "PKGBUILD" },
+  { glob = ".bash_aliases" },
+  { glob = ".Renviron" },
+  { glob = ".xprofile" },
+  { glob = ".xsession" },
+  { glob = ".xsessionrc" },
+  { glob = ".yashrc" },
+  { glob = ".yash_profile" },
+  { glob = ".hushlogin" },
 ]
 shebangs = ["sh", "bash", "dash", "zsh"]
 comment-token = "#"
@@ -1216,7 +1216,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-tsq", rev = "48b5
 [[language]]
 name = "cmake"
 scope = "source.cmake"
-file-types = ["cmake", "CMakeLists.txt"]
+file-types = ["cmake", { glob = "CMakeLists.txt" }]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "cmake-language-server" ]
@@ -1229,7 +1229,7 @@ source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef30
 [[language]]
 name = "make"
 scope = "source.make"
-file-types = ["Makefile", "makefile", "make", "mk", "mak", "GNUmakefile", "OCamlMakefile"]
+file-types = [{ glob = "Makefile" }, { glob = "makefile" }, "make", "mk", "mak", {glob = "GNUmakefile" }, { glob = "OCamlMakefile" }]
 shebangs = ["make", "gmake"]
 injection-regex = "(make|makefile|Makefile|mk)"
 comment-token = "#"
@@ -1372,7 +1372,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", "PULLREQ_EDITMSG", "mkd", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook"]
+file-types = ["md", "markdown", "mkd", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook", { glob = "PULLREQ_EDITMSG" }]
 roots = [".marksman.toml"]
 language-servers = [ "marksman" ]
 indent = { tab-width = 2, unit = "  " }
@@ -1424,7 +1424,7 @@ name = "dockerfile"
 scope = "source.dockerfile"
 injection-regex = "docker|dockerfile"
 roots = ["Dockerfile", "Containerfile"]
-file-types = ["Dockerfile", "dockerfile", "Containerfile", "containerfile"]
+file-types = [{ glob = "Dockerfile*" }, { glob = "dockerfile*" }, { glob = "Containerfile*" }, { glob = "containerfile*" }]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "docker-langserver" ]
@@ -1436,7 +1436,7 @@ source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev =
 [[language]]
 name = "git-commit"
 scope = "git.commitmsg"
-file-types = ["COMMIT_EDITMSG"]
+file-types = [{ glob = "COMMIT_EDITMSG" }]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 rulers = [51, 73]
@@ -1461,7 +1461,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-diff", rev = "fd7
 [[language]]
 name = "git-rebase"
 scope = "source.gitrebase"
-file-types = ["git-rebase-todo"]
+file-types = [{ glob = "git-rebase-todo" }]
 injection-regex = "git-rebase"
 comment-token = "#"
 indent = { tab-width = 2, unit = "y" }
@@ -1474,7 +1474,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-rebase", rev
 name = "regex"
 scope = "source.regex"
 injection-regex = "regex"
-file-types = ["regex", ".Rbuildignore"]
+file-types = ["regex", { glob = ".Rbuildignore" }]
 
 [[grammar]]
 name = "regex"
@@ -1483,7 +1483,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-regex", rev = "e1cf
 [[language]]
 name = "git-config"
 scope = "source.gitconfig"
-file-types = [".gitmodules", ".gitconfig", { suffix = ".git/config" }, { suffix = ".config/git/config" }]
+file-types = [{ glob = ".gitmodules" }, { glob = ".gitconfig" }, { glob = ".git/config" }, { glob = ".config/git/config" }]
 injection-regex = "git-config"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
@@ -1495,7 +1495,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-config", rev
 [[language]]
 name = "git-attributes"
 scope = "source.gitattributes"
-file-types = [".gitattributes"]
+file-types = [{ glob = ".gitattributes" }]
 injection-regex = "git-attributes"
 comment-token = "#"
 grammar = "gitattributes"
@@ -1507,7 +1507,7 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-gitattributes", rev =
 [[language]]
 name = "git-ignore"
 scope = "source.gitignore"
-file-types = [".gitignore", ".gitignore_global", ".ignore", ".prettierignore", ".eslintignore", ".npmignore", "CODEOWNERS", { suffix = ".config/helix/ignore" }, { suffix = ".helix/ignore" }]
+file-types = [{ glob = ".gitignore" }, { glob = ".gitignore_global" }, { glob = ".ignore" }, { glob = ".prettierignore" }, { glob = ".eslintignore" }, { glob = ".npmignore"}, { glob = "CODEOWNERS" }, { glob = ".config/helix/ignore" }, { glob = ".helix/ignore" }]
 injection-regex = "git-ignore"
 comment-token = "#"
 grammar = "gitignore"
@@ -1572,7 +1572,7 @@ source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "
 name = "erlang"
 scope = "source.erlang"
 injection-regex = "erl(ang)?"
-file-types = ["erl", "hrl", "app", "rebar.config", "rebar.lock"]
+file-types = ["erl", "hrl", "app", { glob = "rebar.config" }, { glob = "rebar.lock" }]
 roots = ["rebar.config"]
 shebangs = ["escript"]
 comment-token = "%%"
@@ -1698,7 +1698,7 @@ source = { git = "https://github.com/Hubro/tree-sitter-robot", rev = "322e4cc657
 name = "r"
 scope = "source.r"
 injection-regex = "(r|R)"
-file-types = ["r", "R", ".Rprofile", "Rprofile.site", ".RHistory"]
+file-types = ["r", "R", { glob = ".Rprofile" }, { glob = "Rprofile.site" }, { glob = ".RHistory" }]
 shebangs = ["r", "R"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
@@ -1913,7 +1913,7 @@ source = { git = "https://github.com/ap29600/tree-sitter-odin", rev = "b219207e4
 name = "meson"
 scope = "source.meson"
 injection-regex = "meson"
-file-types = ["meson.build", "meson_options.txt"]
+file-types = [{ glob = "meson.build" }, { glob = "meson_options.txt" }]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
@@ -1924,7 +1924,7 @@ source = { git = "https://github.com/staysail/tree-sitter-meson", rev = "32a83e8
 [[language]]
 name = "sshclientconfig"
 scope = "source.sshclientconfig"
-file-types = [{ suffix = ".ssh/config" }, { suffix = "/etc/ssh/ssh_config" }]
+file-types = [{ glob = ".ssh/config" }, { glob = "/etc/ssh/ssh_config" }]
 comment-token = "#"
 
 [[grammar]]
@@ -2045,7 +2045,7 @@ source = { git = "https://github.com/sogaiu/tree-sitter-clojure", rev = "e57c569
 name = "starlark"
 scope = "source.starlark"
 injection-regex = "(starlark|bzl|bazel)"
-file-types = ["bzl", "bazel", "BUILD", "star"]
+file-types = ["bzl", "bazel", "star", { glob = "BUILD" }, { glob = "BUILD.*" }]
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
 grammar = "python"
@@ -2413,7 +2413,7 @@ source = { git = "https://github.com/hh9527/tree-sitter-wit", rev = "c917790ab9a
 [[language]]
 name = "env"
 scope = "source.env"
-file-types = [".env", ".env.local", ".env.development", ".env.production", ".env.dist", ".envrc", ".envrc.local", ".envrc.private"]
+file-types = [{ glob = ".env" }, { glob = ".env.*" }, { glob = ".envrc" }, { glob = ".envrc.*" }]
 injection-regex = "env"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
@@ -2441,7 +2441,7 @@ file-types = [
   "volume",
   "kube",
   "network",
-  ".editorconfig",
+  { glob = ".editorconfig" },
   "properties",
   "cfg",
   "directory"
@@ -2569,7 +2569,7 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-pem", rev = "be67a433
 [[language]]
 name = "passwd"
 scope = "source.passwd"
-file-types = ["passwd"]
+file-types = [{ glob = "passwd" }]
 
 [[grammar]]
 name = "passwd"
@@ -2578,7 +2578,7 @@ source = { git = "https://github.com/ath3/tree-sitter-passwd", rev = "20239395ea
 [[language]]
 name = "hosts"
 scope = "source.hosts"
-file-types = ["hosts"]
+file-types = [{ glob = "hosts" }]
 comment-token = "#"
 
 [[grammar]]
@@ -2786,7 +2786,7 @@ source = { git = "https://github.com/lefp/tree-sitter-opencl", rev = "8e1d24a570
 [[language]]
 name = "just"
 scope = "source.just"
-file-types = ["justfile", "Justfile", ".justfile", ".Justfile"]
+file-types = [{ glob = "justfile" }, { glob = "Justfile" }, { glob = ".justfile" }, { glob = ".Justfile" }]
 injection-regex = "just"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
@@ -2945,7 +2945,7 @@ source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "1f505
 [[language]]
 name = "todotxt"
 scope = "text.todotxt"
-file-types = [{ suffix = ".todo.txt" }, "todotxt"]
+file-types = [{ glob = "todo.txt" }, { glob = "*.todo.txt" }, "todotxt"]
 formatter = { command = "sort" }
 auto-format = true
 

From 786b5c533e32cfe88dbf8742fdbc18829fb46334 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Sun, 11 Feb 2024 12:38:09 -0500
Subject: [PATCH 702/967] follow neovim's truecolor detection (#9577)

---
 Cargo.lock            |  1 +
 helix-term/Cargo.toml |  1 +
 helix-term/src/lib.rs | 25 +++++++++++++++++++------
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a7ef8eb05..a0f5645dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1387,6 +1387,7 @@ dependencies = [
  "signal-hook-tokio",
  "smallvec",
  "tempfile",
+ "termini",
  "tokio",
  "tokio-stream",
  "toml",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index a0d6754d0..f3343b7a4 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -42,6 +42,7 @@ signal-hook = "0.3"
 tokio-stream = "0.1"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 arc-swap = { version = "1.6.0" }
+termini = "1"
 
 # Logging
 fern = "0.6"
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index b1413ed0d..cdde86ec5 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -22,17 +22,30 @@ use url::Url;
 
 pub use keymap::macros::*;
 
-#[cfg(not(windows))]
-fn true_color() -> bool {
-    std::env::var("COLORTERM")
-        .map(|v| matches!(v.as_str(), "truecolor" | "24bit"))
-        .unwrap_or(false)
-}
 #[cfg(windows)]
 fn true_color() -> bool {
     true
 }
 
+#[cfg(not(windows))]
+fn true_color() -> bool {
+    if matches!(
+        std::env::var("COLORTERM").map(|v| matches!(v.as_str(), "truecolor" | "24bit")),
+        Ok(true)
+    ) {
+        return true;
+    }
+
+    match termini::TermInfo::from_env() {
+        Ok(t) => {
+            t.extended_cap("RGB").is_some()
+                || t.extended_cap("Tc").is_some()
+                || (t.extended_cap("setrgbf").is_some() && t.extended_cap("setrgbb").is_some())
+        }
+        Err(_) => false,
+    }
+}
+
 /// 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

From 13b9885084ed516276db17b730cb1d818fe95716 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 02:17:02 +0100
Subject: [PATCH 703/967] build(deps): bump tokio from 1.35.1 to 1.36.0 (#9540)

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

---
updated-dependencies:
- dependency-name: tokio
  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-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0f5645dd..8827dfdb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2318,9 +2318,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 8e9e3407c..2bdd5cfce 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -27,6 +27,6 @@ lsp-types = { version = "0.95" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+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"
 parking_lot = "0.12.1"

From 204c3707b070c0933366b7366d48744b1426abaa Mon Sep 17 00:00:00 2001
From: 7ombie <80077603+7ombie@users.noreply.github.com>
Date: Mon, 12 Feb 2024 01:17:44 +0000
Subject: [PATCH 704/967] Updated Swift grammar, adding 'any' and 'await'
 keywords. (#9586)

---
 languages.toml                       | 2 +-
 runtime/queries/swift/highlights.scm | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 084d4932c..c2432c278 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1730,7 +1730,7 @@ language-servers = [ "sourcekit-lsp" ]
 
 [[grammar]]
 name = "swift"
-source = { git = "https://github.com/alex-pinkus/tree-sitter-swift", rev = "77c6312c8438f4dbaa0350cec92b3d6dd3d74a66" }
+source = { git = "https://github.com/alex-pinkus/tree-sitter-swift", rev = "b1b66955d420d5cf5ff268ae552f0d6e43ff66e1" }
 
 [[language]]
 name = "erb"
diff --git a/runtime/queries/swift/highlights.scm b/runtime/queries/swift/highlights.scm
index 5560010b0..e7610e38d 100644
--- a/runtime/queries/swift/highlights.scm
+++ b/runtime/queries/swift/highlights.scm
@@ -1,10 +1,10 @@
-; Upstream: https://github.com/alex-pinkus/tree-sitter-swift/blob/8d2fd80e3322df51e3f70952e60d57f5d4077eb8/queries/highlights.scm
+; Upstream: https://github.com/alex-pinkus/tree-sitter-swift/blob/1c586339fb00014b23d6933f2cc32b588a226f3b/queries/highlights.scm
 
 (line_string_literal
   ["\\(" ")"] @punctuation.special)
 
 ["." ";" ":" "," ] @punctuation.delimiter
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket ; TODO: "\\(" ")" in interpolations should be @punctuation.special
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
 ; Identifiers
 (attribute) @variable
@@ -26,6 +26,7 @@
 (function_declaration "init" @constructor)
 (throws) @keyword
 "async" @keyword
+"await" @keyword
 (where_keyword) @keyword
 (parameter external_name: (simple_identifier) @variable.parameter)
 (parameter name: (simple_identifier) @variable.parameter)
@@ -48,6 +49,7 @@
   "convenience"
   "required"
   "some"
+  "any"
 ] @keyword
 
 [

From 7d8ce1a4000939bb1d1e0a67277f7733735607c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 02:23:24 +0100
Subject: [PATCH 705/967] build(deps): bump tempfile from 3.9.0 to 3.10.0
 (#9538)

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.9.0 to 3.10.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.9.0...v3.10.0)

---
updated-dependencies:
- dependency-name: tempfile
  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              | 13 ++++++-------
 helix-loader/Cargo.toml |  2 +-
 helix-stdx/Cargo.toml   |  2 +-
 helix-term/Cargo.toml   |  2 +-
 helix-vcs/Cargo.toml    |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8827dfdb3..24c689336 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -424,9 +424,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fern"
@@ -1973,9 +1973,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -2203,13 +2203,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.4.1",
  "rustix",
  "windows-sys 0.52.0",
 ]
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 469bedc10..6c3617dd1 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -30,7 +30,7 @@ log = "0.4"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.9.0"
+tempfile = "3.10.0"
 dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index e77f8b91f..540a1b99a 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -18,4 +18,4 @@ ropey = { version = "1.6.1", default-features = false }
 which = "6.0"
 
 [dev-dependencies]
-tempfile = "3.9"
+tempfile = "3.10"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index f3343b7a4..09f02c67c 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -84,4 +84,4 @@ helix-loader = { path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.13"
 indoc = "2.0.4"
-tempfile = "3.9.0"
+tempfile = "3.10.0"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 6aa50dcf7..32aca4f09 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -29,4 +29,4 @@ log = "0.4"
 git = ["gix"]
 
 [dev-dependencies]
-tempfile = "3.9"
+tempfile = "3.10"

From d9f7aaacaf65272dfce092954ec49a78961e8112 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy@zelinskie.com>
Date: Sun, 11 Feb 2024 20:28:52 -0500
Subject: [PATCH 706/967] languages: add CEL, SpiceDB schema language (#9296)

* languages: add CEL language and grammar

* languages: add spicedb schema language

* chore: docgen

* runtime/queries: refine spicedb & cel highlights

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

* languages: update spicedb

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md     |  2 +
 languages.toml                         | 24 ++++++++++
 runtime/queries/cel/highlights.scm     | 66 ++++++++++++++++++++++++++
 runtime/queries/spicedb/highlights.scm | 47 ++++++++++++++++++
 runtime/queries/spicedb/injections.scm |  5 ++
 runtime/queries/spicedb/tags.scm       |  4 ++
 6 files changed, 148 insertions(+)
 create mode 100644 runtime/queries/cel/highlights.scm
 create mode 100644 runtime/queries/spicedb/highlights.scm
 create mode 100644 runtime/queries/spicedb/injections.scm
 create mode 100644 runtime/queries/spicedb/tags.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c91b9ae11..9131ff580 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -14,6 +14,7 @@
 | cabal |  |  |  | `haskell-language-server-wrapper` |
 | cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
 | capnp | ✓ |  | ✓ |  |
+| cel | ✓ |  |  |  |
 | clojure | ✓ |  |  | `clojure-lsp` |
 | cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
 | comment | ✓ |  |  |  |
@@ -154,6 +155,7 @@
 | smithy | ✓ |  |  | `cs` |
 | sml | ✓ |  |  |  |
 | solidity | ✓ |  |  | `solc` |
+| spicedb | ✓ |  |  |  |
 | sql | ✓ |  |  |  |
 | sshclientconfig | ✓ |  |  |  |
 | starlark | ✓ | ✓ |  |  |
diff --git a/languages.toml b/languages.toml
index c2432c278..6fc811814 100644
--- a/languages.toml
+++ b/languages.toml
@@ -514,6 +514,30 @@ args = { processId = "{0}" }
 name = "c-sharp"
 source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "5b60f99545fea00a33bbfae5be956f684c4c69e2" }
 
+[[language]]
+name = "cel"
+scope = "source.cel"
+injection-regex = "cel"
+file-types = ["cel"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "cel"
+source = { git = "https://github.com/bufbuild/tree-sitter-cel", rev = "9f2b65da14c216df53933748e489db0f11121464" }
+
+[[language]]
+name = "spicedb"
+scope = "source.zed"
+injection-regex = "spicedb"
+file-types = ["zed"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "spicedb"
+source = { git = "https://github.com/jzelinskie/tree-sitter-spicedb", rev = "a4e4645651f86d6684c15dfa9931b7841dc52a66" }
+
 [[language]]
 name = "go"
 scope = "source.go"
diff --git a/runtime/queries/cel/highlights.scm b/runtime/queries/cel/highlights.scm
new file mode 100644
index 000000000..ab3bae5a5
--- /dev/null
+++ b/runtime/queries/cel/highlights.scm
@@ -0,0 +1,66 @@
+; Operators
+
+[
+  "-"
+  "!"
+  "*"
+  "/"
+  "&&"
+  "%"
+  "+"
+  "<"
+  "<="
+  "=="
+  ">"
+  ">="
+  "||"
+] @operator
+
+; Keywords
+
+[
+"in"
+] @keyword
+
+; Function calls
+
+(call_expression
+  function: (identifier) @function)
+
+(member_call_expression
+  function: (identifier) @function)
+
+; Identifiers
+
+(select_expression
+  operand: (identifier) @type)
+
+(select_expression
+  operand: (select_expression
+    member: (identifier) @type))
+
+(identifier) @variable.other.member
+
+; Literals
+
+[
+  (double_quote_string_literal)
+  (single_quoted_string_literal)
+  (triple_double_quote_string_literal)
+  (triple_single_quoted_string_literal)
+] @string
+
+[
+  (int_literal)
+  (uint_literal)
+] @constant.numeric.integer
+(float_literal) @constant.numeric.float
+
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
+
+(null) @constant.builtin
+
+(comment) @comment
diff --git a/runtime/queries/spicedb/highlights.scm b/runtime/queries/spicedb/highlights.scm
new file mode 100644
index 000000000..63c939551
--- /dev/null
+++ b/runtime/queries/spicedb/highlights.scm
@@ -0,0 +1,47 @@
+; highlights.scm
+
+[
+  "definition"
+  "caveat"
+  "permission"
+  "relation"
+  "nil"
+] @keyword
+
+[
+  ","
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "|"
+  "+"
+  "-"
+  "&"
+  "#"
+  "->"
+  "="
+] @operator
+("with") @keyword.operator
+
+[
+  "nil"
+  "*"
+] @constant.builtin
+
+(comment) @comment
+(type_identifier) @type
+(cel_type_identifier) @type
+(cel_variable_identifier) @variable.parameter
+(field_identifier) @variable.other.member
+[
+  (func_identifier)
+  (method_identifier)
+] @function.method
diff --git a/runtime/queries/spicedb/injections.scm b/runtime/queries/spicedb/injections.scm
new file mode 100644
index 000000000..f8cafc9d1
--- /dev/null
+++ b/runtime/queries/spicedb/injections.scm
@@ -0,0 +1,5 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((caveat_expr) @injection.content
+ (#set! injection.language "cel"))
diff --git a/runtime/queries/spicedb/tags.scm b/runtime/queries/spicedb/tags.scm
new file mode 100644
index 000000000..a8fe932b6
--- /dev/null
+++ b/runtime/queries/spicedb/tags.scm
@@ -0,0 +1,4 @@
+(object_definition
+  name: (type_identifier) @name) @definition.type
+
+(type_identifier) @name @reference.type

From ac8d1f62a126781fbac087aa374aad540dd659b1 Mon Sep 17 00:00:00 2001
From: HumanEntity <102693471+HumanEntity@users.noreply.github.com>
Date: Mon, 12 Feb 2024 02:29:49 +0100
Subject: [PATCH 707/967] sonokai: Add color modes support and change contrast
 between ruler and bg (#9376)

* Added `editor.color-modes` option support

* Less contrast between bg and ruler
---
 runtime/themes/sonokai.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index c7c9adc06..f586be28d 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -63,6 +63,9 @@
 "ui.cursorline.primary" = { bg = "bg1" }
 "ui.statusline" = { fg = "fg", bg = "bg3" }
 "ui.statusline.inactive" = { fg = "grey", bg = "bg1" }
+"ui.statusline.normal" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "bg0", bg = "green", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "bg0", bg = "purple", modifiers = ["bold"] }
 "ui.popup" = { fg = "grey", bg = "bg2" }
 "ui.window" = { fg = "grey", bg = "bg0" }
 "ui.help" = { fg = "fg", bg = "bg1" }
@@ -71,7 +74,7 @@
 "ui.menu" = { fg = "fg", bg = "bg2" }
 "ui.menu.selected" = { fg = "bg0", bg = "green" }
 "ui.virtual.whitespace" = { fg = "grey_dim" }
-"ui.virtual.ruler" = { bg = "grey_dim" }
+"ui.virtual.ruler" = { bg = "bg3" }
 "ui.virtual.inlay-hint" = { fg = "grey_dim" }
 
 info = { fg = 'green', bg = 'bg2' }

From 6a90166d0a3d8fd0e2e96e4ac8e196b2b2989760 Mon Sep 17 00:00:00 2001
From: ontley <67148677+ontley@users.noreply.github.com>
Date: Mon, 12 Feb 2024 02:35:25 +0100
Subject: [PATCH 708/967] Add required-root-patterns for situational lsp
 activation (#8696)

* Added required-root-patterns for situational lsp activation using globbing

* Replaced filter_map with flatten

* updated book to include required-root-patterns option

* fixed wrong function name for path

* Added globset to helix-core. Moved globset building to config parsing.

* Normalize implements AsRef

* cargo fmt

* Revert "cargo fmt"

This reverts commit ca8ce123e8d77d2ae8ed84d5273a9b554101b0db.
---
 book/src/languages.md    | 15 +++++-----
 helix-core/Cargo.toml    |  1 +
 helix-core/src/syntax.rs | 23 +++++++++++++++
 helix-lsp/src/client.rs  | 21 ++------------
 helix-lsp/src/lib.rs     | 63 ++++++++++++++++++++++++++++++----------
 5 files changed, 81 insertions(+), 42 deletions(-)

diff --git a/book/src/languages.md b/book/src/languages.md
index 7e49a6036..e3900dca9 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -122,13 +122,14 @@ languages = { typescript = [ { formatCommand ="prettier --stdin-filepath ${INPUT
 
 These are the available options for a language server.
 
-| Key                   | Description                                                                              |
-| ----                  | -----------                                                                              |
-| `command`             | The name or path of the language server binary to execute. Binaries must be in `$PATH`   |
-| `args`                | A list of arguments to pass to the language server binary                                |
-| `config`              | LSP initialization options                               |
-| `timeout`             | The maximum time a request to the language server may take, in seconds. Defaults to `20` |
-| `environment`         | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
+| Key                        | Description                                                                                                                       |
+| ----                       | -----------                                                                                                                       |
+| `command`                  | The name or path of the language server binary to execute. Binaries must be in `$PATH`                                            |
+| `args`                     | A list of arguments to pass to the language server binary                                                                         |
+| `config`                   | LSP initialization options                                                                                                        |
+| `timeout`                  | The maximum time a request to the language server may take, in seconds. Defaults to `20`                                          |
+| `environment`              | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }`          |
+| `required-root-patterns`   | A list of `glob` patterns to look for in the working directory. The language server is started if at least one of them is found.  |
 
 A `format` sub-table within `config` can be used to pass extra formatting options to
 [Document Formatting Requests](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting).
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index bdc879caa..e0eb6401c 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -53,6 +53,7 @@ globset = "0.4.14"
 
 nucleo.workspace = true
 parking_lot = "0.12"
+globset = "0.4.14"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 99b5a3d10..5d45deaf4 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -10,6 +10,7 @@ use crate::{
 use ahash::RandomState;
 use arc_swap::{ArcSwap, Guard};
 use bitflags::bitflags;
+use globset::GlobSet;
 use hashbrown::raw::RawTable;
 use slotmap::{DefaultKey as LayerId, HopSlotMap};
 
@@ -365,6 +366,22 @@ where
     serializer.end()
 }
 
+fn deserialize_required_root_patterns<'de, D>(deserializer: D) -> Result<Option<GlobSet>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let patterns = Vec::<String>::deserialize(deserializer)?;
+    if patterns.is_empty() {
+        return Ok(None);
+    }
+    let mut builder = globset::GlobSetBuilder::new();
+    for pattern in patterns {
+        let glob = globset::Glob::new(&pattern).map_err(serde::de::Error::custom)?;
+        builder.add(glob);
+    }
+    builder.build().map(Some).map_err(serde::de::Error::custom)
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct LanguageServerConfiguration {
@@ -378,6 +395,12 @@ pub struct LanguageServerConfiguration {
     pub config: Option<serde_json::Value>,
     #[serde(default = "default_timeout")]
     pub timeout: u64,
+    #[serde(
+        default,
+        skip_serializing,
+        deserialize_with = "deserialize_required_root_patterns"
+    )]
+    pub required_root_patterns: Option<GlobSet>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 94bad6faf..0d3a2a56e 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -177,12 +177,11 @@ impl Client {
         args: &[String],
         config: Option<Value>,
         server_environment: HashMap<String, String>,
-        root_markers: &[String],
-        manual_roots: &[PathBuf],
+        root_path: PathBuf,
+        root_uri: Option<lsp::Url>,
         id: usize,
         name: String,
         req_timeout: u64,
-        doc_path: Option<&std::path::PathBuf>,
     ) -> Result<(Self, UnboundedReceiver<(usize, Call)>, Arc<Notify>)> {
         // Resolve path to the binary
         let cmd = helix_stdx::env::which(cmd)?;
@@ -206,22 +205,6 @@ impl Client {
 
         let (server_rx, server_tx, initialize_notify) =
             Transport::start(reader, writer, stderr, id, name.clone());
-        let (workspace, workspace_is_cwd) = find_workspace();
-        let workspace = path::normalize(workspace);
-        let root = find_lsp_workspace(
-            doc_path
-                .and_then(|x| x.parent().and_then(|x| x.to_str()))
-                .unwrap_or("."),
-            root_markers,
-            manual_roots,
-            &workspace,
-            workspace_is_cwd,
-        );
-
-        // `root_uri` and `workspace_folder` can be empty in case there is no workspace
-        // `root_url` can not, use `workspace` as a fallback
-        let root_path = root.clone().unwrap_or_else(|| workspace.clone());
-        let root_uri = root.and_then(|root| lsp::Url::from_file_path(root).ok());
 
         let workspace_folders = root_uri
             .clone()
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 4ce445aee..05764418f 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -680,7 +680,7 @@ impl Registry {
         doc_path: Option<&std::path::PathBuf>,
         root_dirs: &[PathBuf],
         enable_snippets: bool,
-    ) -> Result<Arc<Client>> {
+    ) -> Result<Option<Arc<Client>>> {
         let config = self
             .syn_loader
             .language_server_configs()
@@ -688,7 +688,7 @@ impl Registry {
             .ok_or_else(|| anyhow::anyhow!("Language server '{name}' not defined"))?;
         let id = self.counter;
         self.counter += 1;
-        let NewClient(client, incoming) = start_client(
+        if let Some(NewClient(client, incoming)) = start_client(
             id,
             name,
             ls_config,
@@ -696,9 +696,12 @@ impl Registry {
             doc_path,
             root_dirs,
             enable_snippets,
-        )?;
-        self.incoming.push(UnboundedReceiverStream::new(incoming));
-        Ok(client)
+        )? {
+            self.incoming.push(UnboundedReceiverStream::new(incoming));
+            Ok(Some(client))
+        } else {
+            Ok(None)
+        }
     }
 
     /// If this method is called, all documents that have a reference to language servers used by the language config have to refresh their language servers,
@@ -723,8 +726,8 @@ impl Registry {
                         root_dirs,
                         enable_snippets,
                     ) {
-                        Ok(client) => client,
-                        error => return Some(error),
+                        Ok(client) => client?,
+                        Err(error) => return Some(Err(error)),
                     };
                     let old_clients = self
                         .inner
@@ -764,13 +767,13 @@ impl Registry {
         root_dirs: &'a [PathBuf],
         enable_snippets: bool,
     ) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {
-        language_config.language_servers.iter().map(
+        language_config.language_servers.iter().filter_map(
             move |LanguageServerFeatures { name, .. }| {
                 if let Some(clients) = self.inner.get(name) {
                     if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
                         client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
                     }) {
-                        return (name.to_owned(), Ok(client.clone()));
+                        return Some((name.to_owned(), Ok(client.clone())));
                     }
                 }
                 match self.start_client(
@@ -781,13 +784,14 @@ impl Registry {
                     enable_snippets,
                 ) {
                     Ok(client) => {
+                        let client = client?;
                         self.inner
                             .entry(name.to_owned())
                             .or_default()
                             .push(client.clone());
-                        (name.clone(), Ok(client))
+                        Some((name.clone(), Ok(client)))
                     }
-                    Err(err) => (name.to_owned(), Err(err)),
+                    Err(err) => Some((name.to_owned(), Err(err))),
                 }
             },
         )
@@ -888,18 +892,45 @@ fn start_client(
     doc_path: Option<&std::path::PathBuf>,
     root_dirs: &[PathBuf],
     enable_snippets: bool,
-) -> Result<NewClient> {
+) -> Result<Option<NewClient>> {
+    let (workspace, workspace_is_cwd) = helix_loader::find_workspace();
+    let workspace = path::normalize(workspace);
+    let root = find_lsp_workspace(
+        doc_path
+            .and_then(|x| x.parent().and_then(|x| x.to_str()))
+            .unwrap_or("."),
+        &config.roots,
+        config.workspace_lsp_roots.as_deref().unwrap_or(root_dirs),
+        &workspace,
+        workspace_is_cwd,
+    );
+
+    // `root_uri` and `workspace_folder` can be empty in case there is no workspace
+    // `root_url` can not, use `workspace` as a fallback
+    let root_path = root.clone().unwrap_or_else(|| workspace.clone());
+    let root_uri = root.and_then(|root| lsp::Url::from_file_path(root).ok());
+
+    if let Some(globset) = &ls_config.required_root_patterns {
+        if !root_path
+            .read_dir()?
+            .flatten()
+            .map(|entry| entry.file_name())
+            .any(|entry| globset.is_match(entry))
+        {
+            return Ok(None);
+        }
+    }
+
     let (client, incoming, initialize_notify) = Client::start(
         &ls_config.command,
         &ls_config.args,
         ls_config.config.clone(),
         ls_config.environment.clone(),
-        &config.roots,
-        config.workspace_lsp_roots.as_deref().unwrap_or(root_dirs),
+        root_path,
+        root_uri,
         id,
         name,
         ls_config.timeout,
-        doc_path,
     )?;
 
     let client = Arc::new(client);
@@ -938,7 +969,7 @@ fn start_client(
         initialize_notify.notify_one();
     });
 
-    Ok(NewClient(client, incoming))
+    Ok(Some(NewClient(client, incoming)))
 }
 
 /// Find an LSP workspace of a file using the following mechanism:

From ad7b7bc8047d3c0930bbc6201d8f69132b396b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 12 Feb 2024 12:01:17 +0900
Subject: [PATCH 709/967] minor: Fix compilation

---
 helix-core/Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index e0eb6401c..fb68ccc08 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -49,7 +49,6 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"
 
 etcetera = "0.8"
 textwrap = "0.16.0"
-globset = "0.4.14"
 
 nucleo.workspace = true
 parking_lot = "0.12"

From d7c7589fd5d4dc307f37e23bdac1e5fec4ded4fc Mon Sep 17 00:00:00 2001
From: iko <mail@iko.soy>
Date: Mon, 12 Feb 2024 15:36:14 +0000
Subject: [PATCH 710/967] Add Hoon (#9190)

* Added Hoon

* Added highlights.scm

* Updated docs

* Update runtime/queries/hoon/highlights.scm

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 12 +++++++++++
 runtime/queries/hoon/highlights.scm | 32 +++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 runtime/queries/hoon/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 9131ff580..bfe6d6b1e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -70,6 +70,7 @@
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
 | hocon | ✓ |  | ✓ |  |
+| hoon | ✓ |  |  |  |
 | hosts | ✓ |  |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
 | hurl | ✓ |  | ✓ |  |
diff --git a/languages.toml b/languages.toml
index 6fc811814..d7b8e0d94 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3055,6 +3055,18 @@ file-types = ["log"]
 name = "log"
 source = { git = "https://github.com/Tudyx/tree-sitter-log", rev = "62cfe307e942af3417171243b599cc7deac5eab9" }
 
+[[language]]
+name = "hoon"
+scope = "source.hoon"
+injection-regex = "hoon"
+file-types = ["hoon"]
+comment-token = "::"
+indent = {tab-width = 2, unit = "  "}
+
+[[grammar]]
+name = "hoon"
+source = { git = "https://github.com/urbit-pilled/tree-sitter-hoon", rev = "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6" }
+
 [[language]]
 name = "hocon"
 scope = "source.conf"
diff --git a/runtime/queries/hoon/highlights.scm b/runtime/queries/hoon/highlights.scm
new file mode 100644
index 000000000..91e6b8542
--- /dev/null
+++ b/runtime/queries/hoon/highlights.scm
@@ -0,0 +1,32 @@
+(number) @constant.numeric
+
+(string) @string
+
+[
+  "("
+  ")"
+  "["
+  "]"
+]  @punctuation.bracket
+
+[
+  (coreTerminator)
+  (seriesTerminator)
+] @punctuation.delimiter
+
+
+(rune) @keyword
+
+(term) @constant
+
+(aura) @constant.builtin
+
+(Gap) @comment
+
+(boolean) @constant.builtin
+
+(date) @constant.builtin
+(mold) @constant.builtin
+(specialIndex) @constant.builtin
+(lark) @operator
+(fullContext) @constant.builtin

From 45ee568b98dc8c045d1a1bdaea833457b8b7d926 Mon Sep 17 00:00:00 2001
From: Chirikumbrah <78883260+Chirikumbrah@users.noreply.github.com>
Date: Mon, 12 Feb 2024 19:47:08 +0300
Subject: [PATCH 711/967] Dracula whitespace color changes (#9588)

* added color to render whitespace characters

* made some alphabet sort
---
 runtime/themes/dracula.toml | 150 ++++++++++++++++++++----------------
 1 file changed, 84 insertions(+), 66 deletions(-)

diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 1473c1a83..32d9c8f5d 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -2,135 +2,153 @@
 # Author : Chirikumbrah
 
 "annotation"                      = { fg = "foreground"                                                     }
+
 "attribute"                       = { fg = "green",              modifiers = ["italic"]                     }
+
 "comment"                         = { fg = "comment"                                                        }
-"comment.block.documentation"     = { fg = "comment"                                                        }
 "comment.block"                   = { fg = "comment"                                                        }
+"comment.block.documentation"     = { fg = "comment"                                                        }
 "comment.line"                    = { fg = "comment"                                                        }
+
 "constant"                        = { fg = "purple"                                                         }
-"constant.numeric"                = { fg = "purple"                                                         }
 "constant.builtin"                = { fg = "purple"                                                         }
 "constant.builtin.boolean"        = { fg = "purple"                                                         }
 "constant.character"              = { fg = "cyan"                                                           }
 "constant.character.escape"       = { fg = "pink"                                                           }
 "constant.macro"                  = { fg = "purple"                                                         }
+"constant.numeric"                = { fg = "purple"                                                         }
 "constructor"                     = { fg = "purple"                                                         }
+
+"definition"                      = { underline = { color = "cyan"                                        } }
+
+"diagnostic"                      = { underline = { color = "orange",          style = "curl"             } }
+"diagnostic.hint"                 = { underline = { color = "purple",          style = "curl"             } }
+"diagnostic.warning"              = { underline = { color = "yellow",          style = "curl"             } }
+"diagnostic.error"                = { underline = { color = "red",             style = "curl"             } }
+"diagnostic.info"                 = { underline = { color = "cyan",            style = "curl"             } }
+
+"error"                           = { fg    = "red"                                                         }
+"hint"                            = { fg    = "purple"                                                      }
+"info"                            = { fg    = "cyan"                                                        }
+"warning"                         = { fg    = "yellow"                                                      }
+
+"diff.delta"                      = { fg    = "orange"                                                      }
+"diff.minus"                      = { fg    = "red"                                                         }
+"diff.plus"                       = { fg    = "green"                                                       }
+
+# d
 "function"                        = { fg = "green"                                                          }
 "function.builtin"                = { fg = "green"                                                          }
-"function.method"                 = { fg = "green"                                                          }
-"function.macro"                  = { fg = "purple"                                                         }
 "function.call"                   = { fg = "green"                                                          }
+"function.macro"                  = { fg = "purple"                                                         }
+"function.method"                 = { fg = "green"                                                          }
+
 "keyword"                         = { fg = "pink"                                                           }
-"keyword.operator"                = { fg = "pink"                                                           }
-"keyword.function"                = { fg = "pink"                                                           }
-"keyword.return"                  = { fg = "pink"                                                           }
-"keyword.control.import"          = { fg = "pink"                                                           }
-"keyword.directive"               = { fg = "green"                                                          }
-"keyword.control.repeat"          = { fg = "pink"                                                           }
 "keyword.control.conditional"     = { fg = "pink"                                                           }
 "keyword.control.exception"       = { fg = "purple"                                                         }
+"keyword.control.import"          = { fg = "pink"                                                           }
+"keyword.control.repeat"          = { fg = "pink"                                                           }
+"keyword.directive"               = { fg = "green"                                                          }
+"keyword.function"                = { fg = "pink"                                                           }
+"keyword.operator"                = { fg = "pink"                                                           }
+"keyword.return"                  = { fg = "pink"                                                           }
 "keyword.storage"                 = { fg = "pink"                                                           }
-"keyword.storage.type"            = { fg = "cyan",               modifiers = ["italic"]                     }
 "keyword.storage.modifier"        = { fg = "pink"                                                           }
-"tag"                             = { fg = "pink"                                                           }
-"tag.attribute"                   = { fg = "purple"                                                         }
-"tag.delimiter"                   = { fg = "foreground"                                                     }
+"keyword.storage.type"            = { fg = "cyan",               modifiers = ["italic"]                     }
+
 "label"                           = { fg = "cyan"                                                           }
+
+"markup.bold"                     = { fg    = "orange",          modifiers = ["bold"]                       }
+"markup.heading"                  = { fg    = "purple",          modifiers = ["bold"]                       }
+"markup.italic"                   = { fg    = "yellow",          modifiers = ["italic"]                     }
+"markup.link.text"                = { fg    = "pink"                                                        }
+"markup.link.url"                 = { fg    = "cyan"                                                        }
+"markup.list"                     = { fg    = "cyan"                                                        }
+"markup.quote"                    = { fg    = "yellow",          modifiers = ["italic"]                     }
+"markup.raw"                      = { fg    = "foreground"                                                  }
+"markup.strikethrough"            = {                            modifiers = ["crossed_out"]                }
+
 "punctuation"                     = { fg = "foreground"                                                     }
 "punctuation.bracket"             = { fg = "foreground"                                                     }
 "punctuation.delimiter"           = { fg = "foreground"                                                     }
 "punctuation.special"             = { fg = "pink"                                                           }
+
 "special"                         = { fg = "pink"                                                           }
+
 "string"                          = { fg = "yellow"                                                         }
+"string.regexp"                   = { fg = "red"                                                            }
 "string.special"                  = { fg = "orange"                                                         }
 "string.symbol"                   = { fg = "yellow"                                                         }
-"string.regexp"                   = { fg = "red"                                                            }
-"type.builtin"                    = { fg = "cyan"                                                           }
+
+"tag"                             = { fg = "pink"                                                           }
+"tag.attribute"                   = { fg = "purple"                                                         }
+"tag.delimiter"                   = { fg = "foreground"                                                     }
+
 "type"                            = { fg = "cyan",               modifiers = ["italic"]                     }
+"type.builtin"                    = { fg = "cyan"                                                           }
 "type.enum.variant"               = { fg = "foreground",         modifiers = ["italic"]                     }
-"variable"                        = { fg = "foreground"                                                     }
-"variable.builtin"                = { fg = "purple",             modifiers = ["italic"]                     }
-"variable.parameter"              = { fg = "orange",             modifiers = ["italic"]                     }
-"variable.other"                  = { fg = "foreground"                                                     }
-"variable.other.member"           = { fg = "foreground"                                                     }
-
 
-"diff.plus"                       = { fg    = "green"                                                       }
-"diff.delta"                      = { fg    = "orange"                                                      }
-"diff.minus"                      = { fg    = "red"                                                         }
 "ui.background"                   = { fg    = "foreground",      bg = "background"                          }
-"ui.cursor.match"                 = { fg    = "foreground",      bg = "grey"                                }
 "ui.cursor"                       = { fg    = "background",      bg = "purple",        modifiers = ["dim"]  }
-"ui.cursor.normal"                = { fg    = "background",      bg = "purple",        modifiers = ["dim"]  }	
 "ui.cursor.insert"                = { fg    = "background",      bg = "green",         modifiers = ["dim"]  }	
-"ui.cursor.select"                = { fg    = "background",      bg = "cyan",          modifiers = ["dim"]  }
-"ui.cursor.primary.normal"        = { fg    = "background",      bg = "purple"                              }	
+"ui.cursor.match"                 = { fg    = "foreground",      bg = "grey"                                }
+"ui.cursor.normal"                = { fg    = "background",      bg = "purple",        modifiers = ["dim"]  }	
 "ui.cursor.primary.insert"        = { fg    = "background",      bg = "green"                               }	
+"ui.cursor.primary.normal"        = { fg    = "background",      bg = "purple"                              }	
 "ui.cursor.primary.select"        = { fg    = "background",      bg = "cyan"                                }
+"ui.cursor.select"                = { fg    = "background",      bg = "cyan",          modifiers = ["dim"]  }
 "ui.cursorline.primary"           = {                            bg = "cursorline"                          }
-"ui.help"                         = { fg    = "foreground",      bg = "black"                               }
 "ui.debug"                        = { fg    = "red"                                                         }
+"ui.help"                         = { fg    = "foreground",      bg = "black"                               }
 "ui.highlight.frameline"          = { fg    = "background",      bg = "red"                                 }
 "ui.linenr"                       = { fg    = "comment"                                                     }
 "ui.linenr.selected"              = { fg    = "foreground"                                                  }
 "ui.menu"                         = { fg    = "foreground",      bg = "current_line"                        }
-"ui.menu.selected"                = { fg    = "current_line",    bg = "purple",        modifiers = ["dim"]  }
 "ui.menu.scroll"                  = { fg    = "foreground",      bg = "current_line"                        }
+"ui.menu.selected"                = { fg    = "current_line",    bg = "purple",        modifiers = ["dim"]  }
 "ui.popup"                        = { fg    = "foreground",      bg = "black"                               }
-"ui.selection.primary"            = {                            bg = "current_line"                        }
 "ui.selection"                    = {                            bg = "selection"                           }
+"ui.selection.primary"            = {                            bg = "current_line"                        }
 "ui.statusline"                   = { fg    = "foreground",      bg = "darker"                              }
 "ui.statusline.inactive"          = { fg    = "comment",         bg = "darker"                              }
-"ui.statusline.normal"            = { fg    = "black",           bg = "purple",        modifiers = ["bold"] }
 "ui.statusline.insert"            = { fg    = "black",           bg = "green",         modifiers = ["bold"] }
+"ui.statusline.normal"            = { fg    = "black",           bg = "purple",        modifiers = ["bold"] }
 "ui.statusline.select"            = { fg    = "black",           bg = "cyan",          modifiers = ["bold"] }
 "ui.text"                         = { fg    = "foreground"                                                  }
 "ui.text.focus"                   = { fg    = "cyan"                                                        }
-"ui.window"                       = { fg    = "foreground"                                                  }
-"ui.virtual.whitespace"           = { fg    = "current_line"                                                }
-"ui.virtual.wrap"                 = { fg    = "current_line"                                                }
-"ui.virtual.ruler"                = { bg    = "black"                                                       }
 "ui.virtual.indent-guide"         = { fg    = "indent"                                                      }
 "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"]              }
-"hint"                            = { fg    = "purple"                                                      }
-"error"                           = { fg    = "red"                                                         }
-"warning"                         = { fg    = "yellow"                                                      }
-"info"                            = { fg    = "cyan"                                                        }
-"markup.heading"                  = { fg    = "purple",          modifiers = ["bold"]                       }
-"markup.list"                     = { fg    = "cyan"                                                        }
-"markup.bold"                     = { fg    = "orange",          modifiers = ["bold"]                       }
-"markup.italic"                   = { fg    = "yellow",          modifiers = ["italic"]                     }
-"markup.strikethrough"            = {                            modifiers = ["crossed_out"]                }
-"markup.link.url"                 = { fg    = "cyan"                                                        }
-"markup.link.text"                = { fg    = "pink"                                                        }
-"markup.quote"                    = { fg    = "yellow",          modifiers = ["italic"]                     }
-"markup.raw"                      = { fg    = "foreground"                                                  }
-"diagnostic"                      = { underline = { color = "orange",          style = "curl"             } }
-"diagnostic.hint"                 = { underline = { color = "purple",          style = "curl"             } }
-"diagnostic.warning"              = { underline = { color = "yellow",          style = "curl"             } }
-"diagnostic.error"                = { underline = { color = "red",             style = "curl"             } }
-"diagnostic.info"                 = { underline = { color = "cyan",            style = "curl"             } }
-"definition"                      = { underline = { color = "cyan"                                        } }
+"ui.virtual.ruler"                = { bg    = "black"                                                       }
+"ui.virtual.whitespace"           = { fg    = "whitespace"                                                  }
+"ui.virtual.wrap"                 = { fg    = "current_line"                                                }
+"ui.window"                       = { fg    = "foreground"                                                  }
+
+"variable"                        = { fg = "foreground"                                                     }
+"variable.builtin"                = { fg = "purple",             modifiers = ["italic"]                     }
+"variable.other"                  = { fg = "foreground"                                                     }
+"variable.other.member"           = { fg = "foreground"                                                     }
+"variable.parameter"              = { fg = "orange",             modifiers = ["italic"]                     }
 
 
 [palette]
-foreground        = "#f8f8f2"
 background        = "#282A36"
-cursorline        = "#2d303e"
-darker            = "#222430"
 black             = "#191A21"
-grey              = "#666771"
 comment           = "#6272A4"
 current_line      = "#44475a"
+cursorline        = "#2d303e"
+cyan              = "#8be9fd"
+darker            = "#222430"
+foreground        = "#f8f8f2"
+green             = "#50fa7b" 
+grey              = "#666771"
 indent            = "#56596a"
-selection         = "#363848"
-red               = "#ff5555"
 orange            = "#ffb86c" 
-yellow            = "#f1fa8c" 
-green             = "#50fa7b" 
-purple            = "#BD93F9" 
-cyan              = "#8be9fd"
 pink              = "#ff79c6"
+purple            = "#BD93F9" 
+red               = "#ff5555"
+selection         = "#363848"
+whitespace        = "#586693"
+yellow            = "#f1fa8c" 
 

From 0eec518ff68072071d595b4a297080add11738e3 Mon Sep 17 00:00:00 2001
From: kpbaks <kristoffer.pbs@tuta.io>
Date: Fri, 9 Feb 2024 21:39:50 +0100
Subject: [PATCH 712/967] feat(languages): add formatter for just

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

diff --git a/languages.toml b/languages.toml
index d7b8e0d94..f99e1a63d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2814,6 +2814,8 @@ file-types = [{ glob = "justfile" }, { glob = "Justfile" }, { glob = ".justfile"
 injection-regex = "just"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
+auto-format = true
+formatter = { command = "just", args = ["--dump"] }
 
 [[grammar]]
 name = "just"

From 78ed3aded3622e0036a0476aa9daf5cbeaa24431 Mon Sep 17 00:00:00 2001
From: kpbaks <kristoffer.pbs@tuta.io>
Date: Fri, 9 Feb 2024 22:00:33 +0100
Subject: [PATCH 713/967] feat(languages): use `fish_indent` as the formatter
 for fish

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

diff --git a/languages.toml b/languages.toml
index f99e1a63d..4d5be2824 100644
--- a/languages.toml
+++ b/languages.toml
@@ -311,6 +311,8 @@ file-types = ["fish"]
 shebangs = ["fish"]
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
+auto-format = true
+formatter = { command = "fish_indent" }
 
 [[grammar]]
 name = "fish"

From bb1e2ddcd8c01256d81ae712090c4ca1e2d09561 Mon Sep 17 00:00:00 2001
From: Tom Manner <zephrincochrane@gmail.com>
Date: Mon, 12 Feb 2024 11:47:52 -0500
Subject: [PATCH 714/967] Added "zon" file type to zig language section.
 (#9582)

`build.zig.zon` is what 0.11.0 uses for external dependencies.  The syntax is a subset of zig and can be highlighted and formatted like normal zig code.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 4d5be2824..2cf1750be 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1184,7 +1184,7 @@ source = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "5
 name = "zig"
 scope = "source.zig"
 injection-regex = "zig"
-file-types = ["zig"]
+file-types = ["zig", "zon"]
 roots = ["build.zig"]
 auto-format = true
 comment-token = "//"

From 0516337abb7096c7d909624a7e1307ee4b837835 Mon Sep 17 00:00:00 2001
From: Mark Stosberg <mark@rideamigos.com>
Date: Mon, 12 Feb 2024 11:48:10 -0500
Subject: [PATCH 715/967] docs: Document that what the `diff` gutter symbol
 does (#9587)

Before there was no document about what the `diff` gutter is displaying
or what the colors mean.

These docs clarify it's a `git` diff and makes it easier to
cross-reference the theme if you aren't sure what the colors mean or
want to change them.
---
 book/src/configuration.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index a43ede76a..de33c1ade 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -340,7 +340,12 @@ Currently unused
 
 #### `[editor.gutters.diff]` Section
 
-Currently unused
+The `diff` gutter option displays colored bars indicating whether a `git` diff represents that a line was added, removed or changed.
+These colors are controlled by the theme attributes `diff.plus`, `diff.minus` and `diff.delta`.
+
+Other diff providers will eventually be supported by a future plugin system.
+
+There are currently no options for this section.
 
 #### `[editor.gutters.spacer]` Section
 

From d232e7a98579c3f964ade7ed93a1e6f944f1c89a Mon Sep 17 00:00:00 2001
From: Gagan Janjua <gj1118@gmail.com>
Date: Mon, 12 Feb 2024 11:48:18 -0500
Subject: [PATCH 716/967] Adding Curzon theme (#9553)

* adding Curzon theme

* Adding cursive strings
---
 runtime/themes/curzon.toml | 118 +++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 runtime/themes/curzon.toml

diff --git a/runtime/themes/curzon.toml b/runtime/themes/curzon.toml
new file mode 100644
index 000000000..1303519fb
--- /dev/null
+++ b/runtime/themes/curzon.toml
@@ -0,0 +1,118 @@
+attribute_color = "attribute_color"
+keyword = "keyword_foreground_color"
+"keyword.directive" = "light_blue" 
+namespace = "light_blue"
+punctuation = "punctuation_color"
+"punctuation.delimiter" = "punctuation_color"
+operator = "operator_color"
+special = "label"
+"variable.other.member" = "white"
+variable = "variable"
+"variable.parameter" = { fg = "variable" }
+"variable.builtin" = {fg = "built_in", modifiers=["bold","italic"]}
+type = "white"
+"type.builtin" = "white" 
+constructor = "light_blue"
+function = "white"
+"function.macro" = {fg ="light_blue" }
+"function.builtin" = "white"
+tag = "tag"
+comment = { fg = "comment_color", modifiers = ["italic"] }
+constant = {fg ="white"}
+"constant.builtin" = "white"
+string = {fg="string", modifiers=["italic"]}
+"constant.numeric" = "constant_numeric_foreground_color"
+"constant.character.escape" = "label"
+# used for lifetimes
+label = "label"
+
+"markup.heading" = "light_blue"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "link_url_foreground_color", modifiers = ["underlined"] }
+"markup.link.text" = "markup_link_foreground_color"
+"markup.raw" = "markup_raw_foreground_color"
+
+"diff.plus" = "#35bf86"
+"diff.minus" = "#f22c86"
+"diff.delta" = "info"
+
+"ui.background" = { bg = "black" }
+"ui.background.separator" = { fg = "window_color" }
+"ui.linenr" = { fg = "window_color" }
+"ui.linenr.selected" = { fg = "light_blue" }
+"ui.statusline" = { fg = "statusline_foreground_color", bg = "black" }
+"ui.statusline.inactive" = { fg = "statusline_inactive_foreground_color", bg = "black" }
+"ui.virtual.ruler" = { bg = "dark"}
+
+"ui.popup" = {  fg = "menu_normal_text_color", bg = "menu_background_color"  }
+"ui.window" = { fg = "dark"}
+"ui.help" = {  fg = "menu_normal_text_color", bg = "menu_background_color"  }
+
+"ui.text" = { fg = "text" }
+"ui.text.focus" = { fg = "white" }
+"ui.text.inactive" = "comment_color"
+"ui.virtual" = { fg = "#008DFF" }
+
+"ui.virtual.indent-guide" = { fg = "window_color" }
+
+"ui.selection" = { bg = "#4f46e5" }
+"ui.selection.primary" = { bg = "#4f46e5" }
+"ui.cursor.select" = { bg = "cursor_normal_bg_color" }
+"ui.cursor.primary.insert" = { bg = "#f43f5e", fg = "white" }
+"ui.cursor.match" = { fg = "#212121", bg = "#6C6999" }
+"ui.cursorline.primary" = { bg = "dark"}
+"ui.highlight" = { bg = "dark" }
+"ui.highlight.frameline" = { bg = "#634450" }
+"ui.debug" = { fg = "#634450" }
+"ui.debug.breakpoint" = { fg = "debug_breakpoint" }
+"ui.menu" = { fg = "menu_normal_text_color", bg = "menu_background_color" }
+"ui.menu.selected" = { fg = "menu_background_color", bg = "white" }
+"ui.menu.scroll" = { fg = "menu_scroll", bg = "window_color" }
+
+"diagnostic.hint" = { underline = { color = "hint", style = "curl" } }
+"diagnostic.info" = { underline = { color = "info", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "warning", style = "curl" } }
+"diagnostic.error" = { underline = { color = "error", style = "curl" } }
+
+warning = "warning"
+error = "#f43f5e"
+info = "info"
+hint = "#38bdf8"
+
+[palette]
+label = "#efba5d"
+constant_numeric_foreground_color = "#E8DCA0"
+tag = "#eccdba"
+markup_link_foreground_color = "#eccdba"
+markup_raw_foreground_color = "#eccdba"
+keyword_foreground_color="#eccdba" # alternative color "#ecc1ba"
+comment_color = "#697C81"
+link_url_foreground_color="#b8b8b8"
+debug_breakpoint = "#f47868"
+window_color = "#484a4d"
+light_blue = "#bee0ec" #change name 
+text="#bfdbfe"
+black = "#000000"
+white = "#ffffff"
+dark= "#111111"
+punctuation_color = "#a4a0e8"
+string="#6ee7b7"
+attribute_color="#dbbfef"
+operator_color="#bee0ec"
+menu_background_color="#1e3a8a"
+menu_normal_text_color="#93c5fd"
+statusline_active_background_color="#111111"
+statusline_inactive_background_color="#0e0e0e"
+statusline_inactive_foreground_color="#b8b8b8"
+popup_background_color="#1e3a8a"
+cursor_normal_bg_color="#6366f1"
+warning="#ffcd1c"
+error = "#f43f5e"
+hint = "#38bdf8"
+info = "#6366f1"
+variable="#c7d2fe"
+menu_scroll="#93c5fd"
+built_in="#10b981"
+statusline_foreground_color="#6366f1"

From c111e28a6f4ab81bf1f5b60173f6e7bf3e63aa15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 01:48:45 +0900
Subject: [PATCH 717/967] build(deps): bump toml from 0.7.6 to 0.8.10 (#9539)

Bumps [toml](https://github.com/toml-rs/toml) from 0.7.6 to 0.8.10.
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.7.6...toml-v0.8.10)

---
updated-dependencies:
- dependency-name: toml
  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              | 35 +++++++++++++----------------------
 helix-core/Cargo.toml   |  2 +-
 helix-loader/Cargo.toml |  2 +-
 helix-term/Cargo.toml   |  2 +-
 helix-view/Cargo.toml   |  2 +-
 xtask/Cargo.toml        |  2 +-
 6 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 24c689336..7d8329b3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -591,7 +591,7 @@ dependencies = [
  "gix-date",
  "itoa",
  "thiserror",
- "winnow 0.5.28",
+ "winnow",
 ]
 
 [[package]]
@@ -673,7 +673,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "unicode-bom",
- "winnow 0.5.28",
+ "winnow",
 ]
 
 [[package]]
@@ -888,7 +888,7 @@ dependencies = [
  "itoa",
  "smallvec",
  "thiserror",
- "winnow 0.5.28",
+ "winnow",
 ]
 
 [[package]]
@@ -1001,7 +1001,7 @@ dependencies = [
  "gix-validate",
  "memmap2",
  "thiserror",
- "winnow 0.5.28",
+ "winnow",
 ]
 
 [[package]]
@@ -2055,9 +2055,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
@@ -2358,9 +2358,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.6"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2370,24 +2370,24 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.12"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
+checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.4.6",
+ "winnow",
 ]
 
 [[package]]
@@ -2798,15 +2798,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
-[[package]]
-name = "winnow"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.5.28"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index fb68ccc08..40230e1ec 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -39,7 +39,7 @@ dunce = "1.0"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.7"
+toml = "0.8"
 
 imara-diff = "0.1.0"
 
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 6c3617dd1..25b559696 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -19,7 +19,7 @@ helix-stdx = { path = "../helix-stdx" }
 
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
-toml = "0.7"
+toml = "0.8"
 etcetera = "0.8"
 tree-sitter.workspace = true
 once_cell = "1.19"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 09f02c67c..1e21ec161 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -62,7 +62,7 @@ open = "5.0.1"
 url = "2.5.0"
 
 # config
-toml = "0.7"
+toml = "0.8"
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 2e6893414..5a5525454 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -43,7 +43,7 @@ chardetng = "0.1"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.7"
+toml = "0.8"
 log = "~0.4"
 
 parking_lot = "0.12.1"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 0a61536fc..25d8955e5 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -16,4 +16,4 @@ helix-term = { path = "../helix-term" }
 helix-core = { path = "../helix-core" }
 helix-view = { path = "../helix-view" }
 helix-loader = { path = "../helix-loader" }
-toml = "0.7"
+toml = "0.8"

From 661e12315279ac9032632e51bf32d4e36025f5af Mon Sep 17 00:00:00 2001
From: Chris <artofchrism@gmail.com>
Date: Mon, 12 Feb 2024 16:49:04 +0000
Subject: [PATCH 718/967]  Add support for Odin's formatter (#9537)

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

diff --git a/languages.toml b/languages.toml
index 2cf1750be..e0f3961e0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1923,13 +1923,14 @@ source = { git = "https://github.com/fvacek/tree-sitter-cpon", rev = "0d01fcdae5
 
 [[language]]
 name = "odin"
-auto-format = false
+auto-format = true
 scope = "source.odin"
 file-types = ["odin"]
 roots = ["ols.json"]
 language-servers = [ "ols" ]
 comment-token = "//"
 indent = { tab-width = 4, unit = "\t" }
+formatter = { command = "odinfmt", args = [ "-stdin", "true" ] }
 
 [[grammar]]
 name = "odin"

From fd7b722dfb15b1e2211e1bcce5b2631113d1741e Mon Sep 17 00:00:00 2001
From: ves <28784043+vesdev@users.noreply.github.com>
Date: Mon, 12 Feb 2024 18:49:42 +0200
Subject: [PATCH 719/967] theme: horizon-dark fix constructor color (#9493)

* theme: add horizon-dark

* fix whitespace color and gutter selected

* taplo fmt

* markup and color tweaks

markup colors
diff colors
better comment and menu colors

* horizon-dark: fix constructor color

makes Some and None to look better and more like the vscode theme
---
 runtime/themes/horizon-dark.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/horizon-dark.toml b/runtime/themes/horizon-dark.toml
index aec113dfa..2ab10e911 100644
--- a/runtime/themes/horizon-dark.toml
+++ b/runtime/themes/horizon-dark.toml
@@ -11,6 +11,7 @@ keyword = "purple"
 function = "blue"
 label = "orange"
 type = "orange"
+constructor = "orange"
 namespace = "orange"
 
 # User Interface

From caad87e9996b176c4e39441abf201f25a887c879 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:57:12 +0900
Subject: [PATCH 720/967] build(deps): bump thiserror from 1.0.56 to 1.0.57
 (#9615)

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 7d8329b3a..3f5b3e566 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2244,18 +2244,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",

From c55bf72d25e37ae0e87a53f106e29d265e892c5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:57:22 +0900
Subject: [PATCH 721/967] build(deps): bump clipboard-win from 5.0.0 to 5.1.0
 (#9616)

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 3f5b3e566..5485125ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -183,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "5.0.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
+checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81"
 dependencies = [
  "error-code",
 ]
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 5a5525454..b1b444f90 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.0", features = ["std"] }
+clipboard-win = { version = "5.1", features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

From 36ad70e4c79e08f0a200162a66b894237e6e16f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:57:37 +0900
Subject: [PATCH 722/967] build(deps): bump unicode-segmentation from 1.10.1 to
 1.11.0 (#9617)

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

diff --git a/Cargo.lock b/Cargo.lock
index 5485125ae..8cdf1e0c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2449,9 +2449,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 40230e1ec..ca2f505c6 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -22,7 +22,7 @@ helix-loader = { path = "../helix-loader" }
 ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
 smallvec = "1.13"
 smartstring = "1.0.1"
-unicode-segmentation = "1.10"
+unicode-segmentation = "1.11"
 unicode-width = "0.1"
 unicode-general-category = "0.6"
 # slab = "0.4.2"
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index abb6122af..f880ca6e3 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -20,7 +20,7 @@ helix-core = { path = "../helix-core" }
 
 bitflags = "2.4"
 cassowary = "0.3"
-unicode-segmentation = "1.10"
+unicode-segmentation = "1.11"
 crossterm = { version = "0.27", optional = true }
 termini = "1.0"
 serde = { version = "1", "optional" = true, features = ["derive"]}

From 7934ac77143e69068420556b043dde035255340b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:58:23 +0900
Subject: [PATCH 723/967] build(deps): bump cc from 1.0.83 to 1.0.85 (#9618)

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

diff --git a/Cargo.lock b/Cargo.lock
index 8cdf1e0c3..6131871d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -145,12 +145,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "9b918671670962b48bc23753aef0c51d072dca6f52f01f800854ada6ddb7f7d3"
 
 [[package]]
 name = "cfg-if"

From fe869e5dc7a8cd6c2c2e3945816bd890956eef3a Mon Sep 17 00:00:00 2001
From: kyfanc <chrisfan918@gmail.com>
Date: Tue, 13 Feb 2024 18:58:53 +0800
Subject: [PATCH 724/967] fix lsp config reload (#9415)

`syn_loader` was replaced rather than interior value being replace,
old value was still being referenced and not updated after `:config-refresh`.
By using `ArcSwap` like for `config`, each `.load()` call will return the most
updated value.

Co-authored-by: kyfan <kyfan@email>
---
 Cargo.lock                    |  1 +
 helix-core/src/syntax.rs      | 30 +++++++++++++++++++++++-------
 helix-core/tests/indent.rs    | 10 ++++++++--
 helix-lsp/Cargo.toml          |  1 +
 helix-lsp/src/lib.rs          |  9 +++++----
 helix-term/src/application.rs |  7 ++++---
 helix-term/src/ui/lsp.rs      |  9 +++++++--
 helix-term/src/ui/markdown.rs |  8 +++++---
 helix-term/src/ui/mod.rs      |  4 ++--
 helix-term/src/ui/picker.rs   | 11 +++++++----
 helix-term/src/ui/prompt.rs   |  9 +++++++--
 helix-view/src/document.rs    | 20 ++++++++++++--------
 helix-view/src/editor.rs      | 11 +++++++----
 13 files changed, 89 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6131871d7..6f38f0034 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1316,6 +1316,7 @@ name = "helix-lsp"
 version = "23.10.0"
 dependencies = [
  "anyhow",
+ "arc-swap",
  "futures-executor",
  "futures-util",
  "globset",
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 5d45deaf4..a9344448f 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1000,7 +1000,7 @@ thread_local! {
 pub struct Syntax {
     layers: HopSlotMap<LayerId, LanguageLayer>,
     root: LayerId,
-    loader: Arc<Loader>,
+    loader: Arc<ArcSwap<Loader>>,
 }
 
 fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<str> {
@@ -1011,7 +1011,7 @@ impl Syntax {
     pub fn new(
         source: RopeSlice,
         config: Arc<HighlightConfiguration>,
-        loader: Arc<Loader>,
+        loader: Arc<ArcSwap<Loader>>,
     ) -> Option<Self> {
         let root_layer = LanguageLayer {
             tree: None,
@@ -1055,9 +1055,10 @@ impl Syntax {
         let mut queue = VecDeque::new();
         queue.push_back(self.root);
 
-        let scopes = self.loader.scopes.load();
+        let loader = self.loader.load();
+        let scopes = loader.scopes.load();
         let injection_callback = |language: &InjectionLanguageMarker| {
-            self.loader
+            loader
                 .language_configuration_for_injection_string(language)
                 .and_then(|language_config| language_config.highlight_config(&scopes))
         };
@@ -2663,7 +2664,12 @@ mod test {
         let mut cursor = QueryCursor::new();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();
-        let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
+        let syntax = Syntax::new(
+            source.slice(..),
+            Arc::new(config),
+            Arc::new(ArcSwap::from_pointee(loader)),
+        )
+        .unwrap();
 
         let root = syntax.tree().root_node();
         let mut test = |capture, range| {
@@ -2738,7 +2744,12 @@ mod test {
             fn main() {}
         ",
         );
-        let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
+        let syntax = Syntax::new(
+            source.slice(..),
+            Arc::new(config),
+            Arc::new(ArcSwap::from_pointee(loader)),
+        )
+        .unwrap();
         let tree = syntax.tree();
         let root = tree.root_node();
         assert_eq!(root.kind(), "source_file");
@@ -2829,7 +2840,12 @@ mod test {
         let language = get_language(language_name).unwrap();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();
-        let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
+        let syntax = Syntax::new(
+            source.slice(..),
+            Arc::new(config),
+            Arc::new(ArcSwap::from_pointee(loader)),
+        )
+        .unwrap();
 
         let root = syntax
             .tree()
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index de1434f72..53265e0b1 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -1,10 +1,11 @@
+use arc_swap::ArcSwap;
 use helix_core::{
     indent::{indent_level_for_line, treesitter_indent_for_pos, IndentStyle},
     syntax::{Configuration, Loader},
     Syntax,
 };
 use ropey::Rope;
-use std::{ops::Range, path::PathBuf, process::Command};
+use std::{ops::Range, path::PathBuf, process::Command, sync::Arc};
 
 #[test]
 fn test_treesitter_indent_rust() {
@@ -197,7 +198,12 @@ fn test_treesitter_indent(
     let indent_style = IndentStyle::from_str(&language_config.indent.as_ref().unwrap().unit);
     let highlight_config = language_config.highlight_config(&[]).unwrap();
     let text = doc.slice(..);
-    let syntax = Syntax::new(text, highlight_config, std::sync::Arc::new(loader)).unwrap();
+    let syntax = Syntax::new(
+        text,
+        highlight_config,
+        Arc::new(ArcSwap::from_pointee(loader)),
+    )
+    .unwrap();
     let indent_query = language_config.indent_query().unwrap();
 
     for i in 0..doc.len_lines() {
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 2bdd5cfce..4284b0520 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -30,3 +30,4 @@ 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"
 parking_lot = "0.12.1"
+arc-swap = "1"
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 05764418f..c58d967b6 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -5,6 +5,7 @@ pub mod jsonrpc;
 pub mod snippet;
 mod transport;
 
+use arc_swap::ArcSwap;
 pub use client::Client;
 pub use futures_executor::block_on;
 pub use jsonrpc::Call;
@@ -640,14 +641,14 @@ impl Notification {
 #[derive(Debug)]
 pub struct Registry {
     inner: HashMap<LanguageServerName, Vec<Arc<Client>>>,
-    syn_loader: Arc<helix_core::syntax::Loader>,
+    syn_loader: Arc<ArcSwap<helix_core::syntax::Loader>>,
     counter: usize,
     pub incoming: SelectAll<UnboundedReceiverStream<(usize, Call)>>,
     pub file_event_handler: file_event::Handler,
 }
 
 impl Registry {
-    pub fn new(syn_loader: Arc<helix_core::syntax::Loader>) -> Self {
+    pub fn new(syn_loader: Arc<ArcSwap<helix_core::syntax::Loader>>) -> Self {
         Self {
             inner: HashMap::new(),
             syn_loader,
@@ -681,8 +682,8 @@ impl Registry {
         root_dirs: &[PathBuf],
         enable_snippets: bool,
     ) -> Result<Option<Arc<Client>>> {
-        let config = self
-            .syn_loader
+        let syn_loader = self.syn_loader.load();
+        let config = syn_loader
             .language_server_configs()
             .get(&name)
             .ok_or_else(|| anyhow::anyhow!("Language server '{name}' not defined"))?;
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index b844b5f05..30df3981c 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -66,7 +66,7 @@ pub struct Application {
     #[allow(dead_code)]
     theme_loader: Arc<theme::Loader>,
     #[allow(dead_code)]
-    syn_loader: Arc<syntax::Loader>,
+    syn_loader: Arc<ArcSwap<syntax::Loader>>,
 
     signals: Signals,
     jobs: Jobs,
@@ -122,7 +122,7 @@ impl Application {
             })
             .unwrap_or_else(|| theme_loader.default_theme(true_color));
 
-        let syn_loader = std::sync::Arc::new(lang_loader);
+        let syn_loader = Arc::new(ArcSwap::from_pointee(lang_loader));
 
         #[cfg(not(feature = "integration"))]
         let backend = CrosstermBackend::new(stdout(), &config.editor);
@@ -391,7 +391,8 @@ impl Application {
     /// refresh language config after config change
     fn refresh_language_config(&mut self) -> Result<(), Error> {
         let lang_loader = helix_core::config::user_lang_loader()?;
-        self.syn_loader = std::sync::Arc::new(lang_loader);
+
+        self.syn_loader.store(Arc::new(lang_loader));
         self.editor.syn_loader = self.syn_loader.clone();
         for document in self.editor.documents.values_mut() {
             document.detect_language(self.syn_loader.clone());
diff --git a/helix-term/src/ui/lsp.rs b/helix-term/src/ui/lsp.rs
index 7037b1552..879f963e7 100644
--- a/helix-term/src/ui/lsp.rs
+++ b/helix-term/src/ui/lsp.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use arc_swap::ArcSwap;
 use helix_core::syntax;
 use helix_view::graphics::{Margin, Rect, Style};
 use tui::buffer::Buffer;
@@ -18,13 +19,17 @@ pub struct SignatureHelp {
     active_param_range: Option<(usize, usize)>,
 
     language: String,
-    config_loader: Arc<syntax::Loader>,
+    config_loader: Arc<ArcSwap<syntax::Loader>>,
 }
 
 impl SignatureHelp {
     pub const ID: &'static str = "signature-help";
 
-    pub fn new(signature: String, language: String, config_loader: Arc<syntax::Loader>) -> Self {
+    pub fn new(
+        signature: String,
+        language: String,
+        config_loader: Arc<ArcSwap<syntax::Loader>>,
+    ) -> Self {
         Self {
             signature,
             signature_doc: None,
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 5cf530ad8..749d58508 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -1,4 +1,5 @@
 use crate::compositor::{Component, Context};
+use arc_swap::ArcSwap;
 use tui::{
     buffer::Buffer as Surface,
     text::{Span, Spans, Text},
@@ -31,7 +32,7 @@ pub fn highlighted_code_block<'a>(
     text: &str,
     language: &str,
     theme: Option<&Theme>,
-    config_loader: Arc<syntax::Loader>,
+    config_loader: Arc<ArcSwap<syntax::Loader>>,
     additional_highlight_spans: Option<Vec<(usize, std::ops::Range<usize>)>>,
 ) -> Text<'a> {
     let mut spans = Vec::new();
@@ -48,6 +49,7 @@ pub fn highlighted_code_block<'a>(
 
     let ropeslice = RopeSlice::from(text);
     let syntax = config_loader
+        .load()
         .language_configuration_for_injection_string(&InjectionLanguageMarker::Name(
             language.into(),
         ))
@@ -121,7 +123,7 @@ pub fn highlighted_code_block<'a>(
 pub struct Markdown {
     contents: String,
 
-    config_loader: Arc<syntax::Loader>,
+    config_loader: Arc<ArcSwap<syntax::Loader>>,
 }
 
 // TODO: pre-render and self reference via Pin
@@ -140,7 +142,7 @@ impl Markdown {
     ];
     const INDENT: &'static str = "  ";
 
-    pub fn new(contents: String, config_loader: Arc<syntax::Loader>) -> Self {
+    pub fn new(contents: String, config_loader: Arc<ArcSwap<syntax::Loader>>) -> Self {
         Self {
             contents,
             config_loader,
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index efa2473e0..d27e83553 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -336,8 +336,8 @@ pub mod completers {
     pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
         let text: String = "text".into();
 
-        let language_ids = editor
-            .syn_loader
+        let loader = editor.syn_loader.load();
+        let language_ids = loader
             .language_configs()
             .map(|config| &config.language_id)
             .chain(std::iter::once(&text));
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 4be5a11ef..c2728888a 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -461,14 +461,17 @@ impl<T: Item + 'static> Picker<T> {
 
         // Then attempt to highlight it if it has no language set
         if doc.language_config().is_none() {
-            if let Some(language_config) = doc.detect_language_config(&cx.editor.syn_loader) {
+            if let Some(language_config) = doc.detect_language_config(&cx.editor.syn_loader.load())
+            {
                 doc.language = Some(language_config.clone());
                 let text = doc.text().clone();
                 let loader = cx.editor.syn_loader.clone();
                 let job = tokio::task::spawn_blocking(move || {
-                    let syntax = language_config.highlight_config(&loader.scopes()).and_then(
-                        |highlight_config| Syntax::new(text.slice(..), highlight_config, loader),
-                    );
+                    let syntax = language_config
+                        .highlight_config(&loader.load().scopes())
+                        .and_then(|highlight_config| {
+                            Syntax::new(text.slice(..), highlight_config, loader)
+                        });
                     let callback = move |editor: &mut Editor, compositor: &mut Compositor| {
                         let Some(syntax) = syntax else {
                             log::info!("highlighting picker item failed");
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 3764bba60..a6ee7f05d 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -1,5 +1,6 @@
 use crate::compositor::{Component, Compositor, Context, Event, EventResult};
 use crate::{alt, ctrl, key, shift, ui};
+use arc_swap::ArcSwap;
 use helix_core::syntax;
 use helix_view::input::KeyEvent;
 use helix_view::keyboard::KeyCode;
@@ -34,7 +35,7 @@ pub struct Prompt {
     callback_fn: CallbackFn,
     pub doc_fn: DocFn,
     next_char_handler: Option<PromptCharHandler>,
-    language: Option<(&'static str, Arc<syntax::Loader>)>,
+    language: Option<(&'static str, Arc<ArcSwap<syntax::Loader>>)>,
 }
 
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -98,7 +99,11 @@ impl Prompt {
         self
     }
 
-    pub fn with_language(mut self, language: &'static str, loader: Arc<syntax::Loader>) -> Self {
+    pub fn with_language(
+        mut self,
+        language: &'static str,
+        loader: Arc<ArcSwap<syntax::Loader>>,
+    ) -> Self {
         self.language = Some((language, loader));
         self
     }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 33137c6c9..4e7b1de9f 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -681,7 +681,7 @@ impl Document {
     pub fn open(
         path: &Path,
         encoding: Option<&'static Encoding>,
-        config_loader: Option<Arc<syntax::Loader>>,
+        config_loader: Option<Arc<ArcSwap<syntax::Loader>>>,
         config: Arc<dyn DynAccess<Config>>,
     ) -> Result<Self, Error> {
         // Open the file if it exists, otherwise assume it is a new file (and thus empty).
@@ -922,10 +922,11 @@ impl Document {
     }
 
     /// Detect the programming language based on the file type.
-    pub fn detect_language(&mut self, config_loader: Arc<syntax::Loader>) {
+    pub fn detect_language(&mut self, config_loader: Arc<ArcSwap<syntax::Loader>>) {
+        let loader = config_loader.load();
         self.set_language(
-            self.detect_language_config(&config_loader),
-            Some(config_loader),
+            self.detect_language_config(&loader),
+            Some(Arc::clone(&config_loader)),
         );
     }
 
@@ -1059,10 +1060,12 @@ impl Document {
     pub fn set_language(
         &mut self,
         language_config: Option<Arc<helix_core::syntax::LanguageConfiguration>>,
-        loader: Option<Arc<helix_core::syntax::Loader>>,
+        loader: Option<Arc<ArcSwap<helix_core::syntax::Loader>>>,
     ) {
         if let (Some(language_config), Some(loader)) = (language_config, loader) {
-            if let Some(highlight_config) = language_config.highlight_config(&loader.scopes()) {
+            if let Some(highlight_config) =
+                language_config.highlight_config(&(*loader).load().scopes())
+            {
                 self.syntax = Syntax::new(self.text.slice(..), highlight_config, loader);
             }
 
@@ -1078,9 +1081,10 @@ impl Document {
     pub fn set_language_by_language_id(
         &mut self,
         language_id: &str,
-        config_loader: Arc<syntax::Loader>,
+        config_loader: Arc<ArcSwap<syntax::Loader>>,
     ) -> anyhow::Result<()> {
-        let language_config = config_loader
+        let language_config = (*config_loader)
+            .load()
             .language_config_for_language_id(language_id)
             .ok_or_else(|| anyhow!("invalid language id: {}", language_id))?;
         self.set_language(Some(language_config), Some(config_loader));
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 0fa6d67c9..68b74cf00 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -50,7 +50,10 @@ use helix_stdx::path::canonicalize;
 
 use serde::{ser::SerializeMap, Deserialize, Deserializer, Serialize, Serializer};
 
-use arc_swap::access::{DynAccess, DynGuard};
+use arc_swap::{
+    access::{DynAccess, DynGuard},
+    ArcSwap,
+};
 
 fn deserialize_duration_millis<'de, D>(deserializer: D) -> Result<Duration, D::Error>
 where
@@ -918,7 +921,7 @@ pub struct Editor {
     pub debugger_events: SelectAll<UnboundedReceiverStream<dap::Payload>>,
     pub breakpoints: HashMap<PathBuf, Vec<Breakpoint>>,
 
-    pub syn_loader: Arc<syntax::Loader>,
+    pub syn_loader: Arc<ArcSwap<syntax::Loader>>,
     pub theme_loader: Arc<theme::Loader>,
     /// last_theme is used for theme previews. We store the current theme here,
     /// and if previewing is cancelled, we can return to it.
@@ -1029,7 +1032,7 @@ impl Editor {
     pub fn new(
         mut area: Rect,
         theme_loader: Arc<theme::Loader>,
-        syn_loader: Arc<syntax::Loader>,
+        syn_loader: Arc<ArcSwap<syntax::Loader>>,
         config: Arc<dyn DynAccess<Config>>,
         handlers: Handlers,
     ) -> Self {
@@ -1190,7 +1193,7 @@ impl Editor {
         }
 
         let scopes = theme.scopes();
-        self.syn_loader.set_scopes(scopes.to_vec());
+        (*self.syn_loader).load().set_scopes(scopes.to_vec());
 
         match preview {
             ThemeAction::Preview => {

From c59f29921da98e23525c9ff4ffa82e330310e6fe Mon Sep 17 00:00:00 2001
From: Mihir Gadgil <mmgadgil20@gmail.com>
Date: Tue, 13 Feb 2024 09:16:23 -0700
Subject: [PATCH 725/967] Add changes to history when paste-replacing (#9625)

---
 helix-term/src/commands.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d44f477b7..e46109c0f 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4084,6 +4084,7 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
         return;
     };
     let values: Vec<_> = values.map(|value| value.to_string()).collect();
+    let scrolloff = editor.config().scrolloff;
 
     let (view, doc) = current!(editor);
     let repeat = std::iter::repeat(
@@ -4106,6 +4107,8 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
     });
 
     doc.apply(&transaction, view.id);
+    doc.append_changes_to_history(view);
+    view.ensure_cursor_in_view(doc, scrolloff);
 }
 
 fn replace_selections_with_clipboard(cx: &mut Context) {

From 4df08ddbe02f1e8d84c6aa4be810a91f83c73441 Mon Sep 17 00:00:00 2001
From: Mehdi Abedi <30735843+areux@users.noreply.github.com>
Date: Wed, 14 Feb 2024 10:53:15 +0000
Subject: [PATCH 726/967] Allow numbers as second input event (#8471)

* Make sure pending key list is empty when count handling

This will allow using numbers as second key event.

* count handling; add an exception for 'g'

* Lookup the key event before considering a number as count

* Avoid the allocation of another vec for the pending keys

---------

Co-authored-by: x <x@torrent>
---
 helix-term/src/keymap.rs    | 9 +++++++++
 helix-term/src/ui/editor.rs | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index d9297e08d..975274ed1 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -303,6 +303,15 @@ impl Keymaps {
         self.sticky.as_ref()
     }
 
+    pub fn contains_key(&self, mode: Mode, key: KeyEvent) -> bool {
+        let keymaps = &*self.map();
+        let keymap = &keymaps[&mode];
+        keymap
+            .search(self.pending())
+            .and_then(KeyTrie::node)
+            .is_some_and(|node| node.contains_key(&key))
+    }
+
     /// Lookup `key` in the keymap to try and find a command to execute. Escape
     /// key cancels pending keystrokes. If there are no pending keystrokes but a
     /// sticky node is in use, it will be cleared.
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index fef62a292..bb749d2e7 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -903,7 +903,9 @@ 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'), _) => {
+            (key!(i @ '0'), Some(_)) | (key!(i @ '1'..='9'), _)
+                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));

From 59369d99e2ed891206bd63c9b83b034da474920a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 14 Feb 2024 11:55:55 -0500
Subject: [PATCH 727/967] Bump tree-sitter-erlang, add `*.app.src` file-type
 (#9627)

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

diff --git a/languages.toml b/languages.toml
index e0f3961e0..bfa33bf58 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1598,7 +1598,7 @@ source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "
 name = "erlang"
 scope = "source.erlang"
 injection-regex = "erl(ang)?"
-file-types = ["erl", "hrl", "app", { glob = "rebar.config" }, { glob = "rebar.lock" }]
+file-types = ["erl", "hrl", "app", { glob = "rebar.config" }, { glob = "rebar.lock" }, { glob = "*.app.src" }]
 roots = ["rebar.config"]
 shebangs = ["escript"]
 comment-token = "%%"
@@ -1615,7 +1615,7 @@ language-servers = [ "erlang-ls" ]
 
 [[grammar]]
 name = "erlang"
-source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "ce0ed253d72c199ab93caba7542b6f62075339c4" }
+source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "731e50555a51f0d8635992b0e60dc98cc47a58d7" }
 
 [[language]]
 name = "kotlin"
diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 741f5e544..6d0ec36d7 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -145,8 +145,9 @@
 ((atom) @constant.builtin.boolean
  (#match? @constant.builtin.boolean "^(true|false)$"))
 (atom) @string.special.symbol
-(string) @string
+[(string) (sigil)] @string
 (character) @constant.character
+(escape_sequence) @constant.character.escape
 
 (integer) @constant.numeric.integer
 (float) @constant.numeric.float

From 76e512f9445b2a26655248b46cf13413f9a6bbba Mon Sep 17 00:00:00 2001
From: Matt <matte.f@gmail.com>
Date: Fri, 16 Feb 2024 15:43:14 +0100
Subject: [PATCH 728/967] Remove unwrap on line option, preventing DAP crash
 (#9632)

* Remove unwrap on line option, preventing DAP crash, ref #4683

* Update to fall back to existing values for option fields
---
 helix-view/src/handlers/dap.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/helix-view/src/handlers/dap.rs b/helix-view/src/handlers/dap.rs
index e1437bef7..a5fa0c29c 100644
--- a/helix-view/src/handlers/dap.rs
+++ b/helix-view/src/handlers/dap.rs
@@ -226,10 +226,15 @@ impl Editor {
                                     breakpoints.iter().position(|b| b.id == breakpoint.id)
                                 {
                                     breakpoints[i].verified = breakpoint.verified;
-                                    breakpoints[i].message = breakpoint.message.clone();
-                                    breakpoints[i].line =
-                                        breakpoint.line.unwrap().saturating_sub(1); // TODO: no unwrap
-                                    breakpoints[i].column = breakpoint.column;
+                                    breakpoints[i].message = breakpoint
+                                        .message
+                                        .clone()
+                                        .or_else(|| breakpoints[i].message.take());
+                                    breakpoints[i].line = breakpoint
+                                        .line
+                                        .map_or(breakpoints[i].line, |line| line.saturating_sub(1));
+                                    breakpoints[i].column =
+                                        breakpoint.column.or(breakpoints[i].column);
                                 }
                             }
                         }

From 6ffe09e873821c7232d1da23ea4642214e42a1e7 Mon Sep 17 00:00:00 2001
From: Nick Condron <ncondron42@gmail.com>
Date: Sat, 17 Feb 2024 11:08:18 -0500
Subject: [PATCH 729/967] Fix Sonokai theme to better match original (#5379)

* Make sonokai palette perfectfully faithful

* Amend theme to better match original sonokai

Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)

* Make Sonokai special punctuation yellow
---
 runtime/themes/sonokai.toml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index f586be28d..4bbdb4dbe 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -6,24 +6,23 @@
 # License: MIT License
 
 "type" = "blue"
-"constant" = "purple"
+"constant" = "fg"
 "constant.numeric" = "purple"
 "constant.character.escape" = "orange"
 "string" = "yellow"
 "comment" = "grey"
 "variable" = "fg"
-"variable.builtin" = "orange"
+"variable.builtin" = "purple"
 "variable.parameter" = "fg"
-"variable.other.member" = "fg"
-"label" = "orange"
+"variable.other.member" = "orange"
+"label" = "red"
 "punctuation" = "grey"
-"punctuation.delimiter" = "grey"
-"punctuation.bracket" = "fg"
+"punctuation.special" = "yellow"
 "keyword" = "red"
-"operator" = "orange"
+"operator" = "red"
 "function" = "green"
-"function.builtin" = "blue"
-"function.macro" = "purple"
+"function.builtin" = "green"
+"function.macro" = "green"
 "tag" = "yellow"
 "namespace" = "blue"
 "attribute" = "purple"
@@ -48,12 +47,12 @@
 "markup.raw" = "green"
 
 "diff.plus" = "green"
-"diff.delta" = "orange"
+"diff.delta" = "blue"
 "diff.minus" = "red"
 
 "ui.background" = { bg = "bg0" }
 "ui.cursor" = { modifiers = ['reversed'] }
-"ui.cursor.match" = { fg = "orange", bg = "diff_yellow" }
+"ui.cursor.match" = { bg = "bg4" }
 "ui.cursor.insert" = { fg = "black", bg = "grey" }
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
 "ui.selection" = { bg = "bg5" }
@@ -73,7 +72,7 @@
 "ui.text.focus" = "green"
 "ui.menu" = { fg = "fg", bg = "bg2" }
 "ui.menu.selected" = { fg = "bg0", bg = "green" }
-"ui.virtual.whitespace" = { fg = "grey_dim" }
+"ui.virtual.whitespace" = "bg4" 
 "ui.virtual.ruler" = { bg = "bg3" }
 "ui.virtual.inlay-hint" = { fg = "grey_dim" }
 
@@ -92,11 +91,12 @@ error = { fg = 'red', bg = 'bg2', modifiers = ['bold'] }
 [palette]
 
 black = "#181819"
+bg_dim = "#222327"
 bg0 = "#2c2e34"
 bg1 = "#33353f"
 bg2 = "#363944"
 bg3 = "#3b3e48"
-bg4 = "#5C606A"
+bg4 = "#414550"
 bg5 = "#444852"
 bg_red = "#ff6077"
 diff_red = "#55393d"

From 3e963b3c1b5eb4b5cd7f33b8ef6d6642de210a9b Mon Sep 17 00:00:00 2001
From: Vivek Kethineni <35619837+uek-1@users.noreply.github.com>
Date: Sat, 17 Feb 2024 10:08:44 -0600
Subject: [PATCH 730/967] Add Rust fields as argument textobject (#9637)

* added field_declaration_list and field_initializer_list as parameter textobjects

* removed field_declaration_listt from textobjects.scm
---
 runtime/queries/rust/textobjects.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm
index 837f981e7..df26331d8 100644
--- a/runtime/queries/rust/textobjects.scm
+++ b/runtime/queries/rust/textobjects.scm
@@ -34,6 +34,9 @@
 (arguments
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
 
+(field_initializer_list  
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
 [
   (line_comment)
   (block_comment)

From 78c34194b5c83beb26ca04f12bf9d53fd5aba801 Mon Sep 17 00:00:00 2001
From: melted-brownie <66597133+melted-brownie@users.noreply.github.com>
Date: Sat, 17 Feb 2024 16:09:21 +0000
Subject: [PATCH 731/967] Improve textobjects for parameter/argument for Dart
 (#9644)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sébastien Blondiau <sebastien.blondiau@iot-d.com>
---
 runtime/queries/dart/textobjects.scm | 29 ++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/dart/textobjects.scm b/runtime/queries/dart/textobjects.scm
index 028276156..b88b97bc9 100644
--- a/runtime/queries/dart/textobjects.scm
+++ b/runtime/queries/dart/textobjects.scm
@@ -56,9 +56,34 @@
 
 (documentation_comment)+ @comment.around
 
-(formal_parameter) @parameter.inside
+(formal_parameter_list
+  (
+    (formal_parameter) @parameter.inside . ","? @parameter.around
+  ) @parameter.around
+)
+
+(optional_formal_parameters
+  (
+    (formal_parameter) @parameter.inside . ","? @parameter.around
+  ) @parameter.around
+)
+
+(arguments
+  (
+    [
+      (argument) @parameter.inside
+      (named_argument (label) . (_)* @parameter.inside)
+    ]
+    . ","? @parameter.around
+  ) @parameter.around
+)
 
-(formal_parameter_list) @parameter.around
+(type_arguments
+  (
+    ((_) . ("." . (_) @parameter.inside @parameter.around)?) @parameter.inside
+    . ","? @parameter.around
+  ) @parameter.around
+)
 
 (expression_statement
   ((identifier) @_name (#any-of? @_name "test" "testWidgets"))

From 64326698225999016300423c4b90f8a8c7b8f38b Mon Sep 17 00:00:00 2001
From: Vince Varga <vince.varga@serialdeveloper.com>
Date: Sun, 18 Feb 2024 15:55:21 +0100
Subject: [PATCH 732/967] Add tmux.conf as a bash file type (#9653)

* Add conf as a bash file type

Tmux and tmux.conf is used widely in software developer circles.

Having the tmux.conf file not have any syntax highlighting by default is (IMO) not ideal for an editor that otherwise "just works".

* Use tmux.conf glob instead of simply conf for tmux

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index bfa33bf58..78078ca58 100644
--- a/languages.toml
+++ b/languages.toml
@@ -860,6 +860,7 @@ file-types = [
   "tcshrc",
   "bashrc_Apple_Terminal",
   "zshrc_Apple_Terminal",
+  { glob = "tmux.conf" },
   { glob = ".bash_history" },
   { glob = ".bash_login" },
   { glob = ".bash_logout" },

From 9ab3f9d01a8ea4967f5a7e64a3f6c8f350674c18 Mon Sep 17 00:00:00 2001
From: AlexanderDickie <75994927+AlexanderDickie@users.noreply.github.com>
Date: Sun, 18 Feb 2024 23:13:04 +0000
Subject: [PATCH 733/967] Scroll cursor and page together (neovim-like
 scrolling) (#8015)

* neovim like scroll function

* clear line annotations outside of move_vertically/_visual

* add nvim scroll function to commands

* assign nvim-scroll to C-d and C-u (half page scrolls)

* dont remove backspace and space mapping

* move non-softwrap logic to seperate function, call this in nvim-scroll fn

* Revert "move non-softwrap logic to seperate function, call this in nvim-scroll fn"

This reverts commit e4905729c338a2260e6981f1d8fac022897b4191.

* Revert "clear line annotations outside of move_vertically/_visual"

This reverts commit 1df3fefe55afc840d1ab5094b2116d1127fc363f.

* add TODO for when inline diagnostics gets merged

* move nvim-scroll logic into scroll(), dont respect scrolloff

* run cargo fmt

* run cargo clippy

* update documenation for Ctrl-d and Ctrl-u remap
---
 book/src/keymap.md               | 28 ++++++-------
 helix-term/src/commands.rs       | 68 ++++++++++++++++++++++++++++----
 helix-term/src/keymap/default.rs | 12 +++---
 helix-term/src/ui/editor.rs      |  2 +-
 4 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index a3e41666f..ac84147cd 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -53,8 +53,8 @@ Normal mode is the default mode when you launch helix. You can return to it from
 | `End`                 | Move to the end of the line                        | `goto_line_end`             |
 | `Ctrl-b`, `PageUp`    | Move page up                                       | `page_up`                   |
 | `Ctrl-f`, `PageDown`  | Move page down                                     | `page_down`                 |
-| `Ctrl-u`              | Move half page up                                  | `half_page_up`              |
-| `Ctrl-d`              | Move half page down                                | `half_page_down`            |
+| `Ctrl-u`              | Move cursor and page half page up                  | `page_cursor_half_up`       |
+| `Ctrl-d`              | Move cursor and page half page down                | `page_cursor_half_down`     |
 | `Ctrl-i`              | Jump forward on the jumplist                       | `jump_forward`              |
 | `Ctrl-o`              | Jump backward on the jumplist                      | `jump_backward`             |
 | `Ctrl-s`              | Save the current selection to the jumplist         | `save_selection`            |
@@ -182,18 +182,18 @@ normal mode) is persistent and can be exited using the escape key. This is
 useful when you're simply looking over text and not actively editing it.
 
 
-| Key                  | Description                                               | Command             |
-| -----                | -----------                                               | -------             |
-| `z`, `c`             | Vertically center the line                                | `align_view_center` |
-| `t`                  | Align the line to the top of the screen                   | `align_view_top`    |
-| `b`                  | Align the line to the bottom of the screen                | `align_view_bottom` |
-| `m`                  | Align the line to the middle of the screen (horizontally) | `align_view_middle` |
-| `j`, `down`          | Scroll the view downwards                                 | `scroll_down`       |
-| `k`, `up`            | Scroll the view upwards                                   | `scroll_up`         |
-| `Ctrl-f`, `PageDown` | Move page down                                            | `page_down`         |
-| `Ctrl-b`, `PageUp`   | Move page up                                              | `page_up`           |
-| `Ctrl-d`             | Move half page down                                       | `half_page_down`    |
-| `Ctrl-u`             | Move half page up                                         | `half_page_up`      |
+| Key                  | Description                                               | Command                 |
+| -----                | -----------                                               | -------                 |
+| `z`, `c`             | Vertically center the line                                | `align_view_center`     |
+| `t`                  | Align the line to the top of the screen                   | `align_view_top`        |
+| `b`                  | Align the line to the bottom of the screen                | `align_view_bottom`     |
+| `m`                  | Align the line to the middle of the screen (horizontally) | `align_view_middle`     |
+| `j`, `down`          | Scroll the view downwards                                 | `scroll_down`           |
+| `k`, `up`            | Scroll the view upwards                                   | `scroll_up`             |
+| `Ctrl-f`, `PageDown` | Move page down                                            | `page_down`             |
+| `Ctrl-b`, `PageUp`   | Move page up                                              | `page_up`               |
+| `Ctrl-u`             | Move cursor and page half page up                         | `page_cursor_half_up`   |
+| `Ctrl-d`             | Move cursor and page half page down                       | `page_cursor_half_down` |
 
 #### Goto mode
 
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e46109c0f..51a1ede9b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -277,6 +277,10 @@ impl MappableCommand {
         page_down, "Move page down",
         half_page_up, "Move half page up",
         half_page_down, "Move half page down",
+        page_cursor_up, "Move page and cursor up",
+        page_cursor_down, "Move page and cursor down",
+        page_cursor_half_up, "Move page and cursor half up",
+        page_cursor_half_down, "Move page and cursor half down",
         select_all, "Select whole document",
         select_regex, "Select all regex matches inside selections",
         split_selection, "Split selections on regex matches",
@@ -1608,7 +1612,7 @@ fn switch_to_lowercase(cx: &mut Context) {
     });
 }
 
-pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
+pub fn scroll(cx: &mut Context, offset: usize, direction: Direction, sync_cursor: bool) {
     use Direction::*;
     let config = cx.editor.config();
     let (view, doc) = current!(cx.editor);
@@ -1628,7 +1632,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
     let doc_text = doc.text().slice(..);
     let viewport = view.inner_area(doc);
     let text_fmt = doc.text_format(viewport.width, None);
-    let 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,
@@ -1638,6 +1642,30 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
         &annotations,
     );
 
+    if sync_cursor {
+        let movement = match cx.editor.mode {
+            Mode::Select => Movement::Extend,
+            _ => Movement::Move,
+        };
+        // TODO: When inline diagnostics gets merged- 1. move_vertically_visual removes
+        // line annotations/diagnostics so the cursor may jump further than the view.
+        // 2. If the cursor lands on a complete line of virtual text, the cursor will
+        // jump a different distance than the view.
+        let selection = doc.selection(view.id).clone().transform(|range| {
+            move_vertically_visual(
+                doc_text,
+                range,
+                direction,
+                offset.unsigned_abs(),
+                movement,
+                &text_fmt,
+                &mut annotations,
+            )
+        });
+        doc.set_selection(view.id, selection);
+        return;
+    }
+
     let mut head;
     match direction {
         Forward => {
@@ -1688,25 +1716,49 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
 fn page_up(cx: &mut Context) {
     let view = view!(cx.editor);
     let offset = view.inner_height();
-    scroll(cx, offset, Direction::Backward);
+    scroll(cx, offset, Direction::Backward, false);
 }
 
 fn page_down(cx: &mut Context) {
     let view = view!(cx.editor);
     let offset = view.inner_height();
-    scroll(cx, offset, Direction::Forward);
+    scroll(cx, offset, Direction::Forward, false);
 }
 
 fn half_page_up(cx: &mut Context) {
     let view = view!(cx.editor);
     let offset = view.inner_height() / 2;
-    scroll(cx, offset, Direction::Backward);
+    scroll(cx, offset, Direction::Backward, false);
 }
 
 fn half_page_down(cx: &mut Context) {
     let view = view!(cx.editor);
     let offset = view.inner_height() / 2;
-    scroll(cx, offset, Direction::Forward);
+    scroll(cx, offset, Direction::Forward, false);
+}
+
+fn page_cursor_up(cx: &mut Context) {
+    let view = view!(cx.editor);
+    let offset = view.inner_height();
+    scroll(cx, offset, Direction::Backward, true);
+}
+
+fn page_cursor_down(cx: &mut Context) {
+    let view = view!(cx.editor);
+    let offset = view.inner_height();
+    scroll(cx, offset, Direction::Forward, true);
+}
+
+fn page_cursor_half_up(cx: &mut Context) {
+    let view = view!(cx.editor);
+    let offset = view.inner_height() / 2;
+    scroll(cx, offset, Direction::Backward, true);
+}
+
+fn page_cursor_half_down(cx: &mut Context) {
+    let view = view!(cx.editor);
+    let offset = view.inner_height() / 2;
+    scroll(cx, offset, Direction::Forward, true);
 }
 
 #[allow(deprecated)]
@@ -4856,11 +4908,11 @@ fn align_view_middle(cx: &mut Context) {
 }
 
 fn scroll_up(cx: &mut Context) {
-    scroll(cx, cx.count(), Direction::Backward);
+    scroll(cx, cx.count(), Direction::Backward, false);
 }
 
 fn scroll_down(cx: &mut Context) {
-    scroll(cx, cx.count(), Direction::Forward);
+    scroll(cx, cx.count(), Direction::Forward, false);
 }
 
 fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direction) {
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 763ed4ae7..92d6b5906 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -178,8 +178,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
         "esc" => normal_mode,
         "C-b" | "pageup" => page_up,
         "C-f" | "pagedown" => page_down,
-        "C-u" => half_page_up,
-        "C-d" => half_page_down,
+        "C-u" => page_cursor_half_up,
+        "C-d" => page_cursor_half_down,
 
         "C-w" => { "Window"
             "C-w" | "w" => rotate_view,
@@ -287,8 +287,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "j" | "down" => scroll_down,
             "C-b" | "pageup" => page_up,
             "C-f" | "pagedown" => page_down,
-            "C-u" | "backspace" => half_page_up,
-            "C-d" | "space" => half_page_down,
+            "C-u" | "backspace" => page_cursor_half_up,
+            "C-d" | "space" => page_cursor_half_down,
 
             "/" => search,
             "?" => rsearch,
@@ -304,8 +304,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "j" | "down" => scroll_down,
             "C-b" | "pageup" => page_up,
             "C-f" | "pagedown" => page_down,
-            "C-u" | "backspace" => half_page_up,
-            "C-d" | "space" => half_page_down,
+            "C-u" | "backspace" => page_cursor_half_up,
+            "C-d" | "space" => page_cursor_half_down,
 
             "/" => search,
             "?" => rsearch,
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index bb749d2e7..a87e6cbca 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1156,7 +1156,7 @@ impl EditorView {
                 }
 
                 let offset = config.scroll_lines.unsigned_abs();
-                commands::scroll(cxt, offset, direction);
+                commands::scroll(cxt, offset, direction, false);
 
                 cxt.editor.tree.focus = current_view;
                 cxt.editor.ensure_cursor_in_view(current_view);

From b950dea003750120f6e764afd5afd7b738aa6410 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy@zelinskie.com>
Date: Sun, 18 Feb 2024 18:19:26 -0500
Subject: [PATCH 734/967] add monokai soda theme (#9651)

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

diff --git a/runtime/themes/monokai_soda.toml b/runtime/themes/monokai_soda.toml
new file mode 100644
index 000000000..7e43247e3
--- /dev/null
+++ b/runtime/themes/monokai_soda.toml
@@ -0,0 +1,120 @@
+# Monokai Soda port for Helix (https://helix-editor.com)
+# Author : Jimmy Zelinskie <jimmy@zelinskie.com>
+
+# Syntax
+
+## Constants
+"constant" = "white"
+"constant.builtin" = "pink"
+"constant.character.escape" = "blue"
+"constant.numeric" = "purple"
+
+## Diagnostics
+"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { style = "curl", color = "pink" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "orange" } }
+"diagnostic.info" = { underline = { style = "curl", color = "white" } }
+
+## Diffs
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "pink"
+"diff.delta.moved" = "orange"
+
+## Functions
+"function" = "green"
+"function.macro" = "blue"
+"function.builtin" = "pink"
+"constructor" = "blue"
+
+## Keywords
+"keyword" = "pink"
+"keyword.directive" = "blue"
+
+## Punctuation
+"punctuation" = "gray"
+
+## Strings
+"string" = "yellow"
+
+## Types
+"type" = "blue"
+"type.builtin" = "pink"
+
+## Variables
+"variable"  = "white"
+"variable.builtin" = "pink"
+"variable.other.member" = "white"
+"variable.parameter" = "softorange"
+
+## Markup
+"markup.heading" = "green"
+"markup.bold" = { fg = "orange", modifiers = ["bold"] }
+"markup.italic" = { fg = "orange", modifiers = ["italic"] }
+"markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
+"markup.link.text" = "yellow"
+"markup.quote" = "green"
+
+## Misc
+"attribute" = "blue"
+"comment" = { fg = "gray", modifiers = ["italic"] }
+"error" = "pink"
+"hint" = "white"
+"info" = "white"
+"label" = "yellow"
+"module" = "softorange"
+"namespace" = "pink"
+"operator" = "pink"
+"special" = "softorange"
+"warning" = "orange"
+
+# Editor UI
+
+## Main
+"ui.background" = { bg = "background" }
+"ui.text" = "white"
+"ui.window" = { bg = "darkgray" }
+
+## Debug (TODO)
+
+## Menus
+"ui.menu" = { fg = "white", bg = "darkgray" }
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.popup" = { bg = "darkgray" }
+"ui.help" = { fg = "white", bg = "darkgray" }
+
+## Gutter
+"ui.linenr" = "darkgray"
+"ui.linenr.selected" = "orange"
+
+## Cursor
+"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "white", modifiers = ["reversed"] }
+"ui.selection" = { bg = "darkgray" }
+
+## Statusline
+"ui.statusline" = { bg = "darkgray" }
+"ui.statusline.inactive" = { fg = "white", bg = "darkgray" }
+"ui.statusline.normal" = { fg = "white", bg = "blue" }
+"ui.statusline.insert" = { fg = "white", bg = "green" }
+"ui.statusline.select" = { fg = "white", bg = "purple" }
+
+"ui.text.focus" = { fg = "yellow", modifiers = ["bold"] }
+"ui.virtual" = "darkgray"
+"ui.virtual.ruler" = { bg = "darkgray" }
+
+# Palette
+
+[palette]
+"purple" = "#AE81FF"
+"yellow" = "#E6DB74"
+"pink" = "#f92a72"
+"white" = "#cfcfc2"
+"gray" = "#75715e"
+"darkgray" = "#444444"
+"black" = "#222222"
+"blue" = "#66d9ef"
+"green" = "#a6e22e"
+"softorange" = "#f59762"
+"orange" = "#fd971f"
+"background" = "#191919"

From c72426cc874c70bfb5660b2866e634927e5fb4fd Mon Sep 17 00:00:00 2001
From: Malpha <mega.alpha100@gmail.com>
Date: Sun, 18 Feb 2024 23:19:44 +0000
Subject: [PATCH 735/967] Add docker-compose language (#9661)

* languages: add docker-compose language

it uses docker-compose-langserver as lsp
And yaml for syntax highlighting, indents and injections

* languages: add luajit as a shebang of lua

This helps to provide syntax highlighting and
other lua goodies when writing luajit

* book(update): run cargo xtask docgen

* since #8006 full filenames uses glob
---
 book/src/generated/lang-support.md            |  1 +
 languages.toml                                | 13 ++++++++++++-
 runtime/queries/docker-compose/highlights.scm |  1 +
 runtime/queries/docker-compose/indents.scm    |  1 +
 runtime/queries/docker-compose/injections.scm |  1 +
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/docker-compose/highlights.scm
 create mode 100644 runtime/queries/docker-compose/indents.scm
 create mode 100644 runtime/queries/docker-compose/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index bfe6d6b1e..a37e165f2 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -30,6 +30,7 @@
 | devicetree | ✓ |  |  |  |
 | dhall | ✓ | ✓ |  | `dhall-lsp-server` |
 | diff | ✓ |  |  |  |
+| docker-compose | ✓ |  | ✓ | `docker-compose-langserver` |
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | dot | ✓ |  |  | `dot-language-server` |
 | dtd | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 78078ca58..e52dcabbc 100644
--- a/languages.toml
+++ b/languages.toml
@@ -23,6 +23,7 @@ cuelsp = { command = "cuelsp" }
 dart = { command = "dart", args = ["language-server", "--client-id=helix"] }
 dhall-lsp-server = { command = "dhall-lsp-server" }
 docker-langserver = { command = "docker-langserver", args = ["--stdio"] }
+docker-compose-langserver = { command = "docker-compose-langserver", args = ["--stdio"]}
 dot-language-server = { command = "dot-language-server", args = ["--stdio"] }
 elixir-ls = { command = "elixir-ls", config = { elixirLS.dialyzerEnabled = false } }
 elm-language-server = { command = "elm-language-server" }
@@ -1092,7 +1093,7 @@ name = "lua"
 injection-regex = "lua"
 scope = "source.lua"
 file-types = ["lua"]
-shebangs = ["lua"]
+shebangs = ["lua", "luajit"]
 roots = [".luarc.json", ".luacheckrc", ".stylua.toml", "selene.toml", ".git"]
 comment-token = "--"
 indent = { tab-width = 2, unit = "  " }
@@ -1460,6 +1461,16 @@ language-servers = [ "docker-langserver" ]
 name = "dockerfile"
 source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62" }
 
+[[language]]
+name = "docker-compose"
+scope = "source.yaml.docker-compose"
+roots = ["docker-compose.yaml", "docker-compose.yml"]
+language-servers = [ "docker-compose-langserver" ]
+file-types = [{ glob = "docker-compose.yaml" }, { glob = "docker-compose.yml" }]
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+grammar = "yaml"
+
 [[language]]
 name = "git-commit"
 scope = "git.commitmsg"
diff --git a/runtime/queries/docker-compose/highlights.scm b/runtime/queries/docker-compose/highlights.scm
new file mode 100644
index 000000000..4ba254e82
--- /dev/null
+++ b/runtime/queries/docker-compose/highlights.scm
@@ -0,0 +1 @@
+; inherits: yaml
diff --git a/runtime/queries/docker-compose/indents.scm b/runtime/queries/docker-compose/indents.scm
new file mode 100644
index 000000000..4ba254e82
--- /dev/null
+++ b/runtime/queries/docker-compose/indents.scm
@@ -0,0 +1 @@
+; inherits: yaml
diff --git a/runtime/queries/docker-compose/injections.scm b/runtime/queries/docker-compose/injections.scm
new file mode 100644
index 000000000..4ba254e82
--- /dev/null
+++ b/runtime/queries/docker-compose/injections.scm
@@ -0,0 +1 @@
+; inherits: yaml

From 2dc9ce68ec84fd26e1489e3bac76fc5114d0023e Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Mon, 19 Feb 2024 01:46:13 +0200
Subject: [PATCH 736/967] Add textobject queries for Nix (#9659)

* Add textobject queries for Nix

* Add to lang-support.md
---
 book/src/generated/lang-support.md  | 2 +-
 runtime/queries/nix/textobjects.scm | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/nix/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a37e165f2..09ed4dac5 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -112,7 +112,7 @@
 | nasm | ✓ | ✓ |  |  |
 | nickel | ✓ |  | ✓ | `nls` |
 | nim | ✓ | ✓ | ✓ | `nimlangserver` |
-| nix | ✓ |  |  | `nil` |
+| nix | ✓ | ✓ |  | `nil` |
 | nu | ✓ |  |  | `nu` |
 | nunjucks | ✓ |  |  |  |
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
diff --git a/runtime/queries/nix/textobjects.scm b/runtime/queries/nix/textobjects.scm
new file mode 100644
index 000000000..1508d4c2b
--- /dev/null
+++ b/runtime/queries/nix/textobjects.scm
@@ -0,0 +1,9 @@
+(comment) @comment.inside
+(comment)+ @comment.around
+
+(formals
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(function_expression
+  body: (_) @function.inside) @function.around
+

From ebf155d6351a84dec010447af88b8246103537da Mon Sep 17 00:00:00 2001
From: Jaakko Paju <jaakko.paju@wolt.com>
Date: Mon, 19 Feb 2024 01:46:32 +0200
Subject: [PATCH 737/967] Add textobject queries for HCL (#9658)

* Add textobject queries for HCL

* Add to lang-support.md
---
 book/src/generated/lang-support.md  | 2 +-
 runtime/queries/hcl/textobjects.scm | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/hcl/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 09ed4dac5..f46c9f5e2 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -68,7 +68,7 @@
 | hare | ✓ |  |  |  |
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | haskell-persistent | ✓ |  |  |  |
-| hcl | ✓ |  | ✓ | `terraform-ls` |
+| hcl | ✓ | ✓ | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
 | hocon | ✓ |  | ✓ |  |
 | hoon | ✓ |  |  |  |
diff --git a/runtime/queries/hcl/textobjects.scm b/runtime/queries/hcl/textobjects.scm
new file mode 100644
index 000000000..1e6505876
--- /dev/null
+++ b/runtime/queries/hcl/textobjects.scm
@@ -0,0 +1,6 @@
+(comment) @comment.inside
+(comment)+ @comment.around
+
+(function_arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+

From 787cc36092a5d1a575697287d1d6ba08336a8a96 Mon Sep 17 00:00:00 2001
From: nkitsaini <74284503+nkitsaini@users.noreply.github.com>
Date: Mon, 19 Feb 2024 18:28:17 +0530
Subject: [PATCH 738/967] fix LSP ComplitionTriggerKind value for
 `TriggerKind::Auto` (#9660)

---
 helix-term/src/handlers/completion.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/handlers/completion.rs b/helix-term/src/handlers/completion.rs
index d71fd24fc..491ca5638 100644
--- a/helix-term/src/handlers/completion.rs
+++ b/helix-term/src/handlers/completion.rs
@@ -221,9 +221,17 @@ fn request_completion(
                                 .iter()
                                 .find(|&trigger| trigger_text.ends_with(trigger))
                         });
-                lsp::CompletionContext {
-                    trigger_kind: lsp::CompletionTriggerKind::TRIGGER_CHARACTER,
-                    trigger_character: trigger_char.cloned(),
+
+                if trigger_char.is_some() {
+                    lsp::CompletionContext {
+                        trigger_kind: lsp::CompletionTriggerKind::TRIGGER_CHARACTER,
+                        trigger_character: trigger_char.cloned(),
+                    }
+                } else {
+                    lsp::CompletionContext {
+                        trigger_kind: lsp::CompletionTriggerKind::INVOKED,
+                        trigger_character: None,
+                    }
                 }
             };
 

From cdef4f8a701f921c29fdfe66f104a2edac7fe05c Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Mon, 19 Feb 2024 22:08:26 +0900
Subject: [PATCH 739/967] Make mouse click extend selection in select mode
 (#5436)

* Make mouse click extend selection in select mode

* chore: better readability with `Option::take()`
---
 helix-term/src/ui/editor.rs | 40 ++++++++++++++++++++++++++-----------
 helix-view/src/editor.rs    |  7 +++++--
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index a87e6cbca..66f290a22 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1088,6 +1088,15 @@ impl EditorView {
                     if modifiers == KeyModifiers::ALT {
                         let selection = doc.selection(view_id).clone();
                         doc.set_selection(view_id, selection.push(Range::point(pos)));
+                    } else if editor.mode == Mode::Select {
+                        // Discards non-primary selections for consistent UX with normal mode
+                        let primary = doc.selection(view_id).primary().put_cursor(
+                            doc.text().slice(..),
+                            pos,
+                            true,
+                        );
+                        editor.mouse_down_range = Some(primary);
+                        doc.set_selection(view_id, Selection::single(primary.anchor, primary.head));
                     } else {
                         doc.set_selection(view_id, Selection::point(pos));
                     }
@@ -1171,19 +1180,26 @@ impl EditorView {
 
                 let (view, doc) = current!(cxt.editor);
 
-                if doc
-                    .selection(view.id)
-                    .primary()
-                    .slice(doc.text().slice(..))
-                    .len_chars()
-                    <= 1
-                {
-                    return EventResult::Ignored(None);
-                }
-
-                commands::MappableCommand::yank_main_selection_to_primary_clipboard.execute(cxt);
+                let should_yank = match cxt.editor.mouse_down_range.take() {
+                    Some(down_range) => doc.selection(view.id).primary() != down_range,
+                    None => {
+                        // This should not happen under normal cases. We fall back to the original
+                        // behavior of yanking on non-single-char selections.
+                        doc.selection(view.id)
+                            .primary()
+                            .slice(doc.text().slice(..))
+                            .len_chars()
+                            > 1
+                    }
+                };
 
-                EventResult::Consumed(None)
+                if should_yank {
+                    commands::MappableCommand::yank_main_selection_to_primary_clipboard
+                        .execute(cxt);
+                    EventResult::Consumed(None)
+                } else {
+                    EventResult::Ignored(None)
+                }
             }
 
             MouseEventKind::Up(MouseButton::Right) => {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 68b74cf00..fffbe6207 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -42,7 +42,7 @@ pub use helix_core::diagnostic::Severity;
 use helix_core::{
     auto_pairs::AutoPairs,
     syntax::{self, AutoPairConfig, IndentationHeuristic, LanguageServerFeature, SoftWrap},
-    Change, LineEnding, Position, Selection, NATIVE_LINE_ENDING,
+    Change, LineEnding, Position, Range, Selection, NATIVE_LINE_ENDING,
 };
 use helix_dap as dap;
 use helix_lsp::lsp;
@@ -964,6 +964,8 @@ pub struct Editor {
     /// times during rendering and should not be set by other functions.
     pub cursor_cache: Cell<Option<Option<Position>>>,
     pub handlers: Handlers,
+
+    pub mouse_down_range: Option<Range>,
 }
 
 pub type Motion = Box<dyn Fn(&mut Editor)>;
@@ -1080,6 +1082,7 @@ impl Editor {
             needs_redraw: false,
             cursor_cache: Cell::new(None),
             handlers,
+            mouse_down_range: None,
         }
     }
 
@@ -1978,7 +1981,7 @@ impl Editor {
 
     /// Switches the editor into normal mode.
     pub fn enter_normal_mode(&mut self) {
-        use helix_core::{graphemes, Range};
+        use helix_core::graphemes;
 
         if self.mode == Mode::Normal {
             return;

From 990378a46be2138b2f74799d1af8955390360c4e Mon Sep 17 00:00:00 2001
From: Volodymyr Chernetskyi <volodymyr_chernetskyi@goodyear.com>
Date: Mon, 19 Feb 2024 19:37:02 +0200
Subject: [PATCH 740/967] Add Groovy grammar (#9350)

* Add Groovy grammar

* Rewrite Neovim captures into Helix for Groovy

* Simplify Groovy injections

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

* Remove Neovim's spell from Groovy highlights

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

* Apply suggestions to languages.toml

* Escape backslash in groovy highlights.scm

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 13 ++++
 runtime/queries/groovy/highlights.scm | 96 +++++++++++++++++++++++++++
 runtime/queries/groovy/injections.scm |  2 +
 4 files changed, 112 insertions(+)
 create mode 100644 runtime/queries/groovy/highlights.scm
 create mode 100644 runtime/queries/groovy/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index f46c9f5e2..7aec37778 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -65,6 +65,7 @@
 | gotmpl | ✓ |  |  | `gopls` |
 | gowork | ✓ |  |  | `gopls` |
 | graphql | ✓ |  |  | `graphql-lsp` |
+| groovy | ✓ |  |  |  |
 | hare | ✓ |  |  |  |
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | haskell-persistent | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index e52dcabbc..1c4c61267 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3125,3 +3125,16 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "pkl"
 source = { git = "https://github.com/apple/tree-sitter-pkl", rev = "c03f04a313b712f8ab00a2d862c10b37318699ae" }
+
+[[language]]
+name = "groovy"
+language-id = "groovy"
+scope = "source.groovy"
+file-types = ["groovy", "jenkinsfile", { glob = "Jenkinsfile" },  { glob = "Jenkinsfile.*" }]
+shebangs = ["groovy"]
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "groovy"
+source = { git = "https://github.com/Decodetalkers/tree-sitter-groovy", rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec" }
diff --git a/runtime/queries/groovy/highlights.scm b/runtime/queries/groovy/highlights.scm
new file mode 100644
index 000000000..4e94ccd3a
--- /dev/null
+++ b/runtime/queries/groovy/highlights.scm
@@ -0,0 +1,96 @@
+(unit
+  (identifier) @variable)
+
+(string
+  (identifier) @variable)
+
+(escape_sequence) @constant.character.escape
+
+(block
+  (unit
+    (identifier) @namespace))
+
+(func
+  (identifier) @function)
+
+(number) @constant.numeric
+
+((identifier) @constant.builtin.boolean
+  (#any-of? @constant.builtin.boolean "true" "false"))
+
+((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"))
+
+(string) @string
+
+[
+  (line_comment)
+  (block_comment)
+] @comment
+
+((block_comment) @comment.block.documentation
+  (#match? @comment.block.documentation "^/[*][*][^*](?s:.)*[*]/$"))
+
+((line_comment) @comment.block.documentation
+  (#match? @comment.block.documentation "^///[^/]*.*$"))
+
+[
+  (operators)
+  (leading_key)
+] @operator
+
+["(" ")" "[" "]" "{" "}"]  @punctuation.bracket
diff --git a/runtime/queries/groovy/injections.scm b/runtime/queries/groovy/injections.scm
new file mode 100644
index 000000000..e4509a5fd
--- /dev/null
+++ b/runtime/queries/groovy/injections.scm
@@ -0,0 +1,2 @@
+([(line_comment) (block_comment)] @injection.content
+ (#set! injection.language "comment"))

From 27335476edc22c2da652c4636d9b1bae751fe22d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 17:06:40 +0100
Subject: [PATCH 741/967] build(deps): bump chrono from 0.4.33 to 0.4.34
 (#9673)

Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.33 to 0.4.34.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.33...v0.4.34)

---
updated-dependencies:
- dependency-name: chrono
  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 6f38f0034..2f8b1f97d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -168,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",

From d2aacb3e36d59fb6cef42cdc5bd317a3d15d1a0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 17:06:58 +0100
Subject: [PATCH 742/967] build(deps): bump anyhow from 1.0.79 to 1.0.80
 (#9675)

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

---
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 2f8b1f97d..32b5ad84a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,9 +62,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "arc-swap"

From cad0209e202a7513105639daa36c82578db4032d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 17:07:16 +0100
Subject: [PATCH 743/967] build(deps): bump textwrap from 0.16.0 to 0.16.1
 (#9674)

Bumps [textwrap](https://github.com/mgeisler/textwrap) from 0.16.0 to 0.16.1.
- [Release notes](https://github.com/mgeisler/textwrap/releases)
- [Changelog](https://github.com/mgeisler/textwrap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mgeisler/textwrap/compare/0.16.0...0.16.1)

---
updated-dependencies:
- dependency-name: textwrap
  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-core/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 32b5ad84a..2b8a25c85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2231,9 +2231,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
  "smawk",
  "unicode-linebreak",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index ca2f505c6..0b0dd7452 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -48,7 +48,7 @@ encoding_rs = "0.8"
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 
 etcetera = "0.8"
-textwrap = "0.16.0"
+textwrap = "0.16.1"
 
 nucleo.workspace = true
 parking_lot = "0.12"

From eca537615a554e3b1e379ba53d9f3e0654e67c70 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Wed, 21 Feb 2024 15:46:31 +0100
Subject: [PATCH 744/967] Use groovy support when editing Gradle files (#9681)

The Gradle build tool provides two DSLs for configuring builds. On is
based on Groovy and Gradle build files written in Gradle Groovy DSL use
*.gradle file ending.

This change adds `gradle` to the supported file types of the groovy
language configuration.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 1c4c61267..b158606b0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3130,7 +3130,7 @@ source = { git = "https://github.com/apple/tree-sitter-pkl", rev = "c03f04a313b7
 name = "groovy"
 language-id = "groovy"
 scope = "source.groovy"
-file-types = ["groovy", "jenkinsfile", { glob = "Jenkinsfile" },  { glob = "Jenkinsfile.*" }]
+file-types = ["gradle", "groovy", "jenkinsfile", { glob = "Jenkinsfile" },  { glob = "Jenkinsfile.*" }]
 shebangs = ["groovy"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }

From 98ebeeebd8c7462409f82d34ff4ac0a7ae9116c7 Mon Sep 17 00:00:00 2001
From: Abderrahmane TAHRI JOUTI <302837+atahrijouti@users.noreply.github.com>
Date: Wed, 21 Feb 2024 15:47:14 +0100
Subject: [PATCH 745/967] Cyan Light theme : Add License and Author (#9688)

* Cyan Light theme : Add License and Author

* Add License

Copy  license from https://github.com/OlyaB/CyanTheme/blob/master/LICENSE

* better credits to original author
---
 runtime/themes/cyan_light.toml             | 10 +++++++---
 runtime/themes/licenses/cyan_light.LICENSE | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 runtime/themes/licenses/cyan_light.LICENSE

diff --git a/runtime/themes/cyan_light.toml b/runtime/themes/cyan_light.toml
index 45cb6539d..a35ad5847 100644
--- a/runtime/themes/cyan_light.toml
+++ b/runtime/themes/cyan_light.toml
@@ -1,6 +1,10 @@
-# An approximation/port of the Cyan Light Theme from Jetbrains
-# 
-# Original Color Scheme here https://plugins.jetbrains.com/plugin/12102-cyan-light-theme
+# Cyan Light
+# Adapted from JetBrains' Cyan Light Theme https://plugins.jetbrains.com/plugin/12102-cyan-light-theme 
+# Author: Abderrahmane Tahri Jouti <tj.abderrahmane@gmail.com>
+
+# Original Author : Olga Berdnikova
+# LICENSE : MIT
+# Source: https://github.com/OlyaB/CyanTheme
 
 "attribute" = "blue"
 "type" = "shade07"
diff --git a/runtime/themes/licenses/cyan_light.LICENSE b/runtime/themes/licenses/cyan_light.LICENSE
new file mode 100644
index 000000000..3a4a2fb87
--- /dev/null
+++ b/runtime/themes/licenses/cyan_light.LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 CloudCannon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From b7b6f300841bb61d8833fee1c58d0e3670849b61 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 19 Feb 2024 10:07:03 -0500
Subject: [PATCH 746/967] Use a hook for resolving completion items

Previously we used the IdleTimeout event to trigger LSP
`completion/resolveItem` requests. We can now refactor this to use an
event system hook instead and lower the timeout.
---
 helix-lsp/src/client.rs         |   5 +-
 helix-term/src/ui/completion.rs | 156 ++++++++++++++++++++------------
 helix-term/src/ui/editor.rs     |   8 --
 3 files changed, 100 insertions(+), 69 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 0d3a2a56e..8d03d7992 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -1017,7 +1017,7 @@ impl Client {
     pub fn resolve_completion_item(
         &self,
         completion_item: lsp::CompletionItem,
-    ) -> Option<impl Future<Output = Result<Value>>> {
+    ) -> Option<impl Future<Output = Result<lsp::CompletionItem>>> {
         let capabilities = self.capabilities.get().unwrap();
 
         // Return early if the server does not support resolving completion items.
@@ -1029,7 +1029,8 @@ impl Client {
             _ => return None,
         }
 
-        Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
+        let res = self.call::<lsp::request::ResolveCompletionItem>(completion_item);
+        Some(async move { Ok(serde_json::from_value(res.await?)?) })
     }
 
     pub fn resolve_code_action(
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 48d97fbd8..6cbb5b109 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,7 +1,9 @@
 use crate::{
     compositor::{Component, Context, Event, EventResult},
     handlers::trigger_auto_completion,
+    job,
 };
+use helix_event::AsyncHook;
 use helix_view::{
     document::SavePoint,
     editor::CompleteAction,
@@ -10,14 +12,14 @@ use helix_view::{
     theme::{Modifier, Style},
     ViewId,
 };
+use tokio::time::Instant;
 use tui::{buffer::Buffer as Surface, text::Span};
 
-use std::{borrow::Cow, sync::Arc};
+use std::{borrow::Cow, sync::Arc, time::Duration};
 
 use helix_core::{chars, Change, Transaction};
 use helix_view::{graphics::Rect, Document, Editor};
 
-use crate::commands;
 use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent};
 
 use helix_lsp::{lsp, util, OffsetEncoding};
@@ -102,6 +104,7 @@ pub struct Completion {
     #[allow(dead_code)]
     trigger_offset: usize,
     filter: String,
+    resolve_handler: tokio::sync::mpsc::Sender<CompletionItem>,
 }
 
 impl Completion {
@@ -368,6 +371,7 @@ impl Completion {
             // TODO: expand nucleo api to allow moving straight to a Utf32String here
             // and avoid allocation during matching
             filter: String::from(fragment),
+            resolve_handler: ResolveHandler::default().spawn(),
         };
 
         // need to recompute immediately in case start_offset != trigger_offset
@@ -379,6 +383,8 @@ impl Completion {
         completion
     }
 
+    /// Synchronously resolve the given completion item. This is used when
+    /// accepting a completion.
     fn resolve_completion_item(
         language_server: &helix_lsp::Client,
         completion_item: lsp::CompletionItem,
@@ -386,7 +392,7 @@ impl Completion {
         let future = language_server.resolve_completion_item(completion_item)?;
         let response = helix_lsp::block_on(future);
         match response {
-            Ok(value) => serde_json::from_value(value).ok(),
+            Ok(item) => Some(item),
             Err(err) => {
                 log::error!("Failed to resolve completion item: {}", err);
                 None
@@ -420,62 +426,6 @@ impl Completion {
         self.popup.contents_mut().replace_option(old_item, new_item);
     }
 
-    /// Asynchronously requests that the currently selection completion item is
-    /// resolved through LSP `completionItem/resolve`.
-    pub fn ensure_item_resolved(&mut self, cx: &mut commands::Context) -> bool {
-        // > If computing full completion items is expensive, servers can additionally provide a
-        // > handler for the completion item resolve request. ...
-        // > A typical use case is for example: the `textDocument/completion` request doesn't fill
-        // > in the `documentation` property for returned completion items since it is expensive
-        // > to compute. When the item is selected in the user interface then a
-        // > 'completionItem/resolve' request is sent with the selected completion item as a parameter.
-        // > The returned completion item should have the documentation property filled in.
-        // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion
-        let current_item = match self.popup.contents().selection() {
-            Some(item) if !item.resolved => item.clone(),
-            _ => return false,
-        };
-
-        let Some(language_server) = cx
-            .editor
-            .language_server_by_id(current_item.language_server_id)
-        else {
-            return false;
-        };
-
-        // This method should not block the compositor so we handle the response asynchronously.
-        let Some(future) = language_server.resolve_completion_item(current_item.item.clone())
-        else {
-            return false;
-        };
-
-        cx.callback(
-            future,
-            move |_editor, compositor, response: Option<lsp::CompletionItem>| {
-                let resolved_item = match response {
-                    Some(item) => item,
-                    None => return,
-                };
-
-                if let Some(completion) = &mut compositor
-                    .find::<crate::ui::EditorView>()
-                    .unwrap()
-                    .completion
-                {
-                    let resolved_item = CompletionItem {
-                        item: resolved_item,
-                        language_server_id: current_item.language_server_id,
-                        resolved: true,
-                    };
-
-                    completion.replace_item(current_item, resolved_item);
-                }
-            },
-        );
-
-        true
-    }
-
     pub fn area(&mut self, viewport: Rect, editor: &Editor) -> Rect {
         self.popup.area(viewport, editor)
     }
@@ -498,6 +448,9 @@ impl Component for Completion {
             Some(option) => option,
             None => return,
         };
+        if !option.resolved {
+            helix_event::send_blocking(&self.resolve_handler, option.clone());
+        }
         // need to render:
         // option.detail
         // ---
@@ -599,3 +552,88 @@ impl Component for Completion {
         markdown_doc.render(doc_area, surface, cx);
     }
 }
+
+/// A hook for resolving incomplete completion items.
+///
+/// From the [LSP spec](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion):
+///
+/// > If computing full completion items is expensive, servers can additionally provide a
+/// > handler for the completion item resolve request. ...
+/// > A typical use case is for example: the `textDocument/completion` request doesn't fill
+/// > in the `documentation` property for returned completion items since it is expensive
+/// > to compute. When the item is selected in the user interface then a
+/// > 'completionItem/resolve' request is sent with the selected completion item as a parameter.
+/// > The returned completion item should have the documentation property filled in.
+#[derive(Debug, Default)]
+struct ResolveHandler {
+    trigger: Option<CompletionItem>,
+    request: Option<helix_event::CancelTx>,
+}
+
+impl AsyncHook for ResolveHandler {
+    type Event = CompletionItem;
+
+    fn handle_event(
+        &mut self,
+        item: Self::Event,
+        timeout: Option<tokio::time::Instant>,
+    ) -> Option<tokio::time::Instant> {
+        if self
+            .trigger
+            .as_ref()
+            .is_some_and(|trigger| trigger == &item)
+        {
+            timeout
+        } else {
+            self.trigger = Some(item);
+            self.request = None;
+            Some(Instant::now() + Duration::from_millis(150))
+        }
+    }
+
+    fn finish_debounce(&mut self) {
+        let Some(item) = self.trigger.take() else { return };
+        let (tx, rx) = helix_event::cancelation();
+        self.request = Some(tx);
+        job::dispatch_blocking(move |editor, _| resolve_completion_item(editor, item, rx))
+    }
+}
+
+fn resolve_completion_item(
+    editor: &mut Editor,
+    item: CompletionItem,
+    cancel: helix_event::CancelRx,
+) {
+    let Some(language_server) = editor.language_server_by_id(item.language_server_id) else {
+        return;
+    };
+
+    let Some(future) = language_server.resolve_completion_item(item.item.clone()) else {
+        return;
+    };
+
+    tokio::spawn(async move {
+        match helix_event::cancelable_future(future, cancel).await {
+            Some(Ok(resolved_item)) => {
+                job::dispatch(move |_, compositor| {
+                    if let Some(completion) = &mut compositor
+                        .find::<crate::ui::EditorView>()
+                        .unwrap()
+                        .completion
+                    {
+                        let resolved_item = CompletionItem {
+                            item: resolved_item,
+                            language_server_id: item.language_server_id,
+                            resolved: true,
+                        };
+
+                        completion.replace_item(item, resolved_item);
+                    };
+                })
+                .await
+            }
+            Some(Err(err)) => log::error!("completion resolve request failed: {err}"),
+            None => (),
+        }
+    });
+}
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 66f290a22..15a7262a8 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1027,14 +1027,6 @@ impl EditorView {
     pub fn handle_idle_timeout(&mut self, cx: &mut commands::Context) -> EventResult {
         commands::compute_inlay_hints_for_all_views(cx.editor, cx.jobs);
 
-        if let Some(completion) = &mut self.completion {
-            return if completion.ensure_item_resolved(cx) {
-                EventResult::Consumed(None)
-            } else {
-                EventResult::Ignored(None)
-            };
-        }
-
         EventResult::Ignored(None)
     }
 }

From 7100ed4efc2207a9d7a45ce6e9550564e091f508 Mon Sep 17 00:00:00 2001
From: wr7 <winterred7@gmail.com>
Date: Fri, 23 Feb 2024 09:46:41 -0600
Subject: [PATCH 747/967] Properly handle spaces in filenames in bash
 autocomplete (#9702)

---
 contrib/completion/hx.bash | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/completion/hx.bash b/contrib/completion/hx.bash
index 01b42deb6..6ef0329e4 100644
--- a/contrib/completion/hx.bash
+++ b/contrib/completion/hx.bash
@@ -5,19 +5,20 @@ _hx() {
 	# $1 command name
 	# $2 word being completed
 	# $3 word preceding
-	COMPREPLY=()
 
 	case "$3" in
 	-g | --grammar)
-		COMPREPLY=($(compgen -W "fetch build" -- $2))
+		COMPREPLY="$(compgen -W "fetch build" -- $2)"
 		;;
 	--health)
 		local languages=$(hx --health |tail -n '+7' |awk '{print $1}' |sed 's/\x1b\[[0-9;]*m//g')
-		COMPREPLY=($(compgen -W "$languages" -- $2))
+		COMPREPLY="$(compgen -W "$languages" -- $2)"
 		;;
 	*)
-		COMPREPLY=($(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- $2))
+		COMPREPLY="$(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- $2)"
 		;;
 	esac
-} && complete -o filenames -F _hx hx
 
+	local IFS=$'\n'
+	COMPREPLY=($COMPREPLY)
+} && complete -o filenames -F _hx hx

From 03623f2f407d592c38d21e085ae1fb2e1aa1ea22 Mon Sep 17 00:00:00 2001
From: Jake Low <hello@jakelow.com>
Date: Fri, 23 Feb 2024 18:53:16 -0800
Subject: [PATCH 748/967] Add osm and osc extensions to xml language filetypes
 (#9697)

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

diff --git a/languages.toml b/languages.toml
index b158606b0..ad2e66589 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2371,6 +2371,8 @@ file-types = [
   "menu",
   "mxml",
   "nuspec",
+  "osc",
+  "osm",
   "pt",
   "publishsettings",
   "pubxml",

From 38484f33e5298b2764eb9afd3bf6a60f1facc260 Mon Sep 17 00:00:00 2001
From: wr7 <winterred7@gmail.com>
Date: Fri, 23 Feb 2024 20:54:40 -0600
Subject: [PATCH 749/967] Completely fix bash autocomplete handling of
 filenames with spaces (#9708)

---
 contrib/completion/hx.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/hx.bash b/contrib/completion/hx.bash
index 6ef0329e4..62ca029bf 100644
--- a/contrib/completion/hx.bash
+++ b/contrib/completion/hx.bash
@@ -8,14 +8,14 @@ _hx() {
 
 	case "$3" in
 	-g | --grammar)
-		COMPREPLY="$(compgen -W "fetch build" -- $2)"
+		COMPREPLY="$(compgen -W 'fetch build' -- $2)"
 		;;
 	--health)
 		local languages=$(hx --health |tail -n '+7' |awk '{print $1}' |sed 's/\x1b\[[0-9;]*m//g')
-		COMPREPLY="$(compgen -W "$languages" -- $2)"
+		COMPREPLY="$(compgen -W """$languages""" -- $2)"
 		;;
 	*)
-		COMPREPLY="$(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- $2)"
+		COMPREPLY="$(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- """$2""")"
 		;;
 	esac
 

From ec9efdef3b2f613a86098058f5705e7863e375e2 Mon Sep 17 00:00:00 2001
From: DS/Charlie <82801887+ds-cbo@users.noreply.github.com>
Date: Sat, 24 Feb 2024 04:28:25 +0100
Subject: [PATCH 750/967] Bump tree-sitter-sql (#9634)

---
 languages.toml                     | 2 +-
 runtime/queries/sql/highlights.scm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/languages.toml b/languages.toml
index ad2e66589..112333ea9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1825,7 +1825,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "da2d1eff425b146d3c8cab7be8dfa98b11d896dc" }
 
 [[language]]
 name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index 09b07489e..e575debc5 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -24,20 +24,20 @@
 (term
   alias: (identifier) @variable.parameter)
 
-(term
+((term
    value: (cast
     name: (keyword_cast) @function.builtin
-    parameter: [(literal)]?))
+    parameter: [(literal)]?)))
 
 (literal) @string
 (comment) @comment.line
 (marginalia) @comment.block
 
 ((literal) @constant.numeric.integer
-  (#match? @constant.numeric.integer "^-?\\d+$"))
+   (#match? @constant.numeric.integer "^[-+]?\\d+$"))
 
 ((literal) @constant.numeric.float
-  (#match? @constant.numeric.float "^-?\\d*\\.\\d*$"))
+  (#match? @constant.numeric.float "^[-+]?\\d*\\.\\d*$"))
 
 (parameter) @variable.parameter
 

From 6db666fce1fb4627c06d147554b8e1eb9970619e Mon Sep 17 00:00:00 2001
From: Mo <76752051+mo8it@users.noreply.github.com>
Date: Sat, 24 Feb 2024 16:59:11 +0100
Subject: [PATCH 751/967] Optimization of tilde expansion (#9709)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use next and avoid a redundant prefix strip

* Avoid allocations

Especially when `expand_tilde` is claled on a path
that doesn't contain a tilde.

* Add a test

* Use Into<Cow<…>>

* Put the expand_tilde test at the end of the file

* Remove unused importsw
---
 helix-loader/src/lib.rs          |  2 +-
 helix-stdx/src/path.rs           | 59 +++++++++++++++++++++++++-------
 helix-term/src/commands/typed.rs | 14 ++++----
 helix-term/src/ui/mod.rs         |  4 +--
 4 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index f8fac6703..93488e452 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -53,7 +53,7 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
     rt_dirs.push(conf_rt_dir);
 
     if let Ok(dir) = std::env::var("HELIX_RUNTIME") {
-        let dir = path::expand_tilde(dir);
+        let dir = path::expand_tilde(Path::new(&dir));
         rt_dirs.push(path::normalize(dir));
     }
 
diff --git a/helix-stdx/src/path.rs b/helix-stdx/src/path.rs
index 5746657c3..1dc4d0b24 100644
--- a/helix-stdx/src/path.rs
+++ b/helix-stdx/src/path.rs
@@ -1,6 +1,9 @@
 pub use etcetera::home_dir;
 
-use std::path::{Component, Path, PathBuf};
+use std::{
+    borrow::Cow,
+    path::{Component, Path, PathBuf},
+};
 
 use crate::env::current_working_dir;
 
@@ -19,19 +22,22 @@ pub fn fold_home_dir(path: &Path) -> PathBuf {
 /// Expands tilde `~` into users home directory if available, otherwise returns the path
 /// unchanged. The tilde will only be expanded when present as the first component of the path
 /// and only slash follows it.
-pub fn expand_tilde(path: impl AsRef<Path>) -> PathBuf {
-    let path = path.as_ref();
-    let mut components = path.components().peekable();
-    if let Some(Component::Normal(c)) = components.peek() {
-        if c == &"~" {
-            if let Ok(home) = home_dir() {
-                // it's ok to unwrap, the path starts with `~`
-                return home.join(path.strip_prefix("~").unwrap());
+pub fn expand_tilde<'a, P>(path: P) -> Cow<'a, Path>
+where
+    P: Into<Cow<'a, Path>>,
+{
+    let path = path.into();
+    let mut components = path.components();
+    if let Some(Component::Normal(c)) = components.next() {
+        if c == "~" {
+            if let Ok(mut buf) = home_dir() {
+                buf.push(components);
+                return Cow::Owned(buf);
             }
         }
     }
 
-    path.to_path_buf()
+    path
 }
 
 /// Normalize a path without resolving symlinks.
@@ -109,9 +115,9 @@ pub fn normalize(path: impl AsRef<Path>) -> PathBuf {
 /// This function is used instead of [`std::fs::canonicalize`] because we don't want to verify
 /// here if the path exists, just normalize it's components.
 pub fn canonicalize(path: impl AsRef<Path>) -> PathBuf {
-    let path = expand_tilde(path);
+    let path = expand_tilde(path.as_ref());
     let path = if path.is_relative() {
-        current_working_dir().join(path)
+        Cow::Owned(current_working_dir().join(path))
     } else {
         path
     };
@@ -183,3 +189,32 @@ pub fn get_truncated_path(path: impl AsRef<Path>) -> PathBuf {
     ret.push(file);
     ret
 }
+
+#[cfg(test)]
+mod tests {
+    use std::{
+        ffi::OsStr,
+        path::{Component, Path},
+    };
+
+    use crate::path;
+
+    #[test]
+    fn expand_tilde() {
+        for path in ["~", "~/foo"] {
+            let expanded = path::expand_tilde(Path::new(path));
+
+            let tilde = Component::Normal(OsStr::new("~"));
+
+            let mut component_count = 0;
+            for component in expanded.components() {
+                // No tilde left.
+                assert_ne!(component, tilde);
+                component_count += 1;
+            }
+
+            // The path was at least expanded to something.
+            assert_ne!(component_count, 0);
+        }
+    }
+}
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index b7ceeba59..3d7ea3fc8 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -110,14 +110,14 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     ensure!(!args.is_empty(), "wrong argument count");
     for arg in args {
         let (path, pos) = args::parse_file(arg);
-        let path = helix_stdx::path::expand_tilde(&path);
+        let path = helix_stdx::path::expand_tilde(path);
         // If the path is a directory, open a file picker on that directory and update the status
         // message
         if let Ok(true) = std::fs::canonicalize(&path).map(|p| p.is_dir()) {
             let callback = async move {
                 let call: job::Callback = job::Callback::EditorCompositor(Box::new(
                     move |editor: &mut Editor, compositor: &mut Compositor| {
-                        let picker = ui::file_picker(path, &editor.config());
+                        let picker = ui::file_picker(path.into_owned(), &editor.config());
                         compositor.push(Box::new(overlaid(picker)));
                     },
                 ));
@@ -1078,11 +1078,11 @@ fn change_current_directory(
         return Ok(());
     }
 
-    let dir = helix_stdx::path::expand_tilde(
-        args.first()
-            .context("target directory not provided")?
-            .as_ref(),
-    );
+    let dir = args
+        .first()
+        .context("target directory not provided")?
+        .as_ref();
+    let dir = helix_stdx::path::expand_tilde(Path::new(dir));
 
     helix_stdx::env::set_current_working_dir(dir)?;
 
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index d27e83553..0873116cb 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -428,9 +428,9 @@ pub mod completers {
                 path
             } else {
                 match path.parent() {
-                    Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
+                    Some(path) if !path.as_os_str().is_empty() => Cow::Borrowed(path),
                     // Path::new("h")'s parent is Some("")...
-                    _ => helix_stdx::env::current_working_dir(),
+                    _ => Cow::Owned(helix_stdx::env::current_working_dir()),
                 }
             };
 

From dfa5382c51978c6a582d4586c65aa0f677be2ee8 Mon Sep 17 00:00:00 2001
From: Ryan Mehri <52933714+rmehri01@users.noreply.github.com>
Date: Sun, 25 Feb 2024 02:37:54 -0800
Subject: [PATCH 752/967] Don't run scheduled builds on forks (#9718)

---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d47c2088..7ba46ce56 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,6 +12,7 @@ jobs:
   check:
     name: Check (msrv)
     runs-on: ubuntu-latest
+    if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -31,6 +32,7 @@ jobs:
   test:
     name: Test Suite
     runs-on: ${{ matrix.os }}
+    if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
     env:
       RUST_BACKTRACE: 1
       HELIX_LOG_LEVEL: info
@@ -65,6 +67,7 @@ jobs:
   lints:
     name: Lints
     runs-on: ubuntu-latest
+    if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -92,6 +95,7 @@ jobs:
   docs:
     name: Docs
     runs-on: ubuntu-latest
+    if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

From 8141a4a1ab78084df94c19e6225fc3c64a05b88f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Aug 2023 13:32:17 -0500
Subject: [PATCH 753/967] LSP: Key diagnostics off file path instead of URI

URIs need to be normalized to be comparable. For example a language
server could send a URI for a path containing '+' as '%2B' but we might
encode this in something like 'Document::url' as just '+'. We can
normalize the URI straight into a PathBuf though since this is the only
value we compare these diagnostics URIs against. This also covers
edge-cases like windows drive letter capitalization.
---
 helix-term/src/application.rs  |  6 +--
 helix-term/src/commands/lsp.rs | 72 ++++++++++++++++------------------
 helix-view/src/editor.rs       |  9 ++---
 3 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 30df3981c..0ef200c2f 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -753,9 +753,7 @@ impl Application {
                             let lang_conf = doc.language.clone();
 
                             if let Some(lang_conf) = &lang_conf {
-                                if let Some(old_diagnostics) =
-                                    self.editor.diagnostics.get(&params.uri)
-                                {
+                                if let Some(old_diagnostics) = self.editor.diagnostics.get(&path) {
                                     if !lang_conf.persistent_diagnostic_sources.is_empty() {
                                         // Sort diagnostics first by severity and then by line numbers.
                                         // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
@@ -788,7 +786,7 @@ impl Application {
                         // Insert the original lsp::Diagnostics here because we may have no open document
                         // for diagnosic message and so we can't calculate the exact position.
                         // When using them later in the diagnostics picker, we calculate them on-demand.
-                        let diagnostics = match self.editor.diagnostics.entry(params.uri) {
+                        let diagnostics = match self.editor.diagnostics.entry(path) {
                             Entry::Occupied(o) => {
                                 let current_diagnostics = o.into_mut();
                                 // there may entries of other language servers, which is why we can't overwrite the whole entry
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index a1f7bf17d..a3168dc2d 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -38,7 +38,7 @@ use std::{
     collections::{BTreeMap, HashSet},
     fmt::Write,
     future::Future,
-    path::PathBuf,
+    path::{Path, PathBuf},
 };
 
 /// Gets the first language server that is attached to a document which supports a specific feature.
@@ -134,7 +134,7 @@ struct DiagnosticStyles {
 }
 
 struct PickerDiagnostic {
-    url: lsp::Url,
+    path: PathBuf,
     diag: lsp::Diagnostic,
     offset_encoding: OffsetEncoding,
 }
@@ -167,8 +167,7 @@ impl ui::menu::Item for PickerDiagnostic {
         let path = match format {
             DiagnosticsFormat::HideSourcePath => String::new(),
             DiagnosticsFormat::ShowSourcePath => {
-                let file_path = self.url.to_file_path().unwrap();
-                let path = path::get_truncated_path(file_path);
+                let path = path::get_truncated_path(&self.path);
                 format!("{}: ", path.to_string_lossy())
             }
         };
@@ -208,24 +207,33 @@ fn jump_to_location(
             return;
         }
     };
+    jump_to_position(editor, &path, location.range, offset_encoding, action);
+}
 
-    let doc = match editor.open(&path, action) {
+fn jump_to_position(
+    editor: &mut Editor,
+    path: &Path,
+    range: lsp::Range,
+    offset_encoding: OffsetEncoding,
+    action: Action,
+) {
+    let doc = match editor.open(path, action) {
         Ok(id) => doc_mut!(editor, &id),
         Err(err) => {
-            let err = format!("failed to open path: {:?}: {:?}", location.uri, err);
+            let err = format!("failed to open path: {:?}: {:?}", path, err);
             editor.set_error(err);
             return;
         }
     };
     let view = view_mut!(editor);
     // TODO: convert inside server
-    let new_range =
-        if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {
-            new_range
-        } else {
-            log::warn!("lsp position out of bounds - {:?}", location.range);
-            return;
-        };
+    let new_range = if let Some(new_range) = lsp_range_to_range(doc.text(), range, offset_encoding)
+    {
+        new_range
+    } else {
+        log::warn!("lsp position out of bounds - {:?}", range);
+        return;
+    };
     // we flip the range so that the cursor sits on the start of the symbol
     // (for example start of the function).
     doc.set_selection(view.id, Selection::single(new_range.head, new_range.anchor));
@@ -258,21 +266,20 @@ enum DiagnosticsFormat {
 
 fn diag_picker(
     cx: &Context,
-    diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
-    _current_path: Option<lsp::Url>,
+    diagnostics: BTreeMap<PathBuf, Vec<(lsp::Diagnostic, usize)>>,
     format: DiagnosticsFormat,
 ) -> Picker<PickerDiagnostic> {
     // TODO: drop current_path comparison and instead use workspace: bool flag?
 
     // flatten the map to a vec of (url, diag) pairs
     let mut flat_diag = Vec::new();
-    for (url, diags) in diagnostics {
+    for (path, diags) in diagnostics {
         flat_diag.reserve(diags.len());
 
         for (diag, ls) in diags {
             if let Some(ls) = cx.editor.language_server_by_id(ls) {
                 flat_diag.push(PickerDiagnostic {
-                    url: url.clone(),
+                    path: path.clone(),
                     diag,
                     offset_encoding: ls.offset_encoding(),
                 });
@@ -292,22 +299,17 @@ fn diag_picker(
         (styles, format),
         move |cx,
               PickerDiagnostic {
-                  url,
+                  path,
                   diag,
                   offset_encoding,
               },
               action| {
-            jump_to_location(
-                cx.editor,
-                &lsp::Location::new(url.clone(), diag.range),
-                *offset_encoding,
-                action,
-            )
+            jump_to_position(cx.editor, path, diag.range, *offset_encoding, action)
         },
     )
-    .with_preview(move |_editor, PickerDiagnostic { url, diag, .. }| {
-        let location = lsp::Location::new(url.clone(), diag.range);
-        Some(location_to_file_location(&location))
+    .with_preview(move |_editor, PickerDiagnostic { path, diag, .. }| {
+        let line = Some((diag.range.start.line as usize, diag.range.end.line as usize));
+        Some((path.clone().into(), line))
     })
     .truncate_start(false)
 }
@@ -470,17 +472,16 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
 
 pub fn diagnostics_picker(cx: &mut Context) {
     let doc = doc!(cx.editor);
-    if let Some(current_url) = doc.url() {
+    if let Some(current_path) = doc.path() {
         let diagnostics = cx
             .editor
             .diagnostics
-            .get(&current_url)
+            .get(current_path)
             .cloned()
             .unwrap_or_default();
         let picker = diag_picker(
             cx,
-            [(current_url.clone(), diagnostics)].into(),
-            Some(current_url),
+            [(current_path.clone(), diagnostics)].into(),
             DiagnosticsFormat::HideSourcePath,
         );
         cx.push_layer(Box::new(overlaid(picker)));
@@ -488,16 +489,9 @@ pub fn diagnostics_picker(cx: &mut Context) {
 }
 
 pub fn workspace_diagnostics_picker(cx: &mut Context) {
-    let doc = doc!(cx.editor);
-    let current_url = doc.url();
     // TODO not yet filtered by LanguageServerFeature, need to do something similar as Document::shown_diagnostics here for all open documents
     let diagnostics = cx.editor.diagnostics.clone();
-    let picker = diag_picker(
-        cx,
-        diagnostics,
-        current_url,
-        DiagnosticsFormat::ShowSourcePath,
-    );
+    let picker = diag_picker(cx, diagnostics, DiagnosticsFormat::ShowSourcePath);
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index fffbe6207..f46a0d6a6 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -914,7 +914,7 @@ pub struct Editor {
     pub macro_recording: Option<(char, Vec<KeyEvent>)>,
     pub macro_replaying: Vec<char>,
     pub language_servers: helix_lsp::Registry,
-    pub diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
+    pub diagnostics: BTreeMap<PathBuf, Vec<(lsp::Diagnostic, usize)>>,
     pub diff_providers: DiffProviderRegistry,
 
     pub debugger: Option<dap::Client>,
@@ -1815,7 +1815,7 @@ impl Editor {
     /// Returns all supported diagnostics for the document
     pub fn doc_diagnostics<'a>(
         language_servers: &'a helix_lsp::Registry,
-        diagnostics: &'a BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
+        diagnostics: &'a BTreeMap<PathBuf, Vec<(lsp::Diagnostic, usize)>>,
         document: &Document,
     ) -> impl Iterator<Item = helix_core::Diagnostic> + 'a {
         Editor::doc_diagnostics_with_filter(language_servers, diagnostics, document, |_, _| true)
@@ -1825,7 +1825,7 @@ impl Editor {
     /// filtered by `filter` which is invocated with the raw `lsp::Diagnostic` and the language server id it came from
     pub fn doc_diagnostics_with_filter<'a>(
         language_servers: &'a helix_lsp::Registry,
-        diagnostics: &'a BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
+        diagnostics: &'a BTreeMap<PathBuf, Vec<(lsp::Diagnostic, usize)>>,
 
         document: &Document,
         filter: impl Fn(&lsp::Diagnostic, usize) -> bool + 'a,
@@ -1834,8 +1834,7 @@ impl Editor {
         let language_config = document.language.clone();
         document
             .path()
-            .and_then(|path| url::Url::from_file_path(path).ok()) // TODO log error?
-            .and_then(|uri| diagnostics.get(&uri))
+            .and_then(|path| diagnostics.get(path))
             .map(|diags| {
                 diags.iter().filter_map(move |(diagnostic, lsp_id)| {
                     let ls = language_servers.get_by_id(*lsp_id)?;

From 928bf80d9a1d6206f864e9b375f67662a49a6265 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 17 Jun 2023 17:01:36 -0500
Subject: [PATCH 754/967] LSP: Normalize diagnostic file paths

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

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 0ef200c2f..809393c7f 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -724,7 +724,7 @@ impl Application {
                     }
                     Notification::PublishDiagnostics(mut params) => {
                         let path = match params.uri.to_file_path() {
-                            Ok(path) => path,
+                            Ok(path) => helix_stdx::path::normalize(&path),
                             Err(_) => {
                                 log::error!("Unsupported file URI: {}", params.uri);
                                 return;

From a87614858571ed7f9ab4a3145187cf598ec0faeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20F=C3=BChrmann?= <cfuhrmann@gmail.com>
Date: Mon, 26 Feb 2024 02:53:59 +0100
Subject: [PATCH 755/967] Fix colors of tokyonight diagnostic undercurls
 (#9724)

---
 runtime/themes/tokyonight.toml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index 95ebd4087..fbd8f2ed5 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -58,13 +58,13 @@ variable = { fg = "fg" }
 "diff.plus" = { fg = "add" }
 
 error = { fg = "error" }
-hint = { fg = "hint" }
-info = { fg = "info" }
 warning = { fg = "yellow" }
-"diagnostic.error" = { underline = { style = "curl" } }
-"diagnostic.warning" = { underline = { style = "curl" } }
-"diagnostic.info" = { underline = { style = "curl" } }
-"diagnostic.hint" = { underline = { style = "curl" } }
+info = { fg = "info" }
+hint = { fg = "hint" }
+"diagnostic.error" = { underline = { style = "curl", color = "error" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "yellow"} }
+"diagnostic.info" = { underline = { style = "curl", color = "info"} }
+"diagnostic.hint" = { underline = { style = "curl", color = "hint" } }
 
 "ui.background" = { bg = "bg", fg = "fg" }
 "ui.cursor" = { modifiers = ["reversed"] }
@@ -114,8 +114,8 @@ change = "#6183bb"
 delete = "#914c54"
 
 error = "#db4b4b"
-hint = "#1abc9c"
 info = "#0db9d7"
+hint = "#1abc9c"
 
 fg = "#c0caf5"
 fg-dark = "#a9b1d6"

From c68ec92c5e1bd3a2bf402fb583de23693f59b722 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@slint.dev>
Date: Mon, 26 Feb 2024 08:08:31 +0100
Subject: [PATCH 756/967] slint: Update SHA of tree-sitter parser (#9698)

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

diff --git a/languages.toml b/languages.toml
index 112333ea9..750ec9088 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2178,7 +2178,7 @@ language-servers = [ "slint-lsp" ]
 
 [[grammar]]
 name = "slint"
-source = { git = "https://github.com/slint-ui/tree-sitter-slint", rev = "15618215b79b9db08f824a5c97a12d073dcc1c00" }
+source = { git = "https://github.com/slint-ui/tree-sitter-slint", rev = "3c82235f41b63f35a01ae3888206e93585cbb84a" }
 
 [[language]]
 name = "task"

From cd02976fa3a55c2c1f01b95c40d178061968f797 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 26 Feb 2024 08:45:20 +0100
Subject: [PATCH 757/967] switch to regex-cursor (#9422)

---
 Cargo.lock                  | 18 ++++++-
 helix-core/src/selection.rs | 96 +++++++++++++++++++++++--------------
 helix-core/src/syntax.rs    | 12 +++--
 helix-stdx/Cargo.toml       |  1 +
 helix-stdx/src/rope.rs      | 45 ++++++++++++++++-
 helix-term/src/commands.rs  | 56 ++++++++--------------
 helix-term/src/ui/mod.rs    | 33 +++++++++----
 7 files changed, 175 insertions(+), 86 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2b8a25c85..b8d375c51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1344,6 +1344,7 @@ version = "23.10.0"
 dependencies = [
  "dunce",
  "etcetera",
+ "regex-cursor",
  "ropey",
  "tempfile",
  "which",
@@ -1938,15 +1939,28 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-cursor"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a43718aa0040434d45728c43f56bd53bda75a91c46954cdf0f2ff4dbc8aabbe7"
+dependencies = [
+ "log",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+ "ropey",
+]
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index c44685eea..91f1d0de5 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -7,9 +7,11 @@ use crate::{
         ensure_grapheme_boundary_next, ensure_grapheme_boundary_prev, next_grapheme_boundary,
         prev_grapheme_boundary,
     },
+    line_ending::get_line_ending,
     movement::Direction,
     Assoc, ChangeSet, RopeGraphemes, RopeSlice,
 };
+use helix_stdx::rope::{self, RopeSliceExt};
 use smallvec::{smallvec, SmallVec};
 use std::borrow::Cow;
 
@@ -708,12 +710,12 @@ impl IntoIterator for Selection {
 pub fn keep_or_remove_matches(
     text: RopeSlice,
     selection: &Selection,
-    regex: &crate::regex::Regex,
+    regex: &rope::Regex,
     remove: bool,
 ) -> Option<Selection> {
     let result: SmallVec<_> = selection
         .iter()
-        .filter(|range| regex.is_match(&range.fragment(text)) ^ remove)
+        .filter(|range| regex.is_match(text.regex_input_at(range.from()..range.to())) ^ remove)
         .copied()
         .collect();
 
@@ -724,25 +726,20 @@ pub fn keep_or_remove_matches(
     None
 }
 
+// TODO: support to split on capture #N instead of whole match
 pub fn select_on_matches(
     text: RopeSlice,
     selection: &Selection,
-    regex: &crate::regex::Regex,
+    regex: &rope::Regex,
 ) -> Option<Selection> {
     let mut result = SmallVec::with_capacity(selection.len());
 
     for sel in selection {
-        // TODO: can't avoid occasional allocations since Regex can't operate on chunks yet
-        let fragment = sel.fragment(text);
-
-        let sel_start = sel.from();
-        let start_byte = text.char_to_byte(sel_start);
-
-        for mat in regex.find_iter(&fragment) {
+        for mat in regex.find_iter(text.regex_input_at(sel.from()..sel.to())) {
             // TODO: retain range direction
 
-            let start = text.byte_to_char(start_byte + mat.start());
-            let end = text.byte_to_char(start_byte + mat.end());
+            let start = text.byte_to_char(mat.start());
+            let end = text.byte_to_char(mat.end());
 
             let range = Range::new(start, end);
             // Make sure the match is not right outside of the selection.
@@ -761,12 +758,7 @@ pub fn select_on_matches(
     None
 }
 
-// TODO: support to split on capture #N instead of whole match
-pub fn split_on_matches(
-    text: RopeSlice,
-    selection: &Selection,
-    regex: &crate::regex::Regex,
-) -> Selection {
+pub fn split_on_newline(text: RopeSlice, selection: &Selection) -> Selection {
     let mut result = SmallVec::with_capacity(selection.len());
 
     for sel in selection {
@@ -776,21 +768,47 @@ pub fn split_on_matches(
             continue;
         }
 
-        // TODO: can't avoid occasional allocations since Regex can't operate on chunks yet
-        let fragment = sel.fragment(text);
-
         let sel_start = sel.from();
         let sel_end = sel.to();
 
-        let start_byte = text.char_to_byte(sel_start);
+        let mut start = sel_start;
 
+        for mat in sel.slice(text).lines() {
+            let len = mat.len_chars();
+            let line_end_len = get_line_ending(&mat).map(|le| le.len_chars()).unwrap_or(0);
+            // TODO: retain range direction
+            result.push(Range::new(start, start + len - line_end_len));
+            start += len;
+        }
+
+        if start < sel_end {
+            result.push(Range::new(start, sel_end));
+        }
+    }
+
+    // TODO: figure out a new primary index
+    Selection::new(result, 0)
+}
+
+pub fn split_on_matches(text: RopeSlice, selection: &Selection, regex: &rope::Regex) -> Selection {
+    let mut result = SmallVec::with_capacity(selection.len());
+
+    for sel in selection {
+        // Special case: zero-width selection.
+        if sel.from() == sel.to() {
+            result.push(*sel);
+            continue;
+        }
+
+        let sel_start = sel.from();
+        let sel_end = sel.to();
         let mut start = sel_start;
 
-        for mat in regex.find_iter(&fragment) {
+        for mat in regex.find_iter(text.regex_input_at(sel_start..sel_end)) {
             // TODO: retain range direction
-            let end = text.byte_to_char(start_byte + mat.start());
+            let end = text.byte_to_char(mat.start());
             result.push(Range::new(start, end));
-            start = text.byte_to_char(start_byte + mat.end());
+            start = text.byte_to_char(mat.end());
         }
 
         if start < sel_end {
@@ -1021,14 +1039,12 @@ mod test {
 
     #[test]
     fn test_select_on_matches() {
-        use crate::regex::{Regex, RegexBuilder};
-
         let r = Rope::from_str("Nobody expects the Spanish inquisition");
         let s = r.slice(..);
 
         let selection = Selection::single(0, r.len_chars());
         assert_eq!(
-            select_on_matches(s, &selection, &Regex::new(r"[A-Z][a-z]*").unwrap()),
+            select_on_matches(s, &selection, &rope::Regex::new(r"[A-Z][a-z]*").unwrap()),
             Some(Selection::new(
                 smallvec![Range::new(0, 6), Range::new(19, 26)],
                 0
@@ -1038,8 +1054,14 @@ mod test {
         let r = Rope::from_str("This\nString\n\ncontains multiple\nlines");
         let s = r.slice(..);
 
-        let start_of_line = RegexBuilder::new(r"^").multi_line(true).build().unwrap();
-        let end_of_line = RegexBuilder::new(r"$").multi_line(true).build().unwrap();
+        let start_of_line = rope::RegexBuilder::new()
+            .syntax(rope::Config::new().multi_line(true))
+            .build(r"^")
+            .unwrap();
+        let end_of_line = rope::RegexBuilder::new()
+            .syntax(rope::Config::new().multi_line(true))
+            .build(r"$")
+            .unwrap();
 
         // line without ending
         assert_eq!(
@@ -1077,9 +1099,9 @@ mod test {
             select_on_matches(
                 s,
                 &Selection::single(0, s.len_chars()),
-                &RegexBuilder::new(r"^[a-z ]*$")
-                    .multi_line(true)
-                    .build()
+                &rope::RegexBuilder::new()
+                    .syntax(rope::Config::new().multi_line(true))
+                    .build(r"^[a-z ]*$")
                     .unwrap()
             ),
             Some(Selection::new(
@@ -1171,13 +1193,15 @@ mod test {
 
     #[test]
     fn test_split_on_matches() {
-        use crate::regex::Regex;
-
         let text = Rope::from(" abcd efg wrs   xyz 123 456");
 
         let selection = Selection::new(smallvec![Range::new(0, 9), Range::new(11, 20),], 0);
 
-        let result = split_on_matches(text.slice(..), &selection, &Regex::new(r"\s+").unwrap());
+        let result = split_on_matches(
+            text.slice(..),
+            &selection,
+            &rope::Regex::new(r"\s+").unwrap(),
+        );
 
         assert_eq!(
             result.ranges(),
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index a9344448f..0d8559ca9 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -12,6 +12,7 @@ use arc_swap::{ArcSwap, Guard};
 use bitflags::bitflags;
 use globset::GlobSet;
 use hashbrown::raw::RawTable;
+use helix_stdx::rope::{self, RopeSliceExt};
 use slotmap::{DefaultKey as LayerId, HopSlotMap};
 
 use std::{
@@ -1961,11 +1962,16 @@ impl HighlightConfiguration {
                     node_slice
                 };
 
-                static SHEBANG_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(SHEBANG).unwrap());
+                static SHEBANG_REGEX: Lazy<rope::Regex> =
+                    Lazy::new(|| rope::Regex::new(SHEBANG).unwrap());
 
                 injection_capture = SHEBANG_REGEX
-                    .captures(&Cow::from(lines))
-                    .map(|cap| InjectionLanguageMarker::Shebang(cap[1].to_owned()))
+                    .captures_iter(lines.regex_input())
+                    .map(|cap| {
+                        let cap = lines.byte_slice(cap.get_group(1).unwrap().range());
+                        InjectionLanguageMarker::Shebang(cap.into())
+                    })
+                    .next()
             } else if index == self.injection_content_capture_index {
                 content_node = Some(capture.node);
             }
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index 540a1b99a..5ac7c011f 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -16,6 +16,7 @@ dunce = "1.0"
 etcetera = "0.8"
 ropey = { version = "1.6.1", default-features = false }
 which = "6.0"
+regex-cursor = "0.1.3" 
 
 [dev-dependencies]
 tempfile = "3.10"
diff --git a/helix-stdx/src/rope.rs b/helix-stdx/src/rope.rs
index 4ee39d4a8..7b4edda4f 100644
--- a/helix-stdx/src/rope.rs
+++ b/helix-stdx/src/rope.rs
@@ -1,11 +1,22 @@
+use std::ops::{Bound, RangeBounds};
+
+pub use regex_cursor::engines::meta::{Builder as RegexBuilder, Regex};
+pub use regex_cursor::regex_automata::util::syntax::Config;
+use regex_cursor::{Input as RegexInput, RopeyCursor};
 use ropey::RopeSlice;
 
-pub trait RopeSliceExt: Sized {
+pub trait RopeSliceExt<'a>: Sized {
     fn ends_with(self, text: &str) -> bool;
     fn starts_with(self, text: &str) -> bool;
+    fn regex_input(self) -> RegexInput<RopeyCursor<'a>>;
+    fn regex_input_at_bytes<R: RangeBounds<usize>>(
+        self,
+        byte_range: R,
+    ) -> RegexInput<RopeyCursor<'a>>;
+    fn regex_input_at<R: RangeBounds<usize>>(self, char_range: R) -> RegexInput<RopeyCursor<'a>>;
 }
 
-impl RopeSliceExt for RopeSlice<'_> {
+impl<'a> RopeSliceExt<'a> for RopeSlice<'a> {
     fn ends_with(self, text: &str) -> bool {
         let len = self.len_bytes();
         if len < text.len() {
@@ -23,4 +34,34 @@ impl RopeSliceExt for RopeSlice<'_> {
         self.get_byte_slice(..len - text.len())
             .map_or(false, |start| start == text)
     }
+
+    fn regex_input(self) -> RegexInput<RopeyCursor<'a>> {
+        RegexInput::new(self)
+    }
+
+    fn regex_input_at<R: RangeBounds<usize>>(self, char_range: R) -> RegexInput<RopeyCursor<'a>> {
+        let start_bound = match char_range.start_bound() {
+            Bound::Included(&val) => Bound::Included(self.char_to_byte(val)),
+            Bound::Excluded(&val) => Bound::Excluded(self.char_to_byte(val)),
+            Bound::Unbounded => Bound::Unbounded,
+        };
+        let end_bound = match char_range.end_bound() {
+            Bound::Included(&val) => Bound::Included(self.char_to_byte(val)),
+            Bound::Excluded(&val) => Bound::Excluded(self.char_to_byte(val)),
+            Bound::Unbounded => Bound::Unbounded,
+        };
+        self.regex_input_at_bytes((start_bound, end_bound))
+    }
+    fn regex_input_at_bytes<R: RangeBounds<usize>>(
+        self,
+        byte_range: R,
+    ) -> RegexInput<RopeyCursor<'a>> {
+        let input = match byte_range.start_bound() {
+            Bound::Included(&pos) | Bound::Excluded(&pos) => {
+                RegexInput::new(RopeyCursor::at(self, pos))
+            }
+            Bound::Unbounded => RegexInput::new(self),
+        };
+        input.range(byte_range)
+    }
 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 51a1ede9b..fdad31a81 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3,6 +3,7 @@ pub(crate) mod lsp;
 pub(crate) mod typed;
 
 pub use dap::*;
+use helix_stdx::rope::{self, RopeSliceExt};
 use helix_vcs::Hunk;
 pub use lsp::*;
 use tui::widgets::Row;
@@ -19,7 +20,7 @@ use helix_core::{
     match_brackets,
     movement::{self, move_vertically_visual, Direction},
     object, pos_at_coords,
-    regex::{self, Regex, RegexBuilder},
+    regex::{self, Regex},
     search::{self, CharMatcher},
     selection, shellwords, surround,
     syntax::LanguageServerFeature,
@@ -1907,11 +1908,7 @@ fn split_selection(cx: &mut Context) {
 fn split_selection_on_newline(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
-    // only compile the regex once
-    #[allow(clippy::trivial_regex)]
-    static REGEX: Lazy<Regex> =
-        Lazy::new(|| Regex::new(r"\r\n|[\n\r\u{000B}\u{000C}\u{0085}\u{2028}\u{2029}]").unwrap());
-    let selection = selection::split_on_matches(text, doc.selection(view.id), &REGEX);
+    let selection = selection::split_on_newline(text, doc.selection(view.id));
     doc.set_selection(view.id, selection);
 }
 
@@ -1930,8 +1927,7 @@ fn merge_consecutive_selections(cx: &mut Context) {
 #[allow(clippy::too_many_arguments)]
 fn search_impl(
     editor: &mut Editor,
-    contents: &str,
-    regex: &Regex,
+    regex: &rope::Regex,
     movement: Movement,
     direction: Direction,
     scrolloff: usize,
@@ -1959,23 +1955,20 @@ fn search_impl(
     // do a reverse search and wraparound to the end, we don't need to search
     // the text before the current cursor position for matches, but by slicing
     // it out, we need to add it back to the position of the selection.
-    let mut offset = 0;
+    let doc = doc!(editor).text().slice(..);
 
     // use find_at to find the next match after the cursor, loop around the end
     // Careful, `Regex` uses `bytes` as offsets, not character indices!
     let mut mat = match direction {
-        Direction::Forward => regex.find_at(contents, start),
-        Direction::Backward => regex.find_iter(&contents[..start]).last(),
+        Direction::Forward => regex.find(doc.regex_input_at_bytes(start..)),
+        Direction::Backward => regex.find_iter(doc.regex_input_at_bytes(..start)).last(),
     };
 
     if mat.is_none() {
         if wrap_around {
             mat = match direction {
-                Direction::Forward => regex.find(contents),
-                Direction::Backward => {
-                    offset = start;
-                    regex.find_iter(&contents[start..]).last()
-                }
+                Direction::Forward => regex.find(doc.regex_input()),
+                Direction::Backward => regex.find_iter(doc.regex_input_at_bytes(start..)).last(),
             };
         }
         if show_warnings {
@@ -1992,8 +1985,8 @@ fn search_impl(
     let selection = doc.selection(view.id);
 
     if let Some(mat) = mat {
-        let start = text.byte_to_char(mat.start() + offset);
-        let end = text.byte_to_char(mat.end() + offset);
+        let start = text.byte_to_char(mat.start());
+        let end = text.byte_to_char(mat.end());
 
         if end == 0 {
             // skip empty matches that don't make sense
@@ -2037,13 +2030,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
     let scrolloff = config.scrolloff;
     let wrap_around = config.search.wrap_around;
 
-    let doc = doc!(cx.editor);
-
     // TODO: could probably share with select_on_matches?
-
-    // HAXX: sadly we can't avoid allocating a single string for the whole buffer since we can't
-    // feed chunks into the regex yet
-    let contents = doc.text().slice(..).to_string();
     let completions = search_completions(cx, Some(reg));
 
     ui::regex_prompt(
@@ -2065,7 +2052,6 @@ fn searcher(cx: &mut Context, direction: Direction) {
             }
             search_impl(
                 cx.editor,
-                &contents,
                 &regex,
                 Movement::Move,
                 direction,
@@ -2085,8 +2071,6 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
     let config = cx.editor.config();
     let scrolloff = config.scrolloff;
     if let Some(query) = cx.editor.registers.first(register, cx.editor) {
-        let doc = doc!(cx.editor);
-        let contents = doc.text().slice(..).to_string();
         let search_config = &config.search;
         let case_insensitive = if search_config.smart_case {
             !query.chars().any(char::is_uppercase)
@@ -2094,15 +2078,17 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
             false
         };
         let wrap_around = search_config.wrap_around;
-        if let Ok(regex) = RegexBuilder::new(&query)
-            .case_insensitive(case_insensitive)
-            .multi_line(true)
-            .build()
+        if let Ok(regex) = rope::RegexBuilder::new()
+            .syntax(
+                rope::Config::new()
+                    .case_insensitive(case_insensitive)
+                    .multi_line(true),
+            )
+            .build(&query)
         {
             for _ in 0..count {
                 search_impl(
                     cx.editor,
-                    &contents,
                     &regex,
                     movement,
                     direction,
@@ -2239,7 +2225,7 @@ fn global_search(cx: &mut Context) {
 
     let reg = cx.register.unwrap_or('/');
     let completions = search_completions(cx, Some(reg));
-    ui::regex_prompt(
+    ui::raw_regex_prompt(
         cx,
         "global-search:".into(),
         Some(reg),
@@ -2250,7 +2236,7 @@ fn global_search(cx: &mut Context) {
                 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
                 .collect()
         },
-        move |cx, regex, event| {
+        move |cx, _, input, event| {
             if event != PromptEvent::Validate {
                 return;
             }
@@ -2265,7 +2251,7 @@ fn global_search(cx: &mut Context) {
 
             if let Ok(matcher) = RegexMatcherBuilder::new()
                 .case_smart(smart_case)
-                .build(regex.as_str())
+                .build(input)
             {
                 let search_root = helix_stdx::env::current_working_dir();
                 if !search_root.exists() {
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 0873116cb..a4b148af3 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -18,6 +18,7 @@ use crate::filter_picker_entry;
 use crate::job::{self, Callback};
 pub use completion::{Completion, CompletionItem};
 pub use editor::EditorView;
+use helix_stdx::rope;
 pub use markdown::Markdown;
 pub use menu::Menu;
 pub use picker::{DynamicPicker, FileLocation, Picker};
@@ -26,8 +27,6 @@ pub use prompt::{Prompt, PromptEvent};
 pub use spinner::{ProgressSpinners, Spinner};
 pub use text::Text;
 
-use helix_core::regex::Regex;
-use helix_core::regex::RegexBuilder;
 use helix_view::Editor;
 
 use std::path::PathBuf;
@@ -63,7 +62,22 @@ pub fn regex_prompt(
     prompt: std::borrow::Cow<'static, str>,
     history_register: Option<char>,
     completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
-    fun: impl Fn(&mut crate::compositor::Context, Regex, PromptEvent) + 'static,
+    fun: impl Fn(&mut crate::compositor::Context, rope::Regex, PromptEvent) + 'static,
+) {
+    raw_regex_prompt(
+        cx,
+        prompt,
+        history_register,
+        completion_fn,
+        move |cx, regex, _, event| fun(cx, regex, event),
+    );
+}
+pub fn raw_regex_prompt(
+    cx: &mut crate::commands::Context,
+    prompt: std::borrow::Cow<'static, str>,
+    history_register: Option<char>,
+    completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
+    fun: impl Fn(&mut crate::compositor::Context, rope::Regex, &str, PromptEvent) + 'static,
 ) {
     let (view, doc) = current!(cx.editor);
     let doc_id = view.doc;
@@ -94,10 +108,13 @@ pub fn regex_prompt(
                         false
                     };
 
-                    match RegexBuilder::new(input)
-                        .case_insensitive(case_insensitive)
-                        .multi_line(true)
-                        .build()
+                    match rope::RegexBuilder::new()
+                        .syntax(
+                            rope::Config::new()
+                                .case_insensitive(case_insensitive)
+                                .multi_line(true),
+                        )
+                        .build(input)
                     {
                         Ok(regex) => {
                             let (view, doc) = current!(cx.editor);
@@ -110,7 +127,7 @@ pub fn regex_prompt(
                                 view.jumps.push((doc_id, snapshot.clone()));
                             }
 
-                            fun(cx, regex, event);
+                            fun(cx, regex, input, event);
 
                             let (view, doc) = current!(cx.editor);
                             view.ensure_cursor_in_view(doc, config.scrolloff);

From b43d9aa306099ca1b85543bac8453cf7b67eab3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 01:22:00 +0100
Subject: [PATCH 758/967] build(deps): bump ahash from 0.8.6 to 0.8.9 (#9737)

Bumps [ahash](https://github.com/tkaitchuck/ahash) from 0.8.6 to 0.8.9.
- [Release notes](https://github.com/tkaitchuck/ahash/releases)
- [Commits](https://github.com/tkaitchuck/ahash/commits/v0.8.9)

---
updated-dependencies:
- dependency-name: ahash
  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-core/Cargo.toml  | 2 +-
 helix-event/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b8d375c51..9430cce26 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f"
 dependencies = [
  "cfg-if",
  "getrandom",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 0b0dd7452..be5ea5eb8 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -32,7 +32,7 @@ once_cell = "1.19"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
-ahash = "0.8.6"
+ahash = "0.8.9"
 hashbrown = { version = "0.14.3", features = ["raw"] }
 dunce = "1.0"
 
diff --git a/helix-event/Cargo.toml b/helix-event/Cargo.toml
index a5c88e93d..8711568e8 100644
--- a/helix-event/Cargo.toml
+++ b/helix-event/Cargo.toml
@@ -12,7 +12,7 @@ homepage.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ahash = "0.8.3"
+ahash = "0.8.9"
 hashbrown = "0.14.0"
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 # the event registry is essentially read only but must be an rwlock so we can

From d0f8261141f22c7954d1665bcbc4e89bda9bd6cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 01:25:17 +0100
Subject: [PATCH 759/967] build(deps): bump tempfile from 3.10.0 to 3.10.1
 (#9733)

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.10.0 to 3.10.1.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.10.0...v3.10.1)

---
updated-dependencies:
- dependency-name: tempfile
  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-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9430cce26..d376538e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2215,9 +2215,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 25b559696..d15d87f95 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -30,7 +30,7 @@ log = "0.4"
 # cloning/compiling tree-sitter grammars
 cc = { version = "1" }
 threadpool = { version = "1.0" }
-tempfile = "3.10.0"
+tempfile = "3.10.1"
 dunce = "1.0.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 1e21ec161..8c6ae9f42 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -84,4 +84,4 @@ helix-loader = { path = "../helix-loader" }
 [dev-dependencies]
 smallvec = "1.13"
 indoc = "2.0.4"
-tempfile = "3.10.0"
+tempfile = "3.10.1"

From ea95c687751ebee391088bde269f0b40267dfdf0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 01:25:52 +0100
Subject: [PATCH 760/967] build(deps): bump serde_json from 1.0.113 to 1.0.114
 (#9735)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.113 to 1.0.114.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.113...v1.0.114)

---
updated-dependencies:
- dependency-name: serde_json
  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 d376538e4..6f4d9758e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2045,9 +2045,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",

From 1a82aeeae91be33cb0923c9f652fa6db250efd7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 01:26:24 +0100
Subject: [PATCH 761/967] build(deps): bump serde from 1.0.196 to 1.0.197
 (#9736)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.196 to 1.0.197.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.196...v1.0.197)

---
updated-dependencies:
- dependency-name: serde
  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 6f4d9758e..7f57b75d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2025,18 +2025,18 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",

From 358ac6bc1f512ca7303856dc904d4b4cdc1fe718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A2=E9=B9=8F?= <chaopeng@chaopeng.me>
Date: Mon, 26 Feb 2024 19:41:50 -0500
Subject: [PATCH 762/967] add fidl support (#9713)

---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 18 ++++++++
 runtime/queries/fidl/folds.scm      |  6 +++
 runtime/queries/fidl/highlights.scm | 64 +++++++++++++++++++++++++++++
 runtime/queries/fidl/injections.scm |  2 +
 5 files changed, 91 insertions(+)
 create mode 100644 runtime/queries/fidl/folds.scm
 create mode 100644 runtime/queries/fidl/highlights.scm
 create mode 100644 runtime/queries/fidl/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 7aec37778..1bc6b0817 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -44,6 +44,7 @@
 | erb | ✓ |  |  |  |
 | erlang | ✓ | ✓ |  | `erlang_ls` |
 | esdl | ✓ |  |  |  |
+| fidl | ✓ |  |  |  |
 | fish | ✓ | ✓ | ✓ |  |
 | forth | ✓ |  |  | `forth-lsp` |
 | fortran | ✓ |  | ✓ | `fortls` |
diff --git a/languages.toml b/languages.toml
index 750ec9088..313b3d95e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3140,3 +3140,21 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "groovy"
 source = { git = "https://github.com/Decodetalkers/tree-sitter-groovy", rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec" }
+
+[[language]]
+name = "fidl"
+scope = "source.fidl"
+injection-regex = "fidl"
+file-types = ["fidl"]
+comment-token = "//"
+indent = { tab-width = 4, unit = "    " }
+
+[language.auto-pairs]
+'"' = '"'
+'{' = '}'
+'(' = ')'
+'<' = '>'
+
+[[grammar]]
+name = "fidl"
+source = { git = "https://github.com/google/tree-sitter-fidl", rev = "bdbb635a7f5035e424f6173f2f11b9cd79703f8d" }
diff --git a/runtime/queries/fidl/folds.scm b/runtime/queries/fidl/folds.scm
new file mode 100644
index 000000000..f524c455b
--- /dev/null
+++ b/runtime/queries/fidl/folds.scm
@@ -0,0 +1,6 @@
+[
+  (layout_declaration)
+  (protocol_declaration)
+  (resource_declaration)
+  (service_declaration)
+] @fold
diff --git a/runtime/queries/fidl/highlights.scm b/runtime/queries/fidl/highlights.scm
new file mode 100644
index 000000000..c70d22198
--- /dev/null
+++ b/runtime/queries/fidl/highlights.scm
@@ -0,0 +1,64 @@
+[
+  "ajar"
+  "alias"
+  "as"
+  "bits"
+  "closed"
+  "compose"
+  "const"
+  "enum"
+  "error"
+  "flexible"
+  "library"
+  "open"
+  ; "optional" we did not specify a node for optional yet
+  "overlay"
+  "protocol"
+  "reserved"
+  "resource"
+  "service"
+  "strict"
+  "struct"
+  "table"
+  "type"
+  "union"
+  "using"
+] @keyword
+
+(primitives_type) @type.builtin
+
+(builtin_complex_type) @type.builtin
+
+(const_declaration
+  (identifier) @constant)
+
+[
+  "="
+  "|"
+  "&"
+  "->"
+] @operator
+
+(attribute
+  "@" @attribute
+  (identifier) @attribute)
+
+(string_literal) @string
+
+(numeric_literal) @constant.numeric
+
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
+
+(comment) @comment
+
+[
+  "("
+  ")"
+  "<"
+  ">"
+  "{"
+  "}"
+] @punctuation.bracket
diff --git a/runtime/queries/fidl/injections.scm b/runtime/queries/fidl/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/runtime/queries/fidl/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From f46a09ab4f945273c7baf32e58438b501914fabb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 02:06:37 +0100
Subject: [PATCH 763/967] build(deps): bump cc from 1.0.85 to 1.0.88 (#9734)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.85 to 1.0.88.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.85...1.0.88)

---
updated-dependencies:
- dependency-name: cc
  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 7f57b75d3..08fa4789e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -145,9 +145,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.85"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b918671670962b48bc23753aef0c51d072dca6f52f01f800854ada6ddb7f7d3"
+checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc"
 
 [[package]]
 name = "cfg-if"

From 26b3dc29be886c5a2ed1a5caaaf09eb730829c3e Mon Sep 17 00:00:00 2001
From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com>
Date: Tue, 27 Feb 2024 08:36:25 -0500
Subject: [PATCH 764/967] toggling of block comments (#4718)

---
 book/src/keymap.md               |   4 +
 book/src/languages.md            |   5 +-
 helix-core/src/comment.rs        | 270 ++++++++++++++++++++++++++++++-
 helix-core/src/indent.rs         |   4 +-
 helix-core/src/lib.rs            |   3 -
 helix-core/src/syntax.rs         |  67 +++++++-
 helix-core/tests/indent.rs       |   3 +-
 helix-stdx/src/rope.rs           |  11 ++
 helix-term/src/commands.rs       | 136 ++++++++++++++--
 helix-term/src/keymap/default.rs |   3 +
 languages.toml                   |  91 ++++++++++-
 11 files changed, 568 insertions(+), 29 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index ac84147cd..bb09b0319 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -12,6 +12,7 @@
     - [Match mode](#match-mode)
     - [Window mode](#window-mode)
     - [Space mode](#space-mode)
+      - [Comment mode](#comment-mode)
       - [Popup](#popup)
     - [Unimpaired](#unimpaired)
 - [Insert mode](#insert-mode)
@@ -289,6 +290,9 @@ This layer is a kludge of mappings, mostly pickers.
 | `h`     | Select symbol references (**LSP**)                                      | `select_references_to_symbol_under_cursor` |
 | `'`     | Open last fuzzy picker                                                  | `last_picker`                              |
 | `w`     | Enter [window mode](#window-mode)                                       | N/A                                        |
+| `c`     | Comment/uncomment selections                                            | `toggle_comments`                          |
+| `C`     | Block comment/uncomment selections                                      | `toggle_block_comments`                    |
+| `Alt-c` | Line comment/uncomment selections                                       | `toggle_line_comments`                     |
 | `p`     | Paste system clipboard after selections                                 | `paste_clipboard_after`                    |
 | `P`     | Paste system clipboard before selections                                | `paste_clipboard_before`                   |
 | `y`     | Yank selections to clipboard                                            | `yank_to_clipboard`                        |
diff --git a/book/src/languages.md b/book/src/languages.md
index e3900dca9..dd93fec53 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -42,7 +42,7 @@ name = "mylang"
 scope = "source.mylang"
 injection-regex = "mylang"
 file-types = ["mylang", "myl"]
-comment-token = "#"
+comment-tokens = "#"
 indent = { tab-width = 2, unit = "  " }
 formatter = { command = "mylang-formatter" , args = ["--stdin"] }
 language-servers = [ "mylang-lsp" ]
@@ -61,7 +61,8 @@ These configuration keys are available:
 | `roots`               | A set of marker files to look for when trying to find the workspace root. For example `Cargo.lock`, `yarn.lock` |
 | `auto-format`         | Whether to autoformat this language when saving               |
 | `diagnostic-severity` | Minimal severity of diagnostic for it to be displayed. (Allowed values: `Error`, `Warning`, `Info`, `Hint`) |
-| `comment-token`       | The token to use as a comment-token                           |
+| `comment-tokens`      | The tokens to use as a comment token, either a single token `"//"` or an array `["//", "///", "//!"]` (the first token will be used for commenting). Also configurable as `comment-token` for backwards compatibility|
+| `block-comment-tokens`| The start and end tokens for a multiline comment either an array or single table of `{ start = "/*", end = "*/"}`. The first set of tokens will be used for commenting, any pairs in the array can be uncommented |
 | `indent`              | The indent to use. Has sub keys `unit` (the text inserted into the document when indenting; usually set to N spaces or `"\t"` for tabs) and `tab-width` (the number of spaces rendered for a tab) |
 | `language-servers`    | The Language Servers used for this language. See below for more information in the section [Configuring Language Servers for a language](#configuring-language-servers-for-a-language)   |
 | `grammar`             | The tree-sitter grammar to use (defaults to the value of `name`) |
diff --git a/helix-core/src/comment.rs b/helix-core/src/comment.rs
index 9c7e50f33..536b710ab 100644
--- a/helix-core/src/comment.rs
+++ b/helix-core/src/comment.rs
@@ -1,9 +1,12 @@
 //! This module contains the functionality toggle comments on lines over the selection
 //! using the comment character defined in the user's `languages.toml`
 
+use smallvec::SmallVec;
+
 use crate::{
-    find_first_non_whitespace_char, Change, Rope, RopeSlice, Selection, Tendril, Transaction,
+    syntax::BlockCommentToken, Change, Range, Rope, RopeSlice, Selection, Tendril, Transaction,
 };
+use helix_stdx::rope::RopeSliceExt;
 use std::borrow::Cow;
 
 /// Given text, a comment token, and a set of line indices, returns the following:
@@ -22,12 +25,12 @@ fn find_line_comment(
 ) -> (bool, Vec<usize>, usize, usize) {
     let mut commented = true;
     let mut to_change = Vec::new();
-    let mut min = usize::MAX; // minimum col for find_first_non_whitespace_char
+    let mut min = usize::MAX; // minimum col for first_non_whitespace_char
     let mut margin = 1;
     let token_len = token.chars().count();
     for line in lines {
         let line_slice = text.line(line);
-        if let Some(pos) = find_first_non_whitespace_char(line_slice) {
+        if let Some(pos) = line_slice.first_non_whitespace_char() {
             let len = line_slice.len_chars();
 
             if pos < min {
@@ -94,6 +97,222 @@ pub fn toggle_line_comments(doc: &Rope, selection: &Selection, token: Option<&st
     Transaction::change(doc, changes.into_iter())
 }
 
+#[derive(Debug, PartialEq, Eq)]
+pub enum CommentChange {
+    Commented {
+        range: Range,
+        start_pos: usize,
+        end_pos: usize,
+        start_margin: bool,
+        end_margin: bool,
+        start_token: String,
+        end_token: String,
+    },
+    Uncommented {
+        range: Range,
+        start_pos: usize,
+        end_pos: usize,
+        start_token: String,
+        end_token: String,
+    },
+    Whitespace {
+        range: Range,
+    },
+}
+
+pub fn find_block_comments(
+    tokens: &[BlockCommentToken],
+    text: RopeSlice,
+    selection: &Selection,
+) -> (bool, Vec<CommentChange>) {
+    let mut commented = true;
+    let mut only_whitespace = true;
+    let mut comment_changes = Vec::with_capacity(selection.len());
+    let default_tokens = tokens.first().cloned().unwrap_or_default();
+    // TODO: check if this can be removed on MSRV bump
+    #[allow(clippy::redundant_clone)]
+    let mut start_token = default_tokens.start.clone();
+    #[allow(clippy::redundant_clone)]
+    let mut end_token = default_tokens.end.clone();
+
+    let mut tokens = tokens.to_vec();
+    // sort the tokens by length, so longer tokens will match first
+    tokens.sort_by(|a, b| {
+        if a.start.len() == b.start.len() {
+            b.end.len().cmp(&a.end.len())
+        } else {
+            b.start.len().cmp(&a.start.len())
+        }
+    });
+    for range in selection {
+        let selection_slice = range.slice(text);
+        if let (Some(start_pos), Some(end_pos)) = (
+            selection_slice.first_non_whitespace_char(),
+            selection_slice.last_non_whitespace_char(),
+        ) {
+            let mut line_commented = false;
+            let mut after_start = 0;
+            let mut before_end = 0;
+            let len = (end_pos + 1) - start_pos;
+
+            for BlockCommentToken { start, end } in &tokens {
+                let start_len = start.chars().count();
+                let end_len = end.chars().count();
+                after_start = start_pos + start_len;
+                before_end = end_pos.saturating_sub(end_len);
+
+                if len >= start_len + end_len {
+                    let start_fragment = selection_slice.slice(start_pos..after_start);
+                    let end_fragment = selection_slice.slice(before_end + 1..end_pos + 1);
+
+                    // block commented with these tokens
+                    if start_fragment == start.as_str() && end_fragment == end.as_str() {
+                        start_token = start.to_string();
+                        end_token = end.to_string();
+                        line_commented = true;
+                        break;
+                    }
+                }
+            }
+
+            if !line_commented {
+                comment_changes.push(CommentChange::Uncommented {
+                    range: *range,
+                    start_pos,
+                    end_pos,
+                    start_token: default_tokens.start.clone(),
+                    end_token: default_tokens.end.clone(),
+                });
+                commented = false;
+            } else {
+                comment_changes.push(CommentChange::Commented {
+                    range: *range,
+                    start_pos,
+                    end_pos,
+                    start_margin: selection_slice
+                        .get_char(after_start)
+                        .map_or(false, |c| c == ' '),
+                    end_margin: after_start != before_end
+                        && selection_slice
+                            .get_char(before_end)
+                            .map_or(false, |c| c == ' '),
+                    start_token: start_token.to_string(),
+                    end_token: end_token.to_string(),
+                });
+            }
+            only_whitespace = false;
+        } else {
+            comment_changes.push(CommentChange::Whitespace { range: *range });
+        }
+    }
+    if only_whitespace {
+        commented = false;
+    }
+    (commented, comment_changes)
+}
+
+#[must_use]
+pub fn create_block_comment_transaction(
+    doc: &Rope,
+    selection: &Selection,
+    commented: bool,
+    comment_changes: Vec<CommentChange>,
+) -> (Transaction, SmallVec<[Range; 1]>) {
+    let mut changes: Vec<Change> = Vec::with_capacity(selection.len() * 2);
+    let mut ranges: SmallVec<[Range; 1]> = SmallVec::with_capacity(selection.len());
+    let mut offs = 0;
+    for change in comment_changes {
+        if commented {
+            if let CommentChange::Commented {
+                range,
+                start_pos,
+                end_pos,
+                start_token,
+                end_token,
+                start_margin,
+                end_margin,
+            } = change
+            {
+                let from = range.from();
+                changes.push((
+                    from + start_pos,
+                    from + start_pos + start_token.len() + start_margin as usize,
+                    None,
+                ));
+                changes.push((
+                    from + end_pos - end_token.len() - end_margin as usize + 1,
+                    from + end_pos + 1,
+                    None,
+                ));
+            }
+        } else {
+            // uncommented so manually map ranges through changes
+            match change {
+                CommentChange::Uncommented {
+                    range,
+                    start_pos,
+                    end_pos,
+                    start_token,
+                    end_token,
+                } => {
+                    let from = range.from();
+                    changes.push((
+                        from + start_pos,
+                        from + start_pos,
+                        Some(Tendril::from(format!("{} ", start_token))),
+                    ));
+                    changes.push((
+                        from + end_pos + 1,
+                        from + end_pos + 1,
+                        Some(Tendril::from(format!(" {}", end_token))),
+                    ));
+
+                    let offset = start_token.chars().count() + end_token.chars().count() + 2;
+                    ranges.push(
+                        Range::new(from + offs, from + offs + end_pos + 1 + offset)
+                            .with_direction(range.direction()),
+                    );
+                    offs += offset;
+                }
+                CommentChange::Commented { range, .. } | CommentChange::Whitespace { range } => {
+                    ranges.push(Range::new(range.from() + offs, range.to() + offs));
+                }
+            }
+        }
+    }
+    (Transaction::change(doc, changes.into_iter()), ranges)
+}
+
+#[must_use]
+pub fn toggle_block_comments(
+    doc: &Rope,
+    selection: &Selection,
+    tokens: &[BlockCommentToken],
+) -> Transaction {
+    let text = doc.slice(..);
+    let (commented, comment_changes) = find_block_comments(tokens, text, selection);
+    let (mut transaction, ranges) =
+        create_block_comment_transaction(doc, selection, commented, comment_changes);
+    if !commented {
+        transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
+    }
+    transaction
+}
+
+pub fn split_lines_of_selection(text: RopeSlice, selection: &Selection) -> Selection {
+    let mut ranges = SmallVec::new();
+    for range in selection.ranges() {
+        let (line_start, line_end) = range.line_range(text.slice(..));
+        let mut pos = text.line_to_char(line_start);
+        for line in text.slice(pos..text.line_to_char(line_end + 1)).lines() {
+            let start = pos;
+            pos += line.len_chars();
+            ranges.push(Range::new(start, pos));
+        }
+    }
+    Selection::new(ranges, 0)
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -149,4 +368,49 @@ mod test {
 
         // TODO: account for uncommenting with uneven comment indentation
     }
+
+    #[test]
+    fn test_find_block_comments() {
+        // three lines 5 characters.
+        let mut doc = Rope::from("1\n2\n3");
+        // select whole document
+        let selection = Selection::single(0, doc.len_chars());
+
+        let text = doc.slice(..);
+
+        let res = find_block_comments(&[BlockCommentToken::default()], text, &selection);
+
+        assert_eq!(
+            res,
+            (
+                false,
+                vec![CommentChange::Uncommented {
+                    range: Range::new(0, 5),
+                    start_pos: 0,
+                    end_pos: 4,
+                    start_token: "/*".to_string(),
+                    end_token: "*/".to_string(),
+                }]
+            )
+        );
+
+        // comment
+        let transaction = toggle_block_comments(&doc, &selection, &[BlockCommentToken::default()]);
+        transaction.apply(&mut doc);
+
+        assert_eq!(doc, "/* 1\n2\n3 */");
+
+        // uncomment
+        let selection = Selection::single(0, doc.len_chars());
+        let transaction = toggle_block_comments(&doc, &selection, &[BlockCommentToken::default()]);
+        transaction.apply(&mut doc);
+        assert_eq!(doc, "1\n2\n3");
+
+        // don't panic when there is just a space in comment
+        doc = Rope::from("/* */");
+        let selection = Selection::single(0, doc.len_chars());
+        let transaction = toggle_block_comments(&doc, &selection, &[BlockCommentToken::default()]);
+        transaction.apply(&mut doc);
+        assert_eq!(doc, "");
+    }
 }
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index c29bb3a0b..2a0a3876c 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -1,10 +1,10 @@
 use std::{borrow::Cow, collections::HashMap};
 
+use helix_stdx::rope::RopeSliceExt;
 use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
 
 use crate::{
     chars::{char_is_line_ending, char_is_whitespace},
-    find_first_non_whitespace_char,
     graphemes::{grapheme_width, tab_width_at},
     syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
     tree_sitter::Node,
@@ -970,7 +970,7 @@ pub fn indent_for_newline(
                 let mut num_attempts = 0;
                 for line_idx in (0..=line_before).rev() {
                     let line = text.line(line_idx);
-                    let first_non_whitespace_char = match find_first_non_whitespace_char(line) {
+                    let first_non_whitespace_char = match line.first_non_whitespace_char() {
                         Some(i) => i,
                         None => {
                             continue;
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 94802eba9..1abd90d10 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -37,9 +37,6 @@ pub mod unicode {
 
 pub use helix_loader::find_workspace;
 
-pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
-    line.chars().position(|ch| !ch.is_whitespace())
-}
 mod rope_reader;
 
 pub use rope_reader::RopeReader;
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 0d8559ca9..3b224e1b2 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -99,7 +99,19 @@ pub struct LanguageConfiguration {
     pub shebangs: Vec<String>, // interpreter(s) associated with language
     #[serde(default)]
     pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
-    pub comment_token: Option<String>,
+    #[serde(
+        default,
+        skip_serializing,
+        deserialize_with = "from_comment_tokens",
+        alias = "comment-token"
+    )]
+    pub comment_tokens: Option<Vec<String>>,
+    #[serde(
+        default,
+        skip_serializing,
+        deserialize_with = "from_block_comment_tokens"
+    )]
+    pub block_comment_tokens: Option<Vec<BlockCommentToken>>,
     pub text_width: Option<usize>,
     pub soft_wrap: Option<SoftWrap>,
 
@@ -240,6 +252,59 @@ impl<'de> Deserialize<'de> for FileType {
     }
 }
 
+fn from_comment_tokens<'de, D>(deserializer: D) -> Result<Option<Vec<String>>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum CommentTokens {
+        Multiple(Vec<String>),
+        Single(String),
+    }
+    Ok(
+        Option::<CommentTokens>::deserialize(deserializer)?.map(|tokens| match tokens {
+            CommentTokens::Single(val) => vec![val],
+            CommentTokens::Multiple(vals) => vals,
+        }),
+    )
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct BlockCommentToken {
+    pub start: String,
+    pub end: String,
+}
+
+impl Default for BlockCommentToken {
+    fn default() -> Self {
+        BlockCommentToken {
+            start: "/*".to_string(),
+            end: "*/".to_string(),
+        }
+    }
+}
+
+fn from_block_comment_tokens<'de, D>(
+    deserializer: D,
+) -> Result<Option<Vec<BlockCommentToken>>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum BlockCommentTokens {
+        Multiple(Vec<BlockCommentToken>),
+        Single(BlockCommentToken),
+    }
+    Ok(
+        Option::<BlockCommentTokens>::deserialize(deserializer)?.map(|tokens| match tokens {
+            BlockCommentTokens::Single(val) => vec![val],
+            BlockCommentTokens::Multiple(vals) => vals,
+        }),
+    )
+}
+
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
 #[serde(rename_all = "kebab-case")]
 pub enum LanguageServerFeature {
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index 53265e0b1..31946c56e 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -4,6 +4,7 @@ use helix_core::{
     syntax::{Configuration, Loader},
     Syntax,
 };
+use helix_stdx::rope::RopeSliceExt;
 use ropey::Rope;
 use std::{ops::Range, path::PathBuf, process::Command, sync::Arc};
 
@@ -211,7 +212,7 @@ fn test_treesitter_indent(
         if ignored_lines.iter().any(|range| range.contains(&(i + 1))) {
             continue;
         }
-        if let Some(pos) = helix_core::find_first_non_whitespace_char(line) {
+        if let Some(pos) = line.first_non_whitespace_char() {
             let tab_width: usize = 4;
             let suggested_indent = treesitter_indent_for_pos(
                 indent_query,
diff --git a/helix-stdx/src/rope.rs b/helix-stdx/src/rope.rs
index 7b4edda4f..7e2549f5a 100644
--- a/helix-stdx/src/rope.rs
+++ b/helix-stdx/src/rope.rs
@@ -14,6 +14,8 @@ pub trait RopeSliceExt<'a>: Sized {
         byte_range: R,
     ) -> RegexInput<RopeyCursor<'a>>;
     fn regex_input_at<R: RangeBounds<usize>>(self, char_range: R) -> RegexInput<RopeyCursor<'a>>;
+    fn first_non_whitespace_char(self) -> Option<usize>;
+    fn last_non_whitespace_char(self) -> Option<usize>;
 }
 
 impl<'a> RopeSliceExt<'a> for RopeSlice<'a> {
@@ -64,4 +66,13 @@ impl<'a> RopeSliceExt<'a> for RopeSlice<'a> {
         };
         input.range(byte_range)
     }
+    fn first_non_whitespace_char(self) -> Option<usize> {
+        self.chars().position(|ch| !ch.is_whitespace())
+    }
+    fn last_non_whitespace_char(self) -> Option<usize> {
+        self.chars_at(self.len_chars())
+            .reversed()
+            .position(|ch| !ch.is_whitespace())
+            .map(|pos| self.len_chars() - pos - 1)
+    }
 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index fdad31a81..bd0a60b7c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -12,7 +12,7 @@ pub use typed::*;
 use helix_core::{
     char_idx_at_visual_offset, comment,
     doc_formatter::TextFormat,
-    encoding, find_first_non_whitespace_char, find_workspace, graphemes,
+    encoding, find_workspace, graphemes,
     history::UndoKind,
     increment, indent,
     indent::IndentStyle,
@@ -23,7 +23,7 @@ use helix_core::{
     regex::{self, Regex},
     search::{self, CharMatcher},
     selection, shellwords, surround,
-    syntax::LanguageServerFeature,
+    syntax::{BlockCommentToken, LanguageServerFeature},
     text_annotations::TextAnnotations,
     textobject,
     tree_sitter::Node,
@@ -415,6 +415,8 @@ impl MappableCommand {
         completion, "Invoke completion popup",
         hover, "Show docs for item under cursor",
         toggle_comments, "Comment/uncomment selections",
+        toggle_line_comments, "Line comment/uncomment selections",
+        toggle_block_comments, "Block comment/uncomment selections",
         rotate_selections_forward, "Rotate selections forward",
         rotate_selections_backward, "Rotate selections backward",
         rotate_selection_contents_forward, "Rotate selection contents forward",
@@ -822,7 +824,7 @@ fn kill_to_line_start(cx: &mut Context) {
             let head = if anchor == first_char && line != 0 {
                 // select until previous line
                 line_end_char_index(&text, line - 1)
-            } else if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
+            } else if let Some(pos) = text.line(line).first_non_whitespace_char() {
                 if first_char + pos < anchor {
                     // select until first non-blank in line if cursor is after it
                     first_char + pos
@@ -884,7 +886,7 @@ fn goto_first_nonwhitespace_impl(view: &mut View, doc: &mut Document, movement:
     let selection = doc.selection(view.id).clone().transform(|range| {
         let line = range.cursor_line(text);
 
-        if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
+        if let Some(pos) = text.line(line).first_non_whitespace_char() {
             let pos = pos + text.line_to_char(line);
             range.put_cursor(text, pos, movement == Movement::Extend)
         } else {
@@ -3087,11 +3089,11 @@ fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
         } else {
             // move cursor to the fallback position
             let pos = match cursor_fallback {
-                IndentFallbackPos::LineStart => {
-                    find_first_non_whitespace_char(text.line(cursor_line))
-                        .map(|ws_offset| ws_offset + cursor_line_start)
-                        .unwrap_or(cursor_line_start)
-                }
+                IndentFallbackPos::LineStart => text
+                    .line(cursor_line)
+                    .first_non_whitespace_char()
+                    .map(|ws_offset| ws_offset + cursor_line_start)
+                    .unwrap_or(cursor_line_start),
                 IndentFallbackPos::LineEnd => line_end_char_index(&text, cursor_line),
             };
 
@@ -4462,18 +4464,124 @@ pub fn completion(cx: &mut Context) {
 }
 
 // comments
-fn toggle_comments(cx: &mut Context) {
+type CommentTransactionFn = fn(
+    line_token: Option<&str>,
+    block_tokens: Option<&[BlockCommentToken]>,
+    doc: &Rope,
+    selection: &Selection,
+) -> Transaction;
+
+fn toggle_comments_impl(cx: &mut Context, comment_transaction: CommentTransactionFn) {
     let (view, doc) = current!(cx.editor);
-    let token = doc
+    let line_token: Option<&str> = doc
+        .language_config()
+        .and_then(|lc| lc.comment_tokens.as_ref())
+        .and_then(|tc| tc.first())
+        .map(|tc| tc.as_str());
+    let block_tokens: Option<&[BlockCommentToken]> = doc
         .language_config()
-        .and_then(|lc| lc.comment_token.as_ref())
-        .map(|tc| tc.as_ref());
-    let transaction = comment::toggle_line_comments(doc.text(), doc.selection(view.id), token);
+        .and_then(|lc| lc.block_comment_tokens.as_ref())
+        .map(|tc| &tc[..]);
+
+    let transaction =
+        comment_transaction(line_token, block_tokens, doc.text(), doc.selection(view.id));
 
     doc.apply(&transaction, view.id);
     exit_select_mode(cx);
 }
 
+/// commenting behavior:
+/// 1. only line comment tokens -> line comment
+/// 2. each line block commented -> uncomment all lines
+/// 3. whole selection block commented -> uncomment selection
+/// 4. all lines not commented and block tokens -> comment uncommented lines
+/// 5. no comment tokens and not block commented -> line comment
+fn toggle_comments(cx: &mut Context) {
+    toggle_comments_impl(cx, |line_token, block_tokens, doc, selection| {
+        let text = doc.slice(..);
+
+        // only have line comment tokens
+        if line_token.is_some() && block_tokens.is_none() {
+            return comment::toggle_line_comments(doc, selection, line_token);
+        }
+
+        let split_lines = comment::split_lines_of_selection(text, selection);
+
+        let default_block_tokens = &[BlockCommentToken::default()];
+        let block_comment_tokens = block_tokens.unwrap_or(default_block_tokens);
+
+        let (line_commented, line_comment_changes) =
+            comment::find_block_comments(block_comment_tokens, text, &split_lines);
+
+        // block commented by line would also be block commented so check this first
+        if line_commented {
+            return comment::create_block_comment_transaction(
+                doc,
+                &split_lines,
+                line_commented,
+                line_comment_changes,
+            )
+            .0;
+        }
+
+        let (block_commented, comment_changes) =
+            comment::find_block_comments(block_comment_tokens, text, selection);
+
+        // check if selection has block comments
+        if block_commented {
+            return comment::create_block_comment_transaction(
+                doc,
+                selection,
+                block_commented,
+                comment_changes,
+            )
+            .0;
+        }
+
+        // not commented and only have block comment tokens
+        if line_token.is_none() && block_tokens.is_some() {
+            return comment::create_block_comment_transaction(
+                doc,
+                &split_lines,
+                line_commented,
+                line_comment_changes,
+            )
+            .0;
+        }
+
+        // not block commented at all and don't have any tokens
+        comment::toggle_line_comments(doc, selection, line_token)
+    })
+}
+
+fn toggle_line_comments(cx: &mut Context) {
+    toggle_comments_impl(cx, |line_token, block_tokens, doc, selection| {
+        if line_token.is_none() && block_tokens.is_some() {
+            let default_block_tokens = &[BlockCommentToken::default()];
+            let block_comment_tokens = block_tokens.unwrap_or(default_block_tokens);
+            comment::toggle_block_comments(
+                doc,
+                &comment::split_lines_of_selection(doc.slice(..), selection),
+                block_comment_tokens,
+            )
+        } else {
+            comment::toggle_line_comments(doc, selection, line_token)
+        }
+    });
+}
+
+fn toggle_block_comments(cx: &mut Context) {
+    toggle_comments_impl(cx, |line_token, block_tokens, doc, selection| {
+        if line_token.is_some() && block_tokens.is_none() {
+            comment::toggle_line_comments(doc, selection, line_token)
+        } else {
+            let default_block_tokens = &[BlockCommentToken::default()];
+            let block_comment_tokens = block_tokens.unwrap_or(default_block_tokens);
+            comment::toggle_block_comments(doc, selection, block_comment_tokens)
+        }
+    });
+}
+
 fn rotate_selections(cx: &mut Context, direction: Direction) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 92d6b5906..bab662b04 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -276,6 +276,9 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "k" => hover,
             "r" => rename_symbol,
             "h" => select_references_to_symbol_under_cursor,
+            "c" => toggle_comments,
+            "C" => toggle_block_comments,
+            "A-c" => toggle_line_comments,
             "?" => command_palette,
         },
         "z" => { "View"
diff --git a/languages.toml b/languages.toml
index 313b3d95e..5cfc0c28d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -191,7 +191,12 @@ injection-regex = "rust"
 file-types = ["rs"]
 roots = ["Cargo.toml", "Cargo.lock"]
 auto-format = true
-comment-token = "//"
+comment-tokens = ["//", "///", "//!"]
+block-comment-tokens = [
+  { start = "/*", end = "*/" },
+  { start = "/**", end = "*/" },
+  { start = "/*!", end = "*/" },
+]
 language-servers = [ "rust-analyzer" ]
 indent = { tab-width = 4, unit = "    " }
 persistent-diagnostic-sources = ["rustc", "clippy"]
@@ -283,6 +288,7 @@ injection-regex = "protobuf"
 file-types = ["proto"]
 language-servers = [ "bufls", "pbkit" ]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -326,6 +332,7 @@ injection-regex = "mint"
 file-types = ["mint"]
 shebangs = []
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "mint" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -408,6 +415,7 @@ scope = "source.c"
 injection-regex = "c"
 file-types = ["c"] # TODO: ["h"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "clangd" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -444,6 +452,7 @@ scope = "source.cpp"
 injection-regex = "cpp"
 file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm", "h++", "ii", "inl", { glob = ".hpp.in" }, { glob = ".h.in" }]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "clangd" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -491,6 +500,7 @@ injection-regex = "c-?sharp"
 file-types = ["cs", "csx", "cake"]
 roots = ["sln", "csproj"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "\t" }
 language-servers = [ "omnisharp" ]
 
@@ -549,6 +559,7 @@ file-types = ["go"]
 roots = ["go.work", "go.mod"]
 auto-format = true
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "gopls", "golangci-lint-lsp" ]
 # TODO: gopls needs utf-8 offsets?
 indent = { tab-width = 4, unit = "\t" }
@@ -614,6 +625,7 @@ scope = "source.gotmpl"
 injection-regex = "gotmpl"
 file-types = ["gotmpl"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "gopls" ]
 indent = { tab-width = 2, unit = " " }
 
@@ -643,6 +655,7 @@ language-id = "javascript"
 file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", { glob = "jakefile" }]
 shebangs = ["node"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -669,6 +682,7 @@ injection-regex = "jsx"
 language-id = "javascriptreact"
 file-types = ["jsx"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 grammar = "javascript"
@@ -680,6 +694,8 @@ injection-regex = "(ts|typescript)"
 file-types = ["ts", "mts", "cts"]
 language-id = "typescript"
 shebangs = ["deno", "ts-node"]
+comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -693,6 +709,8 @@ scope = "source.tsx"
 injection-regex = "(tsx)" # |typescript
 language-id = "typescriptreact"
 file-types = ["tsx"]
+comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "typescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -705,6 +723,7 @@ name = "css"
 scope = "source.css"
 injection-regex = "css"
 file-types = ["css", "scss"]
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "vscode-css-language-server" ]
 auto-format = true
 indent = { tab-width = 2, unit = "  " }
@@ -718,6 +737,7 @@ name = "scss"
 scope = "source.scss"
 injection-regex = "scss"
 file-types = ["scss"]
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "vscode-css-language-server" ]
 auto-format = true
 indent = { tab-width = 2, unit = "  " }
@@ -731,6 +751,7 @@ name = "html"
 scope = "text.html.basic"
 injection-regex = "html"
 file-types = ["html", "htm", "shtml", "xhtml", "xht", "jsp", "asp", "aspx", "jshtm", "volt", "rhtml"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 language-servers = [ "vscode-html-language-server" ]
 auto-format = true
 indent = { tab-width = 2, unit = "  " }
@@ -901,6 +922,7 @@ injection-regex = "php"
 file-types = ["php", "inc", "php4", "php5", "phtml", "ctp"]
 shebangs = ["php"]
 roots = ["composer.json", "index.php"]
+comment-token = "//"
 language-servers = [ "intelephense" ]
 indent = { tab-width = 4, unit = "    " }
 
@@ -913,6 +935,7 @@ name = "twig"
 scope = "source.twig"
 injection-regex = "twig"
 file-types = ["twig"]
+block-comment-tokens = { start = "{#", end = "#}" }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -966,6 +989,7 @@ injection-regex = "lean"
 file-types = ["lean"]
 roots = [ "lakefile.lean" ]
 comment-token = "--"
+block-comment-tokens = { start = "/-", end = "-/" }
 language-servers = [ "lean" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -992,6 +1016,7 @@ file-types = ["jl"]
 shebangs = ["julia"]
 roots = ["Manifest.toml", "Project.toml"]
 comment-token = "#"
+block-comment-tokens = { start = "#=", end = "=#" }
 language-servers = [ "julia" ]
 indent = { tab-width = 4, unit = "    " }
 
@@ -1055,6 +1080,7 @@ scope = "source.ocaml"
 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 = "  " }
@@ -1074,6 +1100,7 @@ name = "ocaml-interface"
 scope = "source.ocaml.interface"
 file-types = ["mli"]
 shebangs = []
+block-comment-tokens = { start = "(*", end = "*)" }
 comment-token = "(**)"
 language-servers = [ "ocamllsp" ]
 indent = { tab-width = 2, unit = "  " }
@@ -1096,6 +1123,7 @@ file-types = ["lua"]
 shebangs = ["lua", "luajit"]
 roots = [".luarc.json", ".luacheckrc", ".stylua.toml", "selene.toml", ".git"]
 comment-token = "--"
+block-comment-tokens = { start = "--[[", end = "--]]" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "lua-language-server" ]
 
@@ -1121,6 +1149,7 @@ scope = "source.vue"
 injection-regex = "vue"
 file-types = ["vue"]
 roots = ["package.json"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "vuels" ]
 
@@ -1148,6 +1177,7 @@ injection-regex = "haskell"
 file-types = ["hs", "hs-boot"]
 roots = ["Setup.hs", "stack.yaml", "cabal.project"]
 comment-token = "--"
+block-comment-tokens = { start = "{-", end = "-}" }
 language-servers = [ "haskell-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -1173,6 +1203,7 @@ injection-regex = "purescript"
 file-types = ["purs"]
 roots = ["spago.yaml", "spago.dhall", "bower.json"]
 comment-token = "--"
+block-comment-tokens = { start = "{-", end = "-}" }
 language-servers = [ "purescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 auto-format = true
@@ -1227,6 +1258,7 @@ scope = "source.prolog"
 file-types = ["pl", "prolog"]
 shebangs = ["swipl"]
 comment-token = "%"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "swipl" ]
 
 [[language]]
@@ -1246,6 +1278,7 @@ name = "cmake"
 scope = "source.cmake"
 file-types = ["cmake", { glob = "CMakeLists.txt" }]
 comment-token = "#"
+block-comment-tokens = { start = "#[[", end = "]]" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "cmake-language-server" ]
 injection-regex = "cmake"
@@ -1272,6 +1305,7 @@ name = "glsl"
 scope = "source.glsl"
 file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 injection-regex = "glsl"
 
@@ -1309,6 +1343,7 @@ file-types = ["rkt", "rktd", "rktl", "scrbl"]
 shebangs = ["racket"]
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
+block-comment-tokens = { start = "#|", end = "|#" }
 language-servers = [ "racket" ]
 grammar = "scheme"
 
@@ -1343,6 +1378,7 @@ name = "wgsl"
 scope = "source.wgsl"
 file-types = ["wgsl"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "wgsl_analyzer" ]
 indent = { tab-width = 4, unit = "    " }
 
@@ -1389,6 +1425,7 @@ name = "tablegen"
 scope = "source.tablegen"
 file-types = ["td"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 injection-regex = "tablegen"
 
@@ -1404,6 +1441,7 @@ file-types = ["md", "markdown", "mkd", "mdwn", "mdown", "markdn", "mdtxt", "mdte
 roots = [".marksman.toml"]
 language-servers = [ "marksman" ]
 indent = { tab-width = 2, unit = "  " }
+block-comment-tokens = { start = "<!--", end = "-->" }
 
 [[grammar]]
 name = "markdown"
@@ -1427,6 +1465,7 @@ file-types = ["dart"]
 roots = ["pubspec.yaml"]
 auto-format = true
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "dart" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -1440,6 +1479,7 @@ scope = "source.scala"
 roots = ["build.sbt", "build.sc", "build.gradle", "build.gradle.kts", "pom.xml", ".scala-build"]
 file-types = ["scala", "sbt", "sc"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "metals" ]
 
@@ -1560,6 +1600,8 @@ scope = "source.graphql"
 injection-regex = "graphql"
 file-types = ["gql", "graphql", "graphqls"]
 language-servers = [ "graphql-language-service" ]
+comment-token = "#"
+block-comment-tokens = { start = "\"\"\"", end = "\"\"\"" }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -1574,6 +1616,7 @@ file-types = ["elm"]
 roots = ["elm.json"]
 auto-format = true
 comment-token = "--"
+block-comment-tokens = { start = "{-", end = "-}" }
 language-servers = [ "elm-language-server" ]
 indent = { tab-width = 4, unit = "    " }
 
@@ -1586,6 +1629,7 @@ name = "iex"
 scope = "source.iex"
 injection-regex = "iex"
 file-types = ["iex"]
+comment-token = "#"
 
 [[grammar]]
 name = "iex"
@@ -1599,6 +1643,7 @@ file-types = ["res"]
 roots = ["bsconfig.json"]
 auto-format = true
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "rescript-language-server" ]
 indent = { tab-width = 2, unit = "  " }
 
@@ -1635,6 +1680,7 @@ scope = "source.kotlin"
 file-types = ["kt", "kts"]
 roots = ["settings.gradle", "settings.gradle.kts"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "kotlin-language-server" ]
 
@@ -1649,6 +1695,7 @@ injection-regex = "(hcl|tf|nomad)"
 language-id = "terraform"
 file-types = ["hcl", "tf", "nomad"]
 comment-token = "#"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "terraform-ls" ]
 auto-format = true
@@ -1663,6 +1710,7 @@ scope = "source.tfvars"
 language-id = "terraform-vars"
 file-types = ["tfvars"]
 comment-token = "#"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "terraform-ls" ]
 auto-format = true
@@ -1685,6 +1733,7 @@ scope = "source.sol"
 injection-regex = "(sol|solidity)"
 file-types = ["sol"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "solc" ]
 
@@ -1713,6 +1762,7 @@ scope = "source.ron"
 injection-regex = "ron"
 file-types = ["ron"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
@@ -1754,6 +1804,7 @@ injection-regex = "(r|R)md"
 file-types = ["rmd", "Rmd"]
 indent = { tab-width = 2, unit = "  " }
 grammar = "markdown"
+block-comment-tokens = { start = "<!--", end = "-->" }
 language-servers = [ "r" ]
 
 [[language]]
@@ -1763,6 +1814,7 @@ injection-regex = "swift"
 file-types = ["swift"]
 roots = [ "Package.swift" ]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 auto-format = true
 language-servers = [ "sourcekit-lsp" ]
 
@@ -1775,6 +1827,7 @@ name = "erb"
 scope = "text.html.erb"
 injection-regex = "erb"
 file-types = ["erb"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 grammar = "embedded-template"
 
@@ -1783,6 +1836,7 @@ name = "ejs"
 scope = "text.html.ejs"
 injection-regex = "ejs"
 file-types = ["ejs"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 grammar = "embedded-template"
 
@@ -1796,6 +1850,7 @@ scope = "source.eex"
 injection-regex = "eex"
 file-types = ["eex"]
 roots = ["mix.exs", "mix.lock"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -1808,6 +1863,7 @@ scope = "source.heex"
 injection-regex = "heex"
 file-types = ["heex"]
 roots = ["mix.exs", "mix.lock"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "elixir-ls" ]
 
@@ -1820,6 +1876,7 @@ name = "sql"
 scope = "source.sql"
 file-types = ["sql", "dsql"]
 comment-token = "--"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 injection-regex = "sql"
 
@@ -1878,6 +1935,7 @@ scope = "source.vala"
 injection-regex = "vala"
 file-types = ["vala", "vapi"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "vala-language-server" ]
 
@@ -1903,6 +1961,7 @@ scope = "source.devicetree"
 injection-regex = "(dtsi?|devicetree|fdt)"
 file-types = ["dts", "dtsi"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
@@ -1941,6 +2000,7 @@ file-types = ["odin"]
 roots = ["ols.json"]
 language-servers = [ "ols" ]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "\t" }
 formatter = { command = "odinfmt", args = [ "-stdin", "true" ] }
 
@@ -1998,6 +2058,7 @@ roots = ["v.mod"]
 language-servers = [ "vlang-language-server" ]
 auto-format = true
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
@@ -2009,6 +2070,7 @@ name = "verilog"
 scope = "source.verilog"
 file-types = ["v", "vh", "sv", "svh"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "svlangserver" ]
 indent = { tab-width = 2, unit = "  " }
 injection-regex = "verilog"
@@ -2045,6 +2107,7 @@ scope = "source.openscad"
 injection-regex = "openscad"
 file-types = ["scad"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "openscad-lsp" ]
 indent = { tab-width = 2, unit = "\t" }
 
@@ -2109,6 +2172,7 @@ injection-regex = "idr"
 file-types = ["idr"]
 shebangs = []
 comment-token = "--"
+block-comment-tokens = { start = "{-", end = "-}" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "idris2-lsp" ]
 
@@ -2144,6 +2208,7 @@ scope = "source.dot"
 injection-regex = "dot"
 file-types = ["dot"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "dot-language-server" ]
 
@@ -2173,6 +2238,7 @@ scope = "source.slint"
 injection-regex = "slint"
 file-types = ["slint"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 language-servers = [ "slint-lsp" ]
 
@@ -2222,6 +2288,7 @@ scope = "source.pascal"
 injection-regex = "pascal"
 file-types = ["pas", "pp", "inc", "lpr", "lfm"]
 comment-token = "//"
+block-comment-tokens = { start = "{", end = "}" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "pasls" ]
 
@@ -2234,7 +2301,7 @@ name = "sml"
 scope = "source.sml"
 injection-regex = "sml"
 file-types = ["sml"]
-comment-token = "(*"
+block-comment-tokens = { start = "(*", end = "*)" }
 
 [[grammar]]
 name = "sml"
@@ -2246,6 +2313,7 @@ scope = "source.jsonnet"
 file-types = ["libsonnet", "jsonnet"]
 roots = ["jsonnetfile.json"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "jsonnet-language-server" ]
 
@@ -2258,6 +2326,7 @@ name = "astro"
 scope = "source.astro"
 injection-regex = "astro"
 file-types = ["astro"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -2281,6 +2350,7 @@ source = { git = "https://github.com/vito/tree-sitter-bass", rev = "501133e260d7
 name = "wat"
 scope = "source.wat"
 comment-token = ";;"
+block-comment-tokens = { start = "(;", end = ";)" }
 file-types = ["wat"]
 
 [[grammar]]
@@ -2291,6 +2361,7 @@ source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f
 name = "wast"
 scope = "source.wast"
 comment-token = ";;"
+block-comment-tokens = { start = "(;", end = ";)" }
 file-types = ["wast"]
 
 [[grammar]]
@@ -2302,6 +2373,7 @@ name = "d"
 scope = "source.d"
 file-types = [ "d", "dd" ]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 injection-regex = "d"
 indent = { tab-width = 4, unit = "    "}
 language-servers = [ "serve-d" ]
@@ -2328,6 +2400,7 @@ name = "kdl"
 scope = "source.kdl"
 file-types = ["kdl"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 injection-regex = "kdl"
 
 [[grammar]]
@@ -2398,6 +2471,7 @@ file-types = [
   "musicxml",
   "glif"
 ]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 
 [language.auto-pairs]
@@ -2437,6 +2511,7 @@ scope = "source.wit"
 injection-regex = "wit"
 file-types = ["wit"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
 
 [language.auto-pairs]
@@ -2501,6 +2576,7 @@ scope = "source.bicep"
 file-types = ["bicep"]
 auto-format = true
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = " "}
 language-servers = [ "bicep-langserver" ]
 
@@ -2513,6 +2589,8 @@ name = "qml"
 scope = "source.qml"
 file-types = ["qml"]
 language-servers = [ "qmlls" ]
+comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 4, unit = "    " }
 grammar = "qmljs"
 
@@ -2552,6 +2630,7 @@ injection-regex = "pony"
 roots = ["corral.json", "lock.json"]
 indent = { tab-width = 2, unit = "  " }
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 
 [[grammar]]
 name = "ponylang"
@@ -2563,6 +2642,7 @@ scope = "source.dhall"
 injection-regex = "dhall"
 file-types = ["dhall"]
 comment-token = "--"
+block-comment-tokens = { start = "{-", end = "-}" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "dhall-lsp-server" ]
 formatter = { command = "dhall" , args = ["format"] }
@@ -2586,6 +2666,7 @@ scope = "source.msbuild"
 injection-regex = "msbuild"
 file-types = ["proj", "vbproj", "csproj", "fsproj", "targets", "props"]
 indent = { tab-width = 2, unit = "  " }
+block-comment-tokens = { start = "<!--", end = "-->" }
 grammar = "xml"
 
 [language.auto-pairs]
@@ -2632,7 +2713,7 @@ scope = "source.tal"
 injection-regex = "tal"
 file-types = ["tal"]
 auto-format = false
-comment-token = "("
+block-comment-tokens = { start = "(", end = ")" }
 
 [[grammar]]
 name = "uxntal"
@@ -2766,6 +2847,7 @@ injection-regex = "nim"
 file-types = ["nim", "nims", "nimble"]
 shebangs = []
 comment-token = "#"
+block-comment-tokens = { start = "#[", end = "]#" }
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "nimlangserver" ]
 
@@ -2805,6 +2887,7 @@ source = { git = "https://github.com/pfeiferj/tree-sitter-hurl", rev = "264c4206
 [[language]]
 name = "markdoc"
 scope = "text.markdoc"
+block-comment-tokens = { start = "<!--", end = "-->" }
 file-types = ["mdoc"]
 language-servers = [ "markdoc-ls" ]
 
@@ -2858,6 +2941,7 @@ scope = "source.blueprint"
 injection-regex = "blueprint"
 file-types = ["blp"]
 comment-token = "//"
+block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "blueprint-compiler" ]
 indent = { tab-width = 4, unit = "    " }
 
@@ -2910,6 +2994,7 @@ name = "webc"
 scope = "text.html.webc"
 injection-regex = "webc"
 file-types = ["webc"]
+block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }
 grammar = "html"
 

From 00653c772e7df6f68071d1cb1c92bfe9ca4876f9 Mon Sep 17 00:00:00 2001
From: Mo <76752051+mo8it@users.noreply.github.com>
Date: Tue, 27 Feb 2024 18:24:05 +0100
Subject: [PATCH 765/967] Avoid cloning the whole paragraph content just for
 rendering (#9739)

* Avoid cloning the whole paragraph content just for rendering

* Fix tests
---
 helix-term/src/ui/editor.rs          |  3 ++-
 helix-term/src/ui/info.rs            |  3 ++-
 helix-term/src/ui/lsp.rs             |  4 ++--
 helix-term/src/ui/markdown.rs        |  2 +-
 helix-term/src/ui/text.rs            |  2 +-
 helix-tui/src/widgets/paragraph.rs   | 19 ++++++++-----------
 helix-tui/tests/terminal.rs          |  6 ++++--
 helix-tui/tests/widgets_paragraph.rs | 18 +++++++++---------
 8 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 15a7262a8..dffaeea03 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -716,7 +716,8 @@ impl EditorView {
             }
         }
 
-        let paragraph = Paragraph::new(lines)
+        let text = Text::from(lines);
+        let paragraph = Paragraph::new(&text)
             .alignment(Alignment::Right)
             .wrap(Wrap { trim: true });
         let width = 100.min(viewport.width);
diff --git a/helix-term/src/ui/info.rs b/helix-term/src/ui/info.rs
index cc6b7483f..651e5ca93 100644
--- a/helix-term/src/ui/info.rs
+++ b/helix-term/src/ui/info.rs
@@ -2,6 +2,7 @@ use crate::compositor::{Component, Context};
 use helix_view::graphics::{Margin, Rect};
 use helix_view::info::Info;
 use tui::buffer::Buffer as Surface;
+use tui::text::Text;
 use tui::widgets::{Block, Borders, Paragraph, Widget};
 
 impl Component for Info {
@@ -31,7 +32,7 @@ impl Component for Info {
         let inner = block.inner(area).inner(&margin);
         block.render(area, surface);
 
-        Paragraph::new(self.text.as_str())
+        Paragraph::new(&Text::from(self.text.as_str()))
             .style(text_style)
             .render(inner, surface);
     }
diff --git a/helix-term/src/ui/lsp.rs b/helix-term/src/ui/lsp.rs
index 879f963e7..a3698e38d 100644
--- a/helix-term/src/ui/lsp.rs
+++ b/helix-term/src/ui/lsp.rs
@@ -77,7 +77,7 @@ impl Component for SignatureHelp {
         let (_, sig_text_height) = crate::ui::text::required_size(&sig_text, area.width);
         let sig_text_area = area.clip_top(1).with_height(sig_text_height);
         let sig_text_area = sig_text_area.inner(&margin).intersection(surface.area);
-        let sig_text_para = Paragraph::new(sig_text).wrap(Wrap { trim: false });
+        let sig_text_para = Paragraph::new(&sig_text).wrap(Wrap { trim: false });
         sig_text_para.render(sig_text_area, surface);
 
         if self.signature_doc.is_none() {
@@ -100,7 +100,7 @@ impl Component for SignatureHelp {
         let sig_doc_area = area
             .clip_top(sig_text_area.height + 2)
             .clip_bottom(u16::from(cx.editor.popup_border()));
-        let sig_doc_para = Paragraph::new(sig_doc)
+        let sig_doc_para = Paragraph::new(&sig_doc)
             .wrap(Wrap { trim: false })
             .scroll((cx.scroll.unwrap_or_default() as u16, 0));
         sig_doc_para.render(sig_doc_area.inner(&margin), surface);
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 749d58508..81499d039 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -346,7 +346,7 @@ impl Component for Markdown {
 
         let text = self.parse(Some(&cx.editor.theme));
 
-        let par = Paragraph::new(text)
+        let par = Paragraph::new(&text)
             .wrap(Wrap { trim: false })
             .scroll((cx.scroll.unwrap_or_default() as u16, 0));
 
diff --git a/helix-term/src/ui/text.rs b/helix-term/src/ui/text.rs
index a379536f8..a9c995627 100644
--- a/helix-term/src/ui/text.rs
+++ b/helix-term/src/ui/text.rs
@@ -33,7 +33,7 @@ impl Component for Text {
     fn render(&mut self, area: Rect, surface: &mut Surface, _cx: &mut Context) {
         use tui::widgets::{Paragraph, Widget, Wrap};
 
-        let par = Paragraph::new(self.contents.clone()).wrap(Wrap { trim: false });
+        let par = Paragraph::new(&self.contents).wrap(Wrap { trim: false });
         // .scroll(x, y) offsets
 
         par.render(area, surface);
diff --git a/helix-tui/src/widgets/paragraph.rs b/helix-tui/src/widgets/paragraph.rs
index 4e8391621..9c8ae127c 100644
--- a/helix-tui/src/widgets/paragraph.rs
+++ b/helix-tui/src/widgets/paragraph.rs
@@ -28,15 +28,15 @@ fn get_line_offset(line_width: u16, text_area_width: u16, alignment: Alignment)
 /// # use helix_tui::widgets::{Block, Borders, Paragraph, Wrap};
 /// # use helix_tui::layout::{Alignment};
 /// # use helix_view::graphics::{Style, Color, Modifier};
-/// let text = vec![
+/// let text = Text::from(vec![
 ///     Spans::from(vec![
 ///         Span::raw("First"),
 ///         Span::styled("line",Style::default().add_modifier(Modifier::ITALIC)),
 ///         Span::raw("."),
 ///     ]),
 ///     Spans::from(Span::styled("Second line", Style::default().fg(Color::Red))),
-/// ];
-/// Paragraph::new(text)
+/// ]);
+/// Paragraph::new(&text)
 ///     .block(Block::default().title("Paragraph").borders(Borders::ALL))
 ///     .style(Style::default().fg(Color::White).bg(Color::Black))
 ///     .alignment(Alignment::Center)
@@ -51,7 +51,7 @@ pub struct Paragraph<'a> {
     /// How to wrap the text
     wrap: Option<Wrap>,
     /// The text to display
-    text: Text<'a>,
+    text: &'a Text<'a>,
     /// Scroll
     scroll: (u16, u16),
     /// Alignment of the text
@@ -70,7 +70,7 @@ pub struct Paragraph<'a> {
 ///     - Here is another point that is long enough to wrap"#);
 ///
 /// // With leading spaces trimmed (window width of 30 chars):
-/// Paragraph::new(bullet_points.clone()).wrap(Wrap { trim: true });
+/// Paragraph::new(&bullet_points).wrap(Wrap { trim: true });
 /// // Some indented points:
 /// // - First thing goes here and is
 /// // long so that it wraps
@@ -78,7 +78,7 @@ pub struct Paragraph<'a> {
 /// // is long enough to wrap
 ///
 /// // But without trimming, indentation is preserved:
-/// Paragraph::new(bullet_points).wrap(Wrap { trim: false });
+/// Paragraph::new(&bullet_points).wrap(Wrap { trim: false });
 /// // Some indented points:
 /// //     - First thing goes here
 /// // and is long so that it wraps
@@ -92,15 +92,12 @@ pub struct Wrap {
 }
 
 impl<'a> Paragraph<'a> {
-    pub fn new<T>(text: T) -> Paragraph<'a>
-    where
-        T: Into<Text<'a>>,
-    {
+    pub fn new(text: &'a Text) -> Paragraph<'a> {
         Paragraph {
             block: None,
             style: Default::default(),
             wrap: None,
-            text: text.into(),
+            text,
             scroll: (0, 0),
             alignment: Alignment::Left,
         }
diff --git a/helix-tui/tests/terminal.rs b/helix-tui/tests/terminal.rs
index 2824c9f24..d2d8ca101 100644
--- a/helix-tui/tests/terminal.rs
+++ b/helix-tui/tests/terminal.rs
@@ -17,14 +17,16 @@ fn terminal_buffer_size_should_not_be_limited() {
 //     let backend = TestBackend::new(10, 10);
 //     let mut terminal = Terminal::new(backend)?;
 //     let frame = terminal.draw(|f| {
-//         let paragraph = Paragraph::new("Test");
+//         let text = Text::from("Test");
+//         let paragraph = Paragraph::new(&text);
 //         f.render_widget(paragraph, f.size());
 //     })?;
 //     assert_eq!(frame.buffer.get(0, 0).symbol, "T");
 //     assert_eq!(frame.area, Rect::new(0, 0, 10, 10));
 //     terminal.backend_mut().resize(8, 8);
 //     let frame = terminal.draw(|f| {
-//         let paragraph = Paragraph::new("test");
+//         let text = Text::from("test");
+//         let paragraph = Paragraph::new(&text);
 //         f.render_widget(paragraph, f.size());
 //     })?;
 //     assert_eq!(frame.buffer.get(0, 0).symbol, "t");
diff --git a/helix-tui/tests/widgets_paragraph.rs b/helix-tui/tests/widgets_paragraph.rs
index a7c972eb5..3d2ac467b 100644
--- a/helix-tui/tests/widgets_paragraph.rs
+++ b/helix-tui/tests/widgets_paragraph.rs
@@ -21,8 +21,8 @@
 //         terminal
 //             .draw(|f| {
 //                 let size = f.size();
-//                 let text = vec![Spans::from(SAMPLE_STRING)];
-//                 let paragraph = Paragraph::new(text)
+//                 let text = Text::from(SAMPLE_STRING);
+//                 let paragraph = Paragraph::new(&text)
 //                     .block(Block::default().borders(Borders::ALL))
 //                     .alignment(alignment)
 //                     .wrap(Wrap { trim: true });
@@ -88,8 +88,8 @@
 //     terminal
 //         .draw(|f| {
 //             let size = f.size();
-//             let text = vec![Spans::from(s)];
-//             let paragraph = Paragraph::new(text)
+//             let text = Text::from(s);
+//             let paragraph = Paragraph::new(&text)
 //                 .block(Block::default().borders(Borders::ALL))
 //                 .wrap(Wrap { trim: true });
 //             f.render_widget(paragraph, size);
@@ -120,8 +120,8 @@
 //     terminal
 //         .draw(|f| {
 //             let size = f.size();
-//             let text = vec![Spans::from(s)];
-//             let paragraph = Paragraph::new(text)
+//             let text = Text::from(s);
+//             let paragraph = Paragraph::new(&text)
 //                 .block(Block::default().borders(Borders::ALL))
 //                 .wrap(Wrap { trim: true });
 //             f.render_widget(paragraph, size);
@@ -155,8 +155,8 @@
 //     terminal
 //         .draw(|f| {
 //             let size = f.size();
-
-//             let paragraph = Paragraph::new(line).block(Block::default().borders(Borders::ALL));
+//             let text = Text::from(line);
+//             let paragraph = Paragraph::new(&text).block(Block::default().borders(Borders::ALL));
 //             f.render_widget(paragraph, size);
 //         })
 //         .unwrap();
@@ -174,7 +174,7 @@
 //                 let text = Text::from(
 //                     "段落现在可以水平滚动了！\nParagraph can scroll horizontally!\nShort line",
 //                 );
-//                 let paragraph = Paragraph::new(text)
+//                 let paragraph = Paragraph::new(&text)
 //                     .block(Block::default().borders(Borders::ALL))
 //                     .alignment(alignment)
 //                     .scroll(scroll);

From 083a9e775d31678f4d984c526e7140c0d2bb2312 Mon Sep 17 00:00:00 2001
From: Chris <artofchrism@gmail.com>
Date: Wed, 28 Feb 2024 12:18:00 +0000
Subject: [PATCH 766/967] Add support for pde files (#9741)

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

diff --git a/languages.toml b/languages.toml
index 5cfc0c28d..ea2339f8b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1028,7 +1028,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "8fb3
 name = "java"
 scope = "source.java"
 injection-regex = "java"
-file-types = ["java", "jav"]
+file-types = ["java", "jav", "pde"]
 roots = ["pom.xml", "build.gradle", "build.gradle.kts"]
 language-servers = [ "jdtls" ]
 indent = { tab-width = 2, unit = "  " }

From f03b91d1b7907e78a4242c5b525e47c997f4457d Mon Sep 17 00:00:00 2001
From: Brian Dorsey <brian@dorseys.org>
Date: Wed, 28 Feb 2024 11:55:17 -0800
Subject: [PATCH 767/967] update languages.toml: tree-sitter-lua grammar
 (#9727)

* update languages.toml: tree-sitter-lua grammar

repo has moved, use new URL and the rev of the latest release (v0.0.19)

* update highlight queries

a novice attempt to port query updates from the
source repo to Helix captures and ordering

* Apply suggestions from code review

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml                     |  2 +-
 runtime/queries/lua/highlights.scm | 81 +++++++++++++++++++++++++-----
 2 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/languages.toml b/languages.toml
index ea2339f8b..fb4cda225 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1129,7 +1129,7 @@ language-servers = [ "lua-language-server" ]
 
 [[grammar]]
 name = "lua"
-source = { git = "https://github.com/MunifTanjim/tree-sitter-lua", rev = "887dfd4e83c469300c279314ff1619b1d0b85b91" }
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-lua", rev = "88e446476a1e97a8724dff7a23e2d709855077f2" }
 
 [[language]]
 name = "svelte"
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index f48e607c5..2f3b3c05f 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -1,9 +1,5 @@
 ;;; Highlighting for lua
 
-;;; Builtins
-((identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
-
 ;; Keywords
 
 (if_statement
@@ -130,16 +126,65 @@
 ((identifier) @constant
  (#match? @constant "^[A-Z][A-Z_0-9]*$"))
 
-;; Parameters
-(parameters
-  (identifier) @variable.parameter)
+;; Tables
+
+(field name: (identifier) @variable.other.member)
+
+(dot_index_expression field: (identifier) @variable.other.member)
+
+(table_constructor
+[
+  "{"
+  "}"
+] @constructor)
 
-; ;; Functions
-(function_declaration name: (identifier) @function)
-(function_call name: (identifier) @function.call)
+;; Functions
 
-(function_declaration name: (dot_index_expression field: (identifier) @function))
-(function_call name: (dot_index_expression field: (identifier) @function.call))
+(parameters (identifier) @variable.parameter)
+
+(function_call
+  (identifier) @function.builtin
+  (#any-of? @function.builtin
+    ;; built-in functions in Lua 5.1
+    "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
+    "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
+    "rawequal" "rawget" "rawset" "require" "select" "setfenv" "setmetatable"
+    "tonumber" "tostring" "type" "unpack" "xpcall"))
+
+(function_declaration
+  name: [
+    (identifier) @function
+    (dot_index_expression
+      field: (identifier) @function)
+  ])
+
+(function_declaration
+  name: (method_index_expression
+    method: (identifier) @function.method))
+
+(assignment_statement
+  (variable_list .
+    name: [
+      (identifier) @function
+      (dot_index_expression
+        field: (identifier) @function)
+    ])
+  (expression_list .
+    value: (function_definition)))
+
+(table_constructor
+  (field
+    name: (identifier) @function
+    value: (function_definition)))
+
+(function_call
+  name: [
+    (identifier) @function.call
+    (dot_index_expression
+      field: (identifier) @function.call)
+    (method_index_expression
+      method: (identifier) @function.method.call)
+  ])
 
 ; TODO: incorrectly highlights variable N in `N, nop = 42, function() end`
 (assignment_statement
@@ -153,6 +198,7 @@
 ;; Nodes
 (comment) @comment
 (string) @string
+(escape_sequence) @constant.character.escape
 (number) @constant.numeric.integer
 (label_statement) @label
 ; A bit of a tricky one, this will only match field names
@@ -162,7 +208,16 @@
 ;; Property
 (dot_index_expression field: (identifier) @variable.other.member)
 
-;; Variable
+;; Variables
+((identifier) @variable.builtin
+ (#eq? @variable.builtin "self"))
+
+(variable_list
+  (attribute
+    "<" @punctuation.bracket
+    (identifier) @attribute
+    ">" @punctuation.bracket))
+
 (identifier) @variable
 
 ;; Error

From 1143f4795414c26382a5647f2be8c20a7a62ada4 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 29 Feb 2024 02:47:41 +0100
Subject: [PATCH 768/967] fix split_on_newline (#9756)

---
 helix-core/src/selection.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 91f1d0de5..bd252deb9 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -773,12 +773,12 @@ pub fn split_on_newline(text: RopeSlice, selection: &Selection) -> Selection {
 
         let mut start = sel_start;
 
-        for mat in sel.slice(text).lines() {
-            let len = mat.len_chars();
-            let line_end_len = get_line_ending(&mat).map(|le| le.len_chars()).unwrap_or(0);
+        for line in sel.slice(text).lines() {
+            let Some(line_ending) = get_line_ending(&line) else { break };
+            let line_end = start + line.len_chars();
             // TODO: retain range direction
-            result.push(Range::new(start, start + len - line_end_len));
-            start += len;
+            result.push(Range::new(start, line_end - line_ending.len_chars()));
+            start = line_end;
         }
 
         if start < sel_end {

From e51a1e4e2ae99b8e1ad751e7dfa024a7d0e4ba8f Mon Sep 17 00:00:00 2001
From: JJ <git@toki.la>
Date: Wed, 28 Feb 2024 17:49:10 -0800
Subject: [PATCH 769/967] Switch Nim tree-sitter queries to
 alaviss/tree-sitter-nim (#9722)

---
 languages.toml                      |   4 +-
 runtime/queries/nim/highlights.scm  | 522 ++++++++++++++--------------
 runtime/queries/nim/indents.scm     |  83 +++--
 runtime/queries/nim/textobjects.scm |  44 ++-
 4 files changed, 348 insertions(+), 305 deletions(-)

diff --git a/languages.toml b/languages.toml
index fb4cda225..d2a183ded 100644
--- a/languages.toml
+++ b/languages.toml
@@ -50,6 +50,7 @@ metals = { command = "metals", config = { "isHttpEnabled" = true } }
 mint = { command = "mint", args = ["ls"] }
 nil = { command = "nil" }
 nimlangserver = { command = "nimlangserver" }
+nimlsp = { command = "nimlsp" }
 nls = { command = "nls" }
 nu-lsp = { command = "nu", args = [ "--lsp" ] }
 ocamllsp = { command = "ocamllsp" }
@@ -2858,10 +2859,9 @@ language-servers = [ "nimlangserver" ]
 "'" = "'"
 '{' = '}'
 
-# Nim's tree-sitter grammar is in heavy development.
 [[grammar]]
 name = "nim"
-source = { git = "https://github.com/aMOPel/tree-sitter-nim", rev = "240239b232550e431d67de250d1b5856209e7f06" }
+source = { git = "https://github.com/alaviss/tree-sitter-nim", rev = "c5f0ce3b65222f5dbb1a12f9fe894524881ad590" }
 
 [[language]]
 name = "cabal"
diff --git a/runtime/queries/nim/highlights.scm b/runtime/queries/nim/highlights.scm
index 1d3256853..e02ba5165 100644
--- a/runtime/queries/nim/highlights.scm
+++ b/runtime/queries/nim/highlights.scm
@@ -1,33 +1,32 @@
 ;; Constants, Comments, and Literals
 
 (comment) @comment.line
-(multilineComment) @comment.block
-(docComment) @comment.block.documentation
-(multilineDocComment) @comment.block.documentation
-; comments
-
-[(literal) (generalizedLit)] @constant
-[(nil_lit)] @constant.builtin
-[(bool_lit)] @constant.builtin.boolean
-[(char_lit)] @constant.character
-[(char_esc_seq) (str_esc_seq)] @constant.character.escape
-[(custom_numeric_lit)] @constant.numeric
-[(int_lit) (int_suffix)] @constant.numeric.integer
-[(float_lit) (float_suffix)] @constant.numeric.float
+(block_comment) @comment.block
+[
+  (documentation_comment)
+  (block_documentation_comment)
+] @comment.block.documentation
+
+(nil_literal) @constant.builtin
+((identifier) @constant.builtin.boolean
+  (#any-of? @constant.builtin.boolean "true" "false" "on" "off"))
+
+(char_literal) @constant.character
+(escape_sequence) @constant.character.escape
+(custom_numeric_literal) @constant.numeric
+(integer_literal) @constant.numeric.integer
+(float_literal) @constant.numeric.float
 ; literals
-; note: somewhat irritatingly for testing, lits have the same syntax highlighting as types
+; todo: literal?
 
 [
-  (str_lit)
-  (triplestr_lit)
-  (rstr_lit)
-  (generalized_str_lit)
-  (generalized_triplestr_lit)
-  (interpolated_str_lit)
-  (interpolated_triplestr_lit)
+  (long_string_literal)
+  (raw_string_literal)
+  (generalized_string)
+  (interpreted_string_literal)
 ] @string
+; (generalized_string (string_content) @none) ; todo: attempt to un-match string_content
 ; [] @string.regexp
-; string literals
 
 [
   "."
@@ -44,272 +43,291 @@
   "}"
   "{."
   ".}"
-  "#["
-  "]#"
 ] @punctuation.bracket
-(interpolated_str_lit "&" @punctuation.special)
-(interpolated_str_lit "{" @punctuation.special)
-(interpolated_str_lit "}" @punctuation.special)
-; punctuation
+; todo: interpolated_str_lit?? & { }?
 
 [
   "and"
   "or"
   "xor"
   "not"
-  "in"
-  "notin"
-  "is"
-  "isnot"
   "div"
   "mod"
   "shl"
   "shr"
+  "from"
+  "as"
+  "of"
+  "in"
+  "notin"
+  "is"
+  "isnot"
 ] @keyword.operator
-; operators: we list them explicitly to deliminate them from symbolic operators
-
-[(operator) (opr) "="] @operator
-; all operators (must come after @keyword.operator)
 
-(pragma) @attribute
-; pragmas
+[(operator) "="] @operator
+(infix_expression operator: _ @operator)
+(prefix_expression operator: _ @operator)
 
+(pragma_list
+  (identifier)? @attribute
+  (colon_expression
+    (identifier) @attribute)?)
 
 ;; Imports and Exports
 
-(importStmt
-  (keyw) @keyword.control.import
-  (expr (primary (symbol) @namespace))?
-  (expr (primary (arrayConstr (exprColonExprList (exprColonExpr (expr (primary (symbol) @namespace)))))))?)
-(exportStmt
-  (keyw) @keyword.control.import
-  (expr (primary (symbol) @namespace))?
-  (expr (primary (arrayConstr (exprColonExprList (exprColonExpr (expr (primary (symbol) @namespace)))))))?)
-(fromStmt
-  (keyw) @keyword.control.import
-  (expr (primary (symbol) @namespace))?
-  (expr (primary (arrayConstr (exprColonExprList (exprColonExpr (expr (primary (symbol) @namespace)))))))?)
-(includeStmt
-  (keyw) @keyword.control.import
-  (expr (primary (symbol) @namespace))?
-  (expr (primary (arrayConstr (exprColonExprList (exprColonExpr (expr (primary (symbol) @namespace)))))))?)
-(importExceptStmt
-  (keyw) @keyword.control.import
-  (expr (primary (symbol) @namespace))?
-  (expr (primary (arrayConstr (exprColonExprList (exprColonExpr (expr (primary (symbol) @namespace)))))))?)
-; import statements
-; yeah, this is a bit gross.
-
+[
+  "import"
+  "export"
+  "include"
+  "from"
+] @keyword.control.import
+
+(import_statement
+  [
+    (identifier) @namespace
+    (expression_list (identifier) @namespace)
+    (except_clause
+      "except" @keyword.control.import
+      (expression_list (identifier) @namespace))])
+(import_from_statement
+  (identifier) @namespace
+  (expression_list (identifier) @namespace))
+(include_statement (expression_list (identifier) @namespace))
+(export_statement (expression_list (identifier) @namespace))
 
 ;; Control Flow
 
-(ifStmt (keyw) @keyword.control.conditional)
-(whenStmt (keyw) @keyword.control.conditional)
-(elifStmt (keyw) @keyword.control.conditional)
-(elseStmt (keyw) @keyword.control.conditional)
-(caseStmt (keyw) @keyword.control.conditional)
-(ofBranch (keyw) @keyword.control.conditional)
-(inlineIfStmt (keyw) @keyword.control.conditional)
-(inlineWhenStmt (keyw) @keyword.control.conditional)
+[
+  "if"
+  "when"
+  "case"
+  "elif"
+  "else"
+] @keyword.control.conditional
+(of_branch "of" @keyword.control.conditional)
 ; conditional statements
 ; todo: do block
 
-(forStmt
-  . (keyw) @keyword.control.repeat
-  . (symbol) @variable
-  . (keyw) @keyword.control.repeat)
-(whileStmt (keyw) @keyword.control.repeat)
-; loop statements
-
-(returnStmt (keyw) @keyword.control.repeat)
-(yieldStmt (keyw) @keyword.control.repeat)
-(discardStmt (keyw) @keyword.control.repeat)
-(breakStmt (keyw) @keyword.control.repeat)
-(continueStmt (keyw) @keyword.control.repeat)
-; control flow statements
-
-(raiseStmt (keyw) @keyword.control.exception)
-(tryStmt (keyw) @keyword.control.exception)
-(tryExceptStmt (keyw) @keyword.control.exception)
-(tryFinallyStmt (keyw) @keyword.control.exception)
-(inlineTryStmt (keyw) @keyword.control.exception)
-; (inlineTryExceptStmt (keyw) @keyword.control.exception)
-; (inlineTryFinallyStmt (keyw) @keyword.control.exception)
-; exception handling statements
+"block" @keyword.control
+(block label: (_) @label)
 
-(staticStmt (keyw) @keyword)
-(deferStmt (keyw) @keyword)
-(asmStmt (keyw) @keyword)
-(bindStmt (keyw) @keyword)
-(mixinStmt (keyw) @keyword)
-; miscellaneous blocks
+[
+  "for"
+  "while"
+  "continue"
+  "break"
+] @keyword.control.repeat
+(for "in" @keyword.control.repeat)
 
-(blockStmt
-  (keyw) @keyword.control
-  (symbol) @label)
-; block statements
+[
+  "return"
+  "yield"
+] @keyword.control.return
+; return statements
 
+[
+  "try"
+  "except"
+  "finally"
+  "raise"
+] @keyword.control.exception
+; exception handling statements
 
-;; Types and Type Declarations
+[
+  "asm"
+  "bind"
+  "mixin"
+  "defer"
+  "static"
+] @keyword
+; miscellaneous keywords
 
-(typeDef
-  (keyw) @keyword.storage.type
-  (symbol) @type)
-; names of new types type declarations
-
-(exprColonEqExpr
-  . (expr (primary (symbol) @variable))
-  . (expr (primary (symbol) @type)))
-; variables in inline tuple declarations
-
-(primarySuffix
-  (indexSuffix
-    (exprColonEqExprList
-      (exprColonEqExpr
-        (expr
-          (primary
-            (symbol) @type))))))
-; nested types in brackets, i.e. seq[string]
-
-(primaryTypeDef (symbol) @type)
-; primary types of type declarations (NOT nested types)
-
-(primaryTypeDef (primaryPrefix (keyw) @type))
-; for consistency
-
-(primaryTypeDesc (symbol) @type)
-; type annotations, on declarations or in objects
-
-(primaryTypeDesc (primaryPrefix (keyw) @type))
-; var types etc
-
-(genericParamList (genericParam (symbol) @type))
-; types in generic blocks
-
-(enumDecl (keyw) @keyword.storage.type)
-(enumElement (symbol) @type.enum.variant)
-; enum declarations and elements
-
-(tupleDecl (keyw) @keyword.storage.type)
-; tuple declarations
-
-(objectDecl (keyw) @keyword.storage.type)
-(objectPart (symbol) @variable.other.member)
-; object declarations and fields
-
-(objectCase
-  (keyw) @keyword.control.conditional
-  (symbol) @variable.other.member)
-(objectBranch (keyw) @keyword.control.conditional)
-(objectElif (keyw) @keyword.control.conditional)
-(objectElse (keyw) @keyword.control.conditional)
-(objectWhen (keyw) @keyword.control.conditional)
-; variant objects
-
-(conceptDecl (keyw) @keyword.storage.type)
-(conceptParam (keyw) @type)
-(conceptParam (symbol) @variable)
-; concept declarations, parameters, and qualifiers on those parameters
-
-((expr
-  (primary (symbol))
-  (operator) @operator
-  (primary (symbol) @type))
- (#match? @operator "is"))
-((exprStmt
-  (primary (symbol))
-  (operator) @operator
-  (primary (symbol) @type))
- (#match? @operator "is"))
-; symbols likely to be types: "x is t" means t is either a type or a type variable
-
-; distinct?
+;; Types and Type Declarations
 
+[
+  "let"
+  "var"
+  "const"
+  "type"
+  "object"
+  "tuple"
+  "enum"
+  "concept"
+] @keyword.storage.type
+
+(var_type "var" @keyword.storage.modifier)
+(out_type "out" @keyword.storage.modifier)
+(distinct_type "distinct" @keyword.storage.modifier)
+(ref_type "ref" @keyword.storage.modifier)
+(pointer_type "ptr" @keyword.storage.modifier)
+
+(var_parameter "var" @keyword.storage.modifier)
+(type_parameter "type" @keyword.storage.modifier)
+(static_parameter "static" @keyword.storage.modifier)
+(ref_parameter "ref" @keyword.storage.modifier)
+(pointer_parameter "ptr" @keyword.storage.modifier)
+; (var_parameter (identifier) @variable.parameter)
+; (type_parameter (identifier) @variable.parameter)
+; (static_parameter (identifier) @variable.parameter)
+; (ref_parameter (identifier) @variable.parameter)
+; (pointer_parameter (identifier) @variable.parameter)
+; todo: when are these used??
+
+(type_section
+  (type_declaration
+    (type_symbol_declaration
+      name: (_) @type)))
+; types in type declarations
+
+(enum_field_declaration
+  (symbol_declaration
+    name: (_) @type.enum.variant))
+; types as enum variants
+
+(variant_declaration
+  alternative: (of_branch
+    values: (expression_list (_) @type.enum.variant)))
+; types as object variants
+
+(case
+  (of_branch
+    values: (expression_list (_) @constant)))
+; case values are guaranteed to be constant
+
+(type_expression
+  [
+    (identifier) @type
+    (bracket_expression
+      [
+        (identifier) @type
+        (argument_list (identifier) @type)])
+    (tuple_construction
+      [
+        (identifier) @type
+        (bracket_expression
+          [
+            (identifier) @type
+            (argument_list (identifier) @type)])])])
+; types in type expressions
+
+(call
+  function: (bracket_expression
+    right: (argument_list (identifier) @type)))
+; types as generic parameters
+
+; (dot_generic_call
+;   generic_arguments: (_) @type)
+; ???
+
+(infix_expression
+  operator:
+    [
+      "is"
+      "isnot"
+    ]
+  right: (_) @type)
+; types in "is" comparisions
+
+(except_branch
+  values: (expression_list
+    [
+      (identifier) @type
+      (infix_expression
+        left: (identifier) @type
+        operator: "as"
+        right: (_) @variable)]))
+; types in exception branches
 
 ;; Functions
 
-(routine
-  . (keyw) @keyword.function
-  . (symbol) @function)
-; function declarations
-
-(routineExpr (keyw) @keyword.function)
-; discarded function
-
-(routineExprTypeDesc (keyw) @keyword.function)
-; function declarations as types
-
-(primary
-  . (symbol) @function.call
-  . (primarySuffix (functionCall)))
-; regular function calls
-
-(primary
-  . (symbol) @function.call
-  . (primarySuffix (cmdCall)))
-; function calls without parenthesis
-
-(primary
-  (primarySuffix (qualifiedSuffix (symbol) @function.call))
-  . (primarySuffix (functionCall)))
-; uniform function call syntax calls
-
-(primary
-  (primarySuffix (qualifiedSuffix (symbol) @function.call))
-  . (primarySuffix (cmdCall)))
-; just in case
-
-(primary
-  (symbol) @constructor
-  (primarySuffix (objectConstr)))
-; object constructor
-
-; does not appear to be a way to distinguish these without verbatium matching
-; [] @function.builtin
-; [] @function.method
-; [] @function.macro
-; [] @function.special
-
+[
+  "proc"
+  "func"
+  "method"
+  "converter"
+  "iterator"
+  "template"
+  "macro"
+] @keyword.function
+
+(exported_symbol "*" @attribute)
+(_ "=" @punctuation.delimiter [body: (_) value: (_)])
+
+(proc_declaration name: (_) @function)
+(func_declaration name: (_) @function)
+(iterator_declaration name: (_) @function)
+(converter_declaration name: (_) @function)
+(method_declaration name: (_) @function.method)
+(template_declaration name: (_) @function.macro)
+(macro_declaration name: (_) @function.macro)
+(symbol_declaration name: (_) @variable)
+
+(call
+  function: [
+    (identifier) @function.call
+    (dot_expression
+      right: (identifier) @function.call)
+    (bracket_expression
+      left: [
+        (identifier) @function.call
+        (dot_expression
+          right: (identifier) @function.call)])])
+(generalized_string
+  function: [
+    (identifier) @function.call
+    (dot_expression
+      right: (identifier) @function.call)
+    (bracket_expression
+      left: [
+        (identifier) @function.call
+        (dot_expression
+          right: (identifier) @function.call)])])
+(dot_generic_call function: (_) @function.call)
 
 ;; Variables
 
-(paramList (paramColonEquals (symbol) @variable.parameter))
-; parameter identifiers
-
-(identColon (ident) @variable.other.member)
-; named parts of tuples
-
-(symbolColonExpr (symbol) @variable)
-; object constructor parameters
-
-(symbolEqExpr (symbol) @variable)
-; named parameters
+(parameter_declaration
+  (symbol_declaration_list
+    (symbol_declaration
+      name: (_) @variable.parameter)))
+(argument_list
+  (equal_expression
+    left: (_) @variable.parameter))
+(concept_declaration
+  parameters: (parameter_list (identifier) @variable.parameter))
+
+(field_declaration
+  (symbol_declaration_list
+    (symbol_declaration
+      name: (_) @variable.other.member)))
+(call
+  (argument_list
+    (colon_expression
+      left: (_) @variable.other.member)))
+(tuple_construction
+  (colon_expression
+    left: (_) @variable.other.member))
+(variant_declaration
+  (variant_discriminator_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: (_) @variable.other.member))))
+
+;; Miscellaneous Matches
 
-(variable
-  (keyw) @keyword.storage.type
-  (declColonEquals (symbol) @variable))
-; let, var, const expressions
-
-((primary (symbol) @variable.builtin)
- (#match? @variable.builtin "result"))
-; `result` is an implicit builtin variable inside function scopes
-
-((primary (symbol) @type)
- (#match? @type "^[A-Z]"))
-; assume PascalCase identifiers to be types
-
-((primary
-  (primarySuffix
-    (qualifiedSuffix
-      (symbol) @type)))
- (#match? @type "^[A-Z]"))
-; assume PascalCase member variables to be enum entries
+[
+  "cast"
+  "discard"
+  "do"
+] @keyword
+; also: addr end interface using
 
-(primary (symbol) @variable)
-; overzealous, matches variables
+(blank_identifier) @variable.builtin
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "result"))
 
-(primary (primarySuffix (qualifiedSuffix (symbol) @variable.other.member)))
-; overzealous, matches member variables: i.e. x in foo.x
+(dot_expression
+  left: (identifier) @variable
+  right: (identifier) @variable.other.member)
 
-(keyw) @keyword
-; more specific matches are done above whenever possible
+(identifier) @variable
diff --git a/runtime/queries/nim/indents.scm b/runtime/queries/nim/indents.scm
index 677435407..3b3023868 100644
--- a/runtime/queries/nim/indents.scm
+++ b/runtime/queries/nim/indents.scm
@@ -1,48 +1,59 @@
 [
-  (typeDef)
-  (ifStmt)
-  (whenStmt)
-  (elifStmt)
-  (elseStmt)
-  (ofBranch) ; note: not caseStmt
-  (whileStmt)
-  (tryStmt)
-  (tryExceptStmt)
-  (tryFinallyStmt)
-  (forStmt)
-  (blockStmt)
-  (staticStmt)
-  (deferStmt)
-  (asmStmt)
-  ; exprStmt?
+  (if)
+  (when)
+  (elif_branch)
+  (else_branch)
+  (of_branch) ; note: not case_statement
+  (block)
+  (while)
+  (for)
+  (try)
+  (except_branch)
+  (finally_branch)
+  (defer)
+  (static_statement)
+  (proc_declaration)
+  (func_declaration)
+  (iterator_declaration)
+  (converter_declaration)
+  (method_declaration)
+  (template_declaration)
+  (macro_declaration)
+  (symbol_declaration)
 ] @indent
 ;; increase the indentation level
 
 [
-  (ifStmt)
-  (whenStmt)
-  (elifStmt)
-  (elseStmt)
-  (ofBranch) ; note: not caseStmt
-  (whileStmt)
-  (tryStmt)
-  (tryExceptStmt)
-  (tryFinallyStmt)
-  (forStmt)
-  (blockStmt)
-  (staticStmt)
-  (deferStmt)
-  (asmStmt)
-  ; exprStmt?
+  (if)
+  (when)
+  (elif_branch)
+  (else_branch)
+  (of_branch) ; note: not case_statement
+  (block)
+  (while)
+  (for)
+  (try)
+  (except_branch)
+  (finally_branch)
+  (defer)
+  (static_statement)
+  (proc_declaration)
+  (func_declaration)
+  (iterator_declaration)
+  (converter_declaration)
+  (method_declaration)
+  (template_declaration)
+  (macro_declaration)
+  (symbol_declaration)
 ] @extend
 ;; ???
 
 [
-  (returnStmt)
-  (raiseStmt)
-  (yieldStmt)
-  (breakStmt)
-  (continueStmt)
+  (return_statement)
+  (raise_statement)
+  (yield_statement)
+  (break_statement)
+  (continue_statement)
 ] @extend.prevent-once
 ;; end a level of indentation while staying indented
 
diff --git a/runtime/queries/nim/textobjects.scm b/runtime/queries/nim/textobjects.scm
index 943aa7f08..eaa3e8e8c 100644
--- a/runtime/queries/nim/textobjects.scm
+++ b/runtime/queries/nim/textobjects.scm
@@ -1,19 +1,33 @@
-(routine
-  (block) @function.inside) @function.around
+(proc_declaration
+  body: (_) @function.inside) @function.around
+(func_declaration
+  body: (_) @function.inside) @function.around
+(iterator_declaration
+  body: (_) @function.inside) @function.around
+(converter_declaration
+  body: (_) @function.inside) @function.around
+(method_declaration
+  body: (_) @function.inside) @function.around
+(template_declaration
+  body: (_) @function.inside) @function.around
+(macro_declaration
+  body: (_) @function.inside) @function.around
 
-; @class.inside (types?)
-; @class.around
+(type_declaration (_) @class.inside) @class.around
 
-; paramListSuffix is strange and i do not understand it
-(paramList
-  (paramColonEquals) @parameter.inside) @parameter.around
+(parameter_declaration
+  (symbol_declaration_list) @parameter.inside) @parameter.around
 
-(comment) @comment.inside
-(multilineComment) @comment.inside
-(docComment) @comment.inside
-(multilineDocComment) @comment.inside
+[
+  (comment)
+  (block_comment)
+  (documentation_comment)
+  (block_documentation_comment)
+] @comment.inside
 
-(comment)+ @comment.around
-(multilineComment) @comment.around
-(docComment)+ @comment.around
-(multilineDocComment) @comment.around
+[
+  (comment)+
+  (block_comment)
+  (documentation_comment)+
+  (block_documentation_comment)+
+] @comment.around

From d0bb77447138f5f70f96b174a8f29045a956c8c4 Mon Sep 17 00:00:00 2001
From: Keir Lawson <keirlawson@gmail.com>
Date: Thu, 29 Feb 2024 10:09:29 +0000
Subject: [PATCH 770/967] Mark GTK builder ui files as XML (#9754)

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

diff --git a/languages.toml b/languages.toml
index d2a183ded..a2c10d114 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2470,7 +2470,8 @@ file-types = [
   "xul",
   "xoml",
   "musicxml",
-  "glif"
+  "glif",
+  "ui"
 ]
 block-comment-tokens = { start = "<!--", end = "-->" }
 indent = { tab-width = 2, unit = "  " }

From 44db25939c9361272660854878eb2fc18fcf08e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= <dpc@dpc.pw>
Date: Thu, 29 Feb 2024 17:57:31 -0800
Subject: [PATCH 771/967] Document embracing smart-tab navigation. (#9762)

Re #4443
---
 book/src/configuration.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index de33c1ade..d87936457 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -375,8 +375,25 @@ wrap-indicator = ""  # set wrap-indicator to "" to hide it
 
 ### `[editor.smart-tab]` Section
 
+Options for navigating and editing using tab key.
 
 | Key        | Description | Default |
 |------------|-------------|---------|
 | `enable` | If set to true, then when the cursor is in a position with non-whitespace to its left, instead of inserting a tab, it will run `move_parent_node_end`. If there is only whitespace to the left, then it inserts a tab as normal. With the default bindings, to explicitly insert a tab character, press Shift-tab. | `true` |
 | `supersede-menu` | Normally, when a menu is on screen, such as when auto complete is triggered, the tab key is bound to cycling through the items. This means when menus are on screen, one cannot use the tab key to trigger the `smart-tab` command. If this option is set to true, the `smart-tab` command always takes precedence, which means one cannot use the tab key to cycle through menu items. One of the other bindings must be used instead, such as arrow keys or `C-n`/`C-p`. | `false` |
+
+
+Due to lack of support for S-tab in some terminals, the default keybindings don't fully embrace smart-tab editing experience. If you enjoy smart-tab navigation and a terminal that supports the [Enhanced Keyboard protocol](https://github.com/helix-editor/helix/wiki/Terminal-Support#enhanced-keyboard-protocol), consider setting extra keybindings:
+
+```
+[keys.normal]
+tab = "move_parent_node_end"
+S-tab = "move_parent_node_start"
+
+[keys.insert]
+S-tab = "move_parent_node_start"
+
+[keys.select]
+tab = "extend_parent_node_end"
+S-tab = "extend_parent_node_start"
+```

From 062fb819a21a3b17baf0cded3463a2d9f3e6b4a9 Mon Sep 17 00:00:00 2001
From: Felix Zeller <felixazeller@gmail.com>
Date: Fri, 1 Mar 2024 10:10:49 -0500
Subject: [PATCH 772/967] feat: Add markdown-oxide language server (#9758)

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

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 1bc6b0817..c9668549e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -104,7 +104,7 @@
 | lua | ✓ | ✓ | ✓ | `lua-language-server` |
 | make | ✓ |  | ✓ |  |
 | markdoc | ✓ |  |  | `markdoc-ls` |
-| markdown | ✓ |  |  | `marksman` |
+| markdown | ✓ |  |  | `marksman`, `markdown-oxide` |
 | markdown.inline | ✓ |  |  |  |
 | matlab | ✓ | ✓ | ✓ |  |
 | mermaid | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index a2c10d114..26f6509ce 100644
--- a/languages.toml
+++ b/languages.toml
@@ -45,6 +45,7 @@ kotlin-language-server = { command = "kotlin-language-server" }
 lean = { command = "lean", args = [ "--server" ] }
 ltex-ls = { command = "ltex-ls" }
 markdoc-ls = { command = "markdoc-ls", args = ["--stdio"] }
+markdown-oxide = { command = "markdown-oxide" }
 marksman = { command = "marksman", args = ["server"] }
 metals = { command = "metals", config = { "isHttpEnabled" = true } }
 mint = { command = "mint", args = ["ls"] }
@@ -1440,7 +1441,7 @@ scope = "source.md"
 injection-regex = "md|markdown"
 file-types = ["md", "markdown", "mkd", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook", { glob = "PULLREQ_EDITMSG" }]
 roots = [".marksman.toml"]
-language-servers = [ "marksman" ]
+language-servers = [ "marksman", "markdown-oxide" ]
 indent = { tab-width = 2, unit = "  " }
 block-comment-tokens = { start = "<!--", end = "-->" }
 

From 1d6db30acf91ec1041e014650bf263defdc3feee Mon Sep 17 00:00:00 2001
From: Marcin Drzymala <5504827+drzymalanet@users.noreply.github.com>
Date: Sat, 2 Mar 2024 03:05:17 +0100
Subject: [PATCH 773/967] Fix bug 9703 by commenting out the wrong command
 (#9778)

* Fix bug 9703 by commenting out the wrong command

This fixes issue https://github.com/helix-editor/helix/issues/9703 by removing the wrong formatting command for justfiles.

* Fix indentation width for justfile
---
 languages.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 26f6509ce..a4b6a5cd8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2915,9 +2915,9 @@ scope = "source.just"
 file-types = [{ glob = "justfile" }, { glob = "Justfile" }, { glob = ".justfile" }, { glob = ".Justfile" }]
 injection-regex = "just"
 comment-token = "#"
-indent = { tab-width = 4, unit = "\t" }
-auto-format = true
-formatter = { command = "just", args = ["--dump"] }
+indent = { tab-width = 4, unit = "    " }
+# auto-format = true
+# formatter = { command = "just", args = ["--dump"] } # Please see: https://github.com/helix-editor/helix/issues/9703
 
 [[grammar]]
 name = "just"

From 5ca6a448e9b66f4f5b4caa7cd173252d0a78f92d Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 1 Mar 2024 23:37:11 -0500
Subject: [PATCH 774/967] Support LSP diagnostic tags (#9780)

---
 book/src/themes.md          |  2 ++
 helix-lsp/src/client.rs     |  6 ++++++
 helix-term/src/ui/editor.rs | 15 ++++++++++++++-
 theme.toml                  |  2 ++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index f040dfb19..04d6a69b3 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -333,5 +333,7 @@ These scopes are used for theming the editor interface:
 | `diagnostic.info`                 | Diagnostics info (editing area)                                                                |
 | `diagnostic.warning`              | Diagnostics warning (editing area)                                                             |
 | `diagnostic.error`                | Diagnostics error (editing area)                                                               |
+| `diagnostic.unnecessary`          | Diagnostics with unnecessary tag (editing area)                                                |
+| `diagnostic.deprecated`           | Diagnostics with deprecated tag (editing area)                                                 |
 
 [editor-section]: ./configuration.md#editor-section
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 8d03d7992..a7b3989dd 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -631,6 +631,12 @@ impl Client {
                     }),
                     publish_diagnostics: Some(lsp::PublishDiagnosticsClientCapabilities {
                         version_support: Some(true),
+                        tag_support: Some(lsp::TagSupport {
+                            value_set: vec![
+                                lsp::DiagnosticTag::UNNECESSARY,
+                                lsp::DiagnosticTag::DEPRECATED,
+                            ],
+                        }),
                         ..Default::default()
                     }),
                     inlay_hint: Some(lsp::InlayHintClientCapabilities {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index dffaeea03..f3bba5d1c 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -360,7 +360,7 @@ impl EditorView {
         doc: &Document,
         theme: &Theme,
     ) -> [Vec<(usize, std::ops::Range<usize>)>; 5] {
-        use helix_core::diagnostic::Severity;
+        use helix_core::diagnostic::{DiagnosticTag, Severity};
         let get_scope_of = |scope| {
             theme
             .find_scope_index_exact(scope)
@@ -380,6 +380,10 @@ impl EditorView {
         let error = get_scope_of("diagnostic.error");
         let r#default = get_scope_of("diagnostic"); // this is a bit redundant but should be fine
 
+        // Diagnostic tags
+        let unnecessary = theme.find_scope_index_exact("diagnostic.unnecessary");
+        let deprecated = theme.find_scope_index_exact("diagnostic.deprecated");
+
         let mut default_vec: Vec<(usize, std::ops::Range<usize>)> = Vec::new();
         let mut info_vec = Vec::new();
         let mut hint_vec = Vec::new();
@@ -396,6 +400,15 @@ impl EditorView {
                 _ => (&mut default_vec, r#default),
             };
 
+            let scope = diagnostic
+                .tags
+                .first()
+                .and_then(|tag| match tag {
+                    DiagnosticTag::Unnecessary => unnecessary,
+                    DiagnosticTag::Deprecated => deprecated,
+                })
+                .unwrap_or(scope);
+
             // If any diagnostic overlaps ranges with the prior diagnostic,
             // merge the two together. Otherwise push a new span.
             match vec.last_mut() {
diff --git a/theme.toml b/theme.toml
index dd1a5d889..8a5bfd72d 100644
--- a/theme.toml
+++ b/theme.toml
@@ -80,6 +80,8 @@ label = "honey"
 "diagnostic.info" = { underline = { color = "delta", style = "curl" } }
 "diagnostic.warning" = { underline = { color = "lightning", style = "curl" } }
 "diagnostic.error" = { underline = { color = "apricot", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
 warning = "lightning"
 error = "apricot"

From f04dafa2e23e30771db92fdf6f39fcd1f0f5d0d6 Mon Sep 17 00:00:00 2001
From: Malpha <mega.alpha100@gmail.com>
Date: Sat, 2 Mar 2024 07:47:10 +0000
Subject: [PATCH 775/967] languages.toml: add elvish shebang (#9779)

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

diff --git a/languages.toml b/languages.toml
index a4b6a5cd8..7d859c2e4 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2157,6 +2157,7 @@ grammar = "python"
 [[language]]
 name = "elvish"
 scope = "source.elvish"
+shebangs = ["elvish"]
 file-types = ["elv"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }

From d769fadde085169c26a850966a6d5d8da7cc1c12 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 2 Mar 2024 02:47:24 -0500
Subject: [PATCH 776/967] Fix precedence of svelte typescript injection (#9777)

---
 runtime/queries/svelte/injections.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/runtime/queries/svelte/injections.scm b/runtime/queries/svelte/injections.scm
index 65a6e0e41..52d430c3f 100644
--- a/runtime/queries/svelte/injections.scm
+++ b/runtime/queries/svelte/injections.scm
@@ -19,13 +19,6 @@
    (quoted_attribute_value (attribute_value) @css))
  (#eq? @_attr "style"))
 
-((script_element
-  (raw_text) @injection.content)
-  (#set! injection.language "javascript"))
-
-((raw_text_expr) @injection.content
- (#set! injection.language "javascript"))
-
 (
   (script_element
     (start_tag
@@ -36,5 +29,12 @@
   (#set! injection.language "typescript")
 )
 
+((script_element
+  (raw_text) @injection.content)
+  (#set! injection.language "javascript"))
+
+((raw_text_expr) @injection.content
+ (#set! injection.language "javascript"))
+
 ((comment) @injection.content
  (#set! injection.language "comment"))

From 5bd007266a962a534bd722619821e998735b71e2 Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Sat, 2 Mar 2024 06:05:58 -0800
Subject: [PATCH 777/967] Fix panic when using join_selections_space (#9783)

Joining lines with Alt-J does not properly select the inserted spaces
when the selection contains blank lines. In the worst case it panics
with an out of bounds index.

thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value:
Char index out of bounds: char index 11, Rope/RopeSlice char length 10'

Steps to reproduce:
* Create a new document
    ```
    a

    b

    c

    d

    e
    ```
* % (Select all)
* Alt-J (join and select the spaces)
---
 helix-term/src/commands.rs        | 23 ++++++---
 helix-term/tests/test/commands.rs | 83 +++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index bd0a60b7c..0b2ea0b8a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4372,16 +4372,27 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
 
     // select inserted spaces
     let transaction = if select_space {
+        let mut offset: usize = 0;
         let ranges: SmallVec<_> = changes
             .iter()
-            .scan(0, |offset, change| {
-                let range = Range::point(change.0 - *offset);
-                *offset += change.1 - change.0 - 1; // -1 because cursor is 0-sized
-                Some(range)
+            .filter_map(|change| {
+                if change.2.is_some() {
+                    let range = Range::point(change.0 - offset);
+                    offset += change.1 - change.0 - 1; // -1 adjusts for the replacement of the range by a space
+                    Some(range)
+                } else {
+                    offset += change.1 - change.0;
+                    None
+                }
             })
             .collect();
-        let selection = Selection::new(ranges, 0);
-        Transaction::change(text, changes.into_iter()).with_selection(selection)
+        let t = Transaction::change(text, changes.into_iter());
+        if ranges.is_empty() {
+            t
+        } else {
+            let selection = Selection::new(ranges, 0);
+            t.with_selection(selection)
+        }
     } else {
         Transaction::change(text, changes.into_iter())
     };
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index e52b142c6..1172a7981 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -526,3 +526,86 @@ async fn test_join_selections() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_join_selections_space() -> anyhow::Result<()> {
+    // join with empty lines panic
+    test((
+        platform_line(indoc! {"\
+            #[a
+
+            b
+
+            c
+
+            d
+
+            e|]#
+        "}),
+        "<A-J>",
+        platform_line(indoc! {"\
+            a#[ |]#b#( |)#c#( |)#d#( |)#e
+        "}),
+    ))
+    .await?;
+
+    // normal join
+    test((
+        platform_line(indoc! {"\
+            #[a|]#bc
+            def
+        "}),
+        "<A-J>",
+        platform_line(indoc! {"\
+            abc#[ |]#def
+        "}),
+    ))
+    .await?;
+
+    // join with empty line
+    test((
+        platform_line(indoc! {"\
+            #[a|]#bc
+
+            def
+        "}),
+        "<A-J>",
+        platform_line(indoc! {"\
+            #[a|]#bc
+            def
+        "}),
+    ))
+    .await?;
+
+    // join with additional space in non-empty line
+    test((
+        platform_line(indoc! {"\
+            #[a|]#bc
+
+                def
+        "}),
+        "<A-J><A-J>",
+        platform_line(indoc! {"\
+            abc#[ |]#def
+        "}),
+    ))
+    .await?;
+
+    // join with retained trailing spaces
+    test((
+        platform_line(indoc! {"\
+            #[aaa   
+
+            bb  
+
+            c |]#
+        "}),
+        "<A-J>",
+        platform_line(indoc! {"\
+            aaa   #[ |]#bb  #( |)#c 
+        "}),
+    ))
+    .await?;
+
+    Ok(())
+}

From 9267343830228490d379c90537ff1a6e4bba1260 Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Sun, 3 Mar 2024 09:55:09 -0800
Subject: [PATCH 778/967] Fix panic when using surround_replace/delete (#9796)

1. Create a document containing `{A}`
1. C-w v # vsplit
1. gl    # goto_line_end
1. b     # move_prev_word_start
1. `     # switch_to_lowercase
1. mrm(  # surround replace
1. C-w v # vsplit

In the debug build surround_replace/delete will immedately assert with
`assertion failed: last <= from', transaction.rs:597:13`. The splits and
lowercase conversion are not needed to trigger the bug.

In the release build the surround becomes `)a(` and the last vsplit
causes the transaction to panic.
`internal error: entered unreachable code:
(Some(Retain(18446744073709551573)))', transaction.rs:185:46`

Since the selection direction is backwards get_surround_pos returns the
pairs reversed but the downstream code assumes they are in the forward
direction.
---
 helix-core/src/surround.rs        |  3 +-
 helix-term/tests/test/movement.rs | 54 +++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/surround.rs b/helix-core/src/surround.rs
index b96cce5a0..513f87493 100644
--- a/helix-core/src/surround.rs
+++ b/helix-core/src/surround.rs
@@ -260,7 +260,8 @@ pub fn get_surround_pos(
         if change_pos.contains(&open_pos) || change_pos.contains(&close_pos) {
             return Err(Error::CursorOverlap);
         }
-        change_pos.extend_from_slice(&[open_pos, close_pos]);
+        // ensure the positions are always paired in the forward direction
+        change_pos.extend_from_slice(&[open_pos.min(close_pos), close_pos.max(open_pos)]);
     }
     Ok(change_pos)
 }
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index e3c2668da..0873edbe5 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -552,3 +552,57 @@ async fn find_char_line_ending() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_surround_replace() -> anyhow::Result<()> {
+    test((
+        platform_line(indoc! {"\
+            (#[|a]#)
+            "}),
+        "mrm{",
+        platform_line(indoc! {"\
+            {#[|a]#}
+            "}),
+    ))
+    .await?;
+
+    test((
+        platform_line(indoc! {"\
+            (#[a|]#)
+            "}),
+        "mrm{",
+        platform_line(indoc! {"\
+            {#[a|]#}
+            "}),
+    ))
+    .await?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_surround_delete() -> anyhow::Result<()> {
+    test((
+        platform_line(indoc! {"\
+            (#[|a]#)
+            "}),
+        "mdm",
+        platform_line(indoc! {"\
+            #[|a]#
+            "}),
+    ))
+    .await?;
+
+    test((
+        platform_line(indoc! {"\
+            (#[a|]#)
+            "}),
+        "mdm",
+        platform_line(indoc! {"\
+            #[a|]#
+            "}),
+    ))
+    .await?;
+
+    Ok(())
+}

From cc43e3521ed94e9d6e77c719c14073d3e7217c97 Mon Sep 17 00:00:00 2001
From: RoloEdits <RoloEdits@gmail.com>
Date: Sun, 3 Mar 2024 09:56:18 -0800
Subject: [PATCH 779/967] feat(languages): add support for `*.Dockerfile`
 `file-types` naming convention (#9772)

Current `file-types` only supports up to a `Dockerfile.frontend` naming scheme.

With these changes `frontend.Dockerfile` now gives proper highlights and lsp actions.
---
 languages.toml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 7d859c2e4..49672a30b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1494,7 +1494,20 @@ name = "dockerfile"
 scope = "source.dockerfile"
 injection-regex = "docker|dockerfile"
 roots = ["Dockerfile", "Containerfile"]
-file-types = [{ glob = "Dockerfile*" }, { glob = "dockerfile*" }, { glob = "Containerfile*" }, { glob = "containerfile*" }]
+file-types = [
+  "Dockerfile",
+  { glob = "Dockerfile" },
+  { glob = "Dockerfile.*" },
+  "dockerfile",
+  { glob = "dockerfile" },
+  { glob = "dockerfile.*" },
+  "Containerfile",
+  { glob = "Containerfile" },
+  { glob = "Containerfile.*" },
+  "containerfile",
+  { glob = "containerfile" },
+  { glob = "containerfile.*" },
+]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-servers = [ "docker-langserver" ]

From 3f98891e7952a748f814e6741f4375c9b7aa0983 Mon Sep 17 00:00:00 2001
From: varris1 <38386180+varris1@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:00:34 +0100
Subject: [PATCH 780/967] flake.lock: Bump flake inputs to prevent a warning
 message (#9816)

---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9bb5dece1..48fb4a59f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701025348,
-        "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
+        "lastModified": 1709610799,
+        "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
+        "rev": "81c393c776d5379c030607866afef6406ca1be57",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700794826,
-        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
+        "lastModified": 1709479366,
+        "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
+        "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
         "type": "github"
       },
       "original": {
@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701137803,
-        "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
+        "lastModified": 1709604635,
+        "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
+        "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
         "type": "github"
       },
       "original": {

From 7d8c86e4039551ebe754d9e3753b9b99e6fa6419 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:08:07 +0900
Subject: [PATCH 781/967] build(deps): bump arc-swap from 1.6.0 to 1.7.0
 (#9809)

---
 Cargo.lock            | 4 ++--
 helix-term/Cargo.toml | 2 +-
 helix-vcs/Cargo.toml  | 2 +-
 helix-view/Cargo.toml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 08fa4789e..43213764d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,9 +68,9 @@ checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "arc-swap"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f"
 
 [[package]]
 name = "autocfg"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 8c6ae9f42..accde567e 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.6.0" }
+arc-swap = { version = "1.7.0" }
 termini = "1"
 
 # Logging
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 32aca4f09..874b92d03 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.6.0" }
+arc-swap = { version = "1.7.0" }
 
 gix = { version = "0.58.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 b1b444f90..fc209b00f 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.6.0" }
+arc-swap = { version = "1.7.0" }
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tokio-stream = "0.1"

From ea0b2446441fd09b304e92581f644901018846d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:08:40 +0900
Subject: [PATCH 782/967] build(deps): bump libloading from 0.8.1 to 0.8.2
 (#9810)

---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 43213764d..fd498d9ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1603,12 +1603,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164"
 dependencies = [
  "cfg-if",
- "windows-sys 0.48.0",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]

From 7a473c74945bb7fd28abf9f23f9dfdd5562c7cd6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:09:13 +0900
Subject: [PATCH 783/967] build(deps): bump ahash from 0.8.9 to 0.8.11 (#9813)

---
 Cargo.lock             | 4 ++--
 helix-core/Cargo.toml  | 2 +-
 helix-event/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fd498d9ad..a330e5872 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.9"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index be5ea5eb8..5e2dbd977 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -32,7 +32,7 @@ once_cell = "1.19"
 arc-swap = "1"
 regex = "1"
 bitflags = "2.4"
-ahash = "0.8.9"
+ahash = "0.8.11"
 hashbrown = { version = "0.14.3", features = ["raw"] }
 dunce = "1.0"
 
diff --git a/helix-event/Cargo.toml b/helix-event/Cargo.toml
index 8711568e8..616c323dc 100644
--- a/helix-event/Cargo.toml
+++ b/helix-event/Cargo.toml
@@ -12,7 +12,7 @@ homepage.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ahash = "0.8.9"
+ahash = "0.8.11"
 hashbrown = "0.14.0"
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 # the event registry is essentially read only but must be an rwlock so we can

From 4e5f19df53cbe1f1b1e9ea590415c5bd58642b6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:10:24 +0900
Subject: [PATCH 784/967] build(deps): bump clipboard-win from 5.1.0 to 5.2.0
 (#9811)

---
 Cargo.lock            | 4 ++--
 helix-view/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a330e5872..aa3700b93 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "5.1.0"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81"
+checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297"
 dependencies = [
  "error-code",
 ]
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index fc209b00f..335779bc2 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.1", features = ["std"] }
+clipboard-win = { version = "5.2", features = ["std"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

From b93fae9c8b955e11f427979134e3494294e8e2e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:10:59 +0900
Subject: [PATCH 785/967] build(deps): bump mio from 0.8.9 to 0.8.11 (#9808)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa3700b93..fd74140a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1690,9 +1690,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",

From cb01e52cd8b8021686ee98dd4d53dff8cdc826a9 Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Thu, 7 Mar 2024 09:20:07 -0800
Subject: [PATCH 786/967] Fix panic in surround_replace/delete nested
 multi-cursor (#9815)

Test Document
-------------
```
{{

}
}

```

Steps To Reproduce
------------------
1. 2j  # move_visual_line_down
1. C   # copy_selection_on_next_line
1. mdm # surround_delete

Debug
-----
`assertion failed: last <= from', transaction.rs:597:13`

Release
-------
`called `Result::unwrap()` on an `Err` value: Char range out of bounds:
char range 18446744073709551614..18446744073709551615,
Rope/RopeSlice char length 7', ropey-1.6.1/src/rope.rs:546:37`

Description
-----------

Processing the surrounding pairs in order violates the assertion the
ranges are ordered. To handle nested surrounds all positions have to
be sorted. Also surround_replace has to track the proper replacement
character for each position.
---
 helix-term/src/commands.rs        | 19 ++++++++++++++-----
 helix-term/tests/test/movement.rs | 29 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0b2ea0b8a..4ac2496eb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5282,12 +5282,21 @@ fn surround_replace(cx: &mut Context) {
                 None => return doc.set_selection(view.id, selection),
             };
             let (open, close) = surround::get_pair(to);
+
+            // the changeset has to be sorted to allow nested surrounds
+            let mut sorted_pos: Vec<(usize, char)> = Vec::new();
+            for p in change_pos.chunks(2) {
+                sorted_pos.push((p[0], open));
+                sorted_pos.push((p[1], close));
+            }
+            sorted_pos.sort_unstable();
+
             let transaction = Transaction::change(
                 doc.text(),
-                change_pos.iter().enumerate().map(|(i, &pos)| {
+                sorted_pos.iter().map(|&pos| {
                     let mut t = Tendril::new();
-                    t.push(if i % 2 == 0 { open } else { close });
-                    (pos, pos + 1, Some(t))
+                    t.push(pos.1);
+                    (pos.0, pos.0 + 1, Some(t))
                 }),
             );
             doc.set_selection(view.id, selection);
@@ -5309,14 +5318,14 @@ fn surround_delete(cx: &mut Context) {
         let text = doc.text().slice(..);
         let selection = doc.selection(view.id);
 
-        let change_pos = match surround::get_surround_pos(text, selection, surround_ch, count) {
+        let mut change_pos = match surround::get_surround_pos(text, selection, surround_ch, count) {
             Ok(c) => c,
             Err(err) => {
                 cx.editor.set_error(err.to_string());
                 return;
             }
         };
-
+        change_pos.sort_unstable(); // the changeset has to be sorted to allow nested surrounds
         let transaction =
             Transaction::change(doc.text(), change_pos.into_iter().map(|p| (p, p + 1, None)));
         doc.apply(&transaction, view.id);
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 0873edbe5..4ebaae854 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -577,6 +577,23 @@ async fn test_surround_replace() -> anyhow::Result<()> {
     ))
     .await?;
 
+    test((
+        platform_line(indoc! {"\
+            {{
+
+            #(}|)#
+            #[}|]#
+            "}),
+        "mrm)",
+        platform_line(indoc! {"\
+            ((
+
+            #()|)#
+            #[)|]#
+            "}),
+    ))
+    .await?;
+
     Ok(())
 }
 
@@ -604,5 +621,17 @@ async fn test_surround_delete() -> anyhow::Result<()> {
     ))
     .await?;
 
+    test((
+        platform_line(indoc! {"\
+            {{
+
+            #(}|)#
+            #[}|]#
+            "}),
+        "mdm",
+        platform_line("\n\n#(\n|)##[\n|]#"),
+    ))
+    .await?;
+
     Ok(())
 }

From e27b04735c630140b45ac9fab1b3087ae831f34a Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Thu, 7 Mar 2024 11:37:01 -0800
Subject: [PATCH 787/967] Fix panic in select_textobject_around (#9832)

Test Document
-------------
```
a)b
```

Steps to Reproduce
------------------
1. %   # select_all
1. ms( # surround_add
1. mam # select_textobject_around

Debug and Release
-----------------
`thread 'main' panicked at 'Attempt to index past end of RopeSlice:
char index 7, RopeSlice char length 6', ropey-1.6.1/src/slice.rs:796:13`

Description
-----------
An index was selected beyond the end of the slice with chars_at. The fix
adds a guard check to `find_nth_open_pair`, like in the other find_nth*
functions.
---
 helix-core/src/surround.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/helix-core/src/surround.rs b/helix-core/src/surround.rs
index 513f87493..ed9764883 100644
--- a/helix-core/src/surround.rs
+++ b/helix-core/src/surround.rs
@@ -167,6 +167,10 @@ fn find_nth_open_pair(
     mut pos: usize,
     n: usize,
 ) -> Option<usize> {
+    if pos >= text.len_chars() {
+        return None;
+    }
+
     let mut chars = text.chars_at(pos + 1);
 
     // Adjusts pos for the first iteration, and handles the case of the
@@ -383,6 +387,21 @@ mod test {
         )
     }
 
+    #[test]
+    fn test_find_nth_closest_pairs_pos_index_range_panic() {
+        #[rustfmt::skip]
+        let (doc, selection, _) =
+            rope_with_selections_and_expectations(
+                "(a)c)",
+                "^^^^^"
+            );
+
+        assert_eq!(
+            find_nth_closest_pairs_pos(doc.slice(..), selection.primary(), 1),
+            Err(Error::PairNotFound)
+        )
+    }
+
     // Create a Rope and a matching Selection using a specification language.
     // ^ is a single-point selection.
     // _ is an expected index. These are returned as a Vec<usize> for use in assertions.

From 301dfb07ccf3df41c381300dddb760bf76745cf5 Mon Sep 17 00:00:00 2001
From: Chris <chrism.chickenkeeper24@gmail.com>
Date: Thu, 7 Mar 2024 22:39:00 +0000
Subject: [PATCH 788/967] Add PowerShell highlighting (#9827)

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

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c9668549e..9149acadf 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -132,6 +132,7 @@
 | po | ✓ | ✓ |  |  |
 | pod | ✓ |  |  |  |
 | ponylang | ✓ | ✓ | ✓ |  |
+| powershell | ✓ |  |  |  |
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
 | protobuf | ✓ | ✓ | ✓ | `bufls`, `pb` |
diff --git a/languages.toml b/languages.toml
index 49672a30b..70953b990 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3259,3 +3259,17 @@ indent = { tab-width = 4, unit = "    " }
 [[grammar]]
 name = "fidl"
 source = { git = "https://github.com/google/tree-sitter-fidl", rev = "bdbb635a7f5035e424f6173f2f11b9cd79703f8d" }
+
+[[language]]
+name = "powershell"
+scope = "source.powershell"
+injection-regex = "(pwsh|powershell)"
+file-types = [ "ps1", "psm1", "psd1", "pscc", "psrc" ]
+shebangs = [ "pwsh", "powershell" ]
+comment-token = '#'
+block-comment-tokens = { start = "<#", end = "#>" }
+indent = { tab-width = 4, unit = "    " }
+
+[[grammar]]
+name = "powershell"
+source = { git = "https://github.com/airbus-cert/tree-sitter-powershell", rev = "c9316be0faca5d5b9fd3b57350de650755f42dc0" }
diff --git a/runtime/queries/powershell/highlights.scm b/runtime/queries/powershell/highlights.scm
new file mode 100644
index 000000000..c62c72814
--- /dev/null
+++ b/runtime/queries/powershell/highlights.scm
@@ -0,0 +1,174 @@
+[
+  "if"
+  "elseif"
+  "else"
+  "switch"
+] @keyword.control.conditional
+
+[
+  "foreach"
+  "for"
+  "while"
+  "do"
+  "until"
+] @keyword.control.repeat
+
+[
+  "break"
+  "continue"
+  "return"
+] @keyword.control.return
+
+"in" @keyword.operator
+
+"function" @keyword.function
+
+[
+  "class"
+  "enum"
+] @keyword.storage.type
+
+[
+  "param"
+  "dynamicparam"
+  "begin"
+  "process"
+  "end"
+  "filter"
+  "workflow"
+  "throw"
+  "exit"
+  "trap"
+  "try"
+  "catch"
+  "finally"
+  "data"
+  "inlinescript"
+  "parallel"
+  "sequence"
+] @keyword
+
+[
+  "-as"
+  "-ccontains"
+  "-ceq"
+  "-cge"
+  "-cgt"
+  "-cle"
+  "-clike"
+  "-clt"
+  "-cmatch"
+  "-cne"
+  "-cnotcontains"
+  "-cnotlike"
+  "-cnotmatch"
+  "-contains"
+  "-creplace"
+  "-csplit"
+  "-eq"
+  "-ge"
+  "-gt"
+  "-icontains"
+  "-ieq"
+  "-ige"
+  "-igt"
+  "-ile"
+  "-ilike"
+  "-ilt"
+  "-imatch"
+  "-in"
+  "-ine"
+  "-inotcontains"
+  "-inotlike"
+  "-inotmatch"
+  "-ireplace"
+  "-is"
+  "-isnot"
+  "-isplit"
+  "-join"
+  "-le"
+  "-like"
+  "-lt"
+  "-match"
+  "-ne"
+  "-not"
+  "-notcontains"
+  "-notin"
+  "-notlike"
+  "-notmatch"
+  "-replace"
+  "-shl"
+  "-shr"
+  "-split"
+  "-and"
+  "-or"
+  "-xor"
+  "-band"
+  "-bor"
+  "-bxor"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "++"
+  "--"
+  "!"
+  "\\"
+  ".."
+  "|"
+] @operator
+
+(assignement_operator) @operator
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ";"
+  ","
+  "::"
+] @punctuation.delimiter
+
+(string_literal) @string
+
+(integer_literal) @constant.numeric
+(real_literal) @constant.numeric
+
+(command
+  command_name: (command_name) @function)
+
+(function_name) @function
+
+(invokation_expression
+  (member_name) @function)
+
+(member_access
+  (member_name) @variable.other.member)
+
+(command_invokation_operator) @operator
+
+(type_spec) @type
+
+(variable) @variable
+
+(comment) @comment
+
+(array_expression) @punctuation.bracket
+
+(assignment_expression
+  value: (pipeline) @variable)
+
+(format_operator) @operator
+
+(command_parameter) @variable.parameter
+
+(command_elements) @variable.builtin
+
+(generic_token) @variable
diff --git a/runtime/queries/powershell/injections.scm b/runtime/queries/powershell/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/runtime/queries/powershell/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From fd89c3c8335399e344e038f1141ea0657653a591 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Fri, 8 Mar 2024 02:54:17 +0100
Subject: [PATCH 789/967] fix: close #9771 fix comments with `(` and `)`
 (#9800)

* fix: close #9771 update OCaml

* fix: no longer match on ( ) as the underlying grammar handles these

* fix: implement excellent corrections from review

* fix: module -> namespace to match theme scopes
---
 languages.toml                         |   4 +-
 runtime/queries/comment/highlights.scm |   5 -
 runtime/queries/ocaml/highlights.scm   | 141 ++++++++++++-------------
 3 files changed, 67 insertions(+), 83 deletions(-)

diff --git a/languages.toml b/languages.toml
index 70953b990..e96f06183 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1095,7 +1095,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "ocaml"
-source = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "23d419ba45789c5a47d31448061557716b02750a", subpath = "ocaml" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677", subpath = "ocaml" }
 
 [[language]]
 name = "ocaml-interface"
@@ -1115,7 +1115,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "ocaml-interface"
-source = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "23d419ba45789c5a47d31448061557716b02750a", subpath = "interface" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677", subpath = "interface" }
 
 [[language]]
 name = "lua"
diff --git a/runtime/queries/comment/highlights.scm b/runtime/queries/comment/highlights.scm
index 4cefcdf74..ba26ca0bf 100644
--- a/runtime/queries/comment/highlights.scm
+++ b/runtime/queries/comment/highlights.scm
@@ -1,8 +1,3 @@
-[
- "("
- ")"
-] @punctuation.bracket
-
 ":" @punctuation.delimiter
 
 ; Hint level tags
diff --git a/runtime/queries/ocaml/highlights.scm b/runtime/queries/ocaml/highlights.scm
index 9d3bf4c8b..f2a4f0a4c 100644
--- a/runtime/queries/ocaml/highlights.scm
+++ b/runtime/queries/ocaml/highlights.scm
@@ -6,9 +6,12 @@
 ; Types
 ;------
 
-[(class_name) (class_type_name) (type_constructor)] @type
+(
+  (type_constructor) @type.builtin
+  (#match? @type.builtin "^(int|char|bytes|string|float|bool|unit|exn|array|list|option|int32|int64|nativeint|format6|lazy_t)$")
+)
 
-(type_variable) @type.parameter
+[(class_name) (class_type_name) (type_constructor)] @type
 
 [(constructor_name) (tag)] @constructor
 
@@ -29,27 +32,34 @@
 
 (method_name) @function.method
 
-; Variables
-;----------
-
-(value_pattern) @variable.parameter
-
 ; Application
 ;------------
 
+(
+  (value_name) @function.builtin
+  (#match? @function.builtin "^(raise(_notrace)?|failwith|invalid_arg)$")
+)
+
 (infix_expression
   left: (value_path (value_name) @function)
-  (infix_operator) @operator
+  operator: (concat_operator) @operator
   (#eq? @operator "@@"))
 
 (infix_expression
-  (infix_operator) @operator
+  operator: (rel_operator) @operator
   right: (value_path (value_name) @function)
   (#eq? @operator "|>"))
 
 (application_expression
   function: (value_path (value_name) @function))
 
+; Variables
+;----------
+
+[(value_name) (type_variable)] @variable
+
+(value_pattern) @variable.parameter
+
 ; Properties
 ;-----------
 
@@ -58,55 +68,68 @@
 ; Constants
 ;----------
 
-[(boolean) (unit)] @constant
-
-[(number) (signed_number)] @constant.numeric.integer
+(boolean) @constant.builtin.boolean
 
-(character) @constant.character
+[(number) (signed_number)] @constant.numeric
 
-(string) @string
+[(string) (character)] @string
 
 (quoted_string "{" @string "}" @string) @string
 
 (escape_sequence) @constant.character.escape
 
+(conversion_specification) @string.special
+
+; Operators
+;----------
+
+(match_expression (match_operator) @keyword)
+
+(value_definition [(let_operator) (let_and_operator)] @keyword)
+
 [
-  (conversion_specification)
-  (pretty_printing_indication)
-] @punctuation.special
+  (prefix_operator)
+  (sign_operator)
+  (pow_operator)
+  (mult_operator)
+  (add_operator)
+  (concat_operator)
+  (rel_operator)
+  (and_operator)
+  (or_operator)
+  (assign_operator)
+  (hash_operator)
+  (indexing_operator)
+  (let_operator)
+  (let_and_operator)
+  (match_operator)
+] @operator
+
+["*" "#" "::" "<-"] @operator
 
 ; Keywords
 ;---------
 
 [
-  "and" "as" "assert" "begin" "class" "constraint"
-  "end" "external" "in"
-  "inherit" "initializer" "lazy" "let" "match" "method" "module"
-  "mutable" "new" "nonrec" "object" "of" "private" "rec" "sig" "struct"
-  "type" "val" "virtual" "when" "with"
+  "and" "as" "assert" "begin" "class" "constraint" "do" "done" "downto" "else"
+  "end" "exception" "external" "for" "fun" "function" "functor" "if" "in"
+  "include" "inherit" "initializer" "lazy" "let" "match" "method" "module"
+  "mutable" "new" "nonrec" "object" "of" "open" "private" "rec" "sig" "struct"
+  "then" "to" "try" "type" "val" "virtual" "when" "while" "with"
 ] @keyword
 
-["fun" "function" "functor"] @keyword.function
-
-["if" "then" "else"] @keyword.control.conditional
-
-["exception" "try"] @keyword.control.exception
-
-["include" "open"] @keyword.control.import
-
-["for" "to" "downto" "while" "do" "done"] @keyword.control.repeat
+; Punctuation
+;------------
 
-; Macros
-;-------
+(attribute ["[@" "]"] @punctuation.special)
+(item_attribute ["[@@" "]"] @punctuation.special)
+(floating_attribute ["[@@@" "]"] @punctuation.special)
+(extension ["[%" "]"] @punctuation.special)
+(item_extension ["[%%" "]"] @punctuation.special)
+(quoted_extension ["{%" "}"] @punctuation.special)
+(quoted_item_extension ["{%%" "}"] @punctuation.special)
 
-(attribute ["[@" "]"] @attribute)
-(item_attribute ["[@@" "]"] @attribute)
-(floating_attribute ["[@@@" "]"] @attribute)
-(extension ["[%" "]"] @function.macro)
-(item_extension ["[%%" "]"] @function.macro)
-(quoted_extension ["{%" "}"] @function.macro)
-(quoted_item_extension ["{%%" "}"] @function.macro)
-"%" @function.macro
+"%" @punctuation.special
 
 ["(" ")" "[" "]" "{" "}" "[|" "|]" "[<" "[>"] @punctuation.bracket
 
@@ -117,46 +140,12 @@
   "->" ";;" ":>" "+=" ":=" ".."
 ] @punctuation.delimiter
 
-; Operators
-;----------
-
-[
-  (prefix_operator)
-  (sign_operator)
-  (infix_operator)
-  (hash_operator)
-  (indexing_operator)
-  (let_operator)
-  (and_operator)
-  (match_operator)
-] @operator
-
-(match_expression (match_operator) @keyword)
-
-(value_definition [(let_operator) (and_operator)] @keyword)
-
-;; TODO: this is an error now
-;(prefix_operator "!" @operator)
-
-(infix_operator ["&" "+" "-" "=" ">" "|" "%"] @operator)
-
-(signed_number ["+" "-"] @operator)
-
-["*" "#" "::" "<-"] @operator
-
 ; Attributes
 ;-----------
 
-(attribute_id) @variable.other.member
+(attribute_id) @tag
 
 ; Comments
 ;---------
 
 [(comment) (line_number_directive) (directive) (shebang)] @comment
-
-(ERROR) @error
-
-; Blanket highlights
-; ------------------
-
-[(value_name) (type_variable)] @variable

From e3c6c82828299f1728f16a8d8fcfa5c3603a3d47 Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Sat, 9 Mar 2024 02:59:56 -0500
Subject: [PATCH 790/967] add linker script language (#9835)

---
 book/src/generated/lang-support.md |   1 +
 languages.toml                     |  12 ++
 runtime/queries/ld/highlights.scm  | 173 +++++++++++++++++++++++++++++
 runtime/queries/ld/indents.scm     |  12 ++
 runtime/queries/ld/injections.scm  |   2 +
 5 files changed, 200 insertions(+)
 create mode 100644 runtime/queries/ld/highlights.scm
 create mode 100644 runtime/queries/ld/indents.scm
 create mode 100644 runtime/queries/ld/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 9149acadf..7792bf594 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -94,6 +94,7 @@
 | kdl | ✓ | ✓ | ✓ |  |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
 | latex | ✓ | ✓ |  | `texlab` |
+| ld | ✓ |  | ✓ |  |
 | lean | ✓ |  |  | `lean` |
 | ledger | ✓ |  |  |  |
 | llvm | ✓ | ✓ | ✓ |  |
diff --git a/languages.toml b/languages.toml
index e96f06183..2e9f5d195 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3273,3 +3273,15 @@ indent = { tab-width = 4, unit = "    " }
 [[grammar]]
 name = "powershell"
 source = { git = "https://github.com/airbus-cert/tree-sitter-powershell", rev = "c9316be0faca5d5b9fd3b57350de650755f42dc0" }
+
+[[language]]
+name = "ld"
+scope = "source.ld"
+injection-regex = "ld"
+file-types = ["ld"]
+block-comment-tokens = { start = "/*", end = "*/" }
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "ld"
+source = { git = "https://github.com/mtoohey31/tree-sitter-ld", rev = "81978cde3844bfc199851e39c80a20ec6444d35e" }
diff --git a/runtime/queries/ld/highlights.scm b/runtime/queries/ld/highlights.scm
new file mode 100644
index 000000000..4f935e753
--- /dev/null
+++ b/runtime/queries/ld/highlights.scm
@@ -0,0 +1,173 @@
+; Identifiers
+
+(section
+  .
+  (NAME) @namespace)
+
+(NAME) @variable
+
+; Operators
+
+[
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "<<="
+  ">>="
+  "&="
+  "|="
+  "^="
+  "*"
+  "/"
+  "%"
+  "+"
+  "-"
+  "<<"
+  ">>"
+  "=="
+  "!="
+  "<="
+  ">="
+  "<"
+  ">"
+  "&"
+  "^"
+  "|"
+  "&&"
+  "||"
+  "?"
+] @operator
+
+; Keywords
+
+[
+  "ABSOLUTE"
+  "ADDR"
+  "ALIGNOF"
+  "ASSERT"
+  "BYTE"
+  "CONSTANT"
+  "DATA_SEGMENT_ALIGN"
+  "DATA_SEGMENT_END"
+  "DATA_SEGMENT_RELRO_END"
+  "DEFINED"
+  "LOADADDR"
+  "LOG2CEIL"
+  "LONG"
+  "MAX"
+  "MIN"
+  "NEXT"
+  "QUAD"
+  "SHORT"
+  "SIZEOF"
+  "SQUAD"
+  "FILL"
+  "SEGMENT_START"
+] @function.builtin
+
+[
+  "CONSTRUCTORS"
+  "CREATE_OBJECT_SYMBOLS"
+  "LINKER_VERSION"
+  "SIZEOF_HEADERS"
+] @constant.builtin
+
+[
+  "AFTER"
+  "ALIGN"
+  "ALIGN_WITH_INPUT"
+  "ASCIZ"
+  "AS_NEEDED"
+  "AT"
+  "BEFORE"
+  "BIND"
+  "BLOCK"
+  "COPY"
+  "DSECT"
+  "ENTRY"
+  "EXCLUDE_FILE"
+  "EXTERN"
+  "extern"
+  "FLOAT"
+  "FORCE_COMMON_ALLOCATION"
+  "FORCE_GROUP_ALLOCATION"
+  "global"
+  "GROUP"
+  "HIDDEN"
+  "HLL"
+  "INCLUDE"
+  "INFO"
+  "INHIBIT_COMMON_ALLOCATION"
+  "INPUT"
+  "INPUT_SECTION_FLAGS"
+  "KEEP"
+  "l"
+  "LD_FEATURE"
+  "len"
+  "LENGTH"
+  "local"
+  "MAP"
+  "MEMORY"
+  "NOCROSSREFS"
+  "NOCROSSREFS_TO"
+  "NOFLOAT"
+  "NOLOAD"
+  "o"
+  "ONLY_IF_RO"
+  "ONLY_IF_RW"
+  "org"
+  "ORIGIN"
+  "OUTPUT"
+  "OUTPUT_ARCH"
+  "OUTPUT_FORMAT"
+  "OVERLAY"
+  "PHDRS"
+  "PROVIDE"
+  "PROVIDE_HIDDEN"
+  "READONLY"
+  "REGION_ALIAS"
+  "REVERSE"
+  "SEARCH_DIR"
+  "SECTIONS"
+  "SORT"
+  "SORT_BY_ALIGNMENT"
+  "SORT_BY_INIT_PRIORITY"
+  "SORT_BY_NAME"
+  "SORT_NONE"
+  "SPECIAL"
+  "STARTUP"
+  "SUBALIGN"
+  "SYSLIB"
+  "TARGET"
+  "TYPE"
+  "VERSION"
+] @keyword
+
+; Delimiters
+
+[
+  ","
+  ";"
+  "&"
+  ":"
+  ">"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+; Literals
+
+(INT) @constant.numeric.integer
+
+; Comment
+
+(comment) @comment
diff --git a/runtime/queries/ld/indents.scm b/runtime/queries/ld/indents.scm
new file mode 100644
index 000000000..2e2928b5d
--- /dev/null
+++ b/runtime/queries/ld/indents.scm
@@ -0,0 +1,12 @@
+[
+  (sections)
+  (memory)
+  (section)
+  (phdrs)
+  (overlay_section)
+  (version)
+  (vers_node)
+  (vers_defns)
+] @indent
+
+"}" @outdent @extend.prevent-once
diff --git a/runtime/queries/ld/injections.scm b/runtime/queries/ld/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/runtime/queries/ld/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 0dc67ff8852ce99d40ad4464062ebe212b0b03a1 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <test@oberhumer.com>
Date: Sat, 9 Mar 2024 09:02:43 +0100
Subject: [PATCH 791/967] helix-term: allow to backspace out-of the command
 prompt (#9828)

---
 helix-term/src/ui/prompt.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index a6ee7f05d..d46c13138 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -544,6 +544,10 @@ 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 3bd493299fe632a7ff09fbd4c92c702ba3d0853f Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@users.noreply.github.com>
Date: Sun, 10 Mar 2024 16:22:04 +1300
Subject: [PATCH 792/967] Use Nu language for NUON files (#9839)

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

diff --git a/languages.toml b/languages.toml
index 2e9f5d195..bf726e349 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1934,7 +1934,7 @@ source = { git = "https://github.com/PrestonKnopp/tree-sitter-godot-resource", r
 name = "nu"
 scope = "source.nu"
 injection-regex = "nu"
-file-types = ["nu"]
+file-types = ["nu", "nuon"]
 shebangs = ["nu"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }

From c145999bff81f763a9e2d20d28c79f32bbd1306b Mon Sep 17 00:00:00 2001
From: Kalpaj Chaudhari <daedroza@gmail.com>
Date: Sun, 10 Mar 2024 08:53:33 +0530
Subject: [PATCH 793/967] treesitter: Add textobjects for native funcs and
 constructors (#9806)

This allows native functions and constructors to be accessible as part
of goto_{next,prev}_func.

Change-Id: Ia1234004e8b38e1c5871331a38fcf4f267da935e
---
 runtime/queries/java/textobjects.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/java/textobjects.scm b/runtime/queries/java/textobjects.scm
index a932c7934..b0e73a0a7 100644
--- a/runtime/queries/java/textobjects.scm
+++ b/runtime/queries/java/textobjects.scm
@@ -1,4 +1,7 @@
 (method_declaration
+  body: (_)? @function.inside) @function.around
+
+(constructor_declaration
   body: (_) @function.inside) @function.around
 
 (interface_declaration

From 2d589e74f057188d113c34a6e52cc614134b5f31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:38:19 +0900
Subject: [PATCH 794/967] build(deps): bump cachix/install-nix-action from 25
 to 26 (#9851)

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 25 to 26.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v25...v26)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 57f0a0db4..9638137b8 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install nix
-      uses: cachix/install-nix-action@v25
+      uses: cachix/install-nix-action@v26
 
     - name: Authenticate with Cachix
       uses: cachix/cachix-action@v14

From 2e2a1d6f613eb964dfea655a1e377cb12d1d7b48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:41:40 +0900
Subject: [PATCH 795/967] build(deps): bump open from 5.0.1 to 5.1.2 (#9854)

Bumps [open](https://github.com/Byron/open-rs) from 5.0.1 to 5.1.2.
- [Release notes](https://github.com/Byron/open-rs/releases)
- [Changelog](https://github.com/Byron/open-rs/blob/main/changelog.md)
- [Commits](https://github.com/Byron/open-rs/compare/v5.0.1...v5.1.2)

---
updated-dependencies:
- dependency-name: open
  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-term/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fd74140a5..b67796aba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1767,9 +1767,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "open"
-version = "5.0.1"
+version = "5.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
+checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32"
 dependencies = [
  "is-wsl",
  "libc",
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index accde567e..bc3117d20 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -58,7 +58,7 @@ pulldown-cmark = { version = "0.10", default-features = false }
 content_inspector = "0.2.4"
 
 # opening URLs
-open = "5.0.1"
+open = "5.1.2"
 url = "2.5.0"
 
 # config

From ab61874efb9e53c55f44741b2455c4c08602bec9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:41:48 +0900
Subject: [PATCH 796/967] build(deps): bump cc from 1.0.88 to 1.0.90 (#9855)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.88 to 1.0.90.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.88...1.0.90)

---
updated-dependencies:
- dependency-name: cc
  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 b67796aba..6fe238fe0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -145,9 +145,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.88"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cfg-if"

From 2d15acdf6029fd9b418bf4797c2947d6004dddbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:45:44 +0900
Subject: [PATCH 797/967] build(deps): bump libloading from 0.8.2 to 0.8.3
 (#9857)

Bumps [libloading](https://github.com/nagisa/rust_libloading) from 0.8.2 to 0.8.3.
- [Commits](https://github.com/nagisa/rust_libloading/compare/0.8.2...0.8.3)

---
updated-dependencies:
- dependency-name: libloading
  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 6fe238fe0..22b78986e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1603,9 +1603,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.0",

From 3915b04bd91084477b3076952e6ad6cfdd414e72 Mon Sep 17 00:00:00 2001
From: fnuttens <fnuttens@users.noreply.github.com>
Date: Wed, 13 Mar 2024 05:47:55 +0100
Subject: [PATCH 798/967] fix(themes-catppuccin): make inlay hints more legible
 (#9859)

---
 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 1ea57e960..65ba76e4b 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -88,7 +88,7 @@
 "ui.virtual" = "overlay0"
 "ui.virtual.ruler" = { bg = "surface0" }
 "ui.virtual.indent-guide" = "surface0"
-"ui.virtual.inlay-hint" = { fg = "surface1", bg = "mantle" }
+"ui.virtual.inlay-hint" = { fg = "overlay0", bg = "base" }
 
 "ui.selection" = { bg = "surface1" }
 

From e01a5582942ef96d0de9c369d2b9408c6355cd1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 14:13:36 +0900
Subject: [PATCH 799/967] build(deps): bump log from 0.4.20 to 0.4.21 (#9856)

Bumps [log](https://github.com/rust-lang/log) from 0.4.20 to 0.4.21.
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/compare/0.4.20...0.4.21)

---
updated-dependencies:
- dependency-name: log
  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 22b78986e..9bea99ac5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1638,9 +1638,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "lsp-types"

From b44b627b1403f8a3e23251bc79558d482346c4b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 23:37:10 +0000
Subject: [PATCH 800/967] build(deps): bump chrono from 0.4.34 to 0.4.35

Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.34 to 0.4.35.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.34...v0.4.35)

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

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

diff --git a/Cargo.lock b/Cargo.lock
index 9bea99ac5..8628d002f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -168,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.34"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
+checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",

From 6c4d986c1b1ac4e350dced513b6608ba4464cde3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 12 Mar 2024 09:58:33 -0400
Subject: [PATCH 801/967] Use non-deprecated chrono Duration functions

---
 helix-core/src/increment/date_time.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/helix-core/src/increment/date_time.rs b/helix-core/src/increment/date_time.rs
index 2980bb58b..04cff6b47 100644
--- a/helix-core/src/increment/date_time.rs
+++ b/helix-core/src/increment/date_time.rs
@@ -27,7 +27,7 @@ pub fn increment(selected_text: &str, amount: i64) -> Option<String> {
                 let date_time = NaiveDateTime::parse_from_str(date_time, format.fmt).ok()?;
                 Some(
                     date_time
-                        .checked_add_signed(Duration::minutes(amount))?
+                        .checked_add_signed(Duration::try_minutes(amount)?)?
                         .format(format.fmt)
                         .to_string(),
                 )
@@ -35,14 +35,15 @@ pub fn increment(selected_text: &str, amount: i64) -> Option<String> {
             (true, false) => {
                 let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?;
                 Some(
-                    date.checked_add_signed(Duration::days(amount))?
+                    date.checked_add_signed(Duration::try_days(amount)?)?
                         .format(format.fmt)
                         .to_string(),
                 )
             }
             (false, true) => {
                 let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?;
-                let (adjusted_time, _) = time.overflowing_add_signed(Duration::minutes(amount));
+                let (adjusted_time, _) =
+                    time.overflowing_add_signed(Duration::try_minutes(amount)?);
                 Some(adjusted_time.format(format.fmt).to_string())
             }
             (false, false) => None,

From 0c51ab16d0c65505705297b89ebb1147f3cc8fee Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:38:22 -0400
Subject: [PATCH 802/967] Add a yank diagnostic command (#9640)

* yank diagnostic command

* improve success message

* move to a typed command

* docgen
---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 47 +++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index f4fcb6f62..dbb8b5f38 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -86,3 +86,4 @@
 | `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
 | `:redraw` | Clear and re-render the whole UI |
 | `:move` | Move the current buffer and its corresponding file to a different path |
+| `:yank-diagnostic` | Yank diagnostic(s) under primary cursor to register, or clipboard by default |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 3d7ea3fc8..384db4ac3 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2414,6 +2414,46 @@ fn move_buffer(
     Ok(())
 }
 
+fn yank_diagnostic(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let (view, doc) = current_ref!(cx.editor);
+    let primary = doc.selection(view.id).primary();
+
+    // Look only for diagnostics that intersect with the primary selection
+    let diag: Vec<_> = doc
+        .diagnostics()
+        .iter()
+        .filter(|d| primary.overlaps(&helix_core::Range::new(d.range.start, d.range.end)))
+        .map(|d| d.message.clone())
+        .collect();
+    let n = diag.len();
+    if n == 0 {
+        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}",
+        if n == 1 { "" } else { "s" }
+    ));
+    Ok(())
+}
+
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
     TypableCommand {
         name: "quit",
@@ -3021,6 +3061,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         fun: move_buffer,
         signature: CommandSignature::positional(&[completers::filename]),
     },
+    TypableCommand {
+        name: "yank-diagnostic",
+        aliases: &[],
+        doc: "Yank diagnostic(s) under primary cursor to register, or clipboard by default",
+        fun: yank_diagnostic,
+        signature: CommandSignature::none(),
+    },
 ];
 
 pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =

From b961acf74601f0ede754d595f52ed4cba300e37f Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Fri, 15 Mar 2024 12:44:08 -0700
Subject: [PATCH 803/967] Update regex-cursor (#9891)

---
 Cargo.lock            | 4 ++--
 helix-stdx/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8628d002f..7b73b1b1a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1950,9 +1950,9 @@ dependencies = [
 
 [[package]]
 name = "regex-cursor"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a43718aa0040434d45728c43f56bd53bda75a91c46954cdf0f2ff4dbc8aabbe7"
+checksum = "ae4327b5fde3ae6fda0152128d3d59b95a5aad7be91c405869300091720f7169"
 dependencies = [
  "log",
  "memchr",
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index 5ac7c011f..ed23f4e4f 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -16,7 +16,7 @@ dunce = "1.0"
 etcetera = "0.8"
 ropey = { version = "1.6.1", default-features = false }
 which = "6.0"
-regex-cursor = "0.1.3" 
+regex-cursor = "0.1.4"
 
 [dev-dependencies]
 tempfile = "3.10"

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 804/967] 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 f3bba5d1c..c1e36bbdd 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 805/967] 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 bf726e349..8fbb98e88 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 806/967] 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 4ac2496eb..133f2d540 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 807/967] 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 853254e5b..2a696641c 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 808/967] 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 7792bf594..2cb1e926c 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 8fbb98e88..b01da144d 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 000000000..bf898c9cd
--- /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 000000000..88bfe7434
--- /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 000000000..1f0199ed8
--- /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 809/967] 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 2cb1e926c..40029657f 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 b01da144d..4018fbe0e 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 000000000..0164321b6
--- /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 000000000..41269219e
--- /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 810/967] 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 d87936457..8857af82a 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 9871828ee..c3464067f 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 f46a0d6a6..bad61052e 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 811/967] 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 405f11c1b..b83c067e4 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 812/967] 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 2247bb3be..ad4b3c85a 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 28601d37f..27f19a7ad 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 14faf0e5a..1f285361b 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 8149f653e..49d40e931 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 1ae64d894..a44fbe0f7 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 57c796cb7..294196f31 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 624a261c9..2f9e2bb19 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 983bb7546..7d8569d23 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 813/967] 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 4018fbe0e..e46842983 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 000000000..354861a61
--- /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 4e94ccd3a..11fb8e46e 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 e4509a5fd..1c04c65fb 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 000000000..380c4ad64
--- /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 814/967] 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 e46842983..691468419 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 c066b2844..a20376375 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 815/967] 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 fbd8f2ed5..be7968575 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 816/967] 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 40029657f..97ea8e863 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 691468419..6e6c57932 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 000000000..c17114821
--- /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 000000000..b3d442a05
--- /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 000000000..4c6367349
--- /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 000000000..9fdbe0298
--- /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 000000000..75150f716
--- /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 000000000..66d594c25
--- /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 817/967] 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 97ea8e863..4a0b4b0a9 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 000000000..b84d9a200
--- /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 818/967] 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 7b73b1b1a..0a17dec8f 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 91f6e7cae..e56aedc8f 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 3b224e1b2..0e8917191 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 454d0e5cd..a27f85e63 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 819/967] 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 8eed12afb..7dc20e69c 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 90baee213..013f50632 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 501c94859..1de6ba3c0 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 15867f35e..c5d2d4ac5 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 8ba00a881..de20e0474 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 820/967] 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 4a0b4b0a9..fdec02702 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 6e6c57932..f0d6771fc 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 000000000..214247bc0
--- /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 000000000..0128606de
--- /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 821/967] 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 fdec02702..25b22a327 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 f0d6771fc..85d619b89 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 000000000..fead98384
--- /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 000000000..0a47bcbbd
--- /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 000000000..1d5b8e331
--- /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 000000000..f8a83e0cb
--- /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 822/967] 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 25b22a327..369680474 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 85d619b89..1cf8da374 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 823/967] 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 0a17dec8f..7cb6a26b1 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 335779bc2..b61ee19ec 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 824/967] 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 7cb6a26b1..3a71fc263 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 825/967] 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 3a71fc263..5675a94ce 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 874b92d03..49b3661e2 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 826/967] 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 5675a94ce..90bc3d3c0 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 827/967] 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 90bc3d3c0..075470edc 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 4284b0520..88af10388 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 828/967] 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 529543781..286441b66 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 829/967] 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 90a0aee87..59aba0adc 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 830/967] 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 1dc4d0b24..42d7a9b60 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 831/967] 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 42d7a9b60..c514f9f27 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 c3464067f..7437cbd07 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 4e7b1de9f..5f3595eeb 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 832/967] 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 c514f9f27..ff2bffae5 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 833/967] 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 075470edc..13c1ea333 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 5e2dbd977..a99250692 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 f880ca6e3..9b64a45bd 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 b61ee19ec..6eab0b5e7 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 834/967] 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 88e70f32e..37721e896 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 835/967] 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 384db4ac3..2ca3a5617 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 5f3595eeb..f813c7424 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 836/967] 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 369680474..f7905df7c 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 1cf8da374..7c23f1f42 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 000000000..b38e14222
--- /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 000000000..b38e14222
--- /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 000000000..b38e14222
--- /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 000000000..b38e14222
--- /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 837/967] 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 f7905df7c..3820c39db 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 7c23f1f42..ff25e018f 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 000000000..819d92ccd
--- /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 000000000..643fbd664
--- /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 000000000..e532a2f17
--- /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 000000000..284b41256
--- /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 838/967] 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 133f2d540..a5e79a539 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 2ca3a5617..593837e22 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 839/967] 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 3820c39db..47f8057e0 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 ff25e018f..ccd546fa7 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 000000000..6ffb4b7d4
--- /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 000000000..6ffb4b7d4
--- /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 840/967] 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 cdde86ec5..8b7919951 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 841/967] 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 593837e22..0dfcdb6e9 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 a4b148af3..b5969818c 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 842/967] 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 47f8057e0..b74a8cdb7 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 ccd546fa7..5ce10bf0e 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 000000000..789722ad0
--- /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 843/967] 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 7437cbd07..79a66cc14 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 844/967] 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 5ce10bf0e..9b0a16126 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 845/967] 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 c94bd587f..819cd62aa 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 846/967] 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 79a66cc14..2939a2573 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 847/967] 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 bcfb0c66c..a0b7e74d4 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 848/967] 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 5892be85f..f2535dd92 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 849/967] 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 9b0a16126..970c943f9 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 84767edc6..456639ce3 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 850/967] Recognize 'mmd' as mermaid

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

diff --git a/languages.toml b/languages.toml
index 970c943f9..608ec8a0a 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 851/967] 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 608ec8a0a..3e4084bf4 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 6d0ec36d7..f09f61042 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 11cbd01e3..798882f53 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 7379926b0..156e40381 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 852/967] 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 3e4084bf4..1653fbbcd 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 95a08141b..b40574b04 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 853/967] 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 3cda9d520..09068b4f5 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 854/967] 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 509dcdf7d..c1d14a0b1 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 855/967] 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 1653fbbcd..cbbfc5a91 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 856/967] 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 6025852c5..e3eef1855 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 857/967] 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 bb09b0319..60ada4a27 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 a5e79a539..291ab1fed 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 858/967] 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 0e8917191..6414f3ce9 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 859/967] 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 6414f3ce9..78abc0b0a 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 000000000..d9d140c9f
--- /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 860/967] 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 d2d4fe70a..0df105f1a 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 291ab1fed..ff72cee1f 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 4ebaae854..1c25032c2 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 861/967] 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 c7dc9081f..cbe2da3b6 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 ac8918bb7..d2b6ddc74 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 11d19d485..1576914e3 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 ff72cee1f..6de056518 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 a3168dc2d..63d1608f9 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 f813c7424..090e4dd5c 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 e5e2641a8..bbdc74a74 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 862/967] 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 c1e36bbdd..ad7aa5c5a 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 863/967] 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 d9e5e0224..7cb5cd062 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 864/967] 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 8857af82a..c55426c01 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 60ada4a27..3a5ccca53 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 04d6a69b3..29a8c4ba8 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 bd252deb9..579499de5 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 6de056518..d545480b5 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 bab662b04..ca5a21d26 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 090e4dd5c..da68a67fb 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 bad61052e..3c530c4e8 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 bbdc74a74..b5dc0615a 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 25a491345..a3083d539 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 8a5bfd72d..a853ce6fe 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 865/967] 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 32d9c8f5d..4e01bae2d 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 b2e3b9a9f..b91bd00d0 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 866/967] 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 2ab10e911..b879b432c 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 867/967] 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 65ba76e4b..d1e083564 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 868/967] 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 819cd62aa..11be7fd6a 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 869/967] 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 eae11172e..5b049aff9 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 870/967] 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 456237e94..27b7a630e 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 871/967] 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 d1e083564..5fcb72317 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 872/967] 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 b74a8cdb7..2030949eb 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 cbbfc5a91..9eb80414f 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 000000000..68477aacc
--- /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 000000000..f56119aec
--- /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 000000000..dc50a7654
--- /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 000000000..855ad8de7
--- /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 873/967] 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 c55426c01..83ab3f6b9 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 dc61ca2e3..b571b83c2 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 c30aa6e03..67c4db443 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 3c530c4e8..dd360a78e 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 874/967] 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 ff2bffae5..968596a70 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 875/967] 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 83ab3f6b9..5e22cebf8 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 876/967] 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 13c1ea333..a53734552 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 a99250692..7482262eb 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 bc3117d20..b00e97488 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 49b3661e2..d54f5312b 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 6eab0b5e7..f12185c86 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 877/967] 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 2939a2573..8a87242f9 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 878/967] 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 d46c13138..a6ee7f05d 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 879/967] 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 dab31610f..0fe6db12f 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 b37d35962..2d36cc806 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 880/967] 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 66106d480..bcb6c8d05 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 0fe482546..0cb9300d0 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 a898671f6..65a95a7d3 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 519c9ed39..739418cea 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 9be6bdc00..c88b327bd 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 d002d13fa..6e1a0cb29 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 3cec2f1a3..89b131bea 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 7e43247e3..84a846eb7 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 881/967] 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 e3eef1855..3c1dfc593 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 882/967] 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 ef5369f85..1b7d9b8c0 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 8b7919951..7719a6965 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 883/967] 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 ba26ca0bf..e0916cece 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 884/967] 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 d0576a4e3..4ec938f41 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 885/967] 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 1a865df19..3e0d8bb83 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 886/967] 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 9eb80414f..4a21fe74b 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 887/967] 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 f117f7194..52cea1d4c 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 b98a32e55..6cf4c0a6f 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 ea4930d30..fde54d7d4 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 ef9c27e26..f34517df2 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 888/967] 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 000000000..c73fe93af
--- /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 889/967] 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 4a21fe74b..a5764420b 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 890/967] 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 b5edbf72b..5ff92a277 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 a53734552..d04a1c337 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 e56aedc8f..3bfc4b8e1 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 c455b242e..9b5663744 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 891/967] 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 9b5663744..a46ef796b 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 892/967] 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 6c5ed3501..3dfb4fce5 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 893/967] 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 88f857d3d..74f017a31 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 cd2d2b364..02ca7bdc6 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 894/967] 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 a35ad5847..d8c93fe7e 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 895/967] typo (#10060)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ff92a277..de15f143c 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 896/967] 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 a5764420b..03e471a57 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 897/967] 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 5132d44d9..5ea1024b7 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 ada488fc9..c921e2ae7 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 1172a7981..aaa442f36 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 5be68837c..34c9d23b2 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 f65352c7e..7259b4e58 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 a978f386e..41eab4273 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 7bb3651e6..57ef92f82 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 7669e8a27..10e1861d4 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 1c25032c2..9ecaf6bb0 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 3b66c0486..f19e30041 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 63487fbcd..851fd6e91 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 898/967] 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 2030949eb..a43c0b70a 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 03e471a57..6fbcbbc4e 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 000000000..6e8ab0cf3
--- /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 000000000..adae990e4
--- /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 899/967] 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 e35abdb37..209f71ab6 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 900/967] 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 b38b8b6e3..4f379b4a1 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 901/967] 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 000000000..ac82a3e5f
--- /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 902/967] 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 000000000..759f019b8
--- /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 000000000..b506ab428
--- /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 903/967] 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 650924741..195e06354 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 2ecfe08e0..e8f1a5887 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 142ded369..30b4169ab 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 ce684a6a6..93ccf688e 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 0b011b0ea..ff6694e92 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 6c405381d..d0eca78a1 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 a4b74fcfb..677a7af6f 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 1ea13f1f5..f7d08daa9 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 e528d89d9..3259d6777 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 d3a3e2232..929bbc742 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 5fcb72317..58173dab1 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 1303519fb..d5a608f5f 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 d8c93fe7e..2ac57cd32 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 b704d60ee..db6ce989d 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 51701cfce..6da2389a6 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 47f1dfca8..5c4bd0dd8 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 4e01bae2d..c1a9a12bc 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 b91bd00d0..55f261539 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 513af60e1..c60afe99e 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 b49bf0494..9c1fa062e 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 a3083d539..37b6756f5 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 cf39e23d6..b7448455c 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 0734f2407..212fb5105 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 d833d5c66..cc8f536cb 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 b5ad1aa3e..7fd26c1f8 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 b506ab428..8badd9222 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 6b3354848..dafba559d 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 e6912a987..cd3f1e5d1 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 355a3be83..4737f52f7 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 3c1dfc593..a6b0636d3 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 3c127a3e4..9f8ca1832 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 c81df4097..fb4fc1fd8 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 b879b432c..64f4022d9 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 8942c3ca2..975f7a733 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 55088c298..6f8c326f4 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 4ec938f41..99cbed332 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 b8188f769..d8c17391c 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 6cf4c0a6f..874731769 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 e7037e18d..87f0cb092 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 16d7b6086..8ab66622f 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 e4d5d6737..d8e7d7703 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 ad4b3c85a..e7599c018 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 a44fbe0f7..74974bcb2 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 bcb6c8d05..a849ae96d 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 65a95a7d3..97f2a57c5 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 739418cea..e1f74b1cb 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 c88b327bd..cfa85b651 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 6e1a0cb29..a6ba6fcf3 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 89b131bea..1bfcb6889 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 84a846eb7..ca36d4e93 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 41530d141..d85f31e2d 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 4f878c7e0..2f0dbb0ad 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 fc27dc7cc..ed3c02891 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 3dfb4fce5..62db82c00 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 c9f95f7fe..db127229e 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 c3bbe79c9..c5e04f2a1 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 0fe6db12f..4916c3e84 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 2d36cc806..6c27c507a 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 5b049aff9..7cdeac095 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 307871445..ffa3ae2dc 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 209f71ab6..e395716dd 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 279fa2429..246b0ddd8 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 bc53e82e0..728a80900 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 5dbc799d5..c62c2ad27 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 54db3d1b1..66436c153 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 a0b7e74d4..a05ef6330 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 27b7a630e..9a5ba450e 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 d18419798..eb8d6c839 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 1e3901ef2..00fa84cbb 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 eb88c5eb8..09d0cdd57 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 74f017a31..9e23aff25 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 02ca7bdc6..60a2a0e21 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 4bbdb4dbe..ebe1ae8d2 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 ad2a04d5a..7870f67ca 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 09db90fd6..335d1493a 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 be7968575..38eb269de 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 16909cc70..0bc964b45 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 b07ab08dc..1c6b5e863 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 ecd6942b5..4e2480dba 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 e55b46e5d..c2be9afef 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 091b93eeb..d94a75fcb 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 7ac1e73cc..3eeabab30 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 9a4a7abcc..27f941220 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 904/967] 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 a43c0b70a..6bbea10ac 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 b83c067e4..a31baef93 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 d545480b5..d927d3f47 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 ca5a21d26..ffd076ad3 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 c248aeade..09198519f 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 59983b30c..09536a6b5 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 2a3da66f3..63ec4a567 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 c80dc81b4..a19eb25bb 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 000000000..b60353672
--- /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 b0e73a0a7..1fe0726a8 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 000000000..a8fd57c99
--- /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 6fb2000df..305c3ae7d 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 e35eebd76..e721b864d 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 966e47446..2b9556fca 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 2d48fa6fc..123c55678 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 df26331d8..de517d362 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 000000000..a8fd57c99
--- /dev/null
+++ b/runtime/queries/toml/textobjects.scm
@@ -0,0 +1,5 @@
+(pair 
+  (_) @entry.inside) @entry.around
+
+(array
+  (_) @entry.around)

From a224ee50796a4a115969d7f58b393fd2c797ce15 Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Mon, 1 Apr 2024 06:36:28 +0800
Subject: [PATCH 905/967] Changed file picker (#5645)

Co-authored-by: WJH <hou32hou@gmail.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
Co-authored-by: Pascal Kuthe <pascalkuthe@pm.me>
---
 Cargo.lock                       |  67 +++++++++++++++++++++
 book/src/themes.md               |   1 +
 helix-term/src/commands.rs       | 100 ++++++++++++++++++++++++++++++-
 helix-term/src/keymap/default.rs |   3 +-
 helix-vcs/Cargo.toml             |   2 +-
 helix-vcs/src/git.rs             |  98 ++++++++++++++++++++++++++++--
 helix-vcs/src/git/test.rs        |   2 +-
 helix-vcs/src/lib.rs             |  99 +++++++++++++++++++++++++-----
 helix-vcs/src/status.rs          |  32 ++++++++++
 9 files changed, 380 insertions(+), 24 deletions(-)
 create mode 100644 helix-vcs/src/status.rs

diff --git a/Cargo.lock b/Cargo.lock
index d04a1c337..377e6c05b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -338,6 +338,19 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "dashmap"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.12.3",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "dunce"
 version = "1.0.4"
@@ -536,6 +549,7 @@ dependencies = [
  "gix-config",
  "gix-date",
  "gix-diff",
+ "gix-dir",
  "gix-discover",
  "gix-features",
  "gix-filter",
@@ -557,6 +571,7 @@ dependencies = [
  "gix-revision",
  "gix-revwalk",
  "gix-sec",
+ "gix-status",
  "gix-submodule",
  "gix-tempfile",
  "gix-trace",
@@ -699,8 +714,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78e605593c2ef74980a534ade0909c7dc57cca72baa30cbb67d2dda621f99ac4"
 dependencies = [
  "bstr",
+ "gix-command",
+ "gix-filter",
+ "gix-fs",
  "gix-hash",
  "gix-object",
+ "gix-path",
+ "gix-tempfile",
+ "gix-trace",
+ "gix-worktree",
+ "imara-diff",
+ "thiserror",
+]
+
+[[package]]
+name = "gix-dir"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3413ccd29130900c17574678aee640e4847909acae9febf6424dc77b782c6d32"
+dependencies = [
+ "bstr",
+ "gix-discover",
+ "gix-fs",
+ "gix-ignore",
+ "gix-index",
+ "gix-object",
+ "gix-path",
+ "gix-pathspec",
+ "gix-trace",
+ "gix-utils",
+ "gix-worktree",
  "thiserror",
 ]
 
@@ -1054,6 +1097,28 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "gix-status"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca216db89947eca709f69ec5851aa76f9628e7c7aab7aa5a927d0c619d046bf2"
+dependencies = [
+ "bstr",
+ "filetime",
+ "gix-diff",
+ "gix-dir",
+ "gix-features",
+ "gix-filter",
+ "gix-fs",
+ "gix-hash",
+ "gix-index",
+ "gix-object",
+ "gix-path",
+ "gix-pathspec",
+ "gix-worktree",
+ "thiserror",
+]
+
 [[package]]
 name = "gix-submodule"
 version = "0.10.0"
@@ -1075,6 +1140,7 @@ version = "13.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d337955b7af00fb87120d053d87cdfb422a80b9ff7a3aa4057a99c79422dc30"
 dependencies = [
+ "dashmap",
  "gix-fs",
  "libc",
  "once_cell",
@@ -1124,6 +1190,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0066432d4c277f9877f091279a597ea5331f68ca410efc874f0bdfb1cd348f92"
 dependencies = [
+ "bstr",
  "fastrand",
  "unicode-normalization",
 ]
diff --git a/book/src/themes.md b/book/src/themes.md
index 29a8c4ba8..0a49053f5 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -251,6 +251,7 @@ We use a similar set of scopes as
     - `gutter` - gutter indicator
   - `delta` - modifications
     - `moved` - renamed or moved files/changes
+    - `conflict` - merge conflicts
     - `gutter` - gutter indicator
 
 #### Interface
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d927d3f47..d0b9047c8 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3,10 +3,14 @@ pub(crate) mod lsp;
 pub(crate) mod typed;
 
 pub use dap::*;
+use helix_event::status;
 use helix_stdx::rope::{self, RopeSliceExt};
-use helix_vcs::Hunk;
+use helix_vcs::{FileChange, Hunk};
 pub use lsp::*;
-use tui::widgets::Row;
+use tui::{
+    text::Span,
+    widgets::{Cell, Row},
+};
 pub use typed::*;
 
 use helix_core::{
@@ -39,6 +43,7 @@ use helix_view::{
     info::Info,
     input::KeyEvent,
     keyboard::KeyCode,
+    theme::Style,
     tree,
     view::View,
     Document, DocumentId, Editor, ViewId,
@@ -54,7 +59,7 @@ use crate::{
     filter_picker_entry,
     job::Callback,
     keymap::ReverseKeymap,
-    ui::{self, overlay::overlaid, Picker, Popup, Prompt, PromptEvent},
+    ui::{self, menu::Item, overlay::overlaid, Picker, Popup, Prompt, PromptEvent},
 };
 
 use crate::job::{self, Jobs};
@@ -324,6 +329,7 @@ impl MappableCommand {
         buffer_picker, "Open buffer picker",
         jumplist_picker, "Open jumplist picker",
         symbol_picker, "Open symbol picker",
+        changed_file_picker, "Open changed file picker",
         select_references_to_symbol_under_cursor, "Select symbol references",
         workspace_symbol_picker, "Open workspace symbol picker",
         diagnostics_picker, "Open diagnostic picker",
@@ -2996,6 +3002,94 @@ fn jumplist_picker(cx: &mut Context) {
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
+fn changed_file_picker(cx: &mut Context) {
+    pub struct FileChangeData {
+        cwd: PathBuf,
+        style_untracked: Style,
+        style_modified: Style,
+        style_conflict: Style,
+        style_deleted: Style,
+        style_renamed: Style,
+    }
+
+    impl Item for FileChange {
+        type Data = FileChangeData;
+
+        fn format(&self, data: &Self::Data) -> Row {
+            let process_path = |path: &PathBuf| {
+                path.strip_prefix(&data.cwd)
+                    .unwrap_or(path)
+                    .display()
+                    .to_string()
+            };
+
+            let (sign, style, content) = match self {
+                Self::Untracked { path } => ("[+]", data.style_untracked, process_path(path)),
+                Self::Modified { path } => ("[~]", data.style_modified, process_path(path)),
+                Self::Conflict { path } => ("[x]", data.style_conflict, process_path(path)),
+                Self::Deleted { path } => ("[-]", data.style_deleted, process_path(path)),
+                Self::Renamed { from_path, to_path } => (
+                    "[>]",
+                    data.style_renamed,
+                    format!("{} -> {}", process_path(from_path), process_path(to_path)),
+                ),
+            };
+
+            Row::new([Cell::from(Span::styled(sign, style)), Cell::from(content)])
+        }
+    }
+
+    let cwd = helix_stdx::env::current_working_dir();
+    if !cwd.exists() {
+        cx.editor
+            .set_error("Current working directory does not exist");
+        return;
+    }
+
+    let added = cx.editor.theme.get("diff.plus");
+    let modified = cx.editor.theme.get("diff.delta");
+    let conflict = cx.editor.theme.get("diff.delta.conflict");
+    let deleted = cx.editor.theme.get("diff.minus");
+    let renamed = cx.editor.theme.get("diff.delta.moved");
+
+    let picker = Picker::new(
+        Vec::new(),
+        FileChangeData {
+            cwd: cwd.clone(),
+            style_untracked: added,
+            style_modified: modified,
+            style_conflict: conflict,
+            style_deleted: deleted,
+            style_renamed: renamed,
+        },
+        |cx, meta: &FileChange, action| {
+            let path_to_open = meta.path();
+            if let Err(e) = cx.editor.open(path_to_open, action) {
+                let err = if let Some(err) = e.source() {
+                    format!("{}", err)
+                } else {
+                    format!("unable to open \"{}\"", path_to_open.display())
+                };
+                cx.editor.set_error(err);
+            }
+        },
+    )
+    .with_preview(|_editor, meta| Some((meta.path().to_path_buf().into(), None)));
+    let injector = picker.injector();
+
+    cx.editor
+        .diff_providers
+        .clone()
+        .for_each_changed_file(cwd, move |change| match change {
+            Ok(change) => injector.push(change).is_ok(),
+            Err(err) => {
+                status::report_blocking(err);
+                true
+            }
+        });
+    cx.push_layer(Box::new(overlaid(picker)));
+}
+
 impl ui::menu::Item for MappableCommand {
     type Data = ReverseKeymap;
 
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index ffd076ad3..498a9a3e7 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -225,9 +225,10 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "S" => workspace_symbol_picker,
             "d" => diagnostics_picker,
             "D" => workspace_diagnostics_picker,
+            "g" => changed_file_picker,
             "a" => code_action,
             "'" => last_picker,
-            "g" => { "Debug (experimental)" sticky=true
+            "G" => { "Debug (experimental)" sticky=true
                 "l" => dap_launch,
                 "r" => dap_restart,
                 "b" => dap_toggle_breakpoint,
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index d54f5312b..872ec64b0 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.1" }
 
-gix = { version = "0.61.0", features = ["attributes"], default-features = false, optional = true }
+gix = { version = "0.61.0", features = ["attributes", "status"], default-features = false, optional = true }
 imara-diff = "0.1.5"
 anyhow = "1"
 
diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs
index 995bade06..8d935b5fc 100644
--- a/helix-vcs/src/git.rs
+++ b/helix-vcs/src/git.rs
@@ -5,15 +5,24 @@ use std::io::Read;
 use std::path::Path;
 use std::sync::Arc;
 
+use gix::bstr::ByteSlice;
+use gix::diff::Rewrites;
+use gix::dir::entry::Status;
 use gix::objs::tree::EntryKind;
 use gix::sec::trust::DefaultForLevel;
+use gix::status::{
+    index_worktree::iter::Item,
+    plumbing::index_as_worktree::{Change, EntryStatus},
+    UntrackedFiles,
+};
 use gix::{Commit, ObjectId, Repository, ThreadSafeRepository};
 
-use crate::DiffProvider;
+use crate::{DiffProvider, FileChange};
 
 #[cfg(test)]
 mod test;
 
+#[derive(Clone, Copy)]
 pub struct Git;
 
 impl Git {
@@ -61,10 +70,77 @@ impl Git {
 
         Ok(res)
     }
+
+    /// Emulates the result of running `git status` from the command line.
+    fn status(repo: &Repository, f: impl Fn(Result<FileChange>) -> bool) -> Result<()> {
+        let work_dir = repo
+            .work_dir()
+            .ok_or_else(|| anyhow::anyhow!("working tree not found"))?
+            .to_path_buf();
+
+        let status_platform = repo
+            .status(gix::progress::Discard)?
+            // Here we discard the `status.showUntrackedFiles` config, as it makes little sense in
+            // our case to not list new (untracked) files. We could have respected this config
+            // if the default value weren't `Collapsed` though, as this default value would render
+            // the feature unusable to many.
+            .untracked_files(UntrackedFiles::Files)
+            // Turn on file rename detection, which is off by default.
+            .index_worktree_rewrites(Some(Rewrites {
+                copies: None,
+                percentage: Some(0.5),
+                limit: 1000,
+            }));
+
+        // No filtering based on path
+        let empty_patterns = vec![];
+
+        let status_iter = status_platform.into_index_worktree_iter(empty_patterns)?;
+
+        for item in status_iter {
+            let Ok(item) = item.map_err(|err| f(Err(err.into()))) else {
+                continue;
+            };
+            let change = match item {
+                Item::Modification {
+                    rela_path, status, ..
+                } => {
+                    let path = work_dir.join(rela_path.to_path()?);
+                    match status {
+                        EntryStatus::Conflict(_) => FileChange::Conflict { path },
+                        EntryStatus::Change(Change::Removed) => FileChange::Deleted { path },
+                        EntryStatus::Change(Change::Modification { .. }) => {
+                            FileChange::Modified { path }
+                        }
+                        _ => continue,
+                    }
+                }
+                Item::DirectoryContents { entry, .. } if entry.status == Status::Untracked => {
+                    FileChange::Untracked {
+                        path: work_dir.join(entry.rela_path.to_path()?),
+                    }
+                }
+                Item::Rewrite {
+                    source,
+                    dirwalk_entry,
+                    ..
+                } => FileChange::Renamed {
+                    from_path: work_dir.join(source.rela_path().to_path()?),
+                    to_path: work_dir.join(dirwalk_entry.rela_path.to_path()?),
+                },
+                _ => continue,
+            };
+            if !f(Ok(change)) {
+                break;
+            }
+        }
+
+        Ok(())
+    }
 }
 
-impl DiffProvider for Git {
-    fn get_diff_base(&self, file: &Path) -> Result<Vec<u8>> {
+impl Git {
+    pub fn get_diff_base(&self, file: &Path) -> Result<Vec<u8>> {
         debug_assert!(!file.exists() || file.is_file());
         debug_assert!(file.is_absolute());
 
@@ -95,7 +171,7 @@ impl DiffProvider for Git {
         }
     }
 
-    fn get_current_head_name(&self, file: &Path) -> Result<Arc<ArcSwap<Box<str>>>> {
+    pub fn get_current_head_name(&self, file: &Path) -> Result<Arc<ArcSwap<Box<str>>>> {
         debug_assert!(!file.exists() || file.is_file());
         debug_assert!(file.is_absolute());
         let repo_dir = file.parent().context("file has no parent directory")?;
@@ -112,6 +188,20 @@ impl DiffProvider for Git {
 
         Ok(Arc::new(ArcSwap::from_pointee(name.into_boxed_str())))
     }
+
+    pub fn for_each_changed_file(
+        &self,
+        cwd: &Path,
+        f: impl Fn(Result<FileChange>) -> bool,
+    ) -> Result<()> {
+        Self::status(&Self::open_repo(cwd, None)?.to_thread_local(), f)
+    }
+}
+
+impl From<Git> for DiffProvider {
+    fn from(value: Git) -> Self {
+        DiffProvider::Git(value)
+    }
 }
 
 /// Finds the object that contains the contents of a file at a specific commit.
diff --git a/helix-vcs/src/git/test.rs b/helix-vcs/src/git/test.rs
index 9c67d2c33..0f928204a 100644
--- a/helix-vcs/src/git/test.rs
+++ b/helix-vcs/src/git/test.rs
@@ -2,7 +2,7 @@ use std::{fs::File, io::Write, path::Path, process::Command};
 
 use tempfile::TempDir;
 
-use crate::{DiffProvider, Git};
+use crate::Git;
 
 fn exec_git_cmd(args: &str, git_dir: &Path) {
     let res = Command::new("git")
diff --git a/helix-vcs/src/lib.rs b/helix-vcs/src/lib.rs
index 851fd6e91..7225c38eb 100644
--- a/helix-vcs/src/lib.rs
+++ b/helix-vcs/src/lib.rs
@@ -1,6 +1,9 @@
-use anyhow::{bail, Result};
+use anyhow::{anyhow, bail, Result};
 use arc_swap::ArcSwap;
-use std::{path::Path, sync::Arc};
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+};
 
 #[cfg(feature = "git")]
 pub use git::Git;
@@ -14,18 +17,14 @@ mod diff;
 
 pub use diff::{DiffHandle, Hunk};
 
-pub trait DiffProvider {
-    /// Returns the data that a diff should be computed against
-    /// if this provider is used.
-    /// The data is returned as raw byte without any decoding or encoding performed
-    /// to ensure all file encodings are handled correctly.
-    fn get_diff_base(&self, file: &Path) -> Result<Vec<u8>>;
-    fn get_current_head_name(&self, file: &Path) -> Result<Arc<ArcSwap<Box<str>>>>;
-}
+mod status;
+
+pub use status::FileChange;
 
 #[doc(hidden)]
+#[derive(Clone, Copy)]
 pub struct Dummy;
-impl DiffProvider for Dummy {
+impl Dummy {
     fn get_diff_base(&self, _file: &Path) -> Result<Vec<u8>> {
         bail!("helix was compiled without git support")
     }
@@ -33,10 +32,25 @@ impl DiffProvider for Dummy {
     fn get_current_head_name(&self, _file: &Path) -> Result<Arc<ArcSwap<Box<str>>>> {
         bail!("helix was compiled without git support")
     }
+
+    fn for_each_changed_file(
+        &self,
+        _cwd: &Path,
+        _f: impl Fn(Result<FileChange>) -> bool,
+    ) -> Result<()> {
+        bail!("helix was compiled without git support")
+    }
 }
 
+impl From<Dummy> for DiffProvider {
+    fn from(value: Dummy) -> Self {
+        DiffProvider::Dummy(value)
+    }
+}
+
+#[derive(Clone)]
 pub struct DiffProviderRegistry {
-    providers: Vec<Box<dyn DiffProvider>>,
+    providers: Vec<DiffProvider>,
 }
 
 impl DiffProviderRegistry {
@@ -65,14 +79,71 @@ impl DiffProviderRegistry {
                 }
             })
     }
+
+    /// Fire-and-forget changed file iteration. Runs everything in a background task. Keeps
+    /// iteration until `on_change` returns `false`.
+    pub fn for_each_changed_file(
+        self,
+        cwd: PathBuf,
+        f: impl Fn(Result<FileChange>) -> bool + Send + 'static,
+    ) {
+        tokio::task::spawn_blocking(move || {
+            if self
+                .providers
+                .iter()
+                .find_map(|provider| provider.for_each_changed_file(&cwd, &f).ok())
+                .is_none()
+            {
+                f(Err(anyhow!("no diff provider returns success")));
+            }
+        });
+    }
 }
 
 impl Default for DiffProviderRegistry {
     fn default() -> Self {
         // currently only git is supported
         // TODO make this configurable when more providers are added
-        let git: Box<dyn DiffProvider> = Box::new(Git);
-        let providers = vec![git];
+        let providers = vec![Git.into()];
         DiffProviderRegistry { providers }
     }
 }
+
+/// A union type that includes all types that implement [DiffProvider]. We need this type to allow
+/// cloning [DiffProviderRegistry] as `Clone` cannot be used in trait objects.
+#[derive(Clone)]
+pub enum DiffProvider {
+    Dummy(Dummy),
+    #[cfg(feature = "git")]
+    Git(Git),
+}
+
+impl DiffProvider {
+    fn get_diff_base(&self, file: &Path) -> Result<Vec<u8>> {
+        match self {
+            Self::Dummy(inner) => inner.get_diff_base(file),
+            #[cfg(feature = "git")]
+            Self::Git(inner) => inner.get_diff_base(file),
+        }
+    }
+
+    fn get_current_head_name(&self, file: &Path) -> Result<Arc<ArcSwap<Box<str>>>> {
+        match self {
+            Self::Dummy(inner) => inner.get_current_head_name(file),
+            #[cfg(feature = "git")]
+            Self::Git(inner) => inner.get_current_head_name(file),
+        }
+    }
+
+    fn for_each_changed_file(
+        &self,
+        cwd: &Path,
+        f: impl Fn(Result<FileChange>) -> bool,
+    ) -> Result<()> {
+        match self {
+            Self::Dummy(inner) => inner.for_each_changed_file(cwd, f),
+            #[cfg(feature = "git")]
+            Self::Git(inner) => inner.for_each_changed_file(cwd, f),
+        }
+    }
+}
diff --git a/helix-vcs/src/status.rs b/helix-vcs/src/status.rs
new file mode 100644
index 000000000..f34334909
--- /dev/null
+++ b/helix-vcs/src/status.rs
@@ -0,0 +1,32 @@
+use std::path::{Path, PathBuf};
+
+pub enum FileChange {
+    Untracked {
+        path: PathBuf,
+    },
+    Modified {
+        path: PathBuf,
+    },
+    Conflict {
+        path: PathBuf,
+    },
+    Deleted {
+        path: PathBuf,
+    },
+    Renamed {
+        from_path: PathBuf,
+        to_path: PathBuf,
+    },
+}
+
+impl FileChange {
+    pub fn path(&self) -> &Path {
+        match self {
+            Self::Untracked { path } => path,
+            Self::Modified { path } => path,
+            Self::Conflict { path } => path,
+            Self::Deleted { path } => path,
+            Self::Renamed { to_path, .. } => to_path,
+        }
+    }
+}

From 88d455afebb581bc607d12f04448fe6d8a21baa2 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Sun, 31 Mar 2024 18:43:09 -0400
Subject: [PATCH 906/967] Use a temporary file for writes (#9236)

Co-authored-by: Pascal Kuthe <pascalkuthe@pm.me>
---
 Cargo.lock                              |   4 +
 helix-stdx/Cargo.toml                   |   7 +
 helix-stdx/src/faccess.rs               | 459 ++++++++++++++++++++++++
 helix-stdx/src/lib.rs                   |   1 +
 helix-term/tests/test/commands/write.rs |  50 ++-
 helix-term/tests/test/helpers.rs        |  16 +-
 helix-term/tests/test/splits.rs         |  20 +-
 helix-view/Cargo.toml                   |   2 +
 helix-view/src/document.rs              |  87 +++--
 9 files changed, 569 insertions(+), 77 deletions(-)
 create mode 100644 helix-stdx/src/faccess.rs

diff --git a/Cargo.lock b/Cargo.lock
index 377e6c05b..46f8209f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1405,12 +1405,15 @@ version = "24.3.0"
 name = "helix-stdx"
 version = "24.3.0"
 dependencies = [
+ "bitflags 2.5.0",
  "dunce",
  "etcetera",
  "regex-cursor",
  "ropey",
+ "rustix",
  "tempfile",
  "which",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1515,6 +1518,7 @@ dependencies = [
  "serde",
  "serde_json",
  "slotmap",
+ "tempfile",
  "tokio",
  "tokio-stream",
  "toml",
diff --git a/helix-stdx/Cargo.toml b/helix-stdx/Cargo.toml
index ed23f4e4f..f17e08854 100644
--- a/helix-stdx/Cargo.toml
+++ b/helix-stdx/Cargo.toml
@@ -17,6 +17,13 @@ etcetera = "0.8"
 ropey = { version = "1.6.1", default-features = false }
 which = "6.0"
 regex-cursor = "0.1.4"
+bitflags = "2.4"
+
+[target.'cfg(windows)'.dependencies]
+windows-sys = { version = "0.52", features = ["Win32_Security", "Win32_Security_Authorization", "Win32_System_Threading"] }
+
+[target.'cfg(unix)'.dependencies]
+rustix = { version = "0.38", features = ["fs"] }
 
 [dev-dependencies]
 tempfile = "3.10"
diff --git a/helix-stdx/src/faccess.rs b/helix-stdx/src/faccess.rs
new file mode 100644
index 000000000..0270c1f8a
--- /dev/null
+++ b/helix-stdx/src/faccess.rs
@@ -0,0 +1,459 @@
+//! From <https://github.com/Freaky/faccess>
+
+use std::io;
+use std::path::Path;
+
+use bitflags::bitflags;
+
+// Licensed under MIT from faccess
+bitflags! {
+    /// Access mode flags for `access` function to test for.
+    pub struct AccessMode: u8 {
+        /// Path exists
+        const EXISTS  = 0b0001;
+        /// Path can likely be read
+        const READ    = 0b0010;
+        /// Path can likely be written to
+        const WRITE   = 0b0100;
+        /// Path can likely be executed
+        const EXECUTE = 0b1000;
+    }
+}
+
+#[cfg(unix)]
+mod imp {
+    use super::*;
+
+    use rustix::fs::Access;
+    use std::os::unix::fs::{MetadataExt, PermissionsExt};
+
+    pub fn access(p: &Path, mode: AccessMode) -> io::Result<()> {
+        let mut imode = Access::empty();
+
+        if mode.contains(AccessMode::EXISTS) {
+            imode |= Access::EXISTS;
+        }
+
+        if mode.contains(AccessMode::READ) {
+            imode |= Access::READ_OK;
+        }
+
+        if mode.contains(AccessMode::WRITE) {
+            imode |= Access::WRITE_OK;
+        }
+
+        if mode.contains(AccessMode::EXECUTE) {
+            imode |= Access::EXEC_OK;
+        }
+
+        rustix::fs::access(p, imode)?;
+        Ok(())
+    }
+
+    fn chown(p: &Path, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
+        let uid = uid.map(|n| unsafe { rustix::fs::Uid::from_raw(n) });
+        let gid = gid.map(|n| unsafe { rustix::fs::Gid::from_raw(n) });
+        rustix::fs::chown(p, uid, gid)?;
+        Ok(())
+    }
+
+    pub fn copy_metadata(from: &Path, to: &Path) -> io::Result<()> {
+        let from_meta = std::fs::metadata(from)?;
+        let to_meta = std::fs::metadata(to)?;
+        let from_gid = from_meta.gid();
+        let to_gid = to_meta.gid();
+
+        let mut perms = from_meta.permissions();
+        perms.set_mode(perms.mode() & 0o0777);
+        if from_gid != to_gid && chown(to, None, Some(from_gid)).is_err() {
+            let new_perms = (perms.mode() & 0o0707) | ((perms.mode() & 0o07) << 3);
+            perms.set_mode(new_perms);
+        }
+
+        std::fs::set_permissions(to, perms)?;
+
+        Ok(())
+    }
+}
+
+// Licensed under MIT from faccess except for `chown`, `copy_metadata` and `is_acl_inherited`
+#[cfg(windows)]
+mod imp {
+
+    use windows_sys::Win32::Foundation::{CloseHandle, LocalFree, ERROR_SUCCESS, HANDLE, PSID};
+    use windows_sys::Win32::Security::Authorization::{
+        GetNamedSecurityInfoW, SetNamedSecurityInfoW, SE_FILE_OBJECT,
+    };
+    use windows_sys::Win32::Security::{
+        AccessCheck, AclSizeInformation, GetAce, GetAclInformation, GetSidIdentifierAuthority,
+        ImpersonateSelf, IsValidAcl, IsValidSid, MapGenericMask, RevertToSelf,
+        SecurityImpersonation, ACCESS_ALLOWED_CALLBACK_ACE, ACL, ACL_SIZE_INFORMATION,
+        DACL_SECURITY_INFORMATION, GENERIC_MAPPING, GROUP_SECURITY_INFORMATION, INHERITED_ACE,
+        LABEL_SECURITY_INFORMATION, OBJECT_SECURITY_INFORMATION, OWNER_SECURITY_INFORMATION,
+        PRIVILEGE_SET, PROTECTED_DACL_SECURITY_INFORMATION, PSECURITY_DESCRIPTOR,
+        SID_IDENTIFIER_AUTHORITY, TOKEN_DUPLICATE, TOKEN_QUERY,
+    };
+    use windows_sys::Win32::Storage::FileSystem::{
+        FILE_ACCESS_RIGHTS, FILE_ALL_ACCESS, FILE_GENERIC_EXECUTE, FILE_GENERIC_READ,
+        FILE_GENERIC_WRITE,
+    };
+    use windows_sys::Win32::System::Threading::{GetCurrentThread, OpenThreadToken};
+
+    use super::*;
+
+    use std::ffi::c_void;
+
+    use std::os::windows::{ffi::OsStrExt, fs::OpenOptionsExt};
+
+    struct SecurityDescriptor {
+        sd: PSECURITY_DESCRIPTOR,
+        owner: PSID,
+        group: PSID,
+        dacl: *mut ACL,
+    }
+
+    impl Drop for SecurityDescriptor {
+        fn drop(&mut self) {
+            if !self.sd.is_null() {
+                unsafe {
+                    LocalFree(self.sd);
+                }
+            }
+        }
+    }
+
+    impl SecurityDescriptor {
+        fn for_path(p: &Path) -> io::Result<SecurityDescriptor> {
+            let path = std::fs::canonicalize(p)?;
+            let pathos = path.into_os_string();
+            let mut pathw: Vec<u16> = Vec::with_capacity(pathos.len() + 1);
+            pathw.extend(pathos.encode_wide());
+            pathw.push(0);
+
+            let mut sd = std::ptr::null_mut();
+            let mut owner = std::ptr::null_mut();
+            let mut group = std::ptr::null_mut();
+            let mut dacl = std::ptr::null_mut();
+
+            let err = unsafe {
+                GetNamedSecurityInfoW(
+                    pathw.as_ptr(),
+                    SE_FILE_OBJECT,
+                    OWNER_SECURITY_INFORMATION
+                        | GROUP_SECURITY_INFORMATION
+                        | DACL_SECURITY_INFORMATION
+                        | LABEL_SECURITY_INFORMATION,
+                    &mut owner,
+                    &mut group,
+                    &mut dacl,
+                    std::ptr::null_mut(),
+                    &mut sd,
+                )
+            };
+
+            if err == ERROR_SUCCESS {
+                Ok(SecurityDescriptor {
+                    sd,
+                    owner,
+                    group,
+                    dacl,
+                })
+            } else {
+                Err(io::Error::last_os_error())
+            }
+        }
+
+        fn is_acl_inherited(&self) -> bool {
+            let mut acl_info: ACL_SIZE_INFORMATION = unsafe { ::core::mem::zeroed() };
+            let acl_info_ptr: *mut c_void = &mut acl_info as *mut _ as *mut c_void;
+            let mut ace: ACCESS_ALLOWED_CALLBACK_ACE = unsafe { ::core::mem::zeroed() };
+
+            unsafe {
+                GetAclInformation(
+                    self.dacl,
+                    acl_info_ptr,
+                    std::mem::size_of_val(&acl_info) as u32,
+                    AclSizeInformation,
+                )
+            };
+
+            for i in 0..acl_info.AceCount {
+                let mut ptr = &mut ace as *mut _ as *mut c_void;
+                unsafe { GetAce(self.dacl, i, &mut ptr) };
+                if (ace.Header.AceFlags as u32 & INHERITED_ACE) != 0 {
+                    return true;
+                }
+            }
+
+            false
+        }
+
+        fn descriptor(&self) -> &PSECURITY_DESCRIPTOR {
+            &self.sd
+        }
+
+        fn owner(&self) -> &PSID {
+            &self.owner
+        }
+    }
+
+    struct ThreadToken(HANDLE);
+    impl Drop for ThreadToken {
+        fn drop(&mut self) {
+            unsafe {
+                CloseHandle(self.0);
+            }
+        }
+    }
+
+    impl ThreadToken {
+        fn new() -> io::Result<Self> {
+            unsafe {
+                if ImpersonateSelf(SecurityImpersonation) == 0 {
+                    return Err(io::Error::last_os_error());
+                }
+
+                let token: *mut HANDLE = std::ptr::null_mut();
+                let err =
+                    OpenThreadToken(GetCurrentThread(), TOKEN_DUPLICATE | TOKEN_QUERY, 0, token);
+
+                RevertToSelf();
+
+                if err == 0 {
+                    return Err(io::Error::last_os_error());
+                }
+
+                Ok(Self(*token))
+            }
+        }
+
+        fn as_handle(&self) -> &HANDLE {
+            &self.0
+        }
+    }
+
+    // Based roughly on Tcl's NativeAccess()
+    // https://github.com/tcltk/tcl/blob/2ee77587e4dc2150deb06b48f69db948b4ab0584/win/tclWinFile.c
+    fn eaccess(p: &Path, mut mode: FILE_ACCESS_RIGHTS) -> io::Result<()> {
+        let md = p.metadata()?;
+
+        if !md.is_dir() {
+            // Read Only is ignored for directories
+            if mode & FILE_GENERIC_WRITE == FILE_GENERIC_WRITE && md.permissions().readonly() {
+                return Err(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    "File is read only",
+                ));
+            }
+
+            // If it doesn't have the correct extension it isn't executable
+            if mode & FILE_GENERIC_EXECUTE == FILE_GENERIC_EXECUTE {
+                if let Some(ext) = p.extension().and_then(|s| s.to_str()) {
+                    match ext {
+                        "exe" | "com" | "bat" | "cmd" => (),
+                        _ => {
+                            return Err(io::Error::new(
+                                io::ErrorKind::InvalidData,
+                                "File not executable",
+                            ))
+                        }
+                    }
+                }
+            }
+
+            return std::fs::OpenOptions::new()
+                .access_mode(mode)
+                .open(p)
+                .map(|_| ());
+        }
+
+        let sd = SecurityDescriptor::for_path(p)?;
+
+        // Unmapped Samba users are assigned a top level authority of 22
+        // ACL tests are likely to be misleading
+        const SAMBA_UNMAPPED: SID_IDENTIFIER_AUTHORITY = SID_IDENTIFIER_AUTHORITY {
+            Value: [0, 0, 0, 0, 0, 22],
+        };
+        unsafe {
+            let owner = sd.owner();
+            if IsValidSid(*owner) != 0
+                && (*GetSidIdentifierAuthority(*owner)).Value == SAMBA_UNMAPPED.Value
+            {
+                return Ok(());
+            }
+        }
+
+        let token = ThreadToken::new()?;
+
+        let mut privileges: PRIVILEGE_SET = unsafe { std::mem::zeroed() };
+        let mut granted_access: u32 = 0;
+        let mut privileges_length = std::mem::size_of::<PRIVILEGE_SET>() as u32;
+        let mut result = 0;
+
+        let mut mapping = GENERIC_MAPPING {
+            GenericRead: FILE_GENERIC_READ,
+            GenericWrite: FILE_GENERIC_WRITE,
+            GenericExecute: FILE_GENERIC_EXECUTE,
+            GenericAll: FILE_ALL_ACCESS,
+        };
+
+        unsafe { MapGenericMask(&mut mode, &mut mapping) };
+
+        if unsafe {
+            AccessCheck(
+                *sd.descriptor(),
+                *token.as_handle(),
+                mode,
+                &mut mapping,
+                &mut privileges,
+                &mut privileges_length,
+                &mut granted_access,
+                &mut result,
+            )
+        } != 0
+        {
+            if result == 0 {
+                Err(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    "Permission Denied",
+                ))
+            } else {
+                Ok(())
+            }
+        } else {
+            Err(io::Error::last_os_error())
+        }
+    }
+
+    pub fn access(p: &Path, mode: AccessMode) -> io::Result<()> {
+        let mut imode = 0;
+
+        if mode.contains(AccessMode::READ) {
+            imode |= FILE_GENERIC_READ;
+        }
+
+        if mode.contains(AccessMode::WRITE) {
+            imode |= FILE_GENERIC_WRITE;
+        }
+
+        if mode.contains(AccessMode::EXECUTE) {
+            imode |= FILE_GENERIC_EXECUTE;
+        }
+
+        if imode == 0 {
+            if p.exists() {
+                Ok(())
+            } else {
+                Err(io::Error::new(io::ErrorKind::NotFound, "Not Found"))
+            }
+        } else {
+            eaccess(p, imode)
+        }
+    }
+
+    fn chown(p: &Path, sd: SecurityDescriptor) -> io::Result<()> {
+        let path = std::fs::canonicalize(p)?;
+        let pathos = path.as_os_str();
+        let mut pathw = Vec::with_capacity(pathos.len() + 1);
+        pathw.extend(pathos.encode_wide());
+        pathw.push(0);
+
+        let mut owner = std::ptr::null_mut();
+        let mut group = std::ptr::null_mut();
+        let mut dacl = std::ptr::null();
+
+        let mut si = OBJECT_SECURITY_INFORMATION::default();
+        if unsafe { IsValidSid(sd.owner) } != 0 {
+            si |= OWNER_SECURITY_INFORMATION;
+            owner = sd.owner;
+        }
+
+        if unsafe { IsValidSid(sd.group) } != 0 {
+            si |= GROUP_SECURITY_INFORMATION;
+            group = sd.group;
+        }
+
+        if unsafe { IsValidAcl(sd.dacl) } != 0 {
+            si |= DACL_SECURITY_INFORMATION;
+            if !sd.is_acl_inherited() {
+                si |= PROTECTED_DACL_SECURITY_INFORMATION;
+            }
+            dacl = sd.dacl as *const _;
+        }
+
+        let err = unsafe {
+            SetNamedSecurityInfoW(
+                pathw.as_ptr(),
+                SE_FILE_OBJECT,
+                si,
+                owner,
+                group,
+                dacl,
+                std::ptr::null(),
+            )
+        };
+
+        if err == ERROR_SUCCESS {
+            Ok(())
+        } else {
+            Err(io::Error::last_os_error())
+        }
+    }
+
+    pub fn copy_metadata(from: &Path, to: &Path) -> io::Result<()> {
+        let sd = SecurityDescriptor::for_path(from)?;
+        chown(to, sd)?;
+
+        let meta = std::fs::metadata(from)?;
+        let perms = meta.permissions();
+
+        std::fs::set_permissions(to, perms)?;
+
+        Ok(())
+    }
+}
+
+// Licensed under MIT from faccess except for `copy_metadata`
+#[cfg(not(any(unix, windows)))]
+mod imp {
+    use super::*;
+
+    pub fn access(p: &Path, mode: AccessMode) -> io::Result<()> {
+        if mode.contains(AccessMode::WRITE) {
+            if std::fs::metadata(p)?.permissions().readonly() {
+                return Err(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    "Path is read only",
+                ));
+            } else {
+                return Ok(());
+            }
+        }
+
+        if p.exists() {
+            Ok(())
+        } else {
+            Err(io::Error::new(io::ErrorKind::NotFound, "Path not found"))
+        }
+    }
+
+    pub fn copy_metadata(from: &path, to: &Path) -> io::Result<()> {
+        let meta = std::fs::metadata(from)?;
+        let perms = meta.permissions();
+        std::fs::set_permissions(to, perms)?;
+
+        Ok(())
+    }
+}
+
+pub fn readonly(p: &Path) -> bool {
+    match imp::access(p, AccessMode::WRITE) {
+        Ok(_) => false,
+        Err(err) if err.kind() == std::io::ErrorKind::NotFound => false,
+        Err(_) => true,
+    }
+}
+
+pub fn copy_metadata(from: &Path, to: &Path) -> io::Result<()> {
+    imp::copy_metadata(from, to)
+}
diff --git a/helix-stdx/src/lib.rs b/helix-stdx/src/lib.rs
index 68fe3ec37..19602c205 100644
--- a/helix-stdx/src/lib.rs
+++ b/helix-stdx/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod env;
+pub mod faccess;
 pub mod path;
 pub mod rope;
diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index 7259b4e58..c9280bbd4 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs
@@ -95,7 +95,7 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     .await?;
 
     helpers::assert_file_has_content(
-        file.as_file_mut(),
+        &mut file,
         &LineFeedHandling::Native.apply(&RANGE.end().to_string()),
     )?;
 
@@ -117,9 +117,7 @@ async fn test_write() -> anyhow::Result<()> {
     )
     .await?;
 
-    file.as_file_mut().flush()?;
-    file.as_file_mut().sync_all()?;
-
+    reload_file(&mut file).unwrap();
     let mut file_content = String::new();
     file.as_file_mut().read_to_string(&mut file_content)?;
 
@@ -148,12 +146,9 @@ async fn test_overwrite_protection() -> anyhow::Result<()> {
 
     test_key_sequence(&mut app, Some(":x<ret>"), None, false).await?;
 
-    file.as_file_mut().flush()?;
-    file.as_file_mut().sync_all()?;
-
-    file.rewind()?;
+    reload_file(&mut file).unwrap();
     let mut file_content = String::new();
-    file.as_file_mut().read_to_string(&mut file_content)?;
+    file.read_to_string(&mut file_content)?;
 
     assert_eq!("extremely important content", file_content);
 
@@ -175,11 +170,10 @@ async fn test_write_quit() -> anyhow::Result<()> {
     )
     .await?;
 
-    file.as_file_mut().flush()?;
-    file.as_file_mut().sync_all()?;
+    reload_file(&mut file).unwrap();
 
     let mut file_content = String::new();
-    file.as_file_mut().read_to_string(&mut file_content)?;
+    file.read_to_string(&mut file_content)?;
 
     assert_eq!(
         LineFeedHandling::Native.apply("the gostak distims the doshes"),
@@ -205,11 +199,9 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
 
     test_key_sequence(&mut app, Some(&command), None, false).await?;
 
-    file.as_file_mut().flush()?;
-    file.as_file_mut().sync_all()?;
-
+    reload_file(&mut file).unwrap();
     let mut file_content = String::new();
-    file.as_file_mut().read_to_string(&mut file_content)?;
+    file.read_to_string(&mut file_content)?;
     assert_eq!(
         LineFeedHandling::Native.apply(&RANGE.end().to_string()),
         file_content
@@ -279,7 +271,7 @@ async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {
     )
     .await?;
 
-    helpers::assert_file_has_content(file.as_file_mut(), &LineFeedHandling::Native.apply("hello"))?;
+    helpers::assert_file_has_content(&mut file, &LineFeedHandling::Native.apply("hello"))?;
 
     Ok(())
 }
@@ -324,7 +316,7 @@ async fn test_write_auto_format_fails_still_writes() -> anyhow::Result<()> {
     test_key_sequences(&mut app, vec![(Some(":w<ret>"), None)], false).await?;
 
     // file still saves
-    helpers::assert_file_has_content(file.as_file_mut(), "let foo = 0;\n")?;
+    helpers::assert_file_has_content(&mut file, "let foo = 0;\n")?;
 
     Ok(())
 }
@@ -363,12 +355,12 @@ async fn test_write_new_path() -> anyhow::Result<()> {
     .await?;
 
     helpers::assert_file_has_content(
-        file1.as_file_mut(),
+        &mut file1,
         &LineFeedHandling::Native.apply("i can eat glass, it will not hurt me\n"),
     )?;
 
     helpers::assert_file_has_content(
-        file2.as_file_mut(),
+        &mut file2,
         &LineFeedHandling::Native.apply("i can eat glass, it will not hurt me\n"),
     )?;
 
@@ -439,7 +431,7 @@ async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()
     test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
 
     helpers::assert_file_has_content(
-        file.as_file_mut(),
+        &mut file,
         &LineFeedHandling::Native.apply("have you tried chamomile tea?\n"),
     )?;
 
@@ -457,7 +449,7 @@ async fn test_write_insert_final_newline_unchanged_if_not_missing() -> anyhow::R
     test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
 
     helpers::assert_file_has_content(
-        file.as_file_mut(),
+        &mut file,
         &LineFeedHandling::Native.apply("ten minutes, please\n"),
     )?;
 
@@ -481,10 +473,8 @@ async fn test_write_insert_final_newline_unchanged_if_missing_and_false() -> any
 
     test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
 
-    helpers::assert_file_has_content(
-        file.as_file_mut(),
-        "the quiet rain continued through the night",
-    )?;
+    reload_file(&mut file).unwrap();
+    helpers::assert_file_has_content(&mut file, "the quiet rain continued through the night")?;
 
     Ok(())
 }
@@ -510,12 +500,12 @@ async fn test_write_all_insert_final_newline_add_if_missing_and_modified() -> an
     .await?;
 
     helpers::assert_file_has_content(
-        file1.as_file_mut(),
+        &mut file1,
         &LineFeedHandling::Native.apply("we don't serve time travelers here\n"),
     )?;
 
     helpers::assert_file_has_content(
-        file2.as_file_mut(),
+        &mut file2,
         &LineFeedHandling::Native.apply("a time traveler walks into a bar\n"),
     )?;
 
@@ -534,7 +524,7 @@ async fn test_write_all_insert_final_newline_do_not_add_if_unmodified() -> anyho
 
     test_key_sequence(&mut app, Some(":wa<ret>"), None, false).await?;
 
-    helpers::assert_file_has_content(file.as_file_mut(), "i lost on Jeopardy!")?;
+    helpers::assert_file_has_content(&mut file, "i lost on Jeopardy!")?;
 
     Ok(())
 }
@@ -560,7 +550,7 @@ async fn edit_file_with_content(file_content: &[u8]) -> anyhow::Result<()> {
     )
     .await?;
 
-    file.rewind()?;
+    reload_file(&mut file).unwrap();
     let mut new_file_content: Vec<u8> = Vec::new();
     file.read_to_end(&mut new_file_content)?;
 
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 41eab4273..d7205b0c0 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -1,5 +1,4 @@
 use std::{
-    fs::File,
     io::{Read, Write},
     mem::replace,
     path::PathBuf,
@@ -390,9 +389,8 @@ pub async fn run_event_loop_until_idle(app: &mut Application) {
     app.event_loop_until_idle(&mut rx_stream).await;
 }
 
-pub fn assert_file_has_content(file: &mut File, content: &str) -> anyhow::Result<()> {
-    file.flush()?;
-    file.sync_all()?;
+pub fn assert_file_has_content(file: &mut NamedTempFile, content: &str) -> anyhow::Result<()> {
+    reload_file(file)?;
 
     let mut file_content = String::new();
     file.read_to_string(&mut file_content)?;
@@ -406,3 +404,13 @@ pub fn assert_status_not_error(editor: &Editor) {
         assert_ne!(&Severity::Error, sev);
     }
 }
+
+pub fn reload_file(file: &mut NamedTempFile) -> anyhow::Result<()> {
+    let path = file.path();
+    let f = std::fs::OpenOptions::new()
+        .write(true)
+        .read(true)
+        .open(&path)?;
+    *file.as_file_mut() = f;
+    Ok(())
+}
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index f19e30041..3ba5a504b 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -62,18 +62,9 @@ async fn test_split_write_quit_all() -> anyhow::Result<()> {
     )
     .await?;
 
-    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"),
-    )?;
+    helpers::assert_file_has_content(&mut file1, &LineFeedHandling::Native.apply("hello1"))?;
+    helpers::assert_file_has_content(&mut file2, &LineFeedHandling::Native.apply("hello2"))?;
+    helpers::assert_file_has_content(&mut file3, &LineFeedHandling::Native.apply("hello3"))?;
 
     Ok(())
 }
@@ -131,10 +122,7 @@ async fn test_split_write_quit_same_file() -> anyhow::Result<()> {
     )
     .await?;
 
-    helpers::assert_file_has_content(
-        file.as_file_mut(),
-        &LineFeedHandling::Native.apply("hello\ngoodbye"),
-    )?;
+    helpers::assert_file_has_content(&mut file, &LineFeedHandling::Native.apply("hello\ngoodbye"))?;
 
     Ok(())
 }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index f12185c86..be0edc96e 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -27,6 +27,8 @@ bitflags = "2.5"
 anyhow = "1"
 crossterm = { version = "0.27", optional = true }
 
+tempfile = "3.9"
+
 # Conversion traits
 once_cell = "1.19"
 url = "2.5.0"
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index da68a67fb..0c3a75f1b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -10,6 +10,7 @@ use helix_core::encoding::Encoding;
 use helix_core::syntax::{Highlight, LanguageServerFeature};
 use helix_core::text_annotations::{InlineAnnotation, Overlay};
 use helix_lsp::util::lsp_pos_to_pos;
+use helix_stdx::faccess::{copy_metadata, readonly};
 use helix_vcs::{DiffHandle, DiffProviderRegistry};
 
 use ::parking_lot::Mutex;
@@ -870,7 +871,7 @@ impl Document {
 
         // We encode the file according to the `Document`'s encoding.
         let future = async move {
-            use tokio::{fs, fs::File};
+            use tokio::fs;
             if let Some(parent) = path.parent() {
                 // TODO: display a prompt asking the user if the directories should be created
                 if !parent.exists() {
@@ -893,8 +894,63 @@ impl Document {
                 }
             }
 
-            let mut file = File::create(&path).await?;
-            to_writer(&mut file, encoding_with_bom_info, &text).await?;
+            if readonly(&path) {
+                bail!(std::io::Error::new(
+                    std::io::ErrorKind::PermissionDenied,
+                    "Path is read only"
+                ));
+            }
+            let backup = if path.exists() {
+                let path_ = path.clone();
+                // hacks: we use tempfile to handle the complex task of creating
+                // non clobbered temporary path for us we don't want
+                // the whole automatically delete path on drop thing
+                // since the path doesn't exist yet, we just want
+                // the path
+                tokio::task::spawn_blocking(move || -> Option<PathBuf> {
+                    tempfile::Builder::new()
+                        .prefix(path_.file_name()?)
+                        .suffix(".bck")
+                        .make_in(path_.parent()?, |backup| std::fs::rename(&path_, backup))
+                        .ok()?
+                        .into_temp_path()
+                        .keep()
+                        .ok()
+                })
+                .await
+                .ok()
+                .flatten()
+            } else {
+                None
+            };
+
+            let write_result: anyhow::Result<_> = async {
+                let mut dst = tokio::fs::File::create(&path).await?;
+                to_writer(&mut dst, encoding_with_bom_info, &text).await?;
+                Ok(())
+            }
+            .await;
+
+            if let Some(backup) = backup {
+                if write_result.is_err() {
+                    // restore backup
+                    let _ = tokio::fs::rename(&backup, &path)
+                        .await
+                        .map_err(|e| log::error!("Failed to restore backup on write failure: {e}"));
+                } else {
+                    // copy metadata and delete backup
+                    let path_ = path.clone();
+                    let _ = tokio::task::spawn_blocking(move || {
+                        let _ = copy_metadata(&backup, &path_)
+                            .map_err(|e| log::error!("Failed to copy metadata on write: {e}"));
+                        let _ = std::fs::remove_file(backup)
+                            .map_err(|e| log::error!("Failed to remove backup file on write: {e}"));
+                    })
+                    .await;
+                }
+            }
+
+            write_result?;
 
             let event = DocumentSavedEvent {
                 revision: current_rev,
@@ -955,35 +1011,12 @@ impl Document {
         }
     }
 
-    #[cfg(unix)]
     // Detect if the file is readonly and change the readonly field if necessary (unix only)
     pub fn detect_readonly(&mut self) {
-        use rustix::fs::{access, Access};
         // Allows setting the flag for files the user cannot modify, like root files
         self.readonly = match &self.path {
             None => false,
-            Some(p) => match access(p, Access::WRITE_OK) {
-                Ok(_) => false,
-                Err(err) if err.kind() == std::io::ErrorKind::NotFound => false,
-                Err(_) => true,
-            },
-        };
-    }
-
-    #[cfg(not(unix))]
-    // Detect if the file is readonly and change the readonly field if necessary (non-unix os)
-    pub fn detect_readonly(&mut self) {
-        // TODO Use the Windows' function `CreateFileW` to check if a file is readonly
-        // Discussion: https://github.com/helix-editor/helix/pull/7740#issuecomment-1656806459
-        // Vim implementation: https://github.com/vim/vim/blob/4c0089d696b8d1d5dc40568f25ea5738fa5bbffb/src/os_win32.c#L7665
-        // Windows binding: https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Storage/FileSystem/fn.CreateFileW.html
-        self.readonly = match &self.path {
-            None => false,
-            Some(p) => match std::fs::metadata(p) {
-                Err(err) if err.kind() == std::io::ErrorKind::NotFound => false,
-                Err(_) => false,
-                Ok(metadata) => metadata.permissions().readonly(),
-            },
+            Some(p) => readonly(p),
         };
     }
 

From d56f3fb755b99a04d0e0286dfca086d4610469ed Mon Sep 17 00:00:00 2001
From: Pawel Grzybek <pawelgrzybek@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:45:55 +0100
Subject: [PATCH 907/967] Add jump-label styling for base16 themes (#10076)

* add jump-label styling for base16_transparent theme

* keep the change consistent with other themes from base16 family

* update jump-labels color to blue and make them bold
---
 base16_theme.toml                        | 1 +
 runtime/themes/base16_default_dark.toml  | 1 +
 runtime/themes/base16_default_light.toml | 1 +
 runtime/themes/base16_terminal.toml      | 1 +
 runtime/themes/base16_transparent.toml   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/base16_theme.toml b/base16_theme.toml
index 268a38df6..49f09afed 100644
--- a/base16_theme.toml
+++ b/base16_theme.toml
@@ -28,6 +28,7 @@
 "label" = "magenta"
 "namespace" = "magenta"
 "ui.help" = { fg = "white", bg = "black" }
+"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
 
 "markup.heading" = "blue"
 "markup.list" = "red"
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 1a38a6aeb..0e5f066ba 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -2,6 +2,7 @@
 
 "ui.background" = { bg = "base00" }
 "ui.virtual.whitespace" = "base03"
+"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
 "ui.menu" = { fg = "base05", bg = "base01" }
 "ui.menu.selected" = { fg = "base01", bg = "base04" }
 "ui.linenr" = { fg = "base03", bg = "base01" }
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 84dab5305..e89a9d1be 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -13,6 +13,7 @@
 "ui.cursor" = { fg = "base04", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "base05", modifiers = ["reversed"] }
 "ui.virtual.whitespace" = "base03"
+"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
 "ui.text" = "base05"
 "operator" = "base05"
 "ui.text.focus" = "base05"
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
index f39758611..6864c0eb4 100644
--- a/runtime/themes/base16_terminal.toml
+++ b/runtime/themes/base16_terminal.toml
@@ -14,6 +14,7 @@
 "ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "light-gray", modifiers = ["reversed"] }
 "ui.virtual.whitespace" = "light-gray"
+"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
 "variable" = "light-red"
 "constant.numeric" = "yellow"
 "constant" = "yellow"
diff --git a/runtime/themes/base16_transparent.toml b/runtime/themes/base16_transparent.toml
index c314ae8c5..70452366f 100644
--- a/runtime/themes/base16_transparent.toml
+++ b/runtime/themes/base16_transparent.toml
@@ -31,6 +31,7 @@
 "ui.virtual.inlay-hint.parameter" = { fg = "white", bg = "gray"}
 "ui.virtual.inlay-hint.type" = { fg = "white", bg = "gray"}
 "ui.virtual.wrap" = "gray"
+"ui.virtual.jump-label" = { fg = "blue", modifiers = ["bold", "underlined"] }
 
 "variable" = "light-red"
 "constant.numeric" = "yellow"

From 8635913f0ee0a3ecb2e88fd7b5a2f8fe40b9b85d Mon Sep 17 00:00:00 2001
From: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Date: Mon, 1 Apr 2024 15:40:40 -0700
Subject: [PATCH 908/967] Dim primary selection in kanagawa (#10094)

* [kanagawa] Change selection color

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>

* [kanagawa] Use less brigh selection color

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>

---------

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
---
 runtime/themes/kanagawa.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index 99cbed332..d6f52a070 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -8,7 +8,7 @@
 
 ## User interface
 "ui.selection" = { bg = "waveBlue2" }
-"ui.selection.primary" = { bg = "waveBlue1" }
+"ui.selection.primary" = { bg = "sumiInk5" }
 "ui.background" = { fg = "fujiWhite", bg = "sumiInk1" }
 
 "ui.linenr" = { fg = "sumiInk4" }
@@ -123,6 +123,7 @@ 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
+sumiInk5 = "#363646"      # current selection
 waveBlue1 = "#223249"     # popup background, visual selection background
 waveBlue2 = "#2D4F67"     # popup selection background, search background
 winterGreen = "#2B3328"   # diff add background

From 4b236f30db6d83304a63d850078580e8f98514d6 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <708570+mmlb@users.noreply.github.com>
Date: Mon, 1 Apr 2024 20:48:08 -0400
Subject: [PATCH 909/967] Add Buildkite command/commands support to yaml
 injections (#10090)

* Use any-of instead of match in yaml injections

Go back to original intent when this code was first written now that the
tree-sitter version used supports any-of?.

* yaml/injections: Add injection for Buildkite

Buildkite uses `command` (`commands` is an alias) to define the
command(s) to run for the step.
---
 runtime/queries/yaml/injections.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/runtime/queries/yaml/injections.scm b/runtime/queries/yaml/injections.scm
index 52b437a4e..46c4a9c0f 100644
--- a/runtime/queries/yaml/injections.scm
+++ b/runtime/queries/yaml/injections.scm
@@ -20,22 +20,24 @@
 
 ; Modified for Helix from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/yaml/injections.scm
 
-;; Github actions ("run") / Gitlab CI ("scripts")
+;; Github actions: run
+;; Gitlab CI: scripts, before_script, after_script
+;; Buildkite: command, commands
 (block_mapping_pair
-  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script" "command" "commands")
   value: (flow_node
            (plain_scalar
              (string_scalar) @injection.content)
            (#set! injection.language "bash")))
 
 (block_mapping_pair
-  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script" "command" "commands")
   value: (block_node
            (block_scalar) @injection.content
            (#set! injection.language "bash")))
 
 (block_mapping_pair
-  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script" "command" "commands")
   value: (block_node
            (block_sequence
              (block_sequence_item
@@ -45,7 +47,7 @@
                 (#set! injection.language "bash")))))
 
 (block_mapping_pair
-  key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
+  key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script" "command" "commands")
   value: (block_node
            (block_sequence
              (block_sequence_item

From b24c465a086b60096d7e95852d4d2db84f5ccbd3 Mon Sep 17 00:00:00 2001
From: RoloEdits <RoloEdits@gmail.com>
Date: Mon, 1 Apr 2024 17:49:26 -0700
Subject: [PATCH 910/967] uswd lldb-dab instead of lldb-dap in the default dap
 configuration (#10091)

`LLVM v18.0.0` changed the name here: llvm/llvm-project#69264

Current users of `lldb-vscode` not able to upgrade will have to create a
symlink so that `lldb-dap` links to `lldb-vscode`.

BREAKING CHANGE: debugger looks for `lldb-dap` rather than `lldb-vscode`

closes: #9964
---
 languages.toml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/languages.toml b/languages.toml
index 6fbcbbc4e..43bb90259 100644
--- a/languages.toml
+++ b/languages.toml
@@ -217,9 +217,9 @@ persistent-diagnostic-sources = ["rustc", "clippy"]
 '`' = '`'
 
 [language.debugger]
-name = "lldb-vscode"
+name = "lldb-dap"
 transport = "stdio"
-command = "lldb-vscode"
+command = "lldb-dap"
 
 [[language.debugger.templates]]
 name = "binary"
@@ -436,9 +436,9 @@ language-servers = [ "clangd" ]
 indent = { tab-width = 2, unit = "  " }
 
 [language.debugger]
-name = "lldb-vscode"
+name = "lldb-dap"
 transport = "stdio"
-command = "lldb-vscode"
+command = "lldb-dap"
 
 [[language.debugger.templates]]
 name = "binary"
@@ -473,9 +473,9 @@ language-servers = [ "clangd" ]
 indent = { tab-width = 2, unit = "  " }
 
 [language.debugger]
-name = "lldb-vscode"
+name = "lldb-dap"
 transport = "stdio"
-command = "lldb-vscode"
+command = "lldb-dap"
 
 [[language.debugger.templates]]
 name = "binary"
@@ -1263,9 +1263,9 @@ indent = { tab-width = 4, unit = "    " }
 formatter = { command = "zig" , args = ["fmt", "--stdin"] }
 
 [language.debugger]
-name = "lldb-vscode"
+name = "lldb-dap"
 transport = "stdio"
-command = "lldb-vscode"
+command = "lldb-dap"
 
 [[language.debugger.templates]]
 name = "binary"

From bb0bfa23f3bbe20d96d478bdbe4198fb337bfa3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:26:28 +0900
Subject: [PATCH 911/967] build(deps): bump the rust-dependencies group with 3
 updates (#10099)

Bumps the rust-dependencies group with 3 updates: [serde_json](https://github.com/serde-rs/json), [chrono](https://github.com/chronotope/chrono) and [tokio](https://github.com/tokio-rs/tokio).


Updates `serde_json` from 1.0.114 to 1.0.115
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.114...v1.0.115)

Updates `chrono` from 0.4.35 to 0.4.37
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.35...v0.4.37)

Updates `tokio` from 1.36.0 to 1.37.0
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.36.0...tokio-1.37.0)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  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           | 12 ++++++------
 helix-lsp/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 46f8209f8..ad42dc7ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -159,9 +159,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.35"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -2112,9 +2112,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
  "itoa",
  "ryu",
@@ -2396,9 +2396,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 88af10388..0b502f768 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -27,7 +27,7 @@ lsp-types = { version = "0.95" }
 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 = { version = "1.37", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.15"
 parking_lot = "0.12.1"
 arc-swap = "1"

From 545ff1aac6dfa15bc0c28109a8af1dd6a8d277e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Tue, 2 Apr 2024 15:15:12 +0200
Subject: [PATCH 912/967] add support for jump labels in tokyonight themes
 (#10106)

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

diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index 38eb269de..4e53e03b8 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -92,6 +92,7 @@ hint = { fg = "hint" }
 "ui.virtual.ruler" = { bg = "fg-gutter" }
 "ui.virtual.whitespace" = { fg = "fg-gutter" }
 "ui.virtual.inlay-hint" = {  bg = "bg-inlay", fg = "teal" }
+"ui.virtual.jump-label" = {  fg = "orange", modifiers = ["bold"] }
 "ui.window" = { fg = "border", modifiers = ["bold"] }
 
 [palette]

From e63ed0579d4d8ab7c29978380d5e109e2661fcdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Tue, 2 Apr 2024 15:59:29 +0200
Subject: [PATCH 913/967] Theme: PaperColor: Tune jump-label (#10104)

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

diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index 246b0ddd8..4f53c9e06 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -29,6 +29,7 @@
 "ui.virtual.inlay-hint" = { fg = "regular5", modifiers = ["italic"] }
 "ui.virtual.inlay-hint.parameter" = { fg = "regular5", modifiers = ["italic"] }
 "ui.virtual.inlay-hint.type" = { fg = "regular5", modifiers = ["bold", "italic"] }
+"ui.virtual.jump-label" = { fg = "bright1", modifiers = ["bold"] }  
 "ui.cursor.match" = { bg = "matchparen_bg", fg = "matchparen_fg" }
 "ui.cursor" = { bg = "regular5", fg = "background" }
 "ui.cursor.primary" = { bg = "foreground", fg = "background" }

From cc8290f39364d213128a5064ed54c8830111f0b6 Mon Sep 17 00:00:00 2001
From: woojiq <122799969+woojiq@users.noreply.github.com>
Date: Tue, 2 Apr 2024 17:39:44 +0300
Subject: [PATCH 914/967] show newest options in jumplist picker first, fix
 docs (#10095)

* docs: mention `<space>g` changed file picker

* picker(jumplist): show jumps in order from latest to oldest
---
 book/src/keymap.md         | 3 ++-
 helix-term/src/commands.rs | 1 +
 helix-view/src/view.rs     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 3a5ccca53..73f7a8532 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -280,7 +280,8 @@ This layer is a kludge of mappings, mostly pickers.
 | `F`     | Open file picker at current working directory                           | `file_picker_in_current_directory`         |
 | `b`     | Open buffer picker                                                      | `buffer_picker`                            |
 | `j`     | Open jumplist picker                                                    | `jumplist_picker`                          |
-| `g`     | Debug (experimental)                                                    | N/A                                        |
+| `g`     | Open changed file picker                                                | `changed_file_picker`                      |
+| `G`     | Debug (experimental)                                                    | N/A                                        |
 | `k`     | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover`                                    |
 | `s`     | Open document symbol picker (**LSP**)                                   | `symbol_picker`                            |
 | `S`     | Open workspace symbol picker (**LSP**)                                  | `workspace_symbol_picker`                  |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d0b9047c8..e7a75eb1a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2980,6 +2980,7 @@ fn jumplist_picker(cx: &mut Context) {
             .flat_map(|(view, _)| {
                 view.jumps
                     .iter()
+                    .rev()
                     .map(|(doc_id, selection)| new_meta(view, *doc_id, selection.clone()))
             })
             .collect(),
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index b5dc0615a..5b283b98f 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -79,7 +79,7 @@ impl JumpList {
         self.jumps.retain(|(other_id, _)| other_id != doc_id);
     }
 
-    pub fn iter(&self) -> impl Iterator<Item = &Jump> {
+    pub fn iter(&self) -> impl DoubleEndedIterator<Item = &Jump> {
         self.jumps.iter()
     }
 

From 190fbf66d462748e42e67b6bfe36f1ef28635c23 Mon Sep 17 00:00:00 2001
From: Luis Useche <useche@gmail.com>
Date: Tue, 2 Apr 2024 08:29:57 -0700
Subject: [PATCH 915/967] reconfigure tree properly after closing view (#10004)

This patch merges the last child of a container node to the parent. This
avoids the bug where uneven spaced Views would be created. To reproduce:
1. `vsplit`
2. `split`
3. `quit`
4. `vsplit`

With this patch the bug cannot be seen anymore.
---
 helix-view/src/tree.rs | 101 +++++++++++++++++++++++++++++++++--------
 1 file changed, 81 insertions(+), 20 deletions(-)

diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index 4c9eba0fd..b7ad5aa9d 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -214,33 +214,56 @@ impl Tree {
         node
     }
 
-    pub fn remove(&mut self, index: ViewId) {
-        let mut stack = Vec::new();
+    /// Get a mutable reference to a [Container] by index.
+    /// # Panics
+    /// Panics if `index` is not in self.nodes, or if the node's content is not a [Content::Container].
+    fn container_mut(&mut self, index: ViewId) -> &mut Container {
+        match &mut self.nodes[index] {
+            Node {
+                content: Content::Container(container),
+                ..
+            } => container,
+            _ => unreachable!(),
+        }
+    }
+
+    fn remove_or_replace(&mut self, child: ViewId, replacement: Option<ViewId>) {
+        let parent = self.nodes[child].parent;
+
+        self.nodes.remove(child);
 
+        let container = self.container_mut(parent);
+        let pos = container
+            .children
+            .iter()
+            .position(|&item| item == child)
+            .unwrap();
+
+        if let Some(new) = replacement {
+            container.children[pos] = new;
+            self.nodes[new].parent = parent;
+        } else {
+            container.children.remove(pos);
+        }
+    }
+
+    pub fn remove(&mut self, index: ViewId) {
         if self.focus == index {
             // focus on something else
             self.focus = self.prev();
         }
 
-        stack.push(index);
+        let parent = self.nodes[index].parent;
+        let parent_is_root = parent == self.root;
 
-        while let Some(index) = stack.pop() {
-            let parent_id = self.nodes[index].parent;
-            if let Node {
-                content: Content::Container(container),
-                ..
-            } = &mut self.nodes[parent_id]
-            {
-                if let Some(pos) = container.children.iter().position(|&child| child == index) {
-                    container.children.remove(pos);
-                    // TODO: if container now only has one child, remove it and place child in parent
-                    if container.children.is_empty() && parent_id != self.root {
-                        // if container now empty, remove it
-                        stack.push(parent_id);
-                    }
-                }
-            }
-            self.nodes.remove(index);
+        self.remove_or_replace(index, None);
+
+        let parent_container = self.container_mut(parent);
+        if parent_container.children.len() == 1 && !parent_is_root {
+            // Lets merge the only child back to its grandparent so that Views
+            // are equally spaced.
+            let sibling = parent_container.children.pop().unwrap();
+            self.remove_or_replace(parent, Some(sibling));
         }
 
         self.recalculate()
@@ -873,4 +896,42 @@ mod test {
         assert_eq!(doc_id(&tree, l2), Some(doc_r0));
         assert_eq!(doc_id(&tree, r0), Some(doc_l0));
     }
+
+    #[test]
+    fn all_vertical_views_have_same_width() {
+        let tree_area_width = 180;
+        let mut tree = Tree::new(Rect {
+            x: 0,
+            y: 0,
+            width: tree_area_width,
+            height: 80,
+        });
+        let mut view = View::new(DocumentId::default(), GutterConfig::default());
+        view.area = Rect::new(0, 0, 180, 80);
+        tree.insert(view);
+
+        let view = View::new(DocumentId::default(), GutterConfig::default());
+        tree.split(view, Layout::Vertical);
+
+        let view = View::new(DocumentId::default(), GutterConfig::default());
+        tree.split(view, Layout::Horizontal);
+
+        tree.remove(tree.focus);
+
+        let view = View::new(DocumentId::default(), GutterConfig::default());
+        tree.split(view, Layout::Vertical);
+
+        // Make sure that we only have one level in the tree.
+        assert_eq!(3, tree.views().count());
+        assert_eq!(
+            vec![
+                tree_area_width / 3,
+                tree_area_width / 3,
+                tree_area_width / 3 - 2 // Rounding in `recalculate`.
+            ],
+            tree.views()
+                .map(|(view, _)| view.area.width)
+                .collect::<Vec<_>>()
+        );
+    }
 }

From 96f7d73f3d01715268daa2c1a4c62ac8273164b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Gonz=C3=A1lez?= <jesus@jesusmg.net>
Date: Tue, 2 Apr 2024 18:38:22 -0300
Subject: [PATCH 916/967] Add jump label support to Darcula themes (#10116)

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

diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index db6ce989d..7e0907c09 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -25,6 +25,7 @@
 "ui.virtual.indent-guide" = "grey02"
 "ui.virtual.whitespace" = "grey03"
 "ui.virtual.inlay-hint" = { fg = "grey03", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "lightblue", modifiers = ["italic", "bold"] }
 "ui.bufferline" = { fg = "grey04", bg = "grey00" }
 "ui.bufferline.active" = { fg = "grey07", bg = "grey02" }
 

From 54844241ce0e2a2e76b4a41bc66c4c5400faaae2 Mon Sep 17 00:00:00 2001
From: Sampo Siltanen <10105521+ssiltanen@users.noreply.github.com>
Date: Wed, 3 Apr 2024 04:29:30 +0300
Subject: [PATCH 917/967] Add fsharp block comment tokens to languages.toml
 (#10108)

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

diff --git a/languages.toml b/languages.toml
index 43bb90259..6b47f65da 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3029,6 +3029,7 @@ roots = ["sln", "fsproj"]
 injection-regex = "fsharp"
 file-types = ["fs", "fsx", "fsi", "fsscript"]
 comment-token = "//"
+block-comment-tokens = { start = "(*", end = "*)" }
 indent = { tab-width = 4, unit = "    " }
 auto-format = true
 language-servers = ["fsharp-ls"]

From 226b2755fb09b67484686ae11abeb59cae593426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <glehmann@users.noreply.github.com>
Date: Wed, 3 Apr 2024 03:30:15 +0200
Subject: [PATCH 918/967] add earthfile language configuration (#10111)

---
 book/src/generated/lang-support.md        |  1 +
 languages.toml                            | 17 ++++++
 runtime/queries/earthfile/highlights.scm  | 74 +++++++++++++++++++++++
 runtime/queries/earthfile/indents.scm     |  1 +
 runtime/queries/earthfile/injections.scm  |  9 +++
 runtime/queries/earthfile/textobjects.scm |  1 +
 6 files changed, 103 insertions(+)
 create mode 100644 runtime/queries/earthfile/highlights.scm
 create mode 100644 runtime/queries/earthfile/indents.scm
 create mode 100644 runtime/queries/earthfile/injections.scm
 create mode 100644 runtime/queries/earthfile/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 6bbea10ac..a4e2a84a2 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -37,6 +37,7 @@
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | dot | ✓ |  |  | `dot-language-server` |
 | dtd | ✓ |  |  |  |
+| earthfile | ✓ | ✓ | ✓ | `earthlyls` |
 | edoc | ✓ |  |  |  |
 | eex | ✓ |  |  |  |
 | ejs | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 6b47f65da..8b7c43a7e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -28,6 +28,7 @@ dhall-lsp-server = { command = "dhall-lsp-server" }
 docker-langserver = { command = "docker-langserver", args = ["--stdio"] }
 docker-compose-langserver = { command = "docker-compose-langserver", args = ["--stdio"]}
 dot-language-server = { command = "dot-language-server", args = ["--stdio"] }
+earthlyls = { command = "earthlyls" }
 elixir-ls = { command = "elixir-ls", config = { elixirLS.dialyzerEnabled = false } }
 elm-language-server = { command = "elm-language-server" }
 elvish = { command = "elvish", args = ["-lsp"] }
@@ -3443,3 +3444,19 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "ohm"
 source = { git = "https://github.com/novusnota/tree-sitter-ohm", rev = "80f14f0e477ddacc1e137d5ed8e830329e3fb7a3" }
+
+[[language]]
+name = "earthfile"
+scope = "source.earthfile"
+injection-regex = "earthfile"
+roots = ["Earthfile"]
+file-types = [
+  { glob = "Earthfile" },
+]
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+language-servers = ["earthlyls"]
+
+[[grammar]]
+name = "earthfile"
+source = { git = "https://github.com/glehmann/tree-sitter-earthfile", rev = "2a6ab191f5f962562e495a818aa4e7f45f8a556a" }
diff --git a/runtime/queries/earthfile/highlights.scm b/runtime/queries/earthfile/highlights.scm
new file mode 100644
index 000000000..a0191174f
--- /dev/null
+++ b/runtime/queries/earthfile/highlights.scm
@@ -0,0 +1,74 @@
+(string_array "," @punctuation.delimiter)
+(string_array ["[" "]"] @punctuation.bracket)
+
+(arg_command "ARG" @keyword)
+(build_command "BUILD" @keyword)
+(cache_command "CACHE" @keyword)
+(cmd_command "CMD" @keyword)
+(copy_command "COPY" @keyword)
+(do_command "DO" @keyword)
+(entrypoint_command "ENTRYPOINT" @keyword)
+(env_command "ENV" @keyword)
+(expose_command "EXPOSE" @keyword)
+(from_command "FROM" @keyword)
+(from_dockerfile_command "FROM DOCKERFILE" @keyword)
+(function_command "FUNCTION" @keyword)
+(git_clone_command "GIT CLONE" @keyword)
+(host_command "HOST" @keyword)
+(import_command "IMPORT" @keyword)
+(label_command "LABEL" @keyword)
+(let_command "LET" @keyword)
+(project_command "PROJECT" @keyword)
+(run_command "RUN" @keyword)
+(save_artifact_command ["SAVE ARTIFACT" "AS LOCAL"] @keyword)
+(save_image_command "SAVE IMAGE" @keyword)
+(set_command "SET" @keyword)
+(user_command "USER" @keyword)
+(version_command "VERSION" @keyword)
+(volume_command "VOLUME" @keyword)
+(with_docker_command "WITH DOCKER" @keyword)
+(workdir_command "WORKDIR" @keyword)
+
+(for_command ["FOR" "IN" "END"] @keyword.control.repeat)
+(if_command ["IF" "END"] @keyword.control.conditional)
+(elif_block ["ELSE IF"] @keyword.control.conditional)
+(else_block ["ELSE"] @keyword.control.conditional)
+(import_command ["IMPORT" "AS"] @keyword.control.import)
+(try_command ["TRY" "FINALLY" "END"] @keyword.control.exception)
+(wait_command ["WAIT" "END"] @keyword.control)
+
+
+[
+    (comment)
+    (line_continuation_comment)
+] @comment
+
+(line_continuation) @operator
+
+[
+    (target_ref)
+    (target_artifact)
+    (function_ref)
+] @function
+
+(target (identifier) @function)
+
+[
+    (double_quoted_string)
+    (single_quoted_string)
+] @string
+(unquoted_string) @string.special
+(escape_sequence) @constant.character.escape
+
+(variable) @variable
+(expansion ["$" "{" "}" "(" ")"] @punctuation.special)
+(build_arg) @variable
+(options (_) @variable.parameter)
+
+(options (_ "=" @operator))
+(build_arg "=" @operator)
+(arg_command "=" @operator)
+(env_command "=" @operator)
+(label "=" @operator)
+(set_command "=" @operator)
+(let_command "=" @operator)
diff --git a/runtime/queries/earthfile/indents.scm b/runtime/queries/earthfile/indents.scm
new file mode 100644
index 000000000..2bee23e84
--- /dev/null
+++ b/runtime/queries/earthfile/indents.scm
@@ -0,0 +1 @@
+(target) @indent
diff --git a/runtime/queries/earthfile/injections.scm b/runtime/queries/earthfile/injections.scm
new file mode 100644
index 000000000..7435a400e
--- /dev/null
+++ b/runtime/queries/earthfile/injections.scm
@@ -0,0 +1,9 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((line_continuation_comment) @injection.content
+  (#set! injection.language "comment"))
+
+((shell_fragment) @injection.content
+  (#set! injection.language "bash")
+  (#set! injection.include-children))
diff --git a/runtime/queries/earthfile/textobjects.scm b/runtime/queries/earthfile/textobjects.scm
new file mode 100644
index 000000000..ae0364a2d
--- /dev/null
+++ b/runtime/queries/earthfile/textobjects.scm
@@ -0,0 +1 @@
+(target (block) @function.inside) @function.around

From e0ec34421bb2f2d381bdce853f0eedeb0e3f51ae Mon Sep 17 00:00:00 2001
From: Angus Dippenaar <angusdippenaar@gmail.com>
Date: Wed, 3 Apr 2024 03:31:44 +0200
Subject: [PATCH 919/967] languages: update templ (#10114)

---
 languages.toml                       |  2 +-
 runtime/queries/templ/highlights.scm | 55 ++++------------------------
 2 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/languages.toml b/languages.toml
index 8b7c43a7e..bf6a4cf42 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3198,7 +3198,7 @@ language-servers = [ "templ" ]
 
 [[grammar]]
 name = "templ"
-source = { git = "https://github.com/vrischmann/tree-sitter-templ", rev = "ea56ac0655243490a4929a988f4eaa91dfccc995" }
+source = { git = "https://github.com/vrischmann/tree-sitter-templ", rev = "db662414ccd6f7c78b1e834e7abe11c224b04759" }
 
 [[language]]
 name = "dbml"
diff --git a/runtime/queries/templ/highlights.scm b/runtime/queries/templ/highlights.scm
index e5b2ede01..d015970c0 100644
--- a/runtime/queries/templ/highlights.scm
+++ b/runtime/queries/templ/highlights.scm
@@ -1,28 +1,9 @@
-(package_identifier) @namespace
+; inherits: go
 
-(parameter_declaration (identifier) @variable.parameter)
-(variadic_parameter_declaration (identifier) @variable.parameter)
-
-(function_declaration
-  name: (identifier) @function)
-
-(type_spec name: (type_identifier) @type)
-(type_identifier) @type
-(field_identifier) @variable.other.member
-(identifier) @variable
-
-; Function calls
-
-(call_expression
-  function: (identifier) @function)
-
-(call_expression
-  function: (selector_expression
-    field: (field_identifier) @function))
-
-;
-; These are Templ specific
-;
+(css_declaration
+  name: (css_identifier) @function)
+(script_declaration
+  name: (script_identifier) @function)
 
 (component_declaration
   name: (component_identifier) @function)
@@ -42,6 +23,8 @@
 
 (css_property
   name: (css_property_name) @attribute)
+(css_property
+  value: (css_property_value) @constant)
 
 (expression) @function.method
 (dynamic_class_attribute_value) @function.method
@@ -56,36 +39,12 @@
 ] @operator
 
 [
-  "func"
-  "var"
-  "const"
   "templ"
   "css"
   "type"
-  "struct"
-  "range"
   "script"
 ] @keyword.storage.type
 
-[
-  "return"
-] @keyword.control.return
-
-[
-  "import"
-  "package"
-] @keyword.control.import
-
-[
-  "else"
-  "case"
-  "switch"
-  "if"
-  "default"
-] @keyword.control.conditional
-
-"for" @keyword.control.repeat
-
 [
   (interpreted_string_literal)
   (raw_string_literal)

From e54e3f07cbb0df351b0668338a5e976923feaccd Mon Sep 17 00:00:00 2001
From: Evgeniy Tatarkin <tatarkin.evg@gmail.com>
Date: Wed, 3 Apr 2024 04:32:12 +0300
Subject: [PATCH 920/967] feat(languages): Tiltfile as starlark language
 (#10072)

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

diff --git a/languages.toml b/languages.toml
index bf6a4cf42..b047b83eb 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2190,7 +2190,7 @@ source = { git = "https://github.com/sogaiu/tree-sitter-clojure", rev = "e57c569
 name = "starlark"
 scope = "source.starlark"
 injection-regex = "(starlark|bzl|bazel)"
-file-types = ["bzl", "bazel", "star", { glob = "BUILD" }, { glob = "BUILD.*" }]
+file-types = ["bzl", "bazel", "star", { glob = "BUILD" }, { glob = "BUILD.*" }, { glob = "Tiltfile" }]
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
 grammar = "python"

From 84cc42e5eed04a5f2c13b858281532b040854947 Mon Sep 17 00:00:00 2001
From: Takumi Matsuura <tm99hjkl@gmail.com>
Date: Wed, 3 Apr 2024 23:05:48 +0900
Subject: [PATCH 921/967] typofix (#10125)

---
 helix-loader/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 93488e452..badb9bd64 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -126,7 +126,7 @@ pub fn config_dir() -> PathBuf {
 
 pub fn cache_dir() -> PathBuf {
     // TODO: allow env var override
-    let strategy = choose_base_strategy().expect("Unable to find the config directory!");
+    let strategy = choose_base_strategy().expect("Unable to find the cache directory!");
     let mut path = strategy.cache_dir();
     path.push("helix");
     path

From f7739722410b05ffccb45282e34e1946c451657c Mon Sep 17 00:00:00 2001
From: Harishankar G <67601573+voiceroy@users.noreply.github.com>
Date: Wed, 3 Apr 2024 23:10:55 +0530
Subject: [PATCH 922/967] Use a boolean to indicate whether to yank during
 deletion of a selection (#10132)

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

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e7a75eb1a..b3614793f 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2617,13 +2617,13 @@ fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
     })
 }
 
-fn delete_selection_impl(cx: &mut Context, op: Operation) {
+fn delete_selection_impl(cx: &mut Context, op: Operation, yank: bool) {
     let (view, doc) = current!(cx.editor);
 
     let selection = doc.selection(view.id);
     let only_whole_lines = selection_is_linewise(selection, doc.text());
 
-    if cx.register != Some('_') {
+    if cx.register != Some('_') && yank {
         // first yank the selection
         let text = doc.text().slice(..);
         let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
@@ -2700,21 +2700,19 @@ fn delete_by_selection_insert_mode(
 }
 
 fn delete_selection(cx: &mut Context) {
-    delete_selection_impl(cx, Operation::Delete);
+    delete_selection_impl(cx, Operation::Delete, true);
 }
 
 fn delete_selection_noyank(cx: &mut Context) {
-    cx.register = Some('_');
-    delete_selection_impl(cx, Operation::Delete);
+    delete_selection_impl(cx, Operation::Delete, false);
 }
 
 fn change_selection(cx: &mut Context) {
-    delete_selection_impl(cx, Operation::Change);
+    delete_selection_impl(cx, Operation::Change, true);
 }
 
 fn change_selection_noyank(cx: &mut Context) {
-    cx.register = Some('_');
-    delete_selection_impl(cx, Operation::Change);
+    delete_selection_impl(cx, Operation::Change, false);
 }
 
 fn collapse_selection(cx: &mut Context) {

From fa79ce59a0930890a92f43a77ae2f0c654092cc4 Mon Sep 17 00:00:00 2001
From: Jens Getreu <getreu@web.de>
Date: Thu, 4 Apr 2024 04:17:40 +0300
Subject: [PATCH 923/967] Autumn theme: add jump label (#10134)

---
 runtime/themes/autumn.toml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index 93ccf688e..7e9b3a7e1 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -63,14 +63,15 @@
 "ui.selection" = { bg = "my_gray3" }
 "ui.statusline" = { fg = "my_gray7", bg = "my_gray2" }
 "ui.statusline.inactive" = { fg = 'my_gray5', bg = 'my_gray2' }
-"ui.statusline.insert" = {fg = "my_black", bg = "my_gray6", modifiers = ["bold"]}
-"ui.statusline.normal" = {fg = "my_gray7", bg = "my_gray2"}
-"ui.statusline.select" = {fg = "my_gray7", bg = "my_black", modifiers = ["bold"]}
+"ui.statusline.insert" = { fg = "my_black", bg = "my_gray6", modifiers = ["bold"] }
+"ui.statusline.normal" = { fg = "my_gray7", bg = "my_gray2" }
+"ui.statusline.select" = { fg = "my_gray7", bg = "my_black", modifiers = ["bold"] }
 "ui.text.focus" = "my_white1"
 "ui.text" = "my_white1"
 "ui.virtual.inlay-hint" = { fg = "my_gray4", bg="my_black", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.parameter" = { fg = "my_gray4", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.type" = { fg = "my_gray4", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "my_yellow2", modifiers = ["bold"] }
 "ui.virtual.ruler" = { bg = "my_gray1" }
 "ui.virtual.whitespace" = { fg = "my_gray6" }
 "ui.virtual.wrap" = "my_gray4"

From f16380d418a9e9969203309df89e57a3cb7fb18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= <enkodr@outlook.com>
Date: Thu, 4 Apr 2024 02:17:51 +0100
Subject: [PATCH 924/967] Add jumb label color to ayu themes (#10133)

---
 runtime/themes/ayu_dark.toml   | 1 +
 runtime/themes/ayu_evolve.toml | 1 +
 runtime/themes/ayu_light.toml  | 1 +
 runtime/themes/ayu_mirage.toml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index ff6694e92..a2fbc3161 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -72,6 +72,7 @@
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 "ui.debug" = { fg = "orange", bg = "background" }
 "ui.highlight.frameline" = { bg = "#0067a3" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] }
 
 "special" = "orange"
 
diff --git a/runtime/themes/ayu_evolve.toml b/runtime/themes/ayu_evolve.toml
index b57235a6a..b9c5d8221 100644
--- a/runtime/themes/ayu_evolve.toml
+++ b/runtime/themes/ayu_evolve.toml
@@ -27,6 +27,7 @@ inherits = 'ayu_dark'
 "ui.text.inactive" = "gray"
 "ui.bufferline" = { fg = "light_gray", bg = "background" }
 "ui.bufferline.active" = { fg = "light_gray", bg = "dark_gray" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] }
 
 [palette]
 background = '#020202'
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index d0eca78a1..c3ab1d4f5 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -72,6 +72,7 @@
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 "ui.debug" = { fg = "orange", bg = "background" }
 "ui.highlight.frameline" = { bg = "#cfe0f2" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] }
 
 "special" = "orange"
 
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index 677a7af6f..0fd53a4b0 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -72,6 +72,7 @@
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 "ui.debug" = { fg = "orange", bg = "background" }
 "ui.highlight.frameline" = { bg = "#0067a3" }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] }
 
 "special" = "orange"
 

From 88f293115398e5609ee845fd8698b5584ac62fa5 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 4 Apr 2024 03:31:00 +0200
Subject: [PATCH 925/967] Add tcl highlighting (#9837)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md |   1 +
 languages.toml                     |  12 +++
 runtime/queries/tcl/folds.scm      |   1 +
 runtime/queries/tcl/highlights.scm | 153 +++++++++++++++++++++++++++++
 runtime/queries/tcl/indents.scm    |  13 +++
 5 files changed, 180 insertions(+)
 create mode 100644 runtime/queries/tcl/folds.scm
 create mode 100644 runtime/queries/tcl/highlights.scm
 create mode 100644 runtime/queries/tcl/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a4e2a84a2..efdc8b634 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -186,6 +186,7 @@
 | tablegen | ✓ | ✓ | ✓ |  |
 | tact | ✓ | ✓ | ✓ |  |
 | task | ✓ |  |  |  |
+| tcl | ✓ |  | ✓ |  |
 | templ | ✓ |  |  | `templ` |
 | tfvars | ✓ |  | ✓ | `terraform-ls` |
 | todotxt | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index b047b83eb..755b37deb 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3367,6 +3367,18 @@ grammar = "hyprlang"
 name = "hyprlang"
 source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang", rev = "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3"}
 
+[[language]]
+name = "tcl"
+scope = "source.tcl"
+injection-regex = "tcl"
+file-types = [ "tcl" ]
+shebangs = [ "tclish", "jimsh", "wish" ]
+comment-token = '#'
+
+[[grammar]]
+name = "tcl"
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-tcl", rev = "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8" }
+
 [[language]]
 name = "supercollider"
 scope = "source.supercollider"
diff --git a/runtime/queries/tcl/folds.scm b/runtime/queries/tcl/folds.scm
new file mode 100644
index 000000000..9084c662c
--- /dev/null
+++ b/runtime/queries/tcl/folds.scm
@@ -0,0 +1 @@
+(braced_word) @fold
diff --git a/runtime/queries/tcl/highlights.scm b/runtime/queries/tcl/highlights.scm
new file mode 100644
index 000000000..27b2d81e6
--- /dev/null
+++ b/runtime/queries/tcl/highlights.scm
@@ -0,0 +1,153 @@
+
+(comment) @comment
+
+(command name: (simple_word) @function)
+
+"proc" @keyword.function
+
+(procedure
+  name: (_) @variable
+)
+
+(set (simple_word) @variable)
+
+(argument
+  name: (_) @variable.parameter
+)
+
+((simple_word) @variable.builtin
+               (#any-of? @variable.builtin
+                "argc"
+                "argv"
+                "argv0"
+                "auto_path"
+                "env"
+                "errorCode"
+                "errorInfo"
+                "tcl_interactive"
+                "tcl_library"
+                "tcl_nonwordchars"
+                "tcl_patchLevel"
+                "tcl_pkgPath"
+                "tcl_platform"
+                "tcl_precision"
+                "tcl_rcFileName"
+                "tcl_traceCompile"
+                "tcl_traceExec"
+                "tcl_wordchars"
+                "tcl_version"))
+
+
+"expr" @function.builtin
+
+(command
+  name: (simple_word) @function.builtin
+  (#any-of? @function.builtin
+   "cd"
+   "exec"
+   "exit"
+   "incr"
+   "info"
+   "join"
+   "puts"
+   "regexp"
+   "regsub"
+   "split"
+   "subst"
+   "trace"
+   "source"))
+
+(command name: (simple_word) @keyword
+         (#any-of? @keyword
+          "append"
+          "break"
+          "catch"
+          "continue"
+          "default"
+          "dict"
+          "error"
+          "eval"
+          "global"
+          "lappend"
+          "lassign"
+          "lindex"
+          "linsert"
+          "list"
+          "llength"
+          "lmap"
+          "lrange"
+          "lrepeat"
+          "lreplace"
+          "lreverse"
+          "lsearch"
+          "lset"
+          "lsort"
+          "package"
+          "return"
+          "switch"
+          "throw"
+          "unset"
+          "variable"))
+
+[
+ "error"
+ "namespace"
+ "on"
+ "set"
+ "try"
+ ] @keyword
+
+(unpack) @operator
+
+[
+ "while"
+ "foreach"
+ ; "for"
+ ] @keyword.control.repeat
+
+[
+ "if"
+ "else"
+ "elseif"
+ ] @keyword.control.conditional
+
+[
+ "**"
+ "/" "*" "%" "+" "-"
+ "<<" ">>"
+ ">" "<" ">=" "<="
+ "==" "!="
+ "eq" "ne"
+ "in" "ni"
+ "&"
+ "^"
+ "|"
+ "&&"
+ "||"
+ ] @operator
+
+(variable_substitution) @variable
+(quoted_word) @string
+(escaped_character) @constant.character.escape
+
+[
+ "{" "}"
+ "[" "]"
+ ";"
+ ] @punctuation.delimiter
+
+((simple_word) @constant.numeric
+               (#match? @constant.numeric "^[0-9]+$"))
+
+((simple_word) @constant.builtin.boolean
+               (#any-of? @constant.builtin.boolean "true" "false"))
+
+; after apply array auto_execok auto_import auto_load auto_mkindex auto_qualify
+; auto_reset bgerror binary chan clock close coroutine dde encoding eof fblocked
+; fconfigure fcopy file fileevent filename flush format gets glob history http
+; interp load mathfunc mathop memory msgcat my next nextto open parray pid
+; pkg::create pkg_mkIndex platform platform::shell pwd re_syntax read refchan
+; registry rename safe scan seek self socket source string tailcall tcl::prefix
+; tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord
+; tcl_wordBreakAfter tcl_wordBreakBefore tcltest tell time timerate tm
+; transchan unknown unload update uplevel upvar vwait yield yieldto zlib
diff --git a/runtime/queries/tcl/indents.scm b/runtime/queries/tcl/indents.scm
new file mode 100644
index 000000000..c0652fe78
--- /dev/null
+++ b/runtime/queries/tcl/indents.scm
@@ -0,0 +1,13 @@
+[
+ (braced_word_simple)
+ (namespace)
+ (command)
+ (conditional)
+ (foreach)
+ (while)
+ (try)
+ (procedure)
+ (command_substitution)
+ ] @indent
+
+[ "}" "]" ] @outdent

From 5fece0054dce41af71972492cecd1aba61a32f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 4 Apr 2024 10:35:44 +0900
Subject: [PATCH 926/967] Disable todotxt grammar for files named "todo.txt"

The file name is too common and can unintentionally conflict. Users
should manually opt in.

Fixes #10113
---
 languages.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 755b37deb..95c467659 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3135,7 +3135,8 @@ source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "1f505
 [[language]]
 name = "todotxt"
 scope = "text.todotxt"
-file-types = [{ glob = "todo.txt" }, { glob = "*.todo.txt" }, "todotxt"]
+# glob = "todo.txt" is too common and can conflict regular files, define in user config if necessary
+file-types = [{ glob = "*.todo.txt" }, "todotxt"]
 formatter = { command = "sort" }
 auto-format = true
 

From 15393125583c79e9b0ddeab10121226f4e29c82f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 4 Apr 2024 10:28:31 -0400
Subject: [PATCH 927/967] Add a serializer for the jump alphabet config option
 (#10156)

Without a serializer, we drop the custom alphabet when making config
modifications like with `:set`. For example before this commit,
`:set mouse false` would reset a custom alphabet to the default.
---
 helix-view/src/editor.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dd360a78e..d7058d3ef 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -212,6 +212,14 @@ impl Default for FilePickerConfig {
     }
 }
 
+fn serialize_alphabet<S>(alphabet: &[char], serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let alphabet: String = alphabet.iter().collect();
+    serializer.serialize_str(&alphabet)
+}
+
 fn deserialize_alphabet<'de, D>(deserializer: D) -> Result<Vec<char>, D::Error>
 where
     D: Deserializer<'de>,
@@ -323,7 +331,10 @@ pub struct Config {
     #[serde(default)]
     pub indent_heuristic: IndentationHeuristic,
     /// labels characters used in jumpmode
-    #[serde(skip_serializing, deserialize_with = "deserialize_alphabet")]
+    #[serde(
+        serialize_with = "serialize_alphabet",
+        deserialize_with = "deserialize_alphabet"
+    )]
     pub jump_label_alphabet: Vec<char>,
 }
 

From 3e2b85c61bbde50b8ec0b65381dc852f617f53f3 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Thu, 4 Apr 2024 16:28:44 +0200
Subject: [PATCH 928/967] remove redundant imports (#10154)

---
 helix-dap/src/client.rs          | 2 +-
 helix-lsp/src/client.rs          | 2 +-
 helix-term/src/commands/typed.rs | 4 ++--
 helix-view/src/clipboard.rs      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs
index 18af13ae7..2f5b3d0fc 100644
--- a/helix-dap/src/client.rs
+++ b/helix-dap/src/client.rs
@@ -2,7 +2,7 @@ use crate::{
     requests::DisconnectArguments,
     transport::{Payload, Request, Response, Transport},
     types::*,
-    Error, Result, ThreadId,
+    Error, Result,
 };
 use helix_core::syntax::DebuggerQuirks;
 
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index a7b3989dd..b2290e031 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -6,7 +6,7 @@ use crate::{
 };
 
 use helix_core::{find_workspace, syntax::LanguageServerFeature, ChangeSet, Rope};
-use helix_loader::{self, VERSION_AND_GIT_HASH};
+use helix_loader::VERSION_AND_GIT_HASH;
 use helix_stdx::path;
 use lsp::{
     notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 0dfcdb6e9..5d7057da6 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -7,9 +7,9 @@ use super::*;
 
 use helix_core::fuzzy::fuzzy_match;
 use helix_core::indent::MAX_INDENT;
-use helix_core::{encoding, line_ending, shellwords::Shellwords};
+use helix_core::{line_ending, shellwords::Shellwords};
 use helix_view::document::DEFAULT_LANGUAGE_NAME;
-use helix_view::editor::{Action, CloseError, ConfigEvent};
+use helix_view::editor::{CloseError, ConfigEvent};
 use serde_json::Value;
 use ui::completers::{self, Completer};
 
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index 9ff2fd788..8dd7ebb16 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -156,7 +156,7 @@ pub mod provider {
 
     #[cfg(feature = "term")]
     mod osc52 {
-        use {super::ClipboardType, crate::base64, crossterm};
+        use {super::ClipboardType, crate::base64};
 
         #[derive(Debug)]
         pub struct SetClipboardCommand {
@@ -255,7 +255,7 @@ pub mod provider {
     #[cfg(not(target_arch = "wasm32"))]
     pub mod command {
         use super::*;
-        use anyhow::{bail, Context as _, Result};
+        use anyhow::{bail, Context as _};
 
         #[cfg(not(any(windows, target_os = "macos")))]
         pub fn is_exit_success(program: &str, args: &[&str]) -> bool {

From 962c71418530f7be610d4b8e34b99c9a278681ef Mon Sep 17 00:00:00 2001
From: Harishankar G <67601573+voiceroy@users.noreply.github.com>
Date: Thu, 4 Apr 2024 20:48:48 +0530
Subject: [PATCH 929/967] Use an enum to represent yank decision during
 deletion of a selection (#10148)

---
 helix-term/src/commands.rs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b3614793f..7f43fa9ce 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2617,14 +2617,19 @@ fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
     })
 }
 
-fn delete_selection_impl(cx: &mut Context, op: Operation, yank: bool) {
+enum YankAction {
+    Yank,
+    NoYank,
+}
+
+fn delete_selection_impl(cx: &mut Context, op: Operation, yank: YankAction) {
     let (view, doc) = current!(cx.editor);
 
     let selection = doc.selection(view.id);
     let only_whole_lines = selection_is_linewise(selection, doc.text());
 
-    if cx.register != Some('_') && yank {
-        // first yank the selection
+    if cx.register != Some('_') && matches!(yank, YankAction::Yank) {
+        // yank the selection
         let text = doc.text().slice(..);
         let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
         let reg_name = cx.register.unwrap_or('"');
@@ -2632,9 +2637,9 @@ fn delete_selection_impl(cx: &mut Context, op: Operation, yank: bool) {
             cx.editor.set_error(err.to_string());
             return;
         }
-    };
+    }
 
-    // then delete
+    // delete the selection
     let transaction =
         Transaction::delete_by_selection(doc.text(), selection, |range| (range.from(), range.to()));
     doc.apply(&transaction, view.id);
@@ -2700,19 +2705,19 @@ fn delete_by_selection_insert_mode(
 }
 
 fn delete_selection(cx: &mut Context) {
-    delete_selection_impl(cx, Operation::Delete, true);
+    delete_selection_impl(cx, Operation::Delete, YankAction::Yank);
 }
 
 fn delete_selection_noyank(cx: &mut Context) {
-    delete_selection_impl(cx, Operation::Delete, false);
+    delete_selection_impl(cx, Operation::Delete, YankAction::NoYank);
 }
 
 fn change_selection(cx: &mut Context) {
-    delete_selection_impl(cx, Operation::Change, true);
+    delete_selection_impl(cx, Operation::Change, YankAction::Yank);
 }
 
 fn change_selection_noyank(cx: &mut Context) {
-    delete_selection_impl(cx, Operation::Change, false);
+    delete_selection_impl(cx, Operation::Change, YankAction::NoYank);
 }
 
 fn collapse_selection(cx: &mut Context) {

From 5f44890176b30784c6b165c0a40026ed0913bffa Mon Sep 17 00:00:00 2001
From: Aito Stukas <aito@outlook.com.au>
Date: Thu, 4 Apr 2024 20:12:19 -0400
Subject: [PATCH 930/967] Remove duplicate keyword highlight for Python 'and'
 (#10160)

---
 runtime/queries/python/highlights.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 2666402b8..1bded9529 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -204,7 +204,6 @@
 (for_in_clause "in" @keyword.control)
 
 [
-  "and"
   "async"
   "class"
   "exec"

From d053886fe3e0489c56e41477572bff8c310ed519 Mon Sep 17 00:00:00 2001
From: Karem Abdul-Samad <kas2020@protonmail.com>
Date: Thu, 4 Apr 2024 20:22:41 -0400
Subject: [PATCH 931/967] Add new keyword as per PEP 695 (#10165)

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

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 1bded9529..0a082f2fd 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -210,6 +210,7 @@
   "global"
   "nonlocal"
   "print"
+  "type"
 ] @keyword
 [
   "and"

From f240d896a484b56df4d1e7dd29d9f62040bf76cc Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 5 Apr 2024 01:50:41 -0400
Subject: [PATCH 932/967] Merge unnecessary/deprecated diagnostic highlights
 separately (#10084)

Previously unnecessary/deprecated diagnostic tags replaced the highlight
for the severity of a diagnostic. This could cause either the severity
or unnecessary/deprecated scopes to disappear when diagnostic ranges
overlapped though. Plus the severity highlight can be interesting in
addition to the unnecessary/deprecated highlight.

So this change separates the unnecessary and deprecated highlights from
the severity highlights, so each is merged separately and when they
overlap, the highlights are combined.
---
 helix-term/src/ui/editor.rs | 78 ++++++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index ad7aa5c5a..97a08beb7 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -359,8 +359,8 @@ impl EditorView {
     pub fn doc_diagnostics_highlights(
         doc: &Document,
         theme: &Theme,
-    ) -> [Vec<(usize, std::ops::Range<usize>)>; 5] {
-        use helix_core::diagnostic::{DiagnosticTag, Severity};
+    ) -> [Vec<(usize, std::ops::Range<usize>)>; 7] {
+        use helix_core::diagnostic::{DiagnosticTag, Range, Severity};
         let get_scope_of = |scope| {
             theme
             .find_scope_index_exact(scope)
@@ -389,6 +389,25 @@ impl EditorView {
         let mut hint_vec = Vec::new();
         let mut warning_vec = Vec::new();
         let mut error_vec = Vec::new();
+        let mut unnecessary_vec = Vec::new();
+        let mut deprecated_vec = Vec::new();
+
+        let push_diagnostic =
+            |vec: &mut Vec<(usize, std::ops::Range<usize>)>, scope, range: Range| {
+                // If any diagnostic overlaps ranges with the prior diagnostic,
+                // merge the two together. Otherwise push a new span.
+                match vec.last_mut() {
+                    Some((_, existing_range)) if range.start <= existing_range.end => {
+                        // This branch merges overlapping diagnostics, assuming that the current
+                        // diagnostic starts on range.start or later. If this assertion fails,
+                        // we will discard some part of `diagnostic`. This implies that
+                        // `doc.diagnostics()` is not sorted by `diagnostic.range`.
+                        debug_assert!(existing_range.start <= range.start);
+                        existing_range.end = range.end.max(existing_range.end)
+                    }
+                    _ => vec.push((scope, range.start..range.end)),
+                }
+            };
 
         for diagnostic in doc.diagnostics() {
             // Separate diagnostics into different Vecs by severity.
@@ -400,31 +419,44 @@ impl EditorView {
                 _ => (&mut default_vec, r#default),
             };
 
-            let scope = diagnostic
-                .tags
-                .first()
-                .and_then(|tag| match tag {
-                    DiagnosticTag::Unnecessary => unnecessary,
-                    DiagnosticTag::Deprecated => deprecated,
-                })
-                .unwrap_or(scope);
-
-            // If any diagnostic overlaps ranges with the prior diagnostic,
-            // merge the two together. Otherwise push a new span.
-            match vec.last_mut() {
-                Some((_, range)) if diagnostic.range.start <= range.end => {
-                    // This branch merges overlapping diagnostics, assuming that the current
-                    // diagnostic starts on range.start or later. If this assertion fails,
-                    // we will discard some part of `diagnostic`. This implies that
-                    // `doc.diagnostics()` is not sorted by `diagnostic.range`.
-                    debug_assert!(range.start <= diagnostic.range.start);
-                    range.end = diagnostic.range.end.max(range.end)
+            // If the diagnostic has tags and a non-warning/error severity, skip rendering
+            // the diagnostic as info/hint/default and only render it as unnecessary/deprecated
+            // instead. For warning/error diagnostics, render both the severity highlight and
+            // the tag highlight.
+            if diagnostic.tags.is_empty()
+                || matches!(
+                    diagnostic.severity,
+                    Some(Severity::Warning | Severity::Error)
+                )
+            {
+                push_diagnostic(vec, scope, diagnostic.range);
+            }
+
+            for tag in &diagnostic.tags {
+                match tag {
+                    DiagnosticTag::Unnecessary => {
+                        if let Some(scope) = unnecessary {
+                            push_diagnostic(&mut unnecessary_vec, scope, diagnostic.range)
+                        }
+                    }
+                    DiagnosticTag::Deprecated => {
+                        if let Some(scope) = deprecated {
+                            push_diagnostic(&mut deprecated_vec, scope, diagnostic.range)
+                        }
+                    }
                 }
-                _ => vec.push((scope, diagnostic.range.start..diagnostic.range.end)),
             }
         }
 
-        [default_vec, info_vec, hint_vec, warning_vec, error_vec]
+        [
+            default_vec,
+            unnecessary_vec,
+            deprecated_vec,
+            info_vec,
+            hint_vec,
+            warning_vec,
+            error_vec,
+        ]
     }
 
     /// Get highlight spans for selections in a document view.

From a2ee2e66f2725fbd2d595d43c58ebf43ef9e9383 Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Fri, 5 Apr 2024 05:53:07 -0400
Subject: [PATCH 933/967] Add koka language server and update grammar (#10119)

---
 book/src/generated/lang-support.md  |  2 +-
 languages.toml                      |  4 +++-
 runtime/queries/koka/highlights.scm | 34 -----------------------------
 runtime/queries/koka/indents.scm    |  1 -
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index efdc8b634..156898d45 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -100,7 +100,7 @@
 | julia | ✓ | ✓ | ✓ | `julia` |
 | just | ✓ | ✓ | ✓ |  |
 | kdl | ✓ | ✓ | ✓ |  |
-| koka | ✓ |  | ✓ |  |
+| koka | ✓ |  | ✓ | `koka` |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
 | latex | ✓ | ✓ |  | `texlab` |
 | ld | ✓ |  | ✓ |  |
diff --git a/languages.toml b/languages.toml
index 95c467659..49185cc50 100644
--- a/languages.toml
+++ b/languages.toml
@@ -45,6 +45,7 @@ intelephense = { command = "intelephense", args = ["--stdio"] }
 jdtls = { command = "jdtls" }
 jsonnet-language-server = { command = "jsonnet-language-server", args= ["-t", "--lint"] }
 julia = { command = "julia", timeout = 60, args = [ "--startup-file=no", "--history-file=no", "--quiet", "-e", "using LanguageServer; runserver()", ] }
+koka = { command = "koka", args = ["--language-server", "--lsstdio"] }
 kotlin-language-server = { command = "kotlin-language-server" }
 lean = { command = "lean", args = [ "--server" ] }
 ltex-ls = { command = "ltex-ls" }
@@ -3264,10 +3265,11 @@ injection-regex = "koka"
 file-types = ["kk"]
 comment-token = "//"
 indent = { tab-width = 8, unit = "  " }
+language-servers = ["koka"]
 
 [[grammar]]
 name = "koka"
-source = { git = "https://github.com/mtoohey31/tree-sitter-koka", rev = "2527e152d4b6a79fd50aebd8d0b4b4336c94a034" }
+source = { git = "https://github.com/mtoohey31/tree-sitter-koka", rev = "96d070c3700692858035f3524cc0ad944cef2594" }
 
 [[language]]
 name = "tact"
diff --git a/runtime/queries/koka/highlights.scm b/runtime/queries/koka/highlights.scm
index fead98384..1ef409278 100644
--- a/runtime/queries/koka/highlights.scm
+++ b/runtime/queries/koka/highlights.scm
@@ -12,18 +12,6 @@
         ])))
   ["(" (block) (fnexpr)])
 
-(ntlappexpr
-  function: (ntlappexpr
-    (atom
-      (qidentifier
-        [
-          (qvarid) @function
-          (qidop) @function
-          (identifier
-            [(varid) (idop)] @function)
-        ])))
-  ["(" (block) (fnexpr)])
-
 (appexpr
   field: (atom
     (qidentifier
@@ -46,28 +34,6 @@
         ])))
   "[")
 
-(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"
diff --git a/runtime/queries/koka/indents.scm b/runtime/queries/koka/indents.scm
index 0a47bcbbd..6045373db 100644
--- a/runtime/queries/koka/indents.scm
+++ b/runtime/queries/koka/indents.scm
@@ -1,6 +1,5 @@
 [
   (appexpr ["[" "("]) ; Applications.
-  (ntlappexpr ["[" "("])
   (atom ["[" "("]) ; Lists and tuples.
   (program (moduledecl "{")) ; Braced module declarations.
   (funbody)

From 1ba5763a0cee586fc1c56eeb02fb508081c6e9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Fern=C3=A1ndez=20Serrata?=
 <76864299+Rudxain@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:44:39 -0400
Subject: [PATCH 934/967] recognize more files and shebangs (#10120)

* recognize `.node_repl_history` as JS

* recognize `bun` shebang

also add comments explaining Deno & Bun history files

* recognize `.python_history` file and `python3` shebang

* recognize more shells

* rm Py3 shebang

Co-authored-by: ath3 <45574139+ath3@users.noreply.github.com>

* rm non-standard deno/bun hist recognition

---------

Co-authored-by: ath3 <45574139+ath3@users.noreply.github.com>
---
 languages.toml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/languages.toml b/languages.toml
index 49185cc50..15e42e9d9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -670,7 +670,7 @@ name = "javascript"
 scope = "source.js"
 injection-regex = "(js|javascript)"
 language-id = "javascript"
-file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", { glob = "jakefile" }]
+file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", { glob = ".node_repl_history" }, { glob = "jakefile" }]
 shebangs = ["node"]
 comment-token = "//"
 block-comment-tokens = { start = "/*", end = "*/" }
@@ -709,9 +709,9 @@ grammar = "javascript"
 name = "typescript"
 scope = "source.ts"
 injection-regex = "(ts|typescript)"
-file-types = ["ts", "mts", "cts"]
 language-id = "typescript"
-shebangs = ["deno", "ts-node"]
+file-types = ["ts", "mts", "cts"]
+shebangs = ["deno", "bun", "ts-node"]
 comment-token = "//"
 block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "typescript-language-server" ]
@@ -782,7 +782,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53
 name = "python"
 scope = "source.python"
 injection-regex = "python"
-file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { glob = ".pythonstartup" }, { glob = ".pythonrc" }, { glob = "SConstruct" }, { glob = "SConscript" }]
+file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { glob = ".python_history" }, { glob = ".pythonstartup" }, { glob = ".pythonrc" }, { glob = "SConstruct" }, { glob = "SConscript" }]
 shebangs = ["python"]
 roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
 comment-token = "#"
@@ -884,6 +884,10 @@ injection-regex = "(shell|bash|zsh|sh)"
 file-types = [
   "sh",
   "bash",
+  "ash",
+  "dash",
+  "ksh",
+  "mksh",
   "zsh",
   "zshenv",
   "zlogin",
@@ -895,7 +899,6 @@ file-types = [
   "bazelrc",
   "Renviron",
   "zsh-theme",
-  "ksh",
   "cshrc",
   "tcshrc",
   "bashrc_Apple_Terminal",

From d3bfa3e063b7862e691bff099c61a7fe5cb48181 Mon Sep 17 00:00:00 2001
From: Eduardo Farinati <afxph8fc@duck.com>
Date: Fri, 5 Apr 2024 23:17:22 -0300
Subject: [PATCH 935/967] Fix crash on lsp text edits with invalid ranges
 (#9649)

---
 helix-lsp/src/lib.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index c58d967b6..f1ffcdf88 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -539,6 +539,16 @@ pub mod util {
                 } else {
                     return (0, 0, None);
                 };
+
+                if start > end {
+                    log::error!(
+                        "Invalid LSP text edit start {:?} > end {:?}, discarding",
+                        start,
+                        end
+                    );
+                    return (0, 0, None);
+                }
+
                 (start, end, replacement)
             }),
         )

From 3f2de213422573ecdf686505ea3464bdf28a4f66 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 6 Apr 2024 00:38:51 -0400
Subject: [PATCH 936/967] Handle partial failure when sending
 textDocument/didSave (#10168)

---
 helix-view/src/document.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 0c3a75f1b..f26ba8b97 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -961,13 +961,14 @@ impl Document {
 
             for (_, language_server) in language_servers {
                 if !language_server.is_initialized() {
-                    return Ok(event);
+                    continue;
                 }
-                if let Some(identifier) = &identifier {
-                    if let Some(notification) =
-                        language_server.text_document_did_save(identifier.clone(), &text)
-                    {
-                        notification.await?;
+                if let Some(notification) = identifier
+                    .clone()
+                    .and_then(|id| language_server.text_document_did_save(id, &text))
+                {
+                    if let Err(err) = notification.await {
+                        log::error!("Failed to send textDocument/didSave: {err}");
                     }
                 }
             }

From 97afd67fca0b505600e5fbba7ca59f06a4eec3ff Mon Sep 17 00:00:00 2001
From: Slug <9619abgoni@gmail.com>
Date: Sat, 6 Apr 2024 16:49:14 +0900
Subject: [PATCH 937/967] Add jump-label style for dark high contrast (#10102)

---
 runtime/themes/dark_high_contrast.toml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/runtime/themes/dark_high_contrast.toml b/runtime/themes/dark_high_contrast.toml
index 6da2389a6..9e2328450 100644
--- a/runtime/themes/dark_high_contrast.toml
+++ b/runtime/themes/dark_high_contrast.toml
@@ -3,11 +3,14 @@
 # Interface
 "ui.background" = { bg = "black" }
 "ui.window" = { fg = "aqua" }
-"special" = "orange" # file picker fuzzy match
+"special" = "orange"                           # file picker fuzzy match
 "ui.background.separator" = { fg = "white" }
 "ui.text" = "white"
 "ui.text.focus" = { modifiers = ["reversed"] } # file picker selected
 
+"ui.virtual.jump-label" = { fg = "deep_red", modifiers = [
+    "bold",
+], underline = { color = "deep_red", style = "line" } }
 "ui.virtual" = "gray"
 "ui.virtual.whitespace" = "gray"
 "ui.virtual.ruler" = { fg = "white", bg = "gray" }
@@ -56,14 +59,14 @@
 "diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.unnecessary" = { modifiers = ["dim"] }
 "diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-"info" = "white" 
+"info" = "white"
 "hint" = "yellow"
 "warning" = "orange"
 "error" = "red"
 "debug" = "red"
 
 "diff.plus" = "green"
-"diff.delta" ="blue"
+"diff.delta" = "blue"
 "diff.minus" = "pink"
 
 # Syntax high light
@@ -87,7 +90,9 @@
 "label" = "blue"
 
 # Markup 
-"markup.heading" = { fg = "yellow", modifiers = ["bold"], underline = { color = "yellow", style = "double_line"} }
+"markup.heading" = { fg = "yellow", modifiers = [
+    "bold",
+], underline = { color = "yellow", style = "double_line" } }
 "markup.list" = "pink"
 "markup.bold" = { fg = "emerald_green", modifiers = ["bold"] }
 "markup.italic" = { fg = "blue", modifiers = ["italic"] }
@@ -107,6 +112,7 @@ dark_blue = "#0d1a2d"
 aqua = "#6fc3df"
 purple = "#c586c0"
 red = "#b65f5f"
+deep_red = "#fd0004"
 pink = "#ff5c8d"
 orange = "#f38518"
 brown = "#ce9178"

From e69292e5eb7b0f727fefa19cffec910718af31b3 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Sat, 6 Apr 2024 23:27:29 +0200
Subject: [PATCH 938/967] Improve `goto_file_impl` (#9065)

---
 helix-term/src/commands.rs        | 67 ++++++++++++++++++++++---------
 helix-term/tests/test/commands.rs | 22 ++++++++++
 2 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7f43fa9ce..99e7608fc 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4,7 +4,10 @@ pub(crate) mod typed;
 
 pub use dap::*;
 use helix_event::status;
-use helix_stdx::rope::{self, RopeSliceExt};
+use helix_stdx::{
+    path::expand_tilde,
+    rope::{self, RopeSliceExt},
+};
 use helix_vcs::{FileChange, Hunk};
 pub use lsp::*;
 use tui::{
@@ -1196,25 +1199,51 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
     let primary = selections.primary();
     // Checks whether there is only one selection with a width of 1
     if selections.len() == 1 && primary.len() == 1 {
-        let count = cx.count();
-        let text_slice = text.slice(..);
-        // In this case it selects the WORD under the cursor
-        let current_word = textobject::textobject_word(
-            text_slice,
-            primary,
-            textobject::TextObject::Inside,
-            count,
-            true,
-        );
-        // Trims some surrounding chars so that the actual file is opened.
-        let surrounding_chars: &[_] = &['\'', '"', '(', ')'];
         paths.clear();
-        paths.push(
-            current_word
-                .fragment(text_slice)
-                .trim_matches(surrounding_chars)
-                .to_string(),
-        );
+
+        let is_valid_path_char = |c: &char| {
+            #[cfg(target_os = "windows")]
+            let valid_chars = &[
+                '@', '/', '\\', '.', '-', '_', '+', '#', '$', '%', '{', '}', '[', ']', ':', '!',
+                '~', '=',
+            ];
+            #[cfg(not(target_os = "windows"))]
+            let valid_chars = &['@', '/', '.', '-', '_', '+', '#', '$', '%', '~', '=', ':'];
+
+            valid_chars.contains(c) || c.is_alphabetic() || c.is_numeric()
+        };
+
+        let cursor_pos = primary.cursor(text.slice(..));
+        let pre_cursor_pos = cursor_pos.saturating_sub(1);
+        let post_cursor_pos = cursor_pos + 1;
+        let start_pos = if is_valid_path_char(&text.char(cursor_pos)) {
+            cursor_pos
+        } else if is_valid_path_char(&text.char(pre_cursor_pos)) {
+            pre_cursor_pos
+        } else {
+            post_cursor_pos
+        };
+
+        let prefix_len = text
+            .chars_at(start_pos)
+            .reversed()
+            .take_while(is_valid_path_char)
+            .count();
+
+        let postfix_len = text
+            .chars_at(start_pos)
+            .take_while(is_valid_path_char)
+            .count();
+
+        let path: Cow<str> = text
+            .slice((start_pos - prefix_len)..(start_pos + postfix_len))
+            .into();
+        log::debug!("Goto file path: {}", path);
+
+        match expand_tilde(PathBuf::from(path.as_ref())).to_str() {
+            Some(path) => paths.push(path.to_string()),
+            None => cx.editor.set_error("Couldn't get string out of path."),
+        };
     }
 
     for sel in paths {
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index aaa442f36..351f07fe9 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -153,6 +153,28 @@ async fn test_goto_file_impl() -> anyhow::Result<()> {
     )
     .await?;
 
+    // ';' is behind the path
+    test_key_sequence(
+        &mut AppBuilder::new().with_file(file.path(), None).build()?,
+        Some("iimport 'one.js';<esc>B;gf"),
+        Some(&|app| {
+            assert_eq!(1, match_paths(app, vec!["one.js"]));
+        }),
+        false,
+    )
+    .await?;
+
+    // allow numeric values in path
+    test_key_sequence(
+        &mut AppBuilder::new().with_file(file.path(), None).build()?,
+        Some("iimport 'one123.js'<esc>B;gf"),
+        Some(&|app| {
+            assert_eq!(1, match_paths(app, vec!["one123.js"]));
+        }),
+        false,
+    )
+    .await?;
+
     Ok(())
 }
 

From e663dafcd835ca360c11b78a44744b27044b1cfe Mon Sep 17 00:00:00 2001
From: Pebrianz <pebrianz117@gmail.com>
Date: Mon, 8 Apr 2024 09:32:29 +0700
Subject: [PATCH 939/967] Add angular language server (#10166)

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

diff --git a/languages.toml b/languages.toml
index 15e42e9d9..87778c996 100644
--- a/languages.toml
+++ b/languages.toml
@@ -8,6 +8,7 @@ use-grammars = { except = [ "hare", "wren", "gemini" ] }
 als = { command = "als" }
 ada-language-server = { command = "ada_language_server" }
 ada-gpr-language-server = {command = "ada_language_server", args = ["--language-gpr"]}
+angular = {command = "ngserver", args = ["--stdio", "--tsProbeLocations", ".", "--ngProbeLocations", ".",]}
 awk-language-server = { command = "awk-language-server" }
 bash-language-server = { command = "bash-language-server", args = ["start"] }
 bass = { command = "bass", args = ["--lsp"] }

From 0da809c981d2c0ce77fe828b4d66c995cf2ad56b Mon Sep 17 00:00:00 2001
From: Gary Miller <miller.garym@gmail.com>
Date: Mon, 8 Apr 2024 12:45:20 +1000
Subject: [PATCH 940/967] feat: Add ADL language support (#10029)

* feat: Add ADL language support

* removed error match & change captures to match https://docs.helix-editor.com/master/themes.html\#syntax-highlighting

* fixes to grammar, highlight changes based on PR and grammar fixes
---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 18 ++++++++++++++
 runtime/queries/adl/highlights.scm  | 37 +++++++++++++++++++++++++++++
 runtime/queries/adl/indents.scm     | 12 ++++++++++
 runtime/queries/adl/textobjects.scm |  1 +
 5 files changed, 69 insertions(+)
 create mode 100644 runtime/queries/adl/highlights.scm
 create mode 100644 runtime/queries/adl/indents.scm
 create mode 100644 runtime/queries/adl/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 156898d45..4cd67bc5c 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -1,6 +1,7 @@
 | Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
 | --- | --- | --- | --- | --- |
 | ada | ✓ | ✓ |  | `ada_language_server`, `ada_language_server` |
+| adl | ✓ | ✓ | ✓ |  |
 | agda | ✓ |  |  |  |
 | astro | ✓ |  |  |  |
 | awk | ✓ | ✓ |  | `awk-language-server` |
diff --git a/languages.toml b/languages.toml
index 87778c996..b700c3265 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3479,3 +3479,21 @@ language-servers = ["earthlyls"]
 [[grammar]]
 name = "earthfile"
 source = { git = "https://github.com/glehmann/tree-sitter-earthfile", rev = "2a6ab191f5f962562e495a818aa4e7f45f8a556a" }
+
+[[language]]
+name = "adl"
+scope = "source.adl"
+injection-regex = "adl"
+file-types = ["adl"]
+roots = []
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[language.auto-pairs]
+'"' = '"'
+'{' = '}'
+'<' = '>'
+
+[[grammar]]
+name = "adl"
+source = { git = "https://github.com/adl-lang/tree-sitter-adl", rev = "2787d04beadfbe154d3f2da6e98dc45a1b134bbf" }
diff --git a/runtime/queries/adl/highlights.scm b/runtime/queries/adl/highlights.scm
new file mode 100644
index 000000000..88e00ad7f
--- /dev/null
+++ b/runtime/queries/adl/highlights.scm
@@ -0,0 +1,37 @@
+; adl
+
+[
+"module"
+"struct"
+"union"
+"type"
+"newtype"
+"annotation"
+] @keyword
+
+(adl (scoped_name)) @namespace
+(comment) @comment
+(doc_comment) @comment.block.documentation
+(name) @type
+
+(fname) @variable.other.member
+
+(type_expr (scoped_name) @type)
+
+(type_expr_params (param (scoped_name) @type.parameter))
+
+; json
+(key) @string.special
+
+(string) @string
+
+(number) @constant.numeric
+
+[
+  (null)
+  (true)
+  (false)
+] @constant.builtin
+
+(escape_sequence) @constant.character.escape
+
diff --git a/runtime/queries/adl/indents.scm b/runtime/queries/adl/indents.scm
new file mode 100644
index 000000000..1200d4d42
--- /dev/null
+++ b/runtime/queries/adl/indents.scm
@@ -0,0 +1,12 @@
+[
+  (struct)
+  (union)
+  
+  (array)
+  (object)
+] @indent
+
+; [
+;  "}"
+;  "]"
+; ] @outdent
diff --git a/runtime/queries/adl/textobjects.scm b/runtime/queries/adl/textobjects.scm
new file mode 100644
index 000000000..36e39a2d4
--- /dev/null
+++ b/runtime/queries/adl/textobjects.scm
@@ -0,0 +1 @@
+(struct (_) @function.inside) @funtion.around

From 6f5ea6be587c6a20eff17d015ea0cc88957f1175 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 8 Apr 2024 05:31:23 +0200
Subject: [PATCH 941/967] fix off by one error for completion-replace option
 (#10279)

---
 helix-lsp/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index f1ffcdf88..262bc1b94 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -284,7 +284,8 @@ pub mod util {
                 .chars_at(cursor)
                 .skip(1)
                 .take_while(|ch| chars::char_is_word(*ch))
-                .count();
+                .count()
+                + 1;
         }
         (start, end)
     }

From 1e7c01d75be649c307636c8ad98e5c7de8a02925 Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Mon, 8 Apr 2024 07:47:44 +0200
Subject: [PATCH 942/967] material theme: add diagnostics and other missing
 stuff (#10290)

---
 runtime/themes/material_deep_ocean.toml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/material_deep_ocean.toml b/runtime/themes/material_deep_ocean.toml
index 874731769..e6c31e1f8 100644
--- a/runtime/themes/material_deep_ocean.toml
+++ b/runtime/themes/material_deep_ocean.toml
@@ -85,18 +85,27 @@
 "ui.highlight" = { bg = "highlight" }
 
 "ui.menu" = { bg = "highlight", fg = "text" }
+"ui.menu.selected" = { bg = "blue", fg = "bg" }
 
 "ui.help" = { bg = "highlight", fg = "text" }
 
 "ui.popup" = { bg = "highlight", fg = "text" }
 
+"ui.virtual.jump-label" = { fg = "purple", modifiers = ["bold"] }
+
 warning = "yellow"
 error = "error"
 info = "blue"
 hint = "purple"
 
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
+"diagnostic" = { underline = { color = "error", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "purple", style = "curl" } }
+"diagnostic.error" = { underline = { color = "error", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.unnecessary" = { modifiers = ["dim"]}
+"diagnostic.deprecated" = { modifiers = ["crossed_out"]}
+
 
 [palette]
 bg = "#0f111a"

From d1803954610003499edd7813e79f3845a793d151 Mon Sep 17 00:00:00 2001
From: Bertrand Bousquet <b.kamek@gmail.com>
Date: Mon, 8 Apr 2024 13:53:10 +0000
Subject: [PATCH 943/967] Varua theme jump label support (#10299)

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

diff --git a/runtime/themes/varua.toml b/runtime/themes/varua.toml
index 1c6b5e863..330503506 100644
--- a/runtime/themes/varua.toml
+++ b/runtime/themes/varua.toml
@@ -78,6 +78,7 @@
 "diagnostic.error" = { underline = { style = "curl", color = "red" } }
 "diagnostic.unnecessary" = { modifiers = ["dim"] }
 "diagnostic.deprecated" = { modifiers = ["crossed_out"] }
+"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
 
 [palette]
 bg0 = "#282828"

From 92338bc207778c83e27e80e35b6cfc03f7bdad13 Mon Sep 17 00:00:00 2001
From: Diego <dstafa.dev@gmail.com>
Date: Mon, 8 Apr 2024 17:20:53 +0200
Subject: [PATCH 944/967] fix mouse right click selection (#10067)

---
 helix-term/src/ui/editor.rs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 97a08beb7..dc767e22e 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1263,24 +1263,28 @@ impl EditorView {
             }
 
             MouseEventKind::Up(MouseButton::Right) => {
-                if let Some((coords, view_id)) = gutter_coords_and_view(cxt.editor, row, column) {
+                if let Some((pos, view_id)) = gutter_coords_and_view(cxt.editor, row, column) {
                     cxt.editor.focus(view_id);
 
-                    let (view, doc) = current!(cxt.editor);
-                    if let Some(pos) =
-                        view.pos_at_visual_coords(doc, coords.row as u16, coords.col as u16, true)
-                    {
-                        doc.set_selection(view_id, Selection::point(pos));
-                        if modifiers == KeyModifiers::ALT {
-                            commands::MappableCommand::dap_edit_log.execute(cxt);
-                        } else {
-                            commands::MappableCommand::dap_edit_condition.execute(cxt);
-                        }
+                    if let Some((pos, _)) = pos_and_view(cxt.editor, row, column, true) {
+                        doc_mut!(cxt.editor).set_selection(view_id, Selection::point(pos));
+                    } else {
+                        let (view, doc) = current!(cxt.editor);
 
-                        return EventResult::Consumed(None);
+                        if let Some(pos) = view.pos_at_visual_coords(doc, pos.row as u16, 0, true) {
+                            doc.set_selection(view_id, Selection::point(pos));
+                            match modifiers {
+                                KeyModifiers::ALT => {
+                                    commands::MappableCommand::dap_edit_log.execute(cxt)
+                                }
+                                _ => commands::MappableCommand::dap_edit_condition.execute(cxt),
+                            };
+                        }
                     }
-                }
 
+                    cxt.editor.ensure_cursor_in_view(view_id);
+                    return EventResult::Consumed(None);
+                }
                 EventResult::Ignored(None)
             }
 

From ea2a4858b7130d4c833eab00bd62b9b83d57d64c Mon Sep 17 00:00:00 2001
From: Hichem <hichem.f@live.de>
Date: Mon, 8 Apr 2024 17:41:03 +0200
Subject: [PATCH 945/967] Fix scrolling to the end within a popup (#10181)

when the available height for the popup is low/small, then it is not
possible to scroll until the end

Signed-off-by: Ben Fekih, Hichem <hichem.f@live.de>
---
 helix-term/src/ui/popup.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index 4f379b4a1..124b4402f 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -283,16 +283,20 @@ impl<T: Component> Component for Popup<T> {
             (height + self.margin.height()).min(max_height),
         );
 
-        // re-clamp scroll offset
-        let max_offset = self.child_size.1.saturating_sub(self.size.1);
-        self.scroll = self.scroll.min(max_offset as usize);
-
         Some(self.size)
     }
 
     fn render(&mut self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
         let area = self.area(viewport, cx.editor);
         self.area = area;
+
+        // required_size() calculates the popup size without taking account of self.position
+        // so we need to correct the popup height to correctly calculate the scroll
+        self.size.1 = area.height;
+
+        // re-clamp scroll offset
+        let max_offset = self.child_size.1.saturating_sub(self.size.1);
+        self.scroll = self.scroll.min(max_offset as usize);
         cx.scroll = Some(self.scroll);
 
         // clear area

From be8afe1bfe746c2105b3c5f81909aa8262eed08d Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexander.brevig@hey.com>
Date: Mon, 8 Apr 2024 18:15:31 +0200
Subject: [PATCH 946/967] chore: remove unused xtask themelint (#10294)

* chore: remove unused xtask themelint

* chore(clippy): remove unused themes
---
 book/src/themes.md     |   7 --
 xtask/src/main.rs      |  11 ---
 xtask/src/path.rs      |   4 -
 xtask/src/themelint.rs | 200 -----------------------------------------
 4 files changed, 222 deletions(-)
 delete mode 100644 xtask/src/themelint.rs

diff --git a/book/src/themes.md b/book/src/themes.md
index 0a49053f5..d982dee9a 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -36,13 +36,6 @@ For inspiration, you can find the default `theme.toml`
 user-submitted themes
 [here](https://github.com/helix-editor/helix/blob/master/runtime/themes).
 
-### Using the linter
-
-Use the supplied linting tool to check for errors and missing scopes:
-
-```sh
-cargo xtask themelint onedark # replace onedark with <name>
-```
 
 ## The details of theme creation
 
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 1421fd1a1..aba5c4499 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -2,7 +2,6 @@ mod docgen;
 mod helpers;
 mod path;
 mod querycheck;
-mod themelint;
 
 use std::{env, error::Error};
 
@@ -12,7 +11,6 @@ pub mod tasks {
     use crate::docgen::{lang_features, typable_commands, write};
     use crate::docgen::{LANG_SUPPORT_MD_OUTPUT, TYPABLE_COMMANDS_MD_OUTPUT};
     use crate::querycheck::query_check;
-    use crate::themelint::{lint, lint_all};
     use crate::DynError;
 
     pub fn docgen() -> Result<(), DynError> {
@@ -21,13 +19,6 @@ pub mod tasks {
         Ok(())
     }
 
-    pub fn themelint(file: Option<String>) -> Result<(), DynError> {
-        match file {
-            Some(file) => lint(file),
-            None => lint_all(),
-        }
-    }
-
     pub fn querycheck() -> Result<(), DynError> {
         query_check()
     }
@@ -39,7 +30,6 @@ Usage: Run with `cargo xtask <task>`, eg. `cargo xtask docgen`.
 
     Tasks:
         docgen: Generate files to be included in the mdbook output.
-        themelint <theme>: Report errors for <theme>, or all themes if no theme is specified.
         query-check: Check that tree-sitter queries are valid.
 "
         );
@@ -52,7 +42,6 @@ fn main() -> Result<(), DynError> {
         None => tasks::print_help(),
         Some(t) => match t.as_str() {
             "docgen" => tasks::docgen()?,
-            "themelint" => tasks::themelint(env::args().nth(2))?,
             "query-check" => tasks::querycheck()?,
             invalid => return Err(format!("Invalid task name: {}", invalid).into()),
         },
diff --git a/xtask/src/path.rs b/xtask/src/path.rs
index 6f4545c27..62d884f2e 100644
--- a/xtask/src/path.rs
+++ b/xtask/src/path.rs
@@ -18,7 +18,3 @@ pub fn ts_queries() -> PathBuf {
 pub fn lang_config() -> PathBuf {
     project_root().join("languages.toml")
 }
-
-pub fn themes() -> PathBuf {
-    project_root().join("runtime/themes")
-}
diff --git a/xtask/src/themelint.rs b/xtask/src/themelint.rs
deleted file mode 100644
index f7efb7d9a..000000000
--- a/xtask/src/themelint.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use crate::path;
-use crate::DynError;
-use helix_view::theme::Loader;
-use helix_view::theme::Modifier;
-use helix_view::Theme;
-
-struct Rule {
-    fg: Option<&'static str>,
-    bg: Option<&'static str>,
-    check_both: bool,
-}
-
-enum Require {
-    Existence(Rule),
-    Difference(&'static str, &'static str),
-}
-
-// Placed in an fn here, so it's the first thing you see
-fn get_rules() -> Vec<Require> {
-    vec![
-        // Check for ui.selection, which is required
-        Require::Existence(Rule::has_either("ui.selection")),
-        Require::Existence(Rule::has_either("ui.selection.primary")),
-        Require::Difference("ui.selection", "ui.selection.primary"),
-        // Check for planned readable text
-        Require::Existence(Rule::has_fg("ui.text")),
-        Require::Existence(Rule::has_bg("ui.background")),
-        // Check for complete editor.statusline bare minimum
-        Require::Existence(Rule::has_both("ui.statusline")),
-        Require::Existence(Rule::has_both("ui.statusline.inactive")),
-        // Check for editor.color-modes
-        Require::Existence(Rule::has_either("ui.statusline.normal")),
-        Require::Existence(Rule::has_either("ui.statusline.insert")),
-        Require::Existence(Rule::has_either("ui.statusline.select")),
-        Require::Difference("ui.statusline.normal", "ui.statusline.insert"),
-        Require::Difference("ui.statusline.normal", "ui.statusline.select"),
-        // Check for editor.cursorline
-        Require::Existence(Rule::has_bg("ui.cursorline.primary")),
-        // Check for general ui.virtual (such as inlay-hint)
-        Require::Existence(Rule::has_fg("ui.virtual")),
-        // Check for editor.whitespace
-        Require::Existence(Rule::has_fg("ui.virtual.whitespace")),
-        // Check fir rulers
-        Require::Existence(Rule::has_either("ui.virtual.indent-guide")),
-        // Check for editor.rulers
-        Require::Existence(Rule::has_either("ui.virtual.ruler")),
-        // Check for menus and prompts
-        Require::Existence(Rule::has_both("ui.menu")),
-        Require::Existence(Rule::has_both("ui.help")),
-        Require::Existence(Rule::has_bg("ui.popup")),
-        Require::Existence(Rule::has_either("ui.window")),
-        // Check for visible cursor
-        Require::Existence(Rule::has_bg("ui.cursor.primary")),
-        Require::Existence(Rule::has_either("ui.cursor.match")),
-    ]
-}
-
-impl Rule {
-    fn has_bg(bg: &'static str) -> Rule {
-        Rule {
-            fg: None,
-            bg: Some(bg),
-            check_both: true,
-        }
-    }
-    fn has_fg(fg: &'static str) -> Rule {
-        Rule {
-            fg: Some(fg),
-            bg: None,
-            check_both: true,
-        }
-    }
-    fn has_either(item: &'static str) -> Rule {
-        Rule {
-            fg: Some(item),
-            bg: Some(item),
-            check_both: false,
-        }
-    }
-    fn has_both(item: &'static str) -> Rule {
-        Rule {
-            fg: Some(item),
-            bg: Some(item),
-            check_both: true,
-        }
-    }
-    fn found_fg(&self, theme: &Theme) -> bool {
-        if let Some(fg) = &self.fg {
-            if theme.get(fg).fg.is_none() && theme.get(fg).add_modifier == Modifier::empty() {
-                return false;
-            }
-        }
-        true
-    }
-    fn found_bg(&self, theme: &Theme) -> bool {
-        if let Some(bg) = &self.bg {
-            if theme.get(bg).bg.is_none() && theme.get(bg).add_modifier == Modifier::empty() {
-                return false;
-            }
-        }
-        true
-    }
-    fn rule_name(&self) -> &'static str {
-        if self.fg.is_some() {
-            self.fg.unwrap()
-        } else if self.bg.is_some() {
-            self.bg.unwrap()
-        } else {
-            "LINTER_ERROR_NO_RULE"
-        }
-    }
-
-    fn check_difference(
-        theme: &Theme,
-        a: &'static str,
-        b: &'static str,
-        messages: &mut Vec<String>,
-    ) {
-        let theme_a = theme.get(a);
-        let theme_b = theme.get(b);
-        if theme_a == theme_b {
-            messages.push(format!("$THEME: `{}` and `{}` cannot be equal", a, b));
-        }
-    }
-
-    fn check_existence(rule: &Rule, theme: &Theme, messages: &mut Vec<String>) {
-        let found_fg = rule.found_fg(theme);
-        let found_bg = rule.found_bg(theme);
-
-        if !rule.check_both && (found_fg || found_bg) {
-            return;
-        }
-        if !found_fg || !found_bg {
-            let mut missing = vec![];
-            if !found_fg {
-                missing.push("`fg`");
-            }
-            if !found_bg {
-                missing.push("`bg`");
-            }
-            let entry = if !rule.check_both && !found_fg && !found_bg {
-                missing.join(" or ")
-            } else {
-                missing.join(" and ")
-            };
-            messages.push(format!(
-                "$THEME: missing {} for `{}`",
-                entry,
-                rule.rule_name()
-            ))
-        }
-    }
-}
-
-pub fn lint(file: String) -> Result<(), DynError> {
-    if file.contains("base16") {
-        println!("Skipping base16: {}", file);
-        return Ok(());
-    }
-    let path = path::themes().join(file.clone() + ".toml");
-    let theme = std::fs::read_to_string(path).unwrap();
-    let theme: Theme = toml::from_str(&theme).expect("Failed to parse theme");
-
-    let mut messages: Vec<String> = vec![];
-    get_rules().iter().for_each(|lint| match lint {
-        Require::Existence(rule) => Rule::check_existence(rule, &theme, &mut messages),
-        Require::Difference(a, b) => Rule::check_difference(&theme, a, b, &mut messages),
-    });
-
-    if !messages.is_empty() {
-        messages.iter().for_each(|m| {
-            let theme = file.clone();
-            let message = m.replace("$THEME", theme.as_str());
-            println!("{}", message);
-        });
-        Err(format!("{} has issues", file).into())
-    } else {
-        Ok(())
-    }
-}
-
-pub fn lint_all() -> Result<(), DynError> {
-    let files = Loader::read_names(path::themes().as_path());
-    let files_count = files.len();
-    let ok_files_count = files
-        .into_iter()
-        .filter_map(|path| lint(path.replace(".toml", "")).ok())
-        .count();
-
-    if files_count != ok_files_count {
-        Err(format!(
-            "{} of {} themes had issues",
-            files_count - ok_files_count,
-            files_count
-        )
-        .into())
-    } else {
-        Ok(())
-    }
-}

From c499f9aa5507e2ba721a7203a581ad4f614467bf Mon Sep 17 00:00:00 2001
From: RoloEdits <RoloEdits@gmail.com>
Date: Mon, 8 Apr 2024 11:01:40 -0700
Subject: [PATCH 947/967] feat(themes): add ruler for `adwaita-dark` (#10260)

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

diff --git a/runtime/themes/adwaita-dark.toml b/runtime/themes/adwaita-dark.toml
index e8f1a5887..44ae0063b 100644
--- a/runtime/themes/adwaita-dark.toml
+++ b/runtime/themes/adwaita-dark.toml
@@ -82,6 +82,7 @@
 "ui.help" = { bg = "libadwaita_dark_alt" }
 "ui.text" = "light_4"
 "ui.virtual" = "dark_1"
+"ui.virtual.ruler" = { bg = "libadwaita_popup"}
 "ui.menu" = { fg = "light_4", bg = "libadwaita_popup" }
 "ui.menu.selected" = { fg = "light_4", bg = "blue_5" }
 "ui.menu.scroll" = { fg = "light_7", bg = "dark_3" }

From ae85f5ff712db6729032f302494eba0ca5655510 Mon Sep 17 00:00:00 2001
From: RoloEdits <RoloEdits@gmail.com>
Date: Mon, 8 Apr 2024 11:02:02 -0700
Subject: [PATCH 948/967] refactor(themes): removed `ui.highlight` effects from
 `solarized_dark` (#10261)

---
 runtime/themes/solarized_dark.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index 9e23aff25..df8b7bbaf 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -79,8 +79,6 @@
 "ui.text" = { fg = "base1" }
 # 影响 picker列表选中, 快捷键帮助窗口文本
 "ui.text.focus" = { fg = "blue", modifiers = ["bold"]}
-# file picker中， 预览的当前选中项
-"ui.highlight" = { fg = "red", modifiers = ["bold", "italic", "underlined"] }
 
 # 主光标/selectio
 "ui.cursor.primary" = { fg = "base03", bg = "base1" }

From cf259e37c82f7d8a0c0771bfbf5adee6ab5b3a79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2024 09:41:11 +0900
Subject: [PATCH 949/967] build(deps): bump peaceiris/actions-gh-pages from 3
 to 4 (#10313)

Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases)
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md)
- [Commits](https://github.com/peaceiris/actions-gh-pages/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index ae2e5835e..efad7f913 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -27,14 +27,14 @@ jobs:
           echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
 
       - name: Deploy stable
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         if: startswith(github.ref, 'refs/tags/')
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./book/book
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./book/book

From 55346f32b5af8fe4d7de0966e991b2755436ce1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2024 09:41:41 +0900
Subject: [PATCH 950/967] build(deps): bump peaceiris/actions-mdbook from 1 to
 2 (#10314)

Bumps [peaceiris/actions-mdbook](https://github.com/peaceiris/actions-mdbook) from 1 to 2.
- [Release notes](https://github.com/peaceiris/actions-mdbook/releases)
- [Changelog](https://github.com/peaceiris/actions-mdbook/blob/main/CHANGELOG.md)
- [Commits](https://github.com/peaceiris/actions-mdbook/compare/v1...v2)

---
updated-dependencies:
- dependency-name: peaceiris/actions-mdbook
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gh-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index efad7f913..39dc08982 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup mdBook
-        uses: peaceiris/actions-mdbook@v1
+        uses: peaceiris/actions-mdbook@v2
         with:
           mdbook-version: 'latest'
           # mdbook-version: '0.4.8'

From cf99615b433fa4708604460e0b2298cf92833960 Mon Sep 17 00:00:00 2001
From: Yomain <40139584+yo-main@users.noreply.github.com>
Date: Tue, 9 Apr 2024 02:44:49 +0200
Subject: [PATCH 951/967] material theme: fix statusline color (#10308)

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

diff --git a/runtime/themes/material_deep_ocean.toml b/runtime/themes/material_deep_ocean.toml
index e6c31e1f8..8b1e3c861 100644
--- a/runtime/themes/material_deep_ocean.toml
+++ b/runtime/themes/material_deep_ocean.toml
@@ -63,9 +63,9 @@
 
 "ui.statusline" = { bg = "bg", fg = "text" }
 "ui.statusline.inactive" = { bg = "bg", fg = "disabled" }
-"ui.statusline.normal" = { bg = "accent", fg = "text" }
-"ui.statusline.insert" = { bg = "green", fg = "text" }
-"ui.statusline.select" = { bg = "purple", fg = "text" }
+"ui.statusline.normal" = { bg = "blue", fg = "bg" }
+"ui.statusline.insert" = { bg = "green", fg = "bg" }
+"ui.statusline.select" = { bg = "purple", fg = "bg" }
 
 
 "ui.selection" = { bg = "selection" }

From 07cb24abddb210bf0e6a8948aac38a9af6914f53 Mon Sep 17 00:00:00 2001
From: Evgeniy Tatarkin <tatarkin.evg@gmail.com>
Date: Tue, 9 Apr 2024 17:28:54 +0300
Subject: [PATCH 952/967] Respect lsp definition order for code actions (#9590)

---
 book/src/languages.md           | 2 ++
 helix-term/src/commands/lsp.rs  | 8 ++++----
 helix-term/src/ui/completion.rs | 5 -----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/book/src/languages.md b/book/src/languages.md
index dd93fec53..33ecbb92f 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -150,6 +150,8 @@ They have to be defined in the `[language-server]` table as described in the pre
 
 Different languages can use the same language server instance, e.g. `typescript-language-server` is used for javascript, jsx, tsx and typescript by default.
 
+The definition order of language servers affects the order in the results list of code action menu.
+
 In case multiple language servers are specified in the `language-servers` attribute of a `language`,
 it's often useful to only enable/disable certain language-server features for these language servers.
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 63d1608f9..6a5ceae6f 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1,4 +1,4 @@
-use futures_util::{stream::FuturesUnordered, FutureExt};
+use futures_util::{stream::FuturesOrdered, FutureExt};
 use helix_lsp::{
     block_on,
     lsp::{
@@ -341,7 +341,7 @@ pub fn symbol_picker(cx: &mut Context) {
 
     let mut seen_language_servers = HashSet::new();
 
-    let mut futures: FuturesUnordered<_> = doc
+    let mut futures: FuturesOrdered<_> = doc
         .language_servers_with_feature(LanguageServerFeature::DocumentSymbols)
         .filter(|ls| seen_language_servers.insert(ls.id()))
         .map(|language_server| {
@@ -416,7 +416,7 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
     let get_symbols = move |pattern: String, editor: &mut Editor| {
         let doc = doc!(editor);
         let mut seen_language_servers = HashSet::new();
-        let mut futures: FuturesUnordered<_> = doc
+        let mut futures: FuturesOrdered<_> = doc
             .language_servers_with_feature(LanguageServerFeature::WorkspaceSymbols)
             .filter(|ls| seen_language_servers.insert(ls.id()))
             .map(|language_server| {
@@ -574,7 +574,7 @@ pub fn code_action(cx: &mut Context) {
 
     let mut seen_language_servers = HashSet::new();
 
-    let mut futures: FuturesUnordered<_> = doc
+    let mut futures: FuturesOrdered<_> = doc
         .language_servers_with_feature(LanguageServerFeature::CodeAction)
         .filter(|ls| seen_language_servers.insert(ls.id()))
         // TODO this should probably already been filtered in something like "language_servers_with_feature"
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 6cbb5b109..735bc956a 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -285,11 +285,6 @@ impl Completion {
                     let language_server = language_server!(item);
                     let offset_encoding = language_server.offset_encoding();
 
-                    let language_server = editor
-                        .language_servers
-                        .get_by_id(item.language_server_id)
-                        .unwrap();
-
                     // resolve item if not yet resolved
                     if !item.resolved {
                         if let Some(resolved) =

From cf9b88f9bda6d9ab3a32754b86be705c62662021 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 7 Apr 2024 14:15:29 -0400
Subject: [PATCH 953/967] add Range::{from_node,into_byte_range}

---
 helix-core/src/selection.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 579499de5..652612872 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -14,6 +14,7 @@ use crate::{
 use helix_stdx::rope::{self, RopeSliceExt};
 use smallvec::{smallvec, SmallVec};
 use std::borrow::Cow;
+use tree_sitter::Node;
 
 /// A single selection range.
 ///
@@ -73,6 +74,12 @@ impl Range {
         Self::new(head, head)
     }
 
+    pub fn from_node(node: Node, text: RopeSlice, direction: Direction) -> Self {
+        let from = text.byte_to_char(node.start_byte());
+        let to = text.byte_to_char(node.end_byte());
+        Range::new(from, to).with_direction(direction)
+    }
+
     /// Start of the range.
     #[inline]
     #[must_use]
@@ -376,6 +383,12 @@ impl Range {
         let second = graphemes.next();
         first.is_some() && second.is_none()
     }
+
+    /// Converts this char range into an in order byte range, discarding
+    /// direction.
+    pub fn into_byte_range(&self, text: RopeSlice) -> (usize, usize) {
+        (text.char_to_byte(self.from()), text.char_to_byte(self.to()))
+    }
 }
 
 impl From<(usize, usize)> for Range {
@@ -783,7 +796,9 @@ pub fn split_on_newline(text: RopeSlice, selection: &Selection) -> Selection {
         let mut start = sel_start;
 
         for line in sel.slice(text).lines() {
-            let Some(line_ending) = get_line_ending(&line) else { break };
+            let Some(line_ending) = get_line_ending(&line) else {
+                break;
+            };
             let line_end = start + line.len_chars();
             // TODO: retain range direction
             result.push(Range::new(start, line_end - line_ending.len_chars()));

From 87c41617322896d5b19d13f019dcbb4ed89414b5 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Thu, 22 Jun 2023 00:21:02 -0400
Subject: [PATCH 954/967] feat(command): select_all_siblings

---
 helix-core/src/object.rs                   |  62 ++++++++-
 helix-term/src/commands.rs                 |  21 ++-
 helix-term/src/keymap/default.rs           |   1 +
 helix-term/tests/test/commands/movement.rs | 151 +++++++++++++++++++++
 4 files changed, 232 insertions(+), 3 deletions(-)

diff --git a/helix-core/src/object.rs b/helix-core/src/object.rs
index 0df105f1a..9593b882f 100644
--- a/helix-core/src/object.rs
+++ b/helix-core/src/object.rs
@@ -1,4 +1,5 @@
-use crate::{syntax::TreeCursor, Range, RopeSlice, Selection, Syntax};
+use crate::{movement::Direction, syntax::TreeCursor, Range, RopeSlice, Selection, Syntax};
+use tree_sitter::{Node, Tree};
 
 pub fn expand_selection(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
     let cursor = &mut syntax.walk();
@@ -40,6 +41,65 @@ pub fn select_next_sibling(syntax: &Syntax, text: RopeSlice, selection: Selectio
     })
 }
 
+fn find_parent_with_more_children(mut node: Node) -> Option<Node> {
+    while let Some(parent) = node.parent() {
+        if parent.child_count() > 1 {
+            return Some(parent);
+        }
+
+        node = parent;
+    }
+
+    None
+}
+
+pub fn select_all_siblings(tree: &Tree, text: RopeSlice, selection: Selection) -> Selection {
+    let root_node = &tree.root_node();
+
+    selection.transform_iter(|range| {
+        let from = text.char_to_byte(range.from());
+        let to = text.char_to_byte(range.to());
+
+        root_node
+            .descendant_for_byte_range(from, to)
+            .and_then(find_parent_with_more_children)
+            .map(|parent| select_children(parent, text, range.direction()))
+            .unwrap_or_else(|| vec![range].into_iter())
+    })
+}
+
+fn select_children(
+    node: Node,
+    text: RopeSlice,
+    direction: Direction,
+) -> <Vec<Range> as std::iter::IntoIterator>::IntoIter {
+    let mut cursor = node.walk();
+
+    node.named_children(&mut cursor)
+        .map(|child| {
+            let from = text.byte_to_char(child.start_byte());
+            let to = text.byte_to_char(child.end_byte());
+
+            if direction == Direction::Backward {
+                Range::new(to, from)
+            } else {
+                Range::new(from, to)
+            }
+        })
+        .collect::<Vec<_>>()
+        .into_iter()
+}
+
+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() {
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 99e7608fc..7618fd0ab 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -438,8 +438,9 @@ impl MappableCommand {
         reverse_selection_contents, "Reverse selections contents",
         expand_selection, "Expand selection to parent syntax node",
         shrink_selection, "Shrink selection to previously expanded syntax node",
-        select_next_sibling, "Select next sibling in syntax tree",
-        select_prev_sibling, "Select previous sibling in syntax tree",
+        select_next_sibling, "Select next sibling in the syntax tree",
+        select_prev_sibling, "Select previous sibling the in syntax tree",
+        select_all_siblings, "Select all siblings in the syntax tree",
         jump_forward, "Jump forward on jumplist",
         jump_backward, "Jump backward on jumplist",
         save_selection, "Save current selection to jumplist",
@@ -4974,6 +4975,22 @@ pub fn extend_parent_node_start(cx: &mut Context) {
     move_node_bound_impl(cx, Direction::Backward, Movement::Extend)
 }
 
+fn select_all_siblings(cx: &mut Context) {
+    let motion = |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_all_siblings(syntax.tree(), text, current_selection.clone());
+            doc.set_selection(view.id, selection);
+        }
+    };
+
+    cx.editor.apply_motion(motion);
+}
+
 fn match_brackets(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let is_select = cx.editor.mode == Mode::Select;
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 498a9a3e7..90088e991 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -91,6 +91,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
         "A-n" | "A-right" => select_next_sibling,
         "A-e" => move_parent_node_end,
         "A-b" => move_parent_node_start,
+        "A-a" => select_all_siblings,
 
         "%" => select_all,
         "x" => extend_line_below,
diff --git a/helix-term/tests/test/commands/movement.rs b/helix-term/tests/test/commands/movement.rs
index 34c9d23b2..f263fbac4 100644
--- a/helix-term/tests/test/commands/movement.rs
+++ b/helix-term/tests/test/commands/movement.rs
@@ -450,3 +450,154 @@ async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn select_all_siblings() -> anyhow::Result<()> {
+    let tests = vec![
+        // basic tests
+        (
+            indoc! {r##"
+                let foo = bar(#[a|]#, b, c);
+            "##},
+            "<A-a>",
+            indoc! {r##"
+                let foo = bar(#[a|]#, #(b|)#, #(c|)#);
+            "##},
+        ),
+        (
+            indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    2,
+                    3,
+                    4,
+                    5,
+                ];
+            "##},
+            "<A-a>",
+            indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    #(2|)#,
+                    #(3|)#,
+                    #(4|)#,
+                    #(5|)#,
+                ];
+            "##},
+        ),
+        // direction is preserved
+        (
+            indoc! {r##"
+                let a = [
+                    #[|1]#,
+                    2,
+                    3,
+                    4,
+                    5,
+                ];
+            "##},
+            "<A-a>",
+            indoc! {r##"
+                let a = [
+                    #[|1]#,
+                    #(|2)#,
+                    #(|3)#,
+                    #(|4)#,
+                    #(|5)#,
+                ];
+            "##},
+        ),
+        // can't pick any more siblings - selection stays the same
+        (
+            indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    #(2|)#,
+                    #(3|)#,
+                    #(4|)#,
+                    #(5|)#,
+                ];
+            "##},
+            "<A-a>",
+            indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    #(2|)#,
+                    #(3|)#,
+                    #(4|)#,
+                    #(5|)#,
+                ];
+            "##},
+        ),
+        // each cursor does the sibling select independently
+        (
+            indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    2,
+                    3,
+                    4,
+                    5,
+                ];
+
+                let b = [
+                    #("one"|)#,
+                    "two",
+                    "three",
+                    "four",
+                    "five",
+                ];
+            "##},
+            "<A-a>",
+            indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    #(2|)#,
+                    #(3|)#,
+                    #(4|)#,
+                    #(5|)#,
+                ];
+
+                let b = [
+                    #("one"|)#,
+                    #("two"|)#,
+                    #("three"|)#,
+                    #("four"|)#,
+                    #("five"|)#,
+                ];
+            "##},
+        ),
+        // conflicting sibling selections get normalized. Here, the primary
+        // selection would choose every list item, but because the secondary
+        // range covers more than one item, the descendent is the entire list,
+        // which means the sibling is the assignment. The list item ranges just
+        // get normalized out since the list itself becomes selected.
+        (
+            indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    2,
+                    #(3,
+                    4|)#,
+                    5,
+                ];
+            "##},
+            "<A-a>",
+            indoc! {r##"
+                let #(a|)# = #[[
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                ]|]#;
+            "##},
+        ),
+    ];
+
+    for test in tests {
+        test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
+    }
+
+    Ok(())
+}

From fa67c5c474e270664c652b87dcab4af7c79aeb59 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Thu, 22 Jun 2023 21:33:40 -0400
Subject: [PATCH 955/967] feat(command): select_all_children

---
 helix-core/src/object.rs                   |  30 ++++-
 helix-term/src/commands.rs                 |  20 +++-
 helix-term/src/keymap/default.rs           |   1 +
 helix-term/tests/test/commands/movement.rs | 125 +++++++++++++++++++++
 4 files changed, 170 insertions(+), 6 deletions(-)

diff --git a/helix-core/src/object.rs b/helix-core/src/object.rs
index 9593b882f..ff810489d 100644
--- a/helix-core/src/object.rs
+++ b/helix-core/src/object.rs
@@ -63,7 +63,21 @@ pub fn select_all_siblings(tree: &Tree, text: RopeSlice, selection: Selection) -
         root_node
             .descendant_for_byte_range(from, to)
             .and_then(find_parent_with_more_children)
-            .map(|parent| select_children(parent, text, range.direction()))
+            .and_then(|parent| select_children(parent, text, range.direction()))
+            .unwrap_or_else(|| vec![range].into_iter())
+    })
+}
+
+pub fn select_all_children(tree: &Tree, text: RopeSlice, selection: Selection) -> Selection {
+    let root_node = &tree.root_node();
+
+    selection.transform_iter(|range| {
+        let from = text.char_to_byte(range.from());
+        let to = text.char_to_byte(range.to());
+
+        root_node
+            .descendant_for_byte_range(from, to)
+            .and_then(|parent| select_children(parent, text, range.direction()))
             .unwrap_or_else(|| vec![range].into_iter())
     })
 }
@@ -72,10 +86,11 @@ fn select_children(
     node: Node,
     text: RopeSlice,
     direction: Direction,
-) -> <Vec<Range> as std::iter::IntoIterator>::IntoIter {
+) -> Option<<Vec<Range> as std::iter::IntoIterator>::IntoIter> {
     let mut cursor = node.walk();
 
-    node.named_children(&mut cursor)
+    let children = node
+        .named_children(&mut cursor)
         .map(|child| {
             let from = text.byte_to_char(child.start_byte());
             let to = text.byte_to_char(child.end_byte());
@@ -86,8 +101,13 @@ fn select_children(
                 Range::new(from, to)
             }
         })
-        .collect::<Vec<_>>()
-        .into_iter()
+        .collect::<Vec<_>>();
+
+    if !children.is_empty() {
+        Some(children.into_iter())
+    } else {
+        None
+    }
 }
 
 fn find_sibling_recursive<F>(node: Node, sibling_fn: F) -> Option<Node>
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7618fd0ab..9b203092c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -440,7 +440,8 @@ impl MappableCommand {
         shrink_selection, "Shrink selection to previously expanded syntax node",
         select_next_sibling, "Select next sibling in the syntax tree",
         select_prev_sibling, "Select previous sibling the in syntax tree",
-        select_all_siblings, "Select all siblings in the syntax tree",
+        select_all_siblings, "Select all siblings of the current node",
+        select_all_children, "Select all children of the current node",
         jump_forward, "Jump forward on jumplist",
         jump_backward, "Jump backward on jumplist",
         save_selection, "Save current selection to jumplist",
@@ -4991,6 +4992,23 @@ fn select_all_siblings(cx: &mut Context) {
     cx.editor.apply_motion(motion);
 }
 
+fn select_all_children(cx: &mut Context) {
+    let motion = |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_all_children(syntax.tree(), text, current_selection.clone());
+            doc.set_selection(view.id, selection);
+        }
+    };
+
+    motion(cx.editor);
+    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+}
+
 fn match_brackets(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let is_select = cx.editor.mode == Mode::Select;
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 90088e991..5a3e8eed4 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -87,6 +87,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
         "A-;" => flip_selections,
         "A-o" | "A-up" => expand_selection,
         "A-i" | "A-down" => shrink_selection,
+        "A-I" | "A-S-down" => select_all_children,
         "A-p" | "A-left" => select_prev_sibling,
         "A-n" | "A-right" => select_next_sibling,
         "A-e" => move_parent_node_end,
diff --git a/helix-term/tests/test/commands/movement.rs b/helix-term/tests/test/commands/movement.rs
index f263fbac4..84806d5f8 100644
--- a/helix-term/tests/test/commands/movement.rs
+++ b/helix-term/tests/test/commands/movement.rs
@@ -601,3 +601,128 @@ async fn select_all_siblings() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn select_all_children() -> anyhow::Result<()> {
+    let tests = vec![
+        // basic tests
+        (
+            helpers::platform_line(indoc! {r##"
+                let foo = bar#[(a, b, c)|]#;
+            "##}),
+            "<A-I>",
+            helpers::platform_line(indoc! {r##"
+                let foo = bar(#[a|]#, #(b|)#, #(c|)#);
+            "##}),
+        ),
+        (
+            helpers::platform_line(indoc! {r##"
+                let a = #[[
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                ]|]#;
+            "##}),
+            "<A-I>",
+            helpers::platform_line(indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    #(2|)#,
+                    #(3|)#,
+                    #(4|)#,
+                    #(5|)#,
+                ];
+            "##}),
+        ),
+        // direction is preserved
+        (
+            helpers::platform_line(indoc! {r##"
+                let a = #[|[
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                ]]#;
+            "##}),
+            "<A-I>",
+            helpers::platform_line(indoc! {r##"
+                let a = [
+                    #[|1]#,
+                    #(|2)#,
+                    #(|3)#,
+                    #(|4)#,
+                    #(|5)#,
+                ];
+            "##}),
+        ),
+        // can't pick any more children - selection stays the same
+        (
+            helpers::platform_line(indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    #(2|)#,
+                    #(3|)#,
+                    #(4|)#,
+                    #(5|)#,
+                ];
+            "##}),
+            "<A-I>",
+            helpers::platform_line(indoc! {r##"
+                let a = [
+                    #[1|]#,
+                    #(2|)#,
+                    #(3|)#,
+                    #(4|)#,
+                    #(5|)#,
+                ];
+            "##}),
+        ),
+        // each cursor does the sibling select independently
+        (
+            helpers::platform_line(indoc! {r##"
+                let a = #[|[
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                ]]#;
+
+                let b = #([
+                    "one",
+                    "two",
+                    "three",
+                    "four",
+                    "five",
+                ]|)#;
+            "##}),
+            "<A-I>",
+            helpers::platform_line(indoc! {r##"
+                let a = [
+                    #[|1]#,
+                    #(|2)#,
+                    #(|3)#,
+                    #(|4)#,
+                    #(|5)#,
+                ];
+
+                let b = [
+                    #("one"|)#,
+                    #("two"|)#,
+                    #("three"|)#,
+                    #("four"|)#,
+                    #("five"|)#,
+                ];
+            "##}),
+        ),
+    ];
+
+    for test in tests {
+        test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
+    }
+
+    Ok(())
+}

From c99c333337cf4c1269749bf29aff48c199e27124 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 25 Jun 2023 13:50:37 -0400
Subject: [PATCH 956/967] Use new in-crate TreeCursor

---
 helix-core/src/object.rs                   |  88 +++++----------
 helix-core/src/syntax/tree_cursor.rs       | 118 +++++++++++++++++++--
 helix-term/src/commands.rs                 |  53 ++++-----
 helix-term/tests/test/commands/movement.rs |  40 +++----
 4 files changed, 183 insertions(+), 116 deletions(-)

diff --git a/helix-core/src/object.rs b/helix-core/src/object.rs
index ff810489d..28629235f 100644
--- a/helix-core/src/object.rs
+++ b/helix-core/src/object.rs
@@ -1,5 +1,4 @@
-use crate::{movement::Direction, syntax::TreeCursor, Range, RopeSlice, Selection, Syntax};
-use tree_sitter::{Node, Tree};
+use crate::{syntax::TreeCursor, Range, RopeSlice, Selection, Syntax};
 
 pub fn expand_selection(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
     let cursor = &mut syntax.walk();
@@ -41,85 +40,46 @@ pub fn select_next_sibling(syntax: &Syntax, text: RopeSlice, selection: Selectio
     })
 }
 
-fn find_parent_with_more_children(mut node: Node) -> Option<Node> {
-    while let Some(parent) = node.parent() {
-        if parent.child_count() > 1 {
-            return Some(parent);
-        }
-
-        node = parent;
-    }
-
-    None
-}
-
-pub fn select_all_siblings(tree: &Tree, text: RopeSlice, selection: Selection) -> Selection {
-    let root_node = &tree.root_node();
-
+pub fn select_all_siblings(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
     selection.transform_iter(|range| {
-        let from = text.char_to_byte(range.from());
-        let to = text.char_to_byte(range.to());
+        let mut cursor = syntax.walk();
+        let (from, to) = range.into_byte_range(text);
+        cursor.reset_to_byte_range(from, to);
+
+        if !cursor.goto_parent_with(|parent| parent.child_count() > 1) {
+            return vec![range].into_iter();
+        }
 
-        root_node
-            .descendant_for_byte_range(from, to)
-            .and_then(find_parent_with_more_children)
-            .and_then(|parent| select_children(parent, text, range.direction()))
-            .unwrap_or_else(|| vec![range].into_iter())
+        select_children(&mut cursor, text, range).into_iter()
     })
 }
 
-pub fn select_all_children(tree: &Tree, text: RopeSlice, selection: Selection) -> Selection {
-    let root_node = &tree.root_node();
-
+pub fn select_all_children(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
     selection.transform_iter(|range| {
-        let from = text.char_to_byte(range.from());
-        let to = text.char_to_byte(range.to());
-
-        root_node
-            .descendant_for_byte_range(from, to)
-            .and_then(|parent| select_children(parent, text, range.direction()))
-            .unwrap_or_else(|| vec![range].into_iter())
+        let mut cursor = syntax.walk();
+        let (from, to) = range.into_byte_range(text);
+        cursor.reset_to_byte_range(from, to);
+        select_children(&mut cursor, text, range).into_iter()
     })
 }
 
-fn select_children(
-    node: Node,
+fn select_children<'n>(
+    cursor: &'n mut TreeCursor<'n>,
     text: RopeSlice,
-    direction: Direction,
-) -> Option<<Vec<Range> as std::iter::IntoIterator>::IntoIter> {
-    let mut cursor = node.walk();
-
-    let children = node
-        .named_children(&mut cursor)
-        .map(|child| {
-            let from = text.byte_to_char(child.start_byte());
-            let to = text.byte_to_char(child.end_byte());
-
-            if direction == Direction::Backward {
-                Range::new(to, from)
-            } else {
-                Range::new(from, to)
-            }
-        })
+    range: Range,
+) -> Vec<Range> {
+    let children = cursor
+        .named_children()
+        .map(|child| Range::from_node(child, text, range.direction()))
         .collect::<Vec<_>>();
 
     if !children.is_empty() {
-        Some(children.into_iter())
+        children
     } else {
-        None
+        vec![range]
     }
 }
 
-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() {
diff --git a/helix-core/src/syntax/tree_cursor.rs b/helix-core/src/syntax/tree_cursor.rs
index d9d140c9f..692d5890a 100644
--- a/helix-core/src/syntax/tree_cursor.rs
+++ b/helix-core/src/syntax/tree_cursor.rs
@@ -90,6 +90,19 @@ impl<'a> TreeCursor<'a> {
         true
     }
 
+    pub fn goto_parent_with<P>(&mut self, predicate: P) -> bool
+    where
+        P: Fn(&Node) -> bool,
+    {
+        while self.goto_parent() {
+            if predicate(&self.node()) {
+                return true;
+            }
+        }
+
+        false
+    }
+
     /// 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
@@ -102,7 +115,7 @@ impl<'a> TreeCursor<'a> {
             .find_map(|range| (range.start == search_range.start).then_some(range.layer_id))
     }
 
-    pub fn goto_first_child(&mut self) -> bool {
+    fn goto_first_child_impl(&mut self, named: bool) -> 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())
@@ -111,8 +124,16 @@ impl<'a> TreeCursor<'a> {
             // 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) {
+            return true;
+        }
+
+        let child = if named {
+            self.cursor.named_child(0)
+        } else {
+            self.cursor.child(0)
+        };
+
+        if let Some(child) = child {
             // Otherwise descend in the current tree.
             self.cursor = child;
             true
@@ -121,8 +142,22 @@ impl<'a> TreeCursor<'a> {
         }
     }
 
-    pub fn goto_next_sibling(&mut self) -> bool {
-        if let Some(sibling) = self.cursor.next_sibling() {
+    pub fn goto_first_child(&mut self) -> bool {
+        self.goto_first_child_impl(false)
+    }
+
+    pub fn goto_first_named_child(&mut self) -> bool {
+        self.goto_first_child_impl(true)
+    }
+
+    fn goto_next_sibling_impl(&mut self, named: bool) -> bool {
+        let sibling = if named {
+            self.cursor.next_named_sibling()
+        } else {
+            self.cursor.next_sibling()
+        };
+
+        if let Some(sibling) = sibling {
             self.cursor = sibling;
             true
         } else {
@@ -130,8 +165,22 @@ impl<'a> TreeCursor<'a> {
         }
     }
 
-    pub fn goto_prev_sibling(&mut self) -> bool {
-        if let Some(sibling) = self.cursor.prev_sibling() {
+    pub fn goto_next_sibling(&mut self) -> bool {
+        self.goto_next_sibling_impl(false)
+    }
+
+    pub fn goto_next_named_sibling(&mut self) -> bool {
+        self.goto_next_sibling_impl(true)
+    }
+
+    fn goto_prev_sibling_impl(&mut self, named: bool) -> bool {
+        let sibling = if named {
+            self.cursor.prev_named_sibling()
+        } else {
+            self.cursor.prev_sibling()
+        };
+
+        if let Some(sibling) = sibling {
             self.cursor = sibling;
             true
         } else {
@@ -139,6 +188,14 @@ impl<'a> TreeCursor<'a> {
         }
     }
 
+    pub fn goto_prev_sibling(&mut self) -> bool {
+        self.goto_prev_sibling_impl(false)
+    }
+
+    pub fn goto_prev_named_sibling(&mut self) -> bool {
+        self.goto_prev_sibling_impl(true)
+    }
+
     /// 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
@@ -157,4 +214,51 @@ impl<'a> TreeCursor<'a> {
         let root = self.layers[self.current].tree().root_node();
         self.cursor = root.descendant_for_byte_range(start, end).unwrap_or(root);
     }
+
+    /// Returns an iterator over the children of the node the TreeCursor is on
+    /// at the time this is called.
+    pub fn children(&'a mut self) -> ChildIter {
+        let parent = self.node();
+
+        ChildIter {
+            cursor: self,
+            parent,
+            named: false,
+        }
+    }
+
+    /// Returns an iterator over the named children of the node the TreeCursor is on
+    /// at the time this is called.
+    pub fn named_children(&'a mut self) -> ChildIter {
+        let parent = self.node();
+
+        ChildIter {
+            cursor: self,
+            parent,
+            named: true,
+        }
+    }
+}
+
+pub struct ChildIter<'n> {
+    cursor: &'n mut TreeCursor<'n>,
+    parent: Node<'n>,
+    named: bool,
+}
+
+impl<'n> Iterator for ChildIter<'n> {
+    type Item = Node<'n>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        // first iteration, just visit the first child
+        if self.cursor.node() == self.parent {
+            self.cursor
+                .goto_first_child_impl(self.named)
+                .then(|| self.cursor.node())
+        } else {
+            self.cursor
+                .goto_next_sibling_impl(self.named)
+                .then(|| self.cursor.node())
+        }
+    }
 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 9b203092c..6cda93dcb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -38,7 +38,7 @@ use helix_core::{
     textobject,
     unicode::width::UnicodeWidthChar,
     visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
-    RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
+    RopeReader, RopeSlice, Selection, SmallVec, Syntax, Tendril, Transaction,
 };
 use helix_view::{
     document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
@@ -4976,17 +4976,23 @@ pub fn extend_parent_node_start(cx: &mut Context) {
     move_node_bound_impl(cx, Direction::Backward, Movement::Extend)
 }
 
+fn select_all_impl<F>(editor: &mut Editor, select_fn: F)
+where
+    F: Fn(&Syntax, RopeSlice, Selection) -> Selection,
+{
+    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 = select_fn(syntax, text, current_selection.clone());
+        doc.set_selection(view.id, selection);
+    }
+}
+
 fn select_all_siblings(cx: &mut Context) {
     let motion = |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_all_siblings(syntax.tree(), text, current_selection.clone());
-            doc.set_selection(view.id, selection);
-        }
+        select_all_impl(editor, object::select_all_siblings);
     };
 
     cx.editor.apply_motion(motion);
@@ -4994,19 +5000,10 @@ fn select_all_siblings(cx: &mut Context) {
 
 fn select_all_children(cx: &mut Context) {
     let motion = |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_all_children(syntax.tree(), text, current_selection.clone());
-            doc.set_selection(view.id, selection);
-        }
+        select_all_impl(editor, object::select_all_children);
     };
 
-    motion(cx.editor);
-    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+    cx.editor.apply_motion(motion);
 }
 
 fn match_brackets(cx: &mut Context) {
@@ -6040,7 +6037,10 @@ fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
     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 {
+        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;
         };
@@ -6053,7 +6053,10 @@ fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
         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 {
+            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() {
@@ -6073,8 +6076,8 @@ fn jump_to_label(cx: &mut Context, labels: Vec<Range>, behaviour: Movement) {
                             to
                         }
                     };
-                     Range::new(anchor, range.head)
-                }else{
+                    Range::new(anchor, range.head)
+                } else {
                     range.with_direction(Direction::Forward)
                 };
                 doc_mut!(cx.editor, &doc).set_selection(view, range.into());
diff --git a/helix-term/tests/test/commands/movement.rs b/helix-term/tests/test/commands/movement.rs
index 84806d5f8..1f33b3944 100644
--- a/helix-term/tests/test/commands/movement.rs
+++ b/helix-term/tests/test/commands/movement.rs
@@ -607,16 +607,16 @@ async fn select_all_children() -> anyhow::Result<()> {
     let tests = vec![
         // basic tests
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let foo = bar#[(a, b, c)|]#;
-            "##}),
+            "##},
             "<A-I>",
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let foo = bar(#[a|]#, #(b|)#, #(c|)#);
-            "##}),
+            "##},
         ),
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = #[[
                     1,
                     2,
@@ -624,9 +624,9 @@ async fn select_all_children() -> anyhow::Result<()> {
                     4,
                     5,
                 ]|]#;
-            "##}),
+            "##},
             "<A-I>",
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = [
                     #[1|]#,
                     #(2|)#,
@@ -634,11 +634,11 @@ async fn select_all_children() -> anyhow::Result<()> {
                     #(4|)#,
                     #(5|)#,
                 ];
-            "##}),
+            "##},
         ),
         // direction is preserved
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = #[|[
                     1,
                     2,
@@ -646,9 +646,9 @@ async fn select_all_children() -> anyhow::Result<()> {
                     4,
                     5,
                 ]]#;
-            "##}),
+            "##},
             "<A-I>",
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = [
                     #[|1]#,
                     #(|2)#,
@@ -656,11 +656,11 @@ async fn select_all_children() -> anyhow::Result<()> {
                     #(|4)#,
                     #(|5)#,
                 ];
-            "##}),
+            "##},
         ),
         // can't pick any more children - selection stays the same
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = [
                     #[1|]#,
                     #(2|)#,
@@ -668,9 +668,9 @@ async fn select_all_children() -> anyhow::Result<()> {
                     #(4|)#,
                     #(5|)#,
                 ];
-            "##}),
+            "##},
             "<A-I>",
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = [
                     #[1|]#,
                     #(2|)#,
@@ -678,11 +678,11 @@ async fn select_all_children() -> anyhow::Result<()> {
                     #(4|)#,
                     #(5|)#,
                 ];
-            "##}),
+            "##},
         ),
         // each cursor does the sibling select independently
         (
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = #[|[
                     1,
                     2,
@@ -698,9 +698,9 @@ async fn select_all_children() -> anyhow::Result<()> {
                     "four",
                     "five",
                 ]|)#;
-            "##}),
+            "##},
             "<A-I>",
-            helpers::platform_line(indoc! {r##"
+            indoc! {r##"
                 let a = [
                     #[|1]#,
                     #(|2)#,
@@ -716,7 +716,7 @@ async fn select_all_children() -> anyhow::Result<()> {
                     #("four"|)#,
                     #("five"|)#,
                 ];
-            "##}),
+            "##},
         ),
     ];
 

From b8ddb2f114a06a1b10eb72984352ca5b72a5dc85 Mon Sep 17 00:00:00 2001
From: Valentin B <703631+beeb@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:42:51 +0200
Subject: [PATCH 957/967] feat(solidity): add textobject queries for solidity
 (#10318)

* feat: add textobject queries for solidity

* feat(solidity): add parameter textobject query for call expressions

* feat(solidity): add more textobject queries for parameters

* feat(solidity): add yul function textobject query

* feat(solidity): add textobject query for emit statement arguments

* feat(solidity): add textobject query for revert call arguments

* feat(solidity): update tree-sitter grammar and fix typo

* docs: update auto-generated docs

* fix(solidity): fix identifiers highlight query priority

* feat(solidity): add "abstract" to keywords list

* feat(solidity): add highlight query for type alias

* feat(solidity): add variable builtin highlight queries
---
 book/src/generated/lang-support.md       |  2 +-
 languages.toml                           |  2 +-
 runtime/queries/solidity/highlights.scm  | 18 +++++---
 runtime/queries/solidity/textobjects.scm | 54 ++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 runtime/queries/solidity/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 4cd67bc5c..fb1c7bd5a 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -173,7 +173,7 @@
 | smali | ✓ |  | ✓ |  |
 | smithy | ✓ |  |  | `cs` |
 | sml | ✓ |  |  |  |
-| solidity | ✓ |  |  | `solc` |
+| solidity | ✓ | ✓ |  | `solc` |
 | spicedb | ✓ |  |  |  |
 | sql | ✓ |  |  |  |
 | sshclientconfig | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index b700c3265..0f70a7330 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1787,7 +1787,7 @@ language-servers = [ "solc" ]
 
 [[grammar]]
 name = "solidity"
-source = { git = "https://github.com/JoranHonig/tree-sitter-solidity", rev = "9004b86531cb424bd379424cf7266a4585f2af7d" }
+source = { git = "https://github.com/JoranHonig/tree-sitter-solidity", rev = "08338dcee32603383fcef08f36321900bb7a354b" }
 
 [[language]]
 name = "gleam"
diff --git a/runtime/queries/solidity/highlights.scm b/runtime/queries/solidity/highlights.scm
index 08178c362..ca08d0159 100644
--- a/runtime/queries/solidity/highlights.scm
+++ b/runtime/queries/solidity/highlights.scm
@@ -1,8 +1,3 @@
-; identifiers
-; -----------
-(identifier) @variable
-(yul_identifier) @variable
-
 ; Pragma
 (pragma_directive) @tag
 (solidity_version_comparison_operator _ @tag)
@@ -36,6 +31,7 @@
 (type_name) @type
 (primitive_type) @type
 (user_defined_type (identifier) @type)
+(type_alias (identifier) @type)
 
 ; Color payable in payable address conversion as type and not as keyword
 (payable_conversion_expression "payable" @type)
@@ -80,7 +76,7 @@
 
 ; Function parameters
 (call_struct_argument name: (identifier) @field)
-(event_paramater name: (identifier) @variable.parameter)
+(event_parameter name: (identifier) @variable.parameter)
 (parameter name: (identifier) @variable.parameter)
 
 ; Yul functions
@@ -99,6 +95,7 @@
 ; Keywords
 (meta_type_expression "type" @keyword)
 [
+ "abstract"
  "pragma"
  "contract"
  "interface"
@@ -159,7 +156,7 @@
 "import" @keyword.control.import
 (import_directive "as" @keyword.control.import)
 (import_directive "from" @keyword.control.import)
-(event_paramater "indexed" @keyword) ; TODO fix spelling once fixed upstream
+(event_parameter "indexed" @keyword)
 
 ; Punctuation
 
@@ -217,3 +214,10 @@
   "delete"
   "new"
 ] @keyword.operator
+
+; identifiers
+; -----------
+((identifier) @variable.builtin
+ (#match? @variable.builtin "^(this|msg|block|tx)$"))
+(identifier) @variable
+(yul_identifier) @variable
diff --git a/runtime/queries/solidity/textobjects.scm b/runtime/queries/solidity/textobjects.scm
new file mode 100644
index 000000000..4e5ffdd12
--- /dev/null
+++ b/runtime/queries/solidity/textobjects.scm
@@ -0,0 +1,54 @@
+(function_definition
+  body: (_) @function.inside) @function.around
+
+(constructor_definition
+  body: (_) @function.inside) @function.around
+
+(fallback_receive_definition
+  body: (_) @function.inside) @function.around
+
+(yul_function_definition
+  (yul_block) @function.inside) @function.around
+
+(function_definition 
+  ((parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(constructor_definition 
+  ((parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(return_type_definition 
+  ((parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(modifier_definition 
+  ((parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(event_definition 
+  ((event_parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(error_declaration 
+  ((error_parameter) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(call_argument
+  ((call_struct_argument) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(call_expression
+  ((call_argument) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(variable_declaration_tuple
+  ((variable_declaration) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(emit_statement
+  ((call_argument) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(revert_arguments
+  ((call_argument) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(struct_declaration
+  body: (_) @class.inside) @class.around
+
+(enum_declaration
+  body: (_) @class.inside) @class.around
+
+(comment) @comment.inside
+
+(comment)+ @comment.around

From c5e257b81cd0fbb700beeabba9c217a63f62a756 Mon Sep 17 00:00:00 2001
From: VKondakoff <vkondakoff@gmail.com>
Date: Tue, 9 Apr 2024 17:43:21 +0300
Subject: [PATCH 958/967] Update nord.toml (#10307)

When "nord2" color is used in ui.selection it is almost invisible
if cursorline highlighting is enabled. Changing the color to "nord3" fixes the issue.
---
 runtime/themes/nord.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 4916c3e84..b70f67a13 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -114,7 +114,7 @@
 "ui.cursorcolumn.primary" = { bg = "nord1" }
 "ui.cursorline.primary" = { bg = "nord1" }
 
-"ui.selection" = { bg = "nord2" }
+"ui.selection" = { bg = "nord3" }
 "ui.highlight" = { fg = "nord8", bg = "nord2" }
 
 # Statusline

From f601b7c27872c1de7b3f86908337642bc122a234 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 9 Apr 2024 18:49:30 +0200
Subject: [PATCH 959/967] fix char/byte index mixup in overlay rendering
 (#10317)

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

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index dc767e22e..2aac3d335 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -350,7 +350,8 @@ impl EditorView {
         let text = doc.text().slice(..);
         let row = text.char_to_line(anchor.min(text.len_chars()));
 
-        let range = Self::viewport_byte_range(text, row, height);
+        let mut range = Self::viewport_byte_range(text, row, height);
+        range = text.byte_to_char(range.start)..text.byte_to_char(range.end);
 
         text_annotations.collect_overlay_highlights(range)
     }

From b974716b92baf645a70029551c42c88807174e51 Mon Sep 17 00:00:00 2001
From: blt-r <63462729+blt-r@users.noreply.github.com>
Date: Tue, 9 Apr 2024 22:17:52 +0400
Subject: [PATCH 960/967] Hightlight meson.options as meson file (#10323)

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

diff --git a/languages.toml b/languages.toml
index 0f70a7330..6e0ad97bd 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2060,7 +2060,7 @@ source = { git = "https://github.com/ap29600/tree-sitter-odin", rev = "b219207e4
 name = "meson"
 scope = "source.meson"
 injection-regex = "meson"
-file-types = [{ glob = "meson.build" }, { glob = "meson_options.txt" }]
+file-types = [{ glob = "meson.build" }, { glob = "meson.options" }, { glob = "meson_options.txt" }]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 

From 73d26d0d97bfc684266b5c8180d00783d6d84eba Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 10 Apr 2024 17:14:08 +0200
Subject: [PATCH 961/967] don't manually grapheme align ts highlights (#10310)

---
 helix-core/src/graphemes.rs   | 17 ----------
 helix-stdx/src/rope.rs        | 62 +++++++++++++++++++++++++++++++++++
 helix-term/src/ui/document.rs | 23 ++++++++++++-
 helix-term/src/ui/editor.rs   | 22 +++----------
 4 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/helix-core/src/graphemes.rs b/helix-core/src/graphemes.rs
index 7cb5cd062..a02d6e4dd 100644
--- a/helix-core/src/graphemes.rs
+++ b/helix-core/src/graphemes.rs
@@ -278,23 +278,6 @@ pub fn ensure_grapheme_boundary_prev(slice: RopeSlice, char_idx: usize) -> usize
     }
 }
 
-/// Returns the passed byte index if it's already a grapheme boundary,
-/// or the next grapheme boundary byte index if not.
-#[must_use]
-#[inline]
-pub fn ensure_grapheme_boundary_next_byte(slice: RopeSlice, byte_idx: usize) -> usize {
-    if byte_idx == 0 {
-        byte_idx
-    } else {
-        // TODO: optimize so we're not constructing grapheme cursor twice
-        if is_grapheme_boundary_byte(slice, byte_idx) {
-            byte_idx
-        } else {
-            next_grapheme_boundary_byte(slice, byte_idx)
-        }
-    }
-}
-
 /// Returns whether the given char position is a grapheme boundary.
 #[must_use]
 pub fn is_grapheme_boundary(slice: RopeSlice, char_idx: usize) -> bool {
diff --git a/helix-stdx/src/rope.rs b/helix-stdx/src/rope.rs
index 7e2549f5a..2695555e3 100644
--- a/helix-stdx/src/rope.rs
+++ b/helix-stdx/src/rope.rs
@@ -3,6 +3,7 @@ use std::ops::{Bound, RangeBounds};
 pub use regex_cursor::engines::meta::{Builder as RegexBuilder, Regex};
 pub use regex_cursor::regex_automata::util::syntax::Config;
 use regex_cursor::{Input as RegexInput, RopeyCursor};
+use ropey::str_utils::byte_to_char_idx;
 use ropey::RopeSlice;
 
 pub trait RopeSliceExt<'a>: Sized {
@@ -16,6 +17,23 @@ pub trait RopeSliceExt<'a>: Sized {
     fn regex_input_at<R: RangeBounds<usize>>(self, char_range: R) -> RegexInput<RopeyCursor<'a>>;
     fn first_non_whitespace_char(self) -> Option<usize>;
     fn last_non_whitespace_char(self) -> Option<usize>;
+    /// returns the char idx of `byte_idx`, if `byte_idx` is a char boundary
+    /// this function behaves the same as `byte_to_char` but if `byte_idx` is
+    /// not a valid char boundary (so within a char) this will return the next
+    /// char index.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use ropey::RopeSlice;
+    /// # use helix_stdx::rope::RopeSliceExt;
+    /// let text = RopeSlice::from("😆");
+    /// for i in 1..text.len_bytes() {
+    ///     assert_eq!(text.byte_to_char(i), 0);
+    ///     assert_eq!(text.byte_to_next_char(i), 1);
+    /// }
+    /// ```
+    fn byte_to_next_char(self, byte_idx: usize) -> usize;
 }
 
 impl<'a> RopeSliceExt<'a> for RopeSlice<'a> {
@@ -75,4 +93,48 @@ impl<'a> RopeSliceExt<'a> for RopeSlice<'a> {
             .position(|ch| !ch.is_whitespace())
             .map(|pos| self.len_chars() - pos - 1)
     }
+
+    /// returns the char idx of `byte_idx`, if `byte_idx` is
+    /// a char boundary this function behaves the same as `byte_to_char`
+    fn byte_to_next_char(self, mut byte_idx: usize) -> usize {
+        let (chunk, chunk_byte_off, chunk_char_off, _) = self.chunk_at_byte(byte_idx);
+        byte_idx -= chunk_byte_off;
+        let is_char_boundary =
+            is_utf8_char_boundary(chunk.as_bytes().get(byte_idx).copied().unwrap_or(0));
+        chunk_char_off + byte_to_char_idx(chunk, byte_idx) + !is_char_boundary as usize
+    }
+}
+
+// copied from std
+#[inline]
+const fn is_utf8_char_boundary(b: u8) -> bool {
+    // This is bit magic equivalent to: b < 128 || b >= 192
+    (b as i8) >= -0x40
+}
+
+#[cfg(test)]
+mod tests {
+    use ropey::RopeSlice;
+
+    use crate::rope::RopeSliceExt;
+
+    #[test]
+    fn next_char_at_byte() {
+        for i in 0..=6 {
+            assert_eq!(RopeSlice::from("foobar").byte_to_next_char(i), i);
+        }
+        for char_idx in 0..10 {
+            let len = "😆".len();
+            assert_eq!(
+                RopeSlice::from("😆😆😆😆😆😆😆😆😆😆").byte_to_next_char(char_idx * len),
+                char_idx
+            );
+            for i in 1..=len {
+                assert_eq!(
+                    RopeSlice::from("😆😆😆😆😆😆😆😆😆😆").byte_to_next_char(char_idx * len + i),
+                    char_idx + 1
+                );
+            }
+        }
+    }
 }
diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index b571b83c2..bcbaa3519 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -7,6 +7,7 @@ use helix_core::syntax::Highlight;
 use helix_core::syntax::HighlightEvent;
 use helix_core::text_annotations::TextAnnotations;
 use helix_core::{visual_offset_from_block, Position, RopeSlice};
+use helix_stdx::rope::RopeSliceExt;
 use helix_view::editor::{WhitespaceConfig, WhitespaceRenderValue};
 use helix_view::graphics::Rect;
 use helix_view::theme::Style;
@@ -32,14 +33,27 @@ impl<F: FnMut(&mut TextRenderer, LinePos)> LineDecoration for F {
     }
 }
 
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+enum StyleIterKind {
+    /// base highlights (usually emitted by TS), byte indices (potentially not codepoint aligned)
+    BaseHighlights,
+    /// overlay highlights (emitted by custom code from selections), char indices
+    Overlay,
+}
+
 /// A wrapper around a HighlightIterator
 /// that merges the layered highlights to create the final text style
 /// and yields the active text style and the char_idx where the active
 /// style will have to be recomputed.
+///
+/// TODO(ropey2): hopefully one day helix and ropey will operate entirely
+/// on byte ranges and we can remove this
 struct StyleIter<'a, H: Iterator<Item = HighlightEvent>> {
     text_style: Style,
     active_highlights: Vec<Highlight>,
     highlight_iter: H,
+    kind: StyleIterKind,
+    text: RopeSlice<'a>,
     theme: &'a Theme,
 }
 
@@ -54,7 +68,7 @@ impl<H: Iterator<Item = HighlightEvent>> Iterator for StyleIter<'_, H> {
                 HighlightEvent::HighlightEnd => {
                     self.active_highlights.pop();
                 }
-                HighlightEvent::Source { start, end } => {
+                HighlightEvent::Source { start, mut end } => {
                     if start == end {
                         continue;
                     }
@@ -64,6 +78,9 @@ impl<H: Iterator<Item = HighlightEvent>> Iterator for StyleIter<'_, H> {
                         .fold(self.text_style, |acc, span| {
                             acc.patch(self.theme.highlight(span.0))
                         });
+                    if self.kind == StyleIterKind::BaseHighlights {
+                        end = self.text.byte_to_next_char(end);
+                    }
                     return Some((style, end));
                 }
             }
@@ -185,13 +202,17 @@ pub fn render_text<'t>(
         text_style: renderer.text_style,
         active_highlights: Vec::with_capacity(64),
         highlight_iter: syntax_highlight_iter,
+        kind: StyleIterKind::BaseHighlights,
         theme,
+        text,
     };
     let mut overlay_styles = StyleIter {
         text_style: Style::default(),
         active_highlights: Vec::with_capacity(64),
         highlight_iter: overlay_highlight_iter,
+        kind: StyleIterKind::Overlay,
         theme,
+        text,
     };
 
     let mut last_line_pos = LinePos {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 2aac3d335..7b130a38a 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -12,9 +12,7 @@ use crate::{
 
 use helix_core::{
     diagnostic::NumberOrString,
-    graphemes::{
-        ensure_grapheme_boundary_next_byte, next_grapheme_boundary, prev_grapheme_boundary,
-    },
+    graphemes::{next_grapheme_boundary, prev_grapheme_boundary},
     movement::Direction,
     syntax::{self, HighlightEvent},
     text_annotations::TextAnnotations,
@@ -315,26 +313,14 @@ impl EditorView {
                 let iter = syntax
                     // TODO: range doesn't actually restrict source, just highlight range
                     .highlight_iter(text.slice(..), Some(range), None)
-                    .map(|event| event.unwrap())
-                    .map(move |event| match event {
-                        // TODO: use byte slices directly
-                        // convert byte offsets to char offset
-                        HighlightEvent::Source { start, end } => {
-                            let start =
-                                text.byte_to_char(ensure_grapheme_boundary_next_byte(text, start));
-                            let end =
-                                text.byte_to_char(ensure_grapheme_boundary_next_byte(text, end));
-                            HighlightEvent::Source { start, end }
-                        }
-                        event => event,
-                    });
+                    .map(|event| event.unwrap());
 
                 Box::new(iter)
             }
             None => Box::new(
                 [HighlightEvent::Source {
-                    start: text.byte_to_char(range.start),
-                    end: text.byte_to_char(range.end),
+                    start: range.start,
+                    end: range.end,
                 }]
                 .into_iter(),
             ),

From 34c7eb4bd4d7602e6291a79d860ff9bae97bddd6 Mon Sep 17 00:00:00 2001
From: Josh Robson Chase <josh@robsonchase.com>
Date: Wed, 10 Apr 2024 08:36:37 -0700
Subject: [PATCH 962/967] themes/monokai: add inlay-hint style (#10334)

Matching comment styling so that it doesn't get confused for actual
code.
---
 runtime/themes/monokai.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index a849ae96d..b0faac154 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -83,6 +83,7 @@
 "ui.bufferline.active" = { fg = "active_text", bg = "selection", modifiers = [
   "bold",
 ] }
+"ui.virtual.inlay-hint" = { fg = "#88846F" }
 
 "ui.text" = { fg = "text" }
 "ui.text.focus" = { fg = "active_text" }

From 4fc0a4dafc3a94cd9afcc61dcd0df0f4eb93502e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 11 Apr 2024 16:16:47 +0900
Subject: [PATCH 963/967] Improve solidity highlighting

---
 runtime/queries/solidity/highlights.scm | 36 ++++++++++++++++++-------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/runtime/queries/solidity/highlights.scm b/runtime/queries/solidity/highlights.scm
index ca08d0159..fcc8d3e31 100644
--- a/runtime/queries/solidity/highlights.scm
+++ b/runtime/queries/solidity/highlights.scm
@@ -1,6 +1,6 @@
 ; Pragma
-(pragma_directive) @tag
-(solidity_version_comparison_operator _ @tag)
+(pragma_directive) @keyword.directive
+(solidity_version_comparison_operator _ @keyword.directive)
 
 
 ; Literals
@@ -20,7 +20,7 @@
 [
  (true)
  (false)
-] @constant.builtin
+] @constant.builtin.boolean
 
 (comment) @comment
 
@@ -29,7 +29,12 @@
 ; -----------
 
 (type_name) @type
-(primitive_type) @type
+
+[
+  (primitive_type)
+  (number_unit)
+] @type.builtin
+
 (user_defined_type (identifier) @type)
 (type_alias (identifier) @type)
 
@@ -61,6 +66,7 @@
 
 ; Use constructor coloring for special functions
 (constructor_definition "constructor" @constructor)
+(error_declaration "error" @constructor)
 (fallback_receive_definition "receive" @constructor)
 (fallback_receive_definition "fallback" @constructor)
 
@@ -96,7 +102,6 @@
 (meta_type_expression "type" @keyword)
 [
  "abstract"
- "pragma"
  "contract"
  "interface"
  "library"
@@ -104,9 +109,9 @@
  "struct"
  "enum"
  "event"
- "using"
  "assembly"
  "emit"
+
  "public"
  "internal"
  "private"
@@ -114,17 +119,22 @@
  "pure"
  "view"
  "payable"
+
  "modifier"
- "memory"
- "storage"
- "calldata"
  "var"
- "constant"
+ "let"
  (virtual)
  (override_specifier)
  (yul_leave)
 ] @keyword
 
+[
+ "memory"
+ "storage"
+ "calldata"
+ "constant"
+] @keyword.storage.modifier
+
 [
  "for"
  "while"
@@ -144,6 +154,7 @@
 [
  "try"
  "catch"
+ "revert"
 ] @keyword.control.exception
 
 [
@@ -154,6 +165,7 @@
 "function" @keyword.function
 
 "import" @keyword.control.import
+"using" @keyword.control.import
 (import_directive "as" @keyword.control.import)
 (import_directive "from" @keyword.control.import)
 (event_parameter "indexed" @keyword)
@@ -173,6 +185,9 @@
 [
   "."
   ","
+  ":"
+  "->"
+  "=>"
 ] @punctuation.delimiter
 
 
@@ -215,6 +230,7 @@
   "new"
 ] @keyword.operator
 
+; TODO: move to top when order swapped
 ; identifiers
 ; -----------
 ((identifier) @variable.builtin

From 009a5498ca14dfc083b3ff0ceec9231f3c917a98 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Thu, 11 Apr 2024 17:17:44 +0200
Subject: [PATCH 964/967] add LDIF support (#10330)

* feat(lang): add LDIF support

* style: no unnecessary glob

* Update runtime/queries/ldif/highlights.scm

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

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md  |  1 +
 languages.toml                      | 11 +++++++++++
 runtime/queries/ldif/highlights.scm | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 runtime/queries/ldif/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index fb1c7bd5a..24bf3eece 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -105,6 +105,7 @@
 | kotlin | ✓ |  |  | `kotlin-language-server` |
 | latex | ✓ | ✓ |  | `texlab` |
 | ld | ✓ |  | ✓ |  |
+| ldif | ✓ |  |  |  |
 | lean | ✓ |  |  | `lean` |
 | ledger | ✓ |  |  |  |
 | llvm | ✓ | ✓ | ✓ |  |
diff --git a/languages.toml b/languages.toml
index 6e0ad97bd..d73286f8a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3497,3 +3497,14 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "adl"
 source = { git = "https://github.com/adl-lang/tree-sitter-adl", rev = "2787d04beadfbe154d3f2da6e98dc45a1b134bbf" }
+
+[[language]]
+name = "ldif"
+scope = "source.ldif"
+injection-regex = "ldif"
+file-types = ["ldif"]
+comment-token = "#"
+
+[[grammar]]
+name = "ldif"
+source = { git = "https://github.com/kepet19/tree-sitter-ldif", rev = "0a917207f65ba3e3acfa9cda16142ee39c4c1aaa" }
diff --git a/runtime/queries/ldif/highlights.scm b/runtime/queries/ldif/highlights.scm
new file mode 100644
index 000000000..882ace9fc
--- /dev/null
+++ b/runtime/queries/ldif/highlights.scm
@@ -0,0 +1,19 @@
+(comment) @comment
+
+((distinguishedName
+  (name
+    (name_componet
+      (attributeTypeAndValue
+        (attributeType) @comment
+        (string) @type.parameter
+          )))) @comment)
+
+
+(dn_spec) @constant
+(changerecord) @constant
+(mod_spec) @constant
+
+(attributeType) @type.parameter
+(change_modify) @string
+
+(value_spec) @keyword

From c9ae694aff21a4be47adc69c5465241c551e11b5 Mon Sep 17 00:00:00 2001
From: Arthur <110528300+c0rydoras@users.noreply.github.com>
Date: Thu, 11 Apr 2024 17:59:00 +0200
Subject: [PATCH 965/967] fix(languages/helm): recognize _*.tpl as helm
 (#10344)

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

diff --git a/languages.toml b/languages.toml
index d73286f8a..fe94c597e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3418,7 +3418,7 @@ 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" } ]
+file-types = [ { glob = "templates/*.yaml" }, { glob = "templates/_*.tpl"}, { glob = "templates/NOTES.txt" } ]
 
 [[language]]
 name = "glimmer"

From 6d363a978d3f4c1973674305f16305f9b8f90707 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Thu, 11 Apr 2024 21:49:16 -0400
Subject: [PATCH 966/967] Read symlink when writing files (#10339)

Co-authored-by: Pascal Kuthe <pascalkuthe@pm.me>
---
 helix-term/tests/test/commands/write.rs | 75 +++++++++++++++++++++++++
 helix-term/tests/test/helpers.rs        | 12 ++++
 helix-view/src/document.rs              | 14 +++--
 3 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index c9280bbd4..350f34aab 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs
@@ -529,6 +529,81 @@ async fn test_write_all_insert_final_newline_do_not_add_if_unmodified() -> anyho
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_symlink_write() -> anyhow::Result<()> {
+    #[cfg(unix)]
+    use std::os::unix::fs::symlink;
+    #[cfg(not(unix))]
+    use std::os::windows::fs::symlink_file as symlink;
+
+    let dir = tempfile::tempdir()?;
+
+    let mut file = tempfile::NamedTempFile::new_in(&dir)?;
+    let symlink_path = dir.path().join("linked");
+    symlink(file.path(), &symlink_path)?;
+
+    let mut app = helpers::AppBuilder::new()
+        .with_file(&symlink_path, None)
+        .build()?;
+
+    test_key_sequence(
+        &mut app,
+        Some("ithe gostak distims the doshes<ret><esc>:w<ret>"),
+        None,
+        false,
+    )
+    .await?;
+
+    reload_file(&mut file).unwrap();
+    let mut file_content = String::new();
+    file.as_file_mut().read_to_string(&mut file_content)?;
+
+    assert_eq!(
+        LineFeedHandling::Native.apply("the gostak distims the doshes"),
+        file_content
+    );
+    assert!(symlink_path.is_symlink());
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_symlink_write_fail() -> anyhow::Result<()> {
+    #[cfg(unix)]
+    use std::os::unix::fs::symlink;
+    #[cfg(not(unix))]
+    use std::os::windows::fs::symlink_file as symlink;
+
+    let dir = tempfile::tempdir()?;
+
+    let file = helpers::new_readonly_tempfile_in_dir(&dir)?;
+    let symlink_path = dir.path().join("linked");
+    symlink(file.path(), &symlink_path)?;
+
+    let mut app = helpers::AppBuilder::new()
+        .with_file(&symlink_path, None)
+        .build()?;
+
+    test_key_sequence(
+        &mut app,
+        Some("ihello<esc>:wq<ret>"),
+        Some(&|app| {
+            let mut docs: Vec<_> = app.editor.documents().collect();
+            assert_eq!(1, docs.len());
+
+            let doc = docs.pop().unwrap();
+            assert_eq!(Some(&path::normalize(&symlink_path)), doc.path());
+            assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
+        }),
+        false,
+    )
+    .await?;
+
+    assert!(symlink_path.is_symlink());
+
+    Ok(())
+}
+
 async fn edit_file_with_content(file_content: &[u8]) -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
 
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index d7205b0c0..70b3f4022 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -305,6 +305,18 @@ pub fn new_readonly_tempfile() -> anyhow::Result<NamedTempFile> {
     Ok(file)
 }
 
+/// Creates a new temporary file in the directory that is set to read only. Useful for
+/// testing write failures.
+pub fn new_readonly_tempfile_in_dir(
+    dir: impl AsRef<std::path::Path>,
+) -> anyhow::Result<NamedTempFile> {
+    let mut file = tempfile::NamedTempFile::new_in(dir)?;
+    let metadata = file.as_file().metadata()?;
+    let mut perms = metadata.permissions();
+    perms.set_readonly(true);
+    file.as_file_mut().set_permissions(perms)?;
+    Ok(file)
+}
 pub struct AppBuilder {
     args: Args,
     config: Config,
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index f26ba8b97..d44b4240c 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -893,15 +893,18 @@ impl Document {
                     }
                 }
             }
+            let write_path = tokio::fs::read_link(&path)
+                .await
+                .unwrap_or_else(|_| path.clone());
 
-            if readonly(&path) {
+            if readonly(&write_path) {
                 bail!(std::io::Error::new(
                     std::io::ErrorKind::PermissionDenied,
                     "Path is read only"
                 ));
             }
             let backup = if path.exists() {
-                let path_ = path.clone();
+                let path_ = write_path.clone();
                 // hacks: we use tempfile to handle the complex task of creating
                 // non clobbered temporary path for us we don't want
                 // the whole automatically delete path on drop thing
@@ -925,7 +928,7 @@ impl Document {
             };
 
             let write_result: anyhow::Result<_> = async {
-                let mut dst = tokio::fs::File::create(&path).await?;
+                let mut dst = tokio::fs::File::create(&write_path).await?;
                 to_writer(&mut dst, encoding_with_bom_info, &text).await?;
                 Ok(())
             }
@@ -934,14 +937,13 @@ impl Document {
             if let Some(backup) = backup {
                 if write_result.is_err() {
                     // restore backup
-                    let _ = tokio::fs::rename(&backup, &path)
+                    let _ = tokio::fs::rename(&backup, &write_path)
                         .await
                         .map_err(|e| log::error!("Failed to restore backup on write failure: {e}"));
                 } else {
                     // copy metadata and delete backup
-                    let path_ = path.clone();
                     let _ = tokio::task::spawn_blocking(move || {
-                        let _ = copy_metadata(&backup, &path_)
+                        let _ = copy_metadata(&backup, &write_path)
                             .map_err(|e| log::error!("Failed to copy metadata on write: {e}"));
                         let _ = std::fs::remove_file(backup)
                             .map_err(|e| log::error!("Failed to remove backup file on write: {e}"));

From 081f7d0bd8f3b59857be3fa6bcfccdaee31eaf69 Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Fri, 12 Apr 2024 20:32:24 -0400
Subject: [PATCH 967/967] Update tree-sitter-ld and highlights (#10379)

---
 languages.toml                    | 2 +-
 runtime/queries/ld/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index fe94c597e..03af4fc2f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -3360,7 +3360,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "ld"
-source = { git = "https://github.com/mtoohey31/tree-sitter-ld", rev = "81978cde3844bfc199851e39c80a20ec6444d35e" }
+source = { git = "https://github.com/mtoohey31/tree-sitter-ld", rev = "0e9695ae0ede47b8744a8e2ad44d4d40c5d4e4c9" }
 
 [[language]]
 name = "hyprlang"
diff --git a/runtime/queries/ld/highlights.scm b/runtime/queries/ld/highlights.scm
index 4f935e753..e0c9dd1e1 100644
--- a/runtime/queries/ld/highlights.scm
+++ b/runtime/queries/ld/highlights.scm
@@ -4,7 +4,7 @@
   .
   (NAME) @namespace)
 
-(NAME) @variable
+[(NAME) (SYMBOLNAME)] @variable
 
 ; Operators