1
0
Fork 0

Correct display Git branch name to status bar

This commit is contained in:
Иван Солнцев 2022-07-13 12:02:48 +03:00
parent eebefa0120
commit 6463f4fafb
3 changed files with 4 additions and 8 deletions

View file

@ -78,12 +78,6 @@ function justmyrc#LessBehaviour()
endif endif
endfunction endfunction
" CRITICAL! Bottom code add glitches!
function justmyrc#GetGitBranch() function justmyrc#GetGitBranch()
return trim(system("git rev-parse --abbrev-ref HEAD 2> /dev/null | tr -d '\n'")) return system("git symbolic-ref --short HEAD 2> /dev/null | tr -d '\n'")
endfunction
function justmyrc#StatuslineGitBranch()
let l:branch_name = justmyrc#GitBranch()
return strlen(l:branch_name) > 0?' ' . l:branch_name:''
endfunction endfunction

View file

@ -27,6 +27,7 @@ hi WildMenu cterm=None ctermfg=0 ctermbg=83
"Цвета, используемые в статусной строке "Цвета, используемые в статусной строке
hi StatusLineEditorMode ctermfg=0 ctermbg=245 hi StatusLineEditorMode ctermfg=0 ctermbg=245
hi StatusLineBranchName ctermfg=107 ctermbg=235
hi StatusLineFileFormat ctermfg=247 ctermbg=235 hi StatusLineFileFormat ctermfg=247 ctermbg=235
hi StatusLineEmpty ctermbg=235 hi StatusLineEmpty ctermbg=235
hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=235 hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=235

3
vimrc
View file

@ -28,7 +28,8 @@ set laststatus=2
set statusline= set statusline=
set statusline+=%#StatusLineEditorMode#\ %{justmyrc#GetMode()}\ set statusline+=%#StatusLineEditorMode#\ %{justmyrc#GetMode()}\
set statusline+=%#StatusLineFileFormat#\ %{&ff}\ set statusline+=%#StatusLineBranchName#\ %{justmyrc#GetGitBranch()}\
set statusline+=%#StatusLineFileFormat#%{&ff}\
set statusline+=%#StatusLineEmpty#%= set statusline+=%#StatusLineEmpty#%=
set statusline+=%#StatusLineReadOnlyFlag#\ %r\ set statusline+=%#StatusLineReadOnlyFlag#\ %r\
set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\ set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\