hasufell/vim-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updates for haskell and rust

Browse Source
This commit is contained in:
Julian Ospald 2020-01-09 00:37:57 +01:00
parent e94bbdb593
commit 5d64f2d58a
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
3 changed files with 165 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
after/ftplugin/haskell.vim
View File

@ -17,7 +17,8 @@ set tags=tags;/,codex.tags;/
" classic ctags jump " classic ctags jump
" nnoremap <leader>gd <C-]> " nnoremap <leader>gd <C-]>
nnoremap <silent> <leader>cgd :cs find g <C-R>=expand("<cword>")<CR><CR> " nnoremap <silent> <leader>cgd :cs find g <C-R>=expand("<cword>")<CR><CR>
nnoremap <silent> <leader>cgd :Tags <C-R>=expand("<cword>")<CR><CR>
nnoremap <silent> <C-\> :cs find c <C-R>=expand("<cword>")<CR><CR> nnoremap <silent> <C-\> :cs find c <C-R>=expand("<cword>")<CR><CR>
set cscopeprg=do_at_stack_root\ hscope set cscopeprg=do_at_stack_root\ hscope

171
after/ftplugin/rust.vim
View File

@ -16,29 +16,164 @@ endfunction
nnoremap <buffer><silent><F7> :<C-u>call <SID>search_under_cursor(expand('<cword>'))<CR> nnoremap <buffer><silent><F7> :<C-u>call <SID>search_under_cursor(expand('<cword>'))<CR>
vnoremap <buffer><silent><F7> "gy:call <SID>search_under_cursor(getreg('g'))<CR> vnoremap <buffer><silent><F7> "gy:call <SID>search_under_cursor(getreg('g'))<CR>
nnoremap <F3> :call LanguageClient_contextMenu()<CR> " nnoremap <F3> :call LanguageClient_contextMenu()<CR>
nnoremap <silent> <F4> :call LanguageClient#textDocument_definition()<CR> " nnoremap <silent> <F4> :call LanguageClient#textDocument_definition()<CR>
nnoremap <silent> <F6> :call LanguageClient#textDocument_hover()<CR> " nnoremap <silent> <F6> :call LanguageClient#textDocument_hover()<CR>
nnoremap <silent> <F8> :call LanguageClient#textDocument_rename()<CR> " nnoremap <silent> <F8> :call LanguageClient#textDocument_rename()<CR>
let g:LanguageClient_autoStart = 1 " let g:LanguageClient_autoStart = 1
let g:LanguageClient_serverCommands = { " let g:LanguageClient_serverCommands = {
\ 'rust': ['rustup', 'run', 'nightly', 'rls'] } " \ 'rust': ['rustup', 'run', 'nightly', 'rls'] }
let g:LanguageClient_diagnosticsEnable = 0 " let g:LanguageClient_diagnosticsEnable = 0
let g:ale_linters = {'rust': ['rls']} " let g:ale_linters = {'rust': ['rls']}
let g:ale_fixers = { 'rust': ['rustfmt'] } " let g:ale_fixers = { 'rust': ['rustfmt'] }
let g:ale_fix_on_save = 0 " let g:ale_fix_on_save = 0
let g:autofmt_autosave = 0 " let g:autofmt_autosave = 0
" deoplete " deoplete
call deoplete#custom#option('sources',{ " call deoplete#custom#option('sources',{
\ '_': ['buffer'], " \ '_': ['buffer'],
\ 'rust': ['ultisnips', 'buffer', 'file', 'LanguageClient'] " \ 'rust': ['ultisnips', 'buffer', 'file', 'LanguageClient']
\ }) " \ })
inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>" " inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
call deoplete#enable() " 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 <tab>' to make sure tab is not mapped by other plugin.
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Use <c-space> to trigger completion.
inoremap <silent><expr> <c-space> coc#refresh()
" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
" Coc only does snippet and additional edit on confirm.
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
" Or use `complete_info` if your vim support it, like:
" inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
" Use `[g` and `]g` to navigate diagnostics
nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next)
" Remap keys for gotos
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>')
else
call CocAction('doHover')
endif
endfunction
" Highlight symbol under cursor on CursorHold
autocmd CursorHold * silent call CocActionAsync('highlight')
" Remap for rename current word
nmap <leader>rn <Plug>(coc-rename)
" Remap for format selected region
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
" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph
xmap <leader>a <Plug>(coc-codeaction-selected)
nmap <leader>a <Plug>(coc-codeaction-selected)
" Remap for do codeAction of current line
nmap <leader>ac <Plug>(coc-codeaction)
" Fix autofix problem of current line
nmap <leader>qf <Plug>(coc-fix-current)
" Create mappings for function text object, requires document symbols feature of languageserver.
xmap if <Plug>(coc-funcobj-i)
xmap af <Plug>(coc-funcobj-a)
omap if <Plug>(coc-funcobj-i)
omap af <Plug>(coc-funcobj-a)
" Use <TAB> for select selections ranges, needs server support, like: coc-tsserver, coc-python
nmap <silent> <TAB> <Plug>(coc-range-select)
xmap <silent> <TAB> <Plug>(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', <f-args>)
" 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 <silent> <space>a :<C-u>CocList diagnostics<cr>
" Manage extensions
nnoremap <silent> <space>e :<C-u>CocList extensions<cr>
" Show commands
nnoremap <silent> <space>c :<C-u>CocList commands<cr>
" Find symbol of current document
nnoremap <silent> <space>o :<C-u>CocList outline<cr>
" Search workspace symbols
nnoremap <silent> <space>s :<C-u>CocList -I symbols<cr>
" Do default action for next item.
nnoremap <silent> <space>j :<C-u>CocNext<CR>
" Do default action for previous item.
nnoremap <silent> <space>k :<C-u>CocPrev<CR>
" Resume latest coc list
nnoremap <silent> <space>p :<C-u>CocListResume<CR>

20
vimrc
View File

@ -78,18 +78,18 @@ Plug 'honza/vim-snippets'
" \ } " \ }
" Use release branch (Recommend) " 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-tsserver', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']}
Plug 'neoclide/coc-git', {'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': ['haskell']} " 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-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-vetur', {'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': ['haskell']} Plug 'neoclide/coc-eslint', {'do': 'yarn install --frozen-lockfile', 'for': ['']}
Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile', 'for': ['']}
Plug 'neoclide/coc-highlight', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']} Plug 'neoclide/coc-highlight', {'do': 'yarn install --frozen-lockfile', 'for': ['']}
Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile', 'for': ['haskell']}
" linting/compilation " linting/compilation
Plug 'w0rp/ale', { Plug 'w0rp/ale', {
@ -138,7 +138,7 @@ Plug 'garyburd/go-explorer', { 'for': 'go' }
Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries', 'for': 'go' } Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries', 'for': 'go' }
" rust " rust
Plug 'rhysd/rust-doc.vim', { 'for': 'rust' } " Plug 'rhysd/rust-doc.vim', { 'for': 'rust' }
Plug 'rust-lang/rust.vim', { 'for': 'rust' } Plug 'rust-lang/rust.vim', { 'for': 'rust' }
" javascript " javascript