Refactoring. much better for now #785

Other motion now can use getScreenRowCount().

Author: t9md

lib/motions/general-motions.coffee

@@ -110,6 +110,13 @@ class Motion
   isInclusive: ->
     @vimState.mode is 'visual' or @operatesInclusively
 
+  getScreenRowCount: (cursor) ->
+    return 1 unless (@editor.isSoftWrapped() and @isLinewise())
+
+    bufferRow = cursor.getBufferRow()
+    bufferRowRange = new Range([bufferRow, 0], [bufferRow, Infinity])
+    @editor.screenRangeForBufferRange(bufferRowRange).getRowCount()
+
 class CurrentSelection extends Motion
   constructor: (@editor, @vimState) ->
     super(@editor, @vimState)
@@ -161,36 +168,23 @@ class MoveRight extends Motion
       cursor.moveRight() if wrapToNextLine and cursor.isAtEndOfLine()
       @ensureCursorIsWithinLine(cursor)
 
-class MoveUpDown extends Motion
+class MoveUp extends Motion
   operatesLinewise: true
-  direction: null
-
-  getScreenRowCount: (cursor) ->
-    return 1 unless (@isLinewise() and @editor.isSoftWrapped())
-
-    cursorBufferRow = cursor.getBufferRow()
-    cursorLineBufferRange = [[cursorBufferRow, 0], [cursorBufferRow, Infinity]]
-    cursorLineScreenRange = @editor.screenRangeForBufferRange(cursorLineBufferRange)
-    cursorLineScreenRange.getRowCount()
 
   moveCursor: (cursor, count=1) ->
     _.times count, =>
-      screenRowCount = @getScreenRowCount(cursor)
-      
-      if (@direction is 'Up') and not (cursor.getScreenRow() is 0)
-        cursor.moveUp(screenRowCount)
-        @ensureCursorIsWithinLine(cursor)
-      else if (@direction is 'Down') and not (cursor.getScreenRow() is @editor.getLastScreenRow())
-        cursor.moveDown(screenRowCount)
+      unless cursor.getScreenRow() is 0
+        cursor.moveUp(@getScreenRowCount(cursor))
         @ensureCursorIsWithinLine(cursor)
 
-class MoveUp extends MoveUpDown
+class MoveDown extends Motion
   operatesLinewise: true
-  direction: 'Up'
 
-class MoveDown extends MoveUpDown
-  operatesLinewise: true
-  direction: 'Down'
+  moveCursor: (cursor, count=1) ->
+    _.times count, =>
+      unless cursor.getScreenRow() is @editor.getLastScreenRow()
+        cursor.moveDown(@getScreenRowCount(cursor))
+        @ensureCursorIsWithinLine(cursor)
 
 class MoveToPreviousWord extends Motion
   operatesInclusively: false