dotfiles: vim/vimrc comparison

comparison vim/vimrc @ 495:232351531855

Vim config improvements - Support for gui vs non gui plugin exclusions rules - Move HasPlugin to an autoload function that can be used in vimrc-local - Don't load the local bundle if it doesn't exist - Handle VS vs UE for building projects

author	Ludovic Chabant <ludovic@chabant.com>
date	Fri, 12 Nov 2021 10:51:57 -0800
parents	b452486b97c5
children

comparison

equal deleted inserted replaced

-:76defcf6bf02
+:232351531855
 syntax off
 filetype off
 " Disable some plugins.
 let g:pathogen_disabled = get(g:, 'pathogen_disabled', [])
-call ludo#setup_pathogen([ludo#localpath('bundle'), ludo#localpath('local')])
+let s:bundles = [ludo#localpath('bundle')]
+if isdirectory(ludo#localpath('local'))
+call add(s:bundles, ludo#localpath('local'))
+endif
+call ludo#setup_pathogen(s:bundles)
 " Load pathogen.
 runtime bundle/pathogen/autoload/pathogen.vim
 " Add the bundle directory, and potentially add the local one if it exists.
 " Note that we pass absolute paths to make pathogen prepend stuff before Vim's
 set columns=999
 if has("win32")
 au GUIEnter * simalt ~x
 endif
 endif
-function! s:HasPlugin(plugname, ...) abort
-let l:dirname = 'plugin/'
-if a:0 && a:1
-let l:dirname = 'autoload/'
-endif
-return globpath(&runtimepath, l:dirname.a:plugname.'.vim') !=# ''
-endfunction
 " }}}
 " General Settings {{{
 \'autoignore'
 \]
 " Use PyMatch to go faster.
 if (has('python3') || has('python'))
-if s:HasPlugin('ctrlp-py-matcher')
+if ludo#has_plugin('ctrlp-py-matcher')
 let g:ctrlp_match_func = {'match': 'pymatcher#PyMatch'}
 let g:ctrlp_max_files = 0
 let g:ctrlp_lazy_update = 350
-elseif s:HasPlugin('cpsm', 1)
+elseif ludo#has_plugin('cpsm', 1)
 let g:ctrlp_match_func = {'match': 'cpsm#CtrlPMatch'}
 let g:ctrlp_max_files = 0
 let g:ctrlp_lazy_update = 350
 endif
 endif
 \    'ycm_warns': 'warning',
 \    'gutentags': 'warning',
 \    },
 \}
-if s:HasPlugin('fugitive')
+if ludo#has_plugin('fugitive')
 function! _LightlineFugitive()
 return fugitive#head()
 endfunction
 else
 function! _LightlineFugitive()
 endfunction
 endif
-if s:HasPlugin('lawrencium')
+if ludo#has_plugin('lawrencium')
 function! _LightlineLawrencium()
 return lawrencium#statusline()
 endfunction
 else
 function! _LightlineLawrencium()
 else
 return ''
 endif
 endfunction
-if s:HasPlugin('gutentags')
+if ludo#has_plugin('gutentags')
 function! _LightlineGutentags()
 return gutentags#statusline('', '', '♨')
 endfunction
 else
 function! _LightlineGutentags()
 endfunction
 endif
-if s:HasPlugin('syntastic')
+if ludo#has_plugin('syntastic')
 function! _LightlineLinter()
 return SyntasticStatuslineFlag()
 endfunction
 else
 function! _LightlineLinter() abort
 \   all_errors
 \)
 endfunction
 endif
-if s:HasPlugin('youcompleteme')
+if ludo#has_plugin('youcompleteme')
 function! _LightlineYcmErrors()
 let l:cnt = youcompleteme#GetErrorCount()
 return l:cnt > 0 ? string(l:cnt) : ''
 endfunction
 " Keep search matches in the middle of the window.
 nnoremap n nzvzz
 nnoremap N Nzvzz
 " YCM mappings.
-if s:HasPlugin('youcompleteme')
+if ludo#has_plugin('youcompleteme')
 augroup VimRC_YouCompleteMe
 autocmd!
 autocmd FileType cpp nnoremap <Leader>jj :YcmCompleter GoToImprecise<cr>zv
 autocmd FileType cpp nnoremap <Leader>jd :YcmCompleter GoToDefinition<cr>zv
 autocmd FileType cpp nnoremap <Leader>jh :YcmCompleter GoToDeclaration<cr>zv
 autocmd FileType cpp nnoremap <Leader>je :YcmShowDetailedDiagnostic<cr>
 augroup END
 endif
 " OmniSharp mappings
-if s:HasPlugin('OmniSharp')
+if ludo#has_plugin('OmniSharp')
 augroup VimRC_OmniSharp
 autocmd!
 autocmd FileType cs setlocal omnifunc=OmniSharp#Complete
 autocmd BufEnter,TextChanged,InsertLeave *.cs SyntasticCheck
 autocmd CursorHold *.cs call OmniSharp#TypeLookupWithoutDocumentation()
 augroup END
 nnoremap <leader>cd :ProjectRootCD<cr>
 " Ctrl-P mappings.
-if s:HasPlugin('ctrlp')
+if ludo#has_plugin('ctrlp')
 nnoremap <silent> <C-p> :CtrlP<cr>
 nnoremap <silent> <C-o> :CtrlPBuffer<cr>
 nnoremap <silent> <C-u> :CtrlPTag<cr>
 nnoremap <silent> <C-y> :CtrlPBufTag<cr>
 nnoremap <silent> <Tab> :CtrlPMRUFiles<cr>
 nnoremap <silent> <F8> :CtrlPBookmarkDir<cr>
 endif
 " FZF mappings.
-if s:HasPlugin('fzf')
+if ludo#has_plugin('fzf')
 if exists('*fzf#run')
 nnoremap <silent> <C-p> :Files<cr>
 nnoremap <silent> <C-o> :Buffers<cr>
 nnoremap <Tab> :History<cr>
 \"isn't loaded... add it to your `vimrc-local-pre`.")
 endif
 endif
 " LeaderF mappings.
-if s:HasPlugin('leaderf')
+if ludo#has_plugin('leaderf')
 let g:Lf_ShortcutF = '<C-p>'
 let g:Lf_ShortcutB = '<C-o>'
 nnoremap <silent> <C-p> :LeaderfFile<cr>
 nnoremap <silent> <C-o> :LeaderfBuffer<cr>
 nnoremap <silent> <C-u> :LeaderfTag<cr>
 nnoremap <silent> <Leader>fh :LeaderfHelp<cr>
 let g:Lf_StlSeparator = { 'left': '', 'right': '' }
 endif
-" Vimcrosoft mappings.
+" Vimcrosoft/UE mappings.
-if s:HasPlugin('vimcrosoft')
+nnoremap <F7> :call ludo#build_vs_or_ue()<cr>
-nnoremap <F7> :VimcrosoftBuildActiveProject<cr>
-nnoremap <F8> :VimcrosoftBuildSln<cr>
-endif
 " }}}
 " Folding {{{

Mercurial > dotfiles

comparison vim/vimrc @ 495:232351531855