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

Fixed search order detection for symlinked vim dir

Browse Source
This commit is contained in:
Brian Mock 2014-01-03 23:08:29 -08:00
parent bc391a330d
commit ccbefbc209
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/UltiSnips/__init__.py
View File

@ -32,18 +32,19 @@ def _snippets_dir_is_before_plugin_dir():
""" Returns True if the snippets directory comes before the plugin """ Returns True if the snippets directory comes before the plugin
directory in Vim's runtime path. False otherwise. directory in Vim's runtime path. False otherwise.
""" """
paths = [ os.path.expanduser(p).rstrip(os.path.sep) paths = [ os.path.realpath(os.path.expanduser(p)).rstrip(os.path.sep)
for p in _vim.eval("&runtimepath").split(',') ] for p in _vim.eval("&runtimepath").split(',') ]
home = _vim.eval("$HOME") home = _vim.eval("$HOME")
def vim_path_index(suffix): def vim_path_index(suffix):
path = os.path.join(home, suffix).rstrip(os.path.sep) path = os.path.realpath(os.path.join(home, suffix)).rstrip(os.path.sep)
try: try:
return paths.index(path) return paths.index(path)
except ValueError: except ValueError:
return -1 return -1
try: try:
real_vim_path_index = max(vim_path_index(".vim"), vim_path_index("vimfiles")) real_vim_path_index = max(vim_path_index(".vim"), vim_path_index("vimfiles"))
return paths.index(_plugin_dir()) < real_vim_path_index plugin_path_index = paths.index(_plugin_dir())
return plugin_path_index < real_vim_path_index
except ValueError: except ValueError:
return False return False