From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id OKL8GdI3RmXC6wAAauVa8A:P1 (envelope-from ) for ; Sat, 04 Nov 2023 13:23:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OKL8GdI3RmXC6wAAauVa8A (envelope-from ) for ; Sat, 04 Nov 2023 13:23:46 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E89AE62CCD for ; Sat, 4 Nov 2023 13:23:45 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=oaifvuCm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699100626; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=fMszT5xBLfXSgDBCDi2FwIdZFZ0d9EcQRbzpIDsYve4=; b=cVQmQrQe4K58uGwKZqO5ewyKgv6gAld8audu/+EhH3+gAwfE6oOwqVPWqQv3N0kUdta+aS HA4aBt4uWp9R3ONH71s6HGI1Mf3lx4FSsWLb9P7fOsPfR/q9A167JZfuIjnAnVAwXzkaxm 5YlK4K+n8rr0jQfupThN0G7GY74Wxk7k8W8+dmgwhoQhwlmlXF57PpM3cxpv4+sHagwZVj U3xGDcm/rhD2iXV2OJh49rV/BAwelIU3YhSZv5XlvukY7BT6NRzFABSBKdzt1hTV75Zfcw 2Tr9TKCgn+rT9J+Wr98UZilJk34ABIt4Ar8mYZdntDYhDItTyt+ZegC8SDOQGg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=oaifvuCm; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699100626; a=rsa-sha256; cv=none; b=N+ejn9TlgrYdBdwu9evH2hZTz3PWwCKrCrO9VHwhFLCdGLCylHPNOlD2HL8fS4/VykNJHp RW2/L4E03Z+kuMg/+zTuLleA3jwJeiA0WxVeES7Mhfw0ys0uSUHT+nySsbalANhIPvlcCp X5F0JzjdMp4O00VbSJKz3wGgblAIVuCPya+lRws/qp+RQo3PhM16SgEypOg705lKSAtf5D M/nbNl0bhszbyWsg84jBO1xVDTPN7ew1rfTG8tiStuEW1BrreFljm0c5l3hkhl4VYF7/Id wFxPvKDRqg8oYABg2qlOiyDAlwdib4yi0YQ653/idFxl4Res/rpps4GIS7QVcQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzFgb-00052P-VS; Sat, 04 Nov 2023 08:23:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzFgZ-00051w-AJ for guix-patches@gnu.org; Sat, 04 Nov 2023 08:23:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzFgX-0007Ai-UI for guix-patches@gnu.org; Sat, 04 Nov 2023 08:23:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzFh4-0000AY-G7; Sat, 04 Nov 2023 08:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66836] [PATCH v2] gnu: Add tree-sitter-yaml. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: mail@emturner.co.uk, hako@ultrarare.space, andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 04 Nov 2023 12:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66836@debbugs.gnu.org Cc: Emma Turner , Hilton Chain , Emma Turner , Hilton Chain , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Emma Turner , Hilton Chain , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 66836-submit@debbugs.gnu.org id=B66836.1699100605568 (code B ref 66836); Sat, 04 Nov 2023 12:24:02 +0000 Received: (at 66836) by debbugs.gnu.org; 4 Nov 2023 12:23:25 +0000 Received: from localhost ([127.0.0.1]:33037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzFgS-000094-82 for submit@debbugs.gnu.org; Sat, 04 Nov 2023 08:23:25 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:55098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzFgP-00008t-EV for 66836@debbugs.gnu.org; Sat, 04 Nov 2023 08:23:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1699100387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fMszT5xBLfXSgDBCDi2FwIdZFZ0d9EcQRbzpIDsYve4=; b=oaifvuCmk21tw7DEF7l1afs0kNWsea9Vu997kxg0pQ2LVsiJmywbMMNpFj5LXrqyKX0ryN fOaGmq2+ChFLlhdtxOkq9QTjVx4j8EgmsqZsIAronTdqFRzz+ELuQD3tOXDDCK6SjDxSlX Lk7qLZw/kTFjVl507zqyUnkvwW9qlAP6hFS7F4Pu/Y7vvUg6GxwYv1v0PFyS5K4B3d3iv1 mU3Al0ClHV6X0CiRM9NxakQEc5p2A+XjK9xmYcaV+2Ph+eaVtFyGVW7+coPCwxqeKbJ9aC FwpnBkcVCliapLUW3CaFEYiVLFilG3PjineyEf00dYf6RRTx2sNlAL41K74W+Q== Date: Sat, 4 Nov 2023 20:22:10 +0800 Message-ID: <75280a68b4a63e51c429b5747a5bb27760f5dccb.1699099224.git.hako@ultrarare.space> In-Reply-To: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk> References: <5Vd2H2MDjpVPQxgawXDNnlt9fABkK8GbS0UOOARnZcHtkl9IJ0iUJjC8YXeO5g4MJ8zAs5c03prTh2cH2bgifUrvfgyuHHrZEzSmHfumWHo=@emturner.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.11 X-Spam-Score: -5.11 X-Migadu-Queue-Id: E89AE62CCD X-Migadu-Scanner: mx13.migadu.com X-TUID: 4DBD4vojyMzt From: Emma Turner * 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 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 +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 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Raven Hallsby +;;; Copyright © 2023 Emma Turner ;;; ;;; 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