branch: externals/csharp-mode commit 5bfd3d21ad87b17829bf51397019d74d4098ee83 Author: Jostein Kjønigsen <jost...@kjonigsen.net> Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Fix fontification of namespaces in using-statements. Namespaces can add with numbers (like SomeContract.v3). Update tests. --- csharp-mode-tests.el | 2 ++ csharp-mode.el | 2 +- test-files/namespace-fontification.cs | 8 ++++++++ test-files/using-fontification.cs | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el index 38d485e..d166a3f 100644 --- a/csharp-mode-tests.el +++ b/csharp-mode-tests.el @@ -121,6 +121,7 @@ "Reference" 'font-lock-constant-face "Under_scored" 'font-lock-constant-face "WithNumbers09.Ok" 'font-lock-constant-face + "WithNumbers09.OkV2" 'font-lock-constant-face )) (ert-deftest fontification-of-namespace-statements () @@ -129,6 +130,7 @@ "Reference" 'font-lock-constant-face "Under_scored" 'font-lock-constant-face "WithNumbers09.Ok" 'font-lock-constant-face + "WithNumbers09.OkV2" 'font-lock-constant-face )) (defun list-repeat-once (mylist) diff --git a/csharp-mode.el b/csharp-mode.el index 389de5a..e07199a 100644 --- a/csharp-mode.el +++ b/csharp-mode.el @@ -773,7 +773,7 @@ to work properly with code that includes attributes." "[ \t\n\f\v\r]*=" "[ \t\n\f\v\r]*" "\\)?" - "\\(\\(?:[A-Za-z0-9_]+\\.\\)*[A-Za-z_]+\\)" + "\\(\\(?:[A-Za-z0-9_]+\\.\\)*[A-Za-z0-9_]+\\)" "[ \t\n\f\v\r]*;") (2 font-lock-constant-face t t) (3 font-lock-constant-face)) diff --git a/test-files/namespace-fontification.cs b/test-files/namespace-fontification.cs index 9c7e8dd..e835160 100644 --- a/test-files/namespace-fontification.cs +++ b/test-files/namespace-fontification.cs @@ -5,3 +5,11 @@ namespace Reference { namespace Under_Scored { } + +namespace WithNumbers09.Ok { + +} + +namespace WithNumbers09.OkV2 { + +} diff --git a/test-files/using-fontification.cs b/test-files/using-fontification.cs index 0f1f61b..dbb42f2 100644 --- a/test-files/using-fontification.cs +++ b/test-files/using-fontification.cs @@ -1,3 +1,4 @@ using Reference; using Under_scored; using WithNumbers09.Ok; +using WithNumbers09.OkV2;