From patchwork Fri Nov 25 01:21:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 1115 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 44DF927BBEC; Fri, 25 Nov 2022 01:24:09 +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=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 1C74627BBE9 for ; Fri, 25 Nov 2022 01:24:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyNQm-0005kd-LI; Thu, 24 Nov 2022 20:23:04 -0500 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 1oyNQl-0005k4-DP for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyNQl-0004SC-54 for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyNQl-0000Nb-0D for guix-patches@gnu.org; Thu, 24 Nov 2022 20:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v7 00/32] gnu: Add tree-sitter for emacs. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Nov 2022 01:23:02 +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 Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.16693393451231 (code B ref 49946); Fri, 25 Nov 2022 01:23:02 +0000 Received: (at 49946) by debbugs.gnu.org; 25 Nov 2022 01:22:25 +0000 Received: from localhost ([127.0.0.1]:60782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ7-0000J2-85 for submit@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:24 -0500 Received: from mout.gmx.net ([212.227.17.22]:54905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyNQ4-0000Hl-5t for 49946@debbugs.gnu.org; Thu, 24 Nov 2022 20:22:21 -0500 Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MnJlc-1oZFoX3MI8-00jH1E; Fri, 25 Nov 2022 02:22:13 +0100 From: Pierre Langlois Date: Fri, 25 Nov 2022 01:21:10 +0000 Message-Id: <20221125012142.22579-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <87mtfi63ut.fsf@gmx.com> References: <87mtfi63ut.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:i9Z8wB5ok3W/Jn6CKKcKnHRfvz8+CrS9Bwj7owZDzfWaqLlga8x T0NL24SiMGuCIdKAtaVDH2aE7WiO14BfvFJYAZwnDcjzEQHROk9e04ZUwZYarNbG+IAzmhV NY5uQ7vdJwgIBea6JZrptBsFGPT7kjKY1h/hHHjm93zdWqQ3xkWmGG3Hxg41Dtx54B9HKsb B2vDZPwARHB0/FYq+GK5A== UI-OutboundReport: notjunk:1;M01:P0:FVVuZICHRZw=;9jqZ8BWs8nQIaKCCSeb4ju52WVB 6QOKW79O5ETYE3oFWfA+2AGxfmypGA1Axc/qJKAP+AWKHQYp/5dgpSl/UGp9R23WtQodBmQ5A DDDkhbi+RyKWXEiCrmaSvC2Hc1ExrOUwu4jONFP1v/PGC0FbcaCxdZ0bkWGhf+zih2rNdEUEb Ur4bHCvg4gjs0db96xOJEB0ZmQGzNe6MYHtk9Ku7LByBIoEg70CLWVRk7K6T3N4myxapYp1Uu yrIJbVdxFTtFoEQGKsOluNu0zExtyPSDSofwD7Zr45k+mrcc8HkiPwynUAo8nYiafuNr9inem idxQi5UptgsaGVWMYw97i5/stXJaaUgfjqBeCJRdfVkNxOtrTk9rsjBPyXrfIO0puqtoBVWfW 2Vm30fJ1H4QaHZAAHNxojyDbmBrrc2wvy3c1yihonznaAWLDEeZ2MrtfsaouaZzq5m5kQsmKl rTHyQ1jSIYEAvXPT+4Bno2WPvYjoHka6xGaYvBSK4+Lu5w5XIY4NAx/lSkn+zV0qzTKvdAqZt mTmYOYs5ApmuerILWN0V4eDuQ8ZytaF6JFJBaAwbThZL2zZLIMQf3x8NOTtV3ZZEpKnwng9Uw Ikv7OVurFAFXXBNZ69TcbdeiN3ImPfMkvUg1sdV267hy8uzg2cQMA+iQ6q55qQCT9R75eqDBx 0ENeaqhnN4oaw5Bg+cs0MwE6VMabP5EprSicqGtNMsZhC2SgqOFx5fLxlvD60QMrcoDd10JHf fXSbcGypDIO0YVCz38e8m82O9a/b8ayVc5nDcH9RfrZf5Mtjt7/jmBMgm+k2+H4b1wMLYoD9v gf+EXUCbXgFvw0So4kcXY+/xJa5jVkDR4Jaym82+QkMVgxwXGECHw+D0q3xzMe9Bu8i8xgA7k t1bmrPolGjeBKqW/xgvTT86WkmVJ9zGESIQzt0xOd/vkK7NzDeoY3ttGI1djqKoQMGCk/eCIQ e8c36DrI1Jk3ylpBjkHS192NxUw= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Guix! With the recent news of tree-sitter support making it into emacs, I thought it'd be a good idea to make sure this series is rebased and up-to-date, hopefully nobody's working on this while not being aware of it. This does not use the new native emacs support for tree-sitter, so the emacs packages it introduces could eventually become obsolete. However the grammars and the build system should be re-usable by emacs natively too. On top of rebasing, I also: - Updated to 0.20.7. - Re-introduced a couple of rust crates needed by tree-sitter-cli. - Added support for R and Haskell. - Updated some of the grammars to make the emacs-tree-sitter-langs tests happy. Thanks, Pierre Pierre Langlois (32): gnu: tree-sitter: Move to its own module. gnu: tree-sitter: Update to 0.20.7. gnu: Add rust-html-escape. gnu: Add rust-smallbitvec-2. gnu: Add tree-sitter-cli. build-system: Add tree-sitter-build-system. gnu: Add tree-sitter-c. gnu: Add tree-sitter-cpp. gnu: Add tree-sitter-bash. gnu: Add tree-sitter-css. gnu: Add tree-sitter-c-sharp. gnu: Add tree-sitter-elixir. gnu: Add tree-sitter-elm. gnu: Add tree-sitter-go. gnu: Add tree-sitter-haskell. 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-ocaml. gnu: Add tree-sitter-php. gnu: Add tree-sitter-python. gnu: Add tree-sitter-r. gnu: Add tree-sitter-ruby. gnu: Add tree-sitter-rust. gnu: Add tree-sitter-typescript. gnu: Add rust-tree-sitter. gnu: Add rust-tree-sitter-for-emacs. gnu: Add emacs-tree-sitter-core. gnu: Add emacs-tree-sitter. gnu: Add emacs-tree-sitter-langs. Makefile.am | 2 + doc/guix.texi | 21 +- gnu/local.mk | 2 + gnu/packages/crates-io.scm | 46 + .../rust-tree-sitter-text-provider-fix.patch | 98 ++ gnu/packages/text-editors.scm | 52 - gnu/packages/tree-sitter.scm | 1001 +++++++++++++++++ gnu/packages/vim.scm | 1 + guix/build-system/tree-sitter.scm | 190 ++++ guix/build/tree-sitter-build-system.scm | 153 +++ 10 files changed, 1513 insertions(+), 53 deletions(-) create mode 100644 gnu/packages/patches/rust-tree-sitter-text-provider-fix.patch create mode 100644 gnu/packages/tree-sitter.scm create mode 100644 guix/build-system/tree-sitter.scm create mode 100644 guix/build/tree-sitter-build-system.scm