From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Theodor Thornhill <theo@thornhill.no>
Cc: eliz@gnu.org, 60983@debbugs.gnu.org, casouri@gmail.com
Subject: bug#60983: 29.0.60; Tree-sitter user-level control
Date: Wed, 25 Jan 2023 16:16:33 -0500 [thread overview]
Message-ID: <jwvk01aiazc.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87lelq8jay.fsf@thornhill.no> (Theodor Thornhill's message of "Wed, 25 Jan 2023 21:12:53 +0100")
> -(defcustom c-ts-mode-indent-style 'gnu
> +(defcustom c-ts-mode-indent-style "gnu"
> "Style used for indentation.
>
> The selected style could be one of GNU, K&R, LINUX or BSD. If
> @@ -100,13 +100,33 @@ c-ts-mode-indent-style
> set instead. This function is expected return a list that
> follows the form of `treesit-simple-indent-rules'."
> :version "29.1"
> - :type '(choice (symbol :tag "Gnu" 'gnu)
> - (symbol :tag "K&R" 'k&r)
> - (symbol :tag "Linux" 'linux)
> - (symbol :tag "BSD" 'bsd)
> + :type '(choice (string :tag "Gnu" "gnu")
> + (string :tag "K&R" "k&r")
> + (string :tag "Linux" "linux")
> + (string :tag "BSD" "bsd")
> (function :tag "A function for user customized style" ignore))
> + :set #'c-ts-mode--indent-style
> :group 'c)
Why change to strings?
BTW the previous code seems wrong: instead of
(symbol :tag "FOO" 'foo)
it should be
(symbol :tag "FOO" foo)
since `'foo` is not a symbol but a list (of two symbols).
> +(defun c-ts-mode--indent-style (sym val)
> + "Custom setter for `c-ts-mode-indent-style'."
> + (set-default sym val))
Hmm... why bother use a `:set`ter if it doesn't do anything more than
the default does?
Shouldn't it call `treesit--indent-rules-optimize` to (re)set
`treesit-simple-indent-rules`?
[ Presumably in all relevant buffers, since the defcustom setting is
global. ]
> +(defun c-ts-mode-set-style ()
> + (interactive)
> + (or (eq major-mode 'c-ts-mode) (eq major-mode 'c++-ts-mode)
> + (error "Buffer %s is not a c-ts-mode (c-ts-mode-set-style)"
> + (buffer-name)))
> + (if-let ((mode (cond ((eq major-mode 'c-ts-mode) 'c)
> + ((eq major-mode 'c++-ts-mode) 'cpp)
> + (t nil)))
> + (choice (completing-read "Select style: " '("gnu" "k&r" "linux" "bsd"))))
Here, we probably want to specify `must-match` to `completing-read`
(which makes it unnecessary to check `if-let`, I think) and we should
provide a default.
Also we should probably use the (c-ts-mode--indent-styles mode) alist
rather than hardcode the set of styles.
> + (c-ts-mode--indent-style 'c-ts-mode-indent-style choice)
> + (kill-local-variable 'treesit-simple-indent-rules)
> + (setq-local treesit-simple-indent-rules
> + (treesit--indent-rules-optimize
> + (c-ts-mode--set-indent-style mode)))))
Here we presumably want to do the (setq-local
treesit-simple-indent-rules ...) every time (and set
`c-ts-mode-indent-style` buffer locally rather than via
`c-ts-mode--indent-style`, or otherwise provide an additional arg to
`c-ts-mode--indent-style` to say whether it applies globally or only to
the current buffer).
BTW, the naming of `c-ts-mode--indent-style` and
`c-ts-mode--set-indent-style` is confusing.
Also: why `kill-local-variable` just before the `setq-local`?
> - (pcase c-ts-mode-indent-style
> - ('gnu (alist-get 'gnu (c-ts-mode--indent-styles mode)))
> - ('k&r (alist-get 'k&r (c-ts-mode--indent-styles mode)))
> - ('bsd (alist-get 'bsd (c-ts-mode--indent-styles mode)))
> - ('linux (alist-get 'linux (c-ts-mode--indent-styles mode)))))))
> + (alist-get c-ts-mode-indent-style
> + (c-ts-mode--indent-styles mode) nil nil #'equal))))
Thanks :-)
Stefan
next prev parent reply other threads:[~2023-01-25 21:16 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-21 11:11 bug#60983: 29.0.60; Tree-sitter user-level control Eli Zaretskii
2023-01-21 11:48 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-21 12:36 ` Eli Zaretskii
2023-01-21 12:40 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-23 19:37 ` Yuan Fu
2023-01-23 19:59 ` Eli Zaretskii
2023-01-23 21:08 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-23 23:55 ` Yuan Fu
2023-01-29 13:33 ` Eli Zaretskii
2023-01-29 19:12 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-29 19:41 ` Eli Zaretskii
2023-01-30 2:28 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-30 13:45 ` Eli Zaretskii
2023-01-24 3:26 ` Eli Zaretskii
2023-01-25 20:12 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-25 21:16 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2023-01-26 8:27 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-26 6:08 ` Eli Zaretskii
2023-01-26 6:25 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-23 16:52 ` Eli Zaretskii
2023-01-26 7:27 ` Eli Zaretskii
2023-01-26 7:37 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-26 9:08 ` Eli Zaretskii
2023-01-28 13:12 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-28 13:25 ` Eli Zaretskii
2023-01-28 18:41 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-29 13:24 ` Eli Zaretskii
2023-01-26 7:56 ` Yuan Fu
2023-02-03 3:07 ` Yuan Fu
2023-02-03 7:47 ` Eli Zaretskii
2023-02-04 23:38 ` Yuan Fu
2023-02-05 6:01 ` Eli Zaretskii
2023-02-05 7:54 ` Yuan Fu
2023-02-05 9:23 ` Eli Zaretskii
2023-02-05 9:42 ` Yuan Fu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvk01aiazc.fsf-monnier+emacs@gnu.org \
--to=bug-gnu-emacs@gnu.org \
--cc=60983@debbugs.gnu.org \
--cc=casouri@gmail.com \
--cc=eliz@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=theo@thornhill.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).