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

Fix priorities to work with partial matches.

Browse Source 
Do not delete all lower priority snippets, only those that are defined
elsewhere too.
This commit is contained in:
Holger Rapp 2014-02-19 22:09:22 +01:00
parent 980891c3df
commit bb047c70ca
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pythonx/UltiSnips/snippet_manager.py
View File

@ -396,15 +396,21 @@ class SnippetManager(object):
possible matches.
"""
filetypes = self._filetypes[_vim.buf.number][::-1]
snippets = []
matching_snippets = defaultdict(list)
for provider in self._snippet_providers:
snippets.extend(provider.get_snippets(filetypes, before, possible))
if not snippets:
for snippet in provider.get_snippets(filetypes, before, possible):
matching_snippets[snippet.trigger].append(snippet)
if not matching_snippets:
return []
# Only keep the snippets with the highest priority.
highest_priority = max(snip.priority for snip in snippets)
return [s for s in snippets if s.priority == highest_priority]
# Now filter duplicates and only keep the one with the highest
# priority. Only keep the snippets with the highest priority.
snippets = []
for snippets_with_trigger in matching_snippets.values():
highest_priority = max(s.priority for s in snippets_with_trigger)
snippets.extend(s for s in snippets_with_trigger
if s.priority == highest_priority)
return snippets
def _do_snippet(self, snippet, before):
"""Expands the given snippet, and handles everything