Kaydet (Commit) 644991fa authored tarafından Barry Warsaw's avatar Barry Warsaw

(py-parse-state-re): Remove the "if" from the regular expression.

This fixes an indentation bug reported by Jeremy when seeing multiple
list comprehensions like so:

    [x for x in seq
     if blah(x)]

    # ...

    [y for y in seq
     if blah(y)]

The reason this broke is because this regexp caused the "find a safe
parsing start location higher up in the file" test to erroneously find
the if in the listcomp.  I think the other keywords in this regexp are
fine and good enough.

After a weekend of testing, I can't find any adverse effects.
üst 5c458052
......@@ -3148,7 +3148,7 @@ local bindings to py-newline-and-indent."))
;; Helper functions
(defvar py-parse-state-re
(concat
"^[ \t]*\\(if\\|elif\\|else\\|while\\|def\\|class\\)\\>"
"^[ \t]*\\(elif\\|else\\|while\\|def\\|class\\)\\>"
"\\|"
"^[^ #\t\n]"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment