bug#66154: 30.0.50; Extract java-ts-mode's feature list

bug#66154: 30.0.50; Extract java-ts-mode's feature list

[Augustin Chéneau]

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


This simple patch extracts java-ts-mode's feature list in a
variable. This is needed for bison-ts-mode since it reuses its values if 
java is embedded.


In GNU Emacs 30.0.50 (build 3, x86_64-pc-linux-gnu, GTK+ Version
  3.24.38, cairo version 1.17.8) of 2023-09-19 built on inspiron-5567
Repository revision: 991bf3f0f5dff66794785ebfcc867611fe75e0da
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12302001
System Description: Arch Linux

Configured using:
  'configure PKG_CONFIG_PATH=/home/arch-aug/.opam/default/lib/pkgconfig:'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
JSON LCMS2 LIBSYSTEMD LIBXML2 MODULES NOTIFY INOTIFY PDUMPER PNG RSVG
SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP
X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB

Important settings:
   value of $LANG: fr_FR.UTF-8
   locale-coding-system: utf-8-unix

Major mode: Lisp Interaction

Minor modes in effect:
   tooltip-mode: t
   global-eldoc-mode: t
   eldoc-mode: t
   show-paren-mode: t
   electric-indent-mode: t
   mouse-wheel-mode: t
   tool-bar-mode: t
   menu-bar-mode: t
   file-name-shadow-mode: t
   global-font-lock-mode: t
   font-lock-mode: t
   blink-cursor-mode: t
   minibuffer-regexp-mode: t
   line-number-mode: t
   indent-tabs-mode: t
   transient-mark-mode: t
   auto-composition-mode: t
   auto-encryption-mode: t
   auto-compression-mode: t

Load-path shadows:
None found.

Features:
(help-mode pp shadow sort mail-extr emacsbug message mailcap yank-media
puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived
epg rfc6068 epg-config gnus-util text-property-search mm-decode
mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader
sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils
time-date subr-x cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc
paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode
mwheel term/x-win x-win term/common-win x-dnd touch-screen tool-bar dnd
fontset image regexp-opt fringe tabulated-list replace newcomment
text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow
isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax
font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic
indonesian philippine cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
theme-loaddefs faces cus-face macroexp files window text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind inotify lcms2
dynamic-setting system-font-setting font-render-setting cairo gtk
x-toolkit xinput2 x multi-tty move-toolbar make-network-process emacs)

Memory information:
((conses 16 41214 25389) (symbols 48 5342 3) (strings 32 13771 1915)
  (string-bytes 1 393837) (vectors 16 10551)
  (vector-slots 8 159881 14349) (floats 8 43 52) (intervals 56 343 35)
  (buffers 992 11))

[-- Attachment #2: 0003-Extract-feature-list-of-java-ts-mode-in-a-variable.patch --]
[-- Type: text/x-patch, Size: 1466 bytes --]

From 3a1e8eb01481423ad8309e52931d580704f62141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Augustin=20Ch=C3=A9neau?= <btuin@mailo.com>
Date: Thu, 21 Sep 2023 18:29:24 +0200
Subject: [PATCH 3/3] Extract feature list of java-ts-mode in a variable

---
 lisp/progmodes/java-ts-mode.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 99d34789dcc..a6bc4c4bded 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -303,6 +303,13 @@ java-ts-mode--defun-name
       (treesit-node-child-by-field-name node "name")
       t))))
 
+
+(defvar java-ts-mode--feature-list
+  '(( comment definition )
+    ( constant keyword string type)
+    ( annotation expression literal)
+    ( bracket delimiter operator)))
+
 ;;;###autoload
 (define-derived-mode java-ts-mode prog-mode "Java"
   "Major mode for editing Java, powered by tree-sitter."
@@ -382,11 +389,7 @@ java-ts-mode
 
   ;; Font-lock.
   (setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)
-  (setq-local treesit-font-lock-feature-list
-              '(( comment definition )
-                ( constant keyword string type)
-                ( annotation expression literal)
-                ( bracket delimiter operator)))
+  (setq-local treesit-font-lock-feature-list java-ts-mode--feature-list)
 
   ;; Imenu.
   (setq-local treesit-simple-imenu-settings
-- 
2.42.0

bug#66154: 30.0.50; Extract java-ts-mode's feature list

[Stefan Kangas]

Version: 30.1

Augustin Chéneau (BTuin) <btuin@mailo.com> writes:

> diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
> index 99d34789dcc..a6bc4c4bded 100644
> --- a/lisp/progmodes/java-ts-mode.el
> +++ b/lisp/progmodes/java-ts-mode.el
> @@ -303,6 +303,13 @@ java-ts-mode--defun-name
>        (treesit-node-child-by-field-name node "name")
>        t))))
>
> +
> +(defvar java-ts-mode--feature-list
> +  '(( comment definition )
> +    ( constant keyword string type)
> +    ( annotation expression literal)
> +    ( bracket delimiter operator)))
> +
>  ;;;###autoload
>  (define-derived-mode java-ts-mode prog-mode "Java"
>    "Major mode for editing Java, powered by tree-sitter."
> @@ -382,11 +389,7 @@ java-ts-mode
>
>    ;; Font-lock.
>    (setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)
> -  (setq-local treesit-font-lock-feature-list
> -              '(( comment definition )
> -                ( constant keyword string type)
> -                ( annotation expression literal)
> -                ( bracket delimiter operator)))
> +  (setq-local treesit-font-lock-feature-list java-ts-mode--feature-list)
>
>    ;; Imenu.
>    (setq-local treesit-simple-imenu-settings

This change was already installed on master by Yuan Fu, so I'm closing
this bug now.  Thanks.