From 3dd051f8579f1ccaef83d9d2f98fc432e8aa8bca Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 27 Aug 2012 23:00:51 +0400
Subject: [PATCH] small cleanup

---
 lib/ace/keyboard/vim/maps/aliases.js |  4 +--
 lib/ace/keyboard/vim/maps/motions.js | 52 +++++++++++++---------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/lib/ace/keyboard/vim/maps/aliases.js b/lib/ace/keyboard/vim/maps/aliases.js
index 6708a5c3..556250a6 100644
--- a/lib/ace/keyboard/vim/maps/aliases.js
+++ b/lib/ace/keyboard/vim/maps/aliases.js
@@ -35,9 +35,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
  
-"use strict"
-
 define(function(require, exports, module) {
+"use strict";
+
 module.exports = {
     "x": {
         operator: {
diff --git a/lib/ace/keyboard/vim/maps/motions.js b/lib/ace/keyboard/vim/maps/motions.js
index 3f0830c3..db59dd22 100644
--- a/lib/ace/keyboard/vim/maps/motions.js
+++ b/lib/ace/keyboard/vim/maps/motions.js
@@ -36,9 +36,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
  
-"use strict"
 
 define(function(require, exports, module) {
+"use strict";
 
 var util = require("./util");
 
@@ -56,36 +56,26 @@ function Motion(getRange, type){
     else
         var reverse = type;
 
-    this.nav = function(editor) {
-        var r = getRange(editor);
-        if (!r)
+    this.nav = function(editor, range, count, param) {
+        range = getRange(editor, range, count, param);
+        if (!range)
             return;
-        if (!r.end)
-            var a = r;
-        else if (reverse)
-            var a = r.start;
-        else
-            var a = r.end;
+        var pos = range.end ? range : range[reverse ? "start" : "end"];
 
         editor.clearSelection();
-        editor.moveCursorTo(a.row, a.column);
-    }
-    this.sel = function(editor){
-        var r = getRange(editor);
-        if (!r)
+        editor.moveCursorTo(pos.row, pos.column);
+    };
+    this.sel = function(editor, range, count, param){
+        range = getRange(editor, range, count, param);
+        if (!range)
             return;
         if (extend)
-            return editor.selection.setSelectionRange(r);
+            return editor.selection.setSelectionRange(range);
 
-        if (!r.end)
-            var a = r;
-        else if (reverse)
-            var a = r.start;
-        else
-            var a = r.end;
+        var pos = range.end ? range : range[reverse ? "start" : "end"];
 
-        editor.selection.selectTo(a.row, a.column);
-    }
+        editor.selection.selectTo(pos.row, pos.column);
+    };
 }
 
 var nonWordRe = /[\s.\/\\()\"'-:,.;<>~!@#$%^&*|+=\[\]{}`~?]/;
@@ -98,8 +88,8 @@ var StringStream = function(editor, cursor) {
     this.row = cursor.row;
     this.col = cursor.column;
     var line = editor.session.getLine(this.row);
-    var maxRow = editor.session.getLength()
-    this.ch = line[this.col] || '\n'
+    var maxRow = editor.session.getLength();
+    this.ch = line[this.col] || '\n';
     this.skippedLines = 0;
 
     this.next = function() {
@@ -187,7 +177,7 @@ module.exports = {
         else
             str.next();
 
-        return {column: str.col, row: str.row}
+        return {column: str.col, row: str.row};
     }),
     "b": new Motion(function(editor) {
         var str = new StringStream(editor);
@@ -505,6 +495,9 @@ module.exports = {
                     editor.gotoLine(count || 0);
                 case "U":
                     editor.gotoLine(count || 0);
+                case "$":
+                    editor.navigateLineEnd();
+                    break;
             }
         },
         sel: function(editor, range, count, param) {
@@ -517,6 +510,9 @@ module.exports = {
                     break;
                 case "g":
                     editor.selection.selectTo(count || 0, 0);
+                case "$":
+                    editor.selection.selectLineEnd();
+                    break;
             }
         }
     },
@@ -528,7 +524,7 @@ module.exports = {
                 content += "\n";
 
             if (content.length) {
-                editor.navigateLineEnd()
+                editor.navigateLineEnd();
                 editor.insert(content);
                 util.insertMode(editor);
             }