From 01fce51c45529fad2283716d81d7bb35f6182c73 Mon Sep 17 00:00:00 2001
From: RoloEdits <RoloEdits@gmail.com>
Date: Fri, 28 Mar 2025 06:51:36 -0700
Subject: [PATCH 1/7] fix(keymap): point to proper `MappableCommand` instead of
`Command` (#13214)
---
helix-term/src/keymap/macros.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helix-term/src/keymap/macros.rs b/helix-term/src/keymap/macros.rs
index 15d2aa53..9cddd825 100644
--- a/helix-term/src/keymap/macros.rs
+++ b/helix-term/src/keymap/macros.rs
@@ -90,7 +90,7 @@ macro_rules! keymap {
};
(@trie [$($cmd:ident),* $(,)?]) => {
- $crate::keymap::KeyTrie::Sequence(vec![$($crate::commands::Command::$cmd),*])
+ $crate::keymap::KeyTrie::Sequence(vec![$($crate::commands::MappableCommand::$cmd),*])
};
(
From bb96a535fc13137bb709abf3ff25e9eefe586745 Mon Sep 17 00:00:00 2001
From: Keir Lawson <keirlawson@gmail.com>
Date: Sat, 29 Mar 2025 19:41:43 +0000
Subject: [PATCH 2/7] Add ui.text.directory to spacebones (#13213)
---
runtime/themes/spacebones_light.toml | 1 +
1 file changed, 1 insertion(+)
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index 1d744019..9736ba35 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -64,6 +64,7 @@
"ui.help" = { bg = "bg1", fg = "fg1" }
"ui.text" = { fg = "fg1" }
"ui.text.focus" = { fg = "fg1", modifiers = ["bold"] }
+"ui.text.directory" = { fg = "theme_blue" }
"ui.selection" = { bg = "hl2" }
"ui.selection.primary" = { bg = "hl1" }
"ui.cursor.primary" = { modifiers = ["reversed"] }
From e7354852779f61cbbcc1eb3f6f7b69b590c9ed40 Mon Sep 17 00:00:00 2001
From: Gavin Morrow <gavinfmorrow@gmail.com>
Date: Sat, 29 Mar 2025 15:43:33 -0400
Subject: [PATCH 3/7] Remove bg from tokyonight text (#13216)
---
runtime/themes/tokyonight.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index 08e7ce3a..e95b1178 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -85,7 +85,7 @@ hint = { fg = "hint" }
"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" = { fg = "fg" }
"ui.text.focus" = { bg = "bg-focus" }
"ui.text.inactive" = { fg = "comment", modifiers = ["italic"] }
"ui.text.info" = { bg = "bg-menu", fg = "fg" }
From fb815e2c6f0738eea3491e6a278c27209479bc25 Mon Sep 17 00:00:00 2001
From: Andrea Novellini <andrea.novellini@datadoghq.com>
Date: Sat, 29 Mar 2025 20:44:55 +0100
Subject: [PATCH 4/7] Add peachpuff theme (#13225)
---
runtime/themes/peachpuff.toml | 65 +++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
create mode 100644 runtime/themes/peachpuff.toml
diff --git a/runtime/themes/peachpuff.toml b/runtime/themes/peachpuff.toml
new file mode 100644
index 00000000..c38aee18
--- /dev/null
+++ b/runtime/themes/peachpuff.toml
@@ -0,0 +1,65 @@
+# Author : geonove <andre.novellini@gmail.com>
+# License : Vim License
+
+"ui.menu" = { fg = "light-gray", bg = "gray" }
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.linenr" = "yellow"
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "black" }
+"ui.linenr.selected" = "light-yellow"
+"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
+"ui.text.focus" = { fg = "black", bg = "white" }
+"comment" = "light-green"
+"comment.line" = "light-green"
+"comment.block" = "red"
+"comment.block.documentation" = "red"
+"ui.statusline" = { fg = "black", bg = "light-cyan" }
+"ui.statusline.inactive" = { fg = "gray", bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"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"] }
+"ui.virtual.ruler" = { bg = "black" }
+"variable" = "white"
+"constant.numeric" = "red"
+"constant" = "white"
+"constant.builtin" = "red"
+"attribute" = "yellow"
+"type" = "green"
+"type.builtin" = "cyan"
+"ui.cursor.match" = { fg = "light-gray", modifiers = ["reversed"] }
+"string" = "red"
+"variable.other.member" = "white"
+"constant.character.escape" = "light-cyan"
+#"function.builtin" = "cyan"
+#"function.method" = "cyan"
+#"function.method.private" = "cyan"
+"function" = "cyan"
+"constructor" = "cyan"
+"special" = "light-blue"
+"keyword" = "yellow"
+"keyword.control.import" = "magenta"
+"label" = "white"
+"namespace" = "white"
+
+"markup.heading" = "light-magenta"
+"markup.list" = "light-red"
+"markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "light-red"
+"markup.quote" = "light-cyan"
+"markup.raw" = "light-green"
+
+"diff.plus" = "light-green"
+"diff.delta" = "yellow"
+"diff.minus" = "light-red"
+
+"diagnostic" = { modifiers = ["underlined"] }
+"info" = "light-blue"
+"hint" = "gray"
+"debug" = "gray"
+"warning" = "yellow"
+"error" = "light-red"
From e148d8b3110ace99505c0871714cd64391cc4ba3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 30 Mar 2025 10:35:35 -0400
Subject: [PATCH 5/7] editor: Remove closed Document after updating Views
When closing a document we must wait until all views have been updated
first - either replacing their current document or closing the view -
before we remove the document from the `documents` map. The
`Editor::_refresh` helper is called by `Editor::close`. It accesses each
View's Document to sync changes and ensure that the cursor is in view.
When closing multiple Views at once, `Editor::_refresh` will attempt
to access the closing Document while refreshing a to-be-closed View.
---
helix-view/src/editor.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dfade86b..be221899 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1816,7 +1816,6 @@ impl Editor {
if !force && doc.is_modified() {
return Err(CloseError::BufferModified(doc.display_name().into_owned()));
}
- let doc = self.documents.remove(&doc_id).unwrap();
// This will also disallow any follow-up writes
self.saves.remove(&doc_id);
@@ -1857,6 +1856,8 @@ impl Editor {
}
}
+ let doc = self.documents.remove(&doc_id).unwrap();
+
// If the document we removed was visible in all views, we will have no more views. We don't
// want to close the editor just for a simple buffer close, so we need to create a new view
// containing either an existing document, or a brand new document.
From db187c487092d42d080226d5b57493778aa11588 Mon Sep 17 00:00:00 2001
From: Sri Senthil Balaji J <50240805+SymphonySimper@users.noreply.github.com>
Date: Mon, 31 Mar 2025 19:58:50 +0530
Subject: [PATCH 6/7] feat: add ConsoleOnly to desktop entry categories
(#13236)
---
contrib/Helix.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/Helix.desktop b/contrib/Helix.desktop
index 25d5c3b1..66682871 100644
--- a/contrib/Helix.desktop
+++ b/contrib/Helix.desktop
@@ -86,6 +86,6 @@ Keywords[ru]=текст;текстовый редактор;
Keywords[sr]=Текст;едитор;
Keywords[tr]=Metin;düzenleyici;
Icon=helix
-Categories=Utility;TextEditor;
+Categories=Utility;TextEditor;ConsoleOnly
StartupNotify=false
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
From 7ebf65002940d0ce8d6e59c3ec22c736f7d57d9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 13:55:16 +0900
Subject: [PATCH 7/7] build(deps): bump once_cell in the rust-dependencies
group (#13244)
Bumps the rust-dependencies group with 1 update: [once_cell](https://github.com/matklad/once_cell).
Updates `once_cell` from 1.21.1 to 1.21.3
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matklad/once_cell/compare/v1.21.1...v1.21.3)
---
updated-dependencies:
- dependency-name: once_cell
dependency-version: 1.21.3
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index cabb98a7..3fbb80c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2023,9 +2023,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "open"