Merge pull request #4202 from arturcic/feature/regex

Move regex patterns to a common file
GitTools · Sep 8, 2024 · 719899e · 719899e
2 parents 1e376ce + e507abf
commit 719899e
Show file tree

Hide file tree

Showing 40 changed files with 222 additions and 164 deletions.
diff --git a/new-cli/GitVersion.Common/GitVersion.Common.csproj b/new-cli/GitVersion.Common/GitVersion.Common.csproj
@@ -6,6 +6,7 @@
     <Compile Include="..\..\src\GitVersion.Core\Core\Abstractions\IEnvironment.cs" Link="Infrastructure\%(Filename)%(Extension)" />
     <Compile Include="..\..\src\GitVersion.Core\Core\Abstractions\IFileSystem.cs" Link="Infrastructure\%(Filename)%(Extension)" />
     <Compile Include="..\..\src\GitVersion.Core\Core\Exceptions\WarningException.cs" Link="Exceptions\%(Filename)%(Extension)"/>
+    <Compile Include="..\..\src\GitVersion.Core\Core\RegexPatterns.cs" Link="%(Filename)%(Extension)" />
     <Compile Include="..\..\src\GitVersion.Core\Extensions\StringExtensions.cs" Link="Extensions\StringExtensions.cs" />
     <Compile Include="..\..\src\GitVersion.Core\Extensions\CommonExtensions.cs" Link="Extensions\CommonExtensions.cs" />
     <Compile Include="..\..\src\GitVersion.Core\Helpers\*.cs" Link="Helpers\%(Filename)%(Extension)" />

diff --git a/src/GitVersion.App/ArgumentParserExtensions.cs b/src/GitVersion.App/ArgumentParserExtensions.cs
@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using GitVersion.Core;
 using GitVersion.Helpers;
 
 namespace GitVersion;
@@ -39,9 +39,13 @@ public static bool IsValidPath(this string? path)
     }
 
     public static bool IsSwitchArgument(this string? value)
-        => value != null
-           && (value.StartsWith('-') || value.StartsWith('/'))
-           && !Regex.Match(value, @"/\w+:").Success; //Exclude msbuild & project parameters in form /blah:, which should be parsed as values, not switch names.
+    {
+        var patternRegex = RegexPatterns.Common.SwitchArgumentRegex;
+        return value != null
+               && (value.StartsWith('-') || value.StartsWith('/'))
+               && !patternRegex.Match(value).Success;
+        //Exclude msbuild & project parameters in form /blah:, which should be parsed as values, not switch names.
+    }
 
     public static bool IsSwitch(this string? value, string switchName)
     {

diff --git a/src/GitVersion.Configuration/BranchConfiguration.cs b/src/GitVersion.Configuration/BranchConfiguration.cs
@@ -90,7 +90,7 @@ public virtual IBranchConfiguration Inherit(IBranchConfiguration configuration)
             Increment = Increment == IncrementStrategy.Inherit ? configuration.Increment : Increment,
             DeploymentMode = DeploymentMode ?? configuration.DeploymentMode,
             Label = Label ?? configuration.Label,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = PreventIncrement.OfMergedBranch ?? configuration.PreventIncrement.OfMergedBranch,
                 WhenBranchMerged = PreventIncrement.WhenBranchMerged ?? configuration.PreventIncrement.WhenBranchMerged,
@@ -117,7 +117,7 @@ public virtual IBranchConfiguration Inherit(EffectiveConfiguration configuration
             Increment = Increment == IncrementStrategy.Inherit ? configuration.Increment : Increment,
             DeploymentMode = DeploymentMode ?? configuration.DeploymentMode,
             Label = Label ?? configuration.Label,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = PreventIncrement.OfMergedBranch ?? configuration.PreventIncrementOfMergedBranch,
                 WhenBranchMerged = PreventIncrement.WhenBranchMerged ?? configuration.PreventIncrementWhenBranchMerged,

diff --git a/src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/BranchConfigurationBuilder.cs
@@ -177,7 +177,7 @@ public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration
         IsMainBranch = isMainBranch,
         IsReleaseBranch = isReleaseBranch,
         LabelNumberPattern = labelNumberPattern,
-        PreventIncrement = new PreventIncrementConfiguration()
+        PreventIncrement = new PreventIncrementConfiguration
         {
             OfMergedBranch = preventIncrementOfMergedBranch,
             WhenBranchMerged = preventIncrementWhenBranchMerged,

diff --git a/src/GitVersion.Configuration/Builders/ConfigurationBuilderBase.cs b/src/GitVersion.Configuration/Builders/ConfigurationBuilderBase.cs
@@ -423,7 +423,7 @@ public virtual IGitVersionConfiguration Build()
             IsMainBranch = this.isMainBranch,
             IsReleaseBranch = this.isReleaseBranch,
             LabelNumberPattern = this.labelNumberPattern,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = this.preventIncrementOfMergedBranch,
                 WhenBranchMerged = this.preventIncrementWhenBranchMerged,

diff --git a/src/GitVersion.Configuration/Builders/GitFlowConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/GitFlowConfigurationBuilder.cs
@@ -1,3 +1,4 @@
+using GitVersion.Core;
 using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
@@ -13,10 +14,10 @@ private GitFlowConfigurationBuilder()
             AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
             AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
             CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
-            MajorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
-            MinorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
-            NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern,
-            PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
+            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorPattern,
+            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorPattern,
+            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpPattern,
+            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchPattern,
             SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
             VersionStrategies = ConfigurationConstants.DefaultVersionStrategies,
             TagPrefix = ConfigurationConstants.DefaultTagPrefix,
@@ -28,7 +29,7 @@ private GitFlowConfigurationBuilder()
             Label = ConfigurationConstants.BranchNamePlaceholder,
             Increment = IncrementStrategy.Inherit,
             CommitMessageIncrementing = CommitMessageIncrementMode.Enabled,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = false,
                 WhenBranchMerged = false,
@@ -48,7 +49,7 @@ private GitFlowConfigurationBuilder()
             RegularExpression = DevelopBranch.RegexPattern,
             SourceBranches = [this.MainBranch.Name],
             Label = "alpha",
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },
@@ -66,7 +67,7 @@ private GitFlowConfigurationBuilder()
             RegularExpression = MainBranch.RegexPattern,
             SourceBranches = [],
             Label = string.Empty,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true
             },
@@ -89,7 +90,7 @@ private GitFlowConfigurationBuilder()
                 this.SupportBranch.Name,
             ],
             Label = "beta",
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true,
                 WhenCurrentCommitTagged = false
