From: kobarity <kobarity@gmail.com>
To: 56105@debbugs.gnu.org
Subject: bug#56105: 29.0.50; python-nav-beginning-of-defun does not handle nested functions properly
Date: Mon, 20 Jun 2022 21:01:49 +0900 [thread overview]
Message-ID: <CAMQkrSqJdW+ho+gkMGhZmzWDeTJ=0Fqno2ZP_BBh6wyLnSZ-og@mail.gmail.com> (raw)
In-Reply-To: <handler.56105.B.165572586032307.ack@debbugs.gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1003 bytes --]
Hi,
In python-nav--beginning-of-defun, body-indentation is expected to be
the indentation level of the body of the current function. It is
calculated by searching blocks backward for defuns and adding
python-indent-offset. However, the found defun is not always the defun
for the current function, because there may be nested functions.
Attached is a patch to fix this issue. In this patch, min-indentation
is introduced to keep track of the minimum indentation of the current
function body to distinguish nested defuns from current defun.
(python-info-looking-at-beginning-of-defun) in the initialization of
min-indentation is a special case. In this case,
python-nav-beginning-of-defun is expected to navigate to the previous
defun of the same level, not the enclosing defun.
There is a test case for this issue in
python-nav-beginning-of-defun-1, but unfortunately the expectation is
wrong. I corrected it and added some tests including a test with
python-mark-defun in this patch.
Best Regards,
[-- Attachment #2: fix-56105.patch --]
[-- Type: application/octet-stream, Size: 4166 bytes --]
commit 4c3a0249efdb14acf63eb3a8e37034354fa3fe7e
Author: kobarity <kobarity@gmail.com>
Date: Mon Jun 20 20:53:09 2022 +0900
Fix nested defuns handling in `python-nav-beginning-of-defun'
* lisp/progmodes/python.el (python-nav--beginning-of-defun): Fix
handling of nested defuns (bug#56105).
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c2483436fe..e0c937d7ce 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1455,11 +1455,17 @@ python-nav--beginning-of-defun
(line-beg-pos (line-beginning-position))
(line-content-start (+ line-beg-pos (current-indentation)))
(pos (point-marker))
+ (min-indentation (+ (current-indentation)
+ (if (python-info-looking-at-beginning-of-defun)
+ python-indent-offset 0)))
(body-indentation
(and (> arg 0)
(save-excursion
(while (and
- (not (python-info-looking-at-beginning-of-defun))
+ (or (not (python-info-looking-at-beginning-of-defun))
+ (>= (current-indentation) min-indentation))
+ (setq min-indentation
+ (min min-indentation (current-indentation)))
(python-nav-backward-block)))
(or (and (python-info-looking-at-beginning-of-defun)
(+ (current-indentation) python-indent-offset))
diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index 8db0a07170..e17bc0df92 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -1736,6 +1736,27 @@ python-mark-defun-3
(should (= (marker-position (mark-marker))
expected-mark-end-position)))))
+(ert-deftest python-mark-defun-4 ()
+ "Test `python-mark-defun' with nested functions."
+ (python-tests-with-temp-buffer
+ "
+def foo(x):
+ def bar():
+ return x
+ if True:
+ return bar
+"
+ (let ((expected-mark-beginning-position
+ (progn
+ (python-tests-look-at "def foo(x):")
+ (1- (line-beginning-position))))
+ (expected-mark-end-position (point-max)))
+ (python-tests-look-at "return bar")
+ (python-mark-defun 1)
+ (should (= (point) expected-mark-beginning-position))
+ (should (= (marker-position (mark-marker))
+ expected-mark-end-position)))))
+
\f
;;; Navigation
@@ -1762,12 +1783,20 @@ python-nav-beginning-of-defun-1
return wrapped_f
return wwrap
"
- (python-tests-look-at "return wrap")
+ (python-tests-look-at "return wwrap")
(should (= (save-excursion
(python-nav-beginning-of-defun)
(point))
(save-excursion
- (python-tests-look-at "def wrapped_f(*args):" -1)
+ (python-tests-look-at "def decoratorFunctionWithArguments" -1)
+ (beginning-of-line)
+ (point))))
+ (python-tests-look-at "return wrap" -1)
+ (should (= (save-excursion
+ (python-nav-beginning-of-defun)
+ (point))
+ (save-excursion
+ (python-tests-look-at "def wwrap(f):" -1)
(beginning-of-line)
(point))))
(python-tests-look-at "def wrapped_f(*args):" -1)
@@ -1801,11 +1830,23 @@ python-nav-beginning-of-defun-2
def a():
pass
+ if True:
+ return a
+
def c(self):
pass
"
;; Nested defuns, are handled with care.
(python-tests-look-at "def c(self):")
+ (should (= (save-excursion
+ (python-nav-beginning-of-defun)
+ (point))
+ (save-excursion
+ (python-tests-look-at "def m(self):" -1)
+ (beginning-of-line)
+ (point))))
+ ;; Nested defuns shuld be skipped.
+ (python-tests-look-at "return a" -1)
(should (= (save-excursion
(python-nav-beginning-of-defun)
(point))
next prev parent reply other threads:[~2022-06-20 12:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 11:50 bug#56105: 29.0.50; python-nav-beginning-of-defun does not handle nested functions properly kobarity
[not found] ` <handler.56105.B.165572586032307.ack@debbugs.gnu.org>
2022-06-20 12:01 ` kobarity [this message]
2022-06-21 11:37 ` Lars Ingebrigtsen
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMQkrSqJdW+ho+gkMGhZmzWDeTJ=0Fqno2ZP_BBh6wyLnSZ-og@mail.gmail.com' \
--to=kobarity@gmail.com \
--cc=56105@debbugs.gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).