bug#63759: 29.0.91; dockerfile-ts-mode--imenu returns invalid index

[Randy Taylor <dev@rjt.dev>]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

On Saturday, May 27th, 2023 at 21:28, Ruijie Yu <ruijie@netyu.xyz> wrote:
> Randy Taylor dev@rjt.dev writes:
> 
> > Thanks for the report Jimmy.
> > 
> > Patch attached.
> > 
> > [2. text/x-patch; 0001-dockerfile-ts-mode-Prevent-empty-categories-in-imenu.patch]...
> 
> 
> I think you can get rid of the `append' call, no?
> 
> --
> Best,
> 
> 
> RY

Good point, thanks. That's what I get for lazily copying from my other tree-sitter mode :).

New patch attached.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-dockerfile-ts-mode-Prevent-empty-categories-in-imenu.patch --]
[-- Type: text/x-patch; name=0001-dockerfile-ts-mode-Prevent-empty-categories-in-imenu.patch, Size: 1183 bytes --]

From 3ec61886ce3807f6125ea315bcb73a446981ad1d Mon Sep 17 00:00:00 2001
From: Randy Taylor <dev@rjt.dev>
Date: Sat, 27 May 2023 20:52:37 -0400
Subject: [PATCH] dockerfile-ts-mode: Prevent empty categories in imenu
 (Bug#63759)

* lisp/progmodes/dockerfile-ts-mode.el (dockerfile-ts-mode--imenu):
Don't include empty categories.
---
 lisp/progmodes/dockerfile-ts-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/dockerfile-ts-mode.el b/lisp/progmodes/dockerfile-ts-mode.el
index f2f30cf2617..2973b5149db 100644
--- a/lisp/progmodes/dockerfile-ts-mode.el
+++ b/lisp/progmodes/dockerfile-ts-mode.el
@@ -123,8 +123,9 @@ dockerfile-ts-mode--imenu
   (let* ((node (treesit-buffer-root-node))
          (stage-tree (treesit-induce-sparse-tree
                       node "from_instruction"
-                      nil 1000)))
-    `(("Stage" . ,(dockerfile-ts-mode--imenu-1 stage-tree)))))
+                      nil 1000))
+         (stage-index (dockerfile-ts-mode--imenu-1 stage-tree)))
+    (when stage-index `(("Stage" . ,stage-index)))))
 
 (defun dockerfile-ts-mode--imenu-1 (node)
   "Helper for `dockerfile-ts-mode--imenu'.
-- 
2.40.1