adds class SmartNewLineCommand

fix issue when folded headline is last one in file
demon386 · Mar 26, 2013 · 0c68735 · 0c68735
1 parent 391f4d9
commit 0c68735
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/Add Line SmartMarkdown Heading.sublime-macro b/Add Line SmartMarkdown Heading.sublime-macro
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -23,8 +23,7 @@
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown" }
         ]
     },
-    { "keys": ["ctrl+enter"], "command": "run_macro_file",
-      "args": {"file": "res://Packages/SmartMarkdown/Add Line SmartMarkdown Heading.sublime-macro"}, "context":
+    { "keys": ["ctrl+enter"], "command": "smart_new_line", "context":
         [
             { "key": "selector", "operator": "equal", "operand": "markup.heading.markdown" }
         ]

diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -23,8 +23,7 @@
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown" }
         ]
     },
-    { "keys": ["ctrl+enter"], "command": "run_macro_file",
-      "args": {"file": "res://Packages/SmartMarkdown/Add Line SmartMarkdown Heading.sublime-macro"}, "context":
+    { "keys": ["ctrl+enter"], "command": "smart_new_line", "context":
         [
             { "key": "selector", "operator": "equal", "operand": "markup.heading.markdown" }
         ]

diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -23,8 +23,7 @@
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown" }
         ]
     },
-    { "keys": ["ctrl+enter"], "command": "run_macro_file",
-      "args": {"file": "res://Packages/SmartMarkdown/Add Line SmartMarkdown Heading.sublime-macro"}, "context":
+    { "keys": ["ctrl+enter"], "command": "smart_new_line", "context":
         [
             { "key": "selector", "operator": "equal", "operand": "markup.heading.markdown" }
         ]

diff --git a/smart_folding.py b/smart_folding.py
@@ -24,6 +24,21 @@
 HEADLINE_PATTERN = re.compile(r'^(#+)\s.*')
 
 
+class SmartNewLineCommand(sublime_plugin.TextCommand):
+    """Changes behavior of default 'insert line after'
+       Puts new line after folding mark if any.
+    """
+    def run(self, edit):
+        self.view.run_command("move_to", { "to": "hardeol"})
+        self.view.run_command("move_to", { "to": "eol"})
+        point = self.view.full_line(self.view.sel()[0])
+        if headline._is_region_folded(point.b + 1, self.view):
+            self.view.run_command("move_to", { "to": "eof"})
+            self.view.run_command("insert", {"characters": "\n"})
+        else:
+            self.view.run_command("insert", {"characters": "\n"})
+
+
 class SmartFoldingCommand(sublime_plugin.TextCommand):
     """Smart folding is used to fold / unfold headline at the point.