[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-30 ed57faafc74 1/2: Set treesit-primary-parser for tree-sitter mod
|
From: |
Yuan Fu |
|
Subject: |
emacs-30 ed57faafc74 1/2: Set treesit-primary-parser for tree-sitter modes |
|
Date: |
Mon, 7 Oct 2024 20:41:55 -0400 (EDT) |
branch: emacs-30
commit ed57faafc74e0810b492841deccb3cdc77a258ff
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Set treesit-primary-parser for tree-sitter modes
I debated whether to do this, since technically speaking it's
not needed for single-language modes. But ultimately it's
better to be explicit and set a good example with builtin modes.
* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode):
* lisp/progmodes/csharp-mode.el (csharp-ts-mode):
* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode):
* lisp/progmodes/go-ts-mode.el (go-ts-mode):
(go-mod-ts-mode):
* lisp/progmodes/heex-ts-mode.el (heex-ts-mode):
* lisp/progmodes/java-ts-mode.el (java-ts-mode):
* lisp/progmodes/json-ts-mode.el (json-ts-mode):
* lisp/progmodes/lua-ts-mode.el (lua-ts-mode):
* lisp/progmodes/python.el (python-ts-mode):
* lisp/progmodes/ruby-ts-mode.el (ruby-ts-mode):
* lisp/progmodes/rust-ts-mode.el (rust-ts-mode):
* lisp/progmodes/sh-script.el:
* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode):
(tsx-ts-mode):
* lisp/textmodes/css-mode.el (css-ts-mode):
* lisp/textmodes/html-ts-mode.el (html-ts-mode):
* lisp/textmodes/toml-ts-mode.el (toml-ts-mode):
* lisp/textmodes/yaml-ts-mode.el (yaml-ts-mode): Set
treesit-primary-parser.
---
lisp/progmodes/cmake-ts-mode.el | 2 +-
lisp/progmodes/csharp-mode.el | 2 +-
lisp/progmodes/dockerfile-ts-mode.el | 2 +-
lisp/progmodes/go-ts-mode.el | 4 ++--
lisp/progmodes/heex-ts-mode.el | 2 +-
lisp/progmodes/java-ts-mode.el | 2 +-
lisp/progmodes/json-ts-mode.el | 2 +-
lisp/progmodes/lua-ts-mode.el | 2 +-
lisp/progmodes/python.el | 2 +-
lisp/progmodes/ruby-ts-mode.el | 2 +-
lisp/progmodes/rust-ts-mode.el | 2 +-
lisp/progmodes/sh-script.el | 2 +-
lisp/progmodes/typescript-ts-mode.el | 4 ++--
lisp/textmodes/css-mode.el | 2 +-
lisp/textmodes/html-ts-mode.el | 2 +-
lisp/textmodes/toml-ts-mode.el | 2 +-
lisp/textmodes/yaml-ts-mode.el | 2 +-
17 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lisp/progmodes/cmake-ts-mode.el b/lisp/progmodes/cmake-ts-mode.el
index 854adf4ade7..597ef69d9b8 100644
--- 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)
- (treesit-parser-create 'cmake)
+ (setq treesit-primary-parser (treesit-parser-create 'cmake))
;; Comments.
(setq-local comment-start "# ")
diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index 1f86527191a..b86555b1d87 100644
--- 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.
- (treesit-parser-create 'c-sharp)
+ (setq treesit-primary-parser (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 e31fd86bbdf..42fa7482a87 100644
--- 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)
- (treesit-parser-create 'dockerfile)
+ (setq treesit-primary-parser (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 2d3e6aac090..899f7852c2b 100644
--- 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)
- (treesit-parser-create 'go)
+ (setq treesit-primary-parser (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)
- (treesit-parser-create 'gomod)
+ (setq treesit-primary-parser (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 b527d96b579..84fd513525c 100644
--- 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)
- (treesit-parser-create 'heex)
+ (setq treesit-primary-parser (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 4ceb211ade1..6c7c5a30ab8 100644
--- 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"))
- (treesit-parser-create 'java)
+ (setq treesit-primary-parser (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 1fb96555010..7409c6be833 100644
--- 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"))
- (treesit-parser-create 'json)
+ (setq treesit-primary-parser (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 4ea453c9b65..aea5e1e6116 100644
--- 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)
- (treesit-parser-create 'lua)
+ (setq treesit-primary-parser (treesit-parser-create 'lua))
;; Comments.
(setq-local comment-start "--")
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0001bdd21a9..e4b9fe2367d 100644
--- 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)
- (treesit-parser-create 'python)
+ (setq treesit-primary-parser (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 adcdf15c7ad..aff0b8911b9 100644
--- 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"))
- (treesit-parser-create 'ruby)
+ (setq treesit-primary-parser (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 571ffa9b220..038955d1ae0 100644
--- 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)
- (treesit-parser-create 'rust)
+ (setq treesit-primary-parser (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 a348e9ba6fd..8ba64100203 100644
--- 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)
- (treesit-parser-create 'bash)
+ (setq treesit-primary-parser (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 3606a139d50..4860eaf3a34 100644
--- 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)
- (treesit-parser-create 'typescript)
+ (setq treesit-primary-parser (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)
- (treesit-parser-create 'tsx)
+ (setq treesit-primary-parser (treesit-parser-create 'tsx))
;; Comments.
(setq-local comment-start "// ")
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index f5a20e0ca0e..c8da28187ee 100644
--- 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.
- (treesit-parser-create 'css)
+ (setq treesit-primary-parser (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 235e1055fa9..f78fbdde1da 100644
--- 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"))
- (treesit-parser-create 'html)
+ (setq treesit-primary-parser (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 3c4533a7fea..806f045c23b 100644
--- 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)
- (treesit-parser-create 'toml)
+ (setq treesit-primary-parser (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 210835585fe..42d7c2e1798 100644
--- 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)
- (treesit-parser-create 'yaml)
+ (setq treesit-primary-parser (treesit-parser-create 'yaml))
;; Comments.
(setq-local comment-start "# ")