Fix regression with multiple brackets; issue #214

Author: florentx

CHANGES.txt

@@ -8,6 +8,8 @@ Changelog
 * Fix ignoring too many checks when ``--select`` is used with codes
   declared in a flake8 extension. (Issue #216)
 
+* Fix regression with multiple brackets. (Issue #214)
+
 
 1.4.6 (2013-07-02)
 ------------------

pep8.py

@@ -424,6 +424,7 @@ def continued_indentation(logical_line, tokens, indent_level, hang_closing,
     parens = [0] * nrows
     # relative indents of physical lines
     rel_indent = [0] * nrows
+    open_rows = [[0]]
     # visual indents
     indent_chances = {}
     last_indent = tokens[0][2]
@@ -448,17 +449,15 @@ def continued_indentation(logical_line, tokens, indent_level, hang_closing,
             # record the initial indent.
             rel_indent[row] = expand_indent(line) - indent_level
 
-            if depth:
-                # a bracket expression in a continuation line.
-                # find the line that it was opened on
-                for open_row in range(row - 1, -1, -1):
-                    if parens[open_row]:
-                        break
-            else:
-                # an unbracketed continuation line (ie, backslash)
-                open_row = 0
-            hang = rel_indent[row] - rel_indent[open_row]
+            # identify closing bracket
             close_bracket = (token_type == tokenize.OP and text in ']})')
+
+            # is the indent relative to an opening bracket line?
+            valid_hang = 4 if (hang_closing or not close_bracket) else 0
+            for open_row in reversed(open_rows[depth]):
+                if rel_indent[row] == rel_indent[open_row] + valid_hang:
+                    break
+            hang = rel_indent[row] - rel_indent[open_row]
             visual_indent = (not close_bracket and hang > 0 and
                              indent_chances.get(start[1]))
 
@@ -519,6 +518,9 @@ def continued_indentation(logical_line, tokens, indent_level, hang_closing,
             if text in '([{':
                 depth += 1
                 indent.append(0)
+                if len(open_rows) == depth:
+                    open_rows.append([])
+                open_rows[depth].append(row)
                 parens[row] += 1
                 if verbose >= 4:
                     print("bracket depth %s seen, col %s, visual min = %s" %
@@ -532,13 +534,13 @@ def continued_indentation(logical_line, tokens, indent_level, hang_closing,
                 for ind in list(indent_chances):
                     if ind >= prev_indent:
                         del indent_chances[ind]
+                del open_rows[depth + 1:]
                 depth -= 1
                 if depth:
                     indent_chances[indent[depth]] = True
                 for idx in range(row, -1, -1):
                     if parens[idx]:
                         parens[idx] -= 1
-                        rel_indent[row] = rel_indent[idx]
                         break
             assert len(indent) == depth + 1
             if start[1] not in indent_chances:

testsuite/E12not.py

@@ -128,7 +128,7 @@
 fnct(1, 2, 3,
      4, 5, 6)
 
-fnct(1, 2, 3
+fnct(1, 2, 3,
      4, 5, 6,
      7, 8, 9,
      10, 11)
@@ -578,4 +578,13 @@ def f():
 ('abc'
  'def') == (
     'abc')
+
+# issue 214
+bar(
+    1).zap(
+        2)
+
+bar(
+    1).zap(
+    2)
 #