diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:01 -0700 |
| commit | f7410695500b4e02940cb6a089f013ce71dc54d8 (patch) | |
| tree | e51d61aa1ac8755c0f6de011fce524b7fc2a4fec | |
| parent | Merge branch 'ab/config-hooks-path-testfix' (diff) | |
| parent | userdiff: add support for C# record types (diff) | |
| download | tgif-f7410695500b4e02940cb6a089f013ce71dc54d8.tar.xz | |
Merge branch 'jv/userdiff-csharp-update'
The userdiff pattern for C# learned the token "record".
* jv/userdiff-csharp-update:
userdiff: add support for C# record types
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index 3c3bbe38b0..d9b2ba752f 100644 --- a/userdiff.c +++ b/userdiff.c @@ -65,7 +65,7 @@ PATTERNS("csharp", /* Properties */ "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n" /* Type definitions */ - "^[ \t]*(((static|public|internal|private|protected|new|unsafe|sealed|abstract|partial)[ \t]+)*(class|enum|interface|struct)[ \t]+.*)$\n" + "^[ \t]*(((static|public|internal|private|protected|new|unsafe|sealed|abstract|partial)[ \t]+)*(class|enum|interface|struct|record)[ \t]+.*)$\n" /* Namespace */ "^[ \t]*(namespace[ \t]+.*)$", /* -- */ |