Fix Double Quote on selections #9

Author: eerohele

paredit.py

@@ -71,18 +71,31 @@ def close_bracket(view, edit, close_bracket):
 
 def double_quote(view, edit):
     for region, sel in iterate(view):
-        begin = region.begin()
-        end = region.end()
-
-        if view.substr(end) == '"':
-            sel.append(sublime.Region(end + 1, end + 1))
-        elif sexp.inside_string(view, begin):
-            view.insert(edit, begin, '\\"')
-        elif sexp.inside_comment(view, begin):
-            view.insert(edit, begin, '"')
+        if region.empty():
+            begin = region.begin()
+            end = region.end()
+
+            if view.substr(end) == '"':
+                sel.append(sublime.Region(end + 1, end + 1))
+            elif sexp.inside_string(view, begin):
+                view.insert(edit, begin, '\\"')
+            elif sexp.inside_comment(view, begin):
+                view.insert(edit, begin, '"')
+            else:
+                view.insert(edit, begin, '""')
+                sel.append(sublime.Region(end + 1, end + 1))
         else:
-            view.insert(edit, begin, '""')
-            sel.append(sublime.Region(end + 1, end + 1))
+            this = sexp.innermost(view, region.begin(), edge=False)
+            that = sexp.innermost(view, region.end(), edge=False)
+
+            if this == that:
+                view.insert(edit, region.end(), '"')
+                view.insert(edit, region.begin(), '"')
+            else:
+                # If the two ends of the region are inside different sexps, abort and insert double
+                # quotes at the beginning of the region.
+                view.insert(edit, region.begin(), '""')
+                sel.append(region.begin() + 1)
 
 
 def has_null_character(view, point):

sexp.py

@@ -32,6 +32,9 @@ def absorb_macro_characters(self, region):
 
         return Region(begin, region.end())
 
+    def __eq__(self, other):
+        return other and self.extent() == other.extent()
+
 
 def inside_string(view, point):
     return view.match_selector(

tests/test_paredit.py

@@ -170,6 +170,20 @@ def test_double_quote_simple(self):
         self.assertEquals('""', self.view_content())
         self.assertEquals(self.selections(), [(1, 1)])
 
+    def test_double_quote_selection(self):
+        self.set_view_content('(foo)')
+        self.set_selections((1, 4))
+        self.view.run_command('tutkain_paredit_double_quote')
+        self.assertEquals('("foo")', self.view_content())
+        self.assertEquals(self.selections(), [(2, 5)])
+
+    def test_double_quote_selection_across_sexps(self):
+        self.set_view_content('(foo) (bar)')
+        self.set_selections((4, 9))
+        self.view.run_command('tutkain_paredit_double_quote')
+        self.assertEquals('(foo"") (bar)', self.view_content())
+        self.assertEquals(self.selections(), [(5, 5)])
+
     def test_double_quote_inside_string(self):
         self.set_view_content('" "')
         self.set_selections((1, 1))