VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-09 23:34:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

in os.path.join completions, directories should not end in a slash

Browse Source
This commit is contained in:
Dave Halter
2019-08-07 01:37:58 +02:00
parent 5726c29385
commit 1b064c1078
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/api/file_name.py
View File

@@ -20,7 +20,7 @@ def file_name_completions(evaluator, module_context, start_leaf, string, like_na
must_start_with = os.path.basename(string) + like_name must_start_with = os.path.basename(string) + like_name
string = os.path.dirname(string) string = os.path.dirname(string)
string = _maybe_add_os_path_join(module_context, start_leaf, string) string, is_in_os_path_join = _maybe_add_os_path_join(module_context, start_leaf, string)
base_path = os.path.join(evaluator.project._path, string) base_path = os.path.join(evaluator.project._path, string)
try: try:
listed = os.listdir(base_path) listed = os.listdir(base_path)
@@ -29,7 +29,7 @@ def file_name_completions(evaluator, module_context, start_leaf, string, like_na
for name in listed: for name in listed:
if name.startswith(must_start_with): if name.startswith(must_start_with):
path_for_name = os.path.join(base_path, name) path_for_name = os.path.join(base_path, name)
if os.path.isdir(path_for_name): if os.path.isdir(path_for_name) and not is_in_os_path_join:
name += os.path.sep name += os.path.sep
yield classes.Completion( yield classes.Completion(
@@ -97,8 +97,8 @@ def _maybe_add_os_path_join(module_context, start_leaf, string):
contexts = context.eval_node(atom) contexts = context.eval_node(atom)
if any([c.name.get_qualified_names(include_module_names=True) if any([c.name.get_qualified_names(include_module_names=True)
!= ('os', 'path', 'join') for c in contexts]): != ('os', 'path', 'join') for c in contexts]):
return string return string, False
nodes = arglist.children[:arglist.children.index(start_leaf):2] nodes = arglist.children[:arglist.children.index(start_leaf):2]
return _add_strings(module_context, nodes, add_slash=True) return _add_strings(module_context, nodes, add_slash=True), True
return string return string, False

1
test/test_api/test_completion.py
View File

@@ -215,6 +215,7 @@ os_path = 'from os.path import *\n'
(f2, os_path + 'join(dirname(__file__), "completion", "basi")', 43, ['c.py']), (f2, os_path + 'join(dirname(__file__), "completion", "basi")', 43, ['c.py']),
(f2, os_path + 'join(dirname(__file__), "completion", "basi)', 35, []), (f2, os_path + 'join(dirname(__file__), "completion", "basi)', 35, []),
(f2, os_path + 'join(dirname(__file__), "completion", "basi)', 33, ['on']), (f2, os_path + 'join(dirname(__file__), "completion", "basi)', 33, ['on']),
(f2, os_path + 'join(dirname(__file__), "completion", "basi")', 33, ['on']),
] ]
) )
def test_file_path_completions(Script, file, code, column, expected): def test_file_path_completions(Script, file, code, column, expected):