From 60e141d66820e959bb9a114c9c3b0fdb354a693e Mon Sep 17 00:00:00 2001 From: olemorud Date: Thu, 16 Mar 2023 09:46:07 +0100 Subject: [PATCH] [feat] Remove fromPath in matcher template --- dist/gcc_matcher.jsontemplate | 13 ++++++------- src/gcc_matcher.jsontemplate | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dist/gcc_matcher.jsontemplate b/dist/gcc_matcher.jsontemplate index 0e2dac5..fadabe8 100644 --- a/dist/gcc_matcher.jsontemplate +++ b/dist/gcc_matcher.jsontemplate @@ -4,13 +4,12 @@ "owner": "gcc-problem-matcher", "pattern": [ { - "regexp": "^(${{ BASE }}\\/?)(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$", - "fromPath": 1, - "file": 2, - "line": 3, - "column": 4, - "severity": 5, - "message": 6 + "regexp": "^${{ BASE }}\\/?(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "message": 5 } ] } diff --git a/src/gcc_matcher.jsontemplate b/src/gcc_matcher.jsontemplate index 0e2dac5..fadabe8 100644 --- a/src/gcc_matcher.jsontemplate +++ b/src/gcc_matcher.jsontemplate @@ -4,13 +4,12 @@ "owner": "gcc-problem-matcher", "pattern": [ { - "regexp": "^(${{ BASE }}\\/?)(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$", - "fromPath": 1, - "file": 2, - "line": 3, - "column": 4, - "severity": 5, - "message": 6 + "regexp": "^${{ BASE }}\\/?(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "message": 5 } ] }