refactor #785

Author: t9md

lib/motions/general-motions.coffee

@@ -161,8 +161,9 @@ class MoveRight extends Motion
       cursor.moveRight() if wrapToNextLine and cursor.isAtEndOfLine()
       @ensureCursorIsWithinLine(cursor)
 
-class MoveUp extends Motion
+class MoveUpDown extends Motion
   operatesLinewise: true
+  direction: null
 
   getScreenRowCount: (cursor) ->
     unless (@isLinewise() and @editor.isSoftWrapped())
@@ -176,26 +177,16 @@ class MoveUp extends Motion
   moveCursor: (cursor, count=1) ->
     _.times count, =>
       unless cursor.getScreenRow() is 0
-        cursor.moveUp(@getScreenRowCount(cursor))
+        cursor["move#{@direction}"](@getScreenRowCount(cursor))
         @ensureCursorIsWithinLine(cursor)
 
-class MoveDown extends Motion
+class MoveUp extends MoveUpDown
   operatesLinewise: true
+  direction: 'Up'
 
-  getScreenRowCount: (cursor) ->
-    unless (@isLinewise() and @editor.isSoftWrapped())
-      return 1
-    else
-      cursorBufferRow = cursor.getBufferRow()
-      cursorLineBufferRange = [[cursorBufferRow, 0], [cursorBufferRow, Infinity]]
-      cursorLineScreenRange = @editor.screenRangeForBufferRange(cursorLineBufferRange)
-      cursorLineScreenRange.getRowCount()
-
-  moveCursor: (cursor, count=1) ->
-    _.times count, =>
-      unless cursor.getScreenRow() is @editor.getLastScreenRow()
-        cursor.moveDown(@getScreenRowCount(cursor))
-        @ensureCursorIsWithinLine(cursor)
+class MoveDown extends MoveUpDown
+  operatesLinewise: true
+  direction: 'Down'
 
 class MoveToPreviousWord extends Motion
   operatesInclusively: false