Merge pull request #4748 from arturcic/main

Refactor RegexPatterns to use properties instead of methods for Regex

Author: arturcic

src/GitVersion.App/ArgumentParserExtensions.cs

@@ -41,7 +41,7 @@ public bool IsValidPath()
 
         public bool IsSwitchArgument()
         {
-            var patternRegex = RegexPatterns.Common.SwitchArgumentRegex();
+            var patternRegex = RegexPatterns.SwitchArgumentRegex;
             return value != null
                    && (value.StartsWith('-') || value.StartsWith('/'))
                    && !patternRegex.Match(value).Success;

src/GitVersion.Core.Tests/Core/RegexPatternTests.cs

@@ -118,7 +118,7 @@ private static bool ShouldBeIgnored(ICommit commit, IIgnoreConfiguration ignore)
             foreach (var groupName in regex.GetGroupNames())
             {
                 var groupValue = match.Groups[groupName].Value;
-                Lazy<string> escapedGroupValueLazy = new(() => groupValue.RegexReplace(RegexPatterns.Common.SanitizeNameRegexPattern, "-"));
+                Lazy<string> escapedGroupValueLazy = new(() => groupValue.RegexReplace(RegexPatterns.SanitizeNameRegexPattern, "-"));
                 var placeholder = $"{{{groupName}}}";
                 int index, startIndex = 0;
                 while ((index = label.IndexOf(placeholder, startIndex, StringComparison.InvariantCulture)) >= 0)

src/GitVersion.Core/Core/RegexPatterns.cs

@@ -26,7 +26,7 @@ public string SanitizeEnvVarName(string name)
         if (name.Length > 200)
             throw new ArgumentException($"Environment variable name too long: '{name[..20]}...'");
 
-        if (!RegexPatterns.Cache.GetOrAdd(RegexPatterns.Common.SanitizeEnvVarNameRegexPattern).IsMatch(name))
+        if (!RegexPatterns.Cache.GetOrAdd(RegexPatterns.SanitizeEnvVarNameRegexPattern).IsMatch(name))
             throw new ArgumentException($"Environment variable name contains disallowed characters: '{name}'");
 
         return name;
@@ -40,7 +40,7 @@ public string SanitizeMemberName(string memberName)
         if (memberName.Length > 100)
             throw new ArgumentException($"Member name too long: '{memberName[..20]}...'");
 
-        if (!RegexPatterns.Cache.GetOrAdd(RegexPatterns.Common.SanitizeMemberNameRegexPattern).IsMatch(memberName))
+        if (!RegexPatterns.Cache.GetOrAdd(RegexPatterns.SanitizeMemberNameRegexPattern).IsMatch(memberName))
             throw new ArgumentException($"Member name contains disallowed characters: '{memberName}'");
 
         return memberName;

src/GitVersion.Core/Extensions/ConfigurationExtensions.cs

@@ -45,7 +45,7 @@ public string FormatWith<T>(T? source, IEnvironment environment)
             var result = new StringBuilder();
             var lastIndex = 0;
 
-            foreach (var match in RegexPatterns.Common.ExpandTokensRegex().Matches(template).Cast<Match>())
+            foreach (var match in RegexPatterns.ExpandTokensRegex.Matches(template).Cast<Match>())
             {
                 var replacement = EvaluateMatch(match, source, environment);
                 result.Append(template, lastIndex, match.Index - lastIndex);

src/GitVersion.Core/Formatting/InputSanitizer.cs

@@ -58,7 +58,7 @@ public IDisposable IndentLog(string operationDescription)
 
     private string FormatMessage(string message, string level)
     {
-        var obscuredMessage = RegexPatterns.Common.ObscurePasswordRegex().Replace(message, "$1$2:*******@");
+        var obscuredMessage = RegexPatterns.ObscurePasswordRegex.Replace(message, "$1$2:*******@");
         var timestamp = $"{DateTime.Now:yy-MM-dd H:mm:ss:ff}";
         return string.Format(CultureInfo.InvariantCulture, "{0}{1} [{2}] {3}", this.currentIndentation, level, timestamp, obscuredMessage);
     }

src/GitVersion.Core/Formatting/StringFormatWithExtension.cs

@@ -11,14 +11,14 @@ public class MergeMessage
 {
     private static readonly IList<(string Name, Regex Pattern)> DefaultFormats =
     [
-        new("Default", RegexPatterns.MergeMessage.DefaultMergeMessageRegex()),
-        new("SmartGit", RegexPatterns.MergeMessage.SmartGitMergeMessageRegex()),
-        new("BitBucketPull", RegexPatterns.MergeMessage.BitBucketPullMergeMessageRegex()),
-        new("BitBucketPullv7", RegexPatterns.MergeMessage.BitBucketPullv7MergeMessageRegex()),
-        new("BitBucketCloudPull", RegexPatterns.MergeMessage.BitBucketCloudPullMergeMessageRegex()),
-        new("GitHubPull", RegexPatterns.MergeMessage.GitHubPullMergeMessageRegex()),
-        new("RemoteTracking", RegexPatterns.MergeMessage.RemoteTrackingMergeMessageRegex()),
-        new("AzureDevOpsPull", RegexPatterns.MergeMessage.AzureDevOpsPullMergeMessageRegex())
+        new("Default", RegexPatterns.MergeMessage.DefaultMergeMessageRegex),
+        new("SmartGit", RegexPatterns.MergeMessage.SmartGitMergeMessageRegex),
+        new("BitBucketPull", RegexPatterns.MergeMessage.BitBucketPullMergeMessageRegex),
+        new("BitBucketPullv7", RegexPatterns.MergeMessage.BitBucketPullv7MergeMessageRegex),
+        new("BitBucketCloudPull", RegexPatterns.MergeMessage.BitBucketCloudPullMergeMessageRegex),
+        new("GitHubPull", RegexPatterns.MergeMessage.GitHubPullMergeMessageRegex),
+        new("RemoteTracking", RegexPatterns.MergeMessage.RemoteTrackingMergeMessageRegex),
+        new("AzureDevOpsPull", RegexPatterns.MergeMessage.AzureDevOpsPullMergeMessageRegex)
     ];
 
     public MergeMessage(string mergeMessage, IGitVersionConfiguration configuration)

src/GitVersion.Core/Logging/Log.cs

@@ -149,7 +149,7 @@ public static bool TryParse(string version, string? tagPrefixRegex,
 
     private static bool TryParseStrict(string version, [NotNullWhen(true)] out SemanticVersion? semanticVersion)
     {
-        var parsed = RegexPatterns.SemanticVersion.ParseStrictRegex().Match(version);
+        var parsed = RegexPatterns.SemanticVersion.ParseStrictRegex.Match(version);
 
         if (!parsed.Success)
         {
@@ -171,7 +171,7 @@ private static bool TryParseStrict(string version, [NotNullWhen(true)] out Seman
 
     private static bool TryParseLoose(string version, [NotNullWhen(true)] out SemanticVersion? semanticVersion)
     {
-        var parsed = RegexPatterns.SemanticVersion.ParseLooseRegex().Match(version);
+        var parsed = RegexPatterns.SemanticVersion.ParseLooseRegex.Match(version);
 
         if (!parsed.Success)
         {

src/GitVersion.Core/MergeMessage.cs

@@ -111,7 +111,7 @@ public static SemanticVersionBuildMetaData Parse(string? buildMetaData)
         if (buildMetaData.IsNullOrEmpty())
             return Empty;
 
-        var parsed = RegexPatterns.SemanticVersion.ParseBuildMetaDataRegex().Match(buildMetaData);
+        var parsed = RegexPatterns.SemanticVersion.ParseBuildMetaDataRegex.Match(buildMetaData);
 
         long? buildMetaDataCommitsSinceTag = null;
         long? buildMetaDataCommitsSinceVersionSource = null;
@@ -147,7 +147,7 @@ public static SemanticVersionBuildMetaData Parse(string? buildMetaData)
     private static string FormatMetaDataPart(string value)
     {
         if (!value.IsNullOrEmpty())
-            value = RegexPatterns.SemanticVersion.FormatBuildMetaDataRegex().Replace(value, "-");
+            value = RegexPatterns.SemanticVersion.FormatBuildMetaDataRegex.Replace(value, "-");
         return value;
     }
 }