forked from VimPlug/jedi
renaming of an unclear variable
This commit is contained in:
@@ -87,12 +87,13 @@ class NameFinder(object):
|
|||||||
# Compiled objects don't need that, because there's only one
|
# Compiled objects don't need that, because there's only one
|
||||||
# reference.
|
# reference.
|
||||||
name_list = sorted(name_list, key=lambda n: n.start_pos, reverse=True)
|
name_list = sorted(name_list, key=lambda n: n.start_pos, reverse=True)
|
||||||
|
|
||||||
for name in name_list:
|
for name in name_list:
|
||||||
if unicode(self.name_str) != name.get_code():
|
if unicode(self.name_str) != name.get_code():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
parpar = name.parent.parent
|
scope = name.parent.parent
|
||||||
if name.parent.parent in break_scopes:
|
if scope in break_scopes:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not self._name_is_array_assignment(name):
|
if not self._name_is_array_assignment(name):
|
||||||
@@ -101,16 +102,15 @@ class NameFinder(object):
|
|||||||
# this means that a definition was found and is not e.g.
|
# this means that a definition was found and is not e.g.
|
||||||
# in if/else.
|
# in if/else.
|
||||||
if result and self._name_is_break_scope(name):
|
if result and self._name_is_break_scope(name):
|
||||||
#print result, name.parent, parpar, s
|
if isinstance(scope, pr.Flow) \
|
||||||
if isinstance(parpar, pr.Flow) \
|
or isinstance(scope, pr.KeywordStatement) \
|
||||||
or isinstance(parpar, pr.KeywordStatement) \
|
and scope.name == 'global':
|
||||||
and parpar.name == 'global':
|
|
||||||
s = nscope.base if isinstance(nscope, er.Class) else nscope
|
s = nscope.base if isinstance(nscope, er.Class) else nscope
|
||||||
if parpar == s:
|
if scope == s:
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
break_scopes.append(parpar)
|
break_scopes.append(scope)
|
||||||
if result:
|
if result:
|
||||||
break
|
break
|
||||||
|
|
||||||
@@ -147,6 +147,7 @@ class NameFinder(object):
|
|||||||
elif isinstance(par, pr.Import) and len(par.namespace) > 1:
|
elif isinstance(par, pr.Import) and len(par.namespace) > 1:
|
||||||
# TODO multi-level import non-breakable
|
# TODO multi-level import non-breakable
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def _name_is_array_assignment(self, name):
|
def _name_is_array_assignment(self, name):
|
||||||
|
|||||||
Reference in New Issue
Block a user