aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodor Thornhill2022-12-05 15:59:41 +0100
committerYuan Fu2022-12-05 12:21:31 -0800
commit64271bbb7d9066080ea1e8dbae72beed979350e6 (patch)
tree2ce5fc526cd3e00a0fed8b58caa7082236aca34c
parent16b948884294d6081fbcdd734df06f3bb14da96d (diff)
downloademacs-64271bbb7d9066080ea1e8dbae72beed979350e6.tar.gz
emacs-64271bbb7d9066080ea1e8dbae72beed979350e6.zip
Add back pair feature in json-ts-mode fontification (bug#59833)
* lisp/progmodes/json-ts-mode.el (json-ts-mode--font-lock-settings): Add back in removed pair feature. Also alphabetize features. (json-ts-mode): Use the new feature.
-rw-r--r--lisp/progmodes/json-ts-mode.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 101e873cf6e..8ea582ad8fa 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -93,6 +93,10 @@
93 :override t 93 :override t
94 '((escape_sequence) @font-lock-escape-face) 94 '((escape_sequence) @font-lock-escape-face)
95 :language 'json 95 :language 'json
96 :feature 'pair
97 :override t ; Needed for overriding string face on keys.
98 '((pair key: (_) @font-lock-variable-name-face))
99 :language 'json
96 :feature 'error 100 :feature 'error
97 :override t 101 :override t
98 '((ERROR) @font-lock-warning-face)) 102 '((ERROR) @font-lock-warning-face))
@@ -156,7 +160,7 @@ the subtrees."
156 ;; Font-lock. 160 ;; Font-lock.
157 (setq-local treesit-font-lock-settings json-ts-mode--font-lock-settings) 161 (setq-local treesit-font-lock-settings json-ts-mode--font-lock-settings)
158 (setq-local treesit-font-lock-feature-list 162 (setq-local treesit-font-lock-feature-list
159 '((constant number string) 163 '((constant number pair string)
160 (escape-sequence) 164 (escape-sequence)
161 (bracket delimiter error))) 165 (bracket delimiter error)))
162 166