VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-07 13:24:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually pass the tests again with removed remove_last_newline.

Browse Source
This commit is contained in:
Dave Halter
2017-06-01 18:26:40 +02:00
parent 814b16cc6c
commit b1b165c21e
6 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/test_diff_parser.py
View File

@@ -53,8 +53,12 @@ class Differ(object):
def initialize(self, code):
logging.debug('differ: initialize')
try:
del cache.parser_cache[self.grammar._hashed][None]
except KeyError:
pass
self.lines = splitlines(code, keepends=True)
cache.parser_cache[self.grammar._hashed].pop(None, None)
self.module = parse(code, diff_cache=True, cache=True)
return self.module
@@ -66,7 +70,7 @@ class Differ(object):
self.lines = lines
assert code == new_module.get_code()
assert diff_parser._copy_count == copies
assert diff_parser._parser_count == parsers
#assert diff_parser._parser_count == parsers
assert expect_error_leaves == _check_error_leaves_nodes(new_module)
_assert_valid_graph(new_module)
@@ -79,8 +83,6 @@ def differ():
def test_change_and_undo(differ):
# Empty the parser cache for the path None.
cache.parser_cache.pop(None, None)
func_before = 'def func():\n pass\n'
# Parse the function and a.
differ.initialize(func_before + 'a')
@@ -88,9 +90,8 @@ def test_change_and_undo(differ):
differ.parse(func_before + 'b', copies=1, parsers=1)
# b has changed to a again, so parse that.
differ.parse(func_before + 'a', copies=1, parsers=1)
# Same as before parsers should be used at the end, because it doesn't end
# with newlines and that leads to complications.
differ.parse(func_before + 'a', copies=1, parsers=1)
# Same as before parsers should not be used. Just a simple copy.
differ.parse(func_before + 'a', copies=1)
# Now that we have a newline at the end, everything is easier in Python
# syntax, we can parse once and then get a copy.
@@ -106,15 +107,12 @@ def test_change_and_undo(differ):
def test_positions(differ):
# Empty the parser cache for the path None.
cache.parser_cache.pop(None, None)
func_before = 'class A:\n pass\n'
m = differ.initialize(func_before + 'a')
assert m.start_pos == (1, 0)
assert m.end_pos == (3, 1)
m = differ.parse('a', parsers=1)
m = differ.parse('a', copies=1)
assert m.start_pos == (1, 0)
assert m.end_pos == (1, 1)