diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el index 099cca00e..6197fe243 100644 --- a/modules/lang/scala/config.el +++ b/modules/lang/scala/config.el @@ -65,12 +65,6 @@ :config (when (modulep! +lsp) - (setq-hook! 'scala-ts-mode-hook lsp-enable-indentation nil) - (add-hook 'scala-ts-mode-local-vars-hook #'lsp! 'append)) + (setq-hook! 'scala-ts-mode-hook lsp-enable-indentation nil)) (+scala-common-config 'scala-ts-mode)) - - -(use-package! sbt-mode - :after scala-mode - :config (set-repl-handler! '(scala-mode scala-ts-mode) #'+scala/open-repl :persist t)) diff --git a/modules/lang/scala/doctor.el b/modules/lang/scala/doctor.el index 4ba6b07d2..fc72e2f18 100644 --- a/modules/lang/scala/doctor.el +++ b/modules/lang/scala/doctor.el @@ -8,10 +8,6 @@ (modulep! :tools tree-sitter)) "This module requires (:tools tree-sitter)") -(assert! (or (not (modulep! +tree-sitter)) - (version< emacs-version "29.1")) - "Emacs 29.1+ is required for tree-sitter support") - (if (and (modulep! +lsp) (not (executable-find "metals"))) (warn! "metals isn't installed"))