Merge lp:~ryan.wooden/ultisnips/fix-720611 into lp:~sirver/ultisnips/trunk

[Ryan Wooden]

Simple fix for Bug #720611. It keeps track of which filetypes have been checked, and doesn't retry them.

[SirVer (sirver)]

Merged without modification. Thanks Ryan.

=== modified file 'plugin/UltiSnips/__init__.py'
--- plugin/UltiSnips/__init__.py	2011-02-20 20:16:56 +0000
+++ plugin/UltiSnips/__init__.py	2011-03-01 03:34:48 +0000
@@ -1010,7 +1010,7 @@
             if p not in self._snippets:
                 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
 
@@ -1024,9 +1024,17 @@
         if not snips:
             return []
 
-        parent_results = reduce( lambda a,b: a+b,
-            [ self._find_snippets(p, trigger, potentially)
-                for p in snips.extends ], [])
+        if not seen:
+            seen = []
+        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(
             trigger, potentially)