Switch from try/catch to firstWhereOrNull from 'collections'

tneotia · tneotia · commit 617a0818b0d0 · 2021-04-27T15:53:07.000-04:00
diff --git a/lib/src/css_parser.dart b/lib/src/css_parser.dart
@@ -1,5 +1,6 @@
 import 'dart:ui';
 
+import 'package:collection/collection.dart';
 import 'package:csslib/visitor.dart' as css;
 import 'package:csslib/parser.dart' as cssparser;
 import 'package:flutter/cupertino.dart';
@@ -72,12 +73,8 @@ Style declarationsToStyle(Map<String?, List<css.Expression>> declarations) {
           css.Expression? textDecorationColor;
           /// orElse: will not allow me to return null (even if the compiler says its okay, it errors on runtime).
           /// try/catch is a workaround for this.
-          try {
-            textDecorationColor = nullableList.firstWhere(
-                    (css.Expression? element) => element is css.HexColorTerm || element is css.FunctionTerm);
-          } catch (e) {
-            textDecorationColor = null;
-          }
+          textDecorationColor = nullableList.firstWhereOrNull(
+                  (element) => element is css.HexColorTerm || element is css.FunctionTerm);
           List<css.LiteralTerm?>? potentialStyles = value.whereType<css.LiteralTerm>().toList();
           /// List<css.LiteralTerm> might include other values than the ones we want for [textDecorationStyle], so make sure to remove those before passing it to [ExpressionMapping]
           potentialStyles.removeWhere((element) => element != null && element.text != "solid"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -34,6 +34,9 @@ dependencies:
   # Plugin for rendering MathML
   flutter_math_fork: ^0.3.0+1
 
+  # plugin for firstWhereOrNull extension on lists
+  collection: ^1.15.0
+
   flutter:
     sdk: flutter
 
