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

filtering private variables is now also possible for CompiledObject (important for fake/builtins.pym).

Browse Source
This commit is contained in:
Dave Halter
2015-01-07 15:08:46 +01:00
parent c451c0b29e
commit dd40991669
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
jedi/evaluate/finder.py
View File

@@ -39,19 +39,19 @@ def filter_definition_names(names, origin, position=None):
if isinstance(stmt, (pr.CompFor, pr.Lambda, pr.GlobalStmt)): if isinstance(stmt, (pr.CompFor, pr.Lambda, pr.GlobalStmt)):
return names return names
# Private name mangling (compile.c) disallows access on names
# preceeded by two underscores `__` if used outside of the class. Names
# that also end with two underscores (e.g. __id__) are not affected.
names = list(names)
for name in names:
if name.value.startswith('__') and not name.value.endswith('__'):
if filter_private_variable(scope, origin):
names.remove(name)
if not (isinstance(scope, er.FunctionExecution) if not (isinstance(scope, er.FunctionExecution)
and isinstance(scope.base, er.LambdaWrapper)): and isinstance(scope.base, er.LambdaWrapper)):
names = pr.filter_after_position(names, position) names = pr.filter_after_position(names, position)
return [name for name in names if name.is_definition()] names = [name for name in names if name.is_definition()]
# Private name mangling (compile.c) disallows access on names
# preceeded by two underscores `__` if used outside of the class. Names
# that also end with two underscores (e.g. __id__) are not affected.
for name in list(names):
if name.value.startswith('__') and not name.value.endswith('__'):
if filter_private_variable(scope, origin):
names.remove(name)
return names
class NameFinder(object): class NameFinder(object):
@@ -655,12 +655,17 @@ def check_tuple_assignments(types, name):
return types return types
def filter_private_variable(scope, search_name): def filter_private_variable(scope, origin_node):
"""Check if a variable is defined inside the same class or outside.""" """Check if a variable is defined inside the same class or outside."""
# TODO integrate this in the function that checks this.
instance = scope.get_parent_scope() instance = scope.get_parent_scope()
coming_from = search_name coming_from = origin_node
while coming_from is not None and not isinstance(coming_from, pr.Class): while coming_from is not None \
and not isinstance(coming_from, (pr.Class, compiled.CompiledObject)):
coming_from = coming_from.get_parent_scope() coming_from = coming_from.get_parent_scope()
return isinstance(instance, er.Instance) and instance.base.base != coming_from # CompiledObjects don't have double underscore attributes, but Jedi abuses
# those for fakes (builtins.pym -> list).
if isinstance(instance, compiled.CompiledObject):
return instance != coming_from
else:
return isinstance(instance, er.Instance) and instance.base.base != coming_from