diff options
author | Max Christian Pohle | 2019-09-12 19:44:24 +0200 |
---|---|---|
committer | Max Christian Pohle | 2019-09-12 19:44:24 +0200 |
commit | a6cdae262df868ff79c32dca3b61686ef5c8e433 (patch) | |
tree | 2b2c2c08db0e63505b55e4c6a36a9a26b1fb5606 /plugin | |
parent | ee9db4ec2784356bb1aa16ef52f29bead61e74ae (diff) | |
download | vim-a6cdae262df868ff79c32dca3b61686ef5c8e433.tar.bz2 vim-a6cdae262df868ff79c32dca3b61686ef5c8e433.zip |
Improved Java support & minor fixes
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/statusline.vim | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/plugin/statusline.vim b/plugin/statusline.vim index e3c03ed..20d6b7e 100644 --- a/plugin/statusline.vim +++ b/plugin/statusline.vim | |||
@@ -2,19 +2,14 @@ augroup MAX_FANCYLINE | |||
2 | set noshowmode | " mode will be shown twice, in lightline and below, so we want to deactivate one | 2 | set noshowmode | " mode will be shown twice, in lightline and below, so we want to deactivate one |
3 | set laststatus=2 | " required by AirLine and Lightline, without status line does not appear until a window split | 3 | set laststatus=2 | " required by AirLine and Lightline, without status line does not appear until a window split |
4 | 4 | ||
5 | let g:status_sym_start = '' | 5 | let g:status_sym_start = '' |
6 | let g:status_sym_end = '' | 6 | let g:status_sym_end = '' |
7 | let g:status_sym_sep_start = '' | 7 | let g:status_sym_sep_start = '' |
8 | let g:status_sym_sep_end = '' | 8 | let g:status_sym_sep_end = '' |
9 | let g:symbol_branch = '' | 9 | let g:symbol_branch = '' |
10 | let g:symbol_screen_edge = '░' | ||
10 | 11 | ||
11 | if &term == "linux" | 12 | if &term == "linux" |
12 | let g:status_sym_start = '' | ||
13 | let g:status_sym_end = '' | ||
14 | let g:status_sym_sep_start = '' | ||
15 | let g:status_sym_sep_end = '' | ||
16 | let g:symbol_branch = '' | ||
17 | |||
18 | let g:group_active = "StatusLineTerm" | 13 | let g:group_active = "StatusLineTerm" |
19 | let g:group_inactive = "StatusLineTermNC" | 14 | let g:group_inactive = "StatusLineTermNC" |
20 | let g:group_tabline = "StatusLineTerm" | 15 | let g:group_tabline = "StatusLineTerm" |
@@ -62,6 +57,7 @@ augroup MAX_FANCYLINE | |||
62 | return '' | 57 | return '' |
63 | \ ."%#StatusLineHighlight#" | 58 | \ ."%#StatusLineHighlight#" |
64 | \ ."%#".a:highlight_group."#" | 59 | \ ."%#".a:highlight_group."#" |
60 | \ .g:symbol_screen_edge.' ' | ||
65 | \ ."%{(&readonly\ ?\ '\ \ 🔒'\ :\ '')}" | 61 | \ ."%{(&readonly\ ?\ '\ \ 🔒'\ :\ '')}" |
66 | \ ."%{(&modified\ ?\ '\ \ 💾'\ :\ '')}" | 62 | \ ."%{(&modified\ ?\ '\ \ 💾'\ :\ '')}" |
67 | \ ."%(%w%h%q%)".' '.l:mode.' '.g:status_sym_sep_start | 63 | \ ."%(%w%h%q%)".' '.l:mode.' '.g:status_sym_sep_start |
@@ -83,9 +79,9 @@ augroup MAX_FANCYLINE | |||
83 | \ ."%{(&spell\ ?\ &spelllang.' '.g:status_sym_sep_end\ :\ '')}" | 79 | \ ."%{(&spell\ ?\ &spelllang.' '.g:status_sym_sep_end\ :\ '')}" |
84 | \ ."%{(&fileencoding=~'^$\\|^utf\-8$'?'':&fileencoding.' '.g:status_sym_sep_end.' ')}" | 80 | \ ."%{(&fileencoding=~'^$\\|^utf\-8$'?'':&fileencoding.' '.g:status_sym_sep_end.' ')}" |
85 | \ ."%{(&fileformat=~'^$\\|^unix$'?'':&fileformat.' '.g:status_sym_sep_end)}" | 81 | \ ."%{(&fileformat=~'^$\\|^unix$'?'':&fileformat.' '.g:status_sym_sep_end)}" |
86 | \ ."%l:%-3c" | 82 | \ ."%cx%-l: " |
87 | \ .g:status_sym_sep_end.' ' | ||
88 | \ ."%p%% " | 83 | \ ."%p%% " |
84 | \ .g:symbol_screen_edge | ||
89 | endfunction | 85 | endfunction |
90 | 86 | ||
91 | function! UpdateTabline(highlight_group) | 87 | function! UpdateTabline(highlight_group) |
@@ -94,6 +90,7 @@ augroup MAX_FANCYLINE | |||
94 | " | 90 | " |
95 | return '' | 91 | return '' |
96 | \ ."%#".a:highlight_group."#" | 92 | \ ."%#".a:highlight_group."#" |
93 | \ .g:symbol_screen_edge | ||
97 | \ ."%3( \ %)\ " | 94 | \ ."%3( \ %)\ " |
98 | \ ."%{getcwd(-1)}\ " | 95 | \ ."%{getcwd(-1)}\ " |
99 | \ ."%{FugitiveHead()==''?'':g:status_sym_sep_start.' '.g:symbol_branch.' '.FugitiveHead().' '}" | 96 | \ ."%{FugitiveHead()==''?'':g:status_sym_sep_start.' '.g:symbol_branch.' '.FugitiveHead().' '}" |
@@ -109,6 +106,7 @@ augroup MAX_FANCYLINE | |||
109 | \ ."%(%{v:servername}\ %{v:this_session}%)" | 106 | \ ."%(%{v:servername}\ %{v:this_session}%)" |
110 | \ .g:status_sym_sep_end.' ' | 107 | \ .g:status_sym_sep_end.' ' |
111 | \ ."%(\ \ \ %{tabpagenr()}/%{tabpagenr('$')}\ %)" | 108 | \ ."%(\ \ \ %{tabpagenr()}/%{tabpagenr('$')}\ %)" |
109 | \ .g:symbol_screen_edge | ||
112 | \ ."%##" | 110 | \ ."%##" |
113 | \ ."" " end | 111 | \ ."" " end |
114 | endfunction | 112 | endfunction |