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

Fix an issue with namedtuples

Browse Source
This commit is contained in:
Dave Halter
2019-05-31 15:21:03 +02:00
parent 6d62e55b5e
commit 6cdde65052
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/helpers.py
View File

@@ -217,6 +217,9 @@ def get_int_or_none(context):
return _get_safe_value_or_none(context, int) return _get_safe_value_or_none(context, int)
def get_str_or_none(context):
return _get_safe_value_or_none(context, (bytes, unicode))
def is_number(context): def is_number(context):
return _get_safe_value_or_none(context, (int, float)) is not None return _get_safe_value_or_none(context, (int, float)) is not None

15
jedi/plugins/stdlib.py
View File

@@ -14,6 +14,7 @@ import parso
from jedi._compatibility import force_unicode from jedi._compatibility import force_unicode
from jedi.plugins.base import BasePlugin from jedi.plugins.base import BasePlugin
from jedi import debug from jedi import debug
from jedi.evaluate.helpers import get_str_or_none
from jedi.evaluate.arguments import ValuesArguments, \ from jedi.evaluate.arguments import ValuesArguments, \
repack_with_argument_clinic, AbstractArguments, TreeArgumentsWrapper repack_with_argument_clinic, AbstractArguments, TreeArgumentsWrapper
from jedi.evaluate import analysis from jedi.evaluate import analysis
@@ -397,10 +398,18 @@ def collections_namedtuple(obj, arguments):
evaluator = obj.evaluator evaluator = obj.evaluator
# Process arguments # Process arguments
name = u'jedi_unknown_namedtuple'
for c in _follow_param(evaluator, arguments, 0):
x = get_str_or_none(c)
if x is not None:
name = force_unicode(x)
break
# TODO here we only use one of the types, we should use all. # TODO here we only use one of the types, we should use all.
# TODO this is buggy, doesn't need to be a string param_contexts = _follow_param(evaluator, arguments, 1)
name = force_unicode(list(_follow_param(evaluator, arguments, 0))[0].get_safe_value()) if not param_contexts:
_fields = list(_follow_param(evaluator, arguments, 1))[0] return NO_CONTEXTS
_fields = list(param_contexts)[0]
if isinstance(_fields, compiled.CompiledValue): if isinstance(_fields, compiled.CompiledValue):
fields = force_unicode(_fields.get_safe_value()).replace(',', ' ').split() fields = force_unicode(_fields.get_safe_value()).replace(',', ' ').split()
elif isinstance(_fields, iterable.Sequence): elif isinstance(_fields, iterable.Sequence):