From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel =?UTF-8?Q?Mart=C3=ADn?= via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#60001: [PATCH] Improve completion of treesit-check-indent command Date: Mon, 12 Dec 2022 11:53:00 +0100 Message-ID: References: Reply-To: Daniel =?UTF-8?Q?Mart=C3=ADn?= Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7120"; mail-complaints-to="usenet@ciao.gmane.io" To: 60001@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 12 11:54:23 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p4gRz-0001gh-2k for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 12 Dec 2022 11:54:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4gRm-00036J-1A; Mon, 12 Dec 2022 05:54:11 -0500 Original-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 1p4gRe-00032V-8z for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 05:54:03 -0500 Original-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 1p4gRe-0002qp-00 for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 05:54:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4gRd-00007v-Rc for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 05:54:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel =?UTF-8?Q?Mart=C3=ADn?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Dec 2022 10:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60001 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.1670842393474 (code B ref -1); Mon, 12 Dec 2022 10:54:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Dec 2022 10:53:13 +0000 Original-Received: from localhost ([127.0.0.1]:52171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4gQr-00007a-5i for submit@debbugs.gnu.org; Mon, 12 Dec 2022 05:53:13 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:45274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4gQp-00007T-NM for submit@debbugs.gnu.org; Mon, 12 Dec 2022 05:53:12 -0500 Original-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 1p4gQn-0002oa-Sg for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 05:53:11 -0500 Original-Received: from sonic306-19.consmr.mail.ir2.yahoo.com ([77.238.176.205]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4gQl-0001W2-VD for bug-gnu-emacs@gnu.org; Mon, 12 Dec 2022 05:53:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1670842385; bh=/E0fB+wCaVnqvwIC4V654F0LHFNrBKBz3fd0K+xBFXg=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=TB/xgjffDWRx7No8Y9gTIS118CxjNN2e4QgM+CvKmCKCOy4Rjh4ZvU3ziTMTEy6I2Pl5PPiUwSExchch4jh8teA6Bk1A01/pE3OVwA4oEvTDfzzUqF1JfE3Cl45Dg0n8JDofwuc+bw+MwUU4uxqW3HdyslkJNMKm+AMVKphAHzb3Xc0BAUoeGLOtWY1dr4Sv7Jv0hEkroYICBWBVASJI0gjdlhc2F+0vxlgmrpKRcSzmgsc9uIGlvgKv0Cb54MlVNdZzjYPh+21tW/kyclys/oMrjJIRXdL6H+uXXHcF281kQkzOs2wXp4J0WbZ6es0COZYOjeuG2EwV2MJRdiLwYQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670842385; bh=gmDj+8cMCJUlnLJcvb8vO5VckSXfEbACkimCv3Y0UxD=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=L9RM4/0fbEgIf3pNYoRzpa5YD87rGcxSelELltBz16tgXT2eroJPFcJtmeX8+HgkIwHDOjOX1uLTxtZFYiNQwRCOAhD7XO+E7YYhZ3VmHDsjgnw1mPD9qptQ4j4k1P342PwbrUSwRz8q20I80J4EcdApaTATjOpn8pydGg6EfOmgWD8Iqr4FJ5/pUBiszcpt5Xb0zx4PvDH7OSLAKyOeyiYXFS/p/inYjckaffNp9XBs3+yyQ56P16sOtf9EhbG8V/bXqkXhIGGfG1fNACnISW6NSS+ecOxayMT+doyyaNOK7lFMEDLCBJucOnzBmo48pKcS6s1hG+2U9GLdCmeCzQ== X-YMail-OSG: 6C7Z9aoVM1k2DjNA2xrhWXWmohQOswlhH.bimdj7fFJdgDb4KfQdqM4NYlmhORI WqN2i7Xs2CdDuK4uQhYQqR3PZjipwgYBnjPPZLcFXz0B86_gY5p0u2X.aZ26rnBlRti6aj65zsNq nh6YOaiYE0sCxM75s14fRgHMxJkSVMcGvglSoaTyCNU4dL2tvrjhvygwxDo1PInqEDd1cmm2GGBC R6FjYimoUxdKtOMEfg1fAqipNS.1PXzgVvfs7E1ULUV0Mm0NSGNZ_6dGqI9zoQr9s5TVAVScXWdX lZMteVEmtFKqC524SN38u153gTA1MbHAQA4rs2Cy8q7TlAH3s0nGubf1ruNjbxMUs7qxi.QbXmo4 HLe6XEnilzZ2k7NKBH0y9icQj0peRXeS20wTseJ1n0LEUkI5zGNrrdd4ZlRuwR75Ucl22fUqtDrH JS3Ovhxwik1owI1Poyup8M0hSII0V1GJe_DcTLcrmNV3fNghMO7LtUdMous2f48xH_qcQIR1ftoO .Pw7LeBkesgz2LU6pFTCLTOCN8dvCACIEZnwOQcLg_u9_l3lAo6Fn1tZps9HbcoV6iSisvV.1jA2 5yPiTNane4Iz6ErWnICVd2H8oonVZl65jB9ZdmdrVoVNb7W9laCctwXilfIhJ5plJaTDwxsLrF0O Ry88m5UC2QPpajFwt4UkcD_H_7ZF9wBwvYj4HASSd6GolQY2bOikzwjmMeYwNkiReKygCaOzaAIg FZYWGsMDbPopNnKJUUapeI6A7k0tQojrmUxQ.ed_4SujDUM9TsmXbOufM_avWeuyZ_3oFopjvVEe kJddCKI2Cx4I._W0aL1Yq2GbDEfcPgY1eHc4ZxLC4a X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ir2.yahoo.com with HTTP; Mon, 12 Dec 2022 10:53:05 +0000 Original-Received: by hermes--production-ir2-5795fc58c8-7hl5q (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID bb74469f613b55ce5d2ae83368092076; Mon, 12 Dec 2022 10:53:02 +0000 (UTC) X-Mailer: WebService/1.1.20926 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=77.238.176.205; envelope-from=mardani29@yahoo.es; helo=sonic306-19.consmr.mail.ir2.yahoo.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250694 Archived-At: --=-=-= Content-Type: text/plain Tags: patch The treesit-check-indent command is not really related to Tree-sitter and could be in a more general place than treesit.el. WDYT? In any case, I have a patch to improve this command a bit by offering more accurate completion for major modes, not Emacs commands. I have also tried to improve its documentation a bit. Thanks. --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Improve-completion-of-treesit-check-indent-command.patch >From e6699c1671f3f13fa7d98ef958c0159e80aa2645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Mon, 12 Dec 2022 11:33:01 +0100 Subject: [PATCH] Improve completion of treesit-check-indent command * lisp/treesit.el (treesit--read-major-mode): Helper function to provide completion for most major modes. (treesit-check-indent): Use the new interactive spec and improve the docstring. --- lisp/treesit.el | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 85154d0d1c..de18796628 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1469,12 +1469,28 @@ treesit-simple-indent (message "No matched rule")) (cons nil nil)))))) -(defun treesit-check-indent (mode) - "Check current buffer's indentation against a major mode MODE. +(defun treesit--read-major-mode () + "Read a major mode using completion. +Helper function to use in the `interactive' spec of `treesit-check-indent'." + (let* ((default (and (symbolp major-mode) (symbol-name major-mode))) + (mode + (completing-read + (format-prompt "Target major mode" default) + obarray + (lambda (sym) + (and (string-match-p "-mode\\'" (symbol-name sym)) + (not (or (memq sym minor-mode-list) + (string-match-p "-minor-mode\\'" + (symbol-name sym)))))) + nil nil nil default nil))) + (cond + ((equal mode "nil") nil) + ((and (stringp mode) (fboundp (intern mode))) (intern mode)) + (t mode)))) -Pop up a diff buffer showing the difference. Correct -indentation (target) is in green, current indentation is in red." - (interactive "CTarget major mode: ") +(defun treesit-check-indent (mode) + "Compare the current buffer with how major mode MODE would indent it." + (interactive (list (treesit--read-major-mode))) (let ((source-buf (current-buffer))) (with-temp-buffer (insert-buffer-substring source-buf) -- 2.34.1 --=-=-=--