Suffix tree-sitter cache variables with "-cached"

* lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--indent-rules)
(cmake-ts-mode--indent-rules-cached, cmake-ts-mode--font-lock-settings)
(cmake-ts-mode--font-lock-settings-cached):
* lisp/progmodes/go-ts-mode.el (go-ts-mode--font-lock-settings)
(go-ts-mode--font-lock-settings-cached):
* lisp/progmodes/js.el (js--treesit-indent-rules)
(js--treesit-indent-rules-cached, js--treesit-font-lock-settings)
(js--treesit-font-lock-settings-cached): Suffix tree-sitter cache
variables with "-cached" (bug#79363).
This commit is contained in:
Roi Martin
2025-09-21 12:18:03 +02:00
committed by Juri Linkov
parent 2ae54a8b17
commit 203faa6e42
3 changed files with 30 additions and 30 deletions

View File

@@ -61,16 +61,16 @@
table)
"Syntax table for `cmake-ts-mode'.")
(defvar cmake-ts-mode--indent-rules nil
"Tree-sitter indent rules for `cmake-ts-mode'.")
(defvar cmake-ts-mode--indent-rules-cached nil
"Cached tree-sitter indent rules for `cmake-ts-mode'.")
(defun cmake-ts-mode--indent-rules ()
"Return tree-sitter indent rules for `cmake-ts-mode'.
Tree-sitter indent rules are evaluated the first time this function
is called. Subsequent calls return the first evaluated value."
(or cmake-ts-mode--indent-rules
(setq cmake-ts-mode--indent-rules
Tree-sitter indent rules are evaluated the first time this function is
called. Subsequent calls return the first evaluated value."
(or cmake-ts-mode--indent-rules-cached
(setq cmake-ts-mode--indent-rules-cached
`((cmake
((node-is ")") parent-bol 0)
((node-is "else_command") parent-bol 0)
@@ -148,16 +148,16 @@ Check if a node type is available, then return the right font lock rules."
eol))
@font-lock-constant-face))))))))
(defvar cmake-ts-mode--font-lock-settings nil
"Tree-sitter font-lock settings for `cmake-ts-mode'.")
(defvar cmake-ts-mode--font-lock-settings-cached nil
"Cached tree-sitter font-lock settings for `cmake-ts-mode'.")
(defun cmake-ts-mode--font-lock-settings ()
"Return tree-sitter font-lock settings for `cmake-ts-mode'.
Tree-sitter font-lock rules are evaluated the first time this function
is called. Subsequent calls return the first evaluated value."
(or cmake-ts-mode--font-lock-settings
(setq cmake-ts-mode--font-lock-settings
Tree-sitter font-lock settings are evaluated the first time this
function is called. Subsequent calls return the first evaluated value."
(or cmake-ts-mode--font-lock-settings-cached
(setq cmake-ts-mode--font-lock-settings-cached
(treesit-font-lock-rules
:language 'cmake
:feature 'bracket

View File

@@ -162,16 +162,16 @@
(ignore-errors
(or (treesit-query-string "" '((method_elem) @cap) 'go) t)))
(defvar go-ts-mode--font-lock-settings nil
"Tree-sitter font-lock settings for `go-ts-mode'.")
(defvar go-ts-mode--font-lock-settings-cached nil
"Cached tree-sitter font-lock settings for `go-ts-mode'.")
(defun go-ts-mode--font-lock-settings ()
"Return tree-sitter font-lock settings for `go-ts-mode'.
Tree-sitter font-lock rules are evaluated the first time this function
is called. Subsequent calls return the first evaluated value."
(or go-ts-mode--font-lock-settings
(setq go-ts-mode--font-lock-settings
Tree-sitter font-lock settings are evaluated the first time this
function is called. Subsequent calls return the first evaluated value."
(or go-ts-mode--font-lock-settings-cached
(setq go-ts-mode--font-lock-settings-cached
(treesit-font-lock-rules
:language 'go
:feature 'bracket

View File

@@ -3513,16 +3513,16 @@ characters of the current line."
node parent bol args)
js-indent-level)))
(defvar js--treesit-indent-rules nil
"Tree-sitter indent rules for `js-ts-mode'.")
(defvar js--treesit-indent-rules-cached nil
"Cached tree-sitter indent rules for `js-ts-mode'.")
(defun js--treesit-indent-rules ()
"Return tree-sitter indent rules for `js-ts-mode'.
Tree-sitter indent rules are evaluated the first time this function
is called. Subsequent calls return the first evaluated value."
(or js--treesit-indent-rules
(setq js--treesit-indent-rules
Tree-sitter indent rules are evaluated the first time this function is
called. Subsequent calls return the first evaluated value."
(or js--treesit-indent-rules-cached
(setq js--treesit-indent-rules-cached
`((javascript
((parent-is "program") parent-bol 0)
((node-is "}") standalone-parent 0)
@@ -3595,16 +3595,16 @@ is called. Subsequent calls return the first evaluated value."
"&&" "||" "!")
"JavaScript operators for tree-sitter font-locking.")
(defvar js--treesit-font-lock-settings nil
"Tree-sitter font-lock settings for `js-ts-mode'.")
(defvar js--treesit-font-lock-settings-cached nil
"Cached tree-sitter font-lock settings for `js-ts-mode'.")
(defun js--treesit-font-lock-settings ()
"Return tree-sitter font-lock settings for `js-ts-mode'.
Tree-sitter font-lock rules are evaluated the first time this function
is called. Subsequent calls return the first evaluated value."
(or js--treesit-font-lock-settings
(setq js--treesit-font-lock-settings
Tree-sitter font-lock settings are evaluated the first time this
function is called. Subsequent calls return the first evaluated value."
(or js--treesit-font-lock-settings-cached
(setq js--treesit-font-lock-settings-cached
(treesit-font-lock-rules
:language 'javascript