[bug#66836] [Patch] gnu: Add tree-sitter-yaml.

unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed

* [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
@ 2023-10-29 20:47 Emma Turner via Guix-patches via
  2023-11-04 12:15 ` Hilton Chain via Guix-patches via
  2023-11-04 12:22 ` [bug#66836] [PATCH v2] " Hilton Chain via Guix-patches via
  0 siblings, 2 replies; 7+ messages in thread
From: Emma Turner via Guix-patches via @ 2023-10-29 20:47 UTC (permalink / raw)
  To: 66836

[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]

* gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.

Change-Id: Id48040eee325b0cdb435d8693caf48c9654cf14c
---
gnu/packages/tree-sitter.scm | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 41257d42f1..608f8b6519 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com>
+;;; Copyright © 2023 Emma Turner <mail@emturner.co.uk>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -629,3 +630,11 @@ (define-public tree-sitter-scala
"scala" "Scala"
"0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz"
"0.20.2"))
+
+(define-public tree-sitter-yaml
+ (tree-sitter-grammar
+ "yaml" "Yaml"
+ "1ay4snkd2s4pid7pcr4bgx0y9cj7b5vlgd7wfc1j0896l0p61cjb"
+ "0.5.0"
+ #:repository-url "https://github.com/emturner/tree-sitter-yaml"
+ #:commit "f53859209fef065b677995802842a2b65314defb"))

base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d
--2.41.0

[-- Attachment #2: Type: text/html, Size: 2762 bytes --]

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
  2023-10-29 20:47 [bug#66836] [Patch] gnu: Add tree-sitter-yaml Emma Turner via Guix-patches via
@ 2023-11-04 12:15 ` Hilton Chain via Guix-patches via
  2023-11-04 18:05   ` Emma Turner via Guix-patches via
  2023-11-18  7:42   ` Andrew Tropin
  2023-11-04 12:22 ` [bug#66836] [PATCH v2] " Hilton Chain via Guix-patches via
  1 sibling, 2 replies; 7+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-11-04 12:15 UTC (permalink / raw)
  To: Emma Turner; +Cc: 66836

Hi Emma,

On Mon, 30 Oct 2023 04:47:34 +0800,
Emma Turner via Guix-patches via wrote:
>
> [1  <text/plain; utf-8 (base64)>]
> [2  <text/html; utf-8 (base64)>]
> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>
> Change-Id: Id48040eee325b0cdb435d8693caf48c9654cf14c
> ---
>  gnu/packages/tree-sitter.scm | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index 41257d42f1..608f8b6519 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -7,6 +7,7 @@
>  ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
>  ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
>  ;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com>
> +;;; Copyright © 2023 Emma Turner <mail@emturner.co.uk>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -629,3 +630,11 @@ (define-public tree-sitter-scala
>     "scala" "Scala"
>     "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz"
>     "0.20.2"))
> +
> +(define-public tree-sitter-yaml
> +  (tree-sitter-grammar
> +   "yaml" "Yaml"
> +   "1ay4snkd2s4pid7pcr4bgx0y9cj7b5vlgd7wfc1j0896l0p61cjb"
> +   "0.5.0"
> +   #:repository-url "https://github.com/emturner/tree-sitter-yaml"
> +   #:commit "f53859209fef065b677995802842a2b65314defb"))
>
> base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d
> --
> 2.41.0


There seem to be formatting issue in your patch, making the last two lines
embedded into one: "--2.41.0".  You can have a look at it in [1].

I think your changes can be shipped as a patch with Guix.  Maybe you can open a
PR to upstream as well? :)

I have modified your commit since we don't have to clone the submodule and
generated files in src/ are deleted.  I will send v2 for the change.

Thanks
---
[1]: https://issues.guix.gnu.org/66836




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
  2023-11-04 12:15 ` Hilton Chain via Guix-patches via
@ 2023-11-04 18:05   ` Emma Turner via Guix-patches via
  2023-11-18  7:42   ` Andrew Tropin
  1 sibling, 0 replies; 7+ messages in thread
From: Emma Turner via Guix-patches via @ 2023-11-04 18:05 UTC (permalink / raw)
  To: hako; +Cc: 66836

[-- Attachment #1: Type: text/plain, Size: 1948 bytes --]

Hi Hilton,

Thanks so much! Having the test fixes as its own patches makes complete sense.

I will try open a PR to see if the fixes can get upstreamed, and open a future patch of it does get merged.

Thanks,
Emma

-------- Original Message --------
On 4 Nov 2023, 12:15, Hilton Chain wrote:

> Hi Emma, On Mon, 30 Oct 2023 04:47:34 +0800, Emma Turner via Guix-patches via wrote: > > [1 ] > [2 ] > * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable. > > Change-Id: Id48040eee325b0cdb435d8693caf48c9654cf14c > --- > gnu/packages/tree-sitter.scm | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm > index 41257d42f1..608f8b6519 100644 > --- a/gnu/packages/tree-sitter.scm > +++ b/gnu/packages/tree-sitter.scm > @@ -7,6 +7,7 @@ > ;;; Copyright © 2023 Nicolas Graves  > ;;; Copyright © 2023 Zheng Junjie > ;;; Copyright © 2023 Raven Hallsby  > +;;; Copyright © 2023 Emma Turner  > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -629,3 +630,11 @@ (define-public tree-sitter-scala > "scala" "Scala" > "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz" > "0.20.2")) > + > +(define-public tree-sitter-yaml > + (tree-sitter-grammar > + "yaml" "Yaml" > + "1ay4snkd2s4pid7pcr4bgx0y9cj7b5vlgd7wfc1j0896l0p61cjb" > + "0.5.0" > + #:repository-url "https://github.com/emturner/tree-sitter-yaml" > + #:commit "f53859209fef065b677995802842a2b65314defb")) > > base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d > -- > 2.41.0 There seem to be formatting issue in your patch, making the last two lines embedded into one: "--2.41.0". You can have a look at it in [1]. I think your changes can be shipped as a patch with Guix. Maybe you can open a PR to upstream as well? :) I have modified your commit since we don't have to clone the submodule and generated files in src/ are deleted. I will send v2 for the change. Thanks --- [1]: https://issues.guix.gnu.org/66836

[-- Attachment #2: Type: text/html, Size: 2286 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
  2023-11-04 12:15 ` Hilton Chain via Guix-patches via
  2023-11-04 18:05   ` Emma Turner via Guix-patches via
@ 2023-11-18  7:42   ` Andrew Tropin
  2023-11-18 10:45     ` Hilton Chain via Guix-patches via
  1 sibling, 1 reply; 7+ messages in thread
From: Andrew Tropin @ 2023-11-18  7:42 UTC (permalink / raw)
  To: Hilton Chain, Emma Turner; +Cc: 66836

[-- Attachment #1: Type: text/plain, Size: 2266 bytes --]

On 2023-11-04 20:15, Hilton Chain via Guix-patches via wrote:

> Hi Emma,
>
> On Mon, 30 Oct 2023 04:47:34 +0800,
> Emma Turner via Guix-patches via wrote:
>>
>> [1  <text/plain; utf-8 (base64)>]
>> [2  <text/html; utf-8 (base64)>]
>> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>>
>> Change-Id: Id48040eee325b0cdb435d8693caf48c9654cf14c
>> ---
>>  gnu/packages/tree-sitter.scm | 9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
>> index 41257d42f1..608f8b6519 100644
>> --- a/gnu/packages/tree-sitter.scm
>> +++ b/gnu/packages/tree-sitter.scm
>> @@ -7,6 +7,7 @@
>>  ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
>>  ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
>>  ;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com>
>> +;;; Copyright © 2023 Emma Turner <mail@emturner.co.uk>
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -629,3 +630,11 @@ (define-public tree-sitter-scala
>>     "scala" "Scala"
>>     "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz"
>>     "0.20.2"))
>> +
>> +(define-public tree-sitter-yaml
>> +  (tree-sitter-grammar
>> +   "yaml" "Yaml"
>> +   "1ay4snkd2s4pid7pcr4bgx0y9cj7b5vlgd7wfc1j0896l0p61cjb"
>> +   "0.5.0"
>> +   #:repository-url "https://github.com/emturner/tree-sitter-yaml"
>> +   #:commit "f53859209fef065b677995802842a2b65314defb"))
>>
>> base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d
>> --
>> 2.41.0
>
>
> There seem to be formatting issue in your patch, making the last two lines
> embedded into one: "--2.41.0".  You can have a look at it in [1].
>
> I think your changes can be shipped as a patch with Guix.  Maybe you can open a
> PR to upstream as well? :)

It seems that https://github.com/ikatyang/tree-sitter-yaml is
unmaintained, that's probably why I didn't add this grammar earlier.

So maybe forking and taking a maintainance is not a bad idea.

>
> I have modified your commit since we don't have to clone the submodule and
> generated files in src/ are deleted.  I will send v2 for the change.
>
> Thanks
> ---
> [1]: https://issues.guix.gnu.org/66836
>
>
>

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#66836] [Patch] gnu: Add tree-sitter-yaml.
  2023-11-18  7:42   ` Andrew Tropin
@ 2023-11-18 10:45     ` Hilton Chain via Guix-patches via
  0 siblings, 0 replies; 7+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-11-18 10:45 UTC (permalink / raw)
  To: Andrew Tropin; +Cc: Emma Turner, 66836

Hi Andrew,

On Sat, 18 Nov 2023 15:42:20 +0800,
Andrew Tropin wrote:
>
> > There seem to be formatting issue in your patch, making the last two lines
> > embedded into one: "--2.41.0".  You can have a look at it in [1].
> >
> > I think your changes can be shipped as a patch with Guix.  Maybe you can open a
> > PR to upstream as well? :)
>
> It seems that https://github.com/ikatyang/tree-sitter-yaml is
> unmaintained, that's probably why I didn't add this grammar earlier.
>
> So maybe forking and taking a maintainance is not a bad idea.

I have found the first tree-sitter commit causing the test failures, it's
0fb864c1a0a5a53a951e3bf830fdbdc5edac385d (v0.20.4-9-g0fb864c1), there's also
open issue for it[1].

And the tree-sitter-yaml repository actually has some relevant activity this
July[2].

Thanks
---
[1]:
Regression in YAML parsing with web-tree-sitter + tree-sitter-yaml
https://github.com/tree-sitter/tree-sitter/issues/2339

[2]:
https://github.com/ikatyang/tree-sitter-yaml/tree/feat/error-recovery




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml.
  2023-10-29 20:47 [bug#66836] [Patch] gnu: Add tree-sitter-yaml Emma Turner via Guix-patches via
  2023-11-04 12:15 ` Hilton Chain via Guix-patches via
@ 2023-11-04 12:22 ` Hilton Chain via Guix-patches via
  2023-11-12 15:02   ` Hilton Chain via Guix-patches via
  1 sibling, 1 reply; 7+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-11-04 12:22 UTC (permalink / raw)
  To: 66836
  Cc: Emma Turner, Hilton Chain, Emma Turner, Hilton Chain,
	Andrew Tropin, Katherine Cox-Buday, Liliana Marie Prikler

From: Emma Turner <mail@emturner.co.uk>

* gnu/packages/patches/tree-sitter-yaml-fix-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.

Modified-by: Hilton Chain <hako@ultrarare.space>
Change-Id: I45a4a843ecee9dfa580eeaa352f1354915f83881
---
 gnu/local.mk                                  |   1 +
 .../patches/tree-sitter-yaml-fix-tests.patch  | 690 ++++++++++++++++++
 gnu/packages/tree-sitter.scm                  |  15 +
 3 files changed, 706 insertions(+)
 create mode 100644 gnu/packages/patches/tree-sitter-yaml-fix-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8d817379a7..a5b5afd84b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2045,6 +2045,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/tofi-32bit-compat.patch			\
   %D%/packages/patches/tpetra-remove-duplicate-using.patch	\
   %D%/packages/patches/transcode-ffmpeg.patch	\
+  %D%/packages/patches/tree-sitter-yaml-fix-tests.patch	\
   %D%/packages/patches/trytond-add-egg-modules-to-path.patch	\
   %D%/packages/patches/trytond-add-guix_trytond_path.patch	\
   %D%/packages/patches/ttf2eot-cstddef.patch			\
diff --git a/gnu/packages/patches/tree-sitter-yaml-fix-tests.patch b/gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
new file mode 100644
index 0000000000..c658729bab
--- /dev/null
+++ b/gnu/packages/patches/tree-sitter-yaml-fix-tests.patch
@@ -0,0 +1,690 @@
+From 67e0bec12812921672776cf2dd8dfa79e27f6360 Mon Sep 17 00:00:00 2001
+From: Emma Turner <mail@emturner.co.uk>
+Date: Sun, 29 Oct 2023 16:40:30 +0000
+Subject: [PATCH] fix tests for tree-sitter 0.20.8
+
+---
+ corpus/spec.txt | 492 +++++++++++++++++++-----------------------------
+ 1 file changed, 194 insertions(+), 298 deletions(-)
+
+diff --git a/corpus/spec.txt b/corpus/spec.txt
+index ca75d12..8b64bc4 100644
+--- a/corpus/spec.txt
++++ b/corpus/spec.txt
+@@ -654,23 +654,16 @@ map:
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (block_node
+-            (block_mapping
+-              (block_mapping_pair
+-                key: (flow_node
+-                  (plain_scalar
+-                    (string_scalar)))
+-                value: (flow_node
+-                  (double_quote_scalar)))
+-              (ERROR))))))))
++(ERROR
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (flow_node
++      (double_quote_scalar))))
+ 
+ ================================================================================
+ Bad indentation in mapping [INVALID]
+@@ -981,17 +974,13 @@ block scalar: >
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (block_node
+-            (block_scalar)))
+-        (ERROR)))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (block_node
++      (block_scalar))))
+ 
+ ================================================================================
+ Block Sequence in Block Mapping
+@@ -1212,19 +1201,15 @@ key: word1
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (comment)
+-        (ERROR)))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (flow_node
++      (plain_scalar
++        (string_scalar))))
++  (comment))
+ 
+ ================================================================================
+ Comment that looks like a mapping key [INVALID]
+@@ -1234,22 +1219,18 @@ this is #not a: key
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (ERROR
+-          (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (comment)))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (flow_node
++      (plain_scalar
++        (string_scalar))))
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (comment))
+ 
+ ================================================================================
+ Comment without whitespace after block scalar indicator [INVALID]
+@@ -1415,15 +1396,10 @@ key: "missing closing quote
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (ERROR)))))
++(ERROR
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Doublequoted scalar starting with a tab
+@@ -2116,8 +2092,10 @@ Invalid document markers in flow style [INVALID]
+ 
+ --------------------------------------------------------------------------------
+ 
+-(ERROR
+-  (string_scalar))
++(stream
++  (ERROR)
++  (document)
++  (MISSING _eof))
+ 
+ ================================================================================
+ Invalid document-end marker in single quoted string [INVALID]
+@@ -2192,8 +2170,7 @@ invalid: x
+         (string_scalar))))
+   (flow_node
+     (plain_scalar
+-      (string_scalar)))
+-  (string_scalar))
++      (string_scalar))))
+ 
+ ================================================================================
+ Invalid mapping in plain multiline [INVALID]
+@@ -2270,20 +2247,14 @@ invalid
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_sequence
+-        (block_sequence_item
+-          (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (block_sequence_item
+-          (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (ERROR
+-          (string_scalar))))))
++(ERROR
++  (block_sequence_item
++    (flow_node
++      (plain_scalar
++        (string_scalar))))
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Invalid scalar at the end of mapping [INVALID]
+@@ -2295,28 +2266,24 @@ invalid
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
++(ERROR
++  (block_mapping_pair
++    (flow_node
++      (plain_scalar
++        (string_scalar)))
+     (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
++      (block_sequence
++        (block_sequence_item
++          (flow_node
+             (plain_scalar
+-              (string_scalar)))
+-          value: (block_node
+-            (block_sequence
+-              (block_sequence_item
+-                (flow_node
+-                  (plain_scalar
+-                    (string_scalar))))
+-              (block_sequence_item
+-                (flow_node
+-                  (plain_scalar
+-                    (string_scalar)))))))
+-        (ERROR
++              (string_scalar))))
++        (block_sequence_item
+           (flow_node
+             (plain_scalar
+-              (string_scalar))))))))
++              (string_scalar)))))))
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Invalid scalar at the end of sequence [INVALID]
+@@ -2328,26 +2295,17 @@ key:
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (block_node
+-            (block_sequence
+-              (block_sequence_item
+-                (flow_node
+-                  (plain_scalar
+-                    (string_scalar))))
+-              (block_sequence_item
+-                (flow_node
+-                  (plain_scalar
+-                    (string_scalar))))
+-              (ERROR
+-                (string_scalar)))))))))
++(ERROR
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (block_sequence_item
++    (flow_node
++      (plain_scalar
++        (string_scalar))))
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Invalid sequene item on same line as previous item [INVALID]
+@@ -2420,21 +2378,17 @@ invalid
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (ERROR
+-          (flow_node
+-            (plain_scalar
+-              (string_scalar))))))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (flow_node
++      (plain_scalar
++        (string_scalar))))
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Key with anchor after missing explicit mapping value
+@@ -2507,17 +2461,13 @@ block scalar: |
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (block_node
+-            (block_scalar)))
+-        (ERROR)))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (block_node
++      (block_scalar))))
+ 
+ ================================================================================
+ Literal unicode
+@@ -2647,27 +2597,23 @@ top2
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (block_node
+       (block_mapping
+         (block_mapping_pair
+           key: (flow_node
+             (plain_scalar
+               (string_scalar)))
+-          value: (block_node
+-            (block_mapping
+-              (block_mapping_pair
+-                key: (flow_node
+-                  (plain_scalar
+-                    (string_scalar)))
+-                value: (flow_node
+-                  (plain_scalar
+-                    (string_scalar)))))))
+-        (ERROR
+-          (flow_node
++          value: (flow_node
+             (plain_scalar
+-              (string_scalar))))))))
++              (string_scalar)))))))
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Missing comma in flow [INVALID]
+@@ -2678,19 +2624,14 @@ key: [ word1
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (ERROR
+-          (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          (comment))))))
++(ERROR
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (comment))
+ 
+ ================================================================================
+ Missing document-end marker before directive [INVALID]
+@@ -2703,17 +2644,11 @@ scalar2
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document)
+-  (ERROR
+-    (flow_node
+-      (plain_scalar
+-        (string_scalar)))
+-    (comment))
+-  (document
+-    (flow_node
+-      (plain_scalar
+-        (string_scalar)))))
++(ERROR
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (comment))
+ 
+ ================================================================================
+ Missing space in YAML directive
+@@ -2924,18 +2859,14 @@ Multiline double quoted implicit keys [INVALID]
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (double_quote_scalar
+-              (escape_sequence)))
+-          value: (flow_node
+-            (plain_scalar
+-              (integer_scalar))))
+-        (ERROR)))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (double_quote_scalar
++        (escape_sequence)))
++    value: (flow_node
++      (plain_scalar
++        (integer_scalar)))))
+ 
+ ================================================================================
+ Multiline doublequoted flow mapping key without value
+@@ -3207,17 +3138,13 @@ Multiline single quoted implicit keys [INVALID]
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (single_quote_scalar))
+-          value: (flow_node
+-            (plain_scalar
+-              (integer_scalar))))
+-        (ERROR)))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (single_quote_scalar))
++    value: (flow_node
++      (plain_scalar
++        (integer_scalar)))))
+ 
+ ================================================================================
+ Multiple Entry Block Sequence
+@@ -3529,19 +3456,16 @@ key: &x
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (flow_node
+-            (anchor
+-              (anchor_name))))
+-        (ERROR
+-          (tag))))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (flow_node
++      (anchor
++        (anchor_name))))
++  (flow_node
++    (tag)))
+ 
+ ================================================================================
+ Node and Mapping Key Anchors
+@@ -3922,40 +3846,34 @@ top2: &node2
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (block_node
++      (anchor
++        (anchor_name))
+       (block_mapping
+         (block_mapping_pair
+           key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (block_node
+             (anchor
+               (anchor_name))
+-            (block_mapping
+-              (block_mapping_pair
+-                key: (flow_node
+-                  (anchor
+-                    (anchor_name))
+-                  (plain_scalar
+-                    (string_scalar)))
+-                value: (flow_node
+-                  (plain_scalar
+-                    (string_scalar)))))))
+-        (block_mapping_pair
+-          key: (flow_node
+             (plain_scalar
+               (string_scalar)))
+           value: (flow_node
+-            (anchor
+-              (anchor_name))))
+-        (ERROR
+-          (flow_node
+-            (anchor
+-              (anchor_name))
+             (plain_scalar
+-              (string_scalar))))))))
++              (string_scalar)))))))
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (anchor
++    (anchor_name))
++  (flow_node
++    (anchor
++      (anchor_name))
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Scalars on --- line
+@@ -8728,19 +8646,15 @@ plain: a
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          value: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (comment)
+-        (ERROR)))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (flow_node
++      (plain_scalar
++        (string_scalar))))
++  (comment))
+ 
+ ================================================================================
+ Trailing content after quoted value [INVALID]
+@@ -9607,20 +9521,13 @@ c]
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (ERROR
+-          (flow_node
+-            (plain_scalar
+-              (string_scalar)))
+-          (string_scalar)
+-          (string_scalar))))))
++(ERROR
++  (flow_node
++    (plain_scalar
++      (string_scalar)))
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Wrong indented multiline quoted scalar [INVALID]
+@@ -9632,17 +9539,10 @@ c"
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (document
+-    (block_node
+-      (block_mapping
+-        (block_mapping_pair
+-          key: (flow_node
+-            (plain_scalar
+-              (string_scalar))))
+-        (ERROR
+-          (string_scalar)
+-          (string_scalar))))))
++(ERROR
++  (flow_node
++    (plain_scalar
++      (string_scalar))))
+ 
+ ================================================================================
+ Wrong indented sequence item [INVALID]
+@@ -9671,18 +9571,14 @@ key: value
+ 
+ --------------------------------------------------------------------------------
+ 
+-(stream
+-  (ERROR
+-    (block_mapping_pair
+-      key: (flow_node
+-        (plain_scalar
+-          (string_scalar)))
+-      value: (flow_node
+-        (plain_scalar
+-          (string_scalar)))))
+-  (document
+-    (yaml_directive
+-      (yaml_version))))
++(ERROR
++  (block_mapping_pair
++    key: (flow_node
++      (plain_scalar
++        (string_scalar)))
++    value: (flow_node
++      (plain_scalar
++        (string_scalar)))))
+ 
+ ================================================================================
+ Zero indented block scalar
+
+base-commit: 6129a83eeec7d6070b1c0567ec7ce3509ead607c
+-- 
+2.41.0
+
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 41257d42f1..f2bfff748b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com>
+;;; Copyright © 2023 Emma Turner <mail@emturner.co.uk>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -629,3 +630,17 @@ (define-public tree-sitter-scala
    "scala" "Scala"
    "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz"
    "0.20.2"))
