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

Fix diff parser: The prefix was wrong in some copy cases

Browse Source
This commit is contained in:
Dave Halter
2019-01-05 18:33:38 +01:00
parent deaf1f310b
commit a8ec75fedd
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parso/python/diff.py
View File

@@ -659,6 +659,10 @@ class _NodesTree(object):
tos.add_tree_nodes(prefix, new_nodes, line_offset, last_line_offset_leaf)
self.prefix = new_prefix
self._prefix_remainder = ''
else:
# Need to reset the prefix, because it might have been reset higher
# up in the stack.
self.prefix = prefix
return new_nodes, working_stack

45
test/test_diff_parser.py
View File

@@ -748,40 +748,29 @@ def test_paren_before_docstring(differ):
differ.parse(code1, parsers=2, copies=1)
def test_x(differ):
def test_parentheses_before_method(differ):
code1 = dedent('''\
class StackNode(object):
def __init__(self, dfa):
self.dfa = dfa
self.nodes = []
class A:
def a(self):
pass
@property
def nonterminal(self):
return self.dfa.from_rule
def __repr__(self):
return '%s(%s, %s)' % (self.__class__.__name__, self.dfa, self.nodes)
def x():
pass
class B:
def b(self):
if 1:
pass
''')
code2 = dedent('''\
class StackNode(object):
def __init__(self, dfa):
self.dfa = dfa
self.nodes = []
(msg, type_.name, value, start_pos))
class A:
def a(self):
pass
Exception.__init__(self, "x" %
@property
def nonterminal(self):
def __repr__(self):
def x():
pass
def b(self):
if 1:
pass
''')
differ.initialize(code1)
differ.parse(code2, parsers=3, copies=1, expect_error_leaves=True)
differ.parse(code1, parsers=2, copies=2)
differ.parse(code2, parsers=2, copies=1, expect_error_leaves=True)
differ.parse(code1, parsers=1, copies=1)