Fix #675 and #1004

XVimProject · Jan 28, 2017 · 71bc6d6 · 71bc6d6
1 parent 1313c37
commit 71bc6d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/XVim/NSTextStorage+VimOperation.m b/XVim/NSTextStorage+VimOperation.m
@@ -253,7 +253,7 @@ - (NSUInteger)xvim_firstOfLine:(NSUInteger)index
         return NSNotFound;
     }
 
-    if (pos == index && isNewline([self.xvim_string characterAtIndex:(pos - 1)])) {
+    if (pos == index && isNewline([self.xvim_string characterAtIndex:(pos)])) {
         return NSNotFound;
     }
     return pos;

diff --git a/XVim/NSTextView+VimOperation.m b/XVim/NSTextView+VimOperation.m
@@ -1432,10 +1432,7 @@ - (void)xvim_insertNewlineAboveCurrentLine{
 }
 
 - (void)xvim_insertNewlineAboveCurrentLineWithIndent{
-    NSUInteger head = [self.textStorage xvim_firstOfLine:self.insertionPoint];
-    if( NSNotFound == head ){
-        head = self.insertionPoint;
-    }
+    NSUInteger head = [self.textStorage xvim_startOfLine:self.insertionPoint];
     if( 0 != head ){
         [self setSelectedRange:NSMakeRange(head-1,0)];
         [self insertNewline:self];