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

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-22 08:36:35 +05:30
parent 1b506eefb2
commit e3d95929ac
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/gui2/tweak_book/editor/smarts/python.py
View File

@ -37,6 +37,12 @@ class Smarts(NullSmarts):
override_tab_stop_width = 4 override_tab_stop_width = 4
def __init__(self, *args, **kwargs):
NullSmarts.__init__(self, *args, **kwargs)
c = re.compile
self.escape_scope_pat = c(r'\s+(continue|break|return|pass)(\s|$)')
self.dedent_pat = c(r'\s+(else|elif|except)(\(|\s|$)')
def handle_key_press(self, ev, editor): def handle_key_press(self, ev, editor):
key = ev.key() key = ev.key()
@ -70,7 +76,7 @@ class Smarts(NullSmarts):
line = cursor.block().text() line = cursor.block().text()
if line.rstrip().endswith(':'): if line.rstrip().endswith(':'):
ls += ' ' * 4 ls += ' ' * 4
elif re.match(r'\s+(continue|break|return|pass)(\s|$)', line) is not None: elif self.escape_scope_pat.match(line) is not None:
ls = ls[:-4] ls = ls[:-4]
cursor.insertText('\n' + ls) cursor.insertText('\n' + ls)
editor.setTextCursor(cursor) editor.setTextCursor(cursor)
@ -78,7 +84,7 @@ class Smarts(NullSmarts):
elif key == Qt.Key_Colon: elif key == Qt.Key_Colon:
cursor, text = get_text_before_cursor(editor) cursor, text = get_text_before_cursor(editor)
if re.match(r'\s+(else|elif|except)(\(|\s|$)', text) is not None: if self.dedent_pat.search(text) is not None:
ls = get_leading_whitespace_on_line(editor) ls = get_leading_whitespace_on_line(editor)
pls = get_leading_whitespace_on_line(editor, previous=True) pls = get_leading_whitespace_on_line(editor, previous=True)
if ls and ls >= pls: if ls and ls >= pls: