branch: externals/csharp-mode commit 33fb05c1049e9d3b6db4aa72e27b9b7335b4dbe1 Author: Jostein Kjønigsen <jost...@kjonigsen.net> Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
imenu: Fix indexing of fields with _ in name. Add test-cases. --- csharp-mode-tests.el | 3 ++- csharp-mode.el | 2 +- test-files/imenu-field-keyword-test.cs | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el index 7399bd3..2420b62 100644 --- a/csharp-mode-tests.el +++ b/csharp-mode-tests.el @@ -227,7 +227,8 @@ "(field) TestBool" "(field) CommentedField" "(field) _MultiLineComment" - "(field) VolatileTest") + "(field) VolatileTest" + "(field) m_Member") (def-imenutest imenu-parsing-supports-method-keywords "./test-files/imenu-method-test.cs" diff --git a/csharp-mode.el b/csharp-mode.el index 6e5f901..14c99f8 100644 --- a/csharp-mode.el +++ b/csharp-mode.el @@ -1779,7 +1779,7 @@ to the beginning of the prior namespace. (basic-type (concat ;; typename "\\(?:[A-Za-z_][[:alnum:]_]*\\.\\)*" - "[A-Za-z_][[:alnum:]]*" + "[A-Za-z_][[:alnum:]_]*" )) (type (concat basic-type diff --git a/test-files/imenu-field-keyword-test.cs b/test-files/imenu-field-keyword-test.cs index b7bd6b1..ea29fa8 100644 --- a/test-files/imenu-field-keyword-test.cs +++ b/test-files/imenu-field-keyword-test.cs @@ -14,4 +14,6 @@ public class FieldTestClass new line */ internal volatile DateTime VolatileTest; + + private static object m_Member; }