VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2026-02-28 04:22:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issues with errof leafs and error nodes in a certain order.

Browse Source
This commit is contained in:
Dave Halter
2017-08-05 21:00:25 +02:00
parent 57f7c465ce
commit 5f73b42067
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
parso/python/normalizer.py
View File

@@ -248,7 +248,9 @@ class ErrorFinder(Normalizer):
spacing = list(leaf._split_prefix())[-1] spacing = list(leaf._split_prefix())[-1]
self._add_indentation_error('expected an indented block', spacing) self._add_indentation_error('expected an indented block', spacing)
else: else:
self._add_syntax_error("invalid syntax", leaf) if leaf.type != 'error_leaf':
# Error leafs will be added later as an error.
self._add_syntax_error("invalid syntax", leaf)
elif node.type in _BLOCK_STMTS: elif node.type in _BLOCK_STMTS:
if node.type == 'try_stmt': if node.type == 'try_stmt':
default_except = None default_except = None
@@ -527,11 +529,10 @@ class ErrorFinder(Normalizer):
message = 'invalid syntax' message = 'invalid syntax'
else: else:
if len(match.group(1)) == 1: if len(match.group(1)) == 1:
print(match.group(1))
message = 'EOL while scanning string literal' message = 'EOL while scanning string literal'
else: else:
message = 'EOF while scanning triple-quoted string literal' message = 'EOF while scanning triple-quoted string literal'
self._add_syntax_error(message, leaf, overwrite=True) self._add_syntax_error(message, leaf)
elif leaf.type == 'name': elif leaf.type == 'name':
if leaf.value == '__debug__' and leaf.is_definition(): if leaf.value == '__debug__' and leaf.is_definition():
if self._version < (3, 0): if self._version < (3, 0):
@@ -691,17 +692,14 @@ class ErrorFinder(Normalizer):
def _add_indentation_error(self, message, spacing): def _add_indentation_error(self, message, spacing):
self._add_error(903, "IndentationError: " + message, spacing) self._add_error(903, "IndentationError: " + message, spacing)
def _add_syntax_error(self, message, node, overwrite=False): def _add_syntax_error(self, message, node):
self._add_error(901, "SyntaxError: " + message, node, overwrite) self._add_error(901, "SyntaxError: " + message, node)
def _add_error(self, code, message, node, overwrite=False): def _add_error(self, code, message, node):
# Check if the issues are on the same line. # Check if the issues are on the same line.
line = node.start_pos[0] line = node.start_pos[0]
args = (code, message, node) args = (code, message, node)
if overwrite: self._error_dict.setdefault(line, args)
self._error_dict[line] = args
else:
self._error_dict.setdefault(line, args)
def finalize(self): def finalize(self):
self._context.finalize() self._context.finalize()