[nongnu] elpa/d-mode ab1057f 159/346: Fix imenu for functions with tail qualifiers on their own line

[ELPA Syncer]

branch: elpa/d-mode
commit ab1057f405b18f52fb929c793ac001224a8f87b2
Author: Vladimir Panteleev <git@thecybershadow.net>
Commit: Vladimir Panteleev <git@thecybershadow.net>

    Fix imenu for functions with tail qualifiers on their own line
---
 d-mode.el     | 20 +++++++++++---------
 tests/imenu.d | 10 +++++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/d-mode.el b/d-mode.el
index 752f5d8..1d382f6 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -7,7 +7,7 @@
 ;; Maintainer:  Russel Winder <russel@winder.org.uk>
 ;;              Vladimir Panteleev <vladimir@thecybershadow.net>
 ;; Created:  March 2007
-;; Version:  201610111915
+;; Version:  201610111924
 ;; Keywords:  D programming language emacs cc-mode
 
 ;;;; NB Version number is date and time yyyymmddhhMM UTC.
@@ -468,27 +468,27 @@ The expression is added to 
`compilation-error-regexp-alist' and
   (rx
    ;; Whitespace
    bol
-   (zero-or-more (syntax whitespace))
+   (zero-or-more space)
 
    ;; Qualifiers
    (zero-or-more
     (one-or-more (any "a-z_@()C+"))
-    (one-or-more (syntax whitespace)))
+    (one-or-more space))
 
    ;; Type
    (group
     (one-or-more (any "a-zA-Z0-9_.*![]()")))
-   (one-or-more (syntax whitespace))
+   (one-or-more space)
 
    ;; Function name
    (group
     (one-or-more (any "a-zA-Z0-9_")))
-   (zero-or-more (syntax whitespace))
+   (zero-or-more space)
 
    ;; Type arguments
    (zero-or-one
     "(" (zero-or-more (not (any ")"))) ")"
-    (zero-or-more (syntax whitespace)))
+    (zero-or-more space))
 
    ;; Arguments
    "("
@@ -499,17 +499,19 @@ The expression is added to 
`compilation-error-regexp-alist' and
     ")"
     (zero-or-more (not (any "()"))))
    ")"
-   (zero-or-more (syntax whitespace))
+   (zero-or-more (any " \t\n"))
 
    ;; Pure/const etc.
    (zero-or-more
     (one-or-more (any "a-z@"))
-    (zero-or-more (syntax whitespace)))
+    (zero-or-more (any " \t\n")))
 
    ;; ';' or 'if' or '{'
    (or
     ";"
-    (and (zero-or-more (any " \t\n")) (or "if" "{")))
+    (and
+     (zero-or-more (any " \t\n"))
+     (or "if" "{")))
    ))
 
 (defun d-imenu-method-index-function ()
diff --git a/tests/imenu.d b/tests/imenu.d
index 546c09f..4df9e2e 100644
--- a/tests/imenu.d
+++ b/tests/imenu.d
@@ -1,5 +1,5 @@
 // #run: (d-test-get-imenu-lines)
-// #out: (4 6 11 14 17 19 22)
+// #out: (4 6 11 14 17 19 22 25)
 
 void foo(int x) {}
 
@@ -21,3 +21,11 @@ void test(const(char)* str)
 
 extern (C++) static const(char)* searchPath(Strings* path, const(char)* name, 
bool cwd)
 {}
+
+auto execute(in char[][] args,
+             const string[string] env = null,
+             Config config = Config.none,
+             size_t maxOutput = size_t.max,
+             in char[] workDir = null)
+    @trusted
+{}