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

More indentation issue fixes.

Browse Source
This commit is contained in:
Dave Halter
2017-06-11 23:01:15 +02:00
parent 146ef2436f
commit 7cbcc6d0f3
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parso/python/normalizer.py
+15 -1
View File
@@ -65,6 +65,9 @@ class WhitespaceInfo(object):
class BracketNode(object): class BracketNode(object):
SAME_INDENT_TYPE = object()
NEWLINE_TYPE = object()
def __init__(self, config, indentation_level, leaf): def __init__(self, config, indentation_level, leaf):
next_leaf = leaf.get_next_leaf() next_leaf = leaf.get_next_leaf()
if '\n' in next_leaf.prefix: if '\n' in next_leaf.prefix:
@@ -75,6 +78,7 @@ class BracketNode(object):
# ) # )
self.bracket_indentation = config.indentation * indentation_level self.bracket_indentation = config.indentation * indentation_level
self.item_indentation = self.bracket_indentation + config.indentation self.item_indentation = self.bracket_indentation + config.indentation
self.type = self.NEWLINE_TYPE
else: else:
# Implies code like: # Implies code like:
# foobarbaz( # foobarbaz(
@@ -87,6 +91,7 @@ class BracketNode(object):
else: else:
self.bracket_indentation = ' ' * self.expected_end_indent self.bracket_indentation = ' ' * self.expected_end_indent
self.item_indentation = self.bracket_indentation self.item_indentation = self.bracket_indentation
self.type = self.SAME_INDENT_TYPE
def _is_magic_name(name): def _is_magic_name(name):
@@ -202,9 +207,18 @@ class PEP8Normalizer(Normalizer):
if value in '])}': if value in '])}':
self.add_issue(124, "Closing bracket does not match visual indentation", leaf) self.add_issue(124, "Closing bracket does not match visual indentation", leaf)
else: else:
self.add_issue(121, 'Continuation line under-indented for hanging indent', leaf) if node.type == BracketNode.SAME_INDENT_TYPE:
self.add_issue(128, 'Continuation line under-indented for visual indent', leaf)
else:
self.add_issue(121, 'Continuation line under-indented for hanging indent', leaf)
else: else:
if value in '])}':
self.add_issue(123, "Losing bracket does not match indentation of opening bracket's line", leaf) self.add_issue(123, "Losing bracket does not match indentation of opening bracket's line", leaf)
else:
if node.type == BracketNode.SAME_INDENT_TYPE:
self.add_issue(127, 'Continuation line over-indented for visual indent', leaf)
else:
self.add_issue(126, 'Continuation line over-indented for hanging indent', leaf)
# TODO else? # TODO else?
first = True first = True