Re: rust-ts-mode: appropriately fontify doc strings

[Christophe TROESTLER <Christophe.TROESTLER@umons.ac.be>]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

On  2 December 2023 at 00:58 +01, Dmitry Gutov <dmitry@gutov.dev> wrote:
> […] I've pushed it to emacs-29. In the future, please send patches to
> the bug tracker, though (then it's easier to ensure they are not
> lost).

It seems my latest message has not reached the mailing list... (it ia attached).  I'll use the bug tracker from now on — for some reason, I was under the impression that Emacs patches should be sent first to Emacs devel.

Best,
C.



[-- Attachment #2: Type: message/rfc822, Size: 14965 bytes --]

[-- Attachment #2.1.1: Type: text/plain, Size: 90 bytes --]

Hi,

A slightly updated patch (to encompass create level doc comments).

Best,
C.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2.1.2: 0001-rust-ts-mode-appropriately-fontify-doc-strings.patch --]
[-- Type: text/x-diff; name="0001-rust-ts-mode-appropriately-fontify-doc-strings.patch", Size: 1707 bytes --]

From a5a6c31060962c976d7476da631a325c251a272d Mon Sep 17 00:00:00 2001
From: Christophe Troestler <Christophe.Troestler@umons.ac.be>
Date: Thu, 30 Nov 2023 00:13:10 +0100
Subject: [PATCH] rust-ts-mode: appropriately fontify doc strings
Content-Type: text/plain; charset="utf-8"

---
 lisp/progmodes/rust-ts-mode.el | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index 88344934e49..0e24b09bbbb 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -153,7 +153,7 @@ rust-ts-mode--font-lock-settings
 
    :language 'rust
    :feature 'comment
-   '(([(block_comment) (line_comment)]) @font-lock-comment-face)
+   '(([(block_comment) (line_comment)]) @rust-ts-mode--comment-docstring)
 
    :language 'rust
    :feature 'delimiter
@@ -293,6 +293,17 @@ rust-ts-mode--font-lock-settings
    '((ERROR) @font-lock-warning-face))
   "Tree-sitter font-lock settings for `rust-ts-mode'.")
 
+(defun rust-ts-mode--comment-docstring (node override start end &rest _args)
+  "Use the comment or documentation face appropriately for comments."
+  (let* ((beg (treesit-node-start node))
+         (end (treesit-node-end node))
+         (face (save-excursion
+                 (goto-char beg)
+                 (if (looking-at "//\\(?:/\\|!\\)")
+                     'font-lock-doc-face
+                   'font-lock-comment-face))))
+    (treesit-fontify-with-override beg end face override start end)))
+
 (defun rust-ts-mode--fontify-scope (node override start end &optional tail-p)
   (let* ((case-fold-search nil)
          (face
-- 
2.42.0