Fixing .vintageousrc not parsing omap, vmap; adding nmap

vi/dot_file.py

@@ -1,53 +1,53 @@
-from Vintageous import PluginLogger
-
-import sublime
-
-import os
-
-
-_logger = PluginLogger(__name__)
-
-
-class DotFile(object):
-    def __init__(self, path):
-        self.path = path
-
-    @staticmethod
-    def from_user():
-        path = os.path.join(sublime.packages_path(), 'User', '.vintageousrc')
-        return DotFile(path)
-
-    def run(self):
-        try:
-            with open(self.path, 'r') as f:
-                for line in f:
-                    cmd, args = self.parse(line)
-                    if cmd:
-                        _logger.info('[DotFile] running: {0} {1}'.format(cmd, args))
-                        sublime.active_window().run_command(cmd, args)
-        except FileNotFoundError:
-            pass
-
-    def parse(self, line):
-        try:
-            _logger.info('[DotFile] parsing line: {0}'.format(line))
-            if line.startswith((':map ')):
-                line = line[1:]
-                return ('ex_map', {'command_line': line.rstrip()})
-
-            if line.startswith((':omap ')):
-                line = line[len(':omap '):]
-                return ('ex_omap', {'cmd': line.rstrip()})
-
-            if line.startswith((':vmap ')):
-                line = line[len(':vmap '):]
-                return ('ex_vmap', {'cmd': line.rstrip()})
-
-            if line.startswith((':let ')):
-                line = line[1:]
-                return ('ex_let', {'command_line': line.strip()})
-        except Exception:
-            print('Vintageous: bad config in dotfile: "%s"' % line.rstrip())
-            _logger.debug('bad config inf dotfile: "%s"', line.rstrip())
-
-        return None, None
+from Vintageous import local_logger
+
+import sublime
+
+import os
+
+
+_logger = local_logger(__name__)
+
+
+class DotFile(object):
+    def __init__(self, path):
+        self.path = path
+
+    @staticmethod
+    def from_user():
+        path = os.path.join(sublime.packages_path(), 'User', '.vintageousrc')
+        return DotFile(path)
+
+    def run(self):
+        try:
+            with open(self.path, 'r') as f:
+                for line in f:
+                    cmd, args = self.parse(line)
+                    if cmd:
+                        _logger().info('[DotFile] running: {0} {1}'.format(cmd, args))
+                        sublime.active_window().run_command(cmd, args)
+        except FileNotFoundError:
+            pass
+
+    def parse(self, line):
+        try:
+            _logger().info('[DotFile] parsing line: {0}'.format(line))
+            line = line.lstrip(':')
+            if line.startswith(('map ')):
+                return ('ex_map', {'command_line': line.rstrip()})
+
+            if line.startswith(('omap ')):
+                return ('ex_omap', {'command_line': line.rstrip()})
+
+            if line.startswith(('nmap ')):
+                return ('ex_nmap', {'command_line': line.rstrip()})
+            
+            if line.startswith(('vmap ')):
+                return ('ex_vmap', {'command_line': line.rstrip()})
+
+            if line.startswith(('let ')):
+                return ('ex_let', {'command_line': line.strip()})
+        except Exception:
+            print('Vintageous: bad config in dotfile: "%s"' % line.rstrip())
+            _logger().debug('bad config inf dotfile: "%s"', line.rstrip())
+
+        return None, None

xactions.py

@@ -892,8 +892,10 @@ def run(self, key, repeat_count=None, do_eval=True, check_user_mappings=True):
                 # For example, dd, g~g~ or g~~
                 # remove counts
                 action_seq = to_bare_command_name(state.sequence)
-                _logger.info('[PressKey] action seq: {0}'.format(action_seq))
-                command = key_mappings.resolve(sequence=action_seq, mode=modes.NORMAL)
+
+                _logger().info('[PressKey] action seq: {0}'.format(action_seq))
+                #command = key_mappings.resolve(sequence=action_seq, mode=modes.NORMAL)
+
                 # TODO: Make _missing a command.
                 if isinstance(command, cmd_base.ViMissingCommandDef):
                     _logger.info("[PressKey] unmapped sequence: {0}".format(state.sequence))