mirror of
https://github.com/airblade/vim-gitgutter.git
synced 2025-11-08 11:33:48 -05:00
Revert "Show sign on first line when line(s) deleted at start of file."
Signs aren't shown for deleted lines which aren't at the start of the
file.
This reverts commit 0fd18d66f6.
This commit is contained in:
@@ -204,7 +204,6 @@ To customise the symbols, add the following to your `~/.vimrc`:
|
|||||||
let g:gitgutter_sign_added = 'xx'
|
let g:gitgutter_sign_added = 'xx'
|
||||||
let g:gitgutter_sign_modified = 'yy'
|
let g:gitgutter_sign_modified = 'yy'
|
||||||
let g:gitgutter_sign_removed = 'zz'
|
let g:gitgutter_sign_removed = 'zz'
|
||||||
let g:gitgutter_sign_removed_first_line = '^^'
|
|
||||||
let g:gitgutter_sign_modified_removed = 'ww'
|
let g:gitgutter_sign_modified_removed = 'ww'
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -277,6 +276,10 @@ let g:gitgutter_realtime = 0
|
|||||||
let g:gitgutter_eager = 0
|
let g:gitgutter_eager = 0
|
||||||
```
|
```
|
||||||
|
|
||||||
|
> Why is no sign shown if I delete the first line(s) in a file?
|
||||||
|
|
||||||
|
vim-gitgutter shows removed lines with a sign on the line above. In this case there isn't a line above so vim-gitgutter can't show the sign. In due course I'll fix this with an overline character on the first line.
|
||||||
|
|
||||||
> What happens if I also use another plugin which uses signs (e.g. Syntastic)?
|
> What happens if I also use another plugin which uses signs (e.g. Syntastic)?
|
||||||
|
|
||||||
Vim only allows one sign per line. Before adding a sign to a line, vim-gitgutter checks whether a sign has already been added by somebody else. If so it doesn't do anything. In other words vim-gitgutter won't overwrite another plugin's signs. It also won't remove another plugin's signs.
|
Vim only allows one sign per line. Before adding a sign to a line, vim-gitgutter checks whether a sign has already been added by somebody else. If so it doesn't do anything. In other words vim-gitgutter won't overwrite another plugin's signs. It also won't remove another plugin's signs.
|
||||||
|
|||||||
@@ -142,11 +142,7 @@ function! diff#process_added(modifications, from_count, to_count, to_line)
|
|||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! diff#process_removed(modifications, from_count, to_count, to_line)
|
function! diff#process_removed(modifications, from_count, to_count, to_line)
|
||||||
if a:to_line == 0
|
call add(a:modifications, [a:to_line, 'removed'])
|
||||||
call add(a:modifications, [1, 'removed_first_line'])
|
|
||||||
else
|
|
||||||
call add(a:modifications, [0, 'removed'])
|
|
||||||
endif
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! diff#process_modified(modifications, from_count, to_count, to_line)
|
function! diff#process_modified(modifications, from_count, to_count, to_line)
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ function! highlight#define_signs()
|
|||||||
sign define GitGutterLineAdded
|
sign define GitGutterLineAdded
|
||||||
sign define GitGutterLineModified
|
sign define GitGutterLineModified
|
||||||
sign define GitGutterLineRemoved
|
sign define GitGutterLineRemoved
|
||||||
sign define GitGutterLineRemovedFirstLine
|
|
||||||
sign define GitGutterLineModifiedRemoved
|
sign define GitGutterLineModifiedRemoved
|
||||||
sign define GitGutterDummy
|
sign define GitGutterDummy
|
||||||
|
|
||||||
@@ -47,7 +46,6 @@ function! highlight#define_sign_text()
|
|||||||
execute "sign define GitGutterLineAdded text=" . g:gitgutter_sign_added
|
execute "sign define GitGutterLineAdded text=" . g:gitgutter_sign_added
|
||||||
execute "sign define GitGutterLineModified text=" . g:gitgutter_sign_modified
|
execute "sign define GitGutterLineModified text=" . g:gitgutter_sign_modified
|
||||||
execute "sign define GitGutterLineRemoved text=" . g:gitgutter_sign_removed
|
execute "sign define GitGutterLineRemoved text=" . g:gitgutter_sign_removed
|
||||||
execute "sign define GitGutterLineRemovedFirstLine text=" . g:gitgutter_sign_removed_first_line
|
|
||||||
execute "sign define GitGutterLineModifiedRemoved text=" . g:gitgutter_sign_modified_removed
|
execute "sign define GitGutterLineModifiedRemoved text=" . g:gitgutter_sign_modified_removed
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
@@ -70,7 +68,6 @@ function! highlight#define_sign_text_highlights()
|
|||||||
sign define GitGutterLineAdded texthl=GitGutterAdd
|
sign define GitGutterLineAdded texthl=GitGutterAdd
|
||||||
sign define GitGutterLineModified texthl=GitGutterChange
|
sign define GitGutterLineModified texthl=GitGutterChange
|
||||||
sign define GitGutterLineRemoved texthl=GitGutterDelete
|
sign define GitGutterLineRemoved texthl=GitGutterDelete
|
||||||
sign define GitGutterLineRemovedFirstLine texthl=GitGutterDelete
|
|
||||||
sign define GitGutterLineModifiedRemoved texthl=GitGutterChangeDelete
|
sign define GitGutterLineModifiedRemoved texthl=GitGutterChangeDelete
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
@@ -79,13 +76,11 @@ function! highlight#define_sign_line_highlights()
|
|||||||
sign define GitGutterLineAdded linehl=GitGutterAddLine
|
sign define GitGutterLineAdded linehl=GitGutterAddLine
|
||||||
sign define GitGutterLineModified linehl=GitGutterChangeLine
|
sign define GitGutterLineModified linehl=GitGutterChangeLine
|
||||||
sign define GitGutterLineRemoved linehl=GitGutterDeleteLine
|
sign define GitGutterLineRemoved linehl=GitGutterDeleteLine
|
||||||
sign define GitGutterLineRemovedFirstLine linehl=GitGutterDeleteLine
|
|
||||||
sign define GitGutterLineModifiedRemoved linehl=GitGutterChangeDeleteLine
|
sign define GitGutterLineModifiedRemoved linehl=GitGutterChangeDeleteLine
|
||||||
else
|
else
|
||||||
sign define GitGutterLineAdded linehl=
|
sign define GitGutterLineAdded linehl=
|
||||||
sign define GitGutterLineModified linehl=
|
sign define GitGutterLineModified linehl=
|
||||||
sign define GitGutterLineRemoved linehl=
|
sign define GitGutterLineRemoved linehl=
|
||||||
sign define GitGutterLineRemovedFirstLine linehl=
|
|
||||||
sign define GitGutterLineModifiedRemoved linehl=
|
sign define GitGutterLineModifiedRemoved linehl=
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|||||||
@@ -54,8 +54,7 @@ function! hunk#prev_hunk(count)
|
|||||||
if hunk[2] < current_line
|
if hunk[2] < current_line
|
||||||
let hunk_count += 1
|
let hunk_count += 1
|
||||||
if hunk_count == a:count
|
if hunk_count == a:count
|
||||||
let target = hunk[2] == 0 ? 1 : hunk[2]
|
execute 'normal!' hunk[2] . 'G'
|
||||||
execute 'normal!' target . 'G'
|
|
||||||
break
|
break
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -70,11 +69,6 @@ function! hunk#current_hunk()
|
|||||||
let current_line = line('.')
|
let current_line = line('.')
|
||||||
|
|
||||||
for hunk in s:hunks
|
for hunk in s:hunks
|
||||||
if current_line == 1 && hunk[2] == 0
|
|
||||||
let current_hunk = hunk
|
|
||||||
break
|
|
||||||
endif
|
|
||||||
|
|
||||||
if current_line >= hunk[2] && current_line < hunk[2] + (hunk[3] == 0 ? 1 : hunk[3])
|
if current_line >= hunk[2] && current_line < hunk[2] + (hunk[3] == 0 ? 1 : hunk[3])
|
||||||
let current_hunk = hunk
|
let current_hunk = hunk
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -88,8 +88,6 @@ function! utility#highlight_name_for_change(text)
|
|||||||
return 'GitGutterLineAdded'
|
return 'GitGutterLineAdded'
|
||||||
elseif a:text ==# 'removed'
|
elseif a:text ==# 'removed'
|
||||||
return 'GitGutterLineRemoved'
|
return 'GitGutterLineRemoved'
|
||||||
elseif a:text ==# 'removed_first_line'
|
|
||||||
return 'GitGutterLineRemovedFirstLine'
|
|
||||||
elseif a:text ==# 'modified'
|
elseif a:text ==# 'modified'
|
||||||
return 'GitGutterLineModified'
|
return 'GitGutterLineModified'
|
||||||
elseif a:text ==# 'modified_removed'
|
elseif a:text ==# 'modified_removed'
|
||||||
|
|||||||
@@ -270,7 +270,12 @@ a. Why are the colours in the sign column weird?
|
|||||||
Your colorscheme is configuring the |hl-SignColumn| highlight group weirdly.
|
Your colorscheme is configuring the |hl-SignColumn| highlight group weirdly.
|
||||||
Please see |GitGutterCustomisation| on customising the sign column.
|
Please see |GitGutterCustomisation| on customising the sign column.
|
||||||
|
|
||||||
b. What happens if I also use another plugin which uses signs (e.g. Syntastic)?
|
b. Why is no sign shown if I delete the first line(s) in a file?
|
||||||
|
|
||||||
|
vim-gitgutter shows removed lines with a sign on the line above. In this
|
||||||
|
case there isn't a line above so vim-gitgutter can't show the sign.
|
||||||
|
|
||||||
|
c. What happens if I also use another plugin which uses signs (e.g. Syntastic)?
|
||||||
|
|
||||||
Vim only allows one sign per line. Before adding a sign to a line,
|
Vim only allows one sign per line. Before adding a sign to a line,
|
||||||
vim-gitgutter checks whether a sign has already been added by somebody else.
|
vim-gitgutter checks whether a sign has already been added by somebody else.
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ call s:set('g:gitgutter_eager', 1)
|
|||||||
call s:set('g:gitgutter_sign_added', '+')
|
call s:set('g:gitgutter_sign_added', '+')
|
||||||
call s:set('g:gitgutter_sign_modified', '~')
|
call s:set('g:gitgutter_sign_modified', '~')
|
||||||
call s:set('g:gitgutter_sign_removed', '_')
|
call s:set('g:gitgutter_sign_removed', '_')
|
||||||
call s:set('g:gitgutter_sign_removed_first_line', '‾')
|
|
||||||
call s:set('g:gitgutter_sign_modified_removed', '~_')
|
call s:set('g:gitgutter_sign_modified_removed', '~_')
|
||||||
call s:set('g:gitgutter_diff_args', '')
|
call s:set('g:gitgutter_diff_args', '')
|
||||||
call s:set('g:gitgutter_escape_grep', 0)
|
call s:set('g:gitgutter_escape_grep', 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user