Update processFont to handle null expressions. (dart-archive/csslib#186)

* Update processFont to handle null expressions. * Guidelines.
dart-lang · Mar 19, 2024 · e1a98cd · e1a98cd
1 parent e897e7c
commit e1a98cd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/pkgs/csslib/CHANGELOG.md b/pkgs/csslib/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 1.0.1-wip
 
-- Require Dart 3.0
+- Update `ExpressionsProcessor.processFont` to handle null expressions.
+- Require Dart 3.0.
 
 ## 1.0.0
 

diff --git a/pkgs/csslib/lib/parser.dart b/pkgs/csslib/lib/parser.dart
@@ -2836,9 +2836,9 @@ class ExpressionsProcessor {
     }
 
     return FontExpression(_exprs.span,
-        size: fontSize!.font.size,
-        lineHeight: fontSize.font.lineHeight,
-        family: fontFamily!.font.family);
+        size: fontSize?.font.size,
+        lineHeight: fontSize?.font.lineHeight,
+        family: fontFamily?.font.family);
   }
 }
 

diff --git a/pkgs/csslib/test/declaration_test.dart b/pkgs/csslib/test/declaration_test.dart
@@ -260,6 +260,33 @@ void testUnits() {
   expect(prettyPrint(stylesheet), generated);
 }
 
+void testNoValues() {
+  var errors = <Message>[];
+  final input = r'''
+.foo {
+  color: ;
+}
+.bar {
+  font:;
+  color: blue;
+}
+''';
+
+  final generated = r'''
+.foo {
+  color: ;
+}
+.bar {
+  font: ;
+  color: #00f;
+}''';
+
+  var stylesheet = parseCss(input, errors: errors, opts: simpleOptions);
+
+  expect(errors.isEmpty, true, reason: errors.toString());
+  expect(prettyPrint(stylesheet), generated);
+}
+
 void testUnicode() {
   var errors = <Message>[];
   final input = r'''
@@ -1435,6 +1462,7 @@ void main() {
   test('Identifiers', testIdentifiers);
   test('Composites', testComposites);
   test('Units', testUnits);
+  test('No Values', testNoValues);
   test('Unicode', testUnicode);
   test('Newer CSS', testNewerCss);
   test('Media Queries', testMediaQueries);