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

Get rid of the node_is_value parameter

Browse Source
This commit is contained in:
Dave Halter
2019-08-23 00:02:39 +02:00
parent bd754718e1
commit 05fe29a156
3 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jedi/inference/compiled/mixed.py
View File

@@ -289,13 +289,10 @@ def _create(inference_state, access_handle, parent_context, *args):
return ValueSet({compiled_object})
module_context = parent_context.get_root_context()
tree_values = ValueSet({
module_context.create_context(
tree_node,
node_is_value=True,
)._value
# TODO private access!
})
if tree_node is module_node:
tree_values = ValueSet({module_context.get_value()})
else:
tree_values = ValueSet({module_context.create_value(tree_node)})
if tree_node.type == 'classdef':
if not access_handle.is_class():
# Is an instance, not a class.

45
jedi/inference/context.py
View File

@@ -43,7 +43,7 @@ class AbstractContext(object):
else:
raise NotImplementedError("Probably shouldn't happen: %s" % node)
def create_context(self, node, node_is_value=False):
def create_context(self, node):
def from_scope_node(scope_node, is_nested=True):
if scope_node == base_node:
return self
@@ -60,31 +60,28 @@ class AbstractContext(object):
base_node = self.tree_node
if node_is_value and parser_utils.is_scope(node):
scope_node = node
else:
def parent_scope(node):
while True:
node = node.parent
def parent_scope(node):
while True:
node = node.parent
if parser_utils.is_scope(node):
return node
elif node.type in ('argument', 'testlist_comp'):
if node.children[1].type in ('comp_for', 'sync_comp_for'):
return node.children[1]
elif node.type == 'dictorsetmaker':
for n in node.children[1:4]:
# In dictionaries it can be pretty much anything.
if n.type in ('comp_for', 'sync_comp_for'):
return n
if parser_utils.is_scope(node):
return node
elif node.type in ('argument', 'testlist_comp'):
if node.children[1].type in ('comp_for', 'sync_comp_for'):
return node.children[1]
elif node.type == 'dictorsetmaker':
for n in node.children[1:4]:
# In dictionaries it can be pretty much anything.
if n.type in ('comp_for', 'sync_comp_for'):
return n
scope_node = parent_scope(node)
if scope_node.type in ('funcdef', 'classdef'):
colon = scope_node.children[scope_node.children.index(':')]
if node.start_pos < colon.start_pos:
parent = node.parent
if not (parent.type == 'param' and parent.name == node):
scope_node = parent_scope(scope_node)
scope_node = parent_scope(node)
if scope_node.type in ('funcdef', 'classdef'):
colon = scope_node.children[scope_node.children.index(':')]
if node.start_pos < colon.start_pos:
parent = node.parent
if not (parent.type == 'param' and parent.name == node):
scope_node = parent_scope(scope_node)
return from_scope_node(scope_node, is_nested=True)
def goto(self, name_or_str, position):