From 7c623f99d80defa83fb32afb7a8e99c439e11ca8 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 11 Oct 2022 09:50:45 +0300
Subject: [PATCH] Git: Fix pattern for commit hash matching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Avoid matching mid-word.
* Avoid matching after "mode ".
* Change to raw string literals.

Fixes: QTCREATORBUG-24768
Fixes: QTCREATORBUG-28268
Change-Id: I68abbf3de7928c60e0fe2d944adedaa6db94b1a4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/plugins/git/giteditor.cpp              | 2 +-
 src/plugins/vcsbase/vcsoutputformatter.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 415d1622983..b24f64e7e8d 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -29,7 +29,7 @@
 #include <QTextCodec>
 #include <QTextCursor>
 
-#define CHANGE_PATTERN "[a-f0-9]{7,40}"
+#define CHANGE_PATTERN "\\b[a-f0-9]{7,40}\\b"
 
 using namespace Core;
 using namespace Utils;
diff --git a/src/plugins/vcsbase/vcsoutputformatter.cpp b/src/plugins/vcsbase/vcsoutputformatter.cpp
index 0085a8d06ea..d4ad653d910 100644
--- a/src/plugins/vcsbase/vcsoutputformatter.cpp
+++ b/src/plugins/vcsbase/vcsoutputformatter.cpp
@@ -21,10 +21,10 @@ namespace VcsBase {
 
 VcsOutputLineParser::VcsOutputLineParser() :
     m_regexp(
-        "(https?://\\S*)"                             // https://codereview.org/c/1234
-        "|(v[0-9]+\\.[0-9]+\\.[0-9]+[\\-A-Za-z0-9]*)" // v0.1.2-beta3
-        "|([0-9a-f]{6,}(?:\\.{2,3}[0-9a-f]{6,}"       // 789acf or 123abc..456cde
-        "|\\^+|~\\d+)?)")                             // or 789acf^ or 123abc~99
+        R"((https?://\S*))"                                   // https://codereview.org/c/1234
+        R"(|\b(v[0-9]+\.[0-9]+\.[0-9]+[\-A-Za-z0-9]*))"       // v0.1.2-beta3
+        R"(|\b(?<!mode )([0-9a-f]{6,}(?:\.{2,3}[0-9a-f]{6,})" // 789acf or 123abc..456cde
+        R"(|\^+|~\d+)?)\b)")                                  // or 789acf^ or 123abc~99
 {
 }