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

Use names instead of the isinstance checks in _search_in_scope

Browse Source
This commit is contained in:
Dave Halter
2017-04-30 02:33:51 +02:00
parent 6e9911daa3
commit d8761e6310
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi/parser/python/tree.py
View File

@@ -240,18 +240,18 @@ class Scope(PythonBaseNode, DocstringMixin):
super(Scope, self).__init__(children) super(Scope, self).__init__(children)
def iter_funcdefs(self): def iter_funcdefs(self):
return self._search_in_scope(Function) return self._search_in_scope('funcdef')
def iter_classdefs(self): def iter_classdefs(self):
return self._search_in_scope(Class) return self._search_in_scope('classdef')
def iter_imports(self): def iter_imports(self):
return self._search_in_scope(Import) return self._search_in_scope('import_name', 'import_from')
def _search_in_scope(self, typ): def _search_in_scope(self, *names):
def scan(children): def scan(children):
for element in children: for element in children:
if isinstance(element, typ): if element.type in names:
yield element yield element
if element.type in ('suite', 'simple_stmt', 'decorated') \ if element.type in ('suite', 'simple_stmt', 'decorated') \
or isinstance(element, Flow): or isinstance(element, Flow):
@@ -459,10 +459,10 @@ class Function(ClassOrFunc):
def iter_yield_exprs(self): def iter_yield_exprs(self):
# TODO This is incorrect, yields are also possible in a statement. # TODO This is incorrect, yields are also possible in a statement.
return self._search_in_scope(YieldExpr) return self._search_in_scope('yield_expr')
def iter_return_stmts(self): def iter_return_stmts(self):
return self._search_in_scope(ReturnStmt) return self._search_in_scope('return_stmt')
def is_generator(self): def is_generator(self):
return next(self.iter_yield_exprs(), None) is not None return next(self.iter_yield_exprs(), None) is not None