From: Dmitry Gutov <dgutov@yandex.ru>
To: Lele Gaifax <lele@metapensiero.it>, 62031@debbugs.gnu.org
Cc: Rob Moss <robm.dev@gmail.com>
Subject: bug#62031: 29.0.60; python-mode indentation after re.match
Date: Wed, 8 Mar 2023 19:57:36 +0200 [thread overview]
Message-ID: <69793abf-3d2f-2dbe-698b-877ededfc56b@yandex.ru> (raw)
In-Reply-To: <87wn3rk7bk.fsf@metapensiero.it>
On 08/03/2023 09:53, Lele Gaifax wrote:
> I had a quick glance at this, and while I can confirm the problem with
> the following test
>
> diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
> index 4f24c042c6a..9926c4b002f 100644
> --- a/test/lisp/progmodes/python-tests.el
> +++ b/test/lisp/progmodes/python-tests.el
> @@ -1982,6 +1982,17 @@ python-virt-bin
> (should (eq (car (python-indent-context)) :after-block-start))
> (should (= (python-indent-calculate-indentation) 8))))
>
> +(ert-deftest python-indent-after-re-match ()
> + "Test BUG 62031 regression."
> + (python-tests-with-temp-buffer
> + "
> +def test_re(string):
> + if re.match('^[a-c]+$', string):
> + print('yes')
> + else:
> +"
> + (python-tests-look-at "else:")
> + (should (= (python-indent-calculate-indentation) 4))))
>
> I could not figure out how this can be fixed, with my current knowledge
> on python.el.
>
> There are several places where the regexp produced by `(python-rx
> block-start)' is used, many within a `(looking-at ...)' form and several
> others in a `(re-search-forward ...)': given that block starting
> "keywords" are required to be at the beginning of a line, possibly
> preceded by whitespace, I think that the problem may arise from those
> usages which do not explicitly enforce the constraint, but unfortunately
> all my attempts to do that a) didn't make the test above green and b)
> broke one or more of the other tests.
Right, the problem is that we need some post-check for block-start searches.
python-rx (like rx in general) is just a syntax for Emacs regexp, and it
doesn't support lookbehind or etc.
After some edebug-ing, the patch below seems to fix this case. Maybe
other uses of (python-rx block-start) need this treatment as well, but
I'd like to leave that to someone who comes later. And a lot of them
happen after a (back-to-indentation) call, so those seem covered too.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 1f970633bfc..aff8dc206b4 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5792,7 +5792,9 @@ python-info-dedenter-opening-block-positions
(catch 'exit
(while (python-nav--syntactically
(lambda ()
- (re-search-backward (python-rx block-start) nil t))
+ (cl-loop do (re-search-backward (python-rx
block-start) nil t)
+ until (memq (char-before) '(nil ?\s ?\t
?\n))
+ finally return (point)))
#'<)
(let ((indentation (current-indentation)))
(when (and (not (memq indentation collected-indentations))
next prev parent reply other threads:[~2023-03-08 17:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 4:44 bug#62031: 29.0.60; python-mode indentation after re.match Rob Moss
2023-03-07 14:35 ` Dmitry Gutov
2023-03-07 14:57 ` Lele Gaifax
2023-03-07 23:31 ` Rob Moss
2023-03-08 7:53 ` Lele Gaifax
2023-03-08 13:23 ` Ruijie Yu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-03-08 22:46 ` Dmitry Gutov
2023-03-09 2:31 ` Rob Moss
2023-03-08 13:54 ` Eli Zaretskii
2023-03-08 17:57 ` Dmitry Gutov [this message]
2023-03-08 18:10 ` Lele Gaifax
2023-03-08 20:52 ` Dmitry Gutov
2023-03-09 3:04 ` Ruijie Yu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-03-09 15:29 ` kobarity
2023-03-09 15:42 ` Dmitry Gutov
2023-03-09 15:44 ` Lele Gaifax
2023-03-09 15:40 ` Dmitry Gutov
2023-03-08 18:15 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=69793abf-3d2f-2dbe-698b-877ededfc56b@yandex.ru \
--to=dgutov@yandex.ru \
--cc=62031@debbugs.gnu.org \
--cc=lele@metapensiero.it \
--cc=robm.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.