bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#24820: Imenu in `python-mode' does not display function name for asy


From: Dmitry Lazurkin
Subject: bug#24820: Imenu in `python-mode' does not display function name for async def
Date: Thu, 5 Jan 2017 23:20:44 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1

On 01/05/2017 07:07 AM, npostavs@users.sourceforge.net wrote:
I don't see any formatting problems in your code, but it looks like the
patch got word wrapped, I find sending as attachment generally avoids
such issues.

This is strange because email from my sent emails has not wrapping problem...

Try to send patch in body and in attachment:

From 730e455bdba33849bf47126527cc8ca477ebbb82 Mon Sep 17 00:00:00 2001
From: Dmitry Lazurkin <dilaz03@gmail.com>
Date: Wed, 4 Jan 2017 21:46:21 +0300
Subject: [PATCH] Fix extracting async def type and name in python mode imenu

* lisp/progmodes/python.el (python-imenu--get-defun-type-name):
New function.
(python-imenu--build-tree): Use python-imenu--get-defun-type-name for
extract async or simple def type and name at current position.
* test/lisp/progmodes/python-tests.el (python-imenu-create-index-1):
(python-imenu-create-flat-index-1): Add async def's.
---
 lisp/progmodes/python.el            | 17 ++++++++++++-----
 test/lisp/progmodes/python-tests.el | 12 ++++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 68e19ef..d8262dd 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4415,6 +4415,15 @@ python-imenu-format-parent-item-jump-label
       "*class definition*"
     "*function definition*"))
+(defun python-imenu--get-defun-type-name ()
+  "Return defun type and name at current position."
+  (when (looking-at python-nav-beginning-of-defun-regexp)
+    (let ((split (split-string (match-string-no-properties 0))))
+      (if (= (length split) 2)
+          split
+        (list (concat (car split) " " (cadr split))
+              (car (last split)))))))
+
 (defun python-imenu--put-parent (type name pos tree)
   "Add the parent with TYPE, NAME and POS to TREE."
   (let ((label
@@ -4432,11 +4441,9 @@ python-imenu--build-tree
   (setq min-indent (or min-indent 0)
         prev-indent (or prev-indent python-indent-offset))
   (let* ((pos (python-nav-backward-defun))
-         (type)
-         (name (when (and pos (looking-at 
python-nav-beginning-of-defun-regexp))
-                 (let ((split (split-string (match-string-no-properties 0))))
-                   (setq type (car split))
-                   (cadr split))))
+         (defun-type-name (and pos (python-imenu--get-defun-type-name)))
+         (type (car defun-type-name))
+         (name (cadr defun-type-name))
          (label (when name
                   (funcall python-imenu-format-item-label-function type name)))
          (indent (current-indentation))
diff --git a/test/lisp/progmodes/python-tests.el 
b/test/lisp/progmodes/python-tests.el
index 94c356b..2df1bbf 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -3559,6 +3559,9 @@ python-tests-shell-interpreter
def c(self):
             pass
+
+        async def d(self):
+            pass
 "
    (goto-char (point-max))
    (should (equal
@@ -3580,7 +3583,8 @@ python-tests-shell-interpreter
               (list
                "Frob (class)"
                (cons "*class definition*" (copy-marker 601))
-               (cons "c (def)" (copy-marker 626)))))
+               (cons "c (def)" (copy-marker 626))
+               (cons "d (async def)" (copy-marker 665)))))
             (python-imenu-create-index)))))
(ert-deftest python-imenu-create-index-2 ()
@@ -3702,6 +3706,9 @@ python-tests-shell-interpreter
def c(self):
             pass
+
+        async def d(self):
+            pass
 "
    (goto-char (point-max))
    (should (equal
@@ -3714,7 +3721,8 @@ python-tests-shell-interpreter
                   (cons "Baz.a" (copy-marker 539))
                   (cons "Baz.b" (copy-marker 570))
                   (cons "Baz.Frob" (copy-marker 601))
-                  (cons "Baz.Frob.c" (copy-marker 626)))
+                  (cons "Baz.Frob.c" (copy-marker 626))
+                  (cons "Baz.Frob.d" (copy-marker 665)))
             (python-imenu-create-flat-index)))))
(ert-deftest python-imenu-create-flat-index-2 ()
--
2.7.4


Attachment: 0001-Fix-extracting-async-def-type-and-name-in-python-mod.patch
Description: Text Data


reply via email to

[Prev in Thread] Current Thread [Next in Thread]