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

More efficient implementation for finding longest matching snippet

Browse Source
This commit is contained in:
Kovid Goyal 2015-01-09 14:41:12 +05:30
parent acf0756b70
commit dfac0d2cd5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,7 @@ def snippets(refresh=False):
if snip['trigger'] and isinstance(snip['trigger'], type('')): if snip['trigger'] and isinstance(snip['trigger'], type('')):
key = snip_key(snip['trigger'], *snip['syntaxes']) key = snip_key(snip['trigger'], *snip['syntaxes'])
_snippets[key] = {'template':snip['template'], 'description':snip['description']} _snippets[key] = {'template':snip['template'], 'description':snip['description']}
_snippets = sorted(_snippets.iteritems(), key=(lambda (key, snip):string_length(key.trigger)), reverse=True)
return _snippets return _snippets
# Editor integration {{{ # Editor integration {{{
@ -345,10 +346,10 @@ def expand_template(editor, trigger, template):
def find_matching_snip(text, syntax=None, snip_func=None): def find_matching_snip(text, syntax=None, snip_func=None):
ans_snip = ans_trigger = None ans_snip = ans_trigger = None
for key, snip in (snip_func or snippets)().iteritems(): for key, snip in (snip_func or snippets)():
if text.endswith(key.trigger) and (syntax in key.syntaxes or syntax is None): if text.endswith(key.trigger) and (syntax in key.syntaxes or syntax is None):
if ans_trigger is None or len(key.trigger) > len(ans_trigger): ans_snip, ans_trigger = snip, key.trigger
ans_snip, ans_trigger = snip, key.trigger break
return ans_snip, ans_trigger return ans_snip, ans_trigger
class SnippetManager(QObject): class SnippetManager(QObject):
@ -489,7 +490,7 @@ class EditSnippet(QWidget):
def snip_func(self): def snip_func(self):
key = snip_key(self.trig.text(), '*') key = snip_key(self.trig.text(), '*')
return {key: self.snip} return ((key, self.snip),)
def apply_snip(self, snip, creating_snippet=None): def apply_snip(self, snip, creating_snippet=None):
self.creating_snippet = not snip if creating_snippet is None else creating_snippet self.creating_snippet = not snip if creating_snippet is None else creating_snippet