CSS fix bug with merging style rules, fix unnecessary backslash, more…

… tests (#16628)
oven-sh · Jan 23, 2025 · 70ed282 · 70ed282
1 parent ba2bd5c
commit 70ed282
Show file tree

Hide file tree

Showing 7 changed files with 1,721 additions and 446 deletions.
diff --git a/src/css/css_parser.zig b/src/css/css_parser.zig
@@ -170,6 +170,7 @@ pub const VendorPrefix = packed struct(u8) {
     pub const NONE = VendorPrefix{ .none = true };
     pub const WEBKIT = VendorPrefix{ .webkit = true };
     pub const MOZ = VendorPrefix{ .moz = true };
+    pub const MS = VendorPrefix{ .ms = true };
     pub const O = VendorPrefix{ .o = true };
 
     /// Fields listed here so we can iterate them in the order we want
@@ -881,6 +882,8 @@ pub fn DefineEnumProperty(comptime T: type) type {
             // @panic("TODO renable this");
         }
 
+        pub fn deinit(_: *T, _: std.mem.Allocator) void {}
+
         pub fn toCss(this: *const T, comptime W: type, dest: *Printer(W)) PrintErr!void {
             return dest.writeStr(asStr(this));
         }
@@ -4901,7 +4904,7 @@ const Tokenizer = struct {
                         }
                     }
                     // else: escaped EOF, do nothing.
-                    // continue;
+                    continue;
                 },
                 0 => {
                     this.advance(1);

diff --git a/src/css/declaration.zig b/src/css/declaration.zig
@@ -23,6 +23,7 @@ const ScrollMarginHandler = css.css_properties.margin_padding.ScrollMarginHandle
 const FontHandler = css.css_properties.font.FontHandler;
 const InsetHandler = css.css_properties.margin_padding.InsetHandler;
 const SizeHandler = css.css_properties.size.SizeHandler;
+const FlexHandler = css.css_properties.flex.FlexHandler;
 
 /// A CSS declaration block.
 ///
@@ -332,6 +333,7 @@ pub fn parse_declaration(
 pub const DeclarationHandler = struct {
     background: BackgroundHandler = .{},
     border: BorderHandler = .{},
+    flex: FlexHandler = .{},
     size: SizeHandler = .{},
     margin: MarginHandler = .{},
     padding: PaddingHandler = .{},
@@ -356,6 +358,7 @@ pub const DeclarationHandler = struct {
 
         this.background.finalize(&this.decls, context);
         this.border.finalize(&this.decls, context);
+        this.flex.finalize(&this.decls, context);
         this.size.finalize(&this.decls, context);
         this.margin.finalize(&this.decls, context);
         this.padding.finalize(&this.decls, context);
@@ -369,6 +372,7 @@ pub const DeclarationHandler = struct {
         // return this.background.handleProperty(property, &this.decls, context);
         return this.background.handleProperty(property, &this.decls, context) or
             this.border.handleProperty(property, &this.decls, context) or
+            this.flex.handleProperty(property, &this.decls, context) or
             this.size.handleProperty(property, &this.decls, context) or
             this.margin.handleProperty(property, &this.decls, context) or
             this.padding.handleProperty(property, &this.decls, context) or

diff --git a/src/css/properties/border.zig b/src/css/properties/border.zig
@@ -200,8 +200,6 @@ pub const LineStyle = enum {
         return true;
     }
 
-    pub fn deinit(_: *const @This(), _: std.mem.Allocator) void {}
-
     pub fn default() LineStyle {
         return .none;
     }