Fix #2168: surround spacing bug
Fix #2168: surround spacing bug

In Vim, the commands `yw` and `yaw` will also yank any trailing
whitespace. However, during a surround command `ysaw`, we want to
exclude that whitespace to avoid an offset.

Chillee/Vim,westim/Vim,westim/Vim,westim/Vim,VSCodeVim/Vim,Chillee/Vim,VSCodeVim/Vim