Fixed exponential handling #79

Author: FlorianRappl

CHANGELOG.md

@@ -4,6 +4,7 @@ Released on Thursday, November 4 2021.
 
 - Fixed issue with unbalanced grid areas and rows (#82)
 - Fixed small numbers to be transformed into negative exponentials (#80)
+- Fixed issue handling exponential unit values (#79)
 
 # 0.16.1
 

src/AngleSharp.Css.Tests/Declarations/CssMarginProperty.cs

@@ -30,6 +30,42 @@ public void CssMarginLeftTinyValue_Issue80()
             Assert.AreEqual("0.00001px", property.Value);
         }
 
+        [Test]
+        public void CssMarginLeftExponentialValue_Issue79()
+        {
+            var snippet = "margin-left: 1E5px";
+            var property = ParseDeclaration(snippet);
+            Assert.AreEqual("margin-left", property.Name);
+            Assert.IsFalse(property.IsImportant);
+            Assert.IsFalse(property.IsInherited);
+            Assert.IsTrue(property.HasValue);
+            Assert.AreEqual("100000px", property.Value);
+        }
+
+        [Test]
+        public void CssMarginLeftExponentialValueWithPlus_Issue79()
+        {
+            var snippet = "margin-left: 1E+5px";
+            var property = ParseDeclaration(snippet);
+            Assert.AreEqual("margin-left", property.Name);
+            Assert.IsFalse(property.IsImportant);
+            Assert.IsFalse(property.IsInherited);
+            Assert.IsTrue(property.HasValue);
+            Assert.AreEqual("100000px", property.Value);
+        }
+
+        [Test]
+        public void CssMarginLeftExponentialValueWithMinus_Issue79()
+        {
+            var snippet = "margin-left: 1E-2px";
+            var property = ParseDeclaration(snippet);
+            Assert.AreEqual("margin-left", property.Name);
+            Assert.IsFalse(property.IsImportant);
+            Assert.IsFalse(property.IsInherited);
+            Assert.IsTrue(property.HasValue);
+            Assert.AreEqual("0.01px", property.Value);
+        }
+
         [Test]
         public void CssMarginLeftInitialLegal()
         {

src/AngleSharp.Css/Parser/CssTokenizer.cs

@@ -1,9 +1,9 @@
 namespace AngleSharp.Css.Parser
 {
     using AngleSharp.Common;
-    using AngleSharp.Dom;
     using AngleSharp.Css.Dom.Events;
     using AngleSharp.Css.Parser.Tokens;
+    using AngleSharp.Dom;
     using AngleSharp.Text;
     using System;
     using System.Globalization;
@@ -807,7 +807,7 @@ private CssToken NumberRest()
                 {
                     StringBuffer.Append(current);
                 }
-                else if (current.IsNameStart())
+                else if (current != 'e' && current != 'E' && current.IsNameStart())
                 {
                     StringBuffer.Append(current);
                     return Dimension();
@@ -871,7 +871,7 @@ private CssToken NumberFraction()
                 {
                     StringBuffer.Append(current);
                 }
-                else if (current.IsNameStart())
+                else if (current != 'e' && current != 'E' && current.IsNameStart())
                 {
                     StringBuffer.Append(current);
                     return Dimension();
@@ -949,6 +949,11 @@ private CssToken SciNotation()
                 {
                     StringBuffer.Append(current);
                 }
+                else if (current.IsNameStart() || IsValidEscape(current))
+                {
+                    StringBuffer.Append(current);
+                    return Dimension();
+                }
                 else
                 {
                     Back();

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

@@ -316,6 +316,9 @@ private static Unit UnitStart(StringSource source)
             return null;
         }
 
+        private static Boolean IsDimension(StringSource source, Char current) =>
+            current != 'e' && current != 'E' && (current.IsNameStart() || source.IsValidEscape());
+
         private static Unit UnitRest(StringSource source, StringBuilder buffer)
         {
             var current = source.Next();
@@ -326,7 +329,7 @@ private static Unit UnitRest(StringSource source, StringBuilder buffer)
                 {
                     buffer.Append(current);
                 }
-                else if (current.IsNameStart() || source.IsValidEscape())
+                else if (IsDimension(source, current))
                 {
                     var number = buffer.ToString();
                     return Dimension(source, number, buffer.Clear());
@@ -378,7 +381,7 @@ private static Unit UnitFraction(StringSource source, StringBuilder buffer)
                 {
                     buffer.Append(current);
                 }
-                else if (current.IsNameStart() || source.IsValidEscape())
+                else if (IsDimension(source, current))
                 {
                     var number = buffer.ToString();
                     return Dimension(source, number, buffer.Clear());
@@ -421,7 +424,7 @@ private static Unit Dimension(StringSource source, String number, StringBuilder
                 }
                 else if (source.IsValidEscape())
                 {
-                    current = source.Next();
+                    source.Next();
                     buffer.Append(source.ConsumeEscape());
                 }
                 else
@@ -443,6 +446,11 @@ private static Unit SciNotation(StringSource source, StringBuilder buffer)
                 {
                     buffer.Append(current);
                 }
+                else if (current.IsNameStart() || source.IsValidEscape())
+                {
+                    var number = buffer.ToString();
+                    return Dimension(source, number, buffer.Clear());
+                }
                 else
                 {
                     return new Unit(buffer.ToPool(), String.Empty);