diff options
Diffstat (limited to '.vim')
| -rw-r--r-- | .vim/init.lua | 2 | ||||
| -rw-r--r-- | .vim/lua/plugins.lua | 15 | ||||
| -rw-r--r-- | .vim/lua/plugins/_completion.lua | 8 | ||||
| -rw-r--r-- | .vim/lua/plugins/_lsp.lua | 40 |
4 files changed, 35 insertions, 30 deletions
diff --git a/.vim/init.lua b/.vim/init.lua index 5ef9798..3e06bc9 100644 --- a/.vim/init.lua +++ b/.vim/init.lua @@ -38,7 +38,7 @@ u.opt('w', 'foldlevel', 0) u.opt('w', 'foldmethod', 'marker') u.opt('o', 'fillchars', 'fold:─') u.opt('o', 'complete', '.,w,b,u') -u.opt('o', 'completeopt', 'menuone,noinsert,noselect,preview') +u.opt('o', 'completeopt', 'menuone,noinsert,noselect') cmd('set shortmess+=c') u.opt('w', 'statusline', '%!luaeval("statusline()")') u.opt('o', 'cmdheight', 1) diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua index a0fac91..f5f9a37 100644 --- a/.vim/lua/plugins.lua +++ b/.vim/lua/plugins.lua @@ -56,9 +56,6 @@ return require'packer'.startup(function() use {'neovim/nvim-lspconfig', requires = { - {'nvim-lua/completion-nvim', - requires = {'steelsojka/completion-buffers'}, - config = "require('plugins._completion')"}, {'kosayoda/nvim-lightbulb', config = "require('plugins._lightbulb')"}, }, config = "require('plugins._lsp')" @@ -66,14 +63,22 @@ return require'packer'.startup(function() use {'nvim-treesitter/nvim-treesitter', requires = { - 'nvim-lua/completion-nvim', 'nvim-treesitter/completion-treesitter', 'nvim-treesitter/nvim-treesitter-refactor', }, config = "require('plugins._treesitter')", - run = ':TSUpdate' + run = ':TSUpdate', } + use {'nvim-lua/completion-nvim', + requires = {'steelsojka/completion-buffers'}, + config = "require('plugins._completion')", + } + + -- use {'hrsh7th/nvim-compe', + -- config = "require('plugins._compe')", + -- } + use {'nvim-telescope/telescope.nvim', requires = { 'nvim-lua/popup.nvim', diff --git a/.vim/lua/plugins/_completion.lua b/.vim/lua/plugins/_completion.lua index 59773a2..5497c4b 100644 --- a/.vim/lua/plugins/_completion.lua +++ b/.vim/lua/plugins/_completion.lua @@ -27,10 +27,10 @@ u.augroup2 { completion_user = {{'BufEnter', '*', 'lua require("completion").on_attach()'}} } -inoremap { '<tab>', function() require('completion').smart_tab() end } -inoremap { '<s-tab>', function() require('completion').smart_s_tab() end } -inoremap { '<c-j>', function() require('completion.source').nextCompletion() end } -inoremap { '<c-k>', function() require('completion.source').prevCompletion() end } +inoremap { '<tab>', require('completion').smart_tab} +inoremap { '<s-tab>', require('completion').smart_s_tab } +inoremap { '<c-j>', require('completion.source').nextCompletion } +inoremap { '<c-k>', require('completion.source').prevCompletion } -- inoremap { '<c-n>', function() -- if vim.fn.pumvisible() == 1 then diff --git a/.vim/lua/plugins/_lsp.lua b/.vim/lua/plugins/_lsp.lua index bf1cc6d..9c52998 100644 --- a/.vim/lua/plugins/_lsp.lua +++ b/.vim/lua/plugins/_lsp.lua @@ -11,25 +11,24 @@ local my_attach = function(client) require 'completion'.on_attach(client) -- lsp mappings - nnoremap { 'K', function() vim.lsp.buf.hover() end } - nnoremap { '<C-]>', function() vim.lsp.buf.definition() end } - nnoremap { 'gd', function() vim.lsp.buf.definition() end } - nnoremap { 'grr', function() vim.lsp.buf.rename() end } - nnoremap { '<c-h>', function() vim.lsp.buf.signature_help() end } - nnoremap { ']d', function() vim.lsp.diagnostic.goto_next() end } - nnoremap { '[d', function() vim.lsp.diagnostic.goto_prev() end } - - nnoremap { '<leader>f', function() vim.lsp.buf.formatting() end } - - -- nnoremap { 'g0', function() vim.lsp.buf.document_symbol() end } - nnoremap { 'gR', function() vim.lsp.buf.references() end } - nnoremap { 'gW', function() vim.lsp.buf.workspace_symbol() end } - nnoremap { 'gD', function() vim.lsp.buf.declaration() end } - nnoremap { 'gT', function() vim.lsp.buf.type_definition() end } - nnoremap { 'gI', function() vim.lsp.buf.implementation() end } + nnoremap { 'K' , vim.lsp.buf.hover } + nnoremap { '<C-]>' , vim.lsp.buf.definition } + nnoremap { 'gd' , vim.lsp.buf.definition } + nnoremap { 'grr' , vim.lsp.buf.rename } + nnoremap { '<c-h>' , vim.lsp.buf.signature_help } + nnoremap { ']d' , vim.lsp.diagnostic.goto_next } + nnoremap { '[d' , vim.lsp.diagnostic.goto_prev } + + nnoremap { '<leader>f' , vim.lsp.buf.formatting } + -- nnoremap { 'g0', vim.lsp.buf.document_symbol } + nnoremap { 'gR' , vim.lsp.buf.references } + nnoremap { 'gW' , vim.lsp.buf.workspace_symbol } + nnoremap { 'gD' , vim.lsp.buf.declaration } + nnoremap { 'gT' , vim.lsp.buf.type_definition } + nnoremap { 'gI' , vim.lsp.buf.implementation } -- nnoremap <silent> ;s <cmd> lua vim.lsp.buf.signature_help()<CR> - nnoremap { '<leader>d', function() vim.lsp.diagnostic.show_line_diagnostics() end } + nnoremap { '<leader>d' , vim.lsp.diagnostic.show_line_diagnostics } u.augroup2 { lsp_user = { @@ -40,9 +39,9 @@ local my_attach = function(client) } end --- handler overwrites {{{ +-- handler overwrites -- configure builtin diagnositcs -vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( +vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( -- {{{ vim.lsp.diagnostic.on_publish_diagnostics, { virtual_text = false, signs = true, @@ -50,10 +49,11 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( update_in_insert = true, } ) +-- }}} -- overwrite codeAction handler to not ask for confirmation if only a single -- action is given -vim.lsp.handlers["textDocument/codeAction"] = function(_, _, actions) +vim.lsp.handlers["textDocument/codeAction"] = function(_, _, actions) -- {{{ if actions == nil or vim.tbl_isempty(actions) then -- skip printing 'no code actions available' return |