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

Move analyse_non_prefix.

Browse Source
This commit is contained in:
Dave Halter
2017-07-08 19:50:27 +02:00
parent af38b3cb10
commit 4777eeb89f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
parso/python/pep8.py
View File

@@ -152,7 +152,7 @@ class PEP8Normalizer(Normalizer):
def __init__(self, config): def __init__(self, config):
super(PEP8Normalizer, self).__init__(config) super(PEP8Normalizer, self).__init__(config)
self._previous_part = None self._previous_part = None
self._actual_previous_leaf = None self._previous_leaf = None
self._on_newline = True self._on_newline = True
self._newline_count = 0 self._newline_count = 0
self._wanted_newline_count = None self._wanted_newline_count = None
@@ -308,7 +308,7 @@ class PEP8Normalizer(Normalizer):
or ( or (
val == 'class' val == 'class'
or val == 'async' and leaf.get_next_leaf() == 'def' or val == 'async' and leaf.get_next_leaf() == 'def'
or val == 'def' and self._actual_previous_leaf != 'async' or val == 'def' and self._previous_leaf != 'async'
) and leaf.parent.parent.type != 'decorated' ) and leaf.parent.parent.type != 'decorated'
) )
if needs_lines and actual < wanted: if needs_lines and actual < wanted:
@@ -336,6 +336,7 @@ class PEP8Normalizer(Normalizer):
break break
self._visit_part(part, part.create_spacing_part(), leaf) self._visit_part(part, part.create_spacing_part(), leaf)
self._analyse_non_prefix(leaf)
self._visit_part(leaf, part, leaf) self._visit_part(leaf, part, leaf)
# Cleanup # Cleanup
@@ -357,7 +358,7 @@ class PEP8Normalizer(Normalizer):
self._reset_newlines(part, leaf) self._reset_newlines(part, leaf)
self._max_blank_lines = 0 self._max_blank_lines = 0
self._actual_previous_leaf = leaf self._previous_leaf = leaf
return leaf.value return leaf.value
@@ -477,7 +478,6 @@ class PEP8Normalizer(Normalizer):
else: else:
self._check_spacing(part, spacing) self._check_spacing(part, spacing)
self._analyse_non_prefix(part)
self._check_line_length(part, spacing) self._check_line_length(part, spacing)
# ------------------------------- # -------------------------------
# Finalizing. Updating the state. # Finalizing. Updating the state.
@@ -603,7 +603,7 @@ class PEP8Normalizer(Normalizer):
else: else:
prev_spacing = self._previous_spacing prev_spacing = self._previous_spacing
if prev in _ALLOW_SPACE and spaces != prev_spacing.value \ if prev in _ALLOW_SPACE and spaces != prev_spacing.value \
and '\n' not in self._actual_previous_leaf.prefix: and '\n' not in self._previous_leaf.prefix:
message = "Whitespace before operator doesn't match with whitespace after" message = "Whitespace before operator doesn't match with whitespace after"
self.add_issue(229, message, spacing) self.add_issue(229, message, spacing)
@@ -673,13 +673,11 @@ class PEP8Normalizer(Normalizer):
if self._newline_count >= 2: if self._newline_count >= 2:
self.add_issue(391, 'Blank line at end of file', leaf) self.add_issue(391, 'Blank line at end of file', leaf)
return leaf.value
def add_issue(self, code, message, node): def add_issue(self, code, message, node):
from parso.python.tree import search_ancestor from parso.python.tree import search_ancestor
if search_ancestor(node, 'error_node') is not None or \ if search_ancestor(node, 'error_node') is not None or \
self._previous_part is not None and \ self._previous_leaf is not None and \
search_ancestor(self._previous_part, 'error_node') is not None: search_ancestor(self._previous_leaf, 'error_node') is not None:
return return
super(PEP8Normalizer, self).add_issue(code, message, node) super(PEP8Normalizer, self).add_issue(code, message, node)