Cleaned up code; updated docs.

doc/UltiSnips.txt

@@ -335,12 +335,17 @@ You can also redefine the search path on a buffer by buffer basis by setting
 the variable b:UltiSnipsSnippetDirectories.  This variable takes precedence
 over the global variable.
 
-UltiSnips searches in 'runtimepath' for snippet directories but traverses
+UltiSnips searches in 'runtimepath' for snippet directories and attempts to
-'runtimepath' in reverse order (last item first). If you would like to have
+determine if 'runtimepath' should be traversed in normal or reverse order. If
-UltiSnips traverse 'runtimepath' in the standard order, add this to your vimrc
+you would like to override the order UltiSnips detected for 'runtimepath', add
+this to your vimrc
 file: >
+   " Traverse in normal order
    let g:UltiSnipsDontReverseSearchPath="1"
 
+   " Traverse in reverse order
+   let g:UltiSnipsDontReverseSearchPath="0"
+
 By default, whenever a snippet expand is triggered, UltiSnips will check for
 modifications to the snippet file associated with the filetype and reload it
 if necessary. This behavior can be disabled as follows: >

plugin/UltiSnips/__init__.py

@@ -16,6 +16,46 @@ from UltiSnips.text_objects import SnippetInstance
 from UltiSnips.util import IndentUtil
 import UltiSnips._vim as _vim
 
+def _plugin_dir():
+    d = __file__
+    for i in xrange(3):
+        d = os.path.dirname(d)
+
+    return d
+
+def _snippets_dir_is_before_plugin_dir():
+    def no_slash(path):
+        path_dir, path_base = os.path.split(path)
+
+        if path_base == "":
+            return path_dir
+        else:
+            return path
+
+    paths = [ no_slash(os.path.expanduser(p))
+        for p in _vim.eval("&runtimepath").split(',') ]
+
+    home = _vim.eval("$HOME")
+
+    def vim_path_index(suffix):
+        path = no_slash(os.path.join(home, suffix))
+        try:
+            return paths.index(path)
+        except ValueError:
+            return -1
+
+    try:
+        vim_dir_index = max(vim_path_index(".vim"), vim_path_index("vimfiles"))
+        return paths.index(_plugin_dir()) < vim_dir_index
+    except ValueError:
+        return False
+
+def _should_reverse_search_path():
+    if _vim.eval("exists('g:UltiSnipsDontReverseSearchPath')") != "0":
+       return _vim.eval("g:UltiSnipsDontReverseSearchPath") != "0"
+
+    return not _snippets_dir_is_before_plugin_dir()
+
 def err_to_scratch_buffer(f):
     @wraps(f)
     def wrapper(self, *args, **kwds):
@@ -965,7 +1005,7 @@ class SnippetManager(object):
 
         paths = _vim.eval("&runtimepath").split(',')
 
-        if self._should_reverse_search_path():
+        if _should_reverse_search_path():
             paths = paths[::-1]
 
         for rtp in paths:
@@ -983,57 +1023,6 @@ class SnippetManager(object):
 
         return ret
 
-    def _plugin_dir(self):
-        def apply_n_times(f, x, n):
-            if n < 1:
-                return x
-            else:
-                return apply_n_times(f, f(x), n - 1)
-
-        return apply_n_times(os.path.dirname, __file__, 3)
-
-    def _snippets_dir_is_before_plugin_dir(self):
-        def no_slash(path):
-            path_dir, path_base = os.path.split(path)
-
-            if path_base == "":
-                return path_dir
-            else:
-                return path
-
-        paths = _vim.eval("&runtimepath").split(',')
-        paths = map(os.path.expanduser, paths)
-        paths = map(no_slash, paths)
-
-        home = _vim.eval("$HOME")
-
-        def path_index_of(p):
-            try:
-                return paths.index(p)
-            except ValueError:
-                return -1
-
-        def vim_path_index(suffix):
-            return path_index_of(no_slash(os.path.join(home, suffix)))
-
-        plugin_dir = self._plugin_dir()
-
-        try:
-            vim1 = vim_path_index(".vim")
-            vim2 = vim_path_index("vimfiles")
-            max_vim_dir_index = max(vim1, vim2)
-            plugin_dir_index = paths.index(plugin_dir)
-            return plugin_dir_index < max_vim_dir_index
-        except ValueError:
-            return False
-
-    def _should_reverse_search_path(self):
-        reverse_setting = \
-           _vim.eval("exists('g:UltiSnipsDontReverseSearchPath')") != "0" and \
-           _vim.eval("g:UltiSnipsDontReverseSearchPath") != "0"
-
-        return reverse_setting or not self._snippets_dir_is_before_plugin_dir()
-
     @property
     def primary_filetype(self):
         """ Property for the primary filetype. This filetype