From 5079cf509b9658006379cc426c36c8a4ce2fdde1 Mon Sep 17 00:00:00 2001 From: Taco de Wolff Date: Tue, 27 Feb 2024 12:10:38 -0300 Subject: [PATCH] CSS: fix another comparison bug with functions, see #673 --- css/css.go | 2 +- css/css_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/css/css.go b/css/css.go index 34ee87431d..39b3828d36 100644 --- a/css/css.go +++ b/css/css.go @@ -1134,7 +1134,7 @@ func (c *cssMinifier) minifyProperty(prop Hash, values []Token) []Token { } else { values[i] = minifyColor(values[i]) } - if 0 < i && sameValues && !bytes.Equal(values[0].Data, values[i].Data) { + if 0 < i && sameValues && !values[0].Equal(values[i]) { sameValues = false } } diff --git a/css/css_test.go b/css/css_test.go index a29c5ca914..e7bcfd5f04 100644 --- a/css/css_test.go +++ b/css/css_test.go @@ -75,8 +75,9 @@ func TestCSS(t *testing.T) { {"@import url( )", `@import ""`}, // bugs - {"a{@media screen and (min-width:1024px){ width: 40%; } & h1 { font-size: clamp(2.5rem, 1rem + 3vw, 3.5rem)}}", "a{@media screen and (min-width:1024px){width: 40%;}& h1 { font-size: clamp(2.5rem, 1rem + 3vw, 3.5rem)}}"}, // #602 - {"a{padding:calc(var(--dce-edge-xsmall,6px) - 2px) calc(var(--dce-button-horizontal-padding,18px) - 2px)}", "a{padding:calc(var(--dce-edge-xsmall,6px) - 2px)calc(var(--dce-button-horizontal-padding,18px) - 2px)}"}, // #673 + {"a{@media screen and (min-width:1024px){ width: 40%; } & h1 { font-size: clamp(2.5rem, 1rem + 3vw, 3.5rem)}}", "a{@media screen and (min-width:1024px){width: 40%;}& h1 { font-size: clamp(2.5rem, 1rem + 3vw, 3.5rem)}}"}, // #602 + {"a{padding:calc(var(--dce-edge-xsmall,6px) - 2px) calc(var(--dce-button-horizontal-padding,18px) - 2px)}", "a{padding:calc(var(--dce-edge-xsmall,6px) - 2px)calc(var(--dce-button-horizontal-padding,18px) - 2px)}"}, // #673 + {"a{border-color:var(--dce-brand-color,#01A982)var(--dce-brand-color,#01A982)var(--dce-border-weak,#0000001F)}", "a{border-color:var(--dce-brand-color,#01A982)var(--dce-brand-color,#01A982)var(--dce-border-weak,#0000001F)}"}, // #673 } m := minify.New()