Skip to content

Don't consider ignore_space when deleting #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hiroebe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't consider ignore_space when deleting #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions autoload/operator/surround.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,7 @@ function! s:get_surround_in(region) abort
endfunction

function! s:get_same_str_surround(region) abort
if g:operator#surround#ignore_space
let region = matchstr(a:region, '^[[:space:]\n]*\zs.*\ze[[:space:]\n]*$')
else
let region = matchstr(a:region, '^\n*\zs.*\ze\n*$')
endif
let region = matchstr(a:region, '^[[:space:]\n]*\zs.*\ze[[:space:]\n]*$')

let len = strlen(region)

Expand Down Expand Up @@ -374,9 +370,7 @@ function! s:delete_surround(visual) abort
call s:normal('`['.a:visual.'`]"_d')

" remove the former block and latter block
let space_skipper = g:operator#surround#ignore_space
\ ? '\[[:space:]\n]\*'
\ : '\n\*'
let space_skipper = '\[[:space:]\n]\*'

let after = substitute(region, '^\V'. space_skipper . '\zs' . escape(block[0], '\') , '', '')
let after = substitute(after, '\V' . escape(block[1], '\') . '\ze' . space_skipper . '\$', '', '')
Expand Down