Merge 83f80a2 into ccaac20

DotNetAnalyzers · Apr 15, 2023 · ad0c737 · ad0c737
2 parents ccaac20 + 83f80a2
commit ad0c737
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/DocumentationSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/DocumentationSettings.cs
@@ -34,6 +34,11 @@ internal class DocumentationSettings
         /// </summary>
         internal static readonly ImmutableArray<string> DefaultExcludeFromPunctuationCheck = ImmutableArray.Create("seealso");
 
+        /// <summary>
+        /// A Regex instance matching valid variable names.
+        /// </summary>
+        private static readonly Regex ValidVariableNameRegex = new Regex("^[a-zA-Z0-9]+$");
+
         /// <summary>
         /// This is the backing field for the <see cref="CompanyName"/> property.
         /// </summary>
@@ -199,7 +204,7 @@ protected internal DocumentationSettings(JsonObject documentationSettingsObject,
                     {
                         string name = child.Key;
 
-                        if (!Regex.IsMatch(name, "^[a-zA-Z0-9]+$"))
+                        if (!ValidVariableNameRegex.IsMatch(name))
                         {
                             continue;
                         }

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/NamingSettings.cs b/StyleCop.Analyzers/StyleCop.Analyzers/Settings/ObjectModel/NamingSettings.cs
@@ -13,6 +13,8 @@ namespace StyleCop.Analyzers.Settings.ObjectModel
 
     internal class NamingSettings
     {
+        private static readonly Regex ValidHungarianPrefixRegex = new Regex("^[a-z]{1,2}$");
+
         /// <summary>
         /// Initializes a new instance of the <see cref="NamingSettings"/> class.
         /// </summary>
@@ -55,7 +57,7 @@ protected internal NamingSettings(JsonObject namingSettingsObject, AnalyzerConfi
                     {
                         var prefix = prefixJsonValue.ToStringValue(kvp.Key);
 
-                        if (!Regex.IsMatch(prefix, "^[a-z]{1,2}$"))
+                        if (!ValidHungarianPrefixRegex.IsMatch(prefix))
                         {
                             continue;
                         }
@@ -86,7 +88,7 @@ protected internal NamingSettings(JsonObject namingSettingsObject, AnalyzerConfi
 
             allowCommonHungarianPrefixes ??= AnalyzerConfigHelper.TryGetBooleanValue(analyzerConfigOptions, "stylecop.naming.allowCommonHungarianPrefixes");
             allowedHungarianPrefixes ??= AnalyzerConfigHelper.TryGetStringListValue(analyzerConfigOptions, "stylecop.naming.allowedHungarianPrefixes")
-                ?.Where(value => Regex.IsMatch(value, "^[a-z]{1,2}$"))
+                ?.Where(value => ValidHungarianPrefixRegex.IsMatch(value))
                 .ToImmutableArray()
                 .ToBuilder();
             allowedNamespaceComponents ??= AnalyzerConfigHelper.TryGetStringListValue(analyzerConfigOptions, "stylecop.naming.allowedNamespaceComponents")?.ToBuilder();