diff --git a/syntax/gitsidebar.vim b/syntax/gitsidebar.vim new file mode 100644 index 0000000..33879aa --- /dev/null +++ b/syntax/gitsidebar.vim @@ -0,0 +1,44 @@ +if exists("b:current_syntax") + finish +endif + +syntax match gitSidebarLabel /\v^(Head|Push)\ze:/ +syntax match gitSidebarBranch /\v(^(Head|Push):\s+)@<=\S+/ +syntax match gitSidebarAhead /\v\+\d+/ +syntax match gitSidebarBehind /\v-\d+/ + +syntax region gitSidebarUntrackedHeader start=/\v^Untracked>/ end=/\v^$/ +syntax region gitSidebarUnstagedHeader start=/\v^Unstaged>/ end=/\v^$/ +syntax region gitSidebarStagedHeader start=/\v^Staged>/ end=/\v^$/ +syntax region gitSidebarUnmergedHeader start=/\v^Unmerged>/ end=/\v^$/ +syntax region gitSidebarUnpushedHeader start=/\v^Unpushed>/ end=/\v^$/ +syntax region gitSidebarUnpulledHeader start=/\v^Unpulled>/ end=/\v^$/ + +syntax match gitSidebarUntrackedLabel /\v^Untracked/ contained containedin=gitSidebarUntrackedHeader +syntax match gitSidebarUnstagedLabel /\v^Unstaged/ contained containedin=gitSidebarUnstagedHeader +syntax match gitSidebarStagedLabel /\v^Staged/ contained containedin=gitSidebarStagedHeader +syntax match gitSidebarUnmergedLabel /\v^Unmerged/ contained containedin=gitSidebarUnmergedHeader +syntax match gitSidebarUnpushedLabel /\v^Unpushed/ contained containedin=gitSidebarUnpushedHeader +syntax match gitSidebarUnpulledLabel /\v^Unpulled/ contained containedin=gitSidebarUnpulledHeader + +syntax match gitSidebarHeaderCount /\v\(\zs\d+\ze\)/ contained containedin=gitSidebarUntrackedHeader, + \ gitSidebarUnstagedHeader, + \ gitSidebarStagedHeader, + \ gitSidebarUnmergedHeader, + \ gitSidebarUnpushedHeader, + \ gitSidebarUnpulledHeader + +highlight default link gitSidebarLabel Label +highlight default link gitSidebarBranch None +highlight default link gitSidebarAhead GitUnpushed +highlight default link gitSidebarBehind GitUnpulled +highlight default link gitSidebarHeaderCount Number + +highlight default link gitSidebarUntrackedLabel gitSidebarLabel +highlight default link gitSidebarUnstagedLabel gitSidebarLabel +highlight default link gitSidebarStagedLabel gitSidebarLabel +highlight default link gitSidebarUnmergedLabel gitSidebarLabel +highlight default link gitSidebarUnpushedLabel gitSidebarLabel +highlight default link gitSidebarUnpulledLabel gitSidebarLabel + +let b:current_syntax = "gitSidebar" diff --git a/syntax/gitstatus.vim b/syntax/gitstatus.vim deleted file mode 100644 index 01e4522..0000000 --- a/syntax/gitstatus.vim +++ /dev/null @@ -1,44 +0,0 @@ -if exists("b:current_syntax") - finish -endif - -syntax match gitsidebarLabel /\v^(Head|Push)\ze:/ -syntax match gitsidebarBranch /\v(^(Head|Push):\s+)@<=\S+/ -syntax match gitsidebarAhead /\v\+\d+/ -syntax match gitsidebarBehind /\v-\d+/ - -syntax region gitsidebarUntrackedHeader start=/\v^Untracked>/ end=/\v^$/ -syntax region gitsidebarUnstagedHeader start=/\v^Unstaged>/ end=/\v^$/ -syntax region gitsidebarStagedHeader start=/\v^Staged>/ end=/\v^$/ -syntax region gitsidebarUnmergedHeader start=/\v^Unmerged>/ end=/\v^$/ -syntax region gitsidebarUnpushedHeader start=/\v^Unpushed>/ end=/\v^$/ -syntax region gitsidebarUnpulledHeader start=/\v^Unpulled>/ end=/\v^$/ - -syntax match gitsidebarUntrackedLabel /\v^Untracked/ contained containedin=gitsidebarUntrackedHeader -syntax match gitsidebarUnstagedLabel /\v^Unstaged/ contained containedin=gitsidebarUnstagedHeader -syntax match gitsidebarStagedLabel /\v^Staged/ contained containedin=gitsidebarStagedHeader -syntax match gitsidebarUnmergedLabel /\v^Unmerged/ contained containedin=gitsidebarUnmergedHeader -syntax match gitsidebarUnpushedLabel /\v^Unpushed/ contained containedin=gitsidebarUnpushedHeader -syntax match gitsidebarUnpulledLabel /\v^Unpulled/ contained containedin=gitsidebarUnpulledHeader - -syntax match gitsidebarHeaderCount /\v\(\zs\d+\ze\)/ contained containedin=gitsidebarUntrackedHeader, - \ gitsidebarUnstagedHeader, - \ gitsidebarStagedHeader, - \ gitsidebarUnmergedHeader, - \ gitsidebarUnpushedHeader, - \ gitsidebarUnpulledHeader - -highlight default link gitsidebarLabel Label -highlight default link gitsidebarBranch None -highlight default link gitsidebarAhead GitUnpushed -highlight default link gitsidebarBehind GitUnpulled -highlight default link gitsidebarHeaderCount Number - -highlight default link gitsidebarUntrackedLabel gitsidebarLabel -highlight default link gitsidebarUnstagedLabel gitsidebarLabel -highlight default link gitsidebarStagedLabel gitsidebarLabel -highlight default link gitsidebarUnmergedLabel gitsidebarLabel -highlight default link gitsidebarUnpushedLabel gitsidebarLabel -highlight default link gitsidebarUnpulledLabel gitsidebarLabel - -let b:current_syntax = "gitsidebar"