Revert "Set treesit-primary-parser for tree-sitter modes"

This reverts commit ed57faafc74e0810b492841deccb3cdc77a258ff.

diff --git a/lisp/progmodes/cmake-ts-mode.el b/lisp/progmodes/cmake-ts-mode.el
index 597ef69d9b87fc1fb22ef3f6f4babcdb5e08adaa..854adf4ade7e4415886a67437d00a5e028b78efc 100644 (file)
--- a/lisp/progmodes/cmake-ts-mode.el
+++ b/lisp/progmodes/cmake-ts-mode.el
@@ -208,7 +208,7 @@ Return nil if there is no name or if NODE is not a defun node."
   :syntax-table cmake-ts-mode--syntax-table
 
   (when (treesit-ready-p 'cmake)
-    (setq treesit-primary-parser (treesit-parser-create 'cmake))
+    (treesit-parser-create 'cmake)
 
     ;; Comments.
     (setq-local comment-start "# ")

diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index b86555b1d878c88409afa91df1b793eaa5f752c7..1f86527191a1798710e5ab7b7ab454986b4d2391 100644 (file)
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -1049,7 +1049,7 @@ Key bindings:
     (error "Tree-sitter for C# isn't available"))
 
   ;; Tree-sitter.
-  (setq treesit-primary-parser (treesit-parser-create 'c-sharp))
+  (treesit-parser-create 'c-sharp)
 
   ;; Comments.
   (c-ts-common-comment-setup)

diff --git a/lisp/progmodes/dockerfile-ts-mode.el b/lisp/progmodes/dockerfile-ts-mode.el
index 42fa7482a87c356092ebf525cad45a1ffe0aa037..e31fd86bbdf40bd6e644110af14ed686513ae4d7 100644 (file)
--- a/lisp/progmodes/dockerfile-ts-mode.el
+++ b/lisp/progmodes/dockerfile-ts-mode.el
@@ -133,7 +133,7 @@ Return nil if there is no name or if NODE is not a stage node."
   :syntax-table dockerfile-ts-mode--syntax-table
 
   (when (treesit-ready-p 'dockerfile)
-    (setq treesit-primary-parser (treesit-parser-create 'dockerfile))
+    (treesit-parser-create 'dockerfile)
 
     ;; Comments.
     (setq-local comment-start "# ")

diff --git a/lisp/progmodes/go-ts-mode.el b/lisp/progmodes/go-ts-mode.el
index 899f7852c2bbe0bc3a494f9b9fdf270261328ae8..2d3e6aac0904de8b9e74f1f4c5b62885f97f0801 100644 (file)
--- a/lisp/progmodes/go-ts-mode.el
+++ b/lisp/progmodes/go-ts-mode.el
@@ -253,7 +253,7 @@
   :syntax-table go-ts-mode--syntax-table
 
   (when (treesit-ready-p 'go)
-    (setq treesit-primary-parser (treesit-parser-create 'go))
+    (treesit-parser-create 'go)
 
     ;; Comments.
     (setq-local comment-start "// ")
@@ -453,7 +453,7 @@ what the parent of the node would be if it were a node."
   :syntax-table go-mod-ts-mode--syntax-table
 
   (when (treesit-ready-p 'gomod)
-    (setq treesit-primary-parser (treesit-parser-create 'gomod))
+    (treesit-parser-create 'gomod)
 
     ;; Comments.
     (setq-local comment-start "// ")

diff --git a/lisp/progmodes/heex-ts-mode.el b/lisp/progmodes/heex-ts-mode.el
index 84fd513525c4f98f77f7ee996378bf54e168bbd7..b527d96b5794a35b6c27de4d5b82d08aff77665e 100644 (file)
--- a/lisp/progmodes/heex-ts-mode.el
+++ b/lisp/progmodes/heex-ts-mode.el
@@ -148,7 +148,7 @@ With ARG, do it many times.  Negative ARG means move backward."
   :group 'heex-ts
 
   (when (treesit-ready-p 'heex)
-    (setq treesit-primary-parser (treesit-parser-create 'heex))
+    (treesit-parser-create 'heex)
 
     ;; Comments
     (setq-local treesit-thing-settings

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 6c7c5a30ab8168ca10ed30ceb1227268ab23251a..4ceb211ade11f1a24ff9920f28e37f412f71175f 100644 (file)
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -326,7 +326,7 @@ Return nil if there is no name or if NODE is not a defun node."
   (unless (treesit-ready-p 'java)
     (error "Tree-sitter for Java isn't available"))
 
-  (setq treesit-primary-parser (treesit-parser-create 'java))
+  (treesit-parser-create 'java)
 
   ;; Comments.
   (c-ts-common-comment-setup)

diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 7409c6be833b74649cec95859c48c7a69225e1f4..1fb96555010514c361c9e255ff90a7f9e4b7ca11 100644 (file)
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -128,7 +128,7 @@ Return nil if there is no name or if NODE is not a defun node."
   (unless (treesit-ready-p 'json)
     (error "Tree-sitter for JSON isn't available"))
 
-  (setq treesit-primary-parser (treesit-parser-create 'json))
+  (treesit-parser-create 'json)
 
   ;; Comments.
   (setq-local comment-start "// ")

diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index aea5e1e6116d3dfd7968848eaf04513ab73d5f7a..4ea453c9b65221574e6c141360c1c5e90d42de20 100644 (file)
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -752,7 +752,7 @@ Calls REPORT-FN directly."
   (use-local-map lua-ts-mode-map)
 
   (when (treesit-ready-p 'lua)
-    (setq treesit-primary-parser (treesit-parser-create 'lua))
+    (treesit-parser-create 'lua)
 
     ;; Comments.
     (setq-local comment-start "--")

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index e4b9fe2367d2d5fa8080592fcf036f5d639ab98b..0001bdd21a9d542a069ed3791a90086bb5bc3d25 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -7147,7 +7147,7 @@ implementations: `python-mode' and `python-ts-mode'."
 \\{python-ts-mode-map}"
   :syntax-table python-mode-syntax-table
   (when (treesit-ready-p 'python)
-    (setq treesit-primary-parser (treesit-parser-create 'python))
+    (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
                 '(( comment definition)
                   ( keyword string type)

diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el
index aff0b8911b9a20c1d1e21c30d1c36ff6da8fc699..adcdf15c7ad7fdfaacbdee28d8d28373210bbc0b 100644 (file)
--- a/lisp/progmodes/ruby-ts-mode.el
+++ b/lisp/progmodes/ruby-ts-mode.el
@@ -1127,7 +1127,7 @@ leading double colon is not added."
   (unless (treesit-ready-p 'ruby)
     (error "Tree-sitter for Ruby isn't available"))
 
-  (setq treesit-primary-parser (treesit-parser-create 'ruby))
+  (treesit-parser-create 'ruby)
 
   (setq-local add-log-current-defun-function #'ruby-ts-add-log-current-function)
 

diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index 038955d1ae01eb78fa92e3a169642d83b043e1d8..571ffa9b2205c0c04ee35151276ca500c8502a60 100644 (file)
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -507,7 +507,7 @@ See `prettify-symbols-compose-predicate'."
   :syntax-table rust-ts-mode--syntax-table
 
   (when (treesit-ready-p 'rust)
-    (setq treesit-primary-parser (treesit-parser-create 'rust))
+    (treesit-parser-create 'rust)
 
     ;; Syntax.
     (setq-local syntax-propertize-function

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 8ba641002033ab7241d0a12dff28078cd40abc4a..a348e9ba6fdb73993d7b0a9233d4e1b98648d5af 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1623,7 +1623,7 @@ not written in Bash or sh."
     (add-hook 'flymake-diagnostic-functions #'sh-shellcheck-flymake nil t)
     (add-hook 'hack-local-variables-hook
               #'sh-after-hack-local-variables nil t)
-    (setq treesit-primary-parser (treesit-parser-create 'bash))
+    (treesit-parser-create 'bash)
     (setq-local treesit-font-lock-feature-list
                 '(( comment function)
                   ( command declaration-command keyword string)

diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 4860eaf3a341b2586e85af896a9f9cd9cf91914d..3606a139d503c54fa4b3f5c4677e9d618047e7bd 100644 (file)
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -502,7 +502,7 @@ This mode is intended to be inherited by concrete major modes."
   :syntax-table typescript-ts-mode--syntax-table
 
   (when (treesit-ready-p 'typescript)
-    (setq treesit-primary-parser (treesit-parser-create 'typescript))
+    (treesit-parser-create 'typescript)
 
     ;; Indent.
     (setq-local treesit-simple-indent-rules
@@ -540,7 +540,7 @@ at least 3 (which is the default value)."
   :syntax-table typescript-ts-mode--syntax-table
 
   (when (treesit-ready-p 'tsx)
-    (setq treesit-primary-parser (treesit-parser-create 'tsx))
+    (treesit-parser-create 'tsx)
 
     ;; Comments.
     (setq-local comment-start "// ")

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index c8da28187ee5c31b17b9b5aa6e4c03820a7d01c0..f5a20e0ca0e8bf156d20671a0b8148f957b28cba 100644 (file)
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1814,7 +1814,7 @@ can also be used to fill comments.
     (setq-local font-lock-fontify-region-function #'css--fontify-region)
 
     ;; Tree-sitter specific setup.
-    (setq treesit-primary-parser (treesit-parser-create 'css))
+    (treesit-parser-create 'css)
     (setq-local treesit-simple-indent-rules css--treesit-indent-rules)
     (setq-local treesit-defun-type-regexp "rule_set")
     (setq-local treesit-defun-name-function #'css--treesit-defun-name)

diff --git a/lisp/textmodes/html-ts-mode.el b/lisp/textmodes/html-ts-mode.el
index f78fbdde1da065152492f33e9fb284c721f4b9e3..235e1055fa956d81c305522d9f4b8b4fb512408b 100644 (file)
--- a/lisp/textmodes/html-ts-mode.el
+++ b/lisp/textmodes/html-ts-mode.el
@@ -92,7 +92,7 @@ Return nil if there is no name or if NODE is not a defun node."
   (unless (treesit-ready-p 'html)
     (error "Tree-sitter for HTML isn't available"))
 
-  (setq treesit-primary-parser (treesit-parser-create 'html))
+  (treesit-parser-create 'html)
 
   ;; Indent.
   (setq-local treesit-simple-indent-rules html-ts-mode--indent-rules)

diff --git a/lisp/textmodes/toml-ts-mode.el b/lisp/textmodes/toml-ts-mode.el
index 806f045c23baa6c79d776997a47c44a7cb1eb31b..3c4533a7fea1c8cbf044afad56304ac6cf06a323 100644 (file)
--- a/lisp/textmodes/toml-ts-mode.el
+++ b/lisp/textmodes/toml-ts-mode.el
@@ -124,7 +124,7 @@ Return nil if there is no name or if NODE is not a defun node."
   :syntax-table toml-ts-mode--syntax-table
 
   (when (treesit-ready-p 'toml)
-    (setq treesit-primary-parser (treesit-parser-create 'toml))
+    (treesit-parser-create 'toml)
 
     ;; Comments
     (setq-local comment-start "# ")

diff --git a/lisp/textmodes/yaml-ts-mode.el b/lisp/textmodes/yaml-ts-mode.el
index 42d7c2e1798465df26395ba0b2b15df3abc5c6e7..210835585feeb2f685d0eb7ffd505aeb10ddd35e 100644 (file)
--- a/lisp/textmodes/yaml-ts-mode.el
+++ b/lisp/textmodes/yaml-ts-mode.el
@@ -148,7 +148,7 @@ boundaries.  JUSTIFY is passed to `fill-paragraph'."
   :syntax-table yaml-ts-mode--syntax-table
 
   (when (treesit-ready-p 'yaml)
-    (setq treesit-primary-parser (treesit-parser-create 'yaml))
+    (treesit-parser-create 'yaml)
 
     ;; Comments.
     (setq-local comment-start "# ")