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

Make node insertion a bit easier

Browse Source
This commit is contained in:
Dave Halter
2020-04-03 03:28:14 +02:00
parent 8bbd304eb9
commit 77327a4cea
2 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
parso/python/diff.py
View File

@@ -404,7 +404,10 @@ class DiffParser(object):
was_newline = False was_newline = False
first_token = next(self._tokenizer(lines)) first_token = next(self._tokenizer(lines))
indents = list(self._nodes_tree.get_indents(first_token.start_pos[1])) if first_token.type == ENDMARKER:
indents = [0]
else:
indents = list(self._nodes_tree.get_indents(first_token.start_pos[1]))
initial_indentation_count = len(indents) initial_indentation_count = len(indents)
tokens = self._tokenizer( tokens = self._tokenizer(
@@ -413,7 +416,9 @@ class DiffParser(object):
indents=indents indents=indents
) )
stack = self._active_parser.stack stack = self._active_parser.stack
#print('start', line_offset, indents, first_token.start_pos[1], self._nodes_tree._working_stack)
for token in tokens: for token in tokens:
#print(token)
typ = token.type typ = token.type
if typ == DEDENT: if typ == DEDENT:
if len(indents) < initial_indentation_count: if len(indents) < initial_indentation_count:
@@ -526,7 +531,10 @@ class _NodesTreeNode(object):
def get_latest_indentation(self): def get_latest_indentation(self):
if not self._children_groups: if not self._children_groups:
return 0 return 0
return self._children_groups[-1].children[0].start_pos[1] first = self._children_groups[-1].children[0]
if first.type == 'newline':
first = self._children_groups[-1].children[1]
return first.start_pos[1]
def get_first_indentation(self): def get_first_indentation(self):
if self.tree_node.type == 'suite': if self.tree_node.type == 'suite':
@@ -546,8 +554,9 @@ class _NodesTree(object):
def get_indents(self, indentation): def get_indents(self, indentation):
for node in self._working_stack: for node in self._working_stack:
first_indentation = node.get_first_indentation() first_indentation = node.get_first_indentation()
if indentation >= first_indentation: yield first_indentation
yield first_indentation if indentation <= first_indentation:
break
@property @property
def parsed_until_line(self): def parsed_until_line(self):
@@ -562,21 +571,16 @@ class _NodesTree(object):
for node in reversed(self._working_stack): for node in reversed(self._working_stack):
tree_node = node.tree_node tree_node = node.tree_node
if tree_node.type == 'suite': if tree_node.type == 'suite':
# A suite starts with NEWLINE, ... latest_indentation = node.get_latest_indentation()
node_indentation = tree_node.children[1].start_pos[1] if indentation > latest_indentation:
if previous_node is None:
if indentation > node_indentation: add_error_leaf = 'INDENT'
latest_indentation = node.get_latest_indentation() else:
if indentation != latest_indentation \ # This means that it was not dedented enough.
and not _is_indentation_error_leaf(indentation_node): node = previous_node
if previous_node is None: add_error_leaf = 'ERROR_DEDENT'
add_error_leaf = 'INDENT' break
else: if indentation >= latest_indentation: # Not a Dedent
# This means that it was not dedented enough.
node = previous_node
add_error_leaf = 'ERROR_DEDENT'
break
if indentation >= node_indentation: # Not a Dedent
# We might be at the most outer layer: modules. We # We might be at the most outer layer: modules. We
# don't want to depend on the first statement # don't want to depend on the first statement
# having the right indentation. # having the right indentation.
@@ -584,8 +588,7 @@ class _NodesTree(object):
elif tree_node.type == 'file_input': elif tree_node.type == 'file_input':
if indentation > 0: if indentation > 0:
latest_indentation = node.get_latest_indentation() latest_indentation = node.get_latest_indentation()
if indentation != latest_indentation \ if indentation != latest_indentation:
and not _is_indentation_error_leaf(indentation_node):
if previous_node is None and indentation > latest_indentation: if previous_node is None and indentation > latest_indentation:
add_error_leaf = 'INDENT' add_error_leaf = 'INDENT'
else: else:
@@ -611,7 +614,7 @@ class _NodesTree(object):
add_error_leaf, node = self._get_insertion_node(tree_nodes[0]) add_error_leaf, node = self._get_insertion_node(tree_nodes[0])
assert node.tree_node.type in ('suite', 'file_input') assert node.tree_node.type in ('suite', 'file_input')
node.add_tree_nodes(old_prefix, tree_nodes, add_error_leaf=add_error_leaf) node.add_tree_nodes(old_prefix, tree_nodes)
# tos = Top of stack # tos = Top of stack
self._update_tos(tree_nodes[-1]) self._update_tos(tree_nodes[-1])

19
test/test_diff_parser.py
View File

@@ -1386,3 +1386,22 @@ def test_paren_with_indentation(differ):
differ.initialize(code1) differ.initialize(code1)
differ.parse(code2, parsers=ANY, copies=ANY, expect_error_leaves=True) differ.parse(code2, parsers=ANY, copies=ANY, expect_error_leaves=True)
differ.parse(code1, parsers=2, copies=1) differ.parse(code1, parsers=2, copies=1)
def test_error_dedent_in_function(differ):
code1 = dedent('''\
def x():
a
b
c
d
''')
code2 = dedent('''\
def x():
a
b
c
d
''')
differ.initialize(code1)
differ.parse(code2, parsers=ANY, copies=ANY, expect_error_leaves=True)