Merge branch 'tl/userdiff-csharp-async'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:00:47 +0000 (15:00 -0700)
Update funcname pattern used for C# to recognize "async" keyword.

* tl/userdiff-csharp-async:
userdiff.c: add C# async keyword in diff pattern

1  2 
userdiff.c
diff --combined userdiff.c
index 8f5028f6b25eb570aedb9763f2456442b2e4a1aa,b92caf42b27bebcb99270cc4a2d1bacf8c28aa3e..a69241b25ddaff5b61380aa8b451a6fcb833502c
@@@ -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 */