diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-15 22:00:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-15 22:00:47 (GMT) |
| commit | e215e89791b97ebb6831504480c8ab4734a2117e (patch) | |
| tree | f6da72fc048c72f3458350f8faa8fbfa1339ff77 /userdiff.c | |
| parent | 9ecfd98a87cce0ad345c2dedf14f892d12c49abb (diff) | |
| parent | a12cec99f8b64a0b99ae6f8a7e4724039406aea3 (diff) | |
| download | git-e215e89791b97ebb6831504480c8ab4734a2117e.zip git-e215e89791b97ebb6831504480c8ab4734a2117e.tar.gz git-e215e89791b97ebb6831504480c8ab4734a2117e.tar.bz2 | |
Merge branch 'tl/userdiff-csharp-async'
Update funcname pattern used for C# to recognize "async" keyword.
* tl/userdiff-csharp-async:
userdiff.c: add C# async keyword in diff pattern
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -147,7 +147,7 @@ PATTERNS("csharp", /* Keywords */ "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n" /* Methods and constructors */ - "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n" + "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe|async)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n" /* Properties */ "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n" /* Type definitions */ |