@@ -115,7 +116,7 @@ private GitFlowConfigurationBuilder()
                 this.HotfixBranch.Name
             ],
             Label = ConfigurationConstants.BranchNamePlaceholder,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },
@@ -139,7 +140,7 @@ private GitFlowConfigurationBuilder()
                 this.HotfixBranch.Name
             ],
             Label = "PullRequest",
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true,
                 WhenCurrentCommitTagged = false
@@ -154,7 +155,7 @@ private GitFlowConfigurationBuilder()
             Increment = IncrementStrategy.Inherit,
             RegularExpression = HotfixBranch.RegexPattern,
             DeploymentMode = DeploymentMode.ManualDeployment,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },
@@ -175,7 +176,7 @@ private GitFlowConfigurationBuilder()
             RegularExpression = SupportBranch.RegexPattern,
             SourceBranches = [this.MainBranch.Name],
             Label = string.Empty,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true
             },
@@ -202,7 +203,7 @@ private GitFlowConfigurationBuilder()
                 this.SupportBranch.Name
             ],
             Label = ConfigurationConstants.BranchNamePlaceholder,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = true
             },

diff --git a/src/GitVersion.Configuration/Builders/GitHubFlowConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/GitHubFlowConfigurationBuilder.cs
@@ -1,3 +1,4 @@
+using GitVersion.Core;
 using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
@@ -13,10 +14,10 @@ private GitHubFlowConfigurationBuilder()
             AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
             AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
             CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
-            MajorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
-            MinorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
-            NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern,
-            PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
+            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorPattern,
+            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorPattern,
+            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpPattern,
+            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchPattern,
             SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
             VersionStrategies = ConfigurationConstants.DefaultVersionStrategies,
             TagPrefix = ConfigurationConstants.DefaultTagPrefix,
@@ -26,7 +27,7 @@ private GitHubFlowConfigurationBuilder()
             DeploymentMode = DeploymentMode.ContinuousDelivery,
             Label = ConfigurationConstants.BranchNamePlaceholder,
             Increment = IncrementStrategy.Inherit,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = false,
                 WhenBranchMerged = false,
@@ -45,7 +46,7 @@ private GitHubFlowConfigurationBuilder()
         {
             Label = string.Empty,
             Increment = IncrementStrategy.Patch,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true
             },
