Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
gerardroche committed Feb 23, 2019
1 parent b874a2a commit 556242b
Show file tree
Hide file tree
Showing 2 changed files with 195 additions and 205 deletions.
10 changes: 0 additions & 10 deletions nv/ex/completions.py
Expand Up @@ -41,21 +41,15 @@


def _iter_paths(prefix=None, from_dir=None, only_dirs=False):
print('iter_paths() prefix =', prefix, 'from_dir =', from_dir, 'only_dirs =', only_dirs)
if prefix:
start_at = os.path.expandvars(os.path.expanduser(prefix))
print('iter_paths() start_at =', start_at)
# TODO: implement env var completion.
if not prefix.startswith(('%', '$', '~')):
start_at = os.path.join(from_dir, prefix)
print('iter_paths() start_at =', start_at)
start_at = os.path.expandvars(os.path.expanduser(start_at))
print('iter_paths() start_at =', start_at)

prefix_split = os.path.split(prefix)
print('iter_paths() prefix_split =', prefix_split)
prefix_len = len(prefix_split[1])
print('iter_paths() prefix_len =', prefix_len)

if ('/' in prefix and not prefix_split[0]):
prefix_len = 0
Expand All @@ -64,13 +58,10 @@ def _iter_paths(prefix=None, from_dir=None, only_dirs=False):
if not only_dirs or os.path.isdir(path):
suffix = ('/' if os.path.isdir(path) else '')
item = os.path.split(path)[1]
print('iter_paths() item =', item)
yield prefix + (item + suffix)[prefix_len:]
else:
prefix = from_dir
print('iter_paths() prefix =', prefix)
start_at = os.path.expandvars(os.path.expanduser(prefix))
print('iter_paths() start_at =', start_at)
for path in sorted(glob.iglob(start_at + '*')):
if not only_dirs or os.path.isdir(path):
yield path[len(start_at):] + ('' if not os.path.isdir(path) else '/')
Expand Down Expand Up @@ -195,7 +186,6 @@ def _update(self, edit, cmd, prefix, only_dirs):
_FsCompletion.is_stale = True

if prefix == '..':
print('prefix =', '..')
_FsCompletion.prefix = '../'
_write_to_ex_cmdline(self.view, edit, cmd, '../')

Expand Down

0 comments on commit 556242b

Please sign in to comment.