Change ValidCommentChars to HashSet

Author: cdervis

Src/Configuration.cs

@@ -35,7 +35,7 @@ static Configuration()
       // but without modifying the real invariant culture instance.
       s_cultureInfo = (CultureInfo)CultureInfo.InvariantCulture.Clone();
 
-      ValidCommentChars = new[] { '#', ';' };
+      ValidCommentChars = new HashSet<char> { '#', ';' };
       s_preferredCommentChar = '#';
       s_arrayElementSeparator = ',';
 
@@ -585,7 +585,7 @@ public static CultureInfo CultureInfo
     /// Gets the array that contains all valid comment delimiting characters.
     /// The current value is { '#', ';' }.
     /// </summary>
-    public static char[] ValidCommentChars { get; private set; }
+    public static HashSet<char> ValidCommentChars { get; private set; }
 
     /// <summary>
     /// Gets or sets the preferred comment char when saving configurations.
@@ -597,7 +597,7 @@ public static char PreferredCommentChar
     {
       get => s_preferredCommentChar;
       set {
-        if (!Array.Exists(ValidCommentChars, c => c == value))
+        if (!ValidCommentChars.Contains(value))
         {
           throw new ArgumentException("The specified char '" + value + "' is not allowed as a comment char.");
         }

Src/ConfigurationReader.cs

@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Collections.Generic;
 
 namespace SharpConfig
 {
@@ -26,7 +25,6 @@ private static void Parse(StringReader reader, Configuration config)
     {
       var currentSection = new Section(Section.DefaultSectionName);
       var preCommentBuilder = new StringBuilder();
-      HashSet<char> validCommentChars = new HashSet<char>(Configuration.ValidCommentChars); // Initialize once for each reader to optimize performance
       var lineNumber = 0;
       string line;
 
@@ -44,7 +42,7 @@ private static void Parse(StringReader reader, Configuration config)
           continue;
         }
 
-        var comment = ParseComment(line, validCommentChars, out int commentIndex);
+        var comment = ParseComment(line, out int commentIndex);
 
         if (commentIndex == 0)
         {
@@ -111,7 +109,7 @@ private static void Parse(StringReader reader, Configuration config)
       }
     }
 
-    private static string ParseComment(string line, HashSet<char> validCommentChars, out int commentCharIndex)
+    private static string ParseComment(string line, out int commentCharIndex)
     {
       // A comment starts with a valid comment character that:
       // 1. is not within a quote (eg. "this is # not a comment"), and
@@ -130,7 +128,7 @@ private static string ParseComment(string line, HashSet<char> validCommentChars,
       while (index < length) // traverse line from left to right
       {
         var currentChar = line[index];
-        var isValidCommentChar = validCommentChars.Contains(currentChar);
+        var isValidCommentChar = Configuration.ValidCommentChars.Contains(currentChar);
         var isQuotationMark = currentChar == '\"';
         var isCharWithinQuotes = (quoteCount & 1) == 1; // bitwise AND is slightly faster
         var isCharEscaped = index > 0 && line[index - 1] == '\\';

Src/Setting.cs

@@ -2,6 +2,7 @@
 // https://sharpconfig.org
 
 using System;
+using System.Linq;
 using System.Text;
 
 namespace SharpConfig
@@ -612,8 +613,10 @@ private static string GetValueForOutput(string rawValue)
         return rawValue;
       }
 
+      bool isAnyCommentCharInRawValue() => rawValue.Any(c => Configuration.ValidCommentChars.Contains(c));
+
       if (rawValue.IndexOf(" ", StringComparison.Ordinal) >= 0 ||
-          (rawValue.IndexOfAny(Configuration.ValidCommentChars) >= 0 && !Configuration.IgnoreInlineComments))
+          (isAnyCommentCharInRawValue() && !Configuration.IgnoreInlineComments))
       {
         rawValue = "\"" + rawValue + "\"";
       }