branch: elpa/d-mode
commit 2964263322f5dc19327166732393dcefa22b1bc8
Author: Vladimir Panteleev <[email protected]>
Commit: Vladimir Panteleev <[email protected]>
Fix imenu with alias templates
---
d-mode.el | 7 ++++++-
tests/imenu.d | 5 ++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/d-mode.el b/d-mode.el
index 75f46f0..9c2af8e 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -7,7 +7,7 @@
;; Maintainer: Russel Winder <[email protected]>
;; Vladimir Panteleev <[email protected]>
;; Created: March 2007
-;; Version: 201908262320
+;; Version: 201908262322
;; Keywords: D programming language emacs cc-mode
;; Package-Requires: ((emacs "24.3"))
@@ -711,6 +711,11 @@ Each list item should be a regexp matching a single
identifier."
(?A . ?Z)
(?a . ?z))))
(zero-or-more (syntax whitespace))
+ (zero-or-one
+ "("
+ (zero-or-more (not (any "()")))
+ ")"
+ (zero-or-more (syntax whitespace)))
"=")
1)
("*Aliases*"
diff --git a/tests/imenu.d b/tests/imenu.d
index 2dc9089..9dcfae1 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 25 33 34 37 40 43 46 49 52 54 56 67 75 78 81)
+// #out: (4 6 11 14 17 19 22 25 33 34 37 40 43 46 49 52 54 56 67 75 78 81 84)
void foo(int x) {}
@@ -79,3 +79,6 @@ extern (D) void peekSlice() {}
// Aliases with VisibilityAttribute / StorageClass
public alias foo=bar;
+
+// alias template
+public alias Regex(Char) = std.regex.internal.ir.Regex!(Char);