vim/UltiSnips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied Ryans fix for bug 720611

Browse Source
This commit is contained in:
Holger Rapp 2011-03-14 20:00:51 +01:00
commit 00164824f1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/UltiSnips/__init__.py
View File

@ -1010,7 +1010,7 @@ class SnippetManager(object):
if p not in self._snippets: if p not in self._snippets:
self._load_snippets_for(p) self._load_snippets_for(p)
def _find_snippets(self, ft, trigger, potentially = False): def _find_snippets(self, ft, trigger, potentially = False, seen=None):
""" """
Find snippets matching trigger Find snippets matching trigger
@ -1024,9 +1024,17 @@ class SnippetManager(object):
if not snips: if not snips:
return [] return []
parent_results = reduce( lambda a,b: a+b, if not seen:
[ self._find_snippets(p, trigger, potentially) seen = []
for p in snips.extends ], []) seen.append(ft)
parent_results = []
for p in snips.extends:
if p not in seen:
seen.append(p)
parent_results += self._find_snippets(p, trigger,
potentially, seen)
return parent_results + snips.get_matching_snippets( return parent_results + snips.get_matching_snippets(
trigger, potentially) trigger, potentially)