diff options
| -rw-r--r-- | init.lua | 5 | ||||
| -rw-r--r-- | lua/default-config.lua | 12 | ||||
| -rw-r--r-- | lua/lsp/rust-ls.lua | 9 | ||||
| -rw-r--r-- | lua/lv-autocommands/init.lua | 3 | ||||
| -rw-r--r-- | lua/lv-rust-tools/init.lua | 85 | ||||
| -rw-r--r-- | lua/plugins.lua | 6 | ||||
| -rw-r--r-- | lv-config.lua | 3 |
7 files changed, 117 insertions, 6 deletions
@@ -35,7 +35,10 @@ if O.lang.lua.active then require('lsp.lua-ls') end if O.lang.php.active then require('lsp.php-ls') end if O.lang.python.active then require('lsp.python-ls') end if O.lang.ruby.active then require('lsp.ruby-ls') end -if O.lang.rust.active then require('lsp.rust-ls') end +if O.lang.rust.active then + require('lsp.rust-ls') + require('lv-rust-tools') +end if O.lang.svelte.active then require('lsp.svelte-ls') end if O.lang.terraform.active then require('lsp.terraform-ls') end if O.lang.tailwindcss.active then require('lsp.tailwindcss-ls') end diff --git a/lua/default-config.lua b/lua/default-config.lua index 5328c7cd..950bcf0f 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -163,7 +163,17 @@ O = { vim = {active = false}, yaml = {active = false}, terraform = {active = false}, - rust = {active = false}, + rust = { + active = false, + linter = '', + formatter = '', + autoformat = false, + diagnostics = { + virtual_text = {spacing = 0, prefix = "ï„‘"}, + signs = true, + underline = true + } + }, svelte = {active = false}, php = {active = false}, latex = {active = false}, diff --git a/lua/lsp/rust-ls.lua b/lua/lsp/rust-ls.lua index 377a31e5..e08ebb08 100644 --- a/lua/lsp/rust-ls.lua +++ b/lua/lsp/rust-ls.lua @@ -1,5 +1,6 @@ -require'lspconfig'.rust_analyzer.setup{ - cmd = {DATA_PATH .. "/lspinstall/rust/rust-analyzer"}, - on_attach = require'lsp'.common_on_attach -} +-- the rust-tools plugin will configure this automatically +--require'lspconfig'.rust_analyzer.setup{ +-- cmd = {DATA_PATH .. "/lspinstall/rust/rust-analyzer"}, +-- on_attach = require'lsp'.common_on_attach +--} diff --git a/lua/lv-autocommands/init.lua b/lua/lv-autocommands/init.lua index 02f8f39e..167e6380 100644 --- a/lua/lv-autocommands/init.lua +++ b/lua/lv-autocommands/init.lua @@ -28,6 +28,9 @@ if O.lang.ruby.autoformat then table.insert(auto_formatters, ruby_format) end local go_format = {'BufWritePre', '*.go', 'lua vim.lsp.buf.formatting_sync(nil,1000)'} if O.lang.go.autoformat then table.insert(auto_formatters, go_format) end +local rust_format = {'BufWritePre', '*.rs', 'lua vim.lsp.buf.formatting_sync(nil,1000)'} +if O.lang.rust.autoformat then table.insert(auto_formatters, rust_format) end + utils.define_augroups({ _general_settings = { {'TextYankPost', '*', 'lua require(\'vim.highlight\').on_yank({higroup = \'Search\', timeout = 200})'}, diff --git a/lua/lv-rust-tools/init.lua b/lua/lv-rust-tools/init.lua new file mode 100644 index 00000000..c0443875 --- /dev/null +++ b/lua/lv-rust-tools/init.lua @@ -0,0 +1,85 @@ +local opts = { + tools = { -- rust-tools options + -- automatically set inlay hints (type hints) + -- There is an issue due to which the hints are not applied on the first + -- opened file. For now, write to the file to trigger a reapplication of + -- the hints or just run :RustSetInlayHints. + -- default: true + autoSetHints = true, + + -- whether to show hover actions inside the hover window + -- this overrides the default hover handler + -- default: true + hover_with_actions = true, + + runnables = { + -- whether to use telescope for selection menu or not + -- default: true + use_telescope = true + + -- rest of the opts are forwarded to telescope + }, + + inlay_hints = { + -- wheter to show parameter hints with the inlay hints or not + -- default: true + show_parameter_hints = true, + + -- prefix for parameter hints + -- default: "<-" + parameter_hints_prefix = "<-", + + -- prefix for all the other hints (type, chaining) + -- default: "=>" + other_hints_prefix = "=>", + + -- whether to align to the lenght of the longest line in the file + max_len_align = false, + + -- padding from the left if max_len_align is true + max_len_align_padding = 1, + + -- whether to align to the extreme right or not + right_align = false, + + -- padding from the right if right_align is true + right_align_padding = 7, + }, + + hover_actions = { + -- the border that is used for the hover window + -- see vim.api.nvim_open_win() + border = { + {"â•", "FloatBorder"}, + {"─", "FloatBorder"}, + {"â•®", "FloatBorder"}, + {"│", "FloatBorder"}, + {"╯", "FloatBorder"}, + {"─", "FloatBorder"}, + {"â•°", "FloatBorder"}, + {"│", "FloatBorder"} + }, + } + }, + + -- all the opts to send to nvim-lspconfig + -- these override the defaults set by rust-tools.nvim + -- see https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#rust_analyzer + server = { + cmd = {DATA_PATH .. "/lspinstall/rust/rust-analyzer"}, + on_attach = require'lsp'.common_on_attach + }, -- rust-analyser options +} + + +require('rust-tools').setup(opts) + +vim.api.nvim_exec( + [[ + autocmd Filetype rust nnoremap <leader>lm <Cmd>RustExpandMacro<CR> + autocmd Filetype rust nnoremap <leader>lH <Cmd>RustToggleInlayHints<CR> + autocmd Filetype rust nnoremap <leader>le <Cmd>RustRunnables<CR> + autocmd Filetype rust nnoremap <leader>lh <Cmd>RustHoverActions<CR> + ]], true) + + diff --git a/lua/plugins.lua b/lua/plugins.lua index 1c5088cd..af1aee4d 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -330,6 +330,12 @@ return require("packer").startup(function(use) requires = 'nvim-lua/plenary.nvim' } + -- Rust tools + -- TODO: use lazy loading maybe? + use { + "simrat39/rust-tools.nvim", + disable = not O.lang.rust.active + } -- Lazygit use { "kdheepak/lazygit.nvim", diff --git a/lv-config.lua b/lv-config.lua index bfbfffc6..b1d6045c 100644 --- a/lv-config.lua +++ b/lv-config.lua @@ -80,6 +80,9 @@ O.lang.ruby.autoformat = true -- go O.lang.go.autoformat = true + +-- rust +O.lang.rust.autoformat = true -- create custom autocommand field (This would be easy with lua) -- Turn off relative_numbers |