From 6463f4fafba9d5f62f9b912791bc4b99cd1c92e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=A1=D0=BE=D0=BB=D0=BD=D1=86?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Wed, 13 Jul 2022 12:02:48 +0300 Subject: [PATCH] Correct display Git branch name to status bar --- autoload/justmyrc.vim | 8 +------- colors/custom_scheme_dark.vim | 1 + vimrc | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/autoload/justmyrc.vim b/autoload/justmyrc.vim index 83de434..e25f796 100644 --- a/autoload/justmyrc.vim +++ b/autoload/justmyrc.vim @@ -78,12 +78,6 @@ function justmyrc#LessBehaviour() endif endfunction -" CRITICAL! Bottom code add glitches! function justmyrc#GetGitBranch() - return trim(system("git rev-parse --abbrev-ref 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:'' + return system("git symbolic-ref --short HEAD 2> /dev/null | tr -d '\n'") endfunction diff --git a/colors/custom_scheme_dark.vim b/colors/custom_scheme_dark.vim index 100d15e..8bf3699 100644 --- a/colors/custom_scheme_dark.vim +++ b/colors/custom_scheme_dark.vim @@ -27,6 +27,7 @@ hi WildMenu cterm=None ctermfg=0 ctermbg=83 "Цвета, используемые в статусной строке hi StatusLineEditorMode ctermfg=0 ctermbg=245 +hi StatusLineBranchName ctermfg=107 ctermbg=235 hi StatusLineFileFormat ctermfg=247 ctermbg=235 hi StatusLineEmpty ctermbg=235 hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=235 diff --git a/vimrc b/vimrc index ee5467f..0c860d6 100644 --- a/vimrc +++ b/vimrc @@ -28,7 +28,8 @@ set laststatus=2 set statusline= set statusline+=%#StatusLineEditorMode#\ %{justmyrc#GetMode()}\ -set statusline+=%#StatusLineFileFormat#\ %{&ff}\ +set statusline+=%#StatusLineBranchName#\ %{justmyrc#GetGitBranch()}\ +set statusline+=%#StatusLineFileFormat#%{&ff}\ set statusline+=%#StatusLineEmpty#%= set statusline+=%#StatusLineReadOnlyFlag#\ %r\ set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\