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

Fix another django modelfield issue

Browse Source
This commit is contained in:
Dave Halter
2020-04-22 00:54:43 +02:00
parent 17eeb73767
commit f9176578ea
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
jedi/plugins/django.py
View File

@@ -58,31 +58,32 @@ def _infer_scalar_field(inference_state, field_name, field_tree_instance):
else: else:
module = inference_state.import_module((module_name,)) module = inference_state.import_module((module_name,))
attribute, = module.py__getattribute__(attribute_name) for attribute in module.py__getattribute__(attribute_name):
return DjangoModelField(attribute, field_name) return DjangoModelField(attribute, field_name)
def _infer_field(cls, field_name): def _infer_field(cls, field_name):
inference_state = cls.inference_state inference_state = cls.inference_state
field_tree_instance, = field_name.infer() for field_tree_instance in field_name.infer():
scalar_field = _infer_scalar_field(inference_state, field_name, field_tree_instance) scalar_field = _infer_scalar_field(inference_state, field_name, field_tree_instance)
if scalar_field: if scalar_field:
return scalar_field return scalar_field
if field_tree_instance.py__name__() == 'ForeignKey': if field_tree_instance.py__name__() == 'ForeignKey':
if isinstance(field_tree_instance, TreeInstance): if isinstance(field_tree_instance, TreeInstance):
# TODO private access.. # TODO private access..
argument_iterator = field_tree_instance._arguments.unpack() argument_iterator = field_tree_instance._arguments.unpack()
key, lazy_values = next(argument_iterator, (None, None)) key, lazy_values = next(argument_iterator, (None, None))
if key is None and lazy_values is not None: if key is None and lazy_values is not None:
for value in lazy_values.infer(): for value in lazy_values.infer():
if value.py__name__() == 'str': if value.py__name__() == 'str':
foreign_key_class_name = value.get_safe_value() foreign_key_class_name = value.get_safe_value()
for v in cls.get_root_context().py__getattribute__(foreign_key_class_name): module = cls.get_root_context()
if v.is_class(): for v in module.py__getattribute__(foreign_key_class_name):
return DjangoModelField(v, field_name) if v.is_class():
elif value.is_class(): return DjangoModelField(v, field_name)
return DjangoModelField(value, field_name) elif value.is_class():
return DjangoModelField(value, field_name)
debug.dbg('django plugin: fail to infer `%s` from class `%s`', debug.dbg('django plugin: fail to infer `%s` from class `%s`',
field_name.string_name, cls.py__name__()) field_name.string_name, cls.py__name__())

10
test/completion/django.py
View File

@@ -17,6 +17,7 @@ class BusinessModel(models.Model):
category_fk2 = models.ForeignKey('Category') category_fk2 = models.ForeignKey('Category')
category_fk3 = models.ForeignKey(1) category_fk3 = models.ForeignKey(1)
category_fk4 = models.ForeignKey('models') category_fk4 = models.ForeignKey('models')
category_fk5 = models.ForeignKey()
integer_field = models.IntegerField() integer_field = models.IntegerField()
big_integer_field = models.BigIntegerField() big_integer_field = models.BigIntegerField()
positive_integer_field = models.PositiveIntegerField() positive_integer_field = models.PositiveIntegerField()
@@ -34,6 +35,8 @@ class BusinessModel(models.Model):
date_time_field = models.DateTimeField() date_time_field = models.DateTimeField()
tags_m2m = models.ManyToManyField(Tag) tags_m2m = models.ManyToManyField(Tag)
unidentifiable = NOT_FOUND
model_instance = BusinessModel() model_instance = BusinessModel()
#? int() #? int()
@@ -79,6 +82,13 @@ model_instance.category_fk2.category_name
model_instance.category_fk3 model_instance.category_fk3
#? models.ForeignKey() #? models.ForeignKey()
model_instance.category_fk4 model_instance.category_fk4
#? models.ForeignKey()
model_instance.category_fk5
#? models.ManyToManyField() #? models.ManyToManyField()
model_instance.tags_m2m model_instance.tags_m2m
#?
model_instance.unidentifiable
#! ['unidentifiable = NOT_FOUND']
model_instance.unidentifiable