Merge branch 'master' of github.com:davidhalter/jedi

test/completion/conftest.py

@@ -23,7 +23,7 @@ def inheritance_fixture():
 
 
 @pytest.fixture
-def testdir(testdir):
-    #? ['chdir']
-    testdir.chdir
-    return testdir
+def capsysbinary(capsysbinary):
+    #? ['close']
+    capsysbinary.clos
+    return capsysbinary

test/completion/django.py

@@ -5,6 +5,7 @@ import uuid
 from django.db import models
 from django.contrib.auth.models import User
 from django.db.models.query_utils import DeferredAttribute
+from django.db.models.manager import BaseManager
 
 
 class TagManager(models.Manager):

test/completion/pep0526_variables.py

@@ -44,7 +44,7 @@ class Foo():
     baz: typing.ClassVar[str]
 
 
-#?
+#? int()
 Foo.bar
 #? int()
 Foo().bar
@@ -58,6 +58,7 @@ class VarClass:
     var_instance2: float
     var_class1: typing.ClassVar[str] = 1
     var_class2: typing.ClassVar[bytes]
+    var_class3 = None
 
     def __init__(self):
         #? int()
@@ -70,15 +71,21 @@ class VarClass:
         d.var_class2
         #? []
         d.int
-        #? ['var_class1', 'var_class2', 'var_instance1', 'var_instance2']
+        #? ['var_class1', 'var_class2', 'var_instance1', 'var_instance2', 'var_class3']
         self.var_
 
+class VarClass2(VarClass):
+    var_class3: typing.ClassVar[int]
 
-#? ['var_class1', 'var_class2', 'var_instance1']
+    def __init__(self):
+        #? int()
+        self.var_class3
+
+#? ['var_class1', 'var_class2', 'var_instance1', 'var_class3', 'var_instance2']
 VarClass.var_
 #? int()
 VarClass.var_instance1
-#?
+#? float()
 VarClass.var_instance2
 #? str()
 VarClass.var_class1
@@ -88,7 +95,7 @@ VarClass.var_class2
 VarClass.int
 
 d = VarClass()
-#? ['var_class1', 'var_class2', 'var_instance1', 'var_instance2']
+#? ['var_class1', 'var_class2', 'var_class3', 'var_instance1', 'var_instance2']
 d.var_
 #? int()
 d.var_instance1

test/completion/pytest.py

@@ -139,9 +139,6 @@ def test_p(monkeypatch):
 #? ['capsysbinary']
 def test_p(capsysbin
 
-#? ['tmpdir', 'tmpdir_factory']
-def test_p(tmpdi
-
 
 def close_parens():
     pass
@@ -183,3 +180,28 @@ def with_annot() -> Generator[float, None, None]:
 def test_with_annot(inheritance_fixture, with_annot):
     #? float()
     with_annot
+
+# -----------------
+# pytest external plugins
+# -----------------
+
+#? ['admin_user', 'admin_client']
+def test_z(admin
+
+#! 15 ['def admin_client']
+def test_p(admin_client):
+    #? ['login', 'logout']
+    admin_client.log
+
+@pytest.fixture
+@some_decorator
+#? ['admin_user']
+def bla(admin_u
+    return
+
+@pytest.fixture
+@some_decorator
+#! 12 ['def admin_user']
+def bla(admin_user):
+    pass
+