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

Fix newline endings and a few parser/copy counts

Browse Source
This commit is contained in:
Dave Halter
2019-01-13 19:55:18 +01:00
parent f80d9de7a0
commit a7e24a37e7
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parso/python/diff.py
View File

@@ -271,10 +271,9 @@ class DiffParser(object):
self._parse(self._nodes_tree.parsed_until_line + 1)
elif not copied_nodes:
# We have copied as much as possible (but definitely not too
# much). Therefore we just parse the rest.
# We might not reach the end, because there's a statement
# that is not finished.
self._parse(until_line_new)
# much). Therefore we just parse a bit more.
self._parse(self._nodes_tree.parsed_until_line + 1)
copied_nodes = [None]
else:
p_children = line_stmt.parent.children
index = p_children.index(line_stmt)
@@ -393,10 +392,6 @@ class DiffParser(object):
typ, string, start_pos, prefix = next(tokens)
if '\n' in prefix or '\r' in prefix:
prefix = re.sub(r'[^\n\r]+\Z', '', prefix)
else:
# This is basically the next line and it still needs to
# be parserd.
prefix = ''
yield PythonToken(
PythonTokenTypes.ENDMARKER, '',
(start_pos[0] + line_offset, 0),