+
+(define-public tree-sitter-yaml
+  (let ((base (tree-sitter-grammar
+               "yaml" "Yaml"
+               "1bimf5fq85wn8dwlk665w15n2bj37fma5rsfxrph3i9yb0lvzi3q"
+               "0.5.0"
+               #:repository-url
+               "https://github.com/ikatyang/tree-sitter-yaml")))
+    (package
+      (inherit base)
+      (source (origin
+                (inherit (package-source base))
+                (patches
+                 (search-patches "tree-sitter-yaml-fix-tests.patch")))))))

base-commit: 9dcd8802f5bc472579f23a38dcf437f8a9ac976c
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml.
  2023-11-04 12:22 ` [bug#66836] [PATCH v2] " Hilton Chain via Guix-patches via
@ 2023-11-12 15:02   ` Hilton Chain via Guix-patches via
  0 siblings, 0 replies; 7+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-11-12 15:02 UTC (permalink / raw)
  To: Emma Turner
  Cc: 66836, Andrew Tropin, Katherine Cox-Buday, Liliana Marie Prikler

Hi Emma,

Tests currently fail on aarch64-linux[1], which can be reproduced with
`./pre-inst-env guix build tree-sitter-yaml --system=aarch64-linux`.

Any ideas?

On Sat, 04 Nov 2023 20:22:10 +0800,
Hilton Chain wrote:
>
> From: Emma Turner <mail@emturner.co.uk>
>
> * gnu/packages/patches/tree-sitter-yaml-fix-tests.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> * gnu/packages/tree-sitter.scm (tree-sitter-yaml): New variable.
>
> Modified-by: Hilton Chain <hako@ultrarare.space>
> Change-Id: I45a4a843ecee9dfa580eeaa352f1354915f83881
> ---
>  gnu/local.mk                                  |   1 +
>  .../patches/tree-sitter-yaml-fix-tests.patch  | 690 ++++++++++++++++++
>  gnu/packages/tree-sitter.scm                  |  15 +
>  3 files changed, 706 insertions(+)
>  create mode 100644 gnu/packages/patches/tree-sitter-yaml-fix-tests.patch

