vasili/dotvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged down, some fixes, prepping for re-org

Browse Source
This commit is contained in:
Vasili Svirydau
2019-10-28 10:40:50 -07:00
parent cb501a1ab7
commit 5a42a0c8e1
4 changed files with 31 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
config/01-plugins.vim
View File

@@ -18,14 +18,12 @@ if(g:have_plug)
Plug 'ctrlpvim/ctrlp.vim' " Fuzzy search
Plug 'editorconfig/editorconfig-vim' " EditorConfig.org support
" Plug 'ivyl/vim-bling' " blink search results
if executable('ag')
Plug 'rking/ag.vim' " Silver Searcher Support
endif
if executable('rg')
Plug 'jremmen/vim-ripgrep' " RipGrep
endif
" Plug 'tacahiroy/ctrlp-funky' " Fuzzy in-buffer search
Plug 'tommcdo/vim-lion' " Align stuff
Plug 'tpope/vim-abolish' " Case Convert and other stuff
Plug 'tpope/vim-commentary' " Commenting
@@ -33,34 +31,22 @@ if(g:have_plug)
Plug 'tpope/vim-surround' " Surround with quotes
Plug 'vim-airline/vim-airline' " Status bar
Plug 'vim-airline/vim-airline-themes' " Status bar themes
" Plug 'vimwiki/vimwiki' " http://vimwiki.github.io/
Plug 'w0ng/vim-hybrid' " Hybrid colorscheme
Plug 'christoomey/vim-sort-motion' " Sort Motions
" Language
if executable('rails')
Plug 'tpope/vim-rails' " Rails integration
endif
Plug 'mattn/emmet-vim' " ZenCoding
Plug 'sheerun/vim-polyglot' " Language Support Bundle
Plug 'ianks/vim-tsx'
Plug 'OrangeT/vim-csharp' " C# Support
" Plug 'quramy/vim-js-pretty-template' " Syntax highlight inside template strings
" Plug 'heavenshell/vim-jsdoc' " Generate JSDoc comments
" Quality of life
" Plug 'edkolev/tmuxline.vim'
" Plug 'jez/vim-superman' " Man page viewer
" Plug 'mhinz/vim-signify' " Gutter signs, git, et al.
" Plug 'sotte/presenting.vim' " Slides
if v:version >= 800
Plug 'w0rp/ale' " Asynchronous Linting
Plug 'sbdchd/neoformat' " Automatic code formatting
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'Shougo/deoplete.nvim' " Autocomplete Support
Plug 'ruanyl/coverage.vim' " Code Coverage Support
@@ -83,8 +69,6 @@ let g:loaded_netrwPlugin = 1 " Disable netrw
let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1
" let g:airline#extensions#ale#enabled = 0
" let g:airline#extensions#coc#enabled = 1
let g:airline_section_error = '%{airline#util#wrap(airline#extensions#coc#get_error(),0)}'
let g:airline_section_warning = '%{airline#util#wrap(airline#extensions#coc#get_warning(),0)}'
@@ -92,7 +76,6 @@ let g:ale_sign_column_always = 1
let g:ale_sign_error = ''
let g:ale_sign_warning = ''
let g:ale_fix_on_save = 1
" let g:ale_completion_enabled = 1
let g:ale_linters = {
\ 'typescript': ['tsserver'],
@@ -108,17 +91,17 @@ let g:signify_vcs_list = [ 'git' ]
let g:neoformat_html_prettier = {
\ 'exe': 'prettier',
\ 'typescript': ['typescript-language-server', '--stdio'],
\ 'javascript': ['javascript-typescript-stdio'],
\ 'javascript.jsx': ['javascript-typescript-stdio'],
\ 'typescript': ['typescript-language-server', '--stdio'],
\ 'javascript': ['javascript-typescript-stdio'],
\ 'javascript.jsx': ['javascript-typescript-stdio'],
\ }
let g:neoformat_enabled_html = ['prettier']
let g:neoformat_nginx_nginxbeautifier = {
\ 'exe': 'nginxbeautifier',
\ 'replace': 1,
\ }
\ 'exe': 'nginxbeautifier',
\ 'replace': 1,
\ }
let g:neoformat_enabled_nginx = ['nginxbeautifier']
@@ -126,8 +109,8 @@ let g:OmniSharp_server_stdio = 1
let g:OmniSharp_selector_ui = 'ctrlp'
let g:OmniSharp_highlight_groups = {
\ 'csUserIdentifier': [
\ 'constant name', 'enum member name', 'field name', 'identifier',
\ 'local name', 'parameter name', 'property name', 'static symbol'],
\ 'constant name', 'enum member name', 'field name', 'identifier',
\ 'local name', 'parameter name', 'property name', 'static symbol'],
\ 'csUserInterface': ['interface name'],
\ 'csUserMethod': ['extension method name', 'method name'],
\ 'csUserType': ['class name', 'enum name', 'namespace name', 'struct name']
@@ -144,17 +127,17 @@ augroup END
function! OSCountCodeActions() abort
if bufname('%') ==# '' || OmniSharp#FugitiveCheck() | return | endif
if !OmniSharp#IsServerRunning() | return | endif
let opts = {
\ 'CallbackCount': function('s:CBReturnCount'),
\ 'CallbackCleanup': {-> execute('sign unplace 99')}
\}
call OmniSharp#CountCodeActions(opts)
let l:opts = {
\ 'CallbackCount': function('s:CBReturnCount'),
\ 'CallbackCleanup': {-> execute('sign unplace 99')}
\}
call OmniSharp#CountCodeActions(l:opts)
endfunction
function! s:CBReturnCount(count) abort
if a:count
let l = getpos('.')[1]
let f = expand('%:p')
execute ':sign place 99 line='.l.' name=OmniSharpCodeActions file='.f
let l:l = getpos('.')[1]
let l:f = expand('%:p')
execute ':sign place 99 line='.l:l.' name=OmniSharpCodeActions file='.l:f
endif
endfunction