From 45dd713f716a53f742ddb68c74893292a9d70f4d Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Sun, 18 Nov 2018 22:07:16 +0000 Subject: [PATCH] update --- vim/coc-settings.json | 6 + vim/colors/monotonous-dark.erb | 47 +- vimrc | 775 +++++++++++++++++---------------- 3 files changed, 425 insertions(+), 403 deletions(-) create mode 100644 vim/coc-settings.json diff --git a/vim/coc-settings.json b/vim/coc-settings.json new file mode 100644 index 0000000..0511d43 --- /dev/null +++ b/vim/coc-settings.json @@ -0,0 +1,6 @@ +{ + "coc.preferences.triggerAfterInsertEnter": true, + "coc.preferences.autoTrigger": "always", + "coc.preferences.timeout": 200 +} + diff --git a/vim/colors/monotonous-dark.erb b/vim/colors/monotonous-dark.erb index ffdf5f9..e946b13 100644 --- a/vim/colors/monotonous-dark.erb +++ b/vim/colors/monotonous-dark.erb @@ -200,7 +200,7 @@ [ "Boolean", "String" ], [ "Float", "String" ], - [ "Folded", "NONE", fg_strong3, "NONE" ], + [ "Folded", "NONE", fg_strong3, "bold" ], [ "Statement", "NONE", fg, "NONE" ], [ "Conditional", "NONE", fg_strong3, "bold" ], @@ -213,21 +213,22 @@ [ "PreProc", "NONE", fg_weak1, "bold" ], [ "Include", "NONE", fg_weak1, "NONE" ], - [ "Comment", "NONE", fg_comment, "italic" ], + [ "Comment", "NONE", fg_comment, "bold,italic" ], [ "SpecialComment", "NONE", fg_strong1, "italic"], [ "Todo", "NONE", fg_strong2, "italic" ], [ "Ignore", "NONE", bg, "NONE" ], + [ "Conceal", "NONE", "NONE", "NONE" ], [ "Error", "NONE", fg_error, "bold" ], [ "Underlined", "NONE", "NONE", "underline" ], - [ "StatusLine", ui_bg, ui_fg_strong3, "NONE" ], - [ "StatusLineNC", ui_bg, ui_fg, "NONE" ], - [ "TabLine", ui_bg, ui_fg, "NONE" ], - [ "TabLineFill", ui_bg, ui_bg, "NONE" ], - [ "TabLineSel", ui_bg, ui_fg_strong3, "NONE" ], + [ "StatusLine", ui_bg, ui_fg_strong3, "italic" ], + [ "StatusLineNC", ui_bg, ui_fg, "italic" ], + [ "TabLine", ui_bg, ui_fg, "italic" ], + [ "TabLineFill", ui_bg, ui_bg, "italic" ], + [ "TabLineSel", ui_bg, ui_fg_strong3, "italic" ], [ "VertSplit", bg, ui_bg, "NONE" ], [ "FoldColumn", bg, fg_weak1, "NONE" ], @@ -235,7 +236,7 @@ [ "SignColumn", bg, ui_fg_strong3, "NONE" ], [ "CursorLine", bg_cursorline, "NONE", "NONE" ], - [ "Title", "NONE", fg_strong4, "bold" ], + [ "Title", "NONE", fg_strong4, "bold,italic" ], [ "LineNr", bg, ui_linenr, "NONE" ], [ "CursorLineNr", bg, ui_cursorlinenr, "bold" ], @@ -287,20 +288,20 @@ # tabline, statusline - [ "TabLineNum", ui_bg, ui_fg, "bold"], - [ "TabLineNumSel", ui_bg, ui_fg_strong1, "bold"], + [ "TabLineNum", ui_bg, ui_fg, "italic"], + [ "TabLineNumSel", ui_bg, ui_fg_strong1, "italic"], - [ "StatusLineNoise", ui_bg, ui_fg_weak2, "NONE"], - [ "StatusLineNoiseActive", ui_bg, ui_fg, "NONE"], + [ "StatusLineNoise", ui_bg, ui_fg_weak2, "italic"], + [ "StatusLineNoiseActive", ui_bg, ui_fg, "italic"], - [ "StatusLineBufferNr", ui_bg, ui_fg_strong2, "bold"], - [ "StatusLineBufferNrActive", ui_bg, ui_fg_strong3, "bold"], + [ "StatusLineBufferNr", ui_bg, ui_fg_strong2, "italic"], + [ "StatusLineBufferNrActive", ui_bg, ui_fg_strong3, "italic"], - [ "StatusLinePercent", ui_bg, ui_fg, "bold"], - [ "StatusLinePercentActive", ui_bg, ui_fg_strong2, "bold"], - [ "StatusLineLinecount", ui_bg, ui_fg, "bold"], - [ "StatusLineLinecountActive", ui_bg, ui_fg_strong1, "bold"], + [ "StatusLinePercent", ui_bg, ui_fg, "italic"], + [ "StatusLinePercentActive", ui_bg, ui_fg_strong2, "italic"], + [ "StatusLineLinecount", ui_bg, ui_fg, "italic"], + [ "StatusLineLinecountActive", ui_bg, ui_fg_strong1, "italic"], [ "StatusLineDivActive", ui_fg, ui_fg, "NONE"], [ "StatusLineDivInput", ui_statusbar_input, ui_statusbar_input, "NONE"], @@ -320,8 +321,8 @@ [ "StatusLineFileReadOnly", ui_bg, ui_fg_warning, "italic"], [ "StatusLineFileReadOnlyActive", "NONE", ui_fg_warning, "italic"], - [ "StatusLineWarning", ui_bg, ui_fg_strong1, "bold"], - [ "StatusLineWarningActive", "NONE", ui_fg_warning, "bold"], + [ "StatusLineWarning", ui_bg, ui_fg_strong1, "italic"], + [ "StatusLineWarningActive", "NONE", ui_fg_warning, "italic"], [ "LinterDash", "NONE", ui_fg_linter_dash, "NONE"], [ "LinterDashActive", "NONE", ui_fg_linter_dash_active, "NONE"], @@ -344,6 +345,9 @@ [ "GitGutterAdd", "NONE", ui_sign_add, "bold"], [ "GitGutterChangeDelete", "NONE", ui_sign_changedelete, "bold"], + [ "QuickScopePrimary", "IncSearch" ], + [ "QuickScopeSecondary", "Search" ], + # css, scss [ "cssIdentifier", "NONE", color_secondary, "bold" ], @@ -380,7 +384,7 @@ ["htmlTagName", "NONE", color_tertiary_weak, "NONE"], ["htmlSpecialTagName", "NONE", color_tertiary, "bold"], - ["htmlLink", "NONE", color_tertiary_strong, "underline"], + ["htmlLink", "NONE", fg_strong3, "italic,underline"], [ "htmlNormal", "Normal" ], @@ -429,6 +433,7 @@ [ "vueTagComponentName", "NONE", indigo3, "bold" ], [ "vueDynamicComponent", "NONE", indigo1, "bold" ], + [ "vueComponentName", "vueTagComponentName" ], [ "vueTransitionComponent", "vueDynamicComponent" ], [ "vueTransitionName", "cssIdentifier" ], [ "vueTransitionMode", "String" ], diff --git a/vimrc b/vimrc index 373188d..0b73c16 100644 --- a/vimrc +++ b/vimrc @@ -7,458 +7,465 @@ if empty(glob('~/.vim/autoload/plug.vim'))"{{{ endif "}}} -call plug#begin('~/.vim/bundle') +if !has('nvim') + call plug#begin('~/.vim/bundle') -" #Activity Watch #aw-watcher-vim{{{ -" https://github.com/ActivityWatch/aw-watcher-vim -Plug 'ActivityWatch/aw-watcher-vim' + " #Activity Watch #aw-watcher-vim{{{ + " https://github.com/ActivityWatch/aw-watcher-vim + Plug 'ActivityWatch/aw-watcher-vim' -"}}} -" #ALE {{{ -" https://github.com/w0rp/ale -Plug 'w0rp/ale' + "}}} + " #ALE {{{ + " https://github.com/w0rp/ale + Plug 'w0rp/ale' -nnoremap ne :lnext -nnoremap pe :lprev + nnoremap ne :lnext + nnoremap pe :lprev -let g:ale_sign_error = '>>' -let g:ale_sign_warning = '>' -let g:ale_sign_column_always = 1 -let g:ale_open_list = 0 + let g:ale_sign_error = '>>' + let g:ale_sign_warning = '>' + let g:ale_sign_column_always = 1 + let g:ale_open_list = 0 -let g:ale_linters = {'scss': ['stylelint'], 'javascript': [], 'php':['php'], 'html':['htmlhint'], 'python': [], 'vue': []} -let g:ale_html_htmlhint_options = '-c ~/.htmlhintrc --format=unix' -let g:ale_fixers = {'javascript': ['eslint']} + let g:ale_linters = {'scss': ['stylelint'], 'javascript': [], 'php':['php'], 'html':['htmlhint'], 'python': [], 'vue': []} + let g:ale_html_htmlhint_options = '-c ~/.htmlhintrc --format=unix' + let g:ale_fixers = {'javascript': ['eslint']} -"}}} -" #colorV {{{ -" original: -" https://github.com/gu-fan/colorv.vim -" Plug 'gu-fan/colorv.vim' -" custom fork: -" https://github.com/studio-vx/colorv.vim -Plug 'studio-vx/colorv.vim' + "}}} + " #coc.nvim{{{ + " https://github.com/neoclide/coc.nvim + " Plug 'neoclide/coc.nvim', {'tag': '*', 'do': { -> coc#util#install()}} + "}}} + " #colorV {{{ + " original: + " https://github.com/gu-fan/colorv.vim + " Plug 'gu-fan/colorv.vim' + " custom fork: + " https://github.com/studio-vx/colorv.vim + Plug 'studio-vx/colorv.vim' -let g:ColorVForceGuiColors = 1 + let g:ColorVForceGuiColors = 1 -let g:colorv_no_global_map = 1 -let g:colorv_win_pos = 'top' -let g:colorv_preview_area = 0 + let g:colorv_no_global_map = 1 + let g:colorv_win_pos = 'top' + let g:colorv_preview_area = 0 -nnoremap cv :ColorV -nnoremap ce :ColorVEdit -nnoremap cc :call ToggleColorPreview() -nnoremap ci :ColorVInsert -nnoremap cp :ColorVPicker + nnoremap cv :ColorV + nnoremap ce :ColorVEdit + nnoremap cc :call ToggleColorPreview() + nnoremap ci :ColorVInsert + nnoremap cp :ColorVPicker -let w:colorv_is_previewing = 0 -function! ToggleColorPreview() abort "{{{ - if !exists('w:colorv_is_previewing') - let w:colorv_is_previewing = 0 + let w:colorv_is_previewing = 0 + function! ToggleColorPreview() abort "{{{ + if !exists('w:colorv_is_previewing') + let w:colorv_is_previewing = 0 + endif + if w:colorv_is_previewing == 0 + execute 'ColorVPreview' + let w:colorv_is_previewing = 1 + else + execute 'ColorVClear' + let w:colorv_is_previewing = 0 + endif + endfunction "}}} + + + "}}} + " #css3-syntax{{{ + Plug 'hail2u/vim-css3-syntax' + + "}}} + " #Ctrlp {{{ + Plug 'ctrlpvim/ctrlp.vim' + " :h ctrlp-commands + " :h ctrlp-extensions + + let g:ctrlp_extensions = ['tag', 'buffertag', 'quickfix', 'undo'] + + if executable('ag') + " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore + let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' + " ag is fast enough that CtrlP doesn't need to cache + let g:ctrlp_use_caching = 0 endif - if w:colorv_is_previewing == 0 - execute 'ColorVPreview' - let w:colorv_is_previewing = 1 - else - execute 'ColorVClear' - let w:colorv_is_previewing = 0 + " Use ag over grep + if executable('ag') + set grepprg=ag\ --nogroup\ --nocolor\ --ignore\ node_modules endif -endfunction "}}} + "}}} + " #emmet-vim {{{ + " https://github.com/mattn/emmet-vim + Plug 'mattn/emmet-vim' + let g:user_emmet_leader_key=',,' + let g:user_emmet_settings = { + \ 'indentation': ' ', + \} -"}}} -" #css3-syntax{{{ -Plug 'hail2u/vim-css3-syntax' + "}}} + " #gitgutter {{{ + " https://github.com/airblade/vim-gitgutter/blob/master/README.mkd + Plug 'airblade/vim-gitgutter' -"}}} -" #Ctrlp {{{ -Plug 'ctrlpvim/ctrlp.vim' -" :h ctrlp-commands -" :h ctrlp-extensions + nmap ]h GitGutterNextHunk + nmap [h GitGutterPrevHunk + omap ih GitGutterTextObjectInnerPending + omap ah GitGutterTextObjectOuterPending + xmap ih GitGutterTextObjectInnerVisual + xmap ah GitGutterTextObjectOuterVisual -let g:ctrlp_extensions = ['tag', 'buffertag', 'quickfix', 'undo'] + "}}} + " #gitv{{{ + " https://github.com/gregsexton/gitv + Plug 'gregsexton/gitv' -if executable('ag') - " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore - let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' - " ag is fast enough that CtrlP doesn't need to cache - let g:ctrlp_use_caching = 0 -endif -" Use ag over grep -if executable('ag') - set grepprg=ag\ --nogroup\ --nocolor\ --ignore\ node_modules -endif + "}}} + "#html5{{{ + " https://github.com/othree/html5.vim + Plug 'othree/html5.vim' -"}}} -" #emmet-vim {{{ -" https://github.com/mattn/emmet-vim -Plug 'mattn/emmet-vim' -let g:user_emmet_leader_key=',,' -let g:user_emmet_settings = { -\ 'indentation': ' ', -\} + "}}} + "#i3config.vim{{{ + " https://github.com/mboughaba/i3config.vim + Plug 'mboughaba/i3config.vim' -"}}} -" #gitgutter {{{ -" https://github.com/airblade/vim-gitgutter/blob/master/README.mkd -Plug 'airblade/vim-gitgutter' + "}}} + " #inline_edit.vim {{{ + " https://github.com/AndrewRadev/inline_edit.vim + Plug 'AndrewRadev/inline_edit.vim' -nmap ]h GitGutterNextHunk -nmap [h GitGutterPrevHunk -omap ih GitGutterTextObjectInnerPending -omap ah GitGutterTextObjectOuterPending -xmap ih GitGutterTextObjectInnerVisual -xmap ah GitGutterTextObjectOuterVisual + let g:inline_edit_patterns = [{ + \ 'main_filetype': '*html', + \ 'sub_filetype': 'scss', + \ 'indent_adjustment': 1, + \ 'start': '[^>]*lang=.scss[^>]*>', + \ 'end': '' + \ }] -"}}} -" #gitv{{{ -" https://github.com/gregsexton/gitv -Plug 'gregsexton/gitv' + let g:inline_edit_autowrite = 1 + let g:inline_edit_proxy_type = 'tempfile' + let g:inline_edit_new_buffer_command ='tabedit' + let g:inline_edit_modify_statusline = 0 -"}}} -"#html5{{{ -" https://github.com/othree/html5.vim -Plug 'othree/html5.vim' + nnoremap ie :InlineEdit -"}}} -"#i3config.vim{{{ -" https://github.com/mboughaba/i3config.vim -Plug 'mboughaba/i3config.vim' + "}}} + " #MatchTagAlways{{{ + " https://github.com/Valloric/MatchTagAlways + Plug 'Valloric/MatchTagAlways' -"}}} -" #inline_edit.vim {{{ -" https://github.com/AndrewRadev/inline_edit.vim -Plug 'AndrewRadev/inline_edit.vim' + "}}} + " #Netrw {{{ -let g:inline_edit_patterns = [{ - \ 'main_filetype': '*html', - \ 'sub_filetype': 'scss', - \ 'indent_adjustment': 1, - \ 'start': '[^>]*lang=.scss[^>]*>', - \ 'end': '' - \ }] + let g:netrw_liststyle=3 + let g:netrw_list_hide='^\..*' + let g:netrw_preview = 0 -let g:inline_edit_autowrite = 1 -let g:inline_edit_proxy_type = 'tempfile' -let g:inline_edit_new_buffer_command ='tabedit' -let g:inline_edit_modify_statusline = 0 + "}}} + " #Obsession{{{ + Plug 'tpope/vim-obsession' -nnoremap ie :InlineEdit + "}}} + " #php.vim{{{ + " https://github.com/StanAngeloff/php.vim + Plug 'StanAngeloff/php.vim' -"}}} -" #MatchTagAlways{{{ -" https://github.com/Valloric/MatchTagAlways -Plug 'Valloric/MatchTagAlways' + "}}} + " #phpcomplete.vim{{{ + " https://github.com/shawncplus/phpcomplete.vim + Plug 'shawncplus/phpcomplete.vim' + " https://github.com/dsawardekar/wordpress.vim + " For up to date Wordpress Files see: + " https://github.com/joseluis/wordpress.vim-generator -"}}} -" #Netrw {{{ + "}}} + " #quickscope{{{ + " https://github.com/unblevable/quick-scope + Plug 'unblevable/quick-scope' + let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] + "}}} + " #scss-syntax{{{ + Plug 'cakebaker/scss-syntax.vim' -let g:netrw_liststyle=3 -let g:netrw_list_hide='^\..*' -let g:netrw_preview = 0 + "}}} + " #switch {{{ + "https://github.com/AndrewRadev/switch.vim + Plug 'AndrewRadev/switch.vim' -"}}} -" #Obsession{{{ -Plug 'tpope/vim-obsession' + let g:switch_mapping = '-' + let g:switch_custom_definitions = [ + \ ['0', '1'], + \ ['ease-in', 'ease-out', 'ease-in-out', 'linear'], + \ ['auto', 'none'], + \ ['left', 'right'], + \ ['top', 'bottom'], + \ ['row', 'column'], + \ ['relative', 'absolute', 'fixed'] + \ ] -"}}} -" #php.vim{{{ -" https://github.com/StanAngeloff/php.vim -Plug 'StanAngeloff/php.vim' + "}}} + " #tagbar {{{ + Plug 'majutsushi/tagbar' -"}}} -" #phpcomplete.vim{{{ -" https://github.com/shawncplus/phpcomplete.vim -Plug 'shawncplus/phpcomplete.vim' -" https://github.com/dsawardekar/wordpress.vim -" For up to date Wordpress Files see: -" https://github.com/joseluis/wordpress.vim-generator + nnoremap tb :TagbarOpen fj + nnoremap ] :tag /[.#@]=expand('') + let g:tagbar_autoclose = 1 + " let g:tagbar_autopreview = 1 + " let g:tagbar_previewwin_pos = '' -"}}} -" #quickscope{{{ -" https://github.com/unblevable/quick-scope -Plug 'unblevable/quick-scope' -let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] -"}}} -" #scss-syntax{{{ -Plug 'cakebaker/scss-syntax.vim' + let g:tagbar_type_css = { + \ 'ctagstype' : 'css', + \ 'kinds' : [ + \ 'c:classes', + \ 'i:ids', + \ 't:tags', + \ 'm:medias' + \ ] + \} -"}}} -" #switch {{{ -"https://github.com/AndrewRadev/switch.vim -Plug 'AndrewRadev/switch.vim' + let g:tagbar_type_scss = { + \ 'ctagstype' : 'scss', + \ 'kinds' : [ + \ 'v:variables', + \ 'c:classes', + \ 'i:ids', + \ 't:tags', + \ 'd:medias', + \ 'm:mixins', + \ 'f:functions' + \ ] + \} -let g:switch_mapping = '-' -let g:switch_custom_definitions = [ - \ ['0', '1'], - \ ['ease-in', 'ease-out', 'ease-in-out', 'linear'], - \ ['auto', 'none'], - \ ['left', 'right'], - \ ['top', 'bottom'], - \ ['row', 'column'], - \ ['relative', 'absolute', 'fixed'] -\ ] + let g:tagbar_type_vue = { + \ 'ctagstype' : 'vue', + \ 'kinds' : [ + \ 'o:objects', + \ 'f:functions', + \ 'a:array', + \ 's:string', + \ 'b:boolean', + \ 'n:number', + \ 'v:variable' + \ ] + \ } -"}}} -" #tagbar {{{ -Plug 'majutsushi/tagbar' + "}}} + " #ultisnips {{{ + " https://github.com/sirver/UltiSnips + Plug 'SirVer/ultisnips' + " and some snippets + " https://github.com/honza/vim-snippets + " Plug 'honza/vim-snippets' -nnoremap tb :TagbarOpen fj -nnoremap ] :tag /[.#@]=expand('') -let g:tagbar_autoclose = 1 -" let g:tagbar_autopreview = 1 -" let g:tagbar_previewwin_pos = '' + nnoremap ul :call ListUltisnips() + inoremap jkul :call ListUltisnips() -let g:tagbar_type_css = { -\ 'ctagstype' : 'css', -\ 'kinds' : [ -\ 'c:classes', -\ 'i:ids', -\ 't:tags', -\ 'm:medias' -\ ] -\} + let g:UltiSnipsSnippetsDir='~/.vim/UltiSnips' + " Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. + let g:UltiSnipsExpandTrigger='' + let g:UltiSnipsJumpForwardTrigger='' + let g:UltiSnipsJumpBackwardTrigger='' + let g:UltiSnipsEditSplit='horizontal' -let g:tagbar_type_scss = { -\ 'ctagstype' : 'scss', -\ 'kinds' : [ -\ 'v:variables', -\ 'c:classes', -\ 'i:ids', -\ 't:tags', -\ 'd:medias', -\ 'm:mixins', -\ 'f:functions' -\ ] -\} - -let g:tagbar_type_vue = { -\ 'ctagstype' : 'vue', -\ 'kinds' : [ -\ 'o:objects', -\ 'f:functions', -\ 'a:array', -\ 's:string', -\ 'b:boolean', -\ 'n:number', -\ 'v:variable' -\ ] -\ } - -"}}} -" #ultisnips {{{ -" https://github.com/sirver/UltiSnips -Plug 'SirVer/ultisnips' -" and some snippets -" https://github.com/honza/vim-snippets -" Plug 'honza/vim-snippets' - -nnoremap ul :call ListUltisnips() -inoremap jkul :call ListUltisnips() - -let g:UltiSnipsSnippetsDir='~/.vim/UltiSnips' -" Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. -let g:UltiSnipsExpandTrigger='' -let g:UltiSnipsJumpForwardTrigger='' -let g:UltiSnipsJumpBackwardTrigger='' -let g:UltiSnipsEditSplit='horizontal' - -function! ListUltisnips() abort"{{{ - let l:snips = UltiSnips#SnippetsInCurrentScope(1) - let l:keylist = sort(keys(l:snips)) - echo ' --------------------------------------------------' - for l:key in l:keylist - echo printf(" %-10s\t%s", l:key, l:snips[l:key]) - endfor - echo '---------------------------------------------------' -endfunction - -"}}} -function! CompleteSnippets(findstart, base)"{{{ - if a:findstart - let l:line = getline('.') - let l:start = col('.') - 1 - while l:start > 0 && l:line[l:start - 1] =~ '\a' - let l:start -= 1 - endwhile - return l:start - else - let l:res = [] + function! ListUltisnips() abort"{{{ let l:snips = UltiSnips#SnippetsInCurrentScope(1) let l:keylist = sort(keys(l:snips)) + echo ' --------------------------------------------------' for l:key in l:keylist - if l:key =~ '^' . a:base - let l:item = {'word': l:key, 'menu': l:snips[l:key]} - call add(l:res, l:item) - endif + echo printf(" %-10s\t%s", l:key, l:snips[l:key]) endfor - return l:res - endif -endfunction + echo '---------------------------------------------------' + endfunction -"}}} + "}}} + function! CompleteSnippets(findstart, base)"{{{ + if a:findstart + let l:line = getline('.') + let l:start = col('.') - 1 + while l:start > 0 && l:line[l:start - 1] =~ '\a' + let l:start -= 1 + endwhile + return l:start + else + let l:res = [] + let l:snips = UltiSnips#SnippetsInCurrentScope(1) + let l:keylist = sort(keys(l:snips)) + for l:key in l:keylist + if l:key =~ '^' . a:base + let l:item = {'word': l:key, 'menu': l:snips[l:key]} + call add(l:res, l:item) + endif + endfor + return l:res + endif + endfunction -set completefunc=CompleteSnippets + "}}} -"}}} -" #undotree {{{ -Plug 'mbbill/undotree' -nnoremap ut :UndotreeToggle + set completefunc=CompleteSnippets -"}}} -" #vim-commentary{{{ -" https://github.com/tpope/vim-commentary -Plug 'tpope/vim-commentary' + "}}} + " #undotree {{{ + Plug 'mbbill/undotree' + nnoremap ut :UndotreeToggle -"}}} -" #vim-dispatch{{{ -" https://github.com/tpope/vim-dispatch -Plug 'tpope/vim-dispatch' + "}}} + " #vim-commentary{{{ + " https://github.com/tpope/vim-commentary + Plug 'tpope/vim-commentary' -"}}} -" #vim-easy-align {{{ -" https://github.com/junegunn/vim-easy-align -Plug 'junegunn/vim-easy-align' + "}}} + " #vim-dispatch{{{ + " https://github.com/tpope/vim-dispatch + Plug 'tpope/vim-dispatch' -xmap ga (EasyAlign) -nmap ga (EasyAlign) + "}}} + " #vim-easy-align {{{ + " https://github.com/junegunn/vim-easy-align + Plug 'junegunn/vim-easy-align' -"}}} -" #vim-gutentags {{{ -" https://github.com/ludovicchabant/vim-gutentags -Plug 'ludovicchabant/vim-gutentags' + xmap ga (EasyAlign) + nmap ga (EasyAlign) -let g:gutentags_ctags_tagfile = '.tags' -let g:gutentags_ctags_exclude = ['package.json', 'Session.vim', 'package-lock.json', 'TODO.txt'] + "}}} + " #vim-gutentags {{{ + " https://github.com/ludovicchabant/vim-gutentags + Plug 'ludovicchabant/vim-gutentags' -"}}} -"#vim-json{{{ -" https://github.com/elzr/vim-json -Plug 'elzr/vim-json' + let g:gutentags_ctags_tagfile = '.tags' + let g:gutentags_ctags_exclude = ['package.json', 'Session.vim', 'package-lock.json', 'TODO.txt'] -"}}} -" #vim-lsp {{{ -" https://github.com/prabirshrestha/vim-lsp -Plug 'prabirshrestha/async.vim' -Plug 'prabirshrestha/vim-lsp' + "}}} + "#vim-json{{{ + " https://github.com/elzr/vim-json + Plug 'elzr/vim-json' -let g:lsp_signs_enabled = 1 -let g:lsp_signs_error = {'text': '>>'} -let g:lsp_signs_warning = {'text': '>'} -let g:lsp_signs_information = {'text': '--'} -let g:lsp_signs_hint = {'text': '--'} -let g:lsp_diagnostics_echo_cursor = 1 -let g:lsp_diagnostics_echo_delay = 0 -nnoremap \l :cclose:LspDocumentDiagnostics -nnoremap \h :LspHover -nnoremap \d :LspDefinition -nnoremap \r :LspReferences -nnoremap \n :LspRename -nnoremap \s :LspDocumentSymbol -nnoremap \w :LspWorkspaceSymbol -nnoremap \ff :LspDocumentFormat -nnoremap \fr :LspDocumentRangeFormat -augroup User lsp_setup - autocmd! - if executable('vls') - autocmd User lsp_setup call lsp#register_server({ - \ 'name': 'vue', - \ 'cmd': {server_info->['vls']}, - \ 'whitelist': ['vue'], - \ }) - endif + "}}} + " #vim-lsp {{{ + " https://github.com/prabirshrestha/vim-lsp + Plug 'prabirshrestha/async.vim' + Plug 'prabirshrestha/vim-lsp' - if executable('pyls') - autocmd User lsp_setup call lsp#register_server({ - \ 'name': 'pyls', - \ 'cmd': {server_info->['pyls']}, - \ 'whitelist': ['python'], - \ }) - endif + let g:lsp_signs_enabled = 1 + let g:lsp_signs_error = {'text': '>>'} + let g:lsp_signs_warning = {'text': '>'} + let g:lsp_signs_information = {'text': '--'} + let g:lsp_signs_hint = {'text': '--'} + let g:lsp_diagnostics_echo_cursor = 1 + let g:lsp_diagnostics_echo_delay = 0 + nnoremap \l :cclose:LspDocumentDiagnostics + nnoremap \h :LspHover + nnoremap \d :LspDefinition + nnoremap \r :LspReferences + nnoremap \n :LspRename + nnoremap \s :LspDocumentSymbol + nnoremap \w :LspWorkspaceSymbol + nnoremap \ff :LspDocumentFormat + nnoremap \fr :LspDocumentRangeFormat + augroup User lsp_setup + autocmd! + if executable('vls') "{{{ + autocmd User lsp_setup call lsp#register_server({ + \ 'name': 'vue', + \ 'cmd': {server_info->['vls']}, + \ 'whitelist': ['vue'], + \ }) + endif + "}}} + if executable('pyls') "{{{ + autocmd User lsp_setup call lsp#register_server({ + \ 'name': 'pyls', + \ 'cmd': {server_info->['pyls']}, + \ 'whitelist': ['python'], + \ }) + endif + "}}} + if executable('typescript-language-server') "{{{ + au User lsp_setup call lsp#register_server({ + \ 'name': 'typescript-language-server', + \ 'cmd': { server_info->[&shell, &shellcmdflag, 'typescript-language-server --stdio']}, + \ 'root_uri': { server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_directory(lsp#utils#get_buffer_path(), '.git/..'))}, + \ 'whitelist': ['typescript', 'javascript', 'javascript.jsx'] + \ }) + endif + "}}} + augroup END - if executable('typescript-language-server') - au User lsp_setup call lsp#register_server({ - \ 'name': 'typescript-language-server', - \ 'cmd': { server_info->[&shell, &shellcmdflag, 'typescript-language-server --stdio']}, - \ 'root_uri': { server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_directory(lsp#utils#get_buffer_path(), '.git/..'))}, - \ 'whitelist': ['typescript', 'javascript', 'javascript.jsx'] - \ }) - endif -augroup END + ""}}} + " #vim-repeat{{{ + " https://github.com/tpope/vim-repeat + Plug 'tpope/vim-repeat' -"}}} -" #vim-repeat{{{ -" https://github.com/tpope/vim-repeat -Plug 'tpope/vim-repeat' + "}}} + "#vim-rsi{{{ + "https://github.com/tpope/vim-rsi + Plug 'tpope/vim-rsi' -"}}} -"#vim-rsi{{{ -"https://github.com/tpope/vim-rsi -Plug 'tpope/vim-rsi' + "}}} + " #vim-surround{{{ + Plug 'tpope/vim-surround' -"}}} -" #vim-surround{{{ -Plug 'tpope/vim-surround' + "}}} + " #vim-vue {{{ + " https://github.com/posva/vim-vue + Plug 'posva/vim-vue' -"}}} -" #vim-vue {{{ -" https://github.com/posva/vim-vue -Plug 'posva/vim-vue' + " disable preprocessor checking for vue files - increases speed + let g:vue_disable_pre_processors=0 + " set custom syntax highlighting + augroup fixhighlighting + autocmd! + autocmd BufNewFile,BufRead *.vue syntax sync fromstart + augroup END -" disable preprocessor checking for vue files - increases speed -let g:vue_disable_pre_processors=0 -" set custom syntax highlighting -augroup fixhighlighting - autocmd! - autocmd BufNewFile,BufRead *.vue syntax sync fromstart -augroup END + " #vim-yaml + " https://github.com/stephpy/vim-yaml + Plug 'stephpy/vim-yaml' - " #vim-yaml - " https://github.com/stephpy/vim-yaml - Plug 'stephpy/vim-yaml' - - " #python-syntax - " https://github.com/vim-python/python-syntax - Plug 'vim-python/python-syntax' - let g:python_highlight_all = 1 + " #python-syntax + " https://github.com/vim-python/python-syntax + Plug 'vim-python/python-syntax' + let g:python_highlight_all = 1 -"}}} -" #vim-javascript{{{ -Plug 'pangloss/vim-javascript' + "}}} + " #vim-javascript{{{ + Plug 'pangloss/vim-javascript' -"}}} -" #vimwiki {{{ -" https://github.com/vimwiki/vimwiki -Plug 'vimwiki/vimwiki' -let g:vimwiki_list = [{'path': '~/vimwiki/', 'path_html': '~/vimwiki_html/'}] + "}}} + " #vimwiki {{{ + " https://github.com/vimwiki/vimwiki + Plug 'vimwiki/vimwiki' + let g:vimwiki_list = [{'path': '~/vimwiki/', 'path_html': '~/vimwiki_html/'}] -"}}} -" #wordpress.vim{{{ -" doesn't support universal ctags -" #Plug 'dsawardekar/wordpress.vim' -" This fork does: -" https://github.com/DArcMattr/wordpress.vim/tree/universal-ctags -" Using studio-vx fork -Plug 'studio-vx/wordpress.vim', { 'branch': 'universal-ctags' } + "}}} + " #wordpress.vim{{{ + " doesn't support universal ctags + " #Plug 'dsawardekar/wordpress.vim' + " This fork does: + " https://github.com/DArcMattr/wordpress.vim/tree/universal-ctags + " Using studio-vx fork + Plug 'studio-vx/wordpress.vim', { 'branch': 'universal-ctags' } -"}}} -" #fugitive-vim{{{ -" https://github.com/tpope/vim-fugitive/blob/master/README.markdown -Plug 'tpope/vim-fugitive' + "}}} + " #fugitive-vim{{{ + " https://github.com/tpope/vim-fugitive/blob/master/README.markdown + Plug 'tpope/vim-fugitive' -"}}} -" #vim-git{{{ -" https://github.com/tpope/vim-git -Plug 'tpope/vim-git' + "}}} + " #vim-git{{{ + " https://github.com/tpope/vim-git + Plug 'tpope/vim-git' -"}}} -" #wakatime{{{ -" https://wakatime.com/vim -Plug 'wakatime/vim-wakatime' + "}}} + " #wakatime{{{ + " https://wakatime.com/vim + Plug 'wakatime/vim-wakatime' -"}}} -call plug#end() + "}}} + call plug#end() +endif runtime macros/matchit.vim @@ -1502,8 +1509,12 @@ if exists('+showtabline') let l:customtabline .= '%T%#TabLineFill#%=' let l:customtabline .= '%#TabLineItem# %{getcwd()}% ' - let l:customtabline .= '%#TabLineItem# %{fugitive#statusline()}% ' - let l:customtabline .= "%#TabLineItemSel# %{ObsessionStatus(fnamemodify(v:this_session,':t'),'---')} %*" + if exists("*fugitive#statusline") + let l:customtabline .= '%#TabLineItem# %{fugitive#statusline()}% ' + endif + if exists("*ObsessionStatus") + let l:customtabline .= "%#TabLineItemSel# %{ObsessionStatus(fnamemodify(v:this_session,':t'),'---')} %*" + endif return l:customtabline