From: Theodor Thornhill <theo@thornhill.no>
Date: Thu, 8 Dec 2022 10:08:28 +0000 (+0100)
Subject: Add expression for generic_name in csharp-ts-mode (bug#59897)
X-Git-Tag: emacs-29.0.90~1218
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=647b6a8099f414e5a7b162efd3658e174064dfe7;p=emacs.git

Add expression for generic_name in csharp-ts-mode (bug#59897)

Given the below example, we want 'services' to be font-locked in
'font-lock-variable-name-face' in all cases.  Previously this only
worked in the first case, and the other was font-locked as
'font-lock-function-name-face'.

namespace Foo {
    void Foo() {
        services.Add();
        services.Add<MyType>();
    }
}

* lisp/progmodes/csharp-mode.el (csharp-ts-mode--font-lock-settings):
Add new query that makes the mentioned example work.
---

diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index 8a7313b1ce8..17b8ae53f84 100644
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -784,6 +784,10 @@ compilation and evaluation time conflicts."
      (invocation_expression
       (member_access_expression
        (generic_name (identifier) @font-lock-function-name-face)))
+     (invocation_expression
+      (member_access_expression
+       expression: (identifier) @font-lock-variable-name-face
+       name: (generic_name (type_argument_list (identifier)))))
      (invocation_expression
       (member_access_expression
        ((identifier) @font-lock-variable-name-face