aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vimrc-full33
1 files changed, 19 insertions, 14 deletions
diff --git a/vimrc-full b/vimrc-full
index 2c86fa2..c0ac443 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -739,17 +739,22 @@ nnoremap <S-PageDown> :n<CR>
739 739
740 740
741" Additional: ========================================. 741" Additional: ========================================.
742Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages 742" Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages
743let g:javascript_conceal_function = "ƒ" 743" let g:javascript_conceal_function = "ƒ"
744let g:javascript_conceal_null = "ø" 744" let g:javascript_conceal_null = "ø"
745let g:javascript_conceal_this = "@" 745" let g:javascript_conceal_this = "@"
746let g:javascript_conceal_return = "⇚" 746" let g:javascript_conceal_return = "⇚"
747let g:javascript_conceal_undefined = "¿" 747" let g:javascript_conceal_undefined = "¿"
748let g:javascript_conceal_NaN = "ℕ" 748" let g:javascript_conceal_NaN = "ℕ"
749let g:javascript_conceal_prototype = "¶" 749" let g:javascript_conceal_prototype = "¶"
750let g:javascript_conceal_static = "•" 750" let g:javascript_conceal_static = "•"
751let g:javascript_conceal_super = "Ω" 751" let g:javascript_conceal_super = "Ω"
752let g:javascript_conceal_arrow_function = "⇒" 752" let g:javascript_conceal_arrow_function = "⇒"
753
754
755" indent within <script> and <style> (default is a zero indent)
756let g:html_indent_script1 = "inc"
757let g:html_indent_style1 = "inc"
753 758
754Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more 759Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more
755let g:tagbar_autoclose = 0 760let g:tagbar_autoclose = 0
@@ -762,7 +767,7 @@ let g:tagbar_foldlevel = 99
762nnoremap <F9> :TagbarToggle<CR>| " bind TagBar to hotkey F9 767nnoremap <F9> :TagbarToggle<CR>| " bind TagBar to hotkey F9
763 768
764" Autocompleter: ===================================== 769" Autocompleter: =====================================
765if has("python") 770if has("python") || has('python3')
766 771
767 " ULTISNIPS: code snippet ============================================================================================ 772 " ULTISNIPS: code snippet ============================================================================================
768 Plug 'honza/vim-snippets' " dependency of ultisnips (see below) 773 Plug 'honza/vim-snippets' " dependency of ultisnips (see below)
@@ -801,6 +806,7 @@ if has("python")
801 " let g:deoplete#sources#clang#clang_complete_database = "/home/max/src" 806 " let g:deoplete#sources#clang#clang_complete_database = "/home/max/src"
802 " Plug 'Shougo/neoinclude.vim' " makes vim slow - unfortunatelly 807 " Plug 'Shougo/neoinclude.vim' " makes vim slow - unfortunatelly
803 808
809 " Plug 'Shougo/deoplete-clangx' " mentioned in Q&A of deoplete
804 Plug 'autozimu/LanguageClient-neovim', { 810 Plug 'autozimu/LanguageClient-neovim', {
805 \ 'branch': 'next', 811 \ 'branch': 'next',
806 \ 'do': 'bash install.sh', 812 \ 'do': 'bash install.sh',
@@ -811,8 +817,6 @@ if has("python")
811 \ } 817 \ }
812 " Plug 'roxma/nvim-completion-manager' unmaintained python version 818 " Plug 'roxma/nvim-completion-manager' unmaintained python version
813 else 819 else
814 Plug 'idanarye/vim-vebugger'
815
816 " YouCompleteMe: ===================================================================================================== 820 " YouCompleteMe: =====================================================================================================
817 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... 821 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/...
818 Plug 'Valloric/YouCompleteMe', { 822 Plug 'Valloric/YouCompleteMe', {
@@ -825,6 +829,7 @@ if has("python")
825 let g:ycm_auto_trigger = 1 829 let g:ycm_auto_trigger = 1
826 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file 830 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
827 let g:ycm_confirm_extra_conf = 0 " security is overrated ;) 831 let g:ycm_confirm_extra_conf = 0 " security is overrated ;)
832 let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that
828 833
829 let g:ycm_key_list_previous_completion = ['Up'] 834 let g:ycm_key_list_previous_completion = ['Up']
830 let g:ycm_key_list_select_completion = ['Down'] 835 let g:ycm_key_list_select_completion = ['Down']
..