branch: externals/csharp-mode
commit 879beb48e650aa32b9e722074d1792f96c61ed4b
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
imenu: Fix sorting of fields.
Add test for volatile fields.
---
csharp-mode-tests.el | 7 +++++++
csharp-mode.el | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index 7a8a0c6..d4c04de 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -209,6 +209,13 @@
(should (imenu-get-item imenu-index "interface
ImenuTest.ImenuTestInterface"))
(should (imenu-get-item imenu-index "enum ImenuTest.ImenuTestEnum")))
+(def-imenutest imenu-parsing-supports-fields-keywords
+ "./test-files/imenu-field-keyword-test.cs" imenu-index
+ (should (imenu-get-item imenu-index "(field) TestBool"))
+ (should (imenu-get-item imenu-index "(field) CommentedField"))
+ (should (imenu-get-item imenu-index "(field) _MultiLineComment"))
+ (should (imenu-get-item imenu-index "(field) VolatileTest")))
+
(ert-deftest imenu-indexing-resolves-correct-container ()
(let* ((testcase-no-namespace '( ("class Global" . 10)
(("namespace_a" . 20) ("namespace_b" . 30))
diff --git a/csharp-mode.el b/csharp-mode.el
index 69725a9..57e2552 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -1875,8 +1875,8 @@ to the beginning of the prior namespace.
access-modifier-list "+"
;; fields can be readonly/const
"\\(?:" (regexp-opt '("readonly" "const")) space "\\)?"
- "\\("
return-type space
+ "\\("
generic-identifier
"\\)"
optional-space
