oli/nvim
1
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

Same for lsp and cmp

Browse Source
This commit is contained in:
Oliver Hartmann 2022-03-16 17:38:38 +01:00
parent 7e1182a11b
commit 61a052b960
4 changed files with 138 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.lua
View File

@ -12,8 +12,6 @@ require('my_options')
require("my_autocommands") require("my_autocommands")
-- plugins -- plugins
require('my_lspinstall')
require('my_cmp')
require('my_neogen') require('my_neogen')
require('my_luasnip') require('my_luasnip')
-------------------- TREE-SITTER --------------------------- -------------------- TREE-SITTER ---------------------------

6
lua/my_plugins.lua
View File

@ -65,7 +65,8 @@ return require('packer').startup(function()
'f3fora/cmp-spell', 'f3fora/cmp-spell',
'hrsh7th/cmp-emoji', 'hrsh7th/cmp-emoji',
'hrsh7th/cmp-cmdline' 'hrsh7th/cmp-cmdline'
} },
config = get_setup("cmp")
} }
use {'rafamadriz/friendly-snippets'} use {'rafamadriz/friendly-snippets'}
use {'onsails/lspkind-nvim'} use {'onsails/lspkind-nvim'}
@ -84,7 +85,8 @@ return require('packer').startup(function()
use {'s1n7ax/nvim-terminal'} use {'s1n7ax/nvim-terminal'}
use { use {
'williamboman/nvim-lsp-installer', 'williamboman/nvim-lsp-installer',
requires = {'neovim/nvim-lspconfig'} requires = {'neovim/nvim-lspconfig'},
config = get_setup("lspinstall")
} }
use { use {
'jose-elias-alvarez/null-ls.nvim', 'jose-elias-alvarez/null-ls.nvim',

0
lua/my_cmp.lua → lua/setup/cmp.lua
View File

268
lua/my_lspinstall.lua → lua/setup/lspinstall.lua
View File

@ -1,134 +1,134 @@
local utils = require('utils') local utils = require('utils')
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.documentationFormat = { 'markdown', 'plaintext' } capabilities.textDocument.completion.completionItem.documentationFormat = { 'markdown', 'plaintext' }
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
capabilities.textDocument.completion.completionItem.preselectSupport = true capabilities.textDocument.completion.completionItem.preselectSupport = true
capabilities.textDocument.completion.completionItem.insertReplaceSupport = true capabilities.textDocument.completion.completionItem.insertReplaceSupport = true
capabilities.textDocument.completion.completionItem.labelDetailsSupport = true capabilities.textDocument.completion.completionItem.labelDetailsSupport = true
capabilities.textDocument.completion.completionItem.deprecatedSupport = true capabilities.textDocument.completion.completionItem.deprecatedSupport = true
capabilities.textDocument.completion.completionItem.commitCharactersSupport = true capabilities.textDocument.completion.completionItem.commitCharactersSupport = true
capabilities.textDocument.completion.completionItem.tagSupport = { valueSet = { 1 } } capabilities.textDocument.completion.completionItem.tagSupport = { valueSet = { 1 } }
capabilities.offsetEncoding = { "utf-16" } capabilities.offsetEncoding = { "utf-16" }
capabilities.textDocument.completion.completionItem.resolveSupport = { capabilities.textDocument.completion.completionItem.resolveSupport = {
properties = { properties = {
'documentation', 'documentation',
'detail', 'detail',
'additionalTextEdits', 'additionalTextEdits',
}, },
} }
local on_attach = function(client, bufnr) 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.api.nvim_buf_set_keymap(bufnr, ...) end
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
vim.api.nvim_buf_set_option(0, 'formatexpr', 'v:lua.vim.lsp.formatexpr()') vim.api.nvim_buf_set_option(0, 'formatexpr', 'v:lua.vim.lsp.formatexpr()')
-- Mappings. -- Mappings.
local opts = { noremap=true, silent=true } local opts = { noremap=true, silent=true }
buf_set_keymap('n', '<space>,', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts) buf_set_keymap('n', '<space>,', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
buf_set_keymap('n', '<space>;', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) buf_set_keymap('n', '<space>;', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
buf_set_keymap('n', '<space>a', '<cmd>Telescope lsp_code_actions<CR>', opts) buf_set_keymap('n', '<space>a', '<cmd>Telescope lsp_code_actions<CR>', opts)
buf_set_keymap('n', '<space>d', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) buf_set_keymap('n', '<space>d', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts) buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
buf_set_keymap('n', '<space>h', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) buf_set_keymap('n', '<space>h', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
buf_set_keymap('n', '<space>c', '<cmd>lua vim.lsp.buf.outgoing_calls()<CR>', opts) buf_set_keymap('n', '<space>c', '<cmd>lua vim.lsp.buf.outgoing_calls()<CR>', opts)
buf_set_keymap('n', '<space>C', '<cmd>lua vim.lsp.buf.incoming_calls()<CR>', opts) buf_set_keymap('n', '<space>C', '<cmd>lua vim.lsp.buf.incoming_calls()<CR>', opts)
buf_set_keymap('n', '<space>m', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) buf_set_keymap('n', '<space>m', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-- buf_set_keymap('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR, opts>') -- buf_set_keymap('n', '<space>r', '<cmd>lua vim.lsp.buf.references()<CR, opts>')
buf_set_keymap('n', '<space>s', '<cmd>lua vim.lsp.buf.document_symbol()<CR>', opts) buf_set_keymap('n', '<space>s', '<cmd>lua vim.lsp.buf.document_symbol()<CR>', opts)
buf_set_keymap('n', '<C-t>', '<cmd>Telescope lsp_dynamic_workspace_symbols<CR>', opts) buf_set_keymap('n', '<C-t>', '<cmd>Telescope lsp_dynamic_workspace_symbols<CR>', opts)
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts) buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
buf_set_keymap('n', '<space>r', '<cmd>Telescope lsp_references<cr>', opts) buf_set_keymap('n', '<space>r', '<cmd>Telescope lsp_references<cr>', opts)
buf_set_keymap('n', '<C-S-o>', '<cmd>Telescope lsp_document_symbols<cr>', opts) buf_set_keymap('n', '<C-S-o>', '<cmd>Telescope lsp_document_symbols<cr>', opts)
buf_set_keymap('n', '<A-m>', '<cmd>Telescope lsp_document_symbols<cr>', opts) buf_set_keymap('n', '<A-m>', '<cmd>Telescope lsp_document_symbols<cr>', opts)
buf_set_keymap('n', '<space>v', '<cmd>Telescope diagnostics bufnr=0<cr>', opts) buf_set_keymap('n', '<space>v', '<cmd>Telescope diagnostics bufnr=0<cr>', opts)
buf_set_keymap('n', '<A-o>', ':ClangdSwitchSourceHeader<CR>', opts) buf_set_keymap('n', '<A-o>', ':ClangdSwitchSourceHeader<CR>', opts)
vim.cmd [[autocmd CursorHold <buffer> lua vim.diagnostic.open_float({focusable = false})]] vim.cmd [[autocmd CursorHold <buffer> lua vim.diagnostic.open_float({focusable = false})]]
-- Set some keybinds conditional on server capabilities -- Set some keybinds conditional on server capabilities
if client.resolved_capabilities.document_formatting then if client.resolved_capabilities.document_formatting then
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts) buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
end end
if client.resolved_capabilities.document_range_formatting then if client.resolved_capabilities.document_range_formatting then
buf_set_keymap('v', '<space>f', '<esc><cmd>lua vim.lsp.buf.range_formatting()<CR>', opts) buf_set_keymap('v', '<space>f', '<esc><cmd>lua vim.lsp.buf.range_formatting()<CR>', opts)
end end
-- Set autocommands conditional on server_capabilities -- Set autocommands conditional on server_capabilities
if client.resolved_capabilities.document_highlight then if client.resolved_capabilities.document_highlight then
vim.api.nvim_exec([[ vim.api.nvim_exec([[
hi LspReferenceRead cterm=bold ctermbg=red guibg=DarkGreen hi LspReferenceRead cterm=bold ctermbg=red guibg=DarkGreen
hi LspReferenceWrite cterm=bold ctermbg=red guibg=DarkRed hi LspReferenceWrite cterm=bold ctermbg=red guibg=DarkRed
augroup lsp_document_highlight augroup lsp_document_highlight
autocmd! * <buffer> autocmd! * <buffer>
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight() autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight() autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references() autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
augroup END augroup END
]], false) ]], false)
end end
require "lsp_signature".on_attach({ require "lsp_signature".on_attach({
bind = true, -- This is mandatory, otherwise border config won't get registered. bind = true, -- This is mandatory, otherwise border config won't get registered.
handler_opts = { handler_opts = {
border = "single" border = "single"
}, },
hi_parameter = "IncSearch" hi_parameter = "IncSearch"
}, bufnr) }, bufnr)
end end
local lsp_installer = require("nvim-lsp-installer") local lsp_installer = require("nvim-lsp-installer")
local servers = { local servers = {
"pyright", "pyright",
"cmake", "cmake",
"clangd", "clangd",
"jsonls", "jsonls",
"groovyls", "groovyls",
"sumneko_lua", "sumneko_lua",
"dockerls", "dockerls",
} }
for _, name in pairs(servers) do for _, name in pairs(servers) do
local server_is_found, server = lsp_installer.get_server(name) local server_is_found, server = lsp_installer.get_server(name)
if server_is_found then if server_is_found then
if not server:is_installed() then if not server:is_installed() then
print("Installing " .. name) print("Installing " .. name)
server:install() server:install()
end end
end end
end end
lsp_installer.on_server_ready(function(server) lsp_installer.on_server_ready(function(server)
local opts = { local opts = {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
} }
-- (optional) Customize the options passed to the server -- (optional) Customize the options passed to the server
if server.name == "clangd" then if server.name == "clangd" then
opts.cmd = { "clangd" , "--compile-commands-dir=build_nvim"} opts.cmd = { "clangd" , "--compile-commands-dir=build_nvim"}
end end
-- This setup() function is exactly the same as lspconfig's setup function (:help lspconfig-quickstart) -- This setup() function is exactly the same as lspconfig's setup function (:help lspconfig-quickstart)
server:setup(opts) server:setup(opts)
vim.cmd [[ do User LspAttachBuffers ]] vim.cmd [[ do User LspAttachBuffers ]]
end) end)
local null_ls = require("null-ls") local null_ls = require("null-ls")
null_ls.setup { null_ls.setup {
sources = { sources = {
null_ls.builtins.code_actions.gitsigns, null_ls.builtins.code_actions.gitsigns,
null_ls.builtins.formatting.autopep8, null_ls.builtins.formatting.autopep8,
null_ls.builtins.formatting.prettier, null_ls.builtins.formatting.prettier,
null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.stylua,
null_ls.builtins.diagnostics.flake8, null_ls.builtins.diagnostics.flake8,
null_ls.builtins.formatting.isort, null_ls.builtins.formatting.isort,
null_ls.builtins.formatting.cmake_format null_ls.builtins.formatting.cmake_format
}, },
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities capabilities = capabilities
} }
vim.diagnostic.config({virtual_text = false}) vim.diagnostic.config({virtual_text = false})