Merge pull request #2830 from reujab/surround-workaround

Workaround surround bug
VSCodeVim · Jul 20, 2018 · 1a5f358 · 1a5f358
2 parents dfb4b7a + 95122a3
commit 1a5f358
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/actions/plugins/surround.ts b/src/actions/plugins/surround.ts
@@ -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;
   }
@@ -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;
   }
@@ -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