diff --git a/lua/lsp/metals.lua b/lua/lsp/metals.lua index f141b72..a9a4143 100644 --- a/lua/lsp/metals.lua +++ b/lua/lsp/metals.lua @@ -4,9 +4,36 @@ if (not status) then return function() end end return function(on_attach) metals_config = metals.bare_config() metals_config.init_options.statusBarProvider = "on" - metals_config.settings = { showImplicitArguments = true } - metals_config.on_attach = on_attach + metals_config.settings = { + showImplicitArguments = true, + superMethodLensesEnabled = true, + } + metals_config.on_attach = function(client, bufnr) + require("metals").setup_dap() + on_attach(client, bufnr) + end metals_config.capabilities = require("cmp_nvim_lsp").default_capabilities() + -- Debug settings if you're using nvim-dap + local dap = require("dap") + dap.configurations.scala = { + { + type = "scala", + request = "launch", + name = "RunOrTest", + metals = { + runType = "runOrTestFile", + --args = { "firstArg", "secondArg", "thirdArg" }, -- here just as an example + }, + }, + { + type = "scala", + request = "launch", + name = "Test Target", + metals = { + runType = "testTarget", + }, + }, + } vim.cmd [[augroup lsp]] diff --git a/lua/my-lsp.lua b/lua/my-lsp.lua index 171193d..e53e3f9 100644 --- a/lua/my-lsp.lua +++ b/lua/my-lsp.lua @@ -17,14 +17,15 @@ lsp_status.register_progress() -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end + local function buf_set_keymap(...) vim.keymap.set(...) end local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end --Enable completion triggered by - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc' -- Mappings. - local opts = { noremap=true, silent=true } + local opts = { noremap=true, silent=true, buffer=bufnr } + local loud = { noremap=true, buffer=bufnr } -- See `:help vim.lsp.*` for documentation on any of the below functions buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) @@ -35,13 +36,21 @@ local on_attach = function(client, bufnr) buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.code_action()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.code_action()', loud) + buf_set_keymap('n', '', 'lua vim.codelens.run()', loud) buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) buf_set_keymap('n', '', 'lua vim.diagnostic.open_float()', opts) buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) buf_set_keymap('n', '', 'lua vim.lsp.diagnostic.set_loclist()', opts) buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) + buf_set_keymap("n", "dc", function() require("dap").continue() end, opts) + buf_set_keymap("n", "dr", function() require("dap").repl.toggle() end, opts) + buf_set_keymap("n", "dK", function() require("dap.ui.widgets").hover() end, opts) + buf_set_keymap("n", "dt", function() require("dap").toggle_breakpoint() end, opts) + buf_set_keymap("n", "dso", function() require("dap").step_over() end, opts) + buf_set_keymap("n", "dsi", function() require("dap").step_into() end, opts) + buf_set_keymap("n", "dl", function() require("dap").run_last() end, opts) lsp_status.on_attach(client) diff --git a/packages.vim b/packages.vim index f140bcd..28c9ceb 100644 --- a/packages.vim +++ b/packages.vim @@ -52,6 +52,8 @@ Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' } Plug 'gbrlsnchs/telescope-lsp-handlers.nvim' +Plug 'mfussenegger/nvim-dap' + Plug 'machakann/vim-highlightedyank'