]> git.eshelyaron.com Git - emacs.git/commit
Embed elixir in heex as well as elixir->heex->elixir (bug#76788).
authorJuri Linkov <juri@linkov.net>
Fri, 18 Apr 2025 16:52:19 +0000 (19:52 +0300)
committerEshel Yaron <me@eshelyaron.com>
Mon, 21 Apr 2025 20:36:26 +0000 (22:36 +0200)
commit31f9e0fb16fdb93bf4cbdd42d2033cae946f2782
treec6a93338cbd1e2e119b6e98b5847b5ec849d11be
parent5da08526384472a2d3712e4be5828901e7ee3fcf
Embed elixir in heex as well as elixir->heex->elixir (bug#76788).

* lisp/progmodes/elixir-ts-mode.el (elixir-ts--range-rules):
Rename to a shorter name from 'elixir-ts--treesit-range-rules'.
(elixir-ts--font-lock-feature-list, elixir-ts--thing-settings)
(elixir-ts--range-rules): New variables with default values
extracted from 'elixir-ts-mode'.
(elixir-ts-mode): Use 'elixir-ts--font-lock-feature-list',
'elixir-ts--thing-settings', 'elixir-ts--range-rules'
and 'heex-ts--range-rules'.
Use 'treesit-merge-font-lock-feature-list' to merge
'heex-ts--font-lock-feature-list'.

* lisp/progmodes/heex-ts-mode.el
(heex-ts--font-lock-feature-list, heex-ts--range-rules):
New variables.
(heex-ts-mode): Use 'heex-ts--font-lock-feature-list',
'heex-ts--range-rules'.  Merge 'elixir-ts--font-lock-settings',
'elixir-ts--font-lock-feature-list', 'elixir-ts--thing-settings'
for embedding elixir in heex.  Enable the 'sexp' navigation
by default with 'treesit-cycle-sexp-type'.

* lisp/progmodes/c-ts-mode.el (c-ts-mode): Append
'treesit-range-rules' to possibly already existing list in
'treesit-range-settings'.

* lisp/treesit.el (treesit-language-at-point-default):
Optimize to use 'when-let*'.

(cherry picked from commit d56e37c83c721c5bcffcf434138b27482b7e3fa6)
lisp/progmodes/c-ts-mode.el
lisp/progmodes/elixir-ts-mode.el
lisp/progmodes/heex-ts-mode.el
lisp/treesit.el