refactors regex patterns for performance

arturcic · arturcic · commit 5f7738ffa6bb · 2025-11-16T22:50:53.000+01:00
Refactors regex patterns to utilize `GeneratedRegexAttribute` caching for improved performance and reduced memory allocation.
diff --git a/src/GitVersion.App/ArgumentParserExtensions.cs b/src/GitVersion.App/ArgumentParserExtensions.cs
@@ -41,7 +41,7 @@ public bool IsValidPath()
 
         public bool IsSwitchArgument()
         {
-            var patternRegex = RegexPatterns.Common.SwitchArgumentRegex();
+            var patternRegex = RegexPatterns.Common.SwitchArgumentRegex;
             return value != null
                    && (value.StartsWith('-') || value.StartsWith('/'))
                    && !patternRegex.Match(value).Success;
diff --git a/src/GitVersion.Core.Tests/Core/RegexPatternTests.cs b/src/GitVersion.Core.Tests/Core/RegexPatternTests.cs
diff --git a/src/GitVersion.Core/Core/RegexPatterns.cs b/src/GitVersion.Core/Core/RegexPatterns.cs
diff --git a/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs b/src/GitVersion.Core/Formatting/StringFormatWithExtension.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.Common.ExpandTokensRegex.Matches(template).Cast<Match>())
             {
                 var replacement = EvaluateMatch(match, source, environment);
                 result.Append(template, lastIndex, match.Index - lastIndex);
diff --git a/src/GitVersion.Core/Logging/Log.cs b/src/GitVersion.Core/Logging/Log.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.Common.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);
     }
diff --git a/src/GitVersion.Core/MergeMessage.cs b/src/GitVersion.Core/MergeMessage.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)
diff --git a/src/GitVersion.Core/SemVer/SemanticVersion.cs b/src/GitVersion.Core/SemVer/SemanticVersion.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)
         {
diff --git a/src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.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;
     }
 }
