From 5d64f2d58a08323decdd0c4a29059be2c4da13af Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 9 Jan 2020 00:37:57 +0100 Subject: [PATCH] Updates for haskell and rust --- after/ftplugin/haskell.vim | 3 +- after/ftplugin/rust.vim | 171 +++++++++++++++++++++++++++++++++---- vimrc | 20 ++--- 3 files changed, 165 insertions(+), 29 deletions(-) diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim index 124d675..9516c1c 100644 --- a/after/ftplugin/haskell.vim +++ b/after/ftplugin/haskell.vim @@ -17,7 +17,8 @@ set tags=tags;/,codex.tags;/ " classic ctags jump " nnoremap gd -nnoremap cgd :cs find g =expand("") +" nnoremap cgd :cs find g =expand("") +nnoremap cgd :Tags =expand("") nnoremap :cs find c =expand("") set cscopeprg=do_at_stack_root\ hscope diff --git a/after/ftplugin/rust.vim b/after/ftplugin/rust.vim index 03f50d1..373cf8c 100644 --- a/after/ftplugin/rust.vim +++ b/after/ftplugin/rust.vim @@ -16,29 +16,164 @@ endfunction nnoremap :call search_under_cursor(expand('')) vnoremap "gy:call search_under_cursor(getreg('g')) -nnoremap :call LanguageClient_contextMenu() -nnoremap :call LanguageClient#textDocument_definition() -nnoremap :call LanguageClient#textDocument_hover() -nnoremap :call LanguageClient#textDocument_rename() +" nnoremap :call LanguageClient_contextMenu() +" nnoremap :call LanguageClient#textDocument_definition() +" nnoremap :call LanguageClient#textDocument_hover() +" nnoremap :call LanguageClient#textDocument_rename() -let g:LanguageClient_autoStart = 1 +" let g:LanguageClient_autoStart = 1 -let g:LanguageClient_serverCommands = { - \ 'rust': ['rustup', 'run', 'nightly', 'rls'] } +" let g:LanguageClient_serverCommands = { + " \ 'rust': ['rustup', 'run', 'nightly', 'rls'] } -let g:LanguageClient_diagnosticsEnable = 0 +" let g:LanguageClient_diagnosticsEnable = 0 -let g:ale_linters = {'rust': ['rls']} -let g:ale_fixers = { 'rust': ['rustfmt'] } +" let g:ale_linters = {'rust': ['rls']} +" let g:ale_fixers = { 'rust': ['rustfmt'] } -let g:ale_fix_on_save = 0 -let g:autofmt_autosave = 0 +" let g:ale_fix_on_save = 0 +" let g:autofmt_autosave = 0 " deoplete -call deoplete#custom#option('sources',{ - \ '_': ['buffer'], - \ 'rust': ['ultisnips', 'buffer', 'file', 'LanguageClient'] - \ }) -inoremap pumvisible() ? "\" : "\" -call deoplete#enable() +" call deoplete#custom#option('sources',{ + " \ '_': ['buffer'], + " \ 'rust': ['ultisnips', 'buffer', 'file', 'LanguageClient'] + " \ }) +" inoremap pumvisible() ? "\" : "\" +" call deoplete#enable() + + +" ============ coc.nvim =========== +" markdown rendering of code blocks +let g:markdown_fenced_languages = ['haskell'] + +" if hidden is not set, TextEdit might fail. +set hidden + +" Some servers have issues with backup files, see #649 +set nobackup +set nowritebackup + +" Better display for messages +"set cmdheight=2 + +" You will have bad experience for diagnostic messages when it's default 4000. +set updatetime=300 + +" don't give |ins-completion-menu| messages. +set shortmess+=c + +" always show signcolumns +set signcolumn=yes + +" Use tab for trigger completion with characters ahead and navigate. +" Use command ':verbose imap ' to make sure tab is not mapped by other plugin. +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use to trigger completion. +inoremap coc#refresh() + +" Use to confirm completion, `u` means break undo chain at current position. +" Coc only does snippet and additional edit on confirm. +inoremap pumvisible() ? "\" : "\u\" +" Or use `complete_info` if your vim support it, like: +" inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" + +" Use `[g` and `]g` to navigate diagnostics +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) + +" Remap keys for gotos +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" Use K to show documentation in preview window +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction + +" Highlight symbol under cursor on CursorHold +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Remap for rename current word +nmap rn (coc-rename) + +" Remap for format selected region +xmap f (coc-format-selected) +nmap f (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 + +" Remap for do codeAction of selected region, ex: `aap` for current paragraph +xmap a (coc-codeaction-selected) +nmap a (coc-codeaction-selected) + +" Remap for do codeAction of current line +nmap ac (coc-codeaction) +" Fix autofix problem of current line +nmap qf (coc-fix-current) + +" Create mappings for function text object, requires document symbols feature of languageserver. +xmap if (coc-funcobj-i) +xmap af (coc-funcobj-a) +omap if (coc-funcobj-i) +omap af (coc-funcobj-a) + +" Use for select selections ranges, needs server support, like: coc-tsserver, coc-python +nmap (coc-range-select) +xmap (coc-range-select) + +" Use `:Format` to format current buffer +command! -nargs=0 Format :call CocAction('format') + +" Use `:Fold` to fold current buffer +command! -nargs=? Fold :call CocAction('fold', ) + +" use `:OR` for organize import of current buffer +command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') + +" Add status line support, for integration with other plugin, checkout `:h coc-status` +set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} + +" Using CocList +" Show all diagnostics +nnoremap a :CocList diagnostics +" Manage extensions +nnoremap e :CocList extensions +" Show commands +nnoremap c :CocList commands +" Find symbol of current document +nnoremap o :CocList outline +" Search workspace symbols +nnoremap s :CocList -I symbols +" Do default action for next item. +nnoremap j :CocNext +" Do default action for previous item. +nnoremap k :CocPrev +" Resume latest coc list +nnoremap p :CocListResume + diff --git a/vimrc b/vimrc index 45fff0a..899dde9 100644 --- a/vimrc +++ b/vimrc @@ -78,18 +78,18 @@ Plug 'honza/vim-snippets' " \ } " Use release branch (Recommend) -Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} +Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell', 'rust']} Plug 'neoclide/coc-tsserver', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-git', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-rls', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} +"Plug 'neoclide/coc-git', {'do': 'yarn install --frozen-lockfile'} +" Plug 'neoclide/coc-rls', {'do': 'yarn install --frozen-lockfile', 'for': ['rust']} +Plug 'fannheyward/coc-rust-analyzer', {'do': 'yarn install --frozen-lockfile', 'for': ['rust']} Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-python', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} +Plug 'neoclide/coc-python', {'do': 'yarn install --frozen-lockfile', 'for': ['']} "Plug 'neoclide/coc-vetur', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-eslint', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-highlight', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} -Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} +Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile', 'for': ['']} +Plug 'neoclide/coc-eslint', {'do': 'yarn install --frozen-lockfile', 'for': ['']} +Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile', 'for': ['']} +Plug 'neoclide/coc-highlight', {'do': 'yarn install --frozen-lockfile', 'for': ['']} " linting/compilation Plug 'w0rp/ale', { @@ -138,7 +138,7 @@ Plug 'garyburd/go-explorer', { 'for': 'go' } Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries', 'for': 'go' } " rust -Plug 'rhysd/rust-doc.vim', { 'for': 'rust' } +" Plug 'rhysd/rust-doc.vim', { 'for': 'rust' } Plug 'rust-lang/rust.vim', { 'for': 'rust' } " javascript