Merge pull request #559 from lahma/replace-to-lower

Reduce need to call string.ToLower with proper comparisons

Author: JonathanMagnan

src/HtmlAgilityPack.Shared/HtmlDocument.cs

@@ -1816,7 +1816,7 @@ private void Parse()
 									// https://www.w3schools.com/jsref/prop_node_innertext.asp
 									// textContent returns the text content of all elements, while innerText returns the content of all elements, except for <script> and <style> elements.
 									// innerText will not return the text of elements that are hidden with CSS (textContent will). ==> The parser do not support that.
-									if (_currentnode.Name.ToLowerInvariant().Equals("script")  || _currentnode.Name.ToLowerInvariant().Equals("style"))
+									if (_currentnode.Name.Equals("script", StringComparison.OrdinalIgnoreCase)  || _currentnode.Name.Equals("style", StringComparison.OrdinalIgnoreCase))
                                     {
 	                                    _currentnode._isHideInnerText = true;
 									}
@@ -2171,7 +2171,7 @@ private bool PushNodeEnd(int index, bool close)
             if ((close) || (!_currentnode._starttag))
             {
                 if ((OptionStopperNodeName != null) && (_remainder == null) &&
-                    (string.Compare(_currentnode.Name, OptionStopperNodeName, StringComparison.OrdinalIgnoreCase) == 0))
+                    string.Equals(_currentnode.Name, OptionStopperNodeName, StringComparison.OrdinalIgnoreCase))
                 {
                     _remainderOffset = index;
                     _remainder = Text.Substring(_remainderOffset);
@@ -2224,7 +2224,7 @@ private void ReadDocumentEncoding(HtmlNode node)
             HtmlAttribute att = node.Attributes["http-equiv"];
             if (att != null)
             {
-                if (string.Compare(att.Value, "content-type", StringComparison.OrdinalIgnoreCase) != 0)
+                if (!string.Equals(att.Value, "content-type", StringComparison.OrdinalIgnoreCase))
                     return;
                 HtmlAttribute content = node.Attributes["content"];
                 if (content != null)

src/HtmlAgilityPack.Shared/HtmlNameTable.cs

@@ -9,7 +9,7 @@
 
 namespace HtmlAgilityPack
 {
-    internal class HtmlNameTable : XmlNameTable
+    internal sealed class HtmlNameTable : XmlNameTable
     {
         #region Fields
 

src/HtmlAgilityPack.Shared/HtmlNode.cs

@@ -369,13 +369,13 @@ public virtual string InnerText
 				var sb = new StringBuilder();
                 int depthLevel = 0;
 				string name = this.Name;
-	 
+
 				if (name != null)
 				{
-					name = name.ToLowerInvariant();
+					bool isDisplayScriptingText = string.Equals(name, "head", StringComparison.OrdinalIgnoreCase)
+					                              || string.Equals(name, "script", StringComparison.OrdinalIgnoreCase)
+					                              || string.Equals(name, "style", StringComparison.OrdinalIgnoreCase);
 
-					bool isDisplayScriptingText = (name == "head" || name == "script" || name == "style"); 
-					 
 					InternalInnerText(sb, isDisplayScriptingText, depthLevel);
 				}
 				else
@@ -1984,7 +1984,7 @@ public virtual void WriteTo(TextWriter outText, int level = 0)
 					if (_ownerdocument.OptionOutputAsXml)
 					{
 						var commentNode = (HtmlCommentNode) this;
-						if (!_ownerdocument.BackwardCompatibility && commentNode.Comment.ToLowerInvariant().StartsWith("<!doctype"))
+						if (!_ownerdocument.BackwardCompatibility && commentNode.Comment.StartsWith("<!doctype", StringComparison.OrdinalIgnoreCase))
 						{
 							outText.Write(commentNode.Comment);
 						}
@@ -2623,6 +2623,8 @@ public void AddClass(string name)
 			AddClass(name, false);
 		}
 
+		private static readonly char[] spaceSeparator = { ' ' };
+
 		/// <summary>
 		/// Adds one or more classes to this node.
 		/// </summary>
@@ -2631,26 +2633,26 @@ public void AddClass(string name)
 		public void AddClass(string name, bool throwError)
 		{
 			var classAttributes = Attributes.AttributesWithName("class");
+			var isEmpty = true;
 
-			if (!IsEmpty(classAttributes))
+			foreach (HtmlAttribute att in classAttributes)
 			{
-				foreach (HtmlAttribute att in classAttributes)
-				{ 
-					// Check class solo, check class in First with other class, check Class no first.
-					if (att.Value != null && att.Value.Split(' ').ToList().Any(x => x.Equals(name)))
-					{
-						if (throwError)
-						{
-							throw new Exception(HtmlDocument.HtmlExceptionClassExists);
-						}
-					}
-					else
+				isEmpty = false;
+				// Check class solo, check class in First with other class, check Class no first.
+				if (att.Value != null && Array.IndexOf(att.Value.Split(spaceSeparator), name) != -1)
+				{
+					if (throwError)
 					{
-						SetAttributeValue(att.Name, att.Value + " " + name);
+						throw new Exception(HtmlDocument.HtmlExceptionClassExists);
 					}
 				}
+				else
+				{
+					SetAttributeValue(att.Name, att.Value + " " + name);
+				}
 			}
-			else
+
+			if (isEmpty)
 			{
 				HtmlAttribute attribute = _ownerdocument.CreateAttribute("class", name);
 				Attributes.Append(attribute);
@@ -2718,7 +2720,7 @@ public void RemoveClass(string name, bool throwError)
 					{
 						Attributes.Remove(att);
 					}
-					else if (att.Value != null && att.Value.Split(' ').ToList().Any(x => x.Equals(name)))
+					else if (att.Value != null && att.Value.Split(' ').Contains(name))
 					{
 						string[] classNames = att.Value.Split(' ');
 

src/HtmlAgilityPack.Shared/HtmlWeb.cs

@@ -2129,14 +2129,14 @@ private bool IsCacheHtmlContent(string path)
         }
 #endif
 
-        private bool IsHtmlContent(string contentType)
+        private static bool IsHtmlContent(string contentType)
         {
-            return contentType.ToLowerInvariant().StartsWith("text/html");
+            return contentType.StartsWith("text/html", StringComparison.OrdinalIgnoreCase);
         }
 
-        private bool IsGZipEncoding(string contentEncoding)
+        private static bool IsGZipEncoding(string contentEncoding)
         {
-            return contentEncoding.ToLowerInvariant().StartsWith("gzip");
+            return contentEncoding.StartsWith("gzip", StringComparison.OrdinalIgnoreCase);
         }
 
 #if !(NETSTANDARD1_3 || NETSTANDARD1_6)

src/HtmlAgilityPack.Shared/MixedCodeDocumentFragmentList.cs

@@ -21,7 +21,7 @@ public class MixedCodeDocumentFragmentList : IEnumerable
         #region Fields
 
         private MixedCodeDocument _doc;
-        private IList<MixedCodeDocumentFragment> _items = new List<MixedCodeDocumentFragment>();
+        private List<MixedCodeDocumentFragment> _items = new List<MixedCodeDocumentFragment>();
 
         #endregion