From c6195cd0e4bad1582c8a5ac6409145c10db90422 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Wed, 28 Jun 2023 08:52:18 +0800 Subject: [PATCH] fix(tagbar): fix tagbar startup close https://github.com/SpaceVim/SpaceVim/issues/4872 --- autoload/SpaceVim/layers/core/statusline.vim | 84 ++++++++++---------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/autoload/SpaceVim/layers/core/statusline.vim b/autoload/SpaceVim/layers/core/statusline.vim index 38402751b..adca33525 100644 --- a/autoload/SpaceVim/layers/core/statusline.vim +++ b/autoload/SpaceVim/layers/core/statusline.vim @@ -71,46 +71,46 @@ let [s:ilsep , s:irsep] = ['', ''] let s:loaded_modes = [] let s:modes = { \ 'center-cursor': { - \ 'icon' : '⊝', - \ 'icon_asc' : '-', - \ 'desc' : 'centered-cursor mode', - \ }, - \ 'hi-characters-for-long-lines' :{ - \ 'icon' : '⑧', - \ 'icon_asc' : '8', - \ 'desc' : 'toggle highlight of characters for long lines', - \ }, - \ 'fill-column-indicator' :{ - \ 'icon' : s:MESSLETTERS.circled_letter('f'), - \ 'icon_asc' : 'f', - \ 'desc' : 'fill-column-indicator mode', - \ }, - \ 'syntax-checking' :{ - \ 'icon' : s:MESSLETTERS.circled_letter('s'), - \ 'icon_asc' : 's', - \ 'desc' : 'syntax-checking mode', - \ }, - \ 'spell-checking' :{ - \ 'icon' : s:MESSLETTERS.circled_letter('S'), - \ 'icon_asc' : 'S', - \ 'desc' : 'spell-checking mode', - \ }, - \ 'paste-mode' :{ - \ 'icon' : s:MESSLETTERS.circled_letter('p'), - \ 'icon_asc' : 'p', - \ 'desc' : 'paste mode', - \ }, - \ 'whitespace' :{ - \ 'icon' : s:MESSLETTERS.circled_letter('w'), - \ 'icon_asc' : 'w', - \ 'desc' : 'whitespace mode', - \ }, - \ 'wrapline' :{ - \ 'icon' : s:MESSLETTERS.circled_letter('W'), - \ 'icon_asc' : 'W', - \ 'desc' : 'wrap line mode', - \ }, - \ } + \ 'icon' : '⊝', + \ 'icon_asc' : '-', + \ 'desc' : 'centered-cursor mode', + \ }, + \ 'hi-characters-for-long-lines' :{ + \ 'icon' : '⑧', + \ 'icon_asc' : '8', + \ 'desc' : 'toggle highlight of characters for long lines', + \ }, + \ 'fill-column-indicator' :{ + \ 'icon' : s:MESSLETTERS.circled_letter('f'), + \ 'icon_asc' : 'f', + \ 'desc' : 'fill-column-indicator mode', + \ }, + \ 'syntax-checking' :{ + \ 'icon' : s:MESSLETTERS.circled_letter('s'), + \ 'icon_asc' : 's', + \ 'desc' : 'syntax-checking mode', + \ }, + \ 'spell-checking' :{ + \ 'icon' : s:MESSLETTERS.circled_letter('S'), + \ 'icon_asc' : 'S', + \ 'desc' : 'spell-checking mode', + \ }, + \ 'paste-mode' :{ + \ 'icon' : s:MESSLETTERS.circled_letter('p'), + \ 'icon_asc' : 'p', + \ 'desc' : 'paste mode', + \ }, + \ 'whitespace' :{ + \ 'icon' : s:MESSLETTERS.circled_letter('w'), + \ 'icon_asc' : 'w', + \ 'desc' : 'whitespace mode', + \ }, + \ 'wrapline' :{ + \ 'icon' : s:MESSLETTERS.circled_letter('W'), + \ 'icon_asc' : 'W', + \ 'desc' : 'wrap line mode', + \ }, + \ } " the major_mode will be cached by default. @@ -374,7 +374,9 @@ endfunction function! SpaceVim#layers#core#statusline#_current_tag() abort let tag = '' try - let tag =tagbar#currenttag('%s ', '') + if execute('filetype') ==# 'detection:ON' + let tag = tagbar#currenttag('%s ', '') + endif catch endtry return tag