@@ -44,8 +44,8 @@ Style declarationsToStyle(Map<String, List<css.Expression>> declarations) {
4444 && ! (element is css.EmTerm ) && ! (element is css.RemTerm )
4545 && ! (element is css.NumberTerm ))
4646 );
47- css.LiteralTerm borderWidth = borderWidths.firstWhere ((element) => element != null )! ;
48- css.Expression borderColor = value.firstWhere ((element) => ExpressionMapping .expressionToColor (element) != null );
47+ css.LiteralTerm ? borderWidth = borderWidths.firstWhereOrNull ((element) => element != null );
48+ css.Expression ? borderColor = value.firstWhereOrNull ((element) => ExpressionMapping .expressionToColor (element) != null );
4949 List <css.LiteralTerm ?>? potentialStyles = value.whereType< css.LiteralTerm > ().toList ();
5050 /// Currently doesn't matter, as Flutter only supports "solid" or "none", but may support more in the future.
5151 List <String > possibleBorderValues = ["dotted" , "dashed" , "solid" , "double" , "groove" , "ridge" , "inset" , "outset" , "none" , "hidden" ];
@@ -77,8 +77,8 @@ Style declarationsToStyle(Map<String, List<css.Expression>> declarations) {
7777 && ! (element is css.EmTerm ) && ! (element is css.RemTerm )
7878 && ! (element is css.NumberTerm ))
7979 );
80- css.LiteralTerm borderWidth = borderWidths.firstWhere ((element) => element != null )! ;
81- css.Expression borderColor = value.firstWhere ((element) => ExpressionMapping .expressionToColor (element) != null );
80+ css.LiteralTerm ? borderWidth = borderWidths.firstWhereOrNull ((element) => element != null );
81+ css.Expression ? borderColor = value.firstWhereOrNull ((element) => ExpressionMapping .expressionToColor (element) != null );
8282 List <css.LiteralTerm ?>? potentialStyles = value.whereType< css.LiteralTerm > ().toList ();
8383 /// Currently doesn't matter, as Flutter only supports "solid" or "none", but may support more in the future.
8484 List <String > possibleBorderValues = ["dotted" , "dashed" , "solid" , "double" , "groove" , "ridge" , "inset" , "outset" , "none" , "hidden" ];
@@ -110,8 +110,8 @@ Style declarationsToStyle(Map<String, List<css.Expression>> declarations) {
110110 && ! (element is css.EmTerm ) && ! (element is css.RemTerm )
111111 && ! (element is css.NumberTerm ))
112112 );
113- css.LiteralTerm borderWidth = borderWidths.firstWhere ((element) => element != null )! ;
114- css.Expression borderColor = value.firstWhere ((element) => ExpressionMapping .expressionToColor (element) != null );
113+ css.LiteralTerm ? borderWidth = borderWidths.firstWhereOrNull ((element) => element != null );
114+ css.Expression ? borderColor = value.firstWhereOrNull ((element) => ExpressionMapping .expressionToColor (element) != null );
115115 List <css.LiteralTerm ?>? potentialStyles = value.whereType< css.LiteralTerm > ().toList ();
116116 /// Currently doesn't matter, as Flutter only supports "solid" or "none", but may support more in the future.
117117 List <String > possibleBorderValues = ["dotted" , "dashed" , "solid" , "double" , "groove" , "ridge" , "inset" , "outset" , "none" , "hidden" ];
@@ -143,8 +143,8 @@ Style declarationsToStyle(Map<String, List<css.Expression>> declarations) {
143143 && ! (element is css.EmTerm ) && ! (element is css.RemTerm )
144144 && ! (element is css.NumberTerm ))
145145 );
146- css.LiteralTerm borderWidth = borderWidths.firstWhere ((element) => element != null )! ;
147- css.Expression borderColor = value.firstWhere ((element) => ExpressionMapping .expressionToColor (element) != null );
146+ css.LiteralTerm ? borderWidth = borderWidths.firstWhereOrNull ((element) => element != null );
147+ css.Expression ? borderColor = value.firstWhereOrNull ((element) => ExpressionMapping .expressionToColor (element) != null );
148148 List <css.LiteralTerm ?>? potentialStyles = value.whereType< css.LiteralTerm > ().toList ();
149149 /// Currently doesn't matter, as Flutter only supports "solid" or "none", but may support more in the future.
150150 List <String > possibleBorderValues = ["dotted" , "dashed" , "solid" , "double" , "groove" , "ridge" , "inset" , "outset" , "none" , "hidden" ];
0 commit comments