Fixed bracket #67

Author: FlorianRappl

src/AngleSharp.Css.Tests/Values/Calc.cs

@@ -37,15 +37,15 @@ public void CalcAdditionWithBrackets()
         {
             var source = new StringSource(@"calc(5 + (3 + 7))");
             var calc = CalcParser.ParseCalc(source);
-            Assert.AreEqual("calc(5 + 3 + 7)", calc.CssText);
+            Assert.AreEqual("calc(5 + (3 + 7))", calc.CssText);
         }
 
         [Test]
         public void CalcAdditionWithCalcBracket()
         {
             var source = new StringSource(@"calc(5 + calc(3 + 7))");
             var calc = CalcParser.ParseCalc(source);
-            Assert.AreEqual("calc(5 + 3 + 7)", calc.CssText);
+            Assert.AreEqual("calc(5 + (3 + 7))", calc.CssText);
         }
 
         [Test]

src/AngleSharp.Css/Parser/Micro/CalcParser.cs

@@ -124,11 +124,13 @@ private static ICssValue ParseBracketExpression(this StringSource source)
             if (source.Current == Symbols.RoundBracketOpen)
             {
                 source.SkipCurrentAndSpaces();
-                return source.ParseExpression();
+                var content = source.ParseExpression();
+                return new CssCalcBracketExpression(content);
             }
             else if (source.IsFunction(FunctionNames.Calc))
             {
-                return source.ParseExpression();
+                var content = source.ParseExpression();
+                return new CssCalcBracketExpression(content);
             }
 
             return source.ParseAtomicExpression();

src/AngleSharp.Css/Values/Expressions/CssCalcBracketExpression.cs

@@ -0,0 +1,32 @@
+namespace AngleSharp.Css.Values
+{
+    using AngleSharp.Css.Dom;
+    using System;
+
+    /// <summary>
+    /// Represents a calc bracket expression, i.e., (2+3).
+    /// </summary>
+    sealed class CssCalcBracketExpression : ICssCompositeValue
+    {
+        private readonly ICssValue _content;
+
+        /// <summary>
+        /// Creates a new calc bracket expression.
+        /// </summary>
+        /// <param name="content">The enclosed content.</param>
+        public CssCalcBracketExpression(ICssValue content)
+        {
+            _content = content;
+        }
+
+        /// <summary>
+        /// Gets the bracket's content.
+        /// </summary>
+        public ICssValue Value => _content;
+
+        /// <summary>
+        /// Gets the CSS text representation.
+        /// </summary>
+        public String CssText => String.Concat("(", _content.CssText, ")");
+    }
+}