branch: externals/csharp-mode commit 1d2ef53c894fa5e399478185919274d9e53e1235 Author: Jostein Kjønigsen <jost...@kjonigsen.net> Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Fix imenu-indexing of members with underscore in name. TODO: add test-case. --- csharp-mode.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/csharp-mode.el b/csharp-mode.el index be249ad..6e5f901 100644 --- a/csharp-mode.el +++ b/csharp-mode.el @@ -1778,16 +1778,14 @@ to the beginning of the prior namespace. (access-modifiers (concat access-modifier-list "*")) (basic-type (concat ;; typename - "\\(?:[A-Za-z_][[:alnum:]]*\\.\\)*" + "\\(?:[A-Za-z_][[:alnum:]_]*\\.\\)*" "[A-Za-z_][[:alnum:]]*" )) (type (concat basic-type ;; simplified, optional generic constraint. ;; handles generic sub-types. - ;; { is optional because otherwise initializers with - ;; bracket on same line will indent wrongly. - "\\(?:<[[:alnum:], <>]+>[ \t\n\f\v\r]*{?\\)?")) + "\\(?:<[[:alnum:],<> \t\n\f\v\r]+>\\)?")) (return-type (concat type ;; optional array-specifier