due to auto-inserting, we should delete, then replace

jasonmay · jasonmay · commit 50af44014447 · 2016-11-19T13:48:48.000-08:00
diff --git a/XVim/XVimReplaceEvaluator.m b/XVim/XVimReplaceEvaluator.m
@@ -110,14 +110,14 @@ - (XVimEvaluator*)eval:(XVimKeyStroke*)keyStroke{
                 }
                 nextEvaluator = nil;
             }
-            if (relayEvent) {
-                NSEvent *event = [keyStroke toEventwithWindowNumber:0 context:nil];
-                [self.sourceView interpretKeyEvents:[NSArray arrayWithObject:event]];
-            }
             if (newlinePressed) {
                 XVimMotion* m = XVIM_MAKE_MOTION(MOTION_FORWARD, CHARACTERWISE_EXCLUSIVE, MOTION_OPTION_NONE, 1);
                 [self.sourceView xvim_delete:m andYank:NO];
             }
+            if (relayEvent) {
+                NSEvent *event = [keyStroke toEventwithWindowNumber:0 context:nil];
+                [self.sourceView interpretKeyEvents:[NSArray arrayWithObject:event]];
+            }
         }
     }
     return nextEvaluator;

Original file line number	Diff line number	Diff line change
`@@ -110,14 +110,14 @@ - (XVimEvaluator)eval:(XVimKeyStroke)keyStroke{`
`110`	`110`	`}`
`111`	`111`	`nextEvaluator = nil;`
`112`	`112`	`}`
`113`		`- if (relayEvent) {`
`114`		`- NSEvent *event = [keyStroke toEventwithWindowNumber:0 context:nil];`
`115`		`- [self.sourceView interpretKeyEvents:[NSArray arrayWithObject:event]];`
`116`		`- }`
`117`	`113`	`if (newlinePressed) {`
`118`	`114`	`XVimMotion* m = XVIM_MAKE_MOTION(MOTION_FORWARD, CHARACTERWISE_EXCLUSIVE, MOTION_OPTION_NONE, 1);`
`119`	`115`	`[self.sourceView xvim_delete:m andYank:NO];`
`120`	`116`	`}`
	`117`	`+ if (relayEvent) {`
	`118`	`+ NSEvent *event = [keyStroke toEventwithWindowNumber:0 context:nil];`
	`119`	`+ [self.sourceView interpretKeyEvents:[NSArray arrayWithObject:event]];`
	`120`	`+ }`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`return nextEvaluator;`