Skip to content

Commit

Permalink
fix(treesit): auto mode precedence of rust-mode
Browse files Browse the repository at this point in the history
Currently, `rust-ts-mode` will add itself to
the `auto-mode-alist` when it is loaded, which
is after the autoload for adding `rust-mode`.
We need to re-add `rust-mode` after loading the
treesitter package to make sure this mode has
higher priority.
  • Loading branch information
Dev380 committed Apr 13, 2024
1 parent b2b18aa commit 3592c10
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions rust-mode-treesitter.el
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
(require 'treesit)
(require 'rust-ts-mode)

;; HACK: `rust-ts-mode' adds itself to the `auto-mode-alist'
;; after us, so we need to readd `rust-mode' to the front of
;; the list after loading `rust-ts-mode'.
(setq auto-mode-alist (delete '("\\.rs\\'" . rust-mode) auto-mode-alist))
(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))

(define-derived-mode rust-mode rust-ts-mode "Rust"
"Major mode for Rust code.
Expand Down

0 comments on commit 3592c10

Please sign in to comment.