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

Remove param from get_statement_for_position.

Browse Source
This commit is contained in:
Dave Halter
2015-02-05 12:28:55 +01:00
parent 2d9c644ab6
commit a77ecdbed6
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/representation.py
View File

@@ -682,9 +682,6 @@ class FunctionExecution(Executed):
def subscopes(self): def subscopes(self):
return self._copy_list(self.base.subscopes) return self._copy_list(self.base.subscopes)
def get_statement_for_position(self, pos):
return pr.Scope.get_statement_for_position(self, pos)
def __repr__(self): def __repr__(self):
return "<%s of %s>" % (type(self).__name__, self.base) return "<%s of %s>" % (type(self).__name__, self.base)

8
jedi/parser/tree.py
View File

@@ -552,10 +552,8 @@ class Scope(Simple, DocstringMixin):
return True return True
@Python3Method @Python3Method
def get_statement_for_position(self, pos, include_imports=False): def get_statement_for_position(self, pos):
checks = self.statements + self.asserts checks = self.statements + self.asserts + self.imports
if include_imports:
checks += self.imports
if self.isinstance(Function): if self.isinstance(Function):
checks += self.get_decorators() checks += self.get_decorators()
checks += [r for r in self.returns if r is not None] checks += [r for r in self.returns if r is not None]
@@ -566,7 +564,7 @@ class Scope(Simple, DocstringMixin):
for s in self.subscopes: for s in self.subscopes:
if s.start_pos <= pos <= s.end_pos: if s.start_pos <= pos <= s.end_pos:
p = s.get_statement_for_position(pos, include_imports) p = s.get_statement_for_position(pos)
if p: if p:
return p return p

4
jedi/parser/user_context.py
View File

@@ -259,7 +259,7 @@ class UserContextParser(object):
def user_stmt(self): def user_stmt(self):
module = self.module() module = self.module()
debug.speed('parsed') debug.speed('parsed')
return module.get_statement_for_position(self._position, include_imports=True) return module.get_statement_for_position(self._position)
@cache.underscore_memoization @cache.underscore_memoization
def user_stmt_with_whitespace(self): def user_stmt_with_whitespace(self):
@@ -278,7 +278,7 @@ class UserContextParser(object):
debug.warning('No statement under the cursor.') debug.warning('No statement under the cursor.')
return return
pos = next(self._user_context.get_context(yield_positions=True)) pos = next(self._user_context.get_context(yield_positions=True))
user_stmt = self.module().get_statement_for_position(pos, include_imports=True) user_stmt = self.module().get_statement_for_position(pos)
return user_stmt return user_stmt
@cache.underscore_memoization @cache.underscore_memoization