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

Infering multiple fields is fixed.

Browse Source
This commit is contained in:
ANtlord
2019-12-06 23:58:13 +02:00
parent fbeff00761
commit 654475b7d6
1 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
jedi/plugins/stdlib.py
View File

@@ -781,47 +781,33 @@ _implemented = {
} }
def new_django_dict_filter(cls): def infer_django_field(cls, field):
filter_ = ParserTreeFilter(parent_context=cls.as_context())
field, = filter_.values()
field_tree_instance, = field.infer() field_tree_instance, = field.infer()
if field_tree_instance.name.string_name in ('CharField', 'TextField', 'EmailField'): if field_tree_instance.name.string_name in ('CharField', 'TextField', 'EmailField'):
model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('str') model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('str')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
integer_field_classes = ('IntegerField', 'BigIntegerField', 'PositiveIntegerField', 'SmallIntegerField') integer_field_classes = ('IntegerField', 'BigIntegerField', 'PositiveIntegerField', 'SmallIntegerField')
if field_tree_instance.name.string_name in integer_field_classes: if field_tree_instance.name.string_name in integer_field_classes:
model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('int') model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('int')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'FloatField': if field_tree_instance.name.string_name == 'FloatField':
model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('float') model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('float')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'BinaryField': if field_tree_instance.name.string_name == 'BinaryField':
model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('bytes') model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('bytes')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'BooleanField': if field_tree_instance.name.string_name == 'BooleanField':
model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('bool') model_instance_field_type, = cls.inference_state.builtins_module.py__getattribute__('bool')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'DecimalField': if field_tree_instance.name.string_name == 'DecimalField':
model_instance_field_type, = cls.inference_state.import_module(('decimal',)).py__getattribute__('Decimal') model_instance_field_type, = cls.inference_state.import_module(('decimal',)).py__getattribute__('Decimal')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'ForeignKey': if field_tree_instance.name.string_name == 'ForeignKey':
# TODO: infer related object class and make a filter for that class # TODO: infer related object class and make a filter for that class
@@ -829,30 +815,29 @@ def new_django_dict_filter(cls):
if field_tree_instance.name.string_name == 'TimeField': if field_tree_instance.name.string_name == 'TimeField':
model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('time') model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('time')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'DurationField': if field_tree_instance.name.string_name == 'DurationField':
model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('timedelta') model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('timedelta')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'DateField': if field_tree_instance.name.string_name == 'DateField':
model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('date') model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('date')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
if field_tree_instance.name.string_name == 'DateTimeField': if field_tree_instance.name.string_name == 'DateTimeField':
model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('datetime') model_instance_field_type, = cls.inference_state.import_module(('datetime',)).py__getattribute__('datetime')
return [DictFilter({ return DjangoModelField(model_instance_field_type, field).name
field.string_name: DjangoModelField(model_instance_field_type, field).name
})]
def new_django_dict_filter(cls):
filter_ = ParserTreeFilter(parent_context=cls.as_context())
return [DictFilter({
f.string_name: infer_django_field(cls, f) for f in filter_.values()
})]
def get_metaclass_filters(func): def get_metaclass_filters(func):
def wrapper(cls, metaclasses): def wrapper(cls, metaclasses):
for metaclass in metaclasses: for metaclass in metaclasses: