From: Yuan Fu <casouri@gmail.com>
Date: Mon, 17 Mar 2025 05:30:42 +0000 (-0700)
Subject: Move around java-ts-mode font-lock rules (bug#75154)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e51437653a22a8437c0f3db1b6dc75501d7004b8;p=emacs.git

Move around java-ts-mode font-lock rules (bug#75154)

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode--font-lock-settings): Move constant feature down
so it overrides expression and definition.

(cherry picked from commit 3d2d95e28431a16897a65543d8b26c791b389ef6)
---

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 28f8ef3c8f2..80a6130ab2a 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -244,11 +244,6 @@ For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'."
      (block_comment) @font-lock-comment-face)
    :language 'java
    :override t
-   :feature 'constant
-   `((identifier) @java-ts-mode--fontify-constant
-     [(true) (false)] @font-lock-constant-face)
-   :language 'java
-   :override t
    :feature 'keyword
    `([,@java-ts-mode--keywords
       (this)
@@ -354,7 +349,13 @@ For NODE, OVERRIDE, START, and END, see `treesit-font-lock-rules'."
      (argument_list (identifier) @font-lock-variable-name-face)
 
      (expression_statement (identifier) @font-lock-variable-use-face))
-
+   ;; Make sure the constant feature is after expression and definition,
+   ;; because those two applies variable-name-face on some constants.
+   :language 'java
+   :override t
+   :feature 'constant
+   `((identifier) @java-ts-mode--fontify-constant
+     [(true) (false)] @font-lock-constant-face)
    :language 'java
    :feature 'bracket
    '((["(" ")" "[" "]" "{" "}"]) @font-lock-bracket-face)