Do not consider commented-out lines when calculating indentation level.

m-labs · Dec 30, 2015 · 4b46909 · 4b46909
1 parent 58a0c8f
commit 4b46909
Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pythonparser/lexer.py b/pythonparser/lexer.py
@@ -260,7 +260,8 @@ def _refill(self, eof_token):
 
         # Should we emit indent/dedent?
         if self.new_line and \
-                match.group(3) is None: # not a blank line
+                match.group(3) is None and \
+                match.group(4) is None: # not a blank line
             whitespace = match.string[match.start(0):match.start(1)]
             level = len(whitespace.expandtabs())
             range = source.Range(self.source_buffer, match.start(1), match.start(1))

diff --git a/pythonparser/test/test_lexer.py b/pythonparser/test/test_lexer.py
@@ -77,6 +77,15 @@ def test_comment(self):
                          "pass",    None,
                          "dedent",  None)
 
+        self.assertLexes("class x:\n    # foo\n  pass",
+                         "class",   None,
+                         "ident",   "x",
+                         ":",       None,
+                         "newline", None,
+                         "indent",  None,
+                         "pass",    None,
+                         "dedent",  None)
+
     def test_float(self):
         self.assertLexes("0.0",
                          "float", 0.0)