Re: Tree sitter support for C-like languages

[Yuan Fu <casouri@gmail.com>]

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



> On Nov 10, 2022, at 9:45 AM, Theodor Thornhill <theo@thornhill.no> wrote:
> 
> 
> 
> Hi all,
> 
> See the attached patch for support for several C-like languages.
> 
> They all support:
> - Font locking
> - Indentation (with styles for c/c++)
> - Movement
> - Imenu
> - Which-func
> 
> These modes are meant as a supplement to tree-sitter.
> 
> I'm hopeful for some constructive criticism, and some testing.  This
> patch needs to be applied to the feature/tree-sitter branch, and should
> hopefully be applied there before we merge the branch to master, well
> before Emacs 29 is cut.
> 
> I hope you like it,
> 
> Theo

This is fantastic! I’m trying them out right now :-)

Some things I noticed:

The indentation for the closing bracket of a struct is off:

struct regexp_cache
{
  struct regexp_cache *next;
  };

Imenu has some duplicate entries, the patch below should fix that.

I also added the new contextual thingy to font-lock settings.

Yuan


[-- Attachment #2: cc-modes.diff --]
[-- Type: application/octet-stream, Size: 1329 bytes --]

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 9da20485af4..b48ab667311 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -185,7 +185,8 @@ c-ts-mode--font-lock-settings
    :language 'c
    :override t
    :feature 'comment
-   `((comment) @font-lock-comment-face)
+   `((comment) @font-lock-comment-face
+     (comment) @contexual)
    :language 'c
    :override t
    :feature 'preprocessor
@@ -224,6 +225,7 @@ c-ts-mode--font-lock-settings
    :override t
    :feature 'string
    `((string_literal) @font-lock-string-face
+     ((string_literal)) @contextual
      (system_lib_string) @font-lock-string-face
      (escape_sequence) @font-lock-string-face)
    :language 'c
@@ -327,7 +329,14 @@ c-ts-mode--imenu-1
          (marker (when ts-node
                    (set-marker (make-marker)
                                (treesit-node-start ts-node)))))
+    ;; A struct_specifier could be inside a parameter list or another
+    ;; struct definition.  In those cases we don't include it.
     (cond
+     ((string-match-p
+       (rx (or "parameter" "field") "_declaration")
+       (or (treesit-node-type (treesit-node-parent ts-node))
+           ""))
+      nil)
      ((null ts-node) subtrees)
      (subtrees
       `((,name ,(cons name marker) ,@subtrees)))