procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

go-ts-mode: Use iota query only if supported (Bug#63086)

Browse source 
iota query support was added on January 5, 2022.  To support older
versions of the tree-sitter-go grammar (like the latest tagged version,
v0.19.1, which was released on March 3, 2021), check if the query is
supported before trying to use it.

* lisp/progmodes/go-ts-mode.el (go-ts-mode--iota-query-supported-p): New
function.
(go-ts-mode--font-lock-settings): Use it.
This commit is contained in:
Randy Taylor 2023-04-26 11:15:45 -04:00 • committed by Dmitry Gutov
parent cc090294d7
commit eaf25b9c6a
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/progmodes/go-ts-mode.el
View file

@ -105,6 +105,12 @@
">>" "%=" ">>=" "--" "!" "..." "&^" "&^=" "~") ">>" "%=" ">>=" "--" "!" "..." "&^" "&^=" "~")
"Go operators for tree-sitter font-locking.") "Go operators for tree-sitter font-locking.")
(defun go-ts-mode--iota-query-supported-p ()
"Returns t if the iota query is supported by the current version of
the tree-sitter-go grammar."
(ignore-errors
(or (treesit-query-string "" '((iota) @font-lock-constant-face) 'go) t)))
(defvar go-ts-mode--font-lock-settings (defvar go-ts-mode--font-lock-settings
(treesit-font-lock-rules (treesit-font-lock-rules
:language 'go :language 'go
@ -117,7 +123,9 @@
:language 'go :language 'go
:feature 'constant :feature 'constant
'([(false) (iota) (nil) (true)] @font-lock-constant-face `([(false) (nil) (true)] @font-lock-constant-face
,@(when (go-ts-mode--iota-query-supported-p)
'((iota) @font-lock-constant-face))
(const_declaration (const_declaration
(const_spec name: (identifier) @font-lock-constant-face))) (const_spec name: (identifier) @font-lock-constant-face)))