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

keep newline at end of code

Browse Source
This commit is contained in:
Akinori Hattori
2014-07-17 20:37:25 +09:00
parent 4852c7840f
commit e14b144199
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jedi/parser/__init__.py
View File

@@ -76,11 +76,16 @@ class Parser(object):
d.parent = self.module
self.module.end_pos = self._gen.current.end_pos
if self._gen.current.type in (tokenize.NEWLINE,):
if self._gen.current.type == tokenize.NEWLINE:
# This case is only relevant with the FastTokenizer, because
# otherwise there's always an EndMarker.
# otherwise there's always an ENDMARKER.
# we added a newline before, so we need to "remove" it again.
self.module.end_pos = self._gen.tokenizer_previous.end_pos
#
# NOTE: It should be keep end_pos as-is if the last token of
# a source is a NEWLINE, otherwise the newline at the end of
# a source is not included in a ParserNode.code.
if self._gen.previous.type != tokenize.NEWLINE:
self.module.end_pos = self._gen.previous.end_pos
del self._gen
@@ -620,17 +625,10 @@ class PushBackTokenizer(object):
if self._push_backs:
return self._push_backs.pop(0)
self.previous = self.current
previous = self.current
self.current = next(self._tokenizer)
self.previous = previous
return self.current
def __iter__(self):
return self
@property
def tokenizer_previous(self):
"""
Temporary hack, basically returns the last previous if the fast parser
sees an EndMarker. The fast parser positions have to be changed anyway.
"""
return self._tokenizer.previous

5
jedi/parser/fast.py
View File

@@ -269,11 +269,6 @@ class FastParser(use_metaclass(CachedFastParser)):
is_decorator = False
current_lines.append(l)
if current_lines:
# skip newline at end of code,
# since it is not counted by Parser
if not current_lines[-1]:
del current_lines[-1]
if current_lines:
yield gen_part()