From: Yuan Fu <casouri@gmail.com>
To: "João Paulo Labegalini de Carvalho" <jaopaulolc@gmail.com>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: Initial fontification in sh-mode with tree-sittter
Date: Sat, 12 Nov 2022 14:28:52 -0800 [thread overview]
Message-ID: <F0DEB91E-2BA2-47D4-B16C-26168A79EEEA@gmail.com> (raw)
In-Reply-To: <CAGjvy2_wrrPD_hbEVaZUKJ2+uZcW2TshWchL2zZWC741AhWgKg@mail.gmail.com>
> On Nov 12, 2022, at 2:04 PM, João Paulo Labegalini de Carvalho <jaopaulolc@gmail.com> wrote:
>
> I see. This is tree-sitter-bash’s problem. When there are only newlines between two EOF’s, the parser erroneously marks everything that follows as heredoc_body. I tried tree-sitter’s online demo and it gives the same result[1]. We should report this to tree-sitter-bash’s author.
>
> Sorry for the delay. I confirmed the problem was in the tree-sitter-bash side and submitted a PR to fix it: https://github.com/tree-sitter/tree-sitter-bash/pull/137
> Once my fixes are pulled in, there is no change required to my patch.
>
> Also, when defining sh-mode--treesit-settings, instead of using the value sh-shell as the language, it’s better to just use ‘bash. Here is what happened to me: my default value for sh-shell is fish, so sh-mode--treesit-settings was defined with language = fish. When I open heredoc-issue.sh, sh-mode parses the shebang and sets sh-shell to bash. Since bash does have a parser, (treesit-ready-p ’sh-mode sh-shell) returns t, and tree-sitter is activated. However when font-lock tries to use the query, it errors because query tries to load a parser for fish.
>
> I see. I thought that because sh-mode--treesit-settings is executed after the local variable sh-shell is defined, it would always be equal to the detected/file shell type. I am still getting my head around scope in elisp.
When the defvar evaluates at load time, the value of sh-shell is the value set by user’s configuration, not the detected/file shell type. When the major-mode initialization runs (when we open a file), sh-shell’s value becomes the detected/file shell type.
Because the tree-sitter language definition only works with bash, it doesn’t make sense to define those queries with anything other than bash, in sh-mode--treesit-settings.
> I did the change and I think it is good to go, unless there is anything else to improve for now.
>
> I hope to soon get time to work on imenu, navigation, and indentation for sh-mode & bash with tree-sitter.
>
> Please find the corrected patch attached.
Thanks, some comments:
+(defun sh-mode--treesit-fontify-decl-command (node override _start _end)
+ "Fontifies only the name of declaration_command nodes.
+
+This is used instead of `font-lock-builtion-face' directly because
+otherwise the whole command, including the variable assignment part,
+is fontified with with `font-lock-builtin-face'. An alternative to
+this would be to declaration_command nodes to have a `name:' field.”
I guess you meant “...for declaration_command node to have…”? (Declaimer: not native speaker)
+ (let* ((maybe-decl-cmd (treesit-node-parent node))
+ (node-type (treesit-node-type maybe-decl-cmd)))
+ (when (string= node-type "declaration_command")
+ (let* ((name-node (car (treesit-node-children maybe-decl-cmd)))
+ (name-beg (treesit-node-start name-node))
+ (name-end (treesit-node-end name-node)))
+ (put-text-property name-beg
+ name-end
+ 'face
+ font-lock-builtin-face)))))
+
+ (cond
+ ;; Tree-sitter
+ ((treesit-ready-p 'sh-mode sh-shell)
+ (setq-local font-lock-keywords-only t)
This line is not necessary anymore due to recent changes.
+ (setq-local treesit-font-lock-feature-list
+ '((comments functions strings heredocs)
+ (variables keywords commands decl-commands)
+ (constants operators builtin-variables)))
+ (setq-local treesit-font-lock-settings
+ sh-mode--treesit-settings)
+ (treesit-major-mode-setup))
+ ;; Elisp.
+ (t
+ (setq font-lock-defaults
+ `((sh-font-lock-keywords
+ sh-font-lock-keywords-1 sh-font-lock-keywords-2)
+ nil nil
+ ((?/ . "w") (?~ . "w") (?. . "w") (?- . "w") (?_ . "w")) nil
+ (font-lock-syntactic-face-function
+ . ,#'sh-font-lock-syntactic-face-function))))))
+(defvar sh-mode--treesit-settings
+ (treesit-font-lock-rules
+ :feature 'comments
+ :language sh-shell
+ '((comment) @font-lock-comment-face)
+ :feature 'functions
+ :language sh-shell
+ '((function_definition name: (word) @font-lock-function-name-face))
+ :feature 'strings
+ :language sh-shell
+ '([(string) (raw_string)] @font-lock-string-face)
+ :feature 'heredocs
+ :language sh-shell
+ '([(heredoc_start) (heredoc_body)] @sh-heredoc)
+ :feature 'variables
+ :language sh-shell
+ '((variable_name) @font-lock-variable-name-face)
Because of reasons I mentioned earlier, we should use ‘bash instead of sh-shell here.
Once those are changed I think we can push to feature/tree-sitter, other features/fixes can come later.
Yuan
next prev parent reply other threads:[~2022-11-12 22:28 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 22:01 Initial fontification in sh-mode with tree-sittter João Paulo Labegalini de Carvalho
2022-10-27 23:09 ` João Paulo Labegalini de Carvalho
2022-10-27 23:40 ` João Paulo Labegalini de Carvalho
2022-10-28 8:12 ` Yuan Fu
2022-10-28 15:09 ` Daniel Martín
2022-10-31 2:13 ` Yuan Fu
2022-10-31 21:56 ` Yuan Fu
2022-11-01 0:09 ` Daniel Martín
2022-11-01 0:25 ` Yuan Fu
2022-11-01 7:13 ` Eli Zaretskii
2022-11-01 8:35 ` Yuan Fu
2022-11-01 9:23 ` Eli Zaretskii
[not found] ` <CAGjvy2_6BReOVjSqgTM57+h+Ycjdu1o1TKoQHf6q-ypnAX3=rA@mail.gmail.com>
2022-11-02 19:17 ` Eli Zaretskii
2022-11-03 1:25 ` Yuan Fu
2022-11-03 6:36 ` Eli Zaretskii
2022-11-03 7:16 ` Yuan Fu
2022-11-03 16:08 ` João Paulo Labegalini de Carvalho
2022-11-03 19:12 ` Yuan Fu
2022-11-04 20:44 ` João Paulo Labegalini de Carvalho
2022-11-04 22:50 ` Yuan Fu
2022-11-12 22:04 ` João Paulo Labegalini de Carvalho
2022-11-12 22:28 ` Yuan Fu [this message]
2022-11-12 23:57 ` João Paulo Labegalini de Carvalho
2022-11-16 8:34 ` Yuan Fu
2022-11-16 15:57 ` João Paulo Labegalini de Carvalho
2022-11-17 18:25 ` Yuan Fu
2022-11-17 18:53 ` João Paulo Labegalini de Carvalho
2022-11-17 19:11 ` Yuan Fu
2022-11-13 6:23 ` Eli Zaretskii
2022-11-13 7:01 ` Yuan Fu
2022-11-13 7:26 ` Eli Zaretskii
2022-11-29 21:52 ` João Paulo Labegalini de Carvalho
2022-11-02 20:37 ` [SPAM UNSURE] " Stephen Leake
2022-10-28 0:18 ` Stefan Kangas
2022-10-28 0:48 ` João Paulo Labegalini de Carvalho
2022-10-28 15:27 ` João Paulo Labegalini de Carvalho
2022-10-28 15:57 ` Stefan Kangas
2022-10-28 16:15 ` Stefan Monnier
2022-10-28 16:23 ` Theodor Thornhill
2022-10-28 16:34 ` João Paulo Labegalini de Carvalho
2022-10-28 17:37 ` Stefan Monnier
2022-10-28 17:45 ` Yuan Fu
2022-10-28 18:12 ` Stefan Monnier
2022-11-01 0:33 ` Yuan Fu
2022-11-01 3:38 ` Stefan Monnier
2022-11-01 8:37 ` Yuan Fu
2022-10-29 7:13 ` Augusto Stoffel
2022-10-28 17:44 ` Yuan Fu
2022-11-02 18:22 ` João Paulo Labegalini de Carvalho
2022-11-02 18:55 ` João Paulo Labegalini de Carvalho
2022-11-12 12:47 ` Eli Zaretskii
2022-11-12 19:45 ` Yuan Fu
2022-11-12 19:53 ` Eli Zaretskii
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=F0DEB91E-2BA2-47D4-B16C-26168A79EEEA@gmail.com \
--to=casouri@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jaopaulolc@gmail.com \
/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).