Implement Kill Paredit command #9

Author: eerohele

paredit.py

@@ -327,3 +327,19 @@ def comment_dwim(view, edit):
         line = view.line(region.begin())
         n = view.insert(edit, line.end(), ' ; ')
         sel.append(line.end() + n)
+
+
+def kill(view, edit):
+    for region, _ in iterate(view):
+        # What should kill do with a non-empty selection?
+        point = region.begin()
+
+        innermost = sexp.innermost(view, point, edge=True)
+
+        # Cursive only deletes until newline, we delete the contents of the sexp regardless of
+        # newlines. Not sure which is right, but this is easier to implement and makes more sense
+        # to me.
+        if point == innermost.open.begin() or point == innermost.close.end():
+            view.erase(edit, innermost.extent())
+        elif point == innermost.open.end() or point == innermost.close.begin():
+            view.erase(edit, sublime.Region(innermost.open.end(), innermost.close.begin()))

tests/test_paredit.py

@@ -511,3 +511,30 @@ def test_comment_dwim(self):
         self.set_selections((4, 4))
         self.view.run_command('tutkain_paredit_comment_dwim')
         self.assertEquals('(a b ; \n c)', self.view_content())
+
+    def test_kill(self):
+        self.set_view_content('(a b c)')
+        self.set_selections((0, 0))
+        self.view.run_command('tutkain_paredit_kill')
+        self.assertEquals('', self.view_content())
+
+        self.set_view_content('(a b c)')
+        self.set_selections((1, 1))
+        self.view.run_command('tutkain_paredit_kill')
+        self.assertEquals('()', self.view_content())
+
+        self.set_view_content('(a b c)')
+        self.set_selections((7, 7))
+        self.view.run_command('tutkain_paredit_kill')
+        self.assertEquals('', self.view_content())
+
+        self.set_view_content('(foo "bar baz" quux)')
+        self.set_selections((6, 6))
+        self.view.run_command('tutkain_paredit_kill')
+        self.assertEquals('(foo "" quux)', self.view_content())
+
+        self.set_view_content('(a b c) (d e f)')
+        self.set_selections((1, 1), (9, 9))
+        self.view.run_command('tutkain_paredit_kill')
+        self.assertEquals('() ()', self.view_content())
+        self.assertEquals([(1, 1), (4, 4)], self.selections())

tutkain.py

@@ -603,6 +603,11 @@ def run(self, edit):
         paredit.comment_dwim(self.view, edit)
 
 
+class TutkainPareditKillCommand(sublime_plugin.TextCommand):
+    def run(self, edit):
+        paredit.kill(self.view, edit)
+
+
 class TutkainCycleCollectionTypeCommand(sublime_plugin.TextCommand):
     def run(self, edit):
         sexp.cycle_collection_type(self.view, edit)