Tweak completion and linter. Add hlsl syntax highlight
This commit is contained in:
parent
ca3e91e7c3
commit
7e3cfd66ae
1 changed files with 33 additions and 20 deletions
53
vimrc
53
vimrc
|
@ -59,37 +59,50 @@ if has("unix") || has("mac")
|
||||||
map <F5> :UndotreeToggle<CR>
|
map <F5> :UndotreeToggle<CR>
|
||||||
Plugin 'vim-scripts/LaTeX-Box'
|
Plugin 'vim-scripts/LaTeX-Box'
|
||||||
map <LocalLeader>ll :Latexmk<CR>
|
map <LocalLeader>ll :Latexmk<CR>
|
||||||
if isdirectory(expand("$HOME/.vim/bundle/YouCompleteMe")) || isdirectory(expand("/usr/share/vim/vimfiles/third_party/ycmd/"))
|
if isdirectory(expand("/usr/share/vim/vimfiles/third_party/ycmd/"))
|
||||||
"[Workaround for YCM non-portability]"
|
"[Workaround for YCM non-portability]"
|
||||||
Plugin 'Valloric/YouCompleteMe'
|
"No need for Plugin 'Valloric/YouCompleteMe', it's installed system-wide
|
||||||
let g:ycm_global_ycm_extra_conf = '/usr/share/vim/vimfiles/third_party/ycmd/cpp/ycm/.ycm_extra_conf.py'
|
let g:ycm_global_ycm_extra_conf = '/usr/share/vim/vimfiles/third_party/ycmd/cpp/ycm/.ycm_extra_conf.py'
|
||||||
let g:ycm_server_python_interpreter = '/usr/bin/python2'
|
let g:ycm_server_python_interpreter = '/usr/bin/python2'
|
||||||
|
"[We're using ale for linting]"
|
||||||
|
let g:ycm_show_diagnostics_ui = 0
|
||||||
else
|
else
|
||||||
Plugin 'AutoComplPop'
|
Plugin 'AutoComplPop'
|
||||||
endif
|
endif
|
||||||
Plugin 'w0rp/ale'
|
Plugin 'w0rp/ale'
|
||||||
let g:ale_sign_error = 'E'
|
let g:ale_linters = {
|
||||||
let g:ale_sign_warning = 'W'
|
\ 'cpp': ['g++'],
|
||||||
|
\ 'c': ['clang']
|
||||||
|
\ }
|
||||||
|
let g:ale_c_gcc_options='-std=c99 -pedantic'
|
||||||
|
let g:ale_sign_error = '●'
|
||||||
|
let g:ale_sign_warning = '●'
|
||||||
Plugin 'itchyny/lightline.vim'
|
Plugin 'itchyny/lightline.vim'
|
||||||
let g:lightline = {
|
let g:lightline = {
|
||||||
\'colorscheme': 'solarized',
|
\'colorscheme': 'solarized',
|
||||||
\ 'active': {
|
\ 'active': {
|
||||||
\ 'left': [['mode', 'paste'], ['filename', 'modified']],
|
\ 'left': [['mode', 'paste'], ['filename', 'modified']],
|
||||||
\ 'right': [['lineinfo'], ['percent'], ['readonly', 'linter_warnings', 'linter_errors', 'linter_ok']]
|
\ 'right': [['lineinfo'],
|
||||||
\ },
|
\ ['percent'],
|
||||||
\ 'component_expand': {
|
\ ['readonly', 'linter_warnings', 'linter_errors', 'linter_ok'],
|
||||||
\ 'linter_warnings': 'LightlineLinterWarnings',
|
\ ['fileformat'],
|
||||||
\ 'linter_errors': 'LightlineLinterErrors',
|
\ ['fileencoding']
|
||||||
\ 'linter_ok': 'LightlineLinterOK'
|
\ ]
|
||||||
\ },
|
\ },
|
||||||
\ 'component_type': {
|
\ 'component_expand': {
|
||||||
\ 'readonly': 'error',
|
\ 'linter_warnings': 'LightlineLinterWarnings',
|
||||||
\ 'linter_warnings': 'warning',
|
\ 'linter_errors': 'LightlineLinterErrors',
|
||||||
\ 'linter_errors': 'error'
|
\ 'linter_ok': 'LightlineLinterOK'
|
||||||
\ },
|
\ },
|
||||||
\}
|
\ 'component_type': {
|
||||||
|
\ 'readonly': 'error',
|
||||||
|
\ 'linter_warnings': 'warning',
|
||||||
|
\ 'linter_errors': 'error'
|
||||||
|
\ },
|
||||||
|
\}
|
||||||
Plugin 'godlygeek/tabular'
|
Plugin 'godlygeek/tabular'
|
||||||
Plugin 'tikhomirov/vim-glsl'
|
Plugin 'tikhomirov/vim-glsl'
|
||||||
|
Plugin 'beyondmarc/hlsl.vim'
|
||||||
Plugin 'mzlogin/vim-smali'
|
Plugin 'mzlogin/vim-smali'
|
||||||
Plugin 'jamessan/vim-gnupg'
|
Plugin 'jamessan/vim-gnupg'
|
||||||
Plugin 'petRUShka/vim-opencl'
|
Plugin 'petRUShka/vim-opencl'
|
||||||
|
|
Loading…
Reference in a new issue