Merge pull request #413 from jbest84/master

Fix :has/:is/:where nested selectors removing significant space
trullock · Dec 10, 2024 · 571949a · 571949a
2 parents bf806c1 + b73568c
commit 571949a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 1 deletion.
diff --git a/src/NUglify.Tests/Css/Bugs.cs b/src/NUglify.Tests/Css/Bugs.cs
@@ -133,6 +133,12 @@ public void Bug309()
         public void Bug331()
         {
 	        TestHelper.Instance.RunTest();
+        }
+
+        [Test]
+        public void Bug412()
+        {
+            TestHelper.Instance.RunTest();
         }
 
         [Test]

diff --git a/src/NUglify.Tests/NUglify.Tests.csproj b/src/NUglify.Tests/NUglify.Tests.csproj
@@ -404,6 +404,9 @@
     <Content Include="TestData\CSS\Expected\Bugs\Bug331.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\CSS\Expected\Bugs\Bug412.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\CSS\Expected\Bugs\Bug74.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -446,6 +449,9 @@
     <Content Include="TestData\CSS\Input\Bugs\Bug250.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\CSS\Input\Bugs\Bug412.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\CSS\Input\Bugs\Bug74.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/src/NUglify.Tests/TestData/CSS/Expected/Bugs/Bug412.css b/src/NUglify.Tests/TestData/CSS/Expected/Bugs/Bug412.css
@@ -0,0 +1 @@
+.foo:has(span span){color:#f00;text-align:center}
diff --git a/src/NUglify.Tests/TestData/CSS/Input/Bugs/Bug412.css b/src/NUglify.Tests/TestData/CSS/Input/Bugs/Bug412.css
@@ -0,0 +1,4 @@
+.foo:has(span span) {
+    color: #f00;
+    text-align: center;
+}
diff --git a/src/NUglify/Css/CssParser.cs b/src/NUglify/Css/CssParser.cs
@@ -2464,7 +2464,10 @@ Parsed ParsePseudo()
 
                     case TokenType.Not:
                     case TokenType.Any:
-                    case TokenType.Matches:
+                    case TokenType.Matches:
+                    case TokenType.Is:
+                    case TokenType.Where:
+                    case TokenType.Has:
                         AppendCurrent();
                         SkipSpace();
 

diff --git a/src/NUglify/Css/CssScanner.cs b/src/NUglify/Css/CssScanner.cs
@@ -1185,6 +1185,7 @@ CssToken ScanIdent()
                     NextChar();
 
                     var tokenType = TokenType.Function;
+                    // TODO: Refactor to shared TokenType of "PsuedoWithNested"
                     if (ident.Equals("not", StringComparison.OrdinalIgnoreCase))
                     {
                         tokenType = TokenType.Not;
@@ -1197,6 +1198,18 @@ CssToken ScanIdent()
                     {
                         tokenType = TokenType.Matches;
                     }
+                    else if (ident.Equals("has", StringComparison.OrdinalIgnoreCase))
+                    {
+                        tokenType = TokenType.Has;
+                    }
+                    else if (ident.Equals("is", StringComparison.OrdinalIgnoreCase))
+                    {
+                        tokenType = TokenType.Is;
+                    }
+                    else if (ident.Equals("where", StringComparison.OrdinalIgnoreCase))
+                    {
+                        tokenType = TokenType.Where;
+                    }
 
                     token = new CssToken(tokenType, ident + '(', m_context);
                 }

diff --git a/src/NUglify/Css/CssToken.cs b/src/NUglify/Css/CssToken.cs
@@ -179,6 +179,9 @@ enum TokenType
         Function,
         Not,
         Any,
+        Has,
+        Is,
+        Where,
         Matches,
         UnicodeRange,
         ProgId,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		.foo:has(span span){color:#f00;text-align:center}
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,6 +179,9 @@ enum TokenType @@
             Function,
             Not,
             Any,
+            Has,
+            Is,
+            Where,
             Matches,
             UnicodeRange,
             ProgId,
@@ Expand Down @@