[packages/neovim] upstream fixes for recent tree-sitter query/bash parsers

atler atler at pld-linux.org
Wed Jun 26 20:19:13 CEST 2024


commit 55c3ebe6c3e37fc5a46280ee05d571f3ea1f85e9
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jun 26 20:01:43 2024 +0200

    upstream fixes for recent tree-sitter query/bash parsers

 neovim.spec      |  2 ++
 ts-parsers.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
---
diff --git a/neovim.spec b/neovim.spec
index e1fe901..1b2607b 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -32,6 +32,7 @@ Source2:	%{name}.svg
 Patch0:		desktop.patch
 Patch1:		build-type.patch
 Patch2:		luv.patch
+Patch3:		ts-parsers.patch
 BuildRequires:	cmake >= 3.13
 BuildRequires:	gcc >= 6:4.4
 BuildRequires:	gettext-tools
@@ -101,6 +102,7 @@ Desktop files for Neovim.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1 -R
+%patch3 -p1
 
 %build
 %cmake -B build \
diff --git a/ts-parsers.patch b/ts-parsers.patch
new file mode 100644
index 0000000..7cff877
--- /dev/null
+++ b/ts-parsers.patch
@@ -0,0 +1,93 @@
+From 61b3a26e5b3d7fb6a19dd587994277bc4479307f Mon Sep 17 00:00:00 2001
+From: Christian Clason <c.clason at uni-graz.at>
+Date: Sun, 26 May 2024 12:17:47 +0200
+Subject: [PATCH] build(deps): bump tree-sitter-query to v0.4.0
+
+---
+ cmake.deps/deps.txt                  | 4 ++--
+ runtime/queries/query/highlights.scm | 3 ---
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt
+index 50f86e766aae3e..ca43c53b66bbe8 100644
+--- a/cmake.deps/deps.txt
++++ b/cmake.deps/deps.txt
+@@ -49,8 +49,8 @@ TREESITTER_VIM_URL https://github.com/neovim/tree-sitter-vim/archive/v0.4.0.tar.
+ TREESITTER_VIM_SHA256 9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5
+ TREESITTER_VIMDOC_URL https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1.tar.gz
+ TREESITTER_VIMDOC_SHA256 063645096504b21603585507c41c6d8718ff3c11b2150c5bfc31e8f3ee9afea3
+-TREESITTER_QUERY_URL https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0.tar.gz
+-TREESITTER_QUERY_SHA256 f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0
++TREESITTER_QUERY_URL https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.4.0.tar.gz
++TREESITTER_QUERY_SHA256 d3a423ab66dc62b2969625e280116678a8a22582b5ff087795222108db2f6a6e
+ TREESITTER_PYTHON_URL https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0.tar.gz
+ TREESITTER_PYTHON_SHA256 720304a603271fa89e4430a14d6a81a023d6d7d1171b1533e49c0ab44f1e1c13
+ TREESITTER_BASH_URL https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0.tar.gz
+diff --git a/runtime/queries/query/highlights.scm b/runtime/queries/query/highlights.scm
+index 210d03dc330458..c02ee3f2a01d9c 100644
+--- a/runtime/queries/query/highlights.scm
++++ b/runtime/queries/query/highlights.scm
+@@ -5,9 +5,6 @@
+ (capture
+   (identifier) @type)
+ 
+-(anonymous_node
+-  (identifier) @string)
+-
+ (predicate
+   name: (identifier) @function.call)
+ 
+From 105a9e3dcf95ba64e7737a479579e20063ead0bb Mon Sep 17 00:00:00 2001
+From: Christian Clason <c.clason at uni-graz.at>
+Date: Sat, 8 Jun 2024 10:19:28 +0200
+Subject: [PATCH] build(deps): bump tree-sitter-vimdoc to v3.0.0
+
+---
+ cmake.deps/deps.txt                   |  4 ++--
+ runtime/queries/vimdoc/highlights.scm | 16 +++++++++++-----
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt
+index f2b152640e8810..356bfd92d4c3b5 100644
+--- a/cmake.deps/deps.txt
++++ b/cmake.deps/deps.txt
+@@ -47,8 +47,8 @@ TREESITTER_LUA_URL https://github.com/tree-sitter-grammars/tree-sitter-lua/archi
+ TREESITTER_LUA_SHA256 230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722
+ TREESITTER_VIM_URL https://github.com/neovim/tree-sitter-vim/archive/v0.4.0.tar.gz
+ TREESITTER_VIM_SHA256 9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5
+-TREESITTER_VIMDOC_URL https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1.tar.gz
+-TREESITTER_VIMDOC_SHA256 063645096504b21603585507c41c6d8718ff3c11b2150c5bfc31e8f3ee9afea3
++TREESITTER_VIMDOC_URL https://github.com/neovim/tree-sitter-vimdoc/archive/v3.0.0.tar.gz
++TREESITTER_VIMDOC_SHA256 a639bf92bf57bfa1cdc90ca16af27bfaf26a9779064776dd4be34c1ef1453f6c
+ TREESITTER_QUERY_URL https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.4.0.tar.gz
+ TREESITTER_QUERY_SHA256 d3a423ab66dc62b2969625e280116678a8a22582b5ff087795222108db2f6a6e
+ TREESITTER_PYTHON_URL https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0.tar.gz
+diff --git a/runtime/queries/vimdoc/highlights.scm b/runtime/queries/vimdoc/highlights.scm
+index 70a3a2f2060723..194c80362c4091 100644
+--- a/runtime/queries/vimdoc/highlights.scm
++++ b/runtime/queries/vimdoc/highlights.scm
+@@ -1,13 +1,19 @@
+-(h1) @markup.heading.1
++(h1
++  (delimiter) @markup.heading.1
++  (heading) @markup.heading.1)
+ 
+-(h2) @markup.heading.2
++(h2
++  (delimiter) @markup.heading.2
++  (heading) @markup.heading.2)
+ 
+-(h3) @markup.heading.3
++(h3
++  (heading) @markup.heading.3)
+ 
+-(column_heading) @markup.heading.4
++(column_heading
++  (heading) @markup.heading.4)
+ 
+ (column_heading
+-  "~" @markup.heading.4
++  (delimiter) @markup.heading.4
+   (#set! conceal ""))
+ 
+ (tag
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/neovim.git/commitdiff/55c3ebe6c3e37fc5a46280ee05d571f3ea1f85e9



More information about the pld-cvs-commit mailing list