From 7c614ea4aa024a5ced14ba750d68666a017ebc95 Mon Sep 17 00:00:00 2001
From: Danny McCormick <damccorm@microsoft.com>
Date: Tue, 18 Jun 2019 14:52:43 -0400
Subject: [PATCH] Fix matchers

---
 .github/eslint-compact.json | 2 +-
 .github/tsc.json            | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/eslint-compact.json b/.github/eslint-compact.json
index 017222b4..72173f0c 100644
--- a/.github/eslint-compact.json
+++ b/.github/eslint-compact.json
@@ -4,7 +4,7 @@
             "owner": "eslint-compact",
             "pattern": [
                 {
-                    "regexp": "/^(.+):\\sline\\s(\\d+),\\scol\\s(\\d+),\\s(Error|Warning|Info)\\s-\\s(.+)\\s\\((.+)\\)$/",
+                    "regexp": "^(.+):\\sline\\s(\\d+),\\scol\\s(\\d+),\\s(Error|Warning|Info)\\s-\\s(.+)\\s\\((.+)\\)$",
                     "file": 1,
                     "line": 2,
                     "column": 3,
diff --git a/.github/tsc.json b/.github/tsc.json
index 6e48ac84..5b0b6647 100644
--- a/.github/tsc.json
+++ b/.github/tsc.json
@@ -4,11 +4,12 @@
             "owner": "tsc",
             "pattern": [
                 {
-                    "regexp": "/^([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(\\d+)\\s+(.*)$/",
+                    "regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
                     "file": 1,
                     "location": 2,
-                    "code": 3,
-                    "message": 4
+                    "severity": 3,
+                    "code": 4,
+                    "message": 5
                 }
             ]
         }