From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Mar 2018 22:00:47 +0000 (-0700)
Subject: Merge branch 'tl/userdiff-csharp-async'
X-Git-Tag: v2.17.0-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e215e89791b97ebb6831504480c8ab4734a2117e?ds=inline;hp=-c

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
---

e215e89791b97ebb6831504480c8ab4734a2117e
diff --combined userdiff.c
index 8f5028f6b2,b92caf42b2..a69241b25d
--- a/userdiff.c
+++ b/userdiff.c
@@@ -38,15 -38,6 +38,15 @@@ IPATTERN("fortran"
  	 "|//|\\*\\*|::|[/<>=]="),
  IPATTERN("fountain", "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$",
  	 "[^ \t-]+"),
 +PATTERNS("golang",
 +	 /* Functions */
 +	 "^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n"
 +	 /* Structs and interfaces */
 +	 "^[ \t]*(type[ \t].*(struct|interface)[ \t]*(\\{[ \t]*)?)",
 +	 /* -- */
 +	 "[a-zA-Z_][a-zA-Z0-9_]*"
 +	 "|[-+0-9.eE]+i?|0[xX]?[0-9a-fA-F]+i?"
 +	 "|[-+*/<>%&^|=!:]=|--|\\+\\+|<<=?|>>=?|&\\^=?|&&|\\|\\||<-|\\.{3}"),
  PATTERNS("html", "^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$",
  	 "[^<>= \t]+"),
  PATTERNS("java",
@@@ -147,7 -138,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 */