Fix false E126 with indented comments; issue #138

3 files changed, 11 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 2cf136d..ed2af48 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,7 +13,9 @@ Changelog
 
 * Report E231 for nested dictionary in list. (Issue #142)
 
-* Catch ``E271`` at the beginning of the line. (Issue #133)
+* Catch E271 at the beginning of the line. (Issue #133)
+
+* Fix false positive E126. (Issue #138)
 
 * Fix ``--diff`` failing on one-line hunk. (Issue #137)
 
diff --git a/pep8.py b/pep8.py
index cc20fa1..524fed2 100755
--- a/pep8.py
+++ b/pep8.py
@@ -549,7 +549,8 @@ def continuation_line_indentation(logical_line, tokens, indent_level, verbose):
             if verbose >= 4:
                 print("bracket depth %s indent to %s" % (depth, start[1]))
         # deal with implicit string concatenation
-        elif token_type == tokenize.STRING or text in ('u', 'ur', 'b', 'br'):
+        elif (token_type in (tokenize.STRING, tokenize.COMMENT) or
+              text in ('u', 'ur', 'b', 'br')):
             indent_chances[start[1]] = str
 
         # keep track of bracket depth
diff --git a/testsuite/E12not.py b/testsuite/E12not.py
index 59e5113..9f9bef2 100644
--- a/testsuite/E12not.py
+++ b/testsuite/E12not.py
@@ -535,4 +535,10 @@ try: %s -d5
 d = {  # comment
     1: 2
 }
+
+# issue #138
+[
+    12,  # this is a multi-line inline
+         # comment
+]
 #