* [PATCH] userdiff.c: Add C# async keyword in diff pattern
@ 2018-03-08 10:04 Thomas Levesque
2018-03-08 10:22 ` Eric Sunshine
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Levesque @ 2018-03-08 10:04 UTC (permalink / raw)
To: git
Currently C# async methods are not shown in diff hunk headers. I just
added the async keyword to the csharp method pattern so that they are
properly detected.
---
userdiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/userdiff.c b/userdiff.c
index dbfb4e13cddce..b92caf42b27be 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -138,7 +138,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 */
--
https://github.com/git/git/pull/464
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] userdiff.c: Add C# async keyword in diff pattern
2018-03-08 10:04 [PATCH] userdiff.c: Add C# async keyword in diff pattern Thomas Levesque
@ 2018-03-08 10:22 ` Eric Sunshine
2018-03-08 11:05 ` Thomas Levesque
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sunshine @ 2018-03-08 10:22 UTC (permalink / raw)
To: Thomas Levesque; +Cc: Git List
On Thu, Mar 8, 2018 at 5:04 AM, Thomas Levesque
<thomas.levesque@gmail.com> wrote:
> Currently C# async methods are not shown in diff hunk headers. I just
> added the async keyword to the csharp method pattern so that they are
> properly detected.
Thanks for the contribution. Please sign-off your patch (see
SubmittingPatches[1]).
[1]: https://github.com/git/git/blob/master/Documentation/SubmittingPatches#L278
> ---
> diff --git a/userdiff.c b/userdiff.c
> index dbfb4e13cddce..b92caf42b27be 100644
> --- a/userdiff.c
> +++ b/userdiff.c
> @@ -138,7 +138,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 */
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] userdiff.c: Add C# async keyword in diff pattern
2018-03-08 10:22 ` Eric Sunshine
@ 2018-03-08 11:05 ` Thomas Levesque
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Levesque @ 2018-03-08 11:05 UTC (permalink / raw)
To: git
Currently C# async methods are not shown in diff hunk headers. I just
added the async keyword to the csharp method pattern so that they are
properly detected.
Signed-off-by: Thomas Levesque <thomas.levesque@gmail.com>
---
userdiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/userdiff.c b/userdiff.c
index dbfb4e13cddce..b92caf42b27be 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -138,7 +138,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 */
--
https://github.com/git/git/pull/464
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-08 11:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-08 10:04 [PATCH] userdiff.c: Add C# async keyword in diff pattern Thomas Levesque
2018-03-08 10:22 ` Eric Sunshine
2018-03-08 11:05 ` Thomas Levesque
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).