VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-17 05:49:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplified some crazy iterator stuff within parser

Browse Source
This commit is contained in:
Dave Halter
2014-02-16 15:04:57 +01:00
parent 82f27569b2
commit 22928dbcd0
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/parser/__init__.py
+6 -9
View File
@@ -58,6 +58,12 @@ class Parser(object):
# StopIteration needs to be added as well, because python 2 has a # StopIteration needs to be added as well, because python 2 has a
# strange way of handling StopIterations. # strange way of handling StopIterations.
# sometimes StopIteration isn't catched. Just ignore it. # sometimes StopIteration isn't catched. Just ignore it.
# on finish, set end_pos correctly
s = self._scope
while s is not None:
s.end_pos = self.end_pos
s = s.parent
pass pass
# clean up unused decorators # clean up unused decorators
@@ -403,15 +409,6 @@ class Parser(object):
if typ not in (tokenize.INDENT, tokenize.NEWLINE, tokenize.NL): if typ not in (tokenize.INDENT, tokenize.NEWLINE, tokenize.NL):
self.start_pos, self.end_pos = start_pos, end_pos self.start_pos, self.end_pos = start_pos, end_pos
except (StopIteration, common.MultiLevelStopIteration): except (StopIteration, common.MultiLevelStopIteration):
# on finish, set end_pos correctly
s = self._scope
while s is not None:
if isinstance(s, pr.Module) \
and not isinstance(s, pr.SubModule):
self.module.end_pos = self.end_pos
break
s.end_pos = self.end_pos
s = s.parent
raise raise
self._current = typ, tok self._current = typ, tok