From 5c8c02915caa19d29dfb32ea2db5fa7360ece3d5 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Fri, 21 Mar 2025 16:40:29 +0100
Subject: [PATCH] Update kak-lsp support for scala

---
 packages/common/nki-kakoune/kakrc   |  8 --------
 packages/common/nki-kakoune/lsp.nix | 21 ++++++++++++++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/common/nki-kakoune/kakrc b/packages/common/nki-kakoune/kakrc
index 878869c..af7f4f1 100644
--- a/packages/common/nki-kakoune/kakrc
+++ b/packages/common/nki-kakoune/kakrc
@@ -131,14 +131,6 @@ hook global WinSetOption filetype=(typst) %{
   hook -once -always window WinSetOption filetype=.* %{ remove-hooks window markdown-.+ }
 }
 
-define-command -params 0 -docstring "Set up build" scala-build-connect %{
-    lsp-execute-command 'build-connect' '"[]"'
-}
-
-define-command -params 0 -docstring "Import build" scala-build-import %{
-    lsp-execute-command 'build-import' '"[]"'
-}
-
 def -hidden insert-c-n %{
  try %{
    lsp-snippets-select-next-placeholders
diff --git a/packages/common/nki-kakoune/lsp.nix b/packages/common/nki-kakoune/lsp.nix
index 297a449..53c28e0 100644
--- a/packages/common/nki-kakoune/lsp.nix
+++ b/packages/common/nki-kakoune/lsp.nix
@@ -135,10 +135,9 @@ let
           roots = [ "build.sbt" "build.sc" "build.mill" ];
           settings_section = "metals";
           settings.metals = {
-            enableSemanticHighlighting = true;
-            showInferredType = true;
-            decorationProvider = true;
-            inlineDecorationProvider = true;
+            inlayHints.inferredTypes.enable = true;
+            inlayHints.typeParameters.enable = true;
+            inlayHints.hintsInPatternMatch.enable = true;
             # From kakoune-lsp's own options
             icons = "unicode";
             isHttpEnabled = true;
@@ -300,7 +299,7 @@ in
 
       hook global WinSetOption filetype=(racket|rust|python|go|javascript|typescript|c|cpp|tex|latex|haskell|nix|fsharp|templ) %{
           # Format the document if possible
-          hook window BufWritePre .* %{ lsp-formatting-sync }
+          hook window -group lsp-formatting BufWritePre .* %{ lsp-formatting-sync }
       }
 
       hook global WinSetOption filetype=(rust|scala|fsharp) %{
@@ -316,6 +315,18 @@ in
           remove-hooks window semantic-tokens
         }
       }
+
+      define-command -params 0 -docstring "Set up build" scala-build-connect %{
+          lsp-execute-command 'build-connect' '[]'
+      }
+
+      define-command -params 0 -docstring "Change bsp build server" scala-bsp-switch %{
+          lsp-execute-command 'bsp-switch' '[]'
+      }
+
+      define-command -params 0 -docstring "Import build" scala-build-import %{
+          lsp-execute-command 'build-import' '[]'
+      }
     }
   '';
 }