VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 14:54:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reenable check_user_statement in parser, that did the whole user names calculation

Browse Source
This commit is contained in:
Dave Halter
2014-01-17 02:48:00 +01:00
parent b30a186f8f
commit 19b0e1d5b6
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/docstrings.py
View File

@@ -119,4 +119,4 @@ def find_return_types(evaluator, func):
if p.user_stmt() is None: if p.user_stmt() is None:
return [] return []
p.user_stmt().parent = func p.user_stmt().parent = func
return list(evaluator.eval_statement(p.user_stmt)) return list(evaluator.eval_statement(p.user_stmt()))

13
jedi/parser/__init__.py
View File

@@ -82,6 +82,15 @@ class Parser(object):
def __repr__(self): def __repr__(self):
return "<%s: %s>" % (type(self).__name__, self.module) return "<%s: %s>" % (type(self).__name__, self.module)
def _check_user_stmt(self, simple):
# this is not user checking, just update the used_names
for tok_name in self.module.temp_used_names:
try:
self.module.used_names[tok_name].add(simple)
except KeyError:
self.module.used_names[tok_name] = set([simple])
self.module.temp_used_names = []
def _parse_dot_name(self, pre_used_token=None): def _parse_dot_name(self, pre_used_token=None):
""" """
The dot name parser parses a name, variable or function and returns The dot name parser parses a name, variable or function and returns
@@ -371,6 +380,7 @@ class Parser(object):
names_are_set_vars=names_are_set_vars) names_are_set_vars=names_are_set_vars)
stmt.parent = self.top_module stmt.parent = self.top_module
self._check_user_stmt(stmt)
if tok in always_break + not_first_break: if tok in always_break + not_first_break:
self._gen.push_last_back() self._gen.push_last_back()
@@ -478,10 +488,12 @@ class Parser(object):
end_pos = self.end_pos if count + 1 == len(imports) else e end_pos = self.end_pos if count + 1 == len(imports) else e
i = pr.Import(self.module, first_pos, end_pos, m, i = pr.Import(self.module, first_pos, end_pos, m,
alias, defunct=defunct) alias, defunct=defunct)
self._check_user_stmt(i)
self._scope.add_import(i) self._scope.add_import(i)
if not imports: if not imports:
i = pr.Import(self.module, first_pos, self.end_pos, None, i = pr.Import(self.module, first_pos, self.end_pos, None,
defunct=True) defunct=True)
self._check_user_stmt(i)
self.freshscope = False self.freshscope = False
elif tok == 'from': elif tok == 'from':
defunct = False defunct = False
@@ -513,6 +525,7 @@ class Parser(object):
i = pr.Import(self.module, first_pos, end_pos, name, i = pr.Import(self.module, first_pos, end_pos, name,
alias, mod, star, relative_count, alias, mod, star, relative_count,
defunct=defunct or defunct2) defunct=defunct or defunct2)
self._check_user_stmt(i)
self._scope.add_import(i) self._scope.add_import(i)
self.freshscope = False self.freshscope = False
# loops # loops