emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master cd6dcfad107: Improve completion of treesit-check-indent command


From: Stefan Kangas
Subject: master cd6dcfad107: Improve completion of treesit-check-indent command
Date: Tue, 5 Sep 2023 16:40:48 -0400 (EDT)

branch: master
commit cd6dcfad1074cfdc2a3b18d905cb60ce977ed6b0
Author: Daniel Martín <mardani29@yahoo.es>
Commit: Stefan Kangas <stefankangas@gmail.com>

    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.  (Bug#60001)
---
 lisp/treesit.el | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index d7032b16dab..1eccede436e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1703,12 +1703,28 @@ OFFSET."
                         (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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]