From 23f2e8a6be5b0e60c3e48371718d1c58ce64f55a Mon Sep 17 00:00:00 2001
From: Uko Kokņevičs
Date: Mon, 27 Oct 2025 12:29:15 +0200
Subject: emacs: Replace scala-mode with scala-ts-mode

---
 emacs/.config/emacs/arkta/arkta-progmodes.el     | 2 +-
 emacs/.config/emacs/arkta/arkta-treesit.el       | 4 ++++
 emacs/.config/emacs/init.el                      | 1 +
 emacs/.config/emacs/straight/versions/default.el | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index ea2f411..b8db189 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -237,7 +237,7 @@
   :straight '(rust-ts-mode :type built-in)
   :mode "\\.rs\\'")
 
-(use-package scala-mode
+(use-package scala-ts-mode
   :straight t
   :mode "\\.scala\\'")
 
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index 631268b..7766c20 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -196,6 +196,10 @@
                    (15 "v0.24.0")
                    (14 "v0.23.3")))
 
+          (scala "https://github.com/tree-sitter/tree-sitter-scala"
+                 ,(arkta/treesit-cond
+                    (14 "v0.24.0")))
+
           (toml "https://github.com/ikatyang/tree-sitter-toml.git"
                 ,(arkta/treesit-cond
                    (13 "v0.5.1")))
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index 237fb49..4c1553b 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -73,6 +73,7 @@
                             (python-mode . python-ts-mode)
                             (ruby-mode . ruby-ts-mode)
                             (rust-mode . rust-ts-mode)
+                            (scala-mode . scala-ts-mode)
                             (yaml-mode . yaml-ts-mode)
                             (toml-mode . toml-ts-mode)
                             (tsx-mode . tsx-ts-mode)
diff --git a/emacs/.config/emacs/straight/versions/default.el b/emacs/.config/emacs/straight/versions/default.el
index 19bd8c3..6e57bf7 100644
--- a/emacs/.config/emacs/straight/versions/default.el
+++ b/emacs/.config/emacs/straight/versions/default.el
@@ -23,7 +23,6 @@
  ("emacs-gdscript-mode" . "bd0a741066a7bb2dfa51d2daec54fc38d56078a5")
  ("emacs-kotlin-ts-mode" . "051c9ef534956c235343fb41546623ff87a1695b")
  ("emacs-reformatter" . "c52e91d5438b9bf16b77b4384822e254f10a6b0a")
- ("emacs-scala-mode" . "661337d8aa0a0cb418184c83757661603de3b2e3")
  ("emacs-solaire-mode" . "c9334666bd208f3322e6118d30eba1b2438e2bb9")
  ("emacsmirror-mirror" . "6c387f044ab033f3a912d08b11bc565679187ba6")
  ("envrc" . "de1ae6e538764f74659f358b04af0d84fa0fef42")
@@ -61,6 +60,7 @@
  ("racket-mode" . "143d453dc09e4ca1eb43826bd61270a97f1f7c9d")
  ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
  ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
+ ("scala-ts-mode" . "c7671e10419261ef70b1820d3b970ad39f6fcfe2")
  ("seq" . "da86da9bf111f68fb81efd466d76d53af5aebc00")
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
  ("slime" . "3d809df89ec05a3666c35075923eac0806e90659")
-- 
cgit v1.2.3