merge: branch 'feature/treesit'

Fix: #7742
Fix: #7623
Fix: #7593

modules/lang/ruby/config.el

@@ -22,9 +22,6 @@
   (when (modulep! +lsp)
     (add-hook 'ruby-mode-local-vars-hook #'lsp! 'append))
 
-  (when (modulep! +tree-sitter)
-    (add-hook 'ruby-mode-local-vars-hook #'tree-sitter! 'append))
-
   (after! inf-ruby
     (add-hook 'inf-ruby-mode-hook #'doom-mark-buffer-as-real-h)
     ;; switch to inf-ruby from compile if we detect a breakpoint has been hit
@@ -39,6 +36,20 @@
         "{" #'ruby-toggle-block))
 
 
+(use-package! ruby-ts-mode  ; 29.1+ only
+  :when (modulep! +tree-sitter)
+  :defer t
+  :init
+  (set-tree-sitter! 'ruby-mode 'ruby-ts-mode
+    '((ruby :url "https://github.com/tree-sitter/tree-sitter-ruby"
+            :commit "71bd32fb7607035768799732addba884a37a6210")))
+  :config
+  (set-electric! 'ruby-ts-mode :words '("else" "end" "elsif"))
+  (set-repl-handler! 'ruby-ts-mode #'inf-ruby)
+  (when (modulep! +lsp)
+    (add-hook 'ruby-ts-mode-local-vars-hook #'lsp! 'append)))
+
+
 (use-package! yard-mode
   :hook ruby-mode)