From 9f1429e274df81344d260c8e42b3387a402940f1 Mon Sep 17 00:00:00 2001
From: Bruno Pedrosa <brupelo@gmail.com>
Date: Thu, 20 Oct 2016 02:35:58 +0200
Subject: Sublime: Update generated diagnostic matching expression for MSVC

Update the generated `file_regex` to match MSVC-style messages in
addition to the GCC-style messages already matched.  Use non-capturing
sub-patterns to tolerate the differences in message formats while still
capturing the four pieces of information in proper group numbers (file
name, line number, column number, message).

Closes: #16375
---
 Source/cmExtraSublimeTextGenerator.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 41f82a2..b9e4246 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -271,7 +271,9 @@ void cmExtraSublimeTextGenerator::AppendTarget(
        << this->BuildMakeCommand(make, makefileName.c_str(), targetName)
        << "],\n";
   fout << "\t\t\t\"working_dir\": \"${project_path}\",\n";
-  fout << "\t\t\t\"file_regex\": \"^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$\"\n";
+  fout << "\t\t\t\"file_regex\": \""
+          "^(..[^:]*)(?::|\\\\()([0-9]+)(?::|\\\\))(?:([0-9]+):)?\\\\s*(.*)"
+          "\"\n";
   fout << "\t\t}";
 }
 
-- 
cgit v0.12