VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Remove some code that is not necessary anmore, because of an improvment in get_parent_scope

Browse Source
This commit is contained in:
Dave Halter
2019-04-13 01:57:50 +02:00
parent 05eb06d91b
commit 3c74b9bf10
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jedi/evaluate/helpers.py
View File

@@ -8,7 +8,7 @@ from contextlib import contextmanager
from parso.python import tree
from jedi._compatibility import unicode
from jedi.parser_utils import get_parent_scope, is_name_of_func_or_class_def
from jedi.parser_utils import get_parent_scope
def is_stdlib_path(path):
@@ -175,21 +175,6 @@ def get_module_names(module, all_scopes):
def is_module_scope_name(name):
parent_scope = get_parent_scope(name)
if is_name_of_func_or_class_def(name, parent_scope):
# XXX: In syntax tree function- and class-name nodes are immediate children of
# their respective class-definition or function-definition nodes. Technically,
# get_parent_scope(...) for them should return the parent of the definition node,
# because
#
# def foo(...): pass
#
# is equivalent to
#
# foo = lambda(...): None
#
# but that would be a big change that could break type inference, whereas for now
# this discrepancy looks like only a problem for "get_module_names".
parent_scope = parent_scope.parent
# async functions have an extra wrapper. Strip it.
if parent_scope and parent_scope.type == 'async_stmt':
parent_scope = parent_scope.parent

8
jedi/parser_utils.py
View File

@@ -242,14 +242,6 @@ def is_scope(node):
return node.type in ('file_input', 'classdef', 'funcdef', 'lambdef', 'comp_for')
def is_name_of_func_or_class_def(name_node, func_or_class_def_node):
"""Return True if name_node is the name of the func_or_class_def_node."""
return (
name_node.parent is func_or_class_def_node and
name_node.type == 'name' and
func_or_class_def_node.type in ('classdef', 'funcdef'))
def get_parent_scope(node, include_flows=False):
"""
Returns the underlying scope.