[PATCH 00/10] Update tree-sitter{, -{c{, pp, -sharp}, go, java, {java, type}script, python}},

Open

Details

2 participants

Hilton Chain
Christopher Baines

Owner: unassigned

Submitted by: Hilton Chain

Severity: normal

Hilton Chain wrote on 27 Jul 18:49 +0200

[PATCH 00/10] Update tree-sitter{, -{c{, pp, -sharp}, go, java, {java, type}script, python}},

Recipients:(address . guix-patches@gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:cover.1690476218.git.hako@ultrarare.space

Hello Guix!

This patchset updates several tree-sitter grammars.

tree-sitter is updated to 0.20.10 (untagged), which is required by some of

the grammars. tree-sitter-javascript is updated to a newer revision required

by the tree-sitter-typescript update.

Thanks

Hilton Chain (10):

gnu: Add rust-path-slash-0.2.

gnu: tree-sitter: Update to 0.20.10.

gnu: tree-sitter-c-sharp: Update to 0.20.0.

gnu: tree-sitter-java: Update to 0.20.1.

gnu: tree-sitter-javascript: Update to 0.20.0-14.7a29d06.

gnu: tree-sitter-typescript: Update to 0.20.2.

gnu: tree-sitter-python: Update to 0.20.3.

gnu: tree-sitter-c: Update to 0.20.4.

gnu: tree-sitter-go: Update to 0.20.0.

gnu: tree-sitter-cpp: Update to 0.20.2.

gnu/packages/crates-io.scm | 22 ++++++

gnu/packages/tree-sitter.scm | 133 +++++++++++++++++------------------

2 files changed, 86 insertions(+), 69 deletions(-)

base-commit: c7e45139faa27b60f2c7d0a4bc140f9793d97d47

2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 01/10] gnu: Add rust-path-slash-0.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:0c268b559b961c1d21b725725f15fd42dbdf9d22.1690476218.git.hako@ultrarare.space

* gnu/packages/crates-io.scm (rust-path-slash-0.2): New variable.

---

gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9574e2797..e45b1c4c9b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42680,6 +42680,28 @@ (define-public rust-path-clean-0.1
 path.Clean.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-path-slash-0.2
+  (package
+    (name "rust-path-slash")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "path-slash" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hjgljv4vy97qqw9gxnwzqhhpysjss2yhdphfccy3c388afhk48y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://github.com/rhysd/path-slash")
+    (synopsis "Rust library to convert a file path from/to slash path")
+    (description
+     "This package provides @code{path-slash}, a tiny library to convert a file
+path (e.g. @code{foo/bar}, @code{foo\\bar} or @code{C:\\foo\\bar}) from/to a
+slash path (e.g. @code{foo/bar}, @code{C:/foo/bar}).")
+    (license license:expat)))
+
 (define-public rust-pathdiff-0.2
   (package
     (name "rust-pathdiff")
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 02/10] gnu: tree-sitter: Update to 0.20.10.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:3590dc684dbd7caaabd605685614d5d1c0f542e6.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.10.
(tree-sitter-cli)[arguments]<#:cargo-test-flags>: Skip github_issue_test.
<#:cargo-inputs>: Add rust-path-slash-0.2.
---
 gnu/packages/tree-sitter.scm | 66 +++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 31 deletions(-)

Toggle diff (100 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 117c2acb0c..fb34e42874 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -94,36 +94,38 @@ (define-public python-tree-sitter
     (license license:expat)))
 
 (define-public tree-sitter
-  (package
-    (name "tree-sitter")
-    (version "0.20.8")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/tree-sitter/tree-sitter")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv"))
-              (modules '((guix build utils)))
-              (snippet #~(begin
-                           ;; Remove bundled ICU parts
-                           (delete-file-recursively "lib/src/unicode")))))
-    (build-system gnu-build-system)
-    (inputs (list icu4c))
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure))
-           #:tests? #f ; there are no tests for the runtime library
-           #:make-flags
-           #~(list (string-append "PREFIX=" #$output)
-                   (string-append "CC=" #$(cc-for-target)))))
-    (home-page "https://tree-sitter.github.io/tree-sitter/")
-    (synopsis "Incremental parsing system for programming tools")
-    (description
-     "Tree-sitter is a parser generator tool and an incremental parsing
+  ;; Untagged
+  (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))
+    (package
+      (name "tree-sitter")
+      (version "0.20.10")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/tree-sitter/tree-sitter")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
+                (modules '((guix build utils)))
+                (snippet #~(begin
+                             ;; Remove bundled ICU parts
+                             (delete-file-recursively "lib/src/unicode")))))
+      (build-system gnu-build-system)
+      (inputs (list icu4c))
+      (arguments
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure))
+             #:tests? #f ; there are no tests for the runtime library
+             #:make-flags
+             #~(list (string-append "PREFIX=" #$output)
+                     (string-append "CC=" #$(cc-for-target)))))
+      (home-page "https://tree-sitter.github.io/tree-sitter/")
+      (synopsis "Incremental parsing system for programming tools")
+      (description
+       "Tree-sitter is a parser generator tool and an incremental parsing
 library.  It can build a concrete syntax tree for a source file and
 efficiently update the syntax tree as the source file is edited.
 
@@ -138,7 +140,7 @@ (define-public tree-sitter
 @end itemize
 
 This package includes the @code{libtree-sitter} runtime library.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public tree-sitter-cli
   (package
@@ -173,6 +175,7 @@ (define-public tree-sitter-cli
          ;; good compromise compared to maintaining two different sets of
          ;; grammars (Guix packages vs test fixtures).
          "--skip=tests::corpus_test"
+         "--skip=tests::github_issue_test"
          "--skip=tests::highlight_test"
          "--skip=tests::node_test"
          "--skip=tests::parser_test"
@@ -194,6 +197,7 @@ (define-public tree-sitter-cli
         ("rust-dirs" ,rust-dirs-3)
         ("rust-html-escape" ,rust-html-escape-0.2)
         ("rust-libloading" ,rust-libloading-0.7)
+        ("rust-path-slash" ,rust-path-slash-0.2)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rustc-hash" ,rust-rustc-hash-1)
         ("rust-semver" ,rust-semver-1)
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 03/10] gnu: tree-sitter-c-sharp: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:87a531fe049c89efc0764d207affa76df3ea2f3c.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index fb34e42874..30f6bf47b8 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -391,8 +391,8 @@ (define-public tree-sitter-bash
 (define-public tree-sitter-c-sharp
   (tree-sitter-grammar
    "c-sharp" "C#"
-   "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r"
-   "0.19.1"))
+   "0lijbi5q49g50ji00p2lb45rvd76h07sif3xjl9b31yyxwillr6l"
+   "0.20.0"))
 
 (define-public tree-sitter-elm
   (tree-sitter-grammar
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 04/10] gnu: tree-sitter-java: Update to 0.20.1.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:8c698d72dbc1d65e61c079a558e6806dc7c708f1.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-java): Update to 0.20.1.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 30f6bf47b8..d24abfdb1e 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -432,8 +432,8 @@ (define-public tree-sitter-haskell
 (define-public tree-sitter-java
   (tree-sitter-grammar
    "java" "Java"
-   "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341"
-   "0.20.0"))
+   "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l"
+   "0.20.1"))
 
 (define-public tree-sitter-json
   ;; Not tagged
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 05/10] gnu: tree-sitter-javascript: Update to 0.20.0-14.7a29d06.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:b4e31cb9ef3ab850f65989cd054923cb0bf3ca1f.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-javascript): Update to
0.20.0-14.7a29d06.
---
 gnu/packages/tree-sitter.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d24abfdb1e..a86ebf5d60 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -314,11 +314,14 @@ (define-public tree-sitter-html
    "0.19.0"))
 
 (define-public tree-sitter-javascript
-  (tree-sitter-grammar
-   "javascript" "JavaScript(JSX)"
-   "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"
-   "0.20.0"
-   #:commit "rust-0.20.0"))
+  ;; Required by tree-sitter-typescript.
+  (let ((commit "7a29d06274b7cf87d643212a433d970b73969016")
+        (revision "14"))
+    (tree-sitter-grammar
+     "javascript" "JavaScript(JSX)"
+     "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
+     (git-version "0.20.0" revision commit)
+     #:commit commit)))
 
 (define-public tree-sitter-typescript
   (tree-sitter-grammar
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 06/10] gnu: tree-sitter-typescript: Update to 0.20.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:28d382b96205455991a42117ad1b268e181ced9f.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-typescript): Update to 0.20.2.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index a86ebf5d60..9c33081afe 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -326,8 +326,8 @@ (define-public tree-sitter-javascript
 (define-public tree-sitter-typescript
   (tree-sitter-grammar
    "typescript" "TypeScript and TSX"
-   "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x"
-   "0.20.1"
+   "0934c35as3wgakqw20ilii8lvby5ns36mmqsxjwz8zg5zfsq14vj"
+   "0.20.2"
    #:inputs (list tree-sitter-javascript)
    #:grammar-directories '("typescript" "tsx")))
 
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 07/10] gnu: tree-sitter-python: Update to 0.20.3.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:fff97ddcbe0b8ff0f9ecc59af8f5cb447301e127.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-python): Update to 0.20.3.

---

gnu/packages/tree-sitter.scm | 12 ++++--------

1 file changed, 4 insertions(+), 8 deletions(-)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 9c33081afe..876b3b8250 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -471,14 +471,10 @@ (define-public tree-sitter-php
      #:commit commit)))
 
 (define-public tree-sitter-python
-  ;; There are a lot of additions, the last tag was placed a while ago
-  (let ((commit "9e53981ec31b789ee26162ea335de71f02186003")
-        (revision "0"))
-    (tree-sitter-grammar
-     "python" "Python"
-     "1lv3pgb7h2a0f121897r0lwc228rjwb77y3a6g3ghifx1rgbwvqg"
-     (git-version "0.20.0" revision commit)
-     #:commit commit)))
+  (tree-sitter-grammar
+   "python" "Python"
+   "093q200v479j1p8dfjgzlydpzbn2qc1x2pglx9573m9ls4ga004d"
+   "0.20.3"))
 
 (define-public tree-sitter-r
   ;; No tags
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 08/10] gnu: tree-sitter-c: Update to 0.20.4.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:e2e9494413fcd6ae7ce442246b063d8139503bcb.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-c): Update to 0.20.4.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 876b3b8250..6e396bd862 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -351,8 +351,8 @@ (define-public tree-sitter-css
 (define-public tree-sitter-c
   (tree-sitter-grammar
    "c" "C"
-   "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v"
-   "0.20.2"))
+   "0i88wf6a6295c19y22j2dygf1xl2h3cif9lkg01hj58j7cxa0ani"
+   "0.20.4"))
 
 (define-public tree-sitter-cpp
   ;; There are a lot of additions, the last tag was placed more than 1 year ago
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 09/10] gnu: tree-sitter-go: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:7cdf76d23a0cd506d7a57feba5d0bc70d7148cc4.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-go): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 12 ++++--------

1 file changed, 4 insertions(+), 8 deletions(-)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 6e396bd862..10c7e71716 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -413,14 +413,10 @@ (define-public tree-sitter-gomod
    #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git"))
 
 (define-public tree-sitter-go
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "64457ea6b73ef5422ed1687178d4545c3e91334a")
-        (revision "0"))
-    (tree-sitter-grammar
-     "go" "Go"
-     "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz"
-     (git-version "0.19.1" revision commit)
-     #:commit commit)))
+  (tree-sitter-grammar
+   "go" "Go"
+   "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
+   "0.20.0"))
 
 (define-public tree-sitter-haskell
   ;; There are a lot of additions, the last tag was placed more than 4 years ago
-- 
2.41.0

Hilton Chain wrote on 27 Jul 18:51 +0200

[PATCH 10/10] gnu: tree-sitter-cpp: Update to 0.20.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:8afb7234d9f8181ee420ba20476b845e3d64578c.1690476218.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-cpp): Update to 0.20.2.

---

gnu/packages/tree-sitter.scm | 14 +++++---------

1 file changed, 5 insertions(+), 9 deletions(-)

Toggle diff (27 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 10c7e71716..0f8918f22d 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -355,15 +355,11 @@ (define-public tree-sitter-c
    "0.20.4"))
 
 (define-public tree-sitter-cpp
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "56cec4c2eb5d6af3d2942e69e35db15ae2433740")
-        (revision "0"))
-      (tree-sitter-grammar
-       "cpp" "C++"
-       "0c5iwg9j6naivvr18glfp095x32nfl9hbw0q02rhh1b59fkpjs09"
-       (git-version "0.20.0" revision commit)
-       #:commit commit
-       #:inputs (list tree-sitter-c))))
+  (tree-sitter-grammar
+   "cpp" "C++"
+   "0jbkbr93lb20syb39r9vbl10g1xgw8mlnib95k6ibz806a7b6qzl"
+   "0.20.2"
+   #:inputs (list tree-sitter-c)))
 
 (define-public tree-sitter-elixir
   ;; No tags at all, version in the source code is 0.19.0
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:16 +0200

[PATCH v2 0/8] Update tree-sitter{, -{c{, pp, -sharp}, go, java, {java, type}script, python}},

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:cover.1690477886.git.hako@ultrarare.space

v1->v2:

Merge tree-sitter-javascript and tree-sitter-typescript updates into one commit.

Merge tree-sitter-c and tree-sitter-cpp updates into one commit.

Each case updating the former package breaks build of the latter's old version.

Hilton Chain (8):

gnu: Add rust-path-slash-0.2.

gnu: tree-sitter: Update to 0.20.10.

gnu: tree-sitter-c-sharp: Update to 0.20.0.

gnu: tree-sitter-java: Update to 0.20.1.

gnu: tree-sitter-typescript: Update to 0.20.2.

gnu: tree-sitter-python: Update to 0.20.3.

gnu: tree-sitter-cpp: Update to 0.20.2.

gnu: tree-sitter-go: Update to 0.20.0.

gnu/packages/crates-io.scm | 22 ++++++

gnu/packages/tree-sitter.scm | 133 +++++++++++++++++------------------

2 files changed, 86 insertions(+), 69 deletions(-)

base-commit: c7e45139faa27b60f2c7d0a4bc140f9793d97d47

2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 1/8] gnu: Add rust-path-slash-0.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:0c268b559b961c1d21b725725f15fd42dbdf9d22.1690477886.git.hako@ultrarare.space

* gnu/packages/crates-io.scm (rust-path-slash-0.2): New variable.

---

gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9574e2797..e45b1c4c9b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42680,6 +42680,28 @@ (define-public rust-path-clean-0.1
 path.Clean.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-path-slash-0.2
+  (package
+    (name "rust-path-slash")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "path-slash" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hjgljv4vy97qqw9gxnwzqhhpysjss2yhdphfccy3c388afhk48y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://github.com/rhysd/path-slash")
+    (synopsis "Rust library to convert a file path from/to slash path")
+    (description
+     "This package provides @code{path-slash}, a tiny library to convert a file
+path (e.g. @code{foo/bar}, @code{foo\\bar} or @code{C:\\foo\\bar}) from/to a
+slash path (e.g. @code{foo/bar}, @code{C:/foo/bar}).")
+    (license license:expat)))
+
 (define-public rust-pathdiff-0.2
   (package
     (name "rust-pathdiff")
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 2/8] gnu: tree-sitter: Update to 0.20.10.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:3590dc684dbd7caaabd605685614d5d1c0f542e6.1690477886.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.10.
(tree-sitter-cli)[arguments]<#:cargo-test-flags>: Skip github_issue_test.
<#:cargo-inputs>: Add rust-path-slash-0.2.
---
 gnu/packages/tree-sitter.scm | 66 +++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 31 deletions(-)

Toggle diff (100 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 117c2acb0c..fb34e42874 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -94,36 +94,38 @@ (define-public python-tree-sitter
     (license license:expat)))
 
 (define-public tree-sitter
-  (package
-    (name "tree-sitter")
-    (version "0.20.8")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/tree-sitter/tree-sitter")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv"))
-              (modules '((guix build utils)))
-              (snippet #~(begin
-                           ;; Remove bundled ICU parts
-                           (delete-file-recursively "lib/src/unicode")))))
-    (build-system gnu-build-system)
-    (inputs (list icu4c))
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure))
-           #:tests? #f ; there are no tests for the runtime library
-           #:make-flags
-           #~(list (string-append "PREFIX=" #$output)
-                   (string-append "CC=" #$(cc-for-target)))))
-    (home-page "https://tree-sitter.github.io/tree-sitter/")
-    (synopsis "Incremental parsing system for programming tools")
-    (description
-     "Tree-sitter is a parser generator tool and an incremental parsing
+  ;; Untagged
+  (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))
+    (package
+      (name "tree-sitter")
+      (version "0.20.10")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/tree-sitter/tree-sitter")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
+                (modules '((guix build utils)))
+                (snippet #~(begin
+                             ;; Remove bundled ICU parts
+                             (delete-file-recursively "lib/src/unicode")))))
+      (build-system gnu-build-system)
+      (inputs (list icu4c))
+      (arguments
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure))
+             #:tests? #f ; there are no tests for the runtime library
+             #:make-flags
+             #~(list (string-append "PREFIX=" #$output)
+                     (string-append "CC=" #$(cc-for-target)))))
+      (home-page "https://tree-sitter.github.io/tree-sitter/")
+      (synopsis "Incremental parsing system for programming tools")
+      (description
+       "Tree-sitter is a parser generator tool and an incremental parsing
 library.  It can build a concrete syntax tree for a source file and
 efficiently update the syntax tree as the source file is edited.
 
@@ -138,7 +140,7 @@ (define-public tree-sitter
 @end itemize
 
 This package includes the @code{libtree-sitter} runtime library.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public tree-sitter-cli
   (package
@@ -173,6 +175,7 @@ (define-public tree-sitter-cli
          ;; good compromise compared to maintaining two different sets of
          ;; grammars (Guix packages vs test fixtures).
          "--skip=tests::corpus_test"
+         "--skip=tests::github_issue_test"
          "--skip=tests::highlight_test"
          "--skip=tests::node_test"
          "--skip=tests::parser_test"
@@ -194,6 +197,7 @@ (define-public tree-sitter-cli
         ("rust-dirs" ,rust-dirs-3)
         ("rust-html-escape" ,rust-html-escape-0.2)
         ("rust-libloading" ,rust-libloading-0.7)
+        ("rust-path-slash" ,rust-path-slash-0.2)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rustc-hash" ,rust-rustc-hash-1)
         ("rust-semver" ,rust-semver-1)
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 3/8] gnu: tree-sitter-c-sharp: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:87a531fe049c89efc0764d207affa76df3ea2f3c.1690477886.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index fb34e42874..30f6bf47b8 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -391,8 +391,8 @@ (define-public tree-sitter-bash
 (define-public tree-sitter-c-sharp
   (tree-sitter-grammar
    "c-sharp" "C#"
-   "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r"
-   "0.19.1"))
+   "0lijbi5q49g50ji00p2lb45rvd76h07sif3xjl9b31yyxwillr6l"
+   "0.20.0"))
 
 (define-public tree-sitter-elm
   (tree-sitter-grammar
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 4/8] gnu: tree-sitter-java: Update to 0.20.1.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:8c698d72dbc1d65e61c079a558e6806dc7c708f1.1690477886.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-java): Update to 0.20.1.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 30f6bf47b8..d24abfdb1e 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -432,8 +432,8 @@ (define-public tree-sitter-haskell
 (define-public tree-sitter-java
   (tree-sitter-grammar
    "java" "Java"
-   "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341"
-   "0.20.0"))
+   "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l"
+   "0.20.1"))
 
 (define-public tree-sitter-json
   ;; Not tagged
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 5/8] gnu: tree-sitter-typescript: Update to 0.20.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:b01eea45dbb4c75167b90b15d73e62293a1740a2.1690477886.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-typescript): Update to 0.20.2.
(tree-sitter-javascript): Update to 0.20.0-14.7a29d06.
---
 gnu/packages/tree-sitter.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Toggle diff (34 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d24abfdb1e..9c33081afe 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -314,17 +314,20 @@ (define-public tree-sitter-html
    "0.19.0"))
 
 (define-public tree-sitter-javascript
-  (tree-sitter-grammar
-   "javascript" "JavaScript(JSX)"
-   "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"
-   "0.20.0"
-   #:commit "rust-0.20.0"))
+  ;; Required by tree-sitter-typescript.
+  (let ((commit "7a29d06274b7cf87d643212a433d970b73969016")
+        (revision "14"))
+    (tree-sitter-grammar
+     "javascript" "JavaScript(JSX)"
+     "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
+     (git-version "0.20.0" revision commit)
+     #:commit commit)))
 
 (define-public tree-sitter-typescript
   (tree-sitter-grammar
    "typescript" "TypeScript and TSX"
-   "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x"
-   "0.20.1"
+   "0934c35as3wgakqw20ilii8lvby5ns36mmqsxjwz8zg5zfsq14vj"
+   "0.20.2"
    #:inputs (list tree-sitter-javascript)
    #:grammar-directories '("typescript" "tsx")))
 
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 6/8] gnu: tree-sitter-python: Update to 0.20.3.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:b0ae56f23e15c9ae9fd74cee30206d874b2f3ea1.1690477886.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-python): Update to 0.20.3.

---

gnu/packages/tree-sitter.scm | 12 ++++--------

1 file changed, 4 insertions(+), 8 deletions(-)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 9c33081afe..876b3b8250 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -471,14 +471,10 @@ (define-public tree-sitter-php
      #:commit commit)))
 
 (define-public tree-sitter-python
-  ;; There are a lot of additions, the last tag was placed a while ago
-  (let ((commit "9e53981ec31b789ee26162ea335de71f02186003")
-        (revision "0"))
-    (tree-sitter-grammar
-     "python" "Python"
-     "1lv3pgb7h2a0f121897r0lwc228rjwb77y3a6g3ghifx1rgbwvqg"
-     (git-version "0.20.0" revision commit)
-     #:commit commit)))
+  (tree-sitter-grammar
+   "python" "Python"
+   "093q200v479j1p8dfjgzlydpzbn2qc1x2pglx9573m9ls4ga004d"
+   "0.20.3"))
 
 (define-public tree-sitter-r
   ;; No tags
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 7/8] gnu: tree-sitter-cpp: Update to 0.20.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:9ab3cc7feefd16890c9c7cf717cbced5ae7160fd.1690477886.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-cpp): Update to 0.20.2.
(tree-sitter-c): Update to 0.20.4.
---
 gnu/packages/tree-sitter.scm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

Toggle diff (33 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 876b3b8250..70df68c873 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -351,19 +351,15 @@ (define-public tree-sitter-css
 (define-public tree-sitter-c
   (tree-sitter-grammar
    "c" "C"
-   "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v"
-   "0.20.2"))
+   "0i88wf6a6295c19y22j2dygf1xl2h3cif9lkg01hj58j7cxa0ani"
+   "0.20.4"))
 
 (define-public tree-sitter-cpp
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "56cec4c2eb5d6af3d2942e69e35db15ae2433740")
-        (revision "0"))
-      (tree-sitter-grammar
-       "cpp" "C++"
-       "0c5iwg9j6naivvr18glfp095x32nfl9hbw0q02rhh1b59fkpjs09"
-       (git-version "0.20.0" revision commit)
-       #:commit commit
-       #:inputs (list tree-sitter-c))))
+  (tree-sitter-grammar
+   "cpp" "C++"
+   "0jbkbr93lb20syb39r9vbl10g1xgw8mlnib95k6ibz806a7b6qzl"
+   "0.20.2"
+   #:inputs (list tree-sitter-c)))
 
 (define-public tree-sitter-elixir
   ;; No tags at all, version in the source code is 0.19.0
-- 
2.41.0

Hilton Chain wrote on 27 Jul 19:17 +0200

[PATCH v2 8/8] gnu: tree-sitter-go: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:4623163bd5b578ef40a193b5afae911042ef578b.1690477886.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-go): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 12 ++++--------

1 file changed, 4 insertions(+), 8 deletions(-)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 70df68c873..0f8918f22d 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -409,14 +409,10 @@ (define-public tree-sitter-gomod
    #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git"))
 
 (define-public tree-sitter-go
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "64457ea6b73ef5422ed1687178d4545c3e91334a")
-        (revision "0"))
-    (tree-sitter-grammar
-     "go" "Go"
-     "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz"
-     (git-version "0.19.1" revision commit)
-     #:commit commit)))
+  (tree-sitter-grammar
+   "go" "Go"
+   "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
+   "0.20.0"))
 
 (define-public tree-sitter-haskell
   ;; There are a lot of additions, the last tag was placed more than 4 years ago
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:17 +0200

[PATCH v3 0/9] Update tree-sitter{, -{c{, pp, -sharp}, go, java, {java, type}script, python}},

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:cover.1691647854.git.hako@ultrarare.space

V2 -> V3:
  - tree-sitter-c@0.20.5
  - Re-indent code in a separate commit to produce more readable diffs.

V1 -> V2:
  - Merge tree-sitter-javascript and tree-sitter-typescript updates into one
commit.
  - Merge tree-sitter-c and tree-sitter-cpp updates into one commit.
  Each case updating the former package breaks build of the latter's old
version.

Hilton Chain (9):
  gnu: Add rust-path-slash-0.2.
  gnu: tree-sitter: Update to 0.20.10.
  gnu: tree-sitter-c-sharp: Update to 0.20.0.
  gnu: tree-sitter-java: Update to 0.20.1.
  gnu: tree-sitter-typescript: Update to 0.20.2.
  gnu: tree-sitter-python: Update to 0.20.3.
  gnu: tree-sitter-cpp: Update to 0.20.2.
  gnu: tree-sitter-go: Update to 0.20.0.
  gnu: tree-sitter: Re-indent.

 gnu/packages/crates-io.scm   |  22 ++++++
 gnu/packages/tree-sitter.scm | 133 +++++++++++++++++------------------
 2 files changed, 86 insertions(+), 69 deletions(-)


base-commit: 90e34d25d5e7c14b7f3293a78f3cdad676c0d035
--
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 1/9] gnu: Add rust-path-slash-0.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:d374d805b4b93533646d7da35657127ad741e15f.1691647854.git.hako@ultrarare.space

* gnu/packages/crates-io.scm (rust-path-slash-0.2): New variable.

---

gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9574e2797..e45b1c4c9b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42680,6 +42680,28 @@ (define-public rust-path-clean-0.1
 path.Clean.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-path-slash-0.2
+  (package
+    (name "rust-path-slash")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "path-slash" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hjgljv4vy97qqw9gxnwzqhhpysjss2yhdphfccy3c388afhk48y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://github.com/rhysd/path-slash")
+    (synopsis "Rust library to convert a file path from/to slash path")
+    (description
+     "This package provides @code{path-slash}, a tiny library to convert a file
+path (e.g. @code{foo/bar}, @code{foo\\bar} or @code{C:\\foo\\bar}) from/to a
+slash path (e.g. @code{foo/bar}, @code{C:/foo/bar}).")
+    (license license:expat)))
+
 (define-public rust-pathdiff-0.2
   (package
     (name "rust-pathdiff")
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 2/9] gnu: tree-sitter: Update to 0.20.10.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:3f42d081c13158cfd1c8f4ea6e819778a7f9c92f.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.10.
(tree-sitter-cli)[arguments]<#:cargo-test-flags>: Skip github_issue_test.
<#:cargo-inputs>: Add rust-path-slash-0.2.
---
 gnu/packages/tree-sitter.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Toggle diff (55 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 117c2acb0c..ffed09d945 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -94,18 +94,20 @@ (define-public python-tree-sitter
     (license license:expat)))
 
 (define-public tree-sitter
+  ;; Untagged
+  (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))
   (package
     (name "tree-sitter")
-    (version "0.20.8")
+    (version "0.20.10")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/tree-sitter/tree-sitter")
-                    (commit (string-append "v" version))))
+                    (commit commit)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv"))
+                "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
               (modules '((guix build utils)))
               (snippet #~(begin
                            ;; Remove bundled ICU parts
@@ -138,7 +140,7 @@ (define-public tree-sitter
 @end itemize
 
 This package includes the @code{libtree-sitter} runtime library.")
-    (license license:expat)))
+    (license license:expat))))
 
 (define-public tree-sitter-cli
   (package
@@ -173,6 +175,7 @@ (define-public tree-sitter-cli
          ;; good compromise compared to maintaining two different sets of
          ;; grammars (Guix packages vs test fixtures).
          "--skip=tests::corpus_test"
+         "--skip=tests::github_issue_test"
          "--skip=tests::highlight_test"
          "--skip=tests::node_test"
          "--skip=tests::parser_test"
@@ -194,6 +197,7 @@ (define-public tree-sitter-cli
         ("rust-dirs" ,rust-dirs-3)
         ("rust-html-escape" ,rust-html-escape-0.2)
         ("rust-libloading" ,rust-libloading-0.7)
+        ("rust-path-slash" ,rust-path-slash-0.2)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rustc-hash" ,rust-rustc-hash-1)
         ("rust-semver" ,rust-semver-1)
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 3/9] gnu: tree-sitter-c-sharp: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:e990269815756f872a4e8e25ebeebb884d92540c.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ffed09d945..17df03d160 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -391,8 +391,8 @@ (define-public tree-sitter-bash
 (define-public tree-sitter-c-sharp
   (tree-sitter-grammar
    "c-sharp" "C#"
-   "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r"
-   "0.19.1"))
+   "0lijbi5q49g50ji00p2lb45rvd76h07sif3xjl9b31yyxwillr6l"
+   "0.20.0"))
 
 (define-public tree-sitter-elm
   (tree-sitter-grammar
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 4/9] gnu: tree-sitter-java: Update to 0.20.1.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:d8565caafb744121bed1b867edba2b9e4c38723f.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-java): Update to 0.20.1.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 17df03d160..47b37925cb 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -432,8 +432,8 @@ (define-public tree-sitter-haskell
 (define-public tree-sitter-java
   (tree-sitter-grammar
    "java" "Java"
-   "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341"
-   "0.20.0"))
+   "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l"
+   "0.20.1"))
 
 (define-public tree-sitter-json
   ;; Not tagged
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 5/9] gnu: tree-sitter-typescript: Update to 0.20.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:47be55659f849dc9ae457821d78a282c4f5b6382.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-typescript): Update to 0.20.2.
(tree-sitter-javascript): Update to 0.20.0-14.7a29d06.
---
 gnu/packages/tree-sitter.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 47b37925cb..532e9f3e69 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -314,17 +314,20 @@ (define-public tree-sitter-html
    "0.19.0"))
 
 (define-public tree-sitter-javascript
+  ;; Required by tree-sitter-typescript.
+  (let ((commit "7a29d06274b7cf87d643212a433d970b73969016")
+        (revision "14"))
   (tree-sitter-grammar
    "javascript" "JavaScript(JSX)"
-   "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"
-   "0.20.0"
-   #:commit "rust-0.20.0"))
+   "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
+   (git-version "0.20.0" revision commit)
+   #:commit commit)))
 
 (define-public tree-sitter-typescript
   (tree-sitter-grammar
    "typescript" "TypeScript and TSX"
-   "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x"
-   "0.20.1"
+   "0934c35as3wgakqw20ilii8lvby5ns36mmqsxjwz8zg5zfsq14vj"
+   "0.20.2"
    #:inputs (list tree-sitter-javascript)
    #:grammar-directories '("typescript" "tsx")))
 
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 6/9] gnu: tree-sitter-python: Update to 0.20.3.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:0dc20a5e9e573964eaa3a521036ea19d1d087670.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-python): Update to 0.20.3.

---

gnu/packages/tree-sitter.scm | 8 ++------

1 file changed, 2 insertions(+), 6 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 532e9f3e69..a2efc52f9b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -471,14 +471,10 @@ (define-public tree-sitter-php
      #:commit commit)))
 
 (define-public tree-sitter-python
-  ;; There are a lot of additions, the last tag was placed a while ago
-  (let ((commit "9e53981ec31b789ee26162ea335de71f02186003")
-        (revision "0"))
     (tree-sitter-grammar
      "python" "Python"
-     "1lv3pgb7h2a0f121897r0lwc228rjwb77y3a6g3ghifx1rgbwvqg"
-     (git-version "0.20.0" revision commit)
-     #:commit commit)))
+     "093q200v479j1p8dfjgzlydpzbn2qc1x2pglx9573m9ls4ga004d"
+     "0.20.3"))
 
 (define-public tree-sitter-r
   ;; No tags
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 7/9] gnu: tree-sitter-cpp: Update to 0.20.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:4fe9444f97f79b8b93d0d284df5db3b599591728.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-cpp): Update to 0.20.2.
(tree-sitter-c): Update to 0.20.5.
---
 gnu/packages/tree-sitter.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index a2efc52f9b..d22725320a 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -351,19 +351,15 @@ (define-public tree-sitter-css
 (define-public tree-sitter-c
   (tree-sitter-grammar
    "c" "C"
-   "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v"
-   "0.20.2"))
+   "0bshiwf7rvbafgdv9lj1hgmq3wc8i45gis34n6p6qlb9r6g5jzz6"
+   "0.20.5"))
 
 (define-public tree-sitter-cpp
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "56cec4c2eb5d6af3d2942e69e35db15ae2433740")
-        (revision "0"))
       (tree-sitter-grammar
        "cpp" "C++"
-       "0c5iwg9j6naivvr18glfp095x32nfl9hbw0q02rhh1b59fkpjs09"
-       (git-version "0.20.0" revision commit)
-       #:commit commit
-       #:inputs (list tree-sitter-c))))
+       "0jbkbr93lb20syb39r9vbl10g1xgw8mlnib95k6ibz806a7b6qzl"
+       "0.20.2"
+       #:inputs (list tree-sitter-c)))
 
 (define-public tree-sitter-elixir
   ;; No tags at all, version in the source code is 0.19.0
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 8/9] gnu: tree-sitter-go: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:b93f564846bd99f8c8872c9eb423827d50e8e32c.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-go): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 8 ++------

1 file changed, 2 insertions(+), 6 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index d22725320a..a0d4705f22 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -409,14 +409,10 @@ (define-public tree-sitter-gomod
    #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git"))
 
 (define-public tree-sitter-go
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "64457ea6b73ef5422ed1687178d4545c3e91334a")
-        (revision "0"))
     (tree-sitter-grammar
      "go" "Go"
-     "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz"
-     (git-version "0.19.1" revision commit)
-     #:commit commit)))
+     "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
+     "0.20.0"))
 
 (define-public tree-sitter-haskell
   ;; There are a lot of additions, the last tag was placed more than 4 years ago
-- 
2.41.0

Hilton Chain wrote on 10 Aug 08:19 +0200

[PATCH v3 9/9] gnu: tree-sitter: Re-indent.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:50053f6463f4f857fa3610643d97776215a8194d.1691647854.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter,tree-sitter-javascript)
(tree-sitter-cpp,tree-sitter-go,tree-sitter-python): Re-indent.
---
 gnu/packages/tree-sitter.scm | 98 ++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

Toggle diff (146 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index a0d4705f22..9e2307af86 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -96,36 +96,36 @@ (define-public python-tree-sitter
 (define-public tree-sitter
   ;; Untagged
   (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))
-  (package
-    (name "tree-sitter")
-    (version "0.20.10")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/tree-sitter/tree-sitter")
-                    (commit commit)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
-              (modules '((guix build utils)))
-              (snippet #~(begin
-                           ;; Remove bundled ICU parts
-                           (delete-file-recursively "lib/src/unicode")))))
-    (build-system gnu-build-system)
-    (inputs (list icu4c))
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure))
-           #:tests? #f ; there are no tests for the runtime library
-           #:make-flags
-           #~(list (string-append "PREFIX=" #$output)
-                   (string-append "CC=" #$(cc-for-target)))))
-    (home-page "https://tree-sitter.github.io/tree-sitter/")
-    (synopsis "Incremental parsing system for programming tools")
-    (description
-     "Tree-sitter is a parser generator tool and an incremental parsing
+    (package
+      (name "tree-sitter")
+      (version "0.20.10")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/tree-sitter/tree-sitter")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
+                (modules '((guix build utils)))
+                (snippet #~(begin
+                             ;; Remove bundled ICU parts
+                             (delete-file-recursively "lib/src/unicode")))))
+      (build-system gnu-build-system)
+      (inputs (list icu4c))
+      (arguments
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure))
+             #:tests? #f ; there are no tests for the runtime library
+             #:make-flags
+             #~(list (string-append "PREFIX=" #$output)
+                     (string-append "CC=" #$(cc-for-target)))))
+      (home-page "https://tree-sitter.github.io/tree-sitter/")
+      (synopsis "Incremental parsing system for programming tools")
+      (description
+       "Tree-sitter is a parser generator tool and an incremental parsing
 library.  It can build a concrete syntax tree for a source file and
 efficiently update the syntax tree as the source file is edited.
 
@@ -140,7 +140,7 @@ (define-public tree-sitter
 @end itemize
 
 This package includes the @code{libtree-sitter} runtime library.")
-    (license license:expat))))
+      (license license:expat))))
 
 (define-public tree-sitter-cli
   (package
@@ -317,11 +317,11 @@ (define-public tree-sitter-javascript
   ;; Required by tree-sitter-typescript.
   (let ((commit "7a29d06274b7cf87d643212a433d970b73969016")
         (revision "14"))
-  (tree-sitter-grammar
-   "javascript" "JavaScript(JSX)"
-   "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
-   (git-version "0.20.0" revision commit)
-   #:commit commit)))
+    (tree-sitter-grammar
+     "javascript" "JavaScript(JSX)"
+     "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
+     (git-version "0.20.0" revision commit)
+     #:commit commit)))
 
 (define-public tree-sitter-typescript
   (tree-sitter-grammar
@@ -355,11 +355,11 @@ (define-public tree-sitter-c
    "0.20.5"))
 
 (define-public tree-sitter-cpp
-      (tree-sitter-grammar
-       "cpp" "C++"
-       "0jbkbr93lb20syb39r9vbl10g1xgw8mlnib95k6ibz806a7b6qzl"
-       "0.20.2"
-       #:inputs (list tree-sitter-c)))
+  (tree-sitter-grammar
+   "cpp" "C++"
+   "0jbkbr93lb20syb39r9vbl10g1xgw8mlnib95k6ibz806a7b6qzl"
+   "0.20.2"
+   #:inputs (list tree-sitter-c)))
 
 (define-public tree-sitter-elixir
   ;; No tags at all, version in the source code is 0.19.0
@@ -409,10 +409,10 @@ (define-public tree-sitter-gomod
    #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git"))
 
 (define-public tree-sitter-go
-    (tree-sitter-grammar
-     "go" "Go"
-     "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
-     "0.20.0"))
+  (tree-sitter-grammar
+   "go" "Go"
+   "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
+   "0.20.0"))
 
 (define-public tree-sitter-haskell
   ;; There are a lot of additions, the last tag was placed more than 4 years ago
@@ -463,10 +463,10 @@ (define-public tree-sitter-php
      #:commit commit)))
 
 (define-public tree-sitter-python
-    (tree-sitter-grammar
-     "python" "Python"
-     "093q200v479j1p8dfjgzlydpzbn2qc1x2pglx9573m9ls4ga004d"
-     "0.20.3"))
+  (tree-sitter-grammar
+   "python" "Python"
+   "093q200v479j1p8dfjgzlydpzbn2qc1x2pglx9573m9ls4ga004d"
+   "0.20.3"))
 
 (define-public tree-sitter-r
   ;; No tags
-- 
2.41.0

Hilton Chain wrote on 20 Aug 15:58 +0200

[PATCH v4 00/11] Update tree-sitter{, -{bash, c{, pp, -sharp}, go, java, {java, type}script, python, rust}},

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:cover.1692539095.git.hako@ultrarare.space

V3 -> V4:
  - tree-sitter-bash@0.20.0,
    tree-sitter-c@0.20.6,
    tree-sitter-cpp@0.20.3,
    tree-sitter-python@0.20.4,
    tree-sitter-rust@0.20.4.

V2 -> V3:
  - tree-sitter-c@0.20.5.
  - Re-indent code in a separate commit to produce more readable diffs.

V1 -> V2:
  - Merge tree-sitter-javascript and tree-sitter-typescript updates into one
commit.
  - Merge tree-sitter-c and tree-sitter-cpp updates into one commit.
  Each case updating the former package breaks build of the latter's old
version.

Hilton Chain (11):
  gnu: Add rust-path-slash-0.2.
  gnu: tree-sitter: Update to 0.20.10.
  gnu: tree-sitter-bash: Update to 0.20.0.
  gnu: tree-sitter-c-sharp: Update to 0.20.0.
  gnu: tree-sitter-java: Update to 0.20.1.
  gnu: tree-sitter-typescript: Update to 0.20.2.
  gnu: tree-sitter-python: Update to 0.20.4.
  gnu: tree-sitter-cpp: Update to 0.20.3.
  gnu: tree-sitter-go: Update to 0.20.0.
  gnu: tree-sitter-rust: Update to 0.20.4.
  gnu: tree-sitter: Re-indent.

 gnu/packages/crates-io.scm   |  22 ++++++
 gnu/packages/tree-sitter.scm | 141 +++++++++++++++++------------------
 2 files changed, 90 insertions(+), 73 deletions(-)


base-commit: ad5e4fe54a66c725dc03dedebf8e5c65723ccb74
--
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 01/11] gnu: Add rust-path-slash-0.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:f25240149ca1233d6b94f1ea3069e9f4f61e1c79.1692539095.git.hako@ultrarare.space

* gnu/packages/crates-io.scm (rust-path-slash-0.2): New variable.

---

gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 77a41a5116..f91c5db3a9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45806,6 +45806,28 @@ (define-public rust-path-clean-0.1
 path.Clean.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-path-slash-0.2
+  (package
+    (name "rust-path-slash")
+    (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "path-slash" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hjgljv4vy97qqw9gxnwzqhhpysjss2yhdphfccy3c388afhk48y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1))))
+    (home-page "https://github.com/rhysd/path-slash")
+    (synopsis "Rust library to convert a file path from/to slash path")
+    (description
+     "This package provides @code{path-slash}, a tiny library to convert a file
+path (e.g. @code{foo/bar}, @code{foo\\bar} or @code{C:\\foo\\bar}) from/to a
+slash path (e.g. @code{foo/bar}, @code{C:/foo/bar}).")
+    (license license:expat)))
+
 (define-public rust-pathdiff-0.2
   (package
     (name "rust-pathdiff")
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 02/11] gnu: tree-sitter: Update to 0.20.10.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:5f1931e3330ae7dd368c50fdefcdfb43ab4837f0.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.10.
(tree-sitter-cli)[arguments]<#:cargo-test-flags>: Skip github_issue_test.
<#:cargo-inputs>: Add rust-path-slash-0.2.
---
 gnu/packages/tree-sitter.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Toggle diff (55 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 117c2acb0c..ffed09d945 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -94,18 +94,20 @@ (define-public python-tree-sitter
     (license license:expat)))
 
 (define-public tree-sitter
+  ;; Untagged
+  (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))
   (package
     (name "tree-sitter")
-    (version "0.20.8")
+    (version "0.20.10")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/tree-sitter/tree-sitter")
-                    (commit (string-append "v" version))))
+                    (commit commit)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv"))
+                "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
               (modules '((guix build utils)))
               (snippet #~(begin
                            ;; Remove bundled ICU parts
@@ -138,7 +140,7 @@ (define-public tree-sitter
 @end itemize
 
 This package includes the @code{libtree-sitter} runtime library.")
-    (license license:expat)))
+    (license license:expat))))
 
 (define-public tree-sitter-cli
   (package
@@ -173,6 +175,7 @@ (define-public tree-sitter-cli
          ;; good compromise compared to maintaining two different sets of
          ;; grammars (Guix packages vs test fixtures).
          "--skip=tests::corpus_test"
+         "--skip=tests::github_issue_test"
          "--skip=tests::highlight_test"
          "--skip=tests::node_test"
          "--skip=tests::parser_test"
@@ -194,6 +197,7 @@ (define-public tree-sitter-cli
         ("rust-dirs" ,rust-dirs-3)
         ("rust-html-escape" ,rust-html-escape-0.2)
         ("rust-libloading" ,rust-libloading-0.7)
+        ("rust-path-slash" ,rust-path-slash-0.2)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rustc-hash" ,rust-rustc-hash-1)
         ("rust-semver" ,rust-semver-1)
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 03/11] gnu: tree-sitter-bash: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:bcc419727baa22797cfeead7e3ec0b70a1d432ac.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-bash): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ffed09d945..8de3383e46 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -385,8 +385,8 @@ (define-public tree-sitter-heex
 (define-public tree-sitter-bash
   (tree-sitter-grammar
    "bash" "Bash"
-   "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5"
-   "0.19.0"))
+   "11gjjaf9hrsw3rd774c3gq27im2j9gxmkn59wcpg4nwni60p0vjh"
+   "0.20.0"))
 
 (define-public tree-sitter-c-sharp
   (tree-sitter-grammar
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 04/11] gnu: tree-sitter-c-sharp: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:053ecf1ab0da4abcfb9f1b0fb25236fd1a699aa9.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-c-sharp): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 8de3383e46..a3b4c27138 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -391,8 +391,8 @@ (define-public tree-sitter-bash
 (define-public tree-sitter-c-sharp
   (tree-sitter-grammar
    "c-sharp" "C#"
-   "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r"
-   "0.19.1"))
+   "0lijbi5q49g50ji00p2lb45rvd76h07sif3xjl9b31yyxwillr6l"
+   "0.20.0"))
 
 (define-public tree-sitter-elm
   (tree-sitter-grammar
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 05/11] gnu: tree-sitter-java: Update to 0.20.1.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:68fb57dff8cad1f73b9a20d6f4ac9bcad55133d2.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-java): Update to 0.20.1.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index a3b4c27138..27ac89ed21 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -432,8 +432,8 @@ (define-public tree-sitter-haskell
 (define-public tree-sitter-java
   (tree-sitter-grammar
    "java" "Java"
-   "1i9zfgqibinz3rkx6yws1wk49iys32x901dki65qihbxcmcfh341"
-   "0.20.0"))
+   "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l"
+   "0.20.1"))
 
 (define-public tree-sitter-json
   ;; Not tagged
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 06/11] gnu: tree-sitter-typescript: Update to 0.20.2.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:939be50b16ae64b86c66b5a1c91115bb5ef0ef5e.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-typescript): Update to 0.20.2.
(tree-sitter-javascript): Update to 0.20.0-14.7a29d06.
---
 gnu/packages/tree-sitter.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 27ac89ed21..53e2120207 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -314,17 +314,20 @@ (define-public tree-sitter-html
    "0.19.0"))
 
 (define-public tree-sitter-javascript
+  ;; Required by tree-sitter-typescript.
+  (let ((commit "7a29d06274b7cf87d643212a433d970b73969016")
+        (revision "14"))
   (tree-sitter-grammar
    "javascript" "JavaScript(JSX)"
-   "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"
-   "0.20.0"
-   #:commit "rust-0.20.0"))
+   "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
+   (git-version "0.20.0" revision commit)
+   #:commit commit)))
 
 (define-public tree-sitter-typescript
   (tree-sitter-grammar
    "typescript" "TypeScript and TSX"
-   "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x"
-   "0.20.1"
+   "0934c35as3wgakqw20ilii8lvby5ns36mmqsxjwz8zg5zfsq14vj"
+   "0.20.2"
    #:inputs (list tree-sitter-javascript)
    #:grammar-directories '("typescript" "tsx")))
 
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 07/11] gnu: tree-sitter-python: Update to 0.20.4.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:5cb99dda4dffe4a9b66ce1780a368bad3abbc666.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-python): Update to 0.20.4.

---

gnu/packages/tree-sitter.scm | 8 ++------

1 file changed, 2 insertions(+), 6 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 53e2120207..f367e69809 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -471,14 +471,10 @@ (define-public tree-sitter-php
      #:commit commit)))
 
 (define-public tree-sitter-python
-  ;; There are a lot of additions, the last tag was placed a while ago
-  (let ((commit "9e53981ec31b789ee26162ea335de71f02186003")
-        (revision "0"))
     (tree-sitter-grammar
      "python" "Python"
-     "1lv3pgb7h2a0f121897r0lwc228rjwb77y3a6g3ghifx1rgbwvqg"
-     (git-version "0.20.0" revision commit)
-     #:commit commit)))
+     "1sxz3npk3mq86abcnghfjs38nzahx7nrn3wdh8f8940hy71d0pvi"
+     "0.20.4"))
 
 (define-public tree-sitter-r
   ;; No tags
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 08/11] gnu: tree-sitter-cpp: Update to 0.20.3.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:de002b7a14e85ffdecda40b869c34ad683c9f129.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-cpp): Update to 0.20.3.
(tree-sitter-c): Update to 0.20.6.
---
 gnu/packages/tree-sitter.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index f367e69809..19af0b26b7 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -351,19 +351,15 @@ (define-public tree-sitter-css
 (define-public tree-sitter-c
   (tree-sitter-grammar
    "c" "C"
-   "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v"
-   "0.20.2"))
+   "00mhz2rz98pxssgyhm0iymgcb8cbv8slsf3nmfgyjhfchpmb9n6z"
+   "0.20.6"))
 
 (define-public tree-sitter-cpp
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "56cec4c2eb5d6af3d2942e69e35db15ae2433740")
-        (revision "0"))
       (tree-sitter-grammar
        "cpp" "C++"
-       "0c5iwg9j6naivvr18glfp095x32nfl9hbw0q02rhh1b59fkpjs09"
-       (git-version "0.20.0" revision commit)
-       #:commit commit
-       #:inputs (list tree-sitter-c))))
+       "0fsb6la0da3azh7m9p1w3w079bpg6074dy8jisjw1yq1w1r9grxy"
+       "0.20.3"
+       #:inputs (list tree-sitter-c)))
 
 (define-public tree-sitter-elixir
   ;; No tags at all, version in the source code is 0.19.0
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:00 +0200

[PATCH v4 09/11] gnu: tree-sitter-go: Update to 0.20.0.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:b9fe9860cf7373705b8ec4d39795daf67a56468e.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-go): Update to 0.20.0.

---

gnu/packages/tree-sitter.scm | 8 ++------

1 file changed, 2 insertions(+), 6 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 19af0b26b7..8d4862f810 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -409,14 +409,10 @@ (define-public tree-sitter-gomod
    #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git"))
 
 (define-public tree-sitter-go
-  ;; There are a lot of additions, the last tag was placed more than 1 year ago
-  (let ((commit "64457ea6b73ef5422ed1687178d4545c3e91334a")
-        (revision "0"))
     (tree-sitter-grammar
      "go" "Go"
-     "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz"
-     (git-version "0.19.1" revision commit)
-     #:commit commit)))
+     "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
+     "0.20.0"))
 
 (define-public tree-sitter-haskell
   ;; There are a lot of additions, the last tag was placed more than 4 years ago
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:01 +0200

[PATCH v4 10/11] gnu: tree-sitter-rust: Update to 0.20.4.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:b26bc7f03dc87705f077036b33b981409bbcc727.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter-rust): Update to 0.20.4.

---

gnu/packages/tree-sitter.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (17 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 8d4862f810..bb845b104d 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -491,8 +491,8 @@ (define-public tree-sitter-ruby
 (define-public tree-sitter-rust
   (tree-sitter-grammar
    "rust" "Rust"
-   "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f"
-   "0.20.3"))
+   "1pk4mb3gh62xk0qlhxa8ihhxvnf7grrcchwg2xv99yy6yb3yh26b"
+   "0.20.4"))
 
 (define-public tree-sitter-clojure
   (tree-sitter-grammar
-- 
2.41.0

Hilton Chain wrote on 20 Aug 16:01 +0200

[PATCH v4 11/11] gnu: tree-sitter: Re-indent.

Recipients:(address . 64905@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:507ddb533782784555f99155c0047cb5066f22d5.1692539095.git.hako@ultrarare.space

* gnu/packages/tree-sitter.scm (tree-sitter,tree-sitter-javascript)
(tree-sitter-cpp,tree-sitter-go,tree-sitter-python): Re-indent.
---
 gnu/packages/tree-sitter.scm | 98 ++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

Toggle diff (146 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index bb845b104d..44ba11f1a9 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -96,36 +96,36 @@ (define-public python-tree-sitter
 (define-public tree-sitter
   ;; Untagged
   (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))
-  (package
-    (name "tree-sitter")
-    (version "0.20.10")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/tree-sitter/tree-sitter")
-                    (commit commit)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
-              (modules '((guix build utils)))
-              (snippet #~(begin
-                           ;; Remove bundled ICU parts
-                           (delete-file-recursively "lib/src/unicode")))))
-    (build-system gnu-build-system)
-    (inputs (list icu4c))
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure))
-           #:tests? #f ; there are no tests for the runtime library
-           #:make-flags
-           #~(list (string-append "PREFIX=" #$output)
-                   (string-append "CC=" #$(cc-for-target)))))
-    (home-page "https://tree-sitter.github.io/tree-sitter/")
-    (synopsis "Incremental parsing system for programming tools")
-    (description
-     "Tree-sitter is a parser generator tool and an incremental parsing
+    (package
+      (name "tree-sitter")
+      (version "0.20.10")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/tree-sitter/tree-sitter")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy"))
+                (modules '((guix build utils)))
+                (snippet #~(begin
+                             ;; Remove bundled ICU parts
+                             (delete-file-recursively "lib/src/unicode")))))
+      (build-system gnu-build-system)
+      (inputs (list icu4c))
+      (arguments
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure))
+             #:tests? #f ; there are no tests for the runtime library
+             #:make-flags
+             #~(list (string-append "PREFIX=" #$output)
+                     (string-append "CC=" #$(cc-for-target)))))
+      (home-page "https://tree-sitter.github.io/tree-sitter/")
+      (synopsis "Incremental parsing system for programming tools")
+      (description
+       "Tree-sitter is a parser generator tool and an incremental parsing
 library.  It can build a concrete syntax tree for a source file and
 efficiently update the syntax tree as the source file is edited.
 
@@ -140,7 +140,7 @@ (define-public tree-sitter
 @end itemize
 
 This package includes the @code{libtree-sitter} runtime library.")
-    (license license:expat))))
+      (license license:expat))))
 
 (define-public tree-sitter-cli
   (package
@@ -317,11 +317,11 @@ (define-public tree-sitter-javascript
   ;; Required by tree-sitter-typescript.
   (let ((commit "7a29d06274b7cf87d643212a433d970b73969016")
         (revision "14"))
-  (tree-sitter-grammar
-   "javascript" "JavaScript(JSX)"
-   "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
-   (git-version "0.20.0" revision commit)
-   #:commit commit)))
+    (tree-sitter-grammar
+     "javascript" "JavaScript(JSX)"
+     "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
+     (git-version "0.20.0" revision commit)
+     #:commit commit)))
 
 (define-public tree-sitter-typescript
   (tree-sitter-grammar
@@ -355,11 +355,11 @@ (define-public tree-sitter-c
    "0.20.6"))
 
 (define-public tree-sitter-cpp
-      (tree-sitter-grammar
-       "cpp" "C++"
-       "0fsb6la0da3azh7m9p1w3w079bpg6074dy8jisjw1yq1w1r9grxy"
-       "0.20.3"
-       #:inputs (list tree-sitter-c)))
+  (tree-sitter-grammar
+   "cpp" "C++"
+   "0fsb6la0da3azh7m9p1w3w079bpg6074dy8jisjw1yq1w1r9grxy"
+   "0.20.3"
+   #:inputs (list tree-sitter-c)))
 
 (define-public tree-sitter-elixir
   ;; No tags at all, version in the source code is 0.19.0
@@ -409,10 +409,10 @@ (define-public tree-sitter-gomod
    #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git"))
 
 (define-public tree-sitter-go
-    (tree-sitter-grammar
-     "go" "Go"
-     "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
-     "0.20.0"))
+  (tree-sitter-grammar
+   "go" "Go"
+   "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv"
+   "0.20.0"))
 
 (define-public tree-sitter-haskell
   ;; There are a lot of additions, the last tag was placed more than 4 years ago
@@ -463,10 +463,10 @@ (define-public tree-sitter-php
      #:commit commit)))
 
 (define-public tree-sitter-python
-    (tree-sitter-grammar
-     "python" "Python"
-     "1sxz3npk3mq86abcnghfjs38nzahx7nrn3wdh8f8940hy71d0pvi"
-     "0.20.4"))
+  (tree-sitter-grammar
+   "python" "Python"
+   "1sxz3npk3mq86abcnghfjs38nzahx7nrn3wdh8f8940hy71d0pvi"
+   "0.20.4"))
 
 (define-public tree-sitter-r
   ;; No tags
-- 
2.41.0

Christopher Baines wrote 64 minutes ago

Re: [bug#64905] [PATCH v4 02/11] gnu: tree-sitter: Update to 0.20.10.

Recipients:(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:87cyy3ew4n.fsf@cbaines.net

Hilton Chain via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (28 lines)> * gnu/packages/tree-sitter.scm (tree-sitter): Update to 0.20.10.
> (tree-sitter-cli)[arguments]<#:cargo-test-flags>: Skip github_issue_test.
> <#:cargo-inputs>: Add rust-path-slash-0.2.
> ---
>  gnu/packages/tree-sitter.scm | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index 117c2acb0c..ffed09d945 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -94,18 +94,20 @@ (define-public python-tree-sitter
>      (license license:expat)))
>  
>  (define-public tree-sitter
> +  ;; Untagged
> +  (let ((commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))
>    (package
>      (name "tree-sitter")
> -    (version "0.20.8")
> +    (version "0.20.10")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
>                      (url "https://github.com/tree-sitter/tree-sitter")
> -                    (commit (string-append "v" version))))
> +                    (commit commit)))

If this is just a case of upstream "releasing", but not tagging the
commit, I'd just put the commit in on this line. You don't need the (let
((commit ... pattern unless you're incorporating the commit in to the
version.

Christopher Baines wrote 61 minutes ago

Re: [bug#64905] [PATCH v4 06/11] gnu: tree-sitter-typescript: Update to 0.20.2.

Recipients:(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:878r8rew1m.fsf@cbaines.net

Hilton Chain via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (5 lines)

> (define-public tree-sitter-javascript

> + ;; Required by tree-sitter-typescript.

> + (let ((commit "7a29d06274b7cf87d643212a433d970b73969016")

> + (revision "14"))

I'd use revision 0 or 1 to start with.

Toggle quote (8 lines)>    (tree-sitter-grammar
>     "javascript" "JavaScript(JSX)"
> -   "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67"
> -   "0.20.0"
> -   #:commit "rust-0.20.0"))
> +   "1pk6d9g6a7bzhxmwnvfiycarcgz76wq2rgfqr0xjh7y7swfw5hvw"
> +   (git-version "0.20.0" revision commit)
> +   #:commit commit)))

Christopher Baines wrote 57 minutes ago

Re: [bug#64905] [PATCH v4 00/11] Update tree-sitter{, -{bash, c{, pp, -sharp}, go, java, {java, type}script, python, rust}},

Recipients:(name . Hilton Chain)(address . hako@ultrarare.space)

Message-ID:87wmwbdha3.fsf@cbaines.net

Hilton Chain via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (38 lines)> V3 -> V4:
>   - tree-sitter-bash@0.20.0,
>     tree-sitter-c@0.20.6,
>     tree-sitter-cpp@0.20.3,
>     tree-sitter-python@0.20.4,
>     tree-sitter-rust@0.20.4.
>
> V2 -> V3:
>   - tree-sitter-c@0.20.5.
>   - Re-indent code in a separate commit to produce more readable diffs.
>
> V1 -> V2:
>   - Merge tree-sitter-javascript and tree-sitter-typescript updates into one
> commit.
>   - Merge tree-sitter-c and tree-sitter-cpp updates into one commit.
>   Each case updating the former package breaks build of the latter's old
> version.
>
> Hilton Chain (11):
>   gnu: Add rust-path-slash-0.2.
>   gnu: tree-sitter: Update to 0.20.10.
>   gnu: tree-sitter-bash: Update to 0.20.0.
>   gnu: tree-sitter-c-sharp: Update to 0.20.0.
>   gnu: tree-sitter-java: Update to 0.20.1.
>   gnu: tree-sitter-typescript: Update to 0.20.2.
>   gnu: tree-sitter-python: Update to 0.20.4.
>   gnu: tree-sitter-cpp: Update to 0.20.3.
>   gnu: tree-sitter-go: Update to 0.20.0.
>   gnu: tree-sitter-rust: Update to 0.20.4.
>   gnu: tree-sitter: Re-indent.
>
>  gnu/packages/crates-io.scm   |  22 ++++++
>  gnu/packages/tree-sitter.scm | 141 +++++++++++++++++------------------
>  2 files changed, 90 insertions(+), 73 deletions(-)
>
>
> base-commit: ad5e4fe54a66c725dc03dedebf8e5c65723ccb74

I've made a few comments on individual patches, but apart from those

issues, overall this looks good to me.

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 64905@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date