From patchwork Thu Feb 10 22:39:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 620 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1ECF027BBEA; Thu, 10 Feb 2022 22:53:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9EF8C27BBE9 for ; Thu, 10 Feb 2022 22:53:24 +0000 (GMT) Received: from localhost ([::1]:35898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIIJX-00061i-OH for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 17:53:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIIJC-00061a-FX for guix-patches@gnu.org; Thu, 10 Feb 2022 17:53:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIIJC-0005eQ-05 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIIJB-0000nk-NC for guix-patches@gnu.org; Thu, 10 Feb 2022 17:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [WIP PATCH v3 00/26] gnu: Add tree-sitter for emacs (and neovim as well?). Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 22:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois , Luis Henrique Gomes Higino Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.16445335433025 (code B ref 49946); Thu, 10 Feb 2022 22:53:01 +0000 Received: (at 49946) by debbugs.gnu.org; 10 Feb 2022 22:52:23 +0000 Received: from localhost ([127.0.0.1]:57486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIIY-0000mj-Uu for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:52:23 -0500 Received: from mout.gmx.net ([212.227.17.22]:35759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIIIX-0000mR-5g for 49946@debbugs.gnu.org; Thu, 10 Feb 2022 17:52:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644533534; bh=uO5uAWE25WBxBMjZ1Tu8i/ep+I0ZJ3UYZKat38QHHsU=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=exe9PUScsNcIn/1Dcy3RZa2UN71yclKQaxVFekw+F2/ES7fQHxLBKw0e3mu1Errwu NklRt/deQvU+KEW+5sEHROuQ7Y1aattO1par9alI+TUZXTrGgFPR8l/oKaqSgVkJcf 7buytVsYBYTG0DfR3H0qOijKofvepfz33kdwh3bk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MWici-1npO2o0V44-00X0NN; Thu, 10 Feb 2022 23:52:14 +0100 References: <87h7fztt60.fsf@gmx.com> <20210808233354.6745-1-pierre.langlois@gmx.com> <20210808233354.6745-7-pierre.langlois@gmx.com> <87czpwzg9e.fsf@gmx.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois Date: Thu, 10 Feb 2022 22:39:36 +0000 In-reply-to: <87czpwzg9e.fsf@gmx.com> Message-ID: <87leyinxly.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:/D52zmkKJrBRiY45tufqgC9MtfHdTOvEhqrLpKfpEFXwmrHM/0W GZZSmGOBbIzNY+lIdTh19Lj8Ibjtn2Uee30cJE+2wrGrvD8uyxyC3nwVIctI0K2bKfnjhh0 HFwxIoXhsoQ4HW/1PYy+CqEm28OpI8Zz2hlPb5+hBmlAwyfqb6L5p66B2SUrv5TVxM3SVSH 0mledHOy9btWPb6GZ9ASw== X-UI-Out-Filterresults: notjunk:1;V03:K0:O0TgFzpvjPw=:qdTGu18SCa1bqOFzn0JyAt D/CDMlxQx0zKvXN9LkR/BYOH6lG9xR3s9dEcCEWlRBSdwiQlXvIIoTpvAKUGUWTZ2SAIDdPc8 4hyk7juAlSpCk365+RjLd8UjYWBZrUVTZ4D0RYkGeXTaiXKl8UJBDzz+3XDVDoiYFbZcxKfbA cMZMZkX/wesllOzRhXjH7xFeM3srRQuswrtn0rei96gVzd7dvD31MROCWKZfVHNu0hBIOs7IU W/Mtx+yY4mzUX1PACSbW5DCT7Ob6JaZrZtGpQ7JMUJRo41U330j7lNAWBgxIlfQouNUymxIG1 H7sia0s0fNw12aOUw7P9bBgRSkC9KpasAdxKRKZo4kFXOOjWeA5tSJmxaXakIbx7fKcd+Ye+c DPXJzNbMYL9O7NHYq38MxlrBPpaLTJeP4ai3kAwtZd2lqU8qrpxeFI1slNCX7omJwCNQwN79U xHWv4Bv0hQ55moTpRSS5O22p1UE/rPhemZVrcDKWudxC2S7LZIBhkeBN8KwgB+W573JndJRjF 3qqj4qzrF6vlGWgbQ8CXb6QqdHW/Z2m01RXYWnR/lA3m5VjEc2kyzjDRCT0fFEZM/Gt3Epeph rcc7oKJWf0d8ugJPFRhJHCo8T6UZpmJbi74b3MwSJIqeRSkgZc/eO8K+QGJIDDc8l10kGrU4h BwvqleWzZbu+FVNbGMweFGyeWT7rsS9i5JI5FOoWwx2WuhNntuMZx4pQlyv5moo83kS/6b2TB Soge9C9ZnqUlSK7H26K18vo2hMmREgz2pI70Diw6ybW8VYdDCCXnfuZC/l0JintOAeADCL4/J gRybR6CpN8PpywiLZ94Aown3dwxfnt/HvQzQHd1cayEGPJv5iRHdESiBVoeZFFIg0ATA3fWNK EjGWGGIZaS6ZZLVvRP7Zq7xJYmY0KfFgyXxd/3eI69aak1+1ixroMIbhJRnJLk146J6t13f8F vwjPrTPJELZBojc45ni6o+Op58DfFuqefTx3sf8HbvbuQG7HSeUD02eAWzlaEevUeWaAOzATr N/qix2j4TG/xs3yH0Mn6YKn5Q7OJf6YDFxqbeA4R9vnz4AnD7JKluUvW2IJxPeMREJs2AVaMu 4JBgoXnh30cb+4= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Guix, hi Luis, Here's a WIP V3 of my series for tree-sitter. I'm almost done with it, I need to to another couple of passes to see if there's anything left to cleanup. I'm sharing it early as a WIP first, as I just noticed the other day that Luis also contributed a patches for tree-sitter for neovim[0]. The series I have here is quite a lot bigger though so I'm happy to rebase it on top of yours, Luis :-). The package I had for tree-sitter looks basically the same, I would then move it to a new file with all tree-sitter related packages, if you're happy with that. The other reason I'm posting this is this series, which while it only supports emacs, actually builds grammars for some of the supported languages, I picked a set that I think are popular, there are probably more to add but I thought it was a good starting point. While the grammars are originally in JSON, they are distributed as binaries it seems so it'll be better if we can build them as part of Guix. So I'm wondering, are these tree-sitter grammar packages also useful for the neovim package for tree-sitter? Anyways, see patches incoming in just a minute! Thanks, Pierre [0]: https://issues.guix.gnu.org/53523 Pierre Langlois (26): gnu: Add rust-smallbitvec. gnu: Add rust-html-escape. gnu: Add rust-spin@0.7. gnu: Add tree-sitter. gnu: Add tree-sitter-cli. gnu: Add tree-sitter-c. gnu: Add tree-sitter-cpp. gnu: Add tree-sitter-bash. gnu: Add tree-sitter-css. gnu: Add tree-sitter-go. gnu: Add tree-sitter-html. gnu: Add tree-sitter-java. gnu: Add tree-sitter-javascript. gnu: Add tree-sitter-json. gnu: Add tree-sitter-julia. gnu: Add tree-sitter-php. gnu: Add tree-sitter-python. gnu: Add tree-sitter-rust. gnu: Add tree-sitter-typescript. gnu: Add rust-tree-sitter-for-emacs. gnu: rust-emacs-module: Update to 0.18. gnu: rust-emacs-macros: Update to 0.17. gnu: rust-emacs: Update to 0.18. gnu: Add emacs-tree-sitter-core. gnu: Add emacs-tree-sitter. gnu: Add emacs-tree-sitter-langs. gnu/local.mk | 2 + gnu/packages/crates-io.scm | 154 +++- .../rust-tree-sitter-text-provider-fix.patch | 98 +++ gnu/packages/tree-sitter.scm | 808 ++++++++++++++++++ 4 files changed, 1044 insertions(+), 18 deletions(-) create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch create mode 100644 gnu/packages/tree-sitter.scm