From 21bf2a2a839ed87883b8d1400141c1b911ee02d5 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 7 Jun 2019 11:56:37 -0700 Subject: [PATCH] Better fix --- src/csharp/Grpc.Tools/ProtoCompile.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/csharp/Grpc.Tools/ProtoCompile.cs b/src/csharp/Grpc.Tools/ProtoCompile.cs index b6fd94209d2..36a0ea36cee 100644 --- a/src/csharp/Grpc.Tools/ProtoCompile.cs +++ b/src/csharp/Grpc.Tools/ProtoCompile.cs @@ -136,7 +136,7 @@ namespace Grpc.Tools new ErrorListFilter { Pattern = new Regex( - pattern: "(?'FILENAME'[^\\(]+)\\((?'LINE'\\d+)\\) ?: ?warning in column=(?'COLUMN'\\d+) ?: ?(?'TEXT'.*)", + pattern: "^(?'FILENAME'.+?)\\((?'LINE'\\d+)\\) ?: ?warning in column=(?'COLUMN'\\d+) ?: ?(?'TEXT'.*)", options: RegexOptions.Compiled | RegexOptions.IgnoreCase, matchTimeout: s_regexTimeout), LogAction = (log, match) => @@ -162,7 +162,7 @@ namespace Grpc.Tools new ErrorListFilter { Pattern = new Regex( - pattern: "(?'FILENAME'[^\\(]+)\\((?'LINE'\\d+)\\) ?: ?error in column=(?'COLUMN'\\d+) ?: ?(?'TEXT'.*)", + pattern: "^(?'FILENAME'.+?)\\((?'LINE'\\d+)\\) ?: ?error in column=(?'COLUMN'\\d+) ?: ?(?'TEXT'.*)", options: RegexOptions.Compiled | RegexOptions.IgnoreCase, matchTimeout: s_regexTimeout), LogAction = (log, match) => @@ -188,7 +188,7 @@ namespace Grpc.Tools new ErrorListFilter { Pattern = new Regex( - pattern: "(?'FILENAME'[^:]+): ?warning: ?(?'TEXT'.*)", + pattern: "^(?'FILENAME'.+?): ?warning: ?(?'TEXT'.*)", options: RegexOptions.Compiled | RegexOptions.IgnoreCase, matchTimeout: s_regexTimeout), LogAction = (log, match) => @@ -211,7 +211,7 @@ namespace Grpc.Tools new ErrorListFilter { Pattern = new Regex( - pattern: "(?'FILENAME'[^:]+): ?(?'TEXT'.*)", + pattern: "^(?'FILENAME'.+?): ?(?'TEXT'.*)", options: RegexOptions.Compiled | RegexOptions.IgnoreCase, matchTimeout: s_regexTimeout), LogAction = (log, match) =>