From 3dce4506ebd80da0cd30050fc8ab10693943d461 Mon Sep 17 00:00:00 2001 From: jdhao Date: Fri, 9 Jul 2021 23:24:00 +0800 Subject: update packer and plugin settings --- lua/config/compe.lua | 38 ++++++++++++ lua/config/iron.lua | 7 +++ lua/config/lsp.lua | 128 +++++++++++++++++++++++++++++++++++++++ lua/entrance.lua | 3 - lua/lsp/init.lua | 166 --------------------------------------------------- lua/plugins.lua | 6 +- 6 files changed, 176 insertions(+), 172 deletions(-) create mode 100644 lua/config/compe.lua create mode 100644 lua/config/iron.lua create mode 100644 lua/config/lsp.lua delete mode 100644 lua/lsp/init.lua (limited to 'lua') diff --git a/lua/config/compe.lua b/lua/config/compe.lua new file mode 100644 index 0000000..2e8764a --- /dev/null +++ b/lua/config/compe.lua @@ -0,0 +1,38 @@ +-- nvim-compe settings +require'compe'.setup { + enabled = true; + autocomplete = true; + debug = false; + min_length = 1; + preselect = 'enable'; + throttle_time = 80; + source_timeout = 200; + incomplete_delay = 400; + max_abbr_width = 100; + max_kind_width = 100; + max_menu_width = 100; + documentation = true; + + source = { + omni = {filetypes = {'tex'}}; + path = true; + buffer = false; + spell = {filetypes = {'markdown', 'tex'}}; + emoji = true; + nvim_lsp = true; + nvim_lua = true; + ultisnips = true; + calc = false; + vsnip = false; + }; +} + +vim.o.completeopt = "menuone,noselect" + +-- nvim-compe mappings +local compe_map_opts = {expr = true, noremap = true, silent = true} +vim.api.nvim_set_keymap('i', '', 'compe#complete()', compe_map_opts) +vim.api.nvim_set_keymap('i', '', "compe#confirm('')", compe_map_opts) +vim.api.nvim_set_keymap('i', '', "compe#close('')", compe_map_opts) +vim.api.nvim_set_keymap('i', '', "compe#scroll({'delta': +4})", compe_map_opts) +vim.api.nvim_set_keymap('i', '', "compe#scroll({'delta': -4})", compe_map_opts) diff --git a/lua/config/iron.lua b/lua/config/iron.lua new file mode 100644 index 0000000..926fb6d --- /dev/null +++ b/lua/config/iron.lua @@ -0,0 +1,7 @@ +local iron = require('iron') +iron.core.set_config{ + preferred = { + python = 'ipython' + }, + repl_open_cmd = 'vertical 120 split' +} diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua new file mode 100644 index 0000000..bdf2b57 --- /dev/null +++ b/lua/config/lsp.lua @@ -0,0 +1,128 @@ +local on_attach = function(client, bufnr) + 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 + + buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + local opts = { noremap=true, silent=true } + buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) + buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.definition()', opts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) + buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) + buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) + buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', 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', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics({focusable=false})', 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', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) + + -- Show diagnostic automatically when cursor is on hold. + vim.api.nvim_command('autocmd CursorHold lua vim.lsp.diagnostic.show_line_diagnostics({focusable=false})') + + -- Set some keybinds conditional on server capabilities + if client.resolved_capabilities.document_formatting then + buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) + end + if client.resolved_capabilities.document_range_formatting then + buf_set_keymap("x", "f", "lua vim.lsp.buf.range_formatting()", opts) + end + + -- Set autocommands conditional on server_capabilities + if client.resolved_capabilities.document_highlight then + vim.api.nvim_exec([[ + hi link LspReferenceRead Visual + hi link LspReferenceText Visual + hi link LspReferenceWrite Visual + augroup lsp_document_highlight + autocmd! * + autocmd CursorHold lua vim.lsp.buf.document_highlight() + autocmd CursorMoved lua vim.lsp.buf.clear_references() + augroup END + ]], false) + end + + local msg = string.format('Language server %s started!' , client.name) + vim.api.nvim_echo({{msg, 'MoreMsg'}, }, false, {}) +end + +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities.textDocument.completion.completionItem.snippetSupport = true + +local lspconfig = require("lspconfig") + +lspconfig.pyls.setup{ + on_attach = on_attach, + settings = { + pyls = { + plugins = { + flake8 = {enabled = false}, + pylint = {enabled = true, executable = "pylint"}, + pyflakes = {enabled = false}, + pycodestyle = {enabled = false}, + jedi_completion = {fuzzy = true}, + pyls_isort = {enabled = true}, + pyls_mypy = {enabled = true} + } + } + }, + flags = { + debounce_text_changes = 500, + } +} + +lspconfig.clangd.setup{ + on_attach = on_attach, + capabilities = capabilities, + filetypes = { "c", "cpp", "cc" }, + flags = { + debounce_text_changes = 500, + } +} + +-- set up vim-language-server +lspconfig.vimls.setup{ + on_attach = on_attach, + flags = { + debounce_text_changes = 500, + } +} + +-- Change diagnostic signs. +vim.fn.sign_define('LspDiagnosticsSignError', { text = "✗", texthl = "LspDiagnosticsDefaultError" }) +vim.fn.sign_define('LspDiagnosticsSignWarning', { text = "!", texthl = "LspDiagnosticsDefaultWarning" }) +vim.fn.sign_define('LspDiagnosticsSignInformation', { text = "", texthl = "LspDiagnosticsDefaultInformation" }) +vim.fn.sign_define('LspDiagnosticsSignHint', { text = "", texthl = "LspDiagnosticsDefaultHint" }) + +vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, { + underline = false, + virtual_text = false, + signs = true, + update_in_insert = false, + } +) + +-- The following settings works with the bleeding edge neovim. +-- See https://github.com/neovim/neovim/pull/13998. +vim.lsp.handlers["textDocument/hover"] = vim.lsp.with( + vim.lsp.handlers.hover, { + border = { + {"┌", "Normal"}, + {"─", "Normal"}, + {"┐", "Normal"}, + {"│", "Normal"}, + {"┘", "Normal"}, + {"─", "Normal"}, + {"└", "Normal"}, + {"│", "Normal"} + } + } +) + diff --git a/lua/entrance.lua b/lua/entrance.lua index 8839eed..f38cf27 100644 --- a/lua/entrance.lua +++ b/lua/entrance.lua @@ -1,5 +1,2 @@ -- Some utility stuff require 'utils' - --- LSP stuff -require 'lsp' diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua deleted file mode 100644 index 7526801..0000000 --- a/lua/lsp/init.lua +++ /dev/null @@ -1,166 +0,0 @@ -local on_attach = function(client, bufnr) - 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 - - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - local opts = { noremap=true, silent=true } - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) - buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) - buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', 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', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics({focusable=false})', 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', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - - -- Show diagnostic automatically when cursor is on hold. - vim.api.nvim_command('autocmd CursorHold lua vim.lsp.diagnostic.show_line_diagnostics({focusable=false})') - - -- Set some keybinds conditional on server capabilities - if client.resolved_capabilities.document_formatting then - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) - end - if client.resolved_capabilities.document_range_formatting then - buf_set_keymap("x", "f", "lua vim.lsp.buf.range_formatting()", opts) - end - - -- Set autocommands conditional on server_capabilities - if client.resolved_capabilities.document_highlight then - vim.api.nvim_exec([[ - hi link LspReferenceRead Visual - hi link LspReferenceText Visual - hi link LspReferenceWrite Visual - augroup lsp_document_highlight - autocmd! * - autocmd CursorHold lua vim.lsp.buf.document_highlight() - autocmd CursorMoved lua vim.lsp.buf.clear_references() - augroup END - ]], false) - end - - local msg = string.format('Language server %s started!' , client.name) - vim.api.nvim_echo({{msg, 'MoreMsg'}, }, false, {}) -end - -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities.textDocument.completion.completionItem.snippetSupport = true - -local lspconfig = require("lspconfig") - -lspconfig.pyls.setup{ - on_attach = on_attach, - settings = { - pyls = { - plugins = { - flake8 = {enabled = false}, - pylint = {enabled = true, executable = "pylint"}, - pyflakes = {enabled = false}, - pycodestyle = {enabled = false}, - jedi_completion = {fuzzy = true}, - pyls_isort = {enabled = true}, - pyls_mypy = {enabled = true} - } - } - }, - flags = { - debounce_text_changes = 500, - } -} - -lspconfig.clangd.setup{ - on_attach = on_attach, - capabilities = capabilities, - filetypes = { "c", "cpp", "cc" }, - flags = { - debounce_text_changes = 500, - } -} - --- set up vim-language-server -lspconfig.vimls.setup{ - on_attach = on_attach, - flags = { - debounce_text_changes = 500, - } -} - --- Change diagnostic signs. -vim.fn.sign_define('LspDiagnosticsSignError', { text = "✗", texthl = "LspDiagnosticsDefaultError" }) -vim.fn.sign_define('LspDiagnosticsSignWarning', { text = "!", texthl = "LspDiagnosticsDefaultWarning" }) -vim.fn.sign_define('LspDiagnosticsSignInformation', { text = "", texthl = "LspDiagnosticsDefaultInformation" }) -vim.fn.sign_define('LspDiagnosticsSignHint', { text = "", texthl = "LspDiagnosticsDefaultHint" }) - -vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( - vim.lsp.diagnostic.on_publish_diagnostics, { - underline = false, - virtual_text = false, - signs = true, - update_in_insert = false, - } -) - --- The following settings works with the bleeding edge neovim. --- See https://github.com/neovim/neovim/pull/13998. -vim.lsp.handlers["textDocument/hover"] = vim.lsp.with( - vim.lsp.handlers.hover, { - border = { - {"┌", "Normal"}, - {"─", "Normal"}, - {"┐", "Normal"}, - {"│", "Normal"}, - {"┘", "Normal"}, - {"─", "Normal"}, - {"└", "Normal"}, - {"│", "Normal"} - } - } -) - --- nvim-compe settings -require'compe'.setup { - enabled = true; - autocomplete = true; - debug = false; - min_length = 1; - preselect = 'enable'; - throttle_time = 80; - source_timeout = 200; - incomplete_delay = 400; - max_abbr_width = 100; - max_kind_width = 100; - max_menu_width = 100; - documentation = true; - - source = { - omni = {filetypes = {'tex'}}; - path = true; - buffer = false; - spell = {filetypes = {'markdown', 'tex'}}; - emoji = true; - nvim_lsp = true; - nvim_lua = true; - ultisnips = true; - calc = false; - vsnip = false; - }; -} - -vim.o.completeopt = "menuone,noselect" - --- nvim-compe mappings -local compe_map_opts = {expr = true, noremap = true, silent = true} -vim.api.nvim_set_keymap('i', '', 'compe#complete()', compe_map_opts) -vim.api.nvim_set_keymap('i', '', "compe#confirm('')", compe_map_opts) -vim.api.nvim_set_keymap('i', '', "compe#close('')", compe_map_opts) -vim.api.nvim_set_keymap('i', '', "compe#scroll({'delta': +4})", compe_map_opts) -vim.api.nvim_set_keymap('i', '', "compe#scroll({'delta': -4})", compe_map_opts) diff --git a/lua/plugins.lua b/lua/plugins.lua index be6d204..edd9dd6 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -27,10 +27,10 @@ require('packer').startup( use 'wbthomason/packer.nvim' -- nvim-lsp configuration - use 'neovim/nvim-lspconfig' + use {'neovim/nvim-lspconfig', event = 'VimEnter', config = [[require('config.lsp')]]} -- auto-completion engine - use 'hrsh7th/nvim-compe' + use { 'hrsh7th/nvim-compe', event = 'InsertEnter *', config = [[require('config.compe')]] } -- Python syntax highlighting and more if (vim.g.is_mac == 1) or (vim.g.is_win == 1) then @@ -271,7 +271,7 @@ require('packer').startup( end -- REPL for nvim - use 'hkupty/iron.nvim' + use {'hkupty/iron.nvim', config = [[require('config.iron')]]} -- Show register content use "tversteeg/registers.nvim" -- cgit v1.2.3