CR: Refactor MergeMessage to remove private property setters

Author: Kieranties

src/GitVersionCore/MergeMessage.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace GitVersion
@@ -22,57 +23,44 @@ public MergeMessage(string mergeMessage, Config config)
             if (mergeMessage == null)
                 throw new NullReferenceException();
 
-            foreach(var entry in config.MergeMessageFormats)
-            {
-                var pattern = Pattern(entry.Key, entry.Value);
-                if (ApplyPattern(mergeMessage, config.TagPrefix, pattern))
-                {
-                    return;
-                }
-            }
+            // Concat config messages with the defaults.
+            // Ensure configs are processed first.
+            var allPatterns = config.MergeMessageFormats
+                .Select(x => Pattern(x.Key, x.Value))
+                .Concat(DefaultPatterns);
 
-            foreach (var pattern in DefaultPatterns)
+            foreach (var pattern in allPatterns)
             {
-                if (ApplyPattern(mergeMessage, config.TagPrefix, pattern))
+                var match = pattern.Value.Match(mergeMessage);
+                if (match.Success)
                 {
-                    return;
-                }
-            }
-        }
+                    MatchDefinition = pattern.Key;
+                    MergedBranch = match.Groups["SourceBranch"].Value;
 
-        public string MatchDefinition { get; private set; }
-        public string TargetBranch { get; private set; }
-        public string MergedBranch { get; private set; } = "";
-        public bool IsMergedPullRequest => PullRequestNumber != null;
-        public int? PullRequestNumber { get; private set; }
-        public SemanticVersion Version { get; private set; }
+                    if (match.Groups["TargetBranch"].Success)
+                    {
+                        TargetBranch = match.Groups["TargetBranch"].Value;
+                    }
 
-        private bool ApplyPattern(string mergeMessage, string tagPrefix, KeyValuePair<string, Regex> pattern)
-        {
-            var match = pattern.Value.Match(mergeMessage);
-            if (match.Success)
-            {
-                MatchDefinition = pattern.Key;
-                MergedBranch = match.Groups["SourceBranch"].Value;
+                    if (int.TryParse(match.Groups["PullRequestNumber"].Value, out var pullNumber))
+                    {
+                        PullRequestNumber = pullNumber;
+                    }
 
-                if (match.Groups["TargetBranch"].Success)
-                {
-                    TargetBranch = match.Groups["TargetBranch"].Value;
-                }
+                    Version = ParseVersion(MergedBranch, config.TagPrefix);
 
-                if (int.TryParse(match.Groups["PullRequestNumber"].Value, out var pullNumber))
-                {
-                    PullRequestNumber = pullNumber;
+                    break;
                 }
-
-                Version = ParseVersion(MergedBranch, tagPrefix);
-
-                return true;
             }
-
-            return false;
         }
 
+        public string MatchDefinition { get; }
+        public string TargetBranch { get; }
+        public string MergedBranch { get; } = "";
+        public bool IsMergedPullRequest => PullRequestNumber != null;
+        public int? PullRequestNumber { get; }
+        public SemanticVersion Version { get; }
+
         private SemanticVersion ParseVersion(string branchName, string tagPrefix)
         {
             // Remove remotes and branch prefixes like release/ feature/ hotfix/ etc