Fix bug that added a semi colon when adding a new line even if there …

…was already one
MauriceZ · Jul 4, 2015 · f6209e9 · f6209e9
1 parent 75717ae
commit f6209e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git a/AppendSemiColon.py b/AppendSemiColon.py
@@ -1,7 +1,7 @@
 import sublime_plugin
 
 class AppendSemiColonCommand(sublime_plugin.TextCommand):
-  def run(self, edit):
+  def run(self, edit, **args):
 
     def insert_semicolon(point):
       self.view.insert(edit, point, ';')
@@ -34,3 +34,6 @@ def is_semicolon(point):
 
       elif not is_semicolon(line_end - 1):
         insert_semicolon(line_end)
+
+    if ('enter_new_line' in args and args['enter_new_line'] == 'true'):
+      self.view.run_command("run_macro_file", {"file": "Packages/Default/Add Line.sublime-macro"}) # enter new line
diff --git a/AppendSemiColon.sublime-macro b/AppendSemiColon.sublime-macro
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -1,4 +1,4 @@
 [
   { "keys": ["super+;"], "command": "append_semi_colon" }, 
-  { "keys": ["super+shift+;"], "command": "run_macro_file", "args": {"file": "Packages/AppendSemiColon/AppendSemiColon.sublime-macro"} }
+  { "keys": ["super+shift+;"], "command": "append_semi_colon", "args": {"enter_new_line": "true"} }
 ]
diff --git a/Default.sublime-keymap b/Default.sublime-keymap
@@ -1,4 +1,4 @@
 [
   { "keys": ["ctrl+;"], "command": "append_semi_colon" }, 
-  { "keys": ["ctrl+shift+;"], "command": "run_macro_file", "args": {"file": "Packages/AppendSemiColon/AppendSemiColon.sublime-macro"} }
+  { "keys": ["ctrl+shift+;"], "command": "append_semi_colon", "args": {"enter_new_line": "true"} }
 ]