>From 60b9dfeaec8d194c0b162f3eaa4ae4a4736d68e9 Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
Date: Mon, 5 Dec 2022 12:34:08 +0100
Subject: [PATCH] Add back in font-locking for pair in json-ts-mode

* lisp/progmodes/json-ts-mode.el (json-ts-mode--font-lock-settings):
Add back in removed pair font-lock code.  Also alphabetize features.
(json-ts-mode): Use the new feature.

(bug#59833)
---
 lisp/progmodes/json-ts-mode.el | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 101e873cf6..0ce820bafb 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -78,24 +78,30 @@ json-ts-mode--font-lock-settings
    '((["[" "]" "{" "}"]) @font-lock-bracket-face)
    :language 'json
    :feature 'constant
+   :override t
    '([(null) (true) (false)] @font-lock-constant-face)
    :language 'json
    :feature 'delimiter
    '((["," ":"]) @font-lock-delimiter-face)
    :language 'json
-   :feature 'number
-   '((number) @font-lock-number-face)
-   :language 'json
-   :feature 'string
-   '((string) @font-lock-string-face)
+   :feature 'error
+   :override t
+   '((ERROR) @font-lock-warning-face)
    :language 'json
    :feature 'escape-sequence
    :override t
    '((escape_sequence) @font-lock-escape-face)
    :language 'json
-   :feature 'error
+   :feature 'number
    :override t
-   '((ERROR) @font-lock-warning-face))
+   '((number) @font-lock-number-face)
+   :language 'json
+   :feature 'pair
+   :override t
+   `((pair key: (_) @font-lock-variable-name-face))
+   :language 'json
+   :feature 'string
+   '((string) @font-lock-string-face))
   "Font-lock settings for JSON.")
 
 (defun json-ts-mode--imenu-1 (node)
@@ -156,7 +162,7 @@ json-ts-mode
   ;; Font-lock.
   (setq-local treesit-font-lock-settings json-ts-mode--font-lock-settings)
   (setq-local treesit-font-lock-feature-list
-              '((constant number string)
+              '((constant number string pair)
                 (escape-sequence)
                 (bracket delimiter error)))
 
-- 
2.34.1