diff --git a/completion.lua b/completion.lua new file mode 100644 index 0000000..7528723 --- /dev/null +++ b/completion.lua @@ -0,0 +1,93 @@ +<<<<<<< HEAD +-- Set completeopt to have a better completion experience +-- :help completeopt +-- menuone: popup even when there's only one match +-- noinsert: Do not insert text until a selection is made +-- noselect: Do not select, force to select one from the menu +-- shortness: avoid showing extra messages when using completion +-- updatetime: set updatetime for CursorHold +vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'} +vim.opt.shortmess = vim.opt.shortmess + {c = true} +vim.api.nvim_set_option('updatetime', 300) + +-- Fixed column for diagnostics to appear +-- Show autodiagnostic popup on cursor hover_range +-- Goto previous / next diagnostic warning / error +-- Show inlay_hints more frequently +vim.cmd([[ +set signcolumn=yes +autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false }) +]]) + +vim.opt.spell = true +vim.opt.spelllang = {'en_us'} +vim.lsp.handlers["textDocument/publishDiagnostics"] = + vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, + {virtual_text = true}) +-- Completion Plugin Setup +local cmp = require 'cmp' +cmp.setup({ + -- Enable LSP snippets + snippet = {expand = function(args) vim.fn["vsnip#anonymous"](args.body) end}, + -- = CTRL + -- = SHIFT + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + -- Add tab support + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Insert, + select = true + }) + }, + -- Installed sources: + sources = { + {name = 'path'}, -- file paths + {name = 'nvim_lsp', keyword_length = 3}, -- from language server + {name = 'nvim_lsp_signature_help'}, -- display function signatures with current parameter emphasized + {name = 'nvim_lua', keyword_length = 2}, -- complete neovim's Lua runtime API such vim.lsp.* + {name = 'buffer', keyword_length = 2}, -- source current buffer + {name = 'calc'}, -- source for math calculation + { + name = 'spell', + option = { + keep_all_entries = false, + enable_in_context = function() return true end + } + }, {name = 'conventionalcommits', keyword_length = 1}, {name = 'crates'} + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered() + }, + formatting = { + fields = {'menu', 'abbr' --[[ 'kind' ]] }, + format = function(entry, item) + local menu_icon = { + nvim_lsp = 'λ', + vsnip = '⋗', + buffer = '', + path = '', + spell = '¶', + calc = '√', + crates = '' + } + item.menu = menu_icon[entry.source.name] + if entry.source.name == "calc" then item.kind = "Math" end + return item + end + } +}) +cmp.setup.cmdline('/', {sources = {{name = 'buffer'}}}) +cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({{name = 'path'}}, { + {name = 'cmdline', option = {ignore_cmds = {'Man', '!'}}} + }) +}) diff --git a/default.nix b/default.nix index 444db70..973fd67 100644 --- a/default.nix +++ b/default.nix @@ -40,29 +40,32 @@ in # vim-grammarous markdown-preview-nvim rainbow - nerdtree - nerdtree-git-plugin + nvim-web-devicons fzf-vim - coc-sh - coc-nvim - coc-rust-analyzer - coc-json - coc-yaml - coc-tsserver - coc-prettier - coc-pyright - coc-diagnostic - vimtex - coc-vimtex - coc-html - coc-go - coc-spell-checker editorconfig-nvim + vim-vsnip # tmuxline-vim nvim-dap nvim-dap-ui nvim-notify - rust-tools-nvim + nvim-cmp + cmp-nvim-lsp + cmp-nvim-lua + cmp-buffer + cmp-path + cmp-spell + cmp-vsnip + cmp-conventionalcommits + cmp-calc + cmp-cmdline + rustaceanvim + (if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822 + cmp-conventionalcommits + cmp-calc + cmp-cmdline + rustaceanvim + (if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822 + plenary-nvim crates-nvim nvim-lspconfig telescope-nvim @@ -76,11 +79,19 @@ in lldb = pkgs.lldb; rust_analyzer = rust-analyzer; }; + pathsLua = pkgs.writeTextFile { + name = "nvim-deps.lua"; + text = '' + return { + ${concatStringsSep ",\n " (mapAttrsToList (name: path: ''${name}_path = "${path}"'') paths)} + } + ''; + }; confDir = lib.sourceFilesBySuffices ./. [ "lua" "vim" ]; in with lib; '' vim.cmd [[source ${confDir}/init.vim]] - ${concatStringsSep "\n" (mapAttrsToList (name: path: ''${name}_path = "${path}"'') paths)} + package.path = package.path .. ";${confDir}/?.lua;${pathsLua};" dofile("${confDir}/init.lua") ''; }; @@ -186,9 +197,9 @@ in sdk = [ rust-sdk ]; }; imports.group.enable = true; - # inlayHints = { - # closureReturnTypeHints.enable = false; - # }; + inlayHints = { + closureReturnTypeHints.enable = false; + }; highlightRelated = { yieldPoints.enable = true; references.enable = true; diff --git a/init.lua b/init.lua index 4fbafb0..17e71a2 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,4 @@ +local deps = require("nvim-deps") vim.opt.termguicolors = true vim.notify = require("notify") vim.notify.setup({background_colour = "#000000"}) @@ -44,33 +45,9 @@ neogit.setup({ local dap, dapui = require("dap"), require("dapui") dap.adapters.lldb = { type = "executable", - command = lldb_path .. "/bin/lldb-vscode", + command = deps.lldb_path .. "/bin/lldb-vscode", name = "lldb" } -local lldb = { - name = "Launch lldb", - type = "lldb", -- matches the adapter - request = "launch", -- could also attach to a currently running process - program = function() - return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", - "file") - end, - cwd = "$${workspaceFolder}", - stopOnEntry = false, - args = {}, - console = internalConsole, - runInTerminal = true -} - -dap.configurations.rust = { - lldb -- different debuggers or more configurations can be used here -} ---[[ local opts = { - dap = { - adapter = require("rust-tools.dap").get_codelldb_adapter("${pkgs.lldb}/bin/lldb-vscode", "${pkgs.lldb.lib}/lib/liblldb.so"), - }, - } - require("rust-tools").setup { opts } ]] local dap_breakpoint = { error = { text = "🟥", @@ -79,19 +56,22 @@ local dap_breakpoint = { numhl = "" }, rejected = { - text = "", + text = "❗", texthl = "LspDiagnosticsSignHint", linehl = "", numhl = "" }, stopped = { - text = "⭐️", + text = "🛑", texthl = "LspDiagnosticsSignInformation", linehl = "DiagnosticUnderlineInfo", numhl = "LspDiagnosticsSignInformation" } } +vim.keymap.set('n', 'dk', function() dap.continue() end) +vim.keymap.set('n', 'dl', function() dap.run_last() end) +vim.keymap.set('n', 'b', function() dap.toggle_breakpoint() end) vim.fn.sign_define("DapBreakpoint", dap_breakpoint.error) vim.fn.sign_define("DapStopped", dap_breakpoint.stopped) vim.fn.sign_define("DapBreakpointRejected", dap_breakpoint.rejected) @@ -104,3 +84,46 @@ dap.listeners.after.event_initialized["dapui_config"] = dap.listeners.before.event_terminated["dapui_config"] = function() dapui.close() end dap.listeners.before.event_exited["dapui_config"] = function() dapui.close() end + +-- Setup language servers. +local lspconfig = require('lspconfig') +-- Global mappings. +-- See `:help vim.diagnostic.*` for documentation on any of the below functions +vim.keymap.set('n', 'e', vim.diagnostic.open_float) +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next) +vim.keymap.set('n', 'q', vim.diagnostic.setloclist) + +-- Use LspAttach autocommand to only map the following keys +-- after the language server attaches to the current buffer +vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('UserLspConfig', {}), + callback = function(ev) + -- Enable completion triggered by + vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc' + + -- Buffer local mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local opts = {buffer = ev.buf} + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts) + vim.keymap + .set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, + opts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, opts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) + vim.keymap.set({'n', 'v'}, 'ca', vim.lsp.buf.code_action, opts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) + vim.keymap.set('n', 'f', + function() vim.lsp.buf.format {async = true} end, opts) + end +}) +require("lsp-inlayhints").setup() +require("completion") diff --git a/init.vim b/init.vim index a12f1ae..a618340 100644 --- a/init.vim +++ b/init.vim @@ -5,54 +5,6 @@ set hidden " disable mouse set mouse= -" GoTo code navigation. -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - - -" Rename -nmap rn (coc-rename) - -" Use K to show documentation in preview window. -nnoremap K :call ShowDocumentation() - -nmap ac (coc-codeaction) -nmap as (coc-codeaction-cursor) -nmap cl (coc-codelens-action) - -nmap [G (coc-diagnostic-next-error) -nmap ]G (coc-diagnostic-prev-error) - -nmap [g (coc-diagnostic-next) -nmap ]g (coc-diagnostic-prev) - -" NERDTree config -" autocmd VimEnter * NERDTree -autocmd BufEnter * NERDTreeMirror - -"CTRL-t to toggle tree view with CTRL-t -nmap :NERDTreeToggle -"Set F2 to put the cursor to the nerdtree -nmap :NERDTreeFind - -function! ShowDocumentation() - if CocAction('hasProvider', 'hover') - call CocActionAsync('doHover') - else - call feedkeys('K', 'in') - endif -endfunction - -" Highlight the symbol and its references when holding the cursor. -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Formatting selected code. -xmap f (coc-format-selected) -nmap f (coc-format-selected) -nmap F (coc-format) - " " Copy to clipboard vnoremap y "+y @@ -76,9 +28,6 @@ map to :tabonly " Display line numbers set number relativenumber -inoremap coc#pum#visible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - map :mksession! .nvim_session " Quick write session with F3 map :source .nvim_session " And load session with F4 @@ -95,17 +44,6 @@ let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#show_tab_nr = 1 let g:airline#extensions#tabline#tab_nr_type = 1 -" DAP -nnoremap lua require'dap'.continue() -nnoremap lua require'dap'.step_over() -nnoremap lua require'dap'.step_into() -nnoremap lua require'dap'.step_out() -nnoremap b lua require'dap'.toggle_breakpoint() -nnoremap B lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: ')) -nnoremap lp lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) -nnoremap dr lua require'dap'.repl.open() -nnoremap dl lua require'dap'.run_last() - if has("autocmd") au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif diff --git a/rust.lua b/rust.lua new file mode 100644 index 0000000..96821a4 --- /dev/null +++ b/rust.lua @@ -0,0 +1,350 @@ +<<<<<<< HEAD +local nvim_lsp = require 'lspconfig' +local c = vim.lsp.protocol.make_client_capabilities() +local deps = require("nvim-deps") + +vim.g.rustaceanvim = { + tools = { -- rust-tools options + -- how to execute terminal commands + -- options right now: termopen / quickfix / toggleterm / vimux + executor = require("rust-tools.executors").termopen, + + -- callback to execute once rust-analyzer is done initializing the workspace + -- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error" + on_initialized = nil, + + -- automatically call RustReloadWorkspace when writing to a Cargo.toml file. + reload_workspace_from_cargo_toml = true, + + -- These apply to the default RustSetInlayHints command + inlay_hints = { + -- automatically set inlay hints (type hints) + -- default: true + auto = true, + + -- Only show inlay hints for the current line + only_current_line = false, + + -- whether 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 length 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, + + -- The color of the hints + highlight = "Comment" + }, + + -- options same as lsp hover / vim.lsp.util.open_floating_preview() + 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"} + }, + + -- Maximal width of the hover window. Nil means no max. + max_width = nil, + + -- Maximal height of the hover window. Nil means no max. + max_height = nil, + + -- whether the hover action window gets automatically focused + -- default: false + auto_focus = false + }, + + -- settings for showing the crate graph based on graphviz and the dot + -- command + crate_graph = { + -- Backend used for displaying the graph + -- see: https://graphviz.org/docs/outputs/ + -- default: x11 + backend = "x11", + -- where to store the output, nil for no output stored (relative + -- path from pwd) + -- default: nil + output = nil, + -- true for all crates.io and external crates, false only the local + -- crates + -- default: true + full = true, + + -- List of backends found on: https://graphviz.org/docs/outputs/ + -- Is used for input validation and autocompletion + -- Last updated: 2021-08-26 + enabled_graphviz_backends = { + "bmp", "cgimage", "canon", "dot", "gv", "xdot", "xdot1.2", + "xdot1.4", "eps", "exr", "fig", "gd", "gd2", "gif", "gtk", + "ico", "cmap", "ismap", "imap", "cmapx", "imap_np", "cmapx_np", + "jpg", "jpeg", "jpe", "jp2", "json", "json0", "dot_json", + "xdot_json", "pdf", "pic", "pct", "pict", "plain", "plain-ext", + "png", "pov", "ps", "ps2", "psd", "sgi", "svg", "svgz", "tga", + "tiff", "tif", "tk", "vml", "vmlz", "wbmp", "webp", "xlib", + "x11" + } + } + }, + + -- 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/doc/server_configurations.md#rust_analyzer + server = { + -- standalone file support + -- setting it to false may improve startup time + standalone = true, + cmd = {(deps.rust_analyzer_path .. "/bin/rust-analyzer")}, + capabilities = require("cmp_nvim_lsp").default_capabilities(c), + on_attach = function(client, bufnr) + require("lsp-inlayhints").on_attach(client, bufnr) + require('crates').setup() + local keymap_opts = {buffer = bufnr} + -- Hover actions + -- call twice to focus + vim.keymap.set("n", "K", + function() + vim.cmd.RustLsp {'hover', 'actions'} + end, keymap_opts) + -- Code action groups + vim.keymap.set("n", "as", + function() + vim.cmd.RustLsp {'hover', 'actions'} + end, keymap_opts) + vim.keymap.set('n', 'cc', + function() vim.cmd.RustLsp('openCargo') end, + keymap_opts) + vim.keymap.set('n', 'cr', function() + vim.cmd.RustLsp {'runnables', 'last' --[[ optional ]] } + end, keymap_opts) + vim.keymap.set('n', 'cd', function() + vim.cmd.RustLsp {'debuggables', 'last' --[[ optional ]] } + end, keymap_opts) + -- vim.keymap.set("n", "g0", vim.lsp.buf.document_symbol, keymap_opts) + local diag_float_grp = vim.api.nvim_create_augroup( + "DiagnosticFloat", {clear = true}) + vim.api.nvim_create_autocmd("CursorHold", { + callback = function() + vim.diagnostic.open_float(nil, {focusable = false}) + end, + group = diag_float_grp + }) + + -- Goto previous/next diagnostic warning/error + vim.keymap.set("n", "g[", vim.diagnostic.goto_prev, keymap_opts) + vim.keymap.set("n", "g]", vim.diagnostic.goto_next, keymap_opts) + end + }, -- rust-analyzer options + + -- debugging stuff + dap = { + adapter = { + type = "executable", + command = deps.lldb_path .. "/bin/lldb-vscode", + name = "rt_lldb" + } + } +} +======= +local rt = require("rust-tools") +local deps = require("nvim-deps") + +rt.setup( +{ + tools = { -- rust-tools options + + -- how to execute terminal commands + -- options right now: termopen / quickfix / toggleterm / vimux + executor = require("rust-tools.executors").termopen, + + -- callback to execute once rust-analyzer is done initializing the workspace + -- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error" + on_initialized = nil, + + -- automatically call RustReloadWorkspace when writing to a Cargo.toml file. + reload_workspace_from_cargo_toml = true, + + -- These apply to the default RustSetInlayHints command + inlay_hints = { + -- automatically set inlay hints (type hints) + -- default: true + auto = true, + + -- Only show inlay hints for the current line + only_current_line = false, + + -- whether 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 length 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, + + -- The color of the hints + highlight = "Comment", + }, + + -- options same as lsp hover / vim.lsp.util.open_floating_preview() + 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" }, + }, + + -- Maximal width of the hover window. Nil means no max. + max_width = nil, + + -- Maximal height of the hover window. Nil means no max. + max_height = nil, + + -- whether the hover action window gets automatically focused + -- default: false + auto_focus = false, + }, + + -- settings for showing the crate graph based on graphviz and the dot + -- command + crate_graph = { + -- Backend used for displaying the graph + -- see: https://graphviz.org/docs/outputs/ + -- default: x11 + backend = "x11", + -- where to store the output, nil for no output stored (relative + -- path from pwd) + -- default: nil + output = nil, + -- true for all crates.io and external crates, false only the local + -- crates + -- default: true + full = true, + + -- List of backends found on: https://graphviz.org/docs/outputs/ + -- Is used for input validation and autocompletion + -- Last updated: 2021-08-26 + enabled_graphviz_backends = { + "bmp", + "cgimage", + "canon", + "dot", + "gv", + "xdot", + "xdot1.2", + "xdot1.4", + "eps", + "exr", + "fig", + "gd", + "gd2", + "gif", + "gtk", + "ico", + "cmap", + "ismap", + "imap", + "cmapx", + "imap_np", + "cmapx_np", + "jpg", + "jpeg", + "jpe", + "jp2", + "json", + "json0", + "dot_json", + "xdot_json", + "pdf", + "pic", + "pct", + "pict", + "plain", + "plain-ext", + "png", + "pov", + "ps", + "ps2", + "psd", + "sgi", + "svg", + "svgz", + "tga", + "tiff", + "tif", + "tk", + "vml", + "vmlz", + "wbmp", + "webp", + "xlib", + "x11", + }, + }, + }, + + -- 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/doc/server_configurations.md#rust_analyzer + server = { + -- standalone file support + -- setting it to false may improve startup time + standalone = true, + cmd = { (deps.rust_analyzer_path .. "/bin/rust-analyzer") }, + }, -- rust-analyzer options + + -- debugging stuff + dap = { + adapter = { + type = "executable", + command = deps.lldb_path .. "lldb-vscode", + name = "rt_lldb", + }, + }, +} +) +>>>>>>> 5df3a02 (wip: feat(nvim/rust-tools): begin migration)