@@ -64,7 +65,7 @@ private GitHubFlowConfigurationBuilder()
             DeploymentMode = DeploymentMode.ManualDeployment,
             Label = "beta",
             Increment = IncrementStrategy.Patch,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true,
                 WhenBranchMerged = false,
@@ -88,7 +89,7 @@ private GitHubFlowConfigurationBuilder()
             DeploymentMode = DeploymentMode.ManualDeployment,
             Label = ConfigurationConstants.BranchNamePlaceholder,
             Increment = IncrementStrategy.Inherit,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },
@@ -108,7 +109,7 @@ private GitHubFlowConfigurationBuilder()
             DeploymentMode = DeploymentMode.ContinuousDelivery,
             Label = "PullRequest",
             Increment = IncrementStrategy.Inherit,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true,
                 WhenCurrentCommitTagged = false
@@ -130,7 +131,7 @@ private GitHubFlowConfigurationBuilder()
             DeploymentMode = DeploymentMode.ManualDeployment,
             Label = ConfigurationConstants.BranchNamePlaceholder,
             Increment = IncrementStrategy.Inherit,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },

diff --git a/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs b/src/GitVersion.Configuration/Builders/TrunkBasedConfigurationBuilder.cs
@@ -1,3 +1,4 @@
+using GitVersion.Core;
 using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
@@ -8,15 +9,15 @@ internal sealed class TrunkBasedConfigurationBuilder : ConfigurationBuilderBase<
 
     private TrunkBasedConfigurationBuilder()
     {
-        WithConfiguration(new GitVersionConfiguration()
+        WithConfiguration(new GitVersionConfiguration
         {
             AssemblyFileVersioningScheme = ConfigurationConstants.DefaultAssemblyFileVersioningScheme,
             AssemblyVersioningScheme = ConfigurationConstants.DefaultAssemblyVersioningScheme,
             CommitDateFormat = ConfigurationConstants.DefaultCommitDateFormat,
-            MajorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
-            MinorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
-            NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern,
-            PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
+            MajorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMajorPattern,
+            MinorVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultMinorPattern,
+            NoBumpMessage = RegexPatterns.VersionCalculation.DefaultNoBumpPattern,
+            PatchVersionBumpMessage = RegexPatterns.VersionCalculation.DefaultPatchPattern,
             SemanticVersionFormat = ConfigurationConstants.DefaultSemanticVersionFormat,
             VersionStrategies = [
                 VersionStrategies.ConfiguredNextVersion,
@@ -31,7 +32,7 @@ private TrunkBasedConfigurationBuilder()
             Label = ConfigurationConstants.BranchNamePlaceholder,
             Increment = IncrementStrategy.Inherit,
             CommitMessageIncrementing = CommitMessageIncrementMode.Enabled,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = false,
                 WhenBranchMerged = false,
@@ -44,12 +45,12 @@ private TrunkBasedConfigurationBuilder()
             IsMainBranch = false
         });
 
-        WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration
         {
             DeploymentMode = DeploymentMode.ContinuousDeployment,
             Label = string.Empty,
             Increment = IncrementStrategy.Patch,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true
             },
@@ -63,12 +64,12 @@ private TrunkBasedConfigurationBuilder()
             PreReleaseWeight = 55000
         });
 
-        WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration
         {
             DeploymentMode = DeploymentMode.ContinuousDelivery,
             Label = ConfigurationConstants.BranchNamePlaceholder,
             Increment = IncrementStrategy.Minor,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },
@@ -82,12 +83,12 @@ private TrunkBasedConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(HotfixBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(HotfixBranch.Name).WithConfiguration(new BranchConfiguration
         {
             DeploymentMode = DeploymentMode.ContinuousDelivery,
             Label = ConfigurationConstants.BranchNamePlaceholder,
             Increment = IncrementStrategy.Patch,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },
@@ -106,7 +107,7 @@ private TrunkBasedConfigurationBuilder()
             DeploymentMode = DeploymentMode.ContinuousDelivery,
             Label = "PullRequest",
             Increment = IncrementStrategy.Inherit,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 OfMergedBranch = true,
                 WhenCurrentCommitTagged = false
@@ -126,7 +127,7 @@ private TrunkBasedConfigurationBuilder()
         WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Patch,
-            PreventIncrement = new PreventIncrementConfiguration()
+            PreventIncrement = new PreventIncrementConfiguration
             {
                 WhenCurrentCommitTagged = false
             },