Implemented fragment parsing

FlorianRappl · FlorianRappl · commit c8056d353902 · 2019-05-01T13:36:48.000+02:00
diff --git a/src/AngleSharp.Xml/AngleSharp.Xml.csproj b/src/AngleSharp.Xml/AngleSharp.Xml.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.11.0" />
+    <PackageReference Include="AngleSharp" Version="0.12.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
diff --git a/src/AngleSharp.Xml/AutoSelectedMarkupFormatter.cs b/src/AngleSharp.Xml/AutoSelectedMarkupFormatter.cs
@@ -53,10 +53,7 @@ private IMarkupFormatter ChildFormatter
 
                 return childFormatter ?? HtmlMarkupFormatter.Instance;
             }
-            set
-            {
-                childFormatter = value;
-            }
+            set => childFormatter = value;
         }
 
         #endregion
@@ -68,10 +65,7 @@ private IMarkupFormatter ChildFormatter
         /// </summary>
         /// <param name="attribute">The attribute to serialize.</param>
         /// <returns>The formatted attribute.</returns>
-        public String Attribute(IAttr attribute)
-        {
-            return ChildFormatter.Attribute(attribute);
-        }
+        public String Attribute(IAttr attribute) => ChildFormatter.Attribute(attribute);
 
         /// <summary>
         /// Formats opening a tag with the given name.
@@ -143,10 +137,7 @@ public String Processing(IProcessingInstruction processing)
         /// </summary>
         /// <param name="text">The text to sanatize.</param>
         /// <returns>The formatted text.</returns>
-        public String Text(ICharacterData text)
-        {
-            return ChildFormatter.Text(text);
-        }
+        public String Text(ICharacterData text) => ChildFormatter.Text(text);
 
         #endregion
 
