From 9d02a48553a90bff4296fbd8594f65fab803b315 Mon Sep 17 00:00:00 2001
From: Kalle Jepsen <git@ksonj.net>
Date: Mon, 7 Oct 2024 12:27:38 +0200
Subject: [PATCH] Apply suggested improvements

---
 flake.lock                          | 10 +++---
 flake.nix                           |  2 +-
 modules/plugins/languages/scala.nix | 47 ++++++++++++++---------------
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index eb34f95c..16bd5d17 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1152,15 +1152,15 @@
     "plugin-nvim-metals": {
       "flake": false,
       "locked": {
-        "lastModified": 1728033462,
-        "narHash": "sha256-XqOkZ/5eex1mrNUf6vrJjDjibBbb0bSMYSciKAoVD0A=",
-        "owner": "ksonj",
+        "lastModified": 1728295172,
+        "narHash": "sha256-ja/+MNxZ3H9io9jDwm5rhE6iKNi86a22eCOY75g19O8=",
+        "owner": "scalameta",
         "repo": "nvim-metals",
-        "rev": "4d86c32f6c028de197e28dab0f6a0250c0d1c16a",
+        "rev": "f861db9fda55939797ac1b05238c49b0dcdc3bdb",
         "type": "github"
       },
       "original": {
-        "owner": "ksonj",
+        "owner": "scalameta",
         "repo": "nvim-metals",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 4181f0ad..fb9f03cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -207,7 +207,7 @@
     };
 
     plugin-nvim-metals = {
-      url = "github:ksonj/nvim-metals";
+      url = "github:scalameta/nvim-metals";
       flake = false;
     };
 
diff --git a/modules/plugins/languages/scala.nix b/modules/plugins/languages/scala.nix
index 417cefbc..6326dec0 100644
--- a/modules/plugins/languages/scala.nix
+++ b/modules/plugins/languages/scala.nix
@@ -4,23 +4,17 @@
   lib,
   ...
 }: let
-  inherit (lib) types optionalString;
+  inherit (lib) types optionalString mkPackageOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.binds) mkMappingOption;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.nvim.dag) entryAfter;
 
-  mkBinding = binding: "vim.api.nvim_buf_set_keymap(bufnr, 'n', '${binding.value}', '<cmd>lua ${binding.action}<CR>', {noremap=true, silent=true, desc='${binding.description}'})";
-
-  listCommandsBinding = {
-    value = cfg.lsp.extraMappings.listCommands;
-    description = "List Metals commands";
-    action =
-      if config.vim.telescope.enable
-      then ''require("telescope").extensions.metals.commands()''
-      else ''require("metals").commands()'';
-  };
+  listCommandsAction =
+    if config.vim.telescope.enable
+    then ''require("telescope").extensions.metals.commands()''
+    else ''require("metals").commands()'';
 
   cfg = config.vim.languages.scala;
 
@@ -29,23 +23,22 @@
 in {
   options.vim.languages.scala = {
     enable = mkEnableOption "Scala language support";
+
     treesitter = {
       enable = mkEnableOption "Scala treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = mkGrammarOption pkgs "scala";
     };
+
     lsp = {
       enable = mkEnableOption "Scala LSP support (metals)" // {default = config.vim.languages.enableLSP;};
-      package = mkOption {
-        type = types.package;
-        default = pkgs.metals;
-        description = ''
-          metals package to use
-        '';
+      package = mkPackageOption pkgs "metals" {
+        default = ["metals"];
       };
       extraMappings = {
         listCommands = mkMappingOption "List Metals commands" "<leader>lc";
       };
     };
+
     dap = {
       enable = mkOption {
         description = "Scala Debug Adapter support";
@@ -79,6 +72,7 @@ in {
       };
     };
   };
+
   config = mkIf cfg.enable (
     mkMerge [
       (mkIf cfg.treesitter.enable {
@@ -88,13 +82,12 @@ in {
       (mkIf (cfg.lsp.enable || cfg.dap.enable) {
         vim = {
           startPlugins = ["nvim-metals"];
-          luaConfigRC.nvim-metals = entryAfter ["lsp-setup"] ''
-            -- Scala nvim-metals config
+          pluginRC.nvim-metals = entryAfter ["lsp-setup"] ''
             local metals_caps = capabilities  -- from lsp-setup
 
             local attach_metals_keymaps = function(client, bufnr)
               attach_keymaps(client, bufnr)  -- from lsp-setup
-              ${mkBinding listCommandsBinding}
+              vim.api.nvim_buf_set_keymap(bufnr, 'n', '${cfg.lsp.extraMappings.listCommands}', '<cmd>lua ${listCommandsAction}<CR>', {noremap=true, silent=true, desc='Show all Metals commands'})
             end
 
             metals_config = require('metals').bare_config()
@@ -125,14 +118,18 @@ in {
               }
             )
 
-
             -- without doing this, autocommands that deal with filetypes prohibit messages from being shown
             vim.opt_global.shortmess:remove("F")
 
-            vim.cmd([[augroup lsp]])
-            vim.cmd([[autocmd!]])
-            vim.cmd([[autocmd FileType java,scala,sbt lua require('metals').initialize_or_attach(metals_config)]])
-            vim.cmd([[augroup end]])
+            local lsp_group = vim.api.nvim_create_augroup('lsp', { clear = true })
+
+            vim.api.nvim_create_autocmd('FileType', {
+                group = lsp_group,
+                pattern = {'java', 'scala', 'sbt'},
+                callback = function()
+                    require('metals').initialize_or_attach(metals_config)
+                end,
+            })
           '';
         };
       })