Merge pull request #539 from Dev380/fix-auto-mode-treesit

fix(treesit): auto mode precedence of rust-mode
rust-lang · Apr 15, 2024 · e54bbae · e54bbae
2 parents b2b18aa + 3592c10
commit e54bbae
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/rust-mode-treesitter.el b/rust-mode-treesitter.el
@@ -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.