diff --git a/src/AngleSharp.Xml/Dom/Internal/XmlElement.cs b/src/AngleSharp.Xml/Dom/Internal/XmlElement.cs
@@ -1,6 +1,8 @@
 namespace AngleSharp.Xml.Dom
 {
     using AngleSharp.Dom;
+    using AngleSharp.Text;
+    using AngleSharp.Xml.Parser;
     using System;
 
     /// <summary>
@@ -29,6 +31,21 @@ internal String IdAttribute
 
         #region Methods
 
+        /// <inheritdoc />
+        public override IElement ParseSubtree(String html)
+        {
+            var context = ((IElement)this).Owner?.Context;
+            var source = new TextSource(html);
+            var document = new XmlDocument(context, source);
+            var parser = new XmlDomBuilder(document);
+            var options = new XmlParserOptions
+            {
+                IsSuppressingErrors = true,
+            };
+            return parser.ParseFragment(options, this).DocumentElement;
+        }
+
+        /// <inheritdoc />
         public override Node Clone(Document owner, Boolean deep)
         {
             var node = new XmlElement(owner, LocalName, Prefix);
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Attribute/AttributeDeclarationEntry.cs b/src/AngleSharp.Xml/Dtd/Declaration/Attribute/AttributeDeclarationEntry.cs
@@ -22,7 +22,7 @@ public String Name
 
         public AttributeTypeDeclaration Type
         {
-            get { return _type; }
+            get => _type;
             set
             {
                 _type = value;
@@ -32,7 +32,7 @@ public AttributeTypeDeclaration Type
 
         public AttributeValueDeclaration Default
         {
-            get { return _value; }
+            get => _value;
             set
             {
                 _value = value;
diff --git a/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementDeclarationEntry.cs b/src/AngleSharp.Xml/Dtd/Declaration/Element/ElementDeclarationEntry.cs
@@ -46,8 +46,8 @@ abstract class ElementQuantifiedDeclarationEntry : ElementDeclarationEntry
 
         public ElementQuantifier Quantifier
         {
-            get { return _quantifier; }
-            set { _quantifier = value; }
+            get => _quantifier;
+            set => _quantifier = value;
         }
     }
 
diff --git a/src/AngleSharp.Xml/Dtd/Parser/DtdContainer.cs b/src/AngleSharp.Xml/Dtd/Parser/DtdContainer.cs
@@ -66,7 +66,7 @@ public Node this[Int32 index]
         /// </summary>
         public Boolean IsInvalid
         {
-            get { return _invalid; }
+            get => _invalid;
             private set
             {
                 _invalid = value;
@@ -90,8 +90,8 @@ public XmlDocument Parent
         /// </summary>
         public String Url
         {
-            get { return _url ?? (Parent != null ? Parent.BaseUri : String.Empty); }
-            set { _url = value; }
+            get => _url ?? (Parent != null ? Parent.BaseUri : String.Empty);
+            set => _url = value;
         }
 
         /// <summary>
diff --git a/src/AngleSharp.Xml/Dtd/Parser/DtdParser.cs b/src/AngleSharp.Xml/Dtd/Parser/DtdParser.cs
@@ -53,8 +53,8 @@ public DtdParser(DtdContainer container, TextSource source)
         /// </summary>
         public Boolean IsInternal
         {
-            get { return _tokenizer.IsExternal; }
-            set { _tokenizer.IsExternal = !value; }
+            get => _tokenizer.IsExternal;
+            set => _tokenizer.IsExternal = !value;
         }
 
         /// <summary>
diff --git a/src/AngleSharp.Xml/Dtd/Parser/DtdTokenizer.cs b/src/AngleSharp.Xml/Dtd/Parser/DtdTokenizer.cs
@@ -78,7 +78,7 @@ public String Content
         /// </summary>
         public Boolean IsExternal
         {
-            get { return _external; }
+            get => _external;
             set
             {
                 _external = value;
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdCommentToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdCommentToken.cs
@@ -27,8 +27,8 @@ public DtdCommentToken()
         /// </summary>
         public String Data
         {
-            get { return _data; }
-            set { _data = value; }
+            get => _data;
+            set => _data = value;
         }
 
         #endregion
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdNotationToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdNotationToken.cs
@@ -49,17 +49,17 @@ public Boolean IsPublicId
         /// </summary>
         public String PublicIdentifier
         {
-            get { return _publicIdentifier ?? String.Empty; }
-            set { _publicIdentifier = value; }
+            get => _publicIdentifier ?? String.Empty;
+            set => _publicIdentifier = value;
         }
 
         /// <summary>
         /// Gets or sets the value of the system identifier.
         /// </summary>
         public String SystemIdentifier
         {
-            get { return _systemIdentifier ?? String.Empty; }
-            set { _systemIdentifier = value; }
+            get => _systemIdentifier ?? String.Empty;
+            set => _systemIdentifier = value;
         }
 
         #endregion
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdPIToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdPIToken.cs
@@ -28,17 +28,17 @@ public DtdPIToken()
         /// </summary>
         public String Target
         {
-            get { return _target; }
-            set { _target = value; }
+            get => _target;
+            set => _target = value;
         }
 
         /// <summary>
         /// Gets or sets the content data.
         /// </summary>
         public String Content
         {
-            get { return _content; }
-            set { _content = value; }
+            get => _content;
+            set => _content = value;
         }
 
         #endregion
diff --git a/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdToken.cs b/src/AngleSharp.Xml/Dtd/Parser/Tokens/DtdToken.cs
@@ -38,8 +38,8 @@ public DtdTokenType Type
 
         public String Name
         {
-            get { return _name; }
-            set { _name = value; }
+            get => _name;
+            set => _name = value;
         }
 
         #endregion
diff --git a/src/AngleSharp.Xml/Parser/IXmlParser.cs b/src/AngleSharp.Xml/Parser/IXmlParser.cs
@@ -1,4 +1,4 @@
-﻿namespace AngleSharp.Xml.Parser
+namespace AngleSharp.Xml.Parser
 {
     using AngleSharp.Browser;
     using AngleSharp.Dom;
@@ -22,7 +22,12 @@ public interface IXmlParser : IParser
         /// Parses the stream and returns the result.
         /// </summary>
         IXmlDocument ParseDocument(Stream source);
-        
+
+        /// <summary>
+        /// Parses the string and returns the result.
+        /// </summary>
+        INodeList ParseFragment(String source, IElement contextElement);
+
         /// <summary>
         /// Parses the string asynchronously with option to cancel.
         /// </summary>
diff --git a/src/AngleSharp.Xml/Parser/Tokens/XmlDeclarationToken.cs b/src/AngleSharp.Xml/Parser/Tokens/XmlDeclarationToken.cs
@@ -43,26 +43,26 @@ public XmlDeclarationToken(TextPosition position)
         /// </summary>
         public String Version
         {
-            get { return _version; }
-            set { _version = value; }
+            get => _version;
+            set => _version = value;
         }
 
         /// <summary>
         /// Gets or sets the encoding value.
         /// </summary>
         public String Encoding
         {
-            get { return _encoding ?? String.Empty; }
-            set { _encoding = value; }
+            get => _encoding ?? String.Empty;
+            set => _encoding = value;
         }
 
         /// <summary>
         /// Gets or sets the standalone value.
         /// </summary>
         public Boolean Standalone
         {
-            get { return _standalone; }
-            set { _standalone = value; }
+            get => _standalone;
+            set => _standalone = value;
         }
 
         #endregion
diff --git a/src/AngleSharp.Xml/Parser/Tokens/XmlDoctypeToken.cs b/src/AngleSharp.Xml/Parser/Tokens/XmlDoctypeToken.cs
@@ -53,26 +53,26 @@ public XmlDoctypeToken(TextPosition position)
         /// </summary>
         public String Name
         {
-            get { return _name ?? String.Empty; }
-            set { _name = value; }
+            get => _name ?? String.Empty;
+            set => _name = value;
         }
 
         /// <summary>
         /// Gets or sets the value of the public identifier.
         /// </summary>
         public String PublicIdentifier
         {
-            get { return _publicIdentifier ?? String.Empty; }
-            set { _publicIdentifier = value; }
+            get => _publicIdentifier ?? String.Empty;
+            set => _publicIdentifier = value;
         }
 
         /// <summary>
         /// Gets or sets the value of the system identifier.
         /// </summary>
         public String SystemIdentifier
         {
-            get { return _systemIdentifier ?? String.Empty; }
-            set { _systemIdentifier = value; }
+            get => _systemIdentifier ?? String.Empty;
+            set => _systemIdentifier = value;
         }
 
         /// <summary>
diff --git a/src/AngleSharp.Xml/Parser/Tokens/XmlPIToken.cs b/src/AngleSharp.Xml/Parser/Tokens/XmlPIToken.cs
@@ -1,4 +1,4 @@
-﻿namespace AngleSharp.Xml.Parser.Tokens
+namespace AngleSharp.Xml.Parser.Tokens
 {
     using AngleSharp.Text;
     using System;
@@ -34,19 +34,19 @@ public XmlPIToken(TextPosition position)
         /// <summary>
         /// Gets or sets the target data.
         /// </summary>
-        public String Target 
+        public String Target
         {
-            get { return _target; }
-            set { _target = value; }
+            get => _target;
+            set => _target = value;
         }
 
         /// <summary>
         /// Gets or sets the content data.
         /// </summary>
         public String Content
         {
-            get { return _content; }
-            set { _content = value; }
+            get => _content;
+            set => _content = value;
         }
 
         #endregion
diff --git a/src/AngleSharp.Xml/Parser/Tokens/XmlTagToken.cs b/src/AngleSharp.Xml/Parser/Tokens/XmlTagToken.cs
@@ -38,17 +38,17 @@ public XmlTagToken(XmlTokenType type, TextPosition position)
         /// </summary>
         public Boolean IsSelfClosing
         {
-            get { return _selfClosing; }
-            set { _selfClosing = value; }
+            get => _selfClosing;
+            set => _selfClosing = value;
         }
 
         /// <summary>
         /// Gets or sets the name of the tag.
         /// </summary>
         public String Name
         {
-            get { return _name; }
-            set { _name = value; }
+            get => _name;
+            set => _name = value;
         }
 
         /// <summary>
diff --git a/src/AngleSharp.Xml/Parser/XmlDomBuilder.cs b/src/AngleSharp.Xml/Parser/XmlDomBuilder.cs
@@ -119,6 +119,23 @@ public Document Parse(XmlParserOptions options)
             return _document;
         }
 
+        /// <summary>
+        /// Switches to the fragment algorithm with the specified context
+        /// element. Then parses the given source and creates the document.
+        /// </summary>
+        /// <param name="options">The options to use for parsing.</param>
+        /// <param name="context">
+        /// The context element where the algorithm is applied to.
+        /// </param>
+        public Document ParseFragment(XmlParserOptions options, Element context)
+        {
+            context = context ?? throw new ArgumentNullException(nameof(context));
+            var root = new XmlElement(_document, context.LocalName);
+            _document.AddNode(root);
+            _openElements.Add(root);
+            return Parse(options);
+        }
+
         #endregion
 
         #region States
diff --git a/src/AngleSharp.Xml/Parser/XmlParser.cs b/src/AngleSharp.Xml/Parser/XmlParser.cs
diff --git a/src/AngleSharp.Xml/Parser/XmlParserOptions.cs b/src/AngleSharp.Xml/Parser/XmlParserOptions.cs
diff --git a/src/AngleSharp.Xml/XmlEntityProvider.cs b/src/AngleSharp.Xml/XmlEntityProvider.cs
diff --git a/src/AngleSharp.Xml/XmlMarkupFormatter.cs b/src/AngleSharp.Xml/XmlMarkupFormatter.cs

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public String Name`
`22`	`22`
`23`	`23`	`public AttributeTypeDeclaration Type`
`24`	`24`	`{`
`25`		`- get { return _type; }`
	`25`	`+ get => _type;`
`26`	`26`	`set`
`27`	`27`	`{`
`28`	`28`	`_type = value;`
`@@ -32,7 +32,7 @@ public AttributeTypeDeclaration Type`
`32`	`32`
`33`	`33`	`public AttributeValueDeclaration Default`
`34`	`34`	`{`
`35`		`- get { return _value; }`
	`35`	`+ get => _value;`
`36`	`36`	`set`
`37`	`37`	`{`
`38`	`38`	`_value = value;`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ abstract class ElementQuantifiedDeclarationEntry : ElementDeclarationEntry`
`46`	`46`
`47`	`47`	`public ElementQuantifier Quantifier`
`48`	`48`	`{`
`49`		`- get { return _quantifier; }`
`50`		`- set { _quantifier = value; }`
	`49`	`+ get => _quantifier;`
	`50`	`+ set => _quantifier = value;`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public Node this[Int32 index]`
`66`	`66`	`/// </summary>`
`67`	`67`	`public Boolean IsInvalid`
`68`	`68`	`{`
`69`		`- get { return _invalid; }`
	`69`	`+ get => _invalid;`
`70`	`70`	`private set`
`71`	`71`	`{`
`72`	`72`	`_invalid = value;`
`@@ -90,8 +90,8 @@ public XmlDocument Parent`
`90`	`90`	`/// </summary>`
`91`	`91`	`public String Url`
`92`	`92`	`{`
`93`		`- get { return _url ?? (Parent != null ? Parent.BaseUri : String.Empty); }`
`94`		`- set { _url = value; }`
	`93`	`+ get => _url ?? (Parent != null ? Parent.BaseUri : String.Empty);`
	`94`	`+ set => _url = value;`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ public DtdParser(DtdContainer container, TextSource source)`
`53`	`53`	`/// </summary>`
`54`	`54`	`public Boolean IsInternal`
`55`	`55`	`{`
`56`		`- get { return _tokenizer.IsExternal; }`
`57`		`- set { _tokenizer.IsExternal = !value; }`
	`56`	`+ get => _tokenizer.IsExternal;`
	`57`	`+ set => _tokenizer.IsExternal = !value;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public String Content`
`78`	`78`	`/// </summary>`
`79`	`79`	`public Boolean IsExternal`
`80`	`80`	`{`
`81`		`- get { return _external; }`
	`81`	`+ get => _external;`
`82`	`82`	`set`
`83`	`83`	`{`
`84`	`84`	`_external = value;`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ public DtdCommentToken()`
`27`	`27`	`/// </summary>`
`28`	`28`	`public String Data`
`29`	`29`	`{`
`30`		`- get { return _data; }`
`31`		`- set { _data = value; }`
	`30`	`+ get => _data;`
	`31`	`+ set => _data = value;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -49,17 +49,17 @@ public Boolean IsPublicId`
`49`	`49`	`/// </summary>`
`50`	`50`	`public String PublicIdentifier`
`51`	`51`	`{`
`52`		`- get { return _publicIdentifier ?? String.Empty; }`
`53`		`- set { _publicIdentifier = value; }`
	`52`	`+ get => _publicIdentifier ?? String.Empty;`
	`53`	`+ set => _publicIdentifier = value;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/// <summary>`
`57`	`57`	`/// Gets or sets the value of the system identifier.`
`58`	`58`	`/// </summary>`
`59`	`59`	`public String SystemIdentifier`
`60`	`60`	`{`
`61`		`- get { return _systemIdentifier ?? String.Empty; }`
`62`		`- set { _systemIdentifier = value; }`
	`61`	`+ get => _systemIdentifier ?? String.Empty;`
	`62`	`+ set => _systemIdentifier = value;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`#endregion`