Merge c078c42a94 into 6aee460b1d

Fix inheritance diagram

.readthedocs.yml

@@ -14,3 +14,5 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.11"
+  apt_packages:
+    - graphviz

jedi/api/completion.py

@@ -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

test/test_api/test_interpreter.py

@@ -9,8 +9,10 @@ import pytest
 
 import jedi
 import jedi.settings
+from jedi import Project
 from jedi.inference.compiled import mixed
 from importlib import import_module
+from test.helpers import get_example_dir
 
 
 class _GlobalNameSpace:
@@ -591,6 +593,23 @@ def test_dict_completion(code, column, expected):
     assert [c.complete for c in comps] == expected
 
 
+def test_implicit_namespace_package_with_subpackages(monkeypatch):
+    sys_path_dir1 = get_example_dir('implicit_namespace_package_with_subpackages', 'ns1')
+    sys_path_dir2 = get_example_dir('implicit_namespace_package_with_subpackages', 'ns2')
+    monkeypatch.syspath_prepend(sys_path_dir1)
+    monkeypatch.syspath_prepend(sys_path_dir2)
+
+    import pkg_implicit_namespace_package_test
+    interpreter = jedi.Interpreter(
+        "pkg_implicit_namespace_package_test.",
+        namespaces=[locals()],
+        project=Project('.')
+    )
+    comps = interpreter.complete()
+    expected = ["pkgA", "pkgB"]
+    assert [c.complete for c in comps] == expected
+
+
 @pytest.mark.parametrize(
     'code, types', [
         ('dct[1]', ['int']),

test/test_inference/test_imports.py

@@ -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 os import path")
+    assert 'path' in import_names("from os 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)