Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a single edit block for template expansion

Browse Source
This commit is contained in:
Kovid Goyal 2015-01-08 08:38:00 +05:30
parent aed989d037
commit ed5ac9159e
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/gui2/tweak_book/editor/snippets.py
View File

@ -158,12 +158,21 @@ class EditorTabStop(object):
self.right = self.left + l self.right = self.left + l
self.mirrors = tuple(EditorTabStop(left, [ts], editor) for ts in tab_stops[1:]) self.mirrors = tuple(EditorTabStop(left, [ts], editor) for ts in tab_stops[1:])
self.ignore_position_update = False self.ignore_position_update = False
self.join_previous_edit = False
def __enter__(self):
self.join_previous_edit = True
def __exit__(self, *args):
self.join_previous_edit = False
def apply_selected_text(self, text): def apply_selected_text(self, text):
if self.takes_selection and not self.is_deleted: if self.takes_selection and not self.is_deleted:
self.text = text with self:
self.text = text
for m in self.mirrors: for m in self.mirrors:
m.text = text with m:
m.text = text
@dynamic_property @dynamic_property
def text(self): def text(self):
@ -179,8 +188,10 @@ class EditorTabStop(object):
if editor is None or self.is_deleted: if editor is None or self.is_deleted:
return return
c = editor.textCursor() c = editor.textCursor()
c.joinPreviousEditBlock() if self.join_previous_edit else c.beginEditBlock()
c.setPosition(self.left), c.setPosition(self.right, c.KeepAnchor) c.setPosition(self.left), c.setPosition(self.right, c.KeepAnchor)
c.insertText(text) c.insertText(text)
c.endEditBlock()
return property(fget=fget, fset=fset) return property(fget=fget, fset=fset)
def set_editor_cursor(self, editor): def set_editor_cursor(self, editor):
@ -266,6 +277,7 @@ class Template(list):
def expand_template(editor, trigger, template): def expand_template(editor, trigger, template):
c = editor.textCursor() c = editor.textCursor()
c.beginEditBlock()
c.setPosition(c.position()) c.setPosition(c.position())
right = c.position() right = c.position()
left = right - string_length(trigger) left = right - string_length(trigger)
@ -279,6 +291,7 @@ def expand_template(editor, trigger, template):
ts.set_editor_cursor(editor) ts.set_editor_cursor(editor)
else: else:
editor.setTextCursor(c) editor.setTextCursor(c)
c.endEditBlock()
return tl return tl
def find_matching_snip(text, syntax): def find_matching_snip(text, syntax):