Add OptionThreatCDataBlockAsComment options

Author: JonathanMagnan

src/HtmlAgilityPack.Shared/HtmlDocument.cs

@@ -119,6 +119,9 @@ public static bool DisableBehaviorTagP
         /// </summary>
         public bool OptionEmptyCollection = false;
 
+        /// <summary>True of the whole &lt;![CDATA[ block should be threated as a single comment.</summary>
+        public bool OptionThreatCDataBlockAsComment;
+
         /// <summary>True to disable, false to enable the server side code.</summary>
         public bool DisableServerSideCode = false;
 
@@ -1294,24 +1297,38 @@ private bool NewCheck()
             {
 	            if (Text[_index] == '!' || Text[_index] == '?')
                 {
-					PushNodeStart(HtmlNodeType.Comment, _index - 1, _lineposition -1);
-                    PushNodeNameStart(true, _index);
-                    PushNodeNameEnd(_index + 1);
-                    _state = ParseState.Comment;
-                    if (_index < (Text.Length - 2))
+                    if (OptionThreatCDataBlockAsComment && Text.Substring(_index).StartsWith("![CDATA[", StringComparison.OrdinalIgnoreCase))
                     {
-                        if ((Text[_index + 1] == '-') &&
-                            (Text[_index + 2] == '-'))
+                        PushNodeStart(HtmlNodeType.Comment, _index - 1, _lineposition - 1);
+                        PushNodeNameStart(true, _index);
+                        PushNodeNameEnd(_index + 1);
+
+                        _state = ParseState.PcDataComment;
+
+                        return true;
+                    }
+                    else
+                    {
+                        PushNodeStart(HtmlNodeType.Comment, _index - 1, _lineposition - 1);
+                        PushNodeNameStart(true, _index);
+                        PushNodeNameEnd(_index + 1);
+
+                        _state = ParseState.Comment;
+                        if (_index < (Text.Length - 2))
                         {
-                            _fullcomment = true;
+                            if ((Text[_index + 1] == '-') &&
+                                (Text[_index + 2] == '-'))
+                            {
+                                _fullcomment = true;
+                            }
+                            else
+                            {
+                                _fullcomment = false;
+                            }
                         }
-                        else
-                        {
-                            _fullcomment = false;
-						}
-                    }
 
-                    return true;
+                        return true;
+                    }                   
                 }
             }
 
@@ -1355,6 +1372,9 @@ private void Parse()
             while (_index < Text.Length)
             {
                 _c = Text[_index];
+#if DEBUG
+                char _cChar = Text[_index];
+#endif
                 IncrementPosition();
 
                 switch (_state)
@@ -1702,6 +1722,23 @@ private void Parse()
 
                         break;
 
+                    case ParseState.PcDataComment:
+                        if (_c == '>' && _index < Text.Length && Text[_index - 3] == ']' && Text[_index - 2] == ']')
+                        {
+                            if (!PushNodeEnd(_index, false))
+                            {
+                                // stop parsing
+                                _index = Text.Length;
+                                break;
+                            }
+
+                            _state = ParseState.Text;
+                            PushNodeStart(HtmlNodeType.Text, _index, _lineposition);
+                            continue;
+                        }
+
+                        break;
+
                     case ParseState.ServerSideCode:
                         if (_c == '%')
                         {
@@ -2227,7 +2264,7 @@ private void ReadDocumentEncoding(HtmlNode node)
             }
         }
 
-        #endregion
+#endregion
 
         #region Nested type: ParseState
 
@@ -2245,7 +2282,8 @@ private enum ParseState
             Comment,
             QuotedAttributeValue,
             ServerSideCode,
-            PcData
+            PcData,
+            PcDataComment
         }
 
         #endregion