From 4c5f1737c4815bd6d167108343a61da9a3882f32 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Sat, 19 Nov 2022 18:45:45 -0800
Subject: [PATCH] Remove tree-sitter setup from js-json-mode

* lisp/progmodes/js.el (js-json--treesit-font-lock-settings)
(js--json-treesit-indent-rules): Remove variables.
(js-json-mode): Remove tree-sitter setup.
---
 lisp/progmodes/js.el | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 159c32ca2ae..97e6c4f4107 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3841,49 +3841,12 @@ Currently there are `js-mode' and `js-ts-mode'."
     (setq-local which-func-functions nil)
     (treesit-major-mode-setup)))
 
-(defvar js-json--treesit-font-lock-settings
-  (treesit-font-lock-rules
-   :language 'json
-   :feature 'minimal
-   :override t
-   `(
-     (pair
-      key: (_) @font-lock-string-face)
-
-     (string) @font-lock-string-face
-
-     (number) @font-lock-constant-face
-
-     [(null) (true) (false)] @font-lock-constant-face
-
-     (escape_sequence) @font-lock-constant-face
-
-     (comment) @font-lock-comment-face))
-  "Font-lock settings for JSON.")
-
-
-(defvar js--json-treesit-indent-rules
-  `((json
-     (no-node (js--treesit-backward-up-list) js-indent-level)
-     ((node-is "}") parent-bol 0)
-     ((node-is ")") parent-bol 0)
-     ((node-is "]") parent-bol 0)
-     ((parent-is "object") parent-bol js-indent-level)
-     )))
-
 ;;;###autoload
 (define-derived-mode js-json-mode js-mode "JSON"
   (setq-local js-enabled-frameworks nil)
   ;; Speed up `syntax-ppss': JSON files can be big but can't hold
   ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
-  (setq-local syntax-propertize-function #'ignore)
-
-  (cond
-   ;; Tree-sitter.
-   ((treesit-ready-p 'js-json-mode 'json)
-    (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
-    (setq-local treesit-font-lock-settings js-json--treesit-font-lock-settings)
-    (treesit-major-mode-setup))))
+  (setq-local syntax-propertize-function #'ignore))
 
 ;; Since we made JSX support available and automatically-enabled in
 ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply
-- 
2.39.5