update coc
This commit is contained in:
parent
4a7032aff4
commit
28a0928b83
3 changed files with 37 additions and 24 deletions
|
|
@ -5,4 +5,4 @@
|
||||||
"coc-snippets": ">=2.2.3",
|
"coc-snippets": ">=2.2.3",
|
||||||
"coc-ultisnips": ">=1.2.3"
|
"coc-ultisnips": ">=1.2.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,13 +21,13 @@
|
||||||
"directory": ".ccls-cache"
|
"directory": ".ccls-cache"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"golang": {
|
||||||
|
"command": "gopls",
|
||||||
|
"rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"],
|
||||||
|
"filetypes": ["go"]
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"golang": {
|
|
||||||
"command": "gopls",
|
|
||||||
"rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"],
|
|
||||||
"filetypes": ["go"]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"python.autoComplete.extraPaths": [
|
"python.autoComplete.extraPaths": [
|
||||||
"${env:SPARK_HOME}/python",
|
"${env:SPARK_HOME}/python",
|
||||||
"${env:SPARK_HOME}/python/pyspark"
|
"${env:SPARK_HOME}/python/pyspark"
|
||||||
|
|
|
||||||
47
.vimrc
47
.vimrc
|
|
@ -49,7 +49,8 @@ set splitbelow
|
||||||
" For autocomplete, show a menu, show it when there's only one option,
|
" For autocomplete, show a menu, show it when there's only one option,
|
||||||
" and only complete the longest common bit instead of the whole thing (like
|
" and only complete the longest common bit instead of the whole thing (like
|
||||||
" bash).
|
" bash).
|
||||||
set completeopt=menu,menuone,longest
|
"set completeopt=menu,menuone,longest
|
||||||
|
set completeopt=noinsert,menuone,noselect,longest
|
||||||
|
|
||||||
set diffopt+=vertical
|
set diffopt+=vertical
|
||||||
" Some stuff for 256-Color consoles that I've forgotten.
|
" Some stuff for 256-Color consoles that I've forgotten.
|
||||||
|
|
@ -100,18 +101,19 @@ Plug 'let-def/vimbufsync'
|
||||||
Plug 'lambdalisue/suda.vim'
|
Plug 'lambdalisue/suda.vim'
|
||||||
|
|
||||||
" Plugins that I almost never use
|
" Plugins that I almost never use
|
||||||
Plug 'vim-scripts/DrawIt'
|
"Plug 'vim-scripts/DrawIt'
|
||||||
Plug 'tpope/vim-speeddating'
|
"Plug 'tpope/vim-speeddating'
|
||||||
Plug 'vim-scripts/EasyGrep'
|
"Plug 'vim-scripts/EasyGrep'
|
||||||
Plug 'chrisbra/NrrwRgn'
|
Plug 'chrisbra/NrrwRgn'
|
||||||
Plug 'mattn/calendar-vim'
|
"Plug 'mattn/calendar-vim'
|
||||||
Plug 'rstacruz/sparkup'
|
"Plug 'rstacruz/sparkup'
|
||||||
Plug 'tristen/vim-sparkup'
|
"Plug 'tristen/vim-sparkup'
|
||||||
Plug 'tpope/vim-fireplace', {'for': 'clojure'}
|
"Plug 'tpope/vim-fireplace', {'for': 'clojure'}
|
||||||
"Plug 'terryma/vim-multiple-cursors'
|
""Plug 'terryma/vim-multiple-cursors'
|
||||||
Plug 'ambv/black'
|
"Plug 'ambv/black'
|
||||||
Plug 'kana/vim-textobj-user'
|
Plug 'kana/vim-textobj-user'
|
||||||
|
|
||||||
|
|
||||||
" Plugins I wish I used more
|
" Plugins I wish I used more
|
||||||
"Plug 'hsitz/VimOrganizer'
|
"Plug 'hsitz/VimOrganizer'
|
||||||
Plug 'jceb/vim-orgmode'
|
Plug 'jceb/vim-orgmode'
|
||||||
|
|
@ -143,6 +145,8 @@ Plug 'sheerun/vim-polyglot'
|
||||||
Plug 'Shougo/denite.nvim'
|
Plug 'Shougo/denite.nvim'
|
||||||
Plug 'plytophogy/vim-virtualenv'
|
Plug 'plytophogy/vim-virtualenv'
|
||||||
Plug 'ervandew/supertab'
|
Plug 'ervandew/supertab'
|
||||||
|
"Plug 'ncm2/ncm2'
|
||||||
|
"Plug 'roxma/nvim-yarp'
|
||||||
|
|
||||||
|
|
||||||
" Plugins I NEEDED
|
" Plugins I NEEDED
|
||||||
|
|
@ -199,12 +203,15 @@ Plug 'lervag/vimtex'
|
||||||
|
|
||||||
|
|
||||||
" Unclear
|
" Unclear
|
||||||
Plug 'ncm2/float-preview.nvim'
|
"Plug 'ncm2/float-preview.nvim'
|
||||||
Plug 'lambdalisue/gina.vim'
|
Plug 'lambdalisue/gina.vim'
|
||||||
Plug 'barakmich/vim-code-dark'
|
Plug 'barakmich/vim-code-dark'
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
|
" enable ncm2 for all buffers
|
||||||
|
"autocmd BufEnter * call ncm2#enable_for_buffer()
|
||||||
|
|
||||||
nmap <silent> gd <Plug>(coc-definition)
|
nmap <silent> gd <Plug>(coc-definition)
|
||||||
nmap <silent> gy <Plug>(coc-type-definition)
|
nmap <silent> gy <Plug>(coc-type-definition)
|
||||||
nmap <silent> gi <Plug>(coc-implementation)
|
nmap <silent> gi <Plug>(coc-implementation)
|
||||||
|
|
@ -283,12 +290,13 @@ let g:SuperTabDefaultCompletionType = "<c-n>"
|
||||||
|
|
||||||
" Change the source rank
|
" Change the source rank
|
||||||
"call deoplete#custom#option('sources', {
|
"call deoplete#custom#option('sources', {
|
||||||
"\ 'python': ['LanguageClient', 'jedi'],
|
"\ 'python': ['LanguageClient'],
|
||||||
|
"\ 'cpp': ['LanguageClient'],
|
||||||
"\})
|
"\})
|
||||||
"call deoplete#custom#source('buffer', 'rank', 1)
|
"call deoplete#custom#source('buffer', 'rank', 1)
|
||||||
"let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so'
|
"let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so'
|
||||||
"let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang'
|
"let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang'
|
||||||
"let g:deoplete#enable_at_startup = 1
|
let g:deoplete#enable_at_startup = 1
|
||||||
"let g:deoplete#sources = {}
|
"let g:deoplete#sources = {}
|
||||||
"let g:deoplete#sources.scala = ['buffer', 'tags', 'omni']
|
"let g:deoplete#sources.scala = ['buffer', 'tags', 'omni']
|
||||||
"let g:deoplete#omni#input_patterns = {}
|
"let g:deoplete#omni#input_patterns = {}
|
||||||
|
|
@ -322,15 +330,20 @@ let g:airline#extensions#ale#enabled = 1
|
||||||
let g:ale_set_highlights = 0
|
let g:ale_set_highlights = 0
|
||||||
|
|
||||||
" * LanguageServer
|
" * LanguageServer
|
||||||
"let g:LanguageClient_serverCommands = {
|
let g:LanguageClient_serverCommands = {
|
||||||
"\ 'python': ['pyls'],
|
\ 'python': ['pyls'],
|
||||||
"\ }
|
\ 'cpp': ['ccls'],
|
||||||
|
\ 'go': ['gopls'],
|
||||||
|
\ }
|
||||||
let g:LanguageClient_diagnosticsDisplay = {
|
let g:LanguageClient_diagnosticsDisplay = {
|
||||||
\1: {'name': 'Error', 'texthl': 'ALEError', 'signText': 'E>', 'signTexthl': 'ALEErrorSign',},
|
\1: {'name': 'Error', 'texthl': 'ALEError', 'signText': 'E>', 'signTexthl': 'ALEErrorSign',},
|
||||||
\2: {"name": "Warning", "texthl": "ALEWarning", "signText": "W>", "signTexthl": "ALEWarningSign",},
|
\2: {"name": "Warning", "texthl": "ALEWarning", "signText": "W>", "signTexthl": "ALEWarningSign",},
|
||||||
\3: {"name": "Information", "texthl": "ALEInfo", "signText": "i-", "signTexthl": "ALEInfoSign",},
|
\3: {"name": "Information", "texthl": "ALEInfo", "signText": "i-", "signTexthl": "ALEInfoSign",},
|
||||||
\4: {"name": "Hint", "texthl": "ALEInfo", "signText": "--", "signTexthl": "ALEInfoSign",},
|
\4: {"name": "Hint", "texthl": "ALEInfo", "signText": "--", "signTexthl": "ALEInfoSign",},
|
||||||
\}
|
\}
|
||||||
|
"nmap <silent> gd <Plug>(lcn-definition)
|
||||||
|
"nmap <silent> K <Plug>(lcn-hover)
|
||||||
|
"nmap <silent> <Leader>m <Plug>(lcn-menu)
|
||||||
|
|
||||||
" * Configure browser for haskell_doc.vim
|
" * Configure browser for haskell_doc.vim
|
||||||
let g:haddock_browser = "open"
|
let g:haddock_browser = "open"
|
||||||
|
|
@ -725,7 +738,7 @@ xnoremap <Down> gj
|
||||||
xnoremap <Up> gk
|
xnoremap <Up> gk
|
||||||
inoremap <Down> <C-o>gj
|
inoremap <Down> <C-o>gj
|
||||||
inoremap <Up> <C-o>gk
|
inoremap <Up> <C-o>gk
|
||||||
nnoremap <C-i> <C-a>
|
"nnoremap <C-i> <C-a>
|
||||||
" Years of using bash and zsh have caused my fingers to expect these Emacs-like
|
" Years of using bash and zsh have caused my fingers to expect these Emacs-like
|
||||||
" mappings to exist. Make them exist in vim as well. But eye them with
|
" mappings to exist. Make them exist in vim as well. But eye them with
|
||||||
" suspicion, as they come from Emacs.
|
" suspicion, as they come from Emacs.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue