VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Fix a few issues around duplicated import paths, fixes #2033

Browse Source
This commit is contained in:
Dave Halter
2024-11-25 00:52:47 +01:00
parent 41e9e957e7
commit ecb922c6ff
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/api/completion.py
View File

@@ -683,14 +683,14 @@ def search_in_module(inference_state, module_context, names, wanted_names,
def extract_imported_names(node):
imported_names = []
if node.type in ['import_as_names', 'dotted_as_names', 'import_as_name']:
if node.type in ['import_as_names', 'dotted_as_names', 'dotted_as_name', 'import_as_name']:
for index, child in enumerate(node.children):
if child.type == 'name':
if (index > 0 and node.children[index - 1].type == "keyword"
if (index > 1 and node.children[index - 1].type == "keyword"
and node.children[index - 1].value == "as"):
continue
imported_names.append(child.value)
elif child.type == 'import_as_name':
elif child.type in ('import_as_name', 'dotted_as_name'):
imported_names.extend(extract_imported_names(child))
return imported_names

9
test/test_inference/test_imports.py
View File

@@ -318,9 +318,14 @@ def test_duplicated_import(Script):
s = 'from os import path, p'
assert 'path' not in import_names(s)
assert 'path' in import_names(s, column=len(s) - 3)
assert 'path' in import_names("from import path")
assert 'path' in import_names("from import chdir, path")
s = 'import path as pp, p'
assert 'path' not in import_names(s)
s = 'import math as mm, m'
assert 'math' not in import_names(s)
s = 'import math as os, o'
assert 'os' in import_names(s)
s = 'from os import path as pp, p'
assert 'path' not in import_names(s)