[nongnu] elpa/julia-mode d4077f27a8 03/14: match _one-liners; preserve types; stop at end

[ELPA Syncer]

branch: elpa/julia-mode
commit d4077f27a8b0814fb1ab9321aac8dbbb5d016221
Author: Malte Sandstede <malte@sandstede.com>
Commit: GitHub <noreply@github.com>

    match _one-liners; preserve types; stop at end
---
 julia-mode.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/julia-mode.el b/julia-mode.el
index f345856b56..03ebb7a343 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -703,9 +703,10 @@ Return nil if point is not in a function, otherwise point."
 ;;; IMENU
 (defvar julia-imenu-generic-expression
   ;; don't use syntax classes, screws egrep
-  '(("Function (_)" "[ \t]*function[ \t]+\\(_[^ \t\n]*\\)" 1)
-    ("Function" "^[ \t]*function[ \t]+\\([^_][^\t\n]*\\)" 1)
-    ("Function" "^[ \t]*\\(\\(@.+ \\)?[!\._a-zA-Z0-9]+\(.*\).*\\) = " 1)
+  '(("Function (_)" "^[ \t]*function[ \t]+\\(_.*?\\)\\( +end\\|$\\)" 1)
+    ("Function (_)" "^[ \t]*\\(\\(@.+ \\)?_[!\._a-zA-Z0-9]+\(.*\).*\\) = " 1)
+    ("Function" "^[ \t]*function[ \t]+\\([^_].*?\\)\\( +end\\|$\\)" 1)
+    ("Function" "^[ \t]*\\(\\(@.+ 
\\)?\(?<!_\)[!\.a-zA-Z0-9][!\._a-zA-Z0-9]*\(.*\).*\\) =" 1)
     ("Const" "^[ \t]*const \\([^ \t\n]*\\) *= " 1)
     ("Struct" "^[ \t]*\\(\\(mutable \\)*struct [^ \t\n]*\\)" 1)
     ("Require" " *\\(\\brequire\\)(\\([^ \t\n)]*\\)" 2)