Fix Edit.SurroundWith

Need to keep the selection around when executing Edit.SurroundWith.
Otherwise the command doesn't know what text is to be surrounded with
the chosen construct.

closes #1489