m-vim_plugins/vim-surround
1
0
Fork 0
mirror of https://github.com/tpope/vim-surround.git synced 2025-11-15 14:53:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Save, set, and restore startofline

Browse Source 
Consider this code:
```javascript
_.map(
  (
    mapObjOnK
  )
);
```
If the cursor is on the 3rd line and you press <kbd>d</kbd><kbd>s</kbd><kbd>b</kbd>, the code will become
```javascript
_.map(
);
mapObjOnK
```

The problem occurs if `startofline` is off.

With this change, I set it before processing the the call to
`dosurround`, and then, after the call, I'm unsetting it if
it was unset.
This commit is contained in:
Enrico Maria De Angelis
2022-03-25 18:59:44 +00:00
committed by Tim Pope
parent baf89ad264
commit 9857a87463
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugin/surround.vim
View File

@@ -367,6 +367,8 @@ function! s:reindent() abort " {{{1
endfunction " }}}1 endfunction " }}}1
function! s:dosurround(...) " {{{1 function! s:dosurround(...) " {{{1
let sol_save = &startofline
set startofline
let scount = v:count1 let scount = v:count1
let char = (a:0 ? a:1 : s:inputtarget()) let char = (a:0 ? a:1 : s:inputtarget())
let spc = "" let spc = ""
@@ -388,6 +390,9 @@ function! s:dosurround(...) " {{{1
if a:0 > 1 if a:0 > 1
let newchar = a:2 let newchar = a:2
if newchar == "\<Esc>" || newchar == "\<C-C>" || newchar == "" if newchar == "\<Esc>" || newchar == "\<C-C>" || newchar == ""
if !sol_save
set nostartofline
endif
return s:beep() return s:beep()
endif endif
endif endif
@@ -414,6 +419,9 @@ function! s:dosurround(...) " {{{1
if keeper == "" if keeper == ""
call setreg('"',original,otype) call setreg('"',original,otype)
let &clipboard = cb_save let &clipboard = cb_save
if !sol_save
set nostartofline
endif
return "" return ""
endif endif
let oldline = getline('.') let oldline = getline('.')
@@ -478,6 +486,9 @@ function! s:dosurround(...) " {{{1
else else
silent! call repeat#set("\<Plug>C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:input,scount) silent! call repeat#set("\<Plug>C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:input,scount)
endif endif
if !sol_save
set nostartofline
endif
endfunction " }}}1 endfunction " }}}1
function! s:changesurround(...) " {{{1 function! s:changesurround(...) " {{{1