update myspacevim

Author: mrbeardad

autoload/SpaceVim/api/vim/statusline.vim

@@ -16,8 +16,7 @@ let s:self.__buffer = SpaceVim#api#import('vim#buffer')
 let s:self.__cmp = SpaceVim#api#import('vim#compatible')
 
 function! s:self.check_width(len, sec, winwidth) abort
-  " CUSTOM: Always show the cursor position in statusline
-  return a:sec =~# '%l/%L' ? 1 : a:len + self.len(a:sec) < a:winwidth
+  return a:len + self.len(a:sec) < a:winwidth
 endfunction
 
 let s:self.__winid = -1

autoload/SpaceVim/layers/autocomplete.vim

@@ -58,7 +58,11 @@ function! SpaceVim#layers#autocomplete#plugins() abort
           \ 'loadconf' : 1,
           \ 'on_cmd' : 'NeoSnippetEdit'}])
   elseif g:spacevim_snippet_engine ==# 'ultisnips'
-    call add(plugins, ['SirVer/ultisnips',{ 'on_ft': ['snippets'], 'on_func': 'UltiSnips#ExpandSnippetOrJump', 'loadconf_before' : 1,
+    call add(plugins, ['SirVer/ultisnips',{
+          \ 'on_ft': ['snippets'],
+          \ 'on_func': 'UltiSnips#ExpandSnippetOrJump',
+          \ 'on_cmd': 'UltiSnipsEdit',
+          \ 'loadconf_before' : 1,
           \ 'merged' : 0}])
   endif
   if g:spacevim_autocomplete_method ==# 'ycm'

autoload/SpaceVim/layers/chinese.vim

@@ -20,7 +20,6 @@ function! SpaceVim#layers#chinese#plugins() abort
 endfunction
 
 function! SpaceVim#layers#chinese#config() abort
-  let g:translator_default_engines = ['bing', 'youdao']
   let g:_spacevim_mappings.t = {'name' : '+Translate/TableMode'}
   call SpaceVim#mapping#def('nnoremap', '<Leader>tc', ':Translate<cr>', '', '', 'Translate in cmdline')
   call SpaceVim#mapping#def('vnoremap', '<Leader>tc', ':Translate<cr>', '', '', 'Translate in cmdline')

autoload/SpaceVim/layers/core.vim

@@ -279,8 +279,7 @@ function! SpaceVim#layers#core#config() abort
   let g:_spacevim_mappings_space.p.t = {'name' : '+Tasks'}
   call SpaceVim#mapping#space#def('nnoremap', ['p', 'e'], 'call SpaceVim#plugins#tasks#edit()', 'edit-project-task', 1)
   call SpaceVim#mapping#space#def('nnoremap', ['p', 'l'], 'call SpaceVim#plugins#tasks#list()', 'list-tasks', 1)
-  call SpaceVim#mapping#space#def('nnoremap', ['p', 'r'],
-        \ 'call SpaceVim#plugins#runner#run_task(SpaceVim#plugins#tasks#get())', 'pick-task-to-run', 1)
+  call SpaceVim#mapping#space#def('nnoremap', ['p', 'r'], 'call SpaceVim#plugins#runner#run_task(SpaceVim#plugins#tasks#get())', 'pick-task-to-run', 1)
   call SpaceVim#mapping#space#def('nnoremap', ['p', 't', 'e'], 'call SpaceVim#plugins#tasks#edit()', 'edit-project-task', 1)
   call SpaceVim#mapping#space#def('nnoremap', ['p', 't', 'l'], 'call SpaceVim#plugins#tasks#list()', 'list-tasks', 1)
   call SpaceVim#mapping#space#def('nnoremap', ['p', 't', 'c'], 'call SpaceVim#plugins#runner#clear_tasks()', 'clear-tasks', 1)

autoload/SpaceVim/layers/core/statusline.vim

@@ -19,9 +19,9 @@
 
 scriptencoding utf-8
 
-" if exists('g:_spacevim_statusline_loaded')
-  " finish
-" endif
+if exists('g:_spacevim_statusline_loaded')
+  finish
+endif
 
 let g:_spacevim_statusline_loaded = 1
 

autoload/SpaceVim/layers/edit.vim

@@ -37,10 +37,10 @@ function! SpaceVim#layers#edit#plugins() abort
         \ [g:_spacevim_root_dir . 'bundle/vim-better-whitespace',  { 'on_cmd' : ['StripWhitespace', 'ToggleWhitespace', 'DisableWhitespace', 'EnableWhitespace']}],
         \ ['andrewradev/splitjoin.vim',{ 'on_cmd':['SplitjoinJoin', 'SplitjoinSplit'],'merged' : 0, 'loadconf' : 1}],
         \ ]
-  if executable('fcitx5')
-    call add(plugins,['520Matches/fcitx5.vim',        { 'on_event' : 'InsertEnter'}])
-  elseif executable('fcitx')
+  if executable('fcitx')
     call add(plugins,[g:_spacevim_root_dir . 'bundle/fcitx.vim',        { 'on_event' : 'InsertEnter'}])
+  elseif executable('fcitx5')
+    call add(plugins,['520Matches/fcitx5.vim',        { 'on_event' : 'InsertEnter'}])
   endif
   if g:spacevim_enable_bepo_layout
     call add(plugins,[g:_spacevim_root_dir . 'bundle/vim-bepo',        { 'merged' : 0}])

autoload/SpaceVim/layers/lang/c.vim

@@ -149,7 +149,6 @@ function! SpaceVim#layers#lang#c#plugins() abort
     endif
   else
     call add(plugins, [g:_spacevim_root_dir . 'bundle/vim-cpp-modern', { 'merged' : 0}])
-    call add(plugins, ['t6tn4k/vim-c-posix-syntax', { 'merged' : 0}])
   endif
   return plugins
 endfunction

autoload/SpaceVim/layers/lang/markdown.vim

@@ -46,7 +46,7 @@ endfunction
 
 function! SpaceVim#layers#lang#markdown#plugins() abort
   let plugins = []
-  call add(plugins, ['plasticboy/vim-markdown',{ 'on_ft' : 'markdown'}]) "comment line 872 in ftplugin/markdown.vim
+  call add(plugins, ['plasticboy/vim-markdown',{ 'on_ft' : 'markdown'}])
   call add(plugins, ['mzlogin/vim-markdown-toc',{ 'on_ft' : 'markdown'}])
   call add(plugins, ['iamcco/mathjax-support-for-mkdp',{ 'on_ft' : 'markdown'}])
   call add(plugins, ['lvht/tagbar-markdown',{'merged' : 0}])

autoload/myspacevim.vim

@@ -23,7 +23,7 @@ function! s:file_icons()
 endfunction
 
 
-function! s:runner_before()
+function! s:code_runner()
   if g:spacevim_terminal_runner
     let g:quickrun_default_flags = {
         \ 'cpp': {
@@ -135,11 +135,11 @@ function! s:autocomplete_before()
           \ ]
     augroup MySpaceVimAutocomplete
       for ft in keys(g:ycm_semantic_triggers)
-        exe 'autocmd FileType '.ft.' nnoremap <silent> gd :YcmCompleter GoTo<CR>'
-        exe 'autocmd FileType '.ft.' nnoremap <silent> gr :YcmCompleter GoToReferences<CR>'
-        exe 'autocmd FileType '.ft.' nnoremap <silent> gD :YcmCompleter GetDoc<CR>'
-        exe 'autocmd FileType '.ft." nnoremap <silent> gR :exe 'YcmCompleter RefactorRename '.input('refactor \"'.expand('<cword>').'\" to:')<cr>"
-        exe 'autocmd FileType '.ft.' nnoremap <silent> gt :YcmCompleter GetType<CR>'
+        exe 'autocmd FileType '.ft.' nnoremap <silent><buffer> gd :YcmCompleter GoTo<CR>'
+        exe 'autocmd FileType '.ft.' nnoremap <silent><buffer> gr :YcmCompleter GoToReferences<CR>'
+        exe 'autocmd FileType '.ft.' nnoremap <silent><buffer> gD :YcmCompleter GetDoc<CR>'
+        exe 'autocmd FileType '.ft." nnoremap <silent><buffer> gR :exe 'YcmCompleter RefactorRename '.input('refactor \"'.expand('<cword>').'\" to:')<cr>"
+        exe 'autocmd FileType '.ft.' nnoremap <silent><buffer> gt :YcmCompleter GetType<CR>'
       endfor
     augroup END
   endif
@@ -205,7 +205,7 @@ function! s:checker_after()
     call SpaceVim#mapping#space#def('nnoremap', ['e', 'd'], 'call myspacevim#show_detailed_diagnostic()', 'Detail error information', 1)
   endif
 endfunction
-
+" called by checker
 function! myspacevim#show_detailed_diagnostic() abort
   let bufnr = bufnr('YcmShowDetailedDiagnostic')
   let winid = bufwinid(bufnr)
@@ -274,32 +274,32 @@ endfunction
 
 
 function! s:lang_c_after()
-  function! s:set_lang_cpp_std()
-    let file = findfile('.ycm_extra_conf.py', '.;'.$HOME)
-    if file !=# ''
-      exe 'py3file '. file
-      for thisFlag in py3eval('Settings()').flags
-        if thisFlag =~# '-std='
-          let b:lang_cpp_std = thisFlag
-        endif
-      endfor
-    endif
-    if get(b:, 'lang_cpp_std', '') ==# ''
-      let b:lang_cpp_std = '-std=c++20'
-    endif
-
-    let g:ale_cpp_cc_options = b:lang_cpp_std . ' -O2 -I. -fsyntax-only -fcoroutines -Wall -Wextra -Wshadow -Wfloat-equal -Wsign-conversion -Wlogical-op -Wnon-virtual-dtor -Woverloaded-virtual -Wduplicated-cond -Wduplicated-branches -Wnull-dereference -Wuseless-cast -Wdouble-promotion '
-    let g:ale_cpp_cppcheck_options = '--enable=warning,style,performance,portability -'.b:lang_cpp_std
-    let g:ale_cpp_clangtidy_options = ' -I. ' . b:lang_cpp_std
-
-    let b:QuickrunCompileCmd = substitute(b:QuickrunCompileCmd, '^\(\S*\)', '\1 '.b:lang_cpp_std, '')
-  endfunction
-
-
   augroup MySpaceVimLangC
     autocmd FileType cpp call s:set_lang_cpp_std()
   augroup END
 endfunction
+" called by lang_c
+function! s:set_lang_cpp_std()
+  let file = findfile('.ycm_extra_conf.py', '.;'.$HOME)
+  if file !=# ''
+    exe 'py3file '. file
+    for thisFlag in py3eval('Settings()').flags
+      if thisFlag =~# '-std='
+        let b:lang_cpp_std = thisFlag
+      endif
+    endfor
+  endif
+  if get(b:, 'lang_cpp_std', '') ==# ''
+    let b:lang_cpp_std = '-std=c++20'
+  endif
+
+  let g:ale_cpp_cc_options = b:lang_cpp_std . ' -O2 -I. -fsyntax-only -fcoroutines -Wall -Wextra -Wshadow -Wfloat-equal -Wsign-conversion -Wlogical-op -Wnon-virtual-dtor -Woverloaded-virtual -Wduplicated-cond -Wduplicated-branches -Wnull-dereference -Wuseless-cast -Wdouble-promotion '
+  let g:ale_cpp_cppcheck_options = '--enable=warning,style,performance,portability -'.b:lang_cpp_std
+  let g:ale_cpp_clangtidy_options = ' -I. ' . b:lang_cpp_std
+
+  let b:QuickrunCompileCmd = substitute(b:QuickrunCompileCmd, '^\(\S*\)', '\1 '.b:lang_cpp_std, '')
+endfunction
+
 
 function! s:core_after()
   let g:matchup_matchparen_stopline = 45
@@ -312,11 +312,13 @@ function! s:core_after()
   nnoremap <silent><c-w>X :call SpaceVim#mapping#clear_saved_buffers()<cr>
 endfunction
 
+
 function! s:edit_before()
   let g:table_mode_auto_align = 0
   " let g:table_mode_disable_mappings = 1
 endfunction
 
+
 function! s:edit_after()
   let g:splitjoin_split_mapping = ''
   let g:splitjoin_join_mapping = ''
@@ -348,13 +350,15 @@ function! s:edit_after()
   call SpaceVim#mapping#space#def('vmap', ['x', 'c'], '<Plug>CountSelectionRegion', 'count in the selection region', 0, 1)
 endfunction
 
+
 function! s:lang_markdown_before()
   let g:vim_markdown_no_default_key_mappings = 1
   nmap [[ <Plug>Markdown_MoveToPreviousHeader
   nmap ]] <Plug>Markdown_MoveToNextHeader
   nmap [] <Plug>Markdown_MoveToCurHeader
 endfunction
 
+
 function! s:lang_markdown_after()
   let g:vim_markdown_folding_style_pythonic = 1
   let g:vim_markdown_emphasis_multiline = 0
@@ -381,6 +385,7 @@ function! s:lang_markdown_after()
   augroup END
 endfunction
 
+
 function! s:leaderf_before()
   let g:Lf_GtagsAutoGenerate = 1
   let g:Lf_GtagsAutoUpdate = 1
@@ -395,6 +400,7 @@ function! s:leaderf_before()
   let g:Lf_UseCache = 0
 endfunction
 
+
 function! s:tools_before()
   let g:rainbow_active = 1
   let g:rainbow_conf = {
@@ -430,21 +436,14 @@ function! s:tools_before()
   \}
 endfunction
 
+
 function! s:ui_after()
   let g:indentLine_char =  '¦'
   let g:indentLine_fileTypeExclude = ['help', 'man', 'startify', 'vimfiler', 'defx']
   nnoremap <silent> <F1> :TagbarToggle<CR>
   nnoremap <silent> <F3> :Defx -direction=botright -no-focus -show-ignored-files<cr>
 endfunction
 
-function! s:close_window(range)
-  if a:range ==# ''
-    quit
-  else
-    exe substitute(a:range, '.*\(\d\)', '\1', 'g')+1.'close'
-  endif
-  let &l:statusline = SpaceVim#layers#core#statusline#get(1)
-endfunction
 
 function! s:colorscheme_before()
   let g:neosolarized_italic = 1
@@ -455,6 +454,7 @@ function! s:colorscheme_before()
   let g:palenight_terminal_italics = 1
 endfunction
 
+
 function! s:set_neovim_after() abort
   set nofoldenable
   set showcmd
@@ -610,12 +610,23 @@ function! s:set_neovim_after() abort
   let g:_spacevim_mappings_z['<Down>'] = ['normal 3<c-e>', 'scroll down one line']
   nnoremap z<down> 3<c-y>
 endfunction
+" called by set_neovim
+function! s:close_window(range)
+  if a:range ==# ''
+    quit
+  else
+    exe substitute(a:range, '.*\(\d\)', '\1', 'g')+1.'close'
+  endif
+  let &l:statusline = SpaceVim#layers#core#statusline#get(1)
+endfunction
+
 
 function! s:set_neovim_before() abort
   set list  " 放在before防止覆盖Startify设置
   " set listchars=tab:▸\ ,eol:↵,trail:·,extends:↷,precedes:↶
 endfunction
 
+
 function! s:incsearch_after()
   let g:incsearch#auto_nohlsearch = 0
   function! s:config_easyfuzzymotion(...) abort
@@ -631,12 +642,14 @@ function! s:incsearch_after()
   nmap z/ <Plug>(incsearch-fuzzyword-/)
 endfunction
 
+
 function! s:git_after()
   let g:gitgutter_enabled = 0
   call SpaceVim#mapping#space#def('nnoremap', ['g', 'm'], 'Git branch', 'branch-manager', 1)
   call SpaceVim#mapping#space#def('nnoremap', ['g', 'g'], 'GitGutterToggle', 'GitGutter Buffer Toggle', 1)
 endfunction
 
+
 function! s:colorscheme_after()
   if $WSL_DISTRO_NAME !=# ''
     hi! SpellBad gui=underline guisp=Red
@@ -649,6 +662,7 @@ function! s:colorscheme_after()
   endif
 endfunction
 
+
 function! s:custom_plugins_before()
   "=============== vim-header ================="
   let g:header_field_author = 'Heachen Bear'
@@ -701,11 +715,13 @@ function! s:custom_plugins_before()
   nmap <Space>di <Plug>VimspectorBalloonEval
 endfunction
 
+
 function! s:custom_plugins_after()
   "=============== vim-header =================
   call SpaceVim#mapping#space#def('nnoremap', ['f', 'h'], 'AddHeader', 'add file header', 1)
 endfunction
 
+
 function! s:spacevim_after()
   augroup MySpaceVim
     autocmd FileType SpaceVimFlyGrep map <buffer> <c-c> <esc>
@@ -717,11 +733,17 @@ function! s:spacevim_after()
   augroup END
 endfunction
 
+
+function! s:lang_chinese_before()
+  let g:translator_default_engines = ['bing', 'youdao']
+endfunction
+
+
 " ===================================================================================================
 function! myspacevim#before() abort
   call s:set_neovim_before()
   call s:file_icons()
-  call s:runner_before()
+  call s:code_runner()
   call s:autocomplete_before()
   call s:checker_before()
   call s:edit_before()
@@ -731,6 +753,7 @@ function! myspacevim#before() abort
   call s:tools_before()
   call s:colorscheme_before()
   call s:custom_plugins_before()
+  call s:lang_chinese_before()
 endfunction
 " ===================================================================================================