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

Remove the whitespace info class.

Browse Source
This commit is contained in:
Dave Halter
2017-07-02 23:57:53 +02:00
parent 14026d4c3e
commit 2daeebac95
1 changed files with 6 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
parso/python/normalizer.py
View File

@@ -41,61 +41,6 @@ class Comment(object):
self.start_pos = self.comment_part.start_pos
class WhitespaceInfo(object):
def __init__(self, leaf):
parts = list(leaf._split_prefix())
'''
' ': 'spaces',
'#': 'comment',
'\\': 'backslash',
'\f': 'formfeed',
'\n': 'newline',
'\r': 'newline',
'\t': 'tabs',
'''
self.has_backslash = False
self.comments = []
# TODO this should probably be moved to a function that gets the
# indentation part.
if parts:
start_pos = parts[0].start_pos
else:
start_pos = leaf.start_pos
indentation_part = PrefixPart(
leaf,
type='spacing',
value='',
spacing='',
start_pos=start_pos
)
self.newline_count = 0
for part in parts:
if part.type == 'backslash':
self.has_backslash = True
self.newline_count += 1
if part.type == 'comment':
self.comments.append(Comment(part, indentation_part))
if part.type == 'spacing':
indentation_part = part
else:
indentation_part = None
if part.type == 'newline':
self.newline_count += 1
if indentation_part is None:
self.indentation = ''
else:
self.indentation = indentation_part.value
self.indentation_part = indentation_part
self.trailing_whitespace = []
self.comment_whitespace = []
class IndentationTypes(object):
VERTICAL_BRACKET = object()
HANGING_BRACKET = object()
@@ -103,6 +48,7 @@ class IndentationTypes(object):
SUITE = object()
IMPLICIT = object()
class IndentationNode(object):
type = IndentationTypes.SUITE
@@ -196,6 +142,7 @@ class PEP8Normalizer(Normalizer):
super(PEP8Normalizer, self).__init__(config)
self._previous_leaf = None
self._on_newline = True
self._newline_count = 0
self._new_statement = True
self._implicit_indentation_possible = False
# The top of stack of the indentation nodes.
@@ -428,7 +375,8 @@ class PEP8Normalizer(Normalizer):
if last_column > self._config.max_characters:
self.add_issue(
501,
'Line too long (%s > %s characters)' % (last_column, self._config.max_characters),
'Line too long (%s > %s characters)' %
(last_column, self._config.max_characters),
leaf
)
@@ -520,6 +468,8 @@ class PEP8Normalizer(Normalizer):
pass
elif prev in _FACTOR and prev.parent.type == 'factor':
pass
elif prev == '@' and prev.parent.type == 'decorator':
pass # TODO should probably raise an error if there's a space here
elif leaf in _NEEDS_SPACE or prev in _NEEDS_SPACE:
if leaf == '=' and leaf.parent.type in ('argument', 'param') \
or prev == '=' and prev.parent.type in ('argument', 'param'):