summaryrefslogtreecommitdiff
path: root/app-editors/helix
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/helix')
-rw-r--r--app-editors/helix/Manifest3
-rw-r--r--app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch65
-rw-r--r--app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch23
-rw-r--r--app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch38
4 files changed, 0 insertions, 129 deletions
diff --git a/app-editors/helix/Manifest b/app-editors/helix/Manifest
index c69f8152127e..8ad194c42937 100644
--- a/app-editors/helix/Manifest
+++ b/app-editors/helix/Manifest
@@ -1,6 +1,3 @@
-AUX helix-23.10-tree-sitter-d-gnu-extension.patch 2256 BLAKE2B 9e780b328079c5fb879acb581e58aea00d06ade8697efb8d1f21642f43e35daf2564dcdb00defc3c03e1ac951ba35bf330a5ee225f38e6e867ef896fbcefa5a6 SHA512 aabc26d7e74b4dcc526a327f90985d13e0c3b137e54b8fd110823f6e2e07111978090efe52992546caff0049ccd86e0b636a2c0ecae6ff97747aaa0d6a9096e9
-AUX helix-23.10-tree-sitter-gemini-path.patch 785 BLAKE2B 4857a65d483197fe8ae215ed8b00ed3b37247b16637b704ccb12081527bca12cf16f5d13000ea1dbfb5b669eacb819d88c35acaed802cb97a95c3b12884e3617 SHA512 90ecf967d59c1c43106566c28ff15ce47a2ba72c9837935e49ef368c4df918c8e18d4b055960c54baba42487d70254ff09181da1ca3c2bca3c544cc6ef1e597c
-AUX helix-23.10-tree-sitter-rescript-implicit-int.patch 1527 BLAKE2B 6bce9fb1a93a9c78d04d6ee37df55c99bbdf80bc761f0bb123f13b8fe4d3082d8443e2513d3166f32c5ba2f67935c6be1b696eb7c1575041a0b0399d5cb3ec59 SHA512 9c3fd5a9b9c69fd7d8c7cd6021de3b4dad69ade6a90788ad14bbe26bc9c9273201a1c317c1e4db182f03d3241d81de11ce5c6360ce6420b1a94e3d384214b03c
DIST addr2line-0.20.0.crate 39558 BLAKE2B 1f66fcb361161599a87f874a3bf28a05614e235488d02205d4c8e207ae193280949ad957fd0eb383a49f4c1bc287569454d3c6872ed6e31c081e6fd03f8d460e SHA512 f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319
DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch b/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch
deleted file mode 100644
index b1789a9df944..000000000000
--- a/app-editors/helix/files/helix-23.10-tree-sitter-d-gnu-extension.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 394998798ef15175455a29cc239999e61ff78e6f Mon Sep 17 00:00:00 2001
-From: Michal Rostecki <vadorovsky@protonmail.com>
-Date: Wed, 6 Dec 2023 15:24:34 +0000
-Bug: https://bugs.gentoo.org/912050
-Subject: [PATCH] chore: Update tree-sitter-d
-
-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 66b43472f5a3..7f1c6b769fad 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"
-diff --git a/runtime/grammars/sources/d/src/scanner.c b/runtime/grammars/sources/d/src/scanner.c
-index 6753ba0..2061b02 100644
---- a/runtime/grammars/sources/d/src/scanner.c
-+++ b/runtime/grammars/sources/d/src/scanner.c
-@@ -67,7 +67,7 @@ match_escape(TSLexer *lexer)
- case 'x':
- for (int i = 0; i < 2; i++) { // expect two hex digits
- lexer->advance(lexer, false);
-- if (!isascii(lexer->lookahead) ||
-+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- !isxdigit(lexer->lookahead)) {
- return (false);
- }
-@@ -78,7 +78,7 @@ match_escape(TSLexer *lexer)
- case 'u':
- for (int i = 0; i < 4; i++) {
- lexer->advance(lexer, false);
-- if (!isascii(lexer->lookahead) ||
-+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- !isxdigit(lexer->lookahead)) {
- return (false);
- }
-@@ -89,7 +89,7 @@ match_escape(TSLexer *lexer)
- case 'U':
- for (int i = 0; i < 8; i++) {
- lexer->advance(lexer, false);
-- if (!isascii(lexer->lookahead) ||
-+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- !isxdigit(lexer->lookahead)) {
- return (false);
- }
-@@ -123,7 +123,7 @@ match_escape(TSLexer *lexer)
- }
- break;
- }
-- if (!isascii(lexer->lookahead) ||
-+ if (!(lexer->lookahead >= 0 && lexer->lookahead <= 127) ||
- !isalnum(lexer->lookahead)) {
- return (false);
- }
diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch b/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch
deleted file mode 100644
index bb108f000b2f..000000000000
--- a/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 41eca94bb6bf3642b1cdb80e89845813a9d03edc Mon Sep 17 00:00:00 2001
-From: Nimrod <ndh42@cornell.edu>
-Date: Mon, 27 Nov 2023 20:31:20 -0500
-Subject: [PATCH] Update git source of Gemini grammar
-
-The author's username changed from "sfr" to "nbsp"
----
- languages.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/languages.toml b/languages.toml
-index ef4687af8a71..33b27626e720 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"
diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch b/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch
deleted file mode 100644
index fd7ef56d2799..000000000000
--- a/app-editors/helix/files/helix-23.10-tree-sitter-rescript-implicit-int.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 17918a99bcf1bf39b08c09e0690d2ecccda8088d Mon Sep 17 00:00:00 2001
-From: Nan Zhong <me@nanzho.ng>
-Date: Thu, 30 Nov 2023 22:35:49 -0500
-Bug: https://bugs.gentoo.org/912050
-Bug: https://bugs.gentoo.org/918941
-Subject: [PATCH] languages: update rescript grammar
-
-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 10ed167b028d..f4ff483b2b11 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"
-diff --git a/runtime/grammars/sources/rescript/src/scanner.c b/runtime/grammars/sources/rescript/src/scanner.c
-index 9bf9fa4..113ca35 100644
---- a/runtime/grammars/sources/rescript/src/scanner.c
-+++ b/runtime/grammars/sources/rescript/src/scanner.c
-@@ -131,7 +131,7 @@ bool tree_sitter_rescript_external_scanner_scan(
- const bool* valid_symbols
- ) {
- ScannerState* state = (ScannerState*)payload;
-- const in_string = state->in_quotes || state->in_backticks;
-+ const bool in_string = state->in_quotes || state->in_backticks;
-
- if (valid_symbols[TEMPLATE_CHARS]) {
- lexer->result_symbol = TEMPLATE_CHARS;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 19:00:21 +0000