diff --git a/src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs
@@ -70,7 +70,7 @@ public static SemanticVersionPreReleaseTag Parse(string? preReleaseTag)
     {
         if (preReleaseTag.IsNullOrEmpty()) return Empty;
 
-        var match = RegexPatterns.SemanticVersion.ParsePreReleaseTagRegex().Match(preReleaseTag);
+        var match = RegexPatterns.SemanticVersion.ParsePreReleaseTagRegex.Match(preReleaseTag);
         if (!match.Success)
         {
             // TODO check how to log this
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -49,10 +49,10 @@ public VersionField DetermineIncrementedField(
     {
         commits.NotNull();
 
-        var majorRegex = TryGetRegexOrDefault(configuration.MajorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMajorRegex());
-        var minorRegex = TryGetRegexOrDefault(configuration.MinorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMinorRegex());
-        var patchRegex = TryGetRegexOrDefault(configuration.PatchVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultPatchRegex());
-        var noBumpRegex = TryGetRegexOrDefault(configuration.NoBumpMessage, RegexPatterns.VersionCalculation.DefaultNoBumpRegex());
+        var majorRegex = TryGetRegexOrDefault(configuration.MajorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMajorRegex);
+        var minorRegex = TryGetRegexOrDefault(configuration.MinorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMinorRegex);
+        var patchRegex = TryGetRegexOrDefault(configuration.PatchVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultPatchRegex);
+        var noBumpRegex = TryGetRegexOrDefault(configuration.NoBumpMessage, RegexPatterns.VersionCalculation.DefaultNoBumpRegex);
 
         var increments = commits
             .Select(c => GetIncrementFromCommit(c, majorRegex, minorRegex, patchRegex, noBumpRegex))
@@ -209,10 +209,10 @@ public VersionField GetIncrementForcedByCommit(ICommit commit, IGitVersionConfig
         commit.NotNull();
         configuration.NotNull();
 
-        var majorRegex = TryGetRegexOrDefault(configuration.MajorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMajorRegex());
-        var minorRegex = TryGetRegexOrDefault(configuration.MinorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMinorRegex());
-        var patchRegex = TryGetRegexOrDefault(configuration.PatchVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultPatchRegex());
-        var none = TryGetRegexOrDefault(configuration.NoBumpMessage, RegexPatterns.VersionCalculation.DefaultNoBumpRegex());
+        var majorRegex = TryGetRegexOrDefault(configuration.MajorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMajorRegex);
+        var minorRegex = TryGetRegexOrDefault(configuration.MinorVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultMinorRegex);
+        var patchRegex = TryGetRegexOrDefault(configuration.PatchVersionBumpMessage, RegexPatterns.VersionCalculation.DefaultPatchRegex);
+        var none = TryGetRegexOrDefault(configuration.NoBumpMessage, RegexPatterns.VersionCalculation.DefaultNoBumpRegex);
 
         return GetIncrementFromCommit(commit, majorRegex, minorRegex, patchRegex, none) ?? VersionField.None;
     }
diff --git a/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs b/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs
@@ -44,9 +44,9 @@ private static bool FileContainsVersionAttribute(IFileSystem fileSystem, string
 
         var (attributeRegex, triviaRegex) = compileFileExtension switch
         {
-            ".cs" => (CSharp.AttributeRegex(), CSharp.TriviaRegex()),
-            ".fs" => (FSharp.AttributeRegex(), FSharp.TriviaRegex()),
-            ".vb" => (VisualBasic.AttributeRegex(), VisualBasic.TriviaRegex()),
+            ".cs" => (CSharp.AttributeRegex, CSharp.TriviaRegex),
+            ".fs" => (FSharp.AttributeRegex, FSharp.TriviaRegex),
+            ".vb" => (VisualBasic.AttributeRegex, VisualBasic.TriviaRegex),
             _ => throw new WarningException("File with name containing AssemblyInfo could not be checked for assembly version attributes which conflict with the attributes generated by GitVersion " + compileFile)
         };
 
diff --git a/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs b/src/GitVersion.Output/AssemblyInfo/AssemblyInfoFileUpdater.cs
@@ -17,9 +17,9 @@ internal sealed class AssemblyInfoFileUpdater(ILog log, IFileSystem fileSystem)
 
     private readonly Dictionary<string, Regex> assemblyAttributeRegexes = new()
     {
-        [".cs"] = RegexPatterns.Output.CsharpAssemblyAttributeRegex(),
-        [".fs"] = RegexPatterns.Output.FsharpAssemblyAttributeRegex(),
-        [".vb"] = RegexPatterns.Output.VisualBasicAssemblyAttributeRegex()
+        [".cs"] = RegexPatterns.Output.CsharpAssemblyAttributeRegex,
+        [".fs"] = RegexPatterns.Output.FsharpAssemblyAttributeRegex,
+        [".vb"] = RegexPatterns.Output.VisualBasicAssemblyAttributeRegex
     };
 
     private const string NewLine = "\r\n";
@@ -65,17 +65,17 @@ public void Execute(GitVersionVariables variables, AssemblyInfoContext context)
 
             if (!assemblyVersion.IsNullOrWhiteSpace())
             {
-                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(RegexPatterns.Output.AssemblyVersionRegex(), fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
+                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(RegexPatterns.Output.AssemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
             }
 
             if (!assemblyFileVersion.IsNullOrWhiteSpace())
             {
-                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(RegexPatterns.Output.AssemblyFileVersionRegex(), fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
+                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(RegexPatterns.Output.AssemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
             }
 
             if (!assemblyInfoVersion.IsNullOrWhiteSpace())
             {
-                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(RegexPatterns.Output.AssemblyInfoVersionRegex(), fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
+                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(RegexPatterns.Output.AssemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
             }
 
             if (appendedAttributes)
diff --git a/src/GitVersion.Testing/Helpers/ParticipantSanitizer.cs b/src/GitVersion.Testing/Helpers/ParticipantSanitizer.cs
@@ -12,7 +12,7 @@ public static string SanitizeParticipant(string participant)
     {
         GuardAgainstInvalidParticipants(participant);
 
-        return RegexPatterns.Output.SanitizeParticipantRegex().Replace(participant, "_");
+        return RegexPatterns.Output.SanitizeParticipantRegex.Replace(participant, "_");
     }
 
     private static void GuardAgainstInvalidParticipants(string participant)

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public bool IsValidPath()`
`41`	`41`
`42`	`42`	`public bool IsSwitchArgument()`
`43`	`43`	`{`
`44`		`- var patternRegex = RegexPatterns.Common.SwitchArgumentRegex();`
	`44`	`+ var patternRegex = RegexPatterns.Common.SwitchArgumentRegex;`
`45`	`45`	`return value != null`
`46`	`46`	`&& (value.StartsWith('-') \|\| value.StartsWith('/'))`
`47`	`47`	`&& !patternRegex.Match(value).Success;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public string FormatWith<T>(T? source, IEnvironment environment)`
`45`	`45`	`var result = new StringBuilder();`
`46`	`46`	`var lastIndex = 0;`
`47`	`47`
`48`		`- foreach (var match in RegexPatterns.Common.ExpandTokensRegex().Matches(template).Cast<Match>())`
	`48`	`+ foreach (var match in RegexPatterns.Common.ExpandTokensRegex.Matches(template).Cast<Match>())`
`49`	`49`	`{`
`50`	`50`	`var replacement = EvaluateMatch(match, source, environment);`
`51`	`51`	`result.Append(template, lastIndex, match.Index - lastIndex);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public IDisposable IndentLog(string operationDescription)`
`58`	`58`
`59`	`59`	`private string FormatMessage(string message, string level)`
`60`	`60`	`{`
`61`		`- var obscuredMessage = RegexPatterns.Common.ObscurePasswordRegex().Replace(message, "$1$2:*******@");`
	`61`	`+ var obscuredMessage = RegexPatterns.Common.ObscurePasswordRegex.Replace(message, "$1$2:*******@");`
`62`	`62`	`var timestamp = $"{DateTime.Now:yy-MM-dd H:mm:ss:ff}";`
`63`	`63`	`return string.Format(CultureInfo.InvariantCulture, "{0}{1} [{2}] {3}", this.currentIndentation, level, timestamp, obscuredMessage);`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public static bool TryParse(string version, string? tagPrefixRegex,`
`149`	`149`
`150`	`150`	`private static bool TryParseStrict(string version, [NotNullWhen(true)] out SemanticVersion? semanticVersion)`
`151`	`151`	`{`
`152`		`- var parsed = RegexPatterns.SemanticVersion.ParseStrictRegex().Match(version);`
	`152`	`+ var parsed = RegexPatterns.SemanticVersion.ParseStrictRegex.Match(version);`
`153`	`153`
`154`	`154`	`if (!parsed.Success)`
`155`	`155`	`{`
`@@ -171,7 +171,7 @@ private static bool TryParseStrict(string version, [NotNullWhen(true)] out Seman`
`171`	`171`
`172`	`172`	`private static bool TryParseLoose(string version, [NotNullWhen(true)] out SemanticVersion? semanticVersion)`
`173`	`173`	`{`
`174`		`- var parsed = RegexPatterns.SemanticVersion.ParseLooseRegex().Match(version);`
	`174`	`+ var parsed = RegexPatterns.SemanticVersion.ParseLooseRegex.Match(version);`
`175`	`175`
`176`	`176`	`if (!parsed.Success)`
`177`	`177`	`{`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public static SemanticVersionBuildMetaData Parse(string? buildMetaData)`
`111`	`111`	`if (buildMetaData.IsNullOrEmpty())`
`112`	`112`	`return Empty;`
`113`	`113`
`114`		`- var parsed = RegexPatterns.SemanticVersion.ParseBuildMetaDataRegex().Match(buildMetaData);`
	`114`	`+ var parsed = RegexPatterns.SemanticVersion.ParseBuildMetaDataRegex.Match(buildMetaData);`
`115`	`115`
`116`	`116`	`long? buildMetaDataCommitsSinceTag = null;`
`117`	`117`	`long? buildMetaDataCommitsSinceVersionSource = null;`
`@@ -147,7 +147,7 @@ public static SemanticVersionBuildMetaData Parse(string? buildMetaData)`
`147`	`147`	`private static string FormatMetaDataPart(string value)`
`148`	`148`	`{`
`149`	`149`	`if (!value.IsNullOrEmpty())`
`150`		`- value = RegexPatterns.SemanticVersion.FormatBuildMetaDataRegex().Replace(value, "-");`
	`150`	`+ value = RegexPatterns.SemanticVersion.FormatBuildMetaDataRegex.Replace(value, "-");`
`151`	`151`	`return value;`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static SemanticVersionPreReleaseTag Parse(string? preReleaseTag)`
`70`	`70`	`{`
`71`	`71`	`if (preReleaseTag.IsNullOrEmpty()) return Empty;`
`72`	`72`
`73`		`- var match = RegexPatterns.SemanticVersion.ParsePreReleaseTagRegex().Match(preReleaseTag);`
	`73`	`+ var match = RegexPatterns.SemanticVersion.ParsePreReleaseTagRegex.Match(preReleaseTag);`
`74`	`74`	`if (!match.Success)`
`75`	`75`	`{`
`76`	`76`	`// TODO check how to log this`