Report other E12 errors when E123 is ignored; issue #103

Author: florentx

CHANGES.txt

@@ -15,6 +15,8 @@ Changelog
 
 * Compare full path when exluding a file. (Issue #186)
 
+* Correctly report other E12 errors when E123 is ignored. (Issue #103)
+
 
 1.4.5 (2013-03-06)
 ------------------

pep8.py

@@ -457,17 +457,17 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
                 # an unbracketed continuation line (ie, backslash)
                 open_row = 0
             hang = rel_indent[row] - rel_indent[open_row]
-            visual_indent = indent_chances.get(start[1])
-
-            if token_type == tokenize.OP and text in ']})':
-                # this line starts with a closing bracket
-                if indent[depth]:
-                    if start[1] != indent[depth]:
-                        yield (start, "E124 closing bracket does not match "
-                               "visual indentation")
-                elif hang:
-                    yield (start, "E123 closing bracket does not match "
-                           "indentation of opening bracket's line")
+            close_bracket = (token_type == tokenize.OP and text in ']})')
+            visual_indent = not close_bracket and indent_chances.get(start[1])
+
+            if close_bracket and indent[depth]:
+                # closing bracket for visual indent
+                if start[1] != indent[depth]:
+                    yield (start, "E124 closing bracket does not match "
+                           "visual indentation")
+            elif close_bracket and not hang:
+                # closing bracket matches indentation of opening bracket's line
+                pass
             elif visual_indent is True:
                 # visual indent is verified
                 if not indent[depth]:
@@ -481,7 +481,9 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
                        "under-indented for visual indent")
             elif hang == 4 or (indent_next and rel_indent[row] == 8):
                 # hanging indent is verified
-                pass
+                if close_bracket:
+                    yield (start, "E123 closing bracket does not match "
+                           "indentation of opening bracket's line")
             else:
                 # indent is broken
                 if hang <= 0:

testsuite/E12.py

@@ -50,6 +50,44 @@
             }
         ]
     }
+#: E123
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+    ]
+#: E123
+result = some_function_that_takes_arguments(
+    'a', 'b', 'c',
+    'd', 'e', 'f',
+    )
+#: E124
+my_list = [1, 2, 3,
+           4, 5, 6,
+]
+#: E124
+my_list = [1, 2, 3,
+           4, 5, 6,
+                   ]
+#: E124
+result = some_function_that_takes_arguments('a', 'b', 'c',
+                                            'd', 'e', 'f',
+)
+#: E121
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+     ]
+#: E126
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+        ]
+#: E122
+if True:
+    result = some_function_that_takes_arguments(
+        'a', 'b', 'c',
+        'd', 'e', 'f',
+)
 #: E121
 result = {
    'key1': 'value',

testsuite/E12not.py

@@ -546,3 +546,22 @@ def f():
    c > d:
     moo_like_a_cow()
 #
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+]
+
+my_list = [1, 2, 3,
+           4, 5, 6,
+           ]
+
+result = some_function_that_takes_arguments(
+    'a', 'b', 'c',
+    'd', 'e', 'f',
+)
+
+result = some_function_that_takes_arguments('a', 'b', 'c',
+                                            'd', 'e', 'f',
+                                            )
+
+#