mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-08 18:27:07 -08:00
app-editors/helix: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/38227 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
@@ -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);
|
||||
}
|
||||
@@ -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"
|
||||
@@ -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;
|
||||
Reference in New Issue
Block a user