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

Allow to go back to using 'ruby-mode' after loading 'ruby-ts-mode'

Browse source 
* lisp/progmodes/ruby-ts-mode.el (major-mode-remap-defaults):
Remap 'ruby-mode' to 'ruby-ts-mode'.  Add commentary.
* lisp/progmodes/ruby-mode.el (major-mode-remap-defaults): Remove
any remappings of ruby-mode'.
* lisp/progmodes/c-ts-mode.el: Fix a typo in a comment.  (Bug#74339)
This commit is contained in:
Eli Zaretskii 2024-11-28 16:55:26 +02:00
parent fc17e8727d
commit 0ef0f18f16
3 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/progmodes/c-ts-mode.el
View file

@ -35,7 +35,7 @@
;; To use these modes by default, assuming you have the respective
;; tree-sitter grammars available, do one of the following:
;;
;; - Add one or mode of the following to your init file:
;; - Add one or more of the following lines to your init file:
;;
;; (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))
;; (add-to-list 'major-mode-remap-alist '(c++-mode . c++-ts-mode))

4
lisp/progmodes/ruby-mode.el
View file

@ -2748,6 +2748,10 @@ Currently there are `ruby-mode' and `ruby-ts-mode'."
(dolist (name (list "ruby" "rbx" "jruby" "j?ruby\\(?:[0-9.]+\\)"))
(add-to-list 'interpreter-mode-alist (cons (purecopy name) 'ruby-mode)))
;; See ruby-ts-mode.el for why we do this.
(setq major-mode-remap-defaults
(assq-delete-all 'ruby-mode major-mode-remap-defaults))
(provide 'ruby-mode)
;;; ruby-mode.el ends here

41
lisp/progmodes/ruby-ts-mode.el
View file

@ -34,9 +34,38 @@
;; put somewhere Emacs can find it. See the docstring of
;; `treesit-extra-load-path'.
;; This mode doesn't associate itself with .rb files automatically.
;; You can do that either by prepending to the value of
;; `auto-mode-alist', or using `major-mode-remap-alist'.
;; This mode doesn't associate itself with .rb files automatically. To
;; use this mode by default, assuming you have the tree-sitter grammar
;; available, do one of the following:
;;
;; - Add the following to your init file:
;;
;; (add-to-list 'major-mode-remap-alist '(ruby-mode . ruby-ts-mode))
;;
;; - Customize 'auto-mode-alist' to turn ruby-ts-mode automatically.
;; For example:
;;
;; (add-to-list 'auto-mode-alist
;; (cons (concat "\\(?:\\.\\(?:"
;; "rbw?\\|ru\\|rake\\|thor\\|axlsx"
;; "\\|jbuilder\\|rabl\\|gemspec\\|podspec"
;; "\\)"
;; "\\|/"
;; "\\(?:Gem\\|Rake\\|Cap\\|Thor"
;; "\\|Puppet\\|Berks\\|Brew\\|Fast"
;; "\\|Vagrant\\|Guard\\|Pod\\)file"
;; "\\)\\'")
;; 'ruby-ts-mode))
;;
;; will turn on the ruby-ts-mode for Ruby source files.
;;
;; - If you have the Ruby grammar installed, add
;;
;; (load "ruby-ts-mode")
;;
;; to your init file.
;;
;; You can also turn on this mode manually in a buffer.
;; Tree Sitter brings a lot of power and versitility which can be
;; broken into these features.
@ -1234,8 +1263,10 @@ leading double colon is not added."
(derived-mode-add-parents 'ruby-ts-mode '(ruby-mode))
(if (treesit-ready-p 'ruby)
(add-to-list 'major-mode-remap-defaults
(when (treesit-ready-p 'ruby)
(setq major-mode-remap-defaults
(assq-delete-all 'ruby-mode major-mode-remap-defaults))
(add-to-list 'major-mode-remap-defaults
'(ruby-mode . ruby-ts-mode)))
(provide 'ruby-ts-mode)