Thanks
---
[1]:
https://bordeaux.guix.gnu.org/build/206a6c33-c95a-4f7f-8e15-30e7b5662634/log
--8<---------------cut here---------------start------------->8---
--- expected / +++ actual

  1. Spec Example 9.3. Bare Documents:

    (stream
      (document
        (flow_node
          (plain_scalar
            (string_scalar))))
      (comment)
      (document)
      (document
        (block_node
+++       (block_scalar)))
+++   (MISSING _eof))
---       (block_scalar))))


  2. Spec Example 9.5. Directives Documents:

    (stream
      (document
        (yaml_directive
          (yaml_version))
        (block_node
          (block_scalar)))
+++   (MISSING _eof))
---   (document
---     (yaml_directive
---       (yaml_version))
---     (comment)))


  3. Zero indented block scalar:

    (stream
      (document
        (block_node
+++       (block_scalar)))
+++   (MISSING _eof))
---       (block_scalar))))


  4. Zero indented block scalar with line that looks like a comment:

    (stream
      (document
        (block_node
+++       (block_scalar)))
+++   (MISSING _eof))
---       (block_scalar))))
--8<---------------cut here---------------end--------------->8---




^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-11-18 10:46 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-29 20:47 [bug#66836] [Patch] gnu: Add tree-sitter-yaml Emma Turner via Guix-patches via
2023-11-04 12:15 ` Hilton Chain via Guix-patches via
2023-11-04 18:05   ` Emma Turner via Guix-patches via
2023-11-18  7:42   ` Andrew Tropin
2023-11-18 10:45     ` Hilton Chain via Guix-patches via
2023-11-04 12:22 ` [bug#66836] [PATCH v2] " Hilton Chain via Guix-patches via
2023-11-12 15:02   ` Hilton Chain via Guix-patches via

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).