From 0acbfbc5dcbe87d4d98ddf7f2b60e2fe82826834 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 3 Oct 2025 16:59:51 -0700 Subject: oni-js: Include more functions in the imenu regexp --- oni-js.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/oni-js.el b/oni-js.el index bf16f55..b2b9ba8 100644 --- a/oni-js.el +++ b/oni-js.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2025.0805.110318 +;; Version: 2025.1003.165923 ;; Package-Requires: (oni-company js2-mode js2-refactor oni-flycheck fic-mode rjsx-mode prettier-js) ;; This program is free software; you can redistribute it and/or modify @@ -88,9 +88,11 @@ (list (list nil - (rx (or (seq bol (minimal-match (zero-or-more space)) (optional "async ") (group-n 1 (minimal-match (one-or-more alnum))) "(" (minimal-match (zero-or-more (not ")"))) ")" (minimal-match (zero-or-more white)) "{") - (seq bol (minimal-match (zero-or-more space)) (minimal-match (group-n 1 (one-or-more alnum))) ":" (minimal-match (zero-or-more white)) (optional "function ") "(") - (seq bol (minimal-match (zero-or-more space)) "function " (minimal-match (group-n 1 (one-or-more alnum))) "(" (minimal-match (zero-or-more (not ")"))) ")" (minimal-match (zero-or-more space)) "{"))) + (rx (seq bol (minimal-match (zero-or-more space)) + (or (seq (optional "async ") (group-n 1 (minimal-match (one-or-more alnum))) "(" (minimal-match (zero-or-more (not ")"))) ")" (minimal-match (zero-or-more white)) "{") + (seq (minimal-match (group-n 1 (one-or-more alnum))) ":" (minimal-match (zero-or-more white)) (optional "function ") "(") + (seq (optional "export ") "function " (minimal-match (group-n 1 (one-or-more (any punct alnum)))) "(" (minimal-match (zero-or-more (not ")"))) ")" (minimal-match (zero-or-more space)) "{") + (seq (optional "export ") (optional "const ") (minimal-match (group-n 1 (one-or-more (any punct alnum)))) (minimal-match (zero-or-more space)) "=" (minimal-match (zero-or-more space)) (optional "async") (optional "function") (minimal-match (zero-or-more space)) "(")))) 1)))) (add-hook 'js2-mode-hook #'oni-js-set-imenu-expression) -- cgit v1.3-2-g0d8e