Skip to content
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

Workaround surround bug #2830

Merged
merged 2 commits into from
Jul 20, 2018
Merged

Workaround surround bug #2830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36190e
workaround surround bug
reujab Jul 11, 2018
95122a3
properly fix surround bug
reujab Jul 20, 2018
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: 7 additions & 3 deletions src/actions/plugins/surround.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ class CommandSurroundAddTarget extends BaseCommand {
}

// It's possible we're already done, e.g. dst
await CommandSurroundAddToReplacement.TryToExecuteSurround(vimState, position);
if (await CommandSurroundAddToReplacement.TryToExecuteSurround(vimState, position)) {
this.isCompleteAction = true;
}

return vimState;
}
Expand Down Expand Up @@ -326,7 +328,9 @@ export class CommandSurroundAddToReplacement extends BaseCommand {

vimState.surround.replacement += stringToAdd;

await CommandSurroundAddToReplacement.TryToExecuteSurround(vimState, position);
if (await CommandSurroundAddToReplacement.TryToExecuteSurround(vimState, position)) {
this.isCompleteAction = true;
}

return vimState;
}
Expand All @@ -347,7 +351,7 @@ export class CommandSurroundAddToReplacement extends BaseCommand {
vimState.recordedState.surroundKeys.push(vimState.keyHistory[i]);
}

return false;
return true;
}

// we assume that we start directly on the characters we're operating over
Expand Down