Remove CoC, Telescope; add lspconfig; fix nvim-tree
This commit is contained in:
parent
cb0959a788
commit
467933a14e
GPG Key ID:
655C07B9B3DDC88B
@ -1,54 +0,0 @@
|
||||
{
|
||||
"git.addedSign.text": "▐",
|
||||
"git.changedSign.text": "▐",
|
||||
"git.removedSign.text": "▐",
|
||||
"git.topRemovedSign.text": "▐",
|
||||
"git.changeRemovedSign.text": "▐",
|
||||
"suggest.noselect": false,
|
||||
"diagnostic.errorSign": "✘",
|
||||
"diagnostic.warningSign": "⚠",
|
||||
"diagnostic.infoSign": "🛈",
|
||||
"diagnostic.checkCurrentLine": true,
|
||||
"diagnostic-languageserver.filetypes": {
|
||||
"sh": "shellcheck"
|
||||
},
|
||||
"diagnostic-languageserver.formatFiletypes": {
|
||||
"sh": "shfmt"
|
||||
},
|
||||
"coc.preferences.formatOnSaveFiletypes": [
|
||||
"css",
|
||||
"go",
|
||||
"html",
|
||||
"javascript",
|
||||
"json",
|
||||
"ruby",
|
||||
"rust",
|
||||
"scss"
|
||||
],
|
||||
"hover.target": "float",
|
||||
"languageserver": {
|
||||
"golang": {
|
||||
"command": "gopls",
|
||||
"rootPatterns": [
|
||||
"go.mod",
|
||||
".vim/",
|
||||
".git/",
|
||||
".hg/"
|
||||
],
|
||||
"filetypes": [
|
||||
"go"
|
||||
],
|
||||
"initializationOptions": {
|
||||
"usePlaceholders": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"go.goplsOptions": {
|
||||
"staticcheck": true
|
||||
},
|
||||
"snippets.textmateSnippetsRoots": [
|
||||
"~/.config/coc/snippets"
|
||||
],
|
||||
"rust-analyzer.checkOnSave.command": "clippy",
|
||||
"solargraph.folding": true
|
||||
}
|
||||
162
nvim/coc.vimrc
162
nvim/coc.vimrc
@ -1,162 +0,0 @@
|
||||
" Use tab for trigger completion with characters ahead and navigate.
|
||||
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
|
||||
" other plugin before putting this into your config.
|
||||
function! s:check_back_space() abort
|
||||
let col = col('.') - 1
|
||||
return !col || getline('.')[col - 1] =~# '\s'
|
||||
endfunction
|
||||
|
||||
inoremap <silent><expr> <TAB>
|
||||
\ pumvisible() ? "\<C-n>" :
|
||||
\ coc#expandableOrJumpable() ?
|
||||
\ "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
|
||||
\ <SID>check_back_space() ? "\<TAB>" :
|
||||
\ coc#refresh()
|
||||
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
|
||||
|
||||
" Use <C-space> to trigger completion.
|
||||
if has('nvim')
|
||||
inoremap <silent><expr> <C-space> coc#refresh()
|
||||
else
|
||||
inoremap <silent><expr> <C-@> coc#refresh()
|
||||
endif
|
||||
|
||||
let g:coc_snippet_next = '<C-j>'
|
||||
let g:coc_snippet_prev= '<C-k>'
|
||||
|
||||
" Make <CR> auto-select the first completion item and notify coc.nvim to
|
||||
" format on enter, <cr> could be remapped by other vim plugin
|
||||
inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
|
||||
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
|
||||
|
||||
" Use `[g` and `]g` to navigate diagnostics
|
||||
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
|
||||
nmap <silent> [g <Plug>(coc-diagnostic-prev)
|
||||
nmap <silent> ]g <Plug>(coc-diagnostic-next)
|
||||
|
||||
" GoTo code navigation.
|
||||
nmap <silent> gd <Plug>(coc-definition)
|
||||
nmap <silent> gy <Plug>(coc-type-definition)
|
||||
nmap <silent> gi <Plug>(coc-implementation)
|
||||
nmap <silent> gr <Plug>(coc-references)
|
||||
|
||||
" Use K to show documentation in preview window.
|
||||
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||
|
||||
function! s:show_documentation()
|
||||
if (index(['vim','help'], &filetype) >= 0)
|
||||
execute 'h '.expand('<cword>')
|
||||
elseif (coc#rpc#ready())
|
||||
call CocActionAsync('doHover')
|
||||
else
|
||||
execute '!' . &keywordprg . " " . expand('<cword>')
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Highlight the symbol and its references when holding the cursor.
|
||||
autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||
|
||||
" Symbol renaming.
|
||||
nmap <leader>rn <Plug>(coc-rename)
|
||||
|
||||
" Formatting selected code.
|
||||
xmap <leader>f <Plug>(coc-format-selected)
|
||||
nmap <leader>f <Plug>(coc-format-selected)
|
||||
|
||||
augroup mygroup
|
||||
autocmd!
|
||||
" Setup formatexpr specified filetype(s).
|
||||
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
|
||||
" Update signature help on jump placeholder.
|
||||
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
|
||||
augroup end
|
||||
|
||||
" Applying codeAction to the selected region.
|
||||
" Example: `<leader>aap` for current paragraph
|
||||
xmap <leader>a <Plug>(coc-codeaction-selected)
|
||||
nmap <leader>a <Plug>(coc-codeaction-selected)
|
||||
|
||||
" Remap keys for applying codeAction to the current buffer.
|
||||
nmap <leader>ac <Plug>(coc-codeaction)
|
||||
" Apply AutoFix to problem on the current line.
|
||||
nmap <leader>qf <Plug>(coc-fix-current)
|
||||
|
||||
" Map function and class text objects
|
||||
" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
|
||||
xmap if <Plug>(coc-funcobj-i)
|
||||
omap if <Plug>(coc-funcobj-i)
|
||||
xmap af <Plug>(coc-funcobj-a)
|
||||
omap af <Plug>(coc-funcobj-a)
|
||||
xmap ic <Plug>(coc-classobj-i)
|
||||
omap ic <Plug>(coc-classobj-i)
|
||||
xmap ac <Plug>(coc-classobj-a)
|
||||
omap ac <Plug>(coc-classobj-a)
|
||||
|
||||
" Remap <C-f> and <C-b> for scroll float windows/popups.
|
||||
if has('nvim-0.4.0') || has('patch-8.2.0750')
|
||||
nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
|
||||
nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
|
||||
inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
|
||||
inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
|
||||
vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
|
||||
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
|
||||
endif
|
||||
|
||||
" Use CTRL-S for selections ranges.
|
||||
" Requires 'textDocument/selectionRange' support of language server.
|
||||
nmap <silent> <C-s> <Plug>(coc-range-select)
|
||||
xmap <silent> <C-s> <Plug>(coc-range-select)
|
||||
|
||||
" Add `:Format` command to format current buffer.
|
||||
command! -nargs=0 Format :call CocAction('format')
|
||||
|
||||
" Add `:Fold` command to fold current buffer.
|
||||
"command! -nargs=? Fold :call CocAction('fold', <f-args>)
|
||||
|
||||
" Add `:OR` command for organize imports of the current buffer.
|
||||
command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport')
|
||||
|
||||
" Add (Neo)Vim's native statusline support.
|
||||
" NOTE: Please see `:h coc-status` for integrations with external plugins that
|
||||
" provide custom statusline: lightline.vim, vim-airline.
|
||||
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
|
||||
|
||||
" Mappings for CoCList
|
||||
" Show all diagnostics.
|
||||
nnoremap <silent><nowait> <space>a :<C-u>CocList diagnostics<CR>
|
||||
" Manage extensions.
|
||||
nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<CR>
|
||||
" Show commands.
|
||||
nnoremap <silent><nowait> <space>c :<C-u>CocList commands<CR>
|
||||
" Find symbol of current document.
|
||||
nnoremap <silent><nowait> <space>o :<C-u>CocList outline<CR>
|
||||
" Search workspace symbols.
|
||||
nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<CR>
|
||||
" Do default action for next item.
|
||||
nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR>
|
||||
" Do default action for previous item.
|
||||
nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR>
|
||||
" Resume latest coc list.
|
||||
nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR>
|
||||
|
||||
" CoC-Git mappings
|
||||
" navigate chunks of current buffer
|
||||
nmap [h <Plug>(coc-git-prevchunk)
|
||||
nmap ]h <Plug>(coc-git-nextchunk)
|
||||
" navigate conflicts of current buffer
|
||||
nmap [c <Plug>(coc-git-prevconflict)
|
||||
nmap ]c <Plug>(coc-git-nextconflict)
|
||||
" show chunk diff at current position
|
||||
nmap gs <Plug>(coc-git-chunkinfo)
|
||||
" show commit contains current position
|
||||
nmap gc <Plug>(coc-git-commit)
|
||||
" create text object for git chunks
|
||||
omap ig <Plug>(coc-git-chunk-inner)
|
||||
xmap ig <Plug>(coc-git-chunk-inner)
|
||||
omap ag <Plug>(coc-git-chunk-outer)
|
||||
xmap ag <Plug>(coc-git-chunk-outer)
|
||||
" undo current chunk
|
||||
nmap <Leader>hu :<C-u>CocCommand git.chunkUndo<CR>
|
||||
nmap <Leader>hs :<C-u>CocCommand git.chunkStage<CR>
|
||||
" git list
|
||||
nnoremap <silent><nowait> <space>g :<C-u>CocList --normal gstatus<CR>
|
||||
48
nvim/lspconfig.vimrc
Normal file
48
nvim/lspconfig.vimrc
Normal file
@ -0,0 +1,48 @@
|
||||
lua << EOF
|
||||
local nvim_lsp = require('lspconfig')
|
||||
|
||||
-- Use an on_attach function to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
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
|
||||
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
local opts = { noremap=true, silent=true }
|
||||
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
|
||||
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||
|
||||
end
|
||||
|
||||
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||
-- map buffer local keybindings when the language server attaches
|
||||
local servers = { 'solargraph', 'rust_analyzer', 'gopls', 'tsserver' }
|
||||
for _, lsp in ipairs(servers) do
|
||||
nvim_lsp[lsp].setup {
|
||||
on_attach = on_attach,
|
||||
flags = {
|
||||
debounce_text_changes = 150,
|
||||
}
|
||||
}
|
||||
end
|
||||
EOF
|
||||
@ -29,3 +29,5 @@ let g:nvim_tree_icons = {
|
||||
\ }
|
||||
|
||||
noremap <C-n> :NvimTreeToggle<CR>
|
||||
|
||||
lua require 'nvim-tree'.setup{}
|
||||
|
||||
@ -5,6 +5,7 @@ Plug 'jiangmiao/auto-pairs'
|
||||
Plug 'leafgarland/typescript-vim', { 'for': 'typescript' }
|
||||
Plug 'leafoftree/vim-svelte-plugin', { 'for': 'svelte' }
|
||||
Plug 'lukas-reineke/indent-blankline.nvim'
|
||||
Plug 'neovim/nvim-lspconfig'
|
||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
|
||||
Plug 'posva/vim-vue', { 'for': 'vue' }
|
||||
Plug 'ron-rs/ron.vim', { 'for': 'ron' }
|
||||
@ -17,10 +18,6 @@ Plug 'tpope/vim-surround'
|
||||
Plug 'vim-test/vim-test'
|
||||
Plug 'wakatime/vim-wakatime'
|
||||
|
||||
" CoC
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'} |
|
||||
\ Plug 'neoclide/coc-git'
|
||||
|
||||
" Lightline
|
||||
Plug 'itchyny/lightline.vim' |
|
||||
\ Plug 'albertomontesg/lightline-asyncrun' |
|
||||
@ -39,11 +36,6 @@ Plug 'kyazdani42/nvim-tree.lua' |
|
||||
Plug 'godlygeek/tabular' |
|
||||
\ Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
|
||||
|
||||
" Telescope
|
||||
Plug 'nvim-lua/popup.nvim'
|
||||
Plug 'nvim-lua/plenary.nvim'
|
||||
Plug 'nvim-telescope/telescope.nvim'
|
||||
|
||||
" sonokai colorscheme + supporting plugins
|
||||
Plug 'sainnhe/sonokai' |
|
||||
\ Plug 'rmolin88/pomodoro.vim' |
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
nnoremap <leader>ff <cmd>Telescope find_files<cr>
|
||||
nnoremap <leader>fg <cmd>Telescope live_grep<cr>
|
||||
nnoremap <leader>fG <cmd>Telescope git_files<cr>
|
||||
nnoremap <leader>fb <cmd>Telescope buffers<cr>
|
||||
nnoremap <leader>fh <cmd>Telescope help_tags<cr>
|
||||
nnoremap <leader>fw <cmd>Telescope grep_string<cr>
|
||||
|
||||
lua << EOF
|
||||
require('telescope').setup{
|
||||
defaults = {
|
||||
vimgrep_arguments = {
|
||||
'rg',
|
||||
'--color=never',
|
||||
'--no-heading',
|
||||
'--with-filename',
|
||||
'--line-number',
|
||||
'--column',
|
||||
'--smart-case'
|
||||
},
|
||||
prompt_prefix = " 🔍 ",
|
||||
selection_caret = " ⯈ ",
|
||||
entry_prefix = " ",
|
||||
initial_mode = "insert",
|
||||
selection_strategy = "reset",
|
||||
sorting_strategy = "descending",
|
||||
layout_strategy = "horizontal",
|
||||
layout_config = {
|
||||
horizontal = {
|
||||
mirror = false,
|
||||
},
|
||||
vertical = {
|
||||
mirror = false,
|
||||
},
|
||||
},
|
||||
file_sorter = require'telescope.sorters'.get_fuzzy_file,
|
||||
file_ignore_patterns = {},
|
||||
generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter,
|
||||
winblend = 0,
|
||||
border = {},
|
||||
borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' },
|
||||
color_devicons = true,
|
||||
use_less = true,
|
||||
path_display = {},
|
||||
set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil,
|
||||
file_previewer = require'telescope.previewers'.vim_buffer_cat.new,
|
||||
grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new,
|
||||
qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new,
|
||||
|
||||
-- Developer configurations: Not meant for general override
|
||||
buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker
|
||||
}
|
||||
}
|
||||
EOF
|
||||
14
vimrc
14
vimrc
@ -68,16 +68,15 @@ if filereadable(expand("~/.config/nvim/plugins.vimrc"))
|
||||
endif
|
||||
call plug#end()
|
||||
|
||||
if filereadable(expand("~/.config/nvim/lspconfig.vimrc"))
|
||||
source ~/.config/nvim/lspconfig.vimrc
|
||||
endif
|
||||
|
||||
" Keybindings
|
||||
if filereadable(expand("~/.config/nvim/keybindings.vimrc"))
|
||||
source ~/.config/nvim/keybindings.vimrc
|
||||
endif
|
||||
|
||||
" CoC
|
||||
if filereadable(expand("~/.config/nvim/coc.vimrc"))
|
||||
source ~/.config/nvim/coc.vimrc
|
||||
endif
|
||||
|
||||
" Lightline setup
|
||||
if filereadable(expand("~/.config/nvim/lightline.vimrc"))
|
||||
source ~/.config/nvim/lightline.vimrc
|
||||
@ -108,11 +107,6 @@ if filereadable(expand("~/.config/nvim/projections.vimrc"))
|
||||
source ~/.config/nvim/projections.vimrc
|
||||
endif
|
||||
|
||||
" Telescope setup
|
||||
if filereadable(expand("~/.config/nvim/telescope.vimrc"))
|
||||
source ~/.config/nvim/telescope.vimrc
|
||||
endif
|
||||
|
||||
" Test setup
|
||||
if filereadable(expand("~/.config/nvim/test.vimrc"))
|
||||
source ~/.config/nvim/test.vimrc
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user