VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-02-26 06:37:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some stuff to make parso work again.

Browse Source
This commit is contained in:
Dave Halter
2017-06-02 00:00:31 +02:00
parent af26cc9f05
commit e0485b032e
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/evaluate/__init__.py
View File

@@ -449,10 +449,9 @@ class Evaluator(object):
if is_simple_name:
if name.parent.type == 'classdef' and name.parent.name == name:
return [er.ClassContext(self, name.parent, context)]
elif name.parent.type == 'funcdef':
elif name.parent.type == 'funcdef' and name.parent.name == name:
return [er.FunctionContext(self, context, name.parent)]
elif name.parent.type == 'file_input':
raise NotImplementedError
if def_.type == 'expr_stmt' and name in def_.get_defined_names():
return self.eval_statement(context, def_, name)
elif def_.type == 'for_stmt' and \
@@ -592,7 +591,7 @@ class Evaluator(object):
if node_is_context and parser_utils.is_scope(node):
scope_node = node
else:
if node.parent.type in ('funcdef', 'classdef'):
if node.parent.type in ('funcdef', 'classdef') and node.parent.name == node:
# When we're on class/function names/leafs that define the
# object itself and not its contents.
node = node.parent