From 73c197fe312ddbffad1fef9ebb0f5ee922c0de261926c2d8481d3c2744c87f8e Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 6 Apr 2023 09:38:59 +0000 Subject: [PATCH 1/5] - Update to version 22.03 * Breaking changes: - Select diagnostic range in goto_*_diag commands - Remove jump behavior from increment/decrement - Select change range in goto_*_change commands - Split file modification indicator from filename statusline elements - Jump to symbol ranges in LSP goto commands - Workspace detection now stops at the first .helix/ directory (merging multiple .helix/languages.toml configurations is no longer supported) * Features: - Dynamic workspace symbol picker - Soft-wrap - Initial support for LSP snippet completions - Add a statusline element for showing the current version control HEAD - Display LSP type hints - Enable the Kitty keyboard protocol on terminals with support - Add a statusline element for the basename of the current file - Add substring matching syntax for the picker - Support LSP textDocument/prepareRename - Allow multiple runtime directories with priorities - Allow configuring whether to insert or replace completions - Allow per-workspace config file .helix/config.toml - Add workspace-lsp-roots config option to support multiple LSP roots for use with monorepos * Commands: - :pipe-to which pipes selections into a shell command and ignores output - merge_consecutive_selections (A-_) combines all consecutive selections - rotate_view_reverse which focuses the previous view - goto_declaration (gD, requires LSP) which jumps to a symbol's declaration - file_picker_in_current_buffer_directory - :character-info which shows information about the character under the cursor - :toggle-option for toggling config options at runtime OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=55 --- _service | 2 +- cargo_config | 5 +++ helix-22.12.tar.xz | 3 -- helix-23.03.tar.xz | 3 ++ helix-runtime-path.patch | 16 -------- helix.changes | 88 ++++++++++++++++++++++++++++++++++++++++ helix.spec | 7 ++-- vendor.tar.xz | 4 +- 8 files changed, 102 insertions(+), 26 deletions(-) delete mode 100644 helix-22.12.tar.xz create mode 100644 helix-23.03.tar.xz delete mode 100644 helix-runtime-path.patch diff --git a/_service b/_service index 7a74113..9d4c3bc 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - helix-22.12.tar.xz + helix-23.03.tar.xz xz true diff --git a/cargo_config b/cargo_config index 6fb4ff4..f799a70 100644 --- a/cargo_config +++ b/cargo_config @@ -1,5 +1,10 @@ [source.crates-io] replace-with = "vendored-sources" +[source."git+https://github.com/tree-sitter/tree-sitter?rev=c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14"] +git = "https://github.com/tree-sitter/tree-sitter" +rev = "c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14" +replace-with = "vendored-sources" + [source.vendored-sources] directory = "vendor" \ No newline at end of file diff --git a/helix-22.12.tar.xz b/helix-22.12.tar.xz deleted file mode 100644 index 540c3f3..0000000 --- a/helix-22.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:295b42a369fbc6282693eb984a77fb86260f7baf3ba3a8505d62d1c619c2f3f4 -size 84787532 diff --git a/helix-23.03.tar.xz b/helix-23.03.tar.xz new file mode 100644 index 0000000..395d685 --- /dev/null +++ b/helix-23.03.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60e5d8927f2f43807ff4ed3c96e7071746ce23d0b7ebaa27e380723726710703 +size 113618664 diff --git a/helix-runtime-path.patch b/helix-runtime-path.patch deleted file mode 100644 index 0f1a695..0000000 --- a/helix-runtime-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: helix-22.12/helix-loader/src/lib.rs -=================================================================== ---- helix-22.12.orig/helix-loader/src/lib.rs 2023-03-06 10:51:51.196485557 +0100 -+++ helix-22.12/helix-loader/src/lib.rs 2023-03-06 10:52:38.460917379 +0100 -@@ -41,6 +41,11 @@ pub fn runtime_dir() -> PathBuf { - return conf_dir; - } - -+ let rt_dir = std::path::PathBuf::from("@HELIX_RUNTIME_DIR@").join(RT_DIR); -+ if rt_dir.exists() { -+ return rt_dir; -+ } -+ - // fallback to location of the executable being run - // canonicalize the path in case the executable is symlinked - std::env::current_exe() diff --git a/helix.changes b/helix.changes index 11c291f..a63e1b7 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,91 @@ +------------------------------------------------------------------- +Thu Apr 6 09:21:16 UTC 2023 - Soc Virnyl Estela + +- Update to version 22.03 + * Breaking changes: + - Select diagnostic range in goto_*_diag commands + - Remove jump behavior from increment/decrement + - Select change range in goto_*_change commands + - Split file modification indicator from filename statusline elements + - Jump to symbol ranges in LSP goto commands + - Workspace detection now stops at the first .helix/ directory (merging multiple .helix/languages.toml configurations is no longer supported) + * Features: + - Dynamic workspace symbol picker + - Soft-wrap + - Initial support for LSP snippet completions + - Add a statusline element for showing the current version control HEAD + - Display LSP type hints + - Enable the Kitty keyboard protocol on terminals with support + - Add a statusline element for the basename of the current file + - Add substring matching syntax for the picker + - Support LSP textDocument/prepareRename + - Allow multiple runtime directories with priorities + - Allow configuring whether to insert or replace completions + - Allow per-workspace config file .helix/config.toml + - Add workspace-lsp-roots config option to support multiple LSP roots for use with monorepos + * Commands: + - :pipe-to which pipes selections into a shell command and ignores output + - merge_consecutive_selections (A-_) combines all consecutive selections + - rotate_view_reverse which focuses the previous view + - goto_declaration (gD, requires LSP) which jumps to a symbol's declaration + - file_picker_in_current_buffer_directory + - :character-info which shows information about the character under the cursor + - :toggle-option for toggling config options at runtime + - dap_restart for restarting a debug session in DAP + - :lsp-stop to stop the language server of the current buffer + - :reset-diff-change for resetting a diff hunk to its original text + - :config-open-workspace for opening the config file local to the current workspace + * Fixes: + - Fix behavior of auto-completion flag for completion-on-trigger + - Reset editor mode when changing buffers + - Respect scrolloff settings in mouse movements + - Avoid trailing s when only one file is opened + - Fix erroneous indent between closers of auto-pairs + - Expand ~ when parsing file paths in :open + - Fix theme inheritance for default themes + - Fix extend_line with a count when the current line(s) are selected + - Prompt: Fix autocompletion for paths containing periods + - Skip serializing JSONRPC params if params is null + - Fix interaction with the xclip clipboard provider + - Fix undo/redo execution from the command palette + - Fix highlighting of non-block cursors + - Fix panic when nooping in join_selections and join_selections_space + - Fix selecting a changed file in global search + - Fix initial syntax highlight layer sort order + - Fix UTF-8 length handling for shellwords + - Remove C-j and C-k bindings from the completion menu + - Always commit to history when pasting + - Properly handle LSP position encoding + - Fix infinite loop in copy_selection_on_prev_line + - Fix completion popup positioning + - Fix a panic when uncommenting a line with only a comment token + - Fix panic in goto_window_center at EOF + - Ignore invalid file URIs sent by a language server + - Decode LSP URIs for the workspace diagnostics picker + - Fix incorrect usages of tab_width with indent_width + - DAP: Send Disconnect if the Terminated event is received + - DAP: Validate key and index exist when requesting variables + - Check LSP renaming support before prompting for rename text + - Fix indent guide rendering + - Fix division by zero panic + - Fix lacking space panic + - Send error replies for malformed and unhandled LSP requests + - Fix table column calculations for dynamic pickers + - Skip adding jumplist entries for : line number previews + - Fix completion race conditions + - Fix shrink_selection with multiple cursors + - Fix indentation calculation for lines with mixed tabs/spaces + - No-op client/registerCapability LSP requests + - Send the STOP signal to all processes in the process group + - Fix workspace edit client capabilities declaration (7bf168d) + - Fix highlighting in picker results with multiple columns + - Canonicalize paths before stripping the current dir as a prefix + - Fix truncation behavior for long path names in the file picker + - Fix theme reloading behavior in :config-reload (ab819d8) + * More information at https://github.com/helix-editor/helix/blob/master/CHANGELOG.md#2303-2023-03-31 +- Remove helix-runtime-paths.patch +- Fix SPDX license names + ------------------------------------------------------------------- Wed Mar 8 14:44:35 UTC 2023 - Andreas Schneider diff --git a/helix.spec b/helix.spec index a1fb621..cb979b0 100644 --- a/helix.spec +++ b/helix.spec @@ -23,18 +23,17 @@ %global _helix_runtimedir %{_libdir}/%{name}/runtime Name: helix -Version: 22.12 +Version: 23.03 Release: 0 Summary: A post-modern modal text editor written in Rust -License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT or Unlicense) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSL-1.0 AND ISC AND MIT AND MPL-2.0+ AND Zlib AND MPL-2.0 +License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT or Unlicense) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSL-1.0 AND ISC AND MIT AND MPL-2.0 AND Zlib AND MPL-2.0 URL: https://github.com/helix-editor/helix # This tarball includes fetched grammars -Source0: %{url}/releases/download/%{version}/%{name}-%{version}-source.tar.xz#/%{name}-%{version}.tar.xz +Source0: https://github.com/helix-editor/helix/releases/download/%{version}/%{name}-%{version}-source.tar.xz#/%{name}-%{version}.tar.xz Source1: vendor.tar.xz Source2: cargo_config Source3: README-suse-maint.md Source4: helix-rpmlintrc -Patch0: helix-runtime-path.patch BuildRequires: c++_compiler BuildRequires: c_compiler BuildRequires: cargo-packaging diff --git a/vendor.tar.xz b/vendor.tar.xz index 7c413fb..3bac225 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a53e4f09aa52cc848caa203cdcbbabfd3697c2b244999e18823cf08a4111c5f -size 29664656 +oid sha256:b3becdf4493cf4d822c39fcefa0431969d605c6a6da75e098978f598d60df120 +size 38327548 From e9ba3d49a03ac4a8056fca5dc34d9a290eaca935854f32679c5259cf469e5e6d Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 6 Apr 2023 12:21:24 +0000 Subject: [PATCH 2/5] - Remove sed command to modify HELIX_RUNTIME OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=56 --- helix.changes | 5 +++++ helix.spec | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/helix.changes b/helix.changes index a63e1b7..c02d368 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 6 12:20:41 UTC 2023 - Soc Virnyl Estela + +- Remove sed command to modify HELIX_RUNTIME + ------------------------------------------------------------------- Thu Apr 6 09:21:16 UTC 2023 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index cb979b0..050beae 100644 --- a/helix.spec +++ b/helix.spec @@ -88,9 +88,6 @@ if there is no runtime present in the users config directory specifically mkdir -p .cargo cp %{SOURCE2} .cargo/config.toml -# Replace RUNTIME dir -sed -e 's#@HELIX_RUNTIME_DIR@#%{_libdir}/%{name}#' -i helix-loader/src/lib.rs - # Remove shell definitions sed -e '/^\#\!\/usr\/bin\/env .*/d' -i contrib/completion/hx.* From b99c1b3d9128d1e6ac70123b0ea6fc0845d9490777b472de9d59d6bb7879b73a Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 6 Apr 2023 13:02:20 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=57 --- helix.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helix.spec b/helix.spec index 050beae..53116cc 100644 --- a/helix.spec +++ b/helix.spec @@ -93,8 +93,9 @@ sed -e '/^\#\!\/usr\/bin\/env .*/d' -i contrib/completion/hx.* %build export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true +export HELIX_RUNTIME="%{_builddir}/%{name}-%{version}/runtime" %{cargo_build} -HELIX_RUNTIME="$PWD/runtime" ./target/release/hx --grammar build +./target/release/hx --grammar build # Shell completions sed -i "s|hx|helix|g" contrib/completion/hx.* From 284190113d579db90a0ba2ca6ce426c2c353f0c2ea5a4f5794926021f1ddb4be Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 6 Apr 2023 13:28:56 +0000 Subject: [PATCH 4/5] - Remove HELIX_DISABLE_AUTO_GRAMMAR_BUILD. OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=58 --- helix.changes | 5 +++++ helix.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/helix.changes b/helix.changes index c02d368..0fc57a4 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 6 13:27:49 UTC 2023 - Soc Virnyl Estela + +- Remove HELIX_DISABLE_AUTO_GRAMMAR_BUILD. + ------------------------------------------------------------------- Thu Apr 6 12:20:41 UTC 2023 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index 53116cc..964b092 100644 --- a/helix.spec +++ b/helix.spec @@ -92,10 +92,7 @@ cp %{SOURCE2} .cargo/config.toml sed -e '/^\#\!\/usr\/bin\/env .*/d' -i contrib/completion/hx.* %build -export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true -export HELIX_RUNTIME="%{_builddir}/%{name}-%{version}/runtime" %{cargo_build} -./target/release/hx --grammar build # Shell completions sed -i "s|hx|helix|g" contrib/completion/hx.* @@ -114,6 +111,9 @@ find "%{_builddir}/%{name}-%{version}/runtime/grammars" -type f -name '*.so' -ex install --verbose -Dm 755 {} -t "%{buildroot}%{_helix_runtimedir}/grammars" \; install -Dm644 runtime/tutor -t %{buildroot}%{_helix_runtimedir} +# Not needed during runtime +rm -rfv %{buildroot}%{_helix_runtimedir}/grammars/sources + # Desktop application file install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/Helix.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file %{name} From d4341e67f8315c510223c8b7fc77d784135bc2eaa24a93307854634a4f27d002 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 7 Apr 2023 00:27:48 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=59 --- helix.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helix.changes b/helix.changes index 0fc57a4..b845042 100644 --- a/helix.changes +++ b/helix.changes @@ -93,7 +93,7 @@ Thu Apr 6 09:21:16 UTC 2023 - Soc Virnyl Estela - Fix truncation behavior for long path names in the file picker - Fix theme reloading behavior in :config-reload (ab819d8) * More information at https://github.com/helix-editor/helix/blob/master/CHANGELOG.md#2303-2023-03-31 -- Remove helix-runtime-paths.patch +- Remove helix-runtime-path.patch - Fix SPDX license names -------------------------------------------------------------------