Skip to content

Commit 7559faa

Browse files
committed
Convert to GeneratedRegexes
1 parent 388d24c commit 7559faa

File tree

13 files changed

+311
-221
lines changed

13 files changed

+311
-221
lines changed

src/GitVersion.App/ArgumentParserExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static bool IsValidPath(this string? path)
4040

4141
public static bool IsSwitchArgument(this string? value)
4242
{
43-
var patternRegex = RegexPatterns.Common.SwitchArgumentRegex;
43+
var patternRegex = RegexPatterns.Common.SwitchArgumentRegex();
4444
return value != null
4545
&& (value.StartsWith('-') || value.StartsWith('/'))
4646
&& !patternRegex.Match(value).Success;

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

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

src/GitVersion.Core/Configuration/IBranchConfiguration.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using GitVersion.Core;
2-
using GitVersion.Extensions;
32
using GitVersion.VersionCalculation;
43

54
namespace GitVersion.Configuration;

src/GitVersion.Core/Core/RegexPatterns.cs

Lines changed: 242 additions & 151 deletions
Large diffs are not rendered by default.

src/GitVersion.Core/Helpers/StringFormatWith.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static string FormatWith<T>(this string template, T? source, IEnvironment
3333
ArgumentNullException.ThrowIfNull(template);
3434
ArgumentNullException.ThrowIfNull(source);
3535

36-
foreach (var match in RegexPatterns.Common.ExpandTokensRegex.Matches(template).Cast<Match>())
36+
foreach (var match in RegexPatterns.Common.ExpandTokensRegex().Matches(template).Cast<Match>())
3737
{
3838
string propertyValue;
3939
var fallback = match.Groups["fallback"].Success ? match.Groups["fallback"].Value : null;

src/GitVersion.Core/Logging/Log.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public IDisposable IndentLog(string operationDescription)
5858

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

src/GitVersion.Core/MergeMessage.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ public class MergeMessage
1111
{
1212
private static readonly IList<(string Name, Regex Pattern)> DefaultFormats =
1313
[
14-
new("Default", RegexPatterns.MergeMessage.DefaultMergeMessageRegex),
15-
new("SmartGit", RegexPatterns.MergeMessage.SmartGitMergeMessageRegex),
16-
new("BitBucketPull", RegexPatterns.MergeMessage.BitBucketPullMergeMessageRegex),
17-
new("BitBucketPullv7", RegexPatterns.MergeMessage.BitBucketPullv7MergeMessageRegex),
18-
new("BitBucketCloudPull", RegexPatterns.MergeMessage.BitBucketCloudPullMergeMessageRegex),
19-
new("GitHubPull", RegexPatterns.MergeMessage.GitHubPullMergeMessageRegex),
20-
new("RemoteTracking", RegexPatterns.MergeMessage.RemoteTrackingMergeMessageRegex),
21-
new("AzureDevOpsPull", RegexPatterns.MergeMessage.AzureDevOpsPullMergeMessageRegex)
14+
new("Default", RegexPatterns.MergeMessage.DefaultMergeMessageRegex()),
15+
new("SmartGit", RegexPatterns.MergeMessage.SmartGitMergeMessageRegex()),
16+
new("BitBucketPull", RegexPatterns.MergeMessage.BitBucketPullMergeMessageRegex()),
17+
new("BitBucketPullv7", RegexPatterns.MergeMessage.BitBucketPullv7MergeMessageRegex()),
18+
new("BitBucketCloudPull", RegexPatterns.MergeMessage.BitBucketCloudPullMergeMessageRegex()),
19+
new("GitHubPull", RegexPatterns.MergeMessage.GitHubPullMergeMessageRegex()),
20+
new("RemoteTracking", RegexPatterns.MergeMessage.RemoteTrackingMergeMessageRegex()),
21+
new("AzureDevOpsPull", RegexPatterns.MergeMessage.AzureDevOpsPullMergeMessageRegex())
2222
];
2323

2424
public MergeMessage(string mergeMessage, IGitVersionConfiguration configuration)

src/GitVersion.Core/SemVer/SemanticVersion.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static bool TryParse(string version, string? tagPrefixRegex,
149149

150150
private static bool TryParseStrict(string version, [NotNullWhen(true)] out SemanticVersion? semanticVersion)
151151
{
152-
var parsed = RegexPatterns.SemanticVersion.ParseStrictRegex.Match(version);
152+
var parsed = RegexPatterns.SemanticVersion.ParseStrictRegex().Match(version);
153153

154154
if (!parsed.Success)
155155
{
@@ -171,7 +171,7 @@ private static bool TryParseStrict(string version, [NotNullWhen(true)] out Seman
171171

172172
private static bool TryParseLoose(string version, [NotNullWhen(true)] out SemanticVersion? semanticVersion)
173173
{
174-
var parsed = RegexPatterns.SemanticVersion.ParseLooseRegex.Match(version);
174+
var parsed = RegexPatterns.SemanticVersion.ParseLooseRegex().Match(version);
175175

176176
if (!parsed.Success)
177177
{

src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public static SemanticVersionBuildMetaData Parse(string? buildMetaData)
111111
if (buildMetaData.IsNullOrEmpty())
112112
return Empty;
113113

114-
var parsed = RegexPatterns.SemanticVersion.ParseBuildMetaDataRegex.Match(buildMetaData);
114+
var parsed = RegexPatterns.SemanticVersion.ParseBuildMetaDataRegex().Match(buildMetaData);
115115

116116
long? buildMetaDataCommitsSinceTag = null;
117117
long? buildMetaDataCommitsSinceVersionSource = null;
@@ -147,7 +147,7 @@ public static SemanticVersionBuildMetaData Parse(string? buildMetaData)
147147
private static string FormatMetaDataPart(string value)
148148
{
149149
if (!value.IsNullOrEmpty())
150-
value = RegexPatterns.SemanticVersion.FormatBuildMetaDataRegex.Replace(value, "-");
150+
value = RegexPatterns.SemanticVersion.FormatBuildMetaDataRegex().Replace(value, "-");
151151
return value;
152152
}
153153
}

src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static SemanticVersionPreReleaseTag Parse(string? preReleaseTag)
7070
{
7171
if (preReleaseTag.IsNullOrEmpty()) return Empty;
7272

73-
var match = RegexPatterns.SemanticVersion.ParsePreReleaseTagRegex.Match(preReleaseTag);
73+
var match = RegexPatterns.SemanticVersion.ParsePreReleaseTagRegex().Match(preReleaseTag);
7474
if (!match.Success)
7575
{
7676
// TODO check how to log this

0 commit comments

Comments
 (0)