Fixed missing_return warning brought about by dart 2.4.* (or Flutter 1.7.*)

danvick · danvick · commit 53bcb2d3a554 · 2019-07-10T17:59:31.000+03:00
diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -284,6 +284,7 @@ class MyHomePageState extends State<MyHomePage> {
                               val >= 10) {
                             return "You can only put more than 10 if you've accepted terms";
                           }
+                          return null;
                         }
                       ],
                     ),
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -84,6 +84,7 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_checkbox_list.dart b/lib/src/fields/form_builder_checkbox_list.dart
@@ -90,6 +90,7 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
             if (widget.validators[i](val) != null)
               return widget.validators[i](val);
           }
+          return null;
         },
         onSaved: (val) {
           if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_chips_input.dart b/lib/src/fields/form_builder_chips_input.dart
@@ -74,6 +74,7 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
             if (widget.validators[i](val) != null)
               return widget.validators[i](val);
           }
+          return null;
         },
         onSaved: (val) {
           if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -209,6 +209,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onChanged: widget.onChanged,
       builder: widget.builder,
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -75,6 +75,7 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_radio.dart b/lib/src/fields/form_builder_radio.dart
@@ -85,6 +85,7 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_rate.dart b/lib/src/fields/form_builder_rate.dart
@@ -64,6 +64,7 @@ class _FormBuilderRateState extends State<FormBuilderRate> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
@@ -90,6 +91,7 @@ class _FormBuilderRateState extends State<FormBuilderRate> {
                     FocusScope.of(context).requestFocus(FocusNode());
                     field.didChange(value);
                     if (widget.onChanged != null) widget.onChanged(value);
+                    return value;
                   },
           ),
         );
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -62,6 +62,7 @@ class _FormBuilderSegmentedControlState
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -80,6 +80,7 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_slider.dart b/lib/src/fields/form_builder_slider.dart
@@ -75,6 +75,7 @@ class _FormBuilderSliderState extends State<FormBuilderSlider> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_stepper.dart b/lib/src/fields/form_builder_stepper.dart
@@ -66,6 +66,7 @@ class _FormBuilderStepperState extends State<FormBuilderStepper> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_switch.dart b/lib/src/fields/form_builder_switch.dart
@@ -59,6 +59,7 @@ class _FormBuilderSwitchState extends State<FormBuilderSwitch> {
             if (widget.validators[i](val) != null)
               return widget.validators[i](val);
           }
+          return null;
         },
         onSaved: (val) {
           if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_text_field.dart b/lib/src/fields/form_builder_text_field.dart
@@ -115,6 +115,7 @@ class FormBuilderTextFieldState extends State<FormBuilderTextField> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/fields/form_builder_typeahead.dart b/lib/src/fields/form_builder_typeahead.dart
@@ -104,6 +104,7 @@ class _FormBuilderTypeAheadState extends State<FormBuilderTypeAhead> {
           if (widget.validators[i](val) != null)
             return widget.validators[i](val);
         }
+        return null;
       },
       onSaved: (val) {
         if (widget.valueTransformer != null) {
diff --git a/lib/src/form_builder_custom_field.dart b/lib/src/form_builder_custom_field.dart
@@ -83,6 +83,7 @@ class FormBuilderCustomFieldState<T> extends State<FormBuilderCustomField<T>> {
           }
           if (widget.formField.validator != null)
             return widget.formField.validator(val);
+          return null;
         },
         builder:
             widget.formField.builder ?? (FormField<T> field) => Container(),
diff --git a/lib/src/form_builder_validators.dart b/lib/src/form_builder_validators.dart
@@ -14,6 +14,7 @@ class FormBuilderValidators {
               valueCandidate.length == 0)) {
         return errorText;
       }
+      return null;
     };
   }
 
@@ -26,6 +27,7 @@ class FormBuilderValidators {
       if (valueCandidate != true) {
         return errorText;
       }
+      return null;
     };
   }
 
@@ -43,6 +45,7 @@ class FormBuilderValidators {
                   num.tryParse(valueCandidate) < min))) {
         return errorText ?? "Value must be greater than or equal to $min";
       }
+      return null;
     };
   }
 
@@ -61,6 +64,7 @@ class FormBuilderValidators {
           return errorText ?? "Value must be less than or equal to $max";
         }
       }
+      return null;
     };
   }
 
@@ -75,6 +79,7 @@ class FormBuilderValidators {
         return errorText ??
             "Value must have a length greater than or equal to $minLength";
       }
+      return null;
     };
   }
 
@@ -89,6 +94,7 @@ class FormBuilderValidators {
         return errorText ??
             "Value must have a length less than or equal to $maxLength";
       }
+      return null;
     };
   }
 
@@ -100,6 +106,7 @@ class FormBuilderValidators {
       if (valueCandidate != null && valueCandidate.isNotEmpty) {
         if (!isEmail(valueCandidate)) return errorText;
       }
+      return null;
     };
   }
 
@@ -122,6 +129,7 @@ class FormBuilderValidators {
             hostWhitelist: hostWhitelist,
             hostBlacklist: hostBlacklist)) return errorText;
       }
+      return null;
     };
   }
 
@@ -135,6 +143,7 @@ class FormBuilderValidators {
       if (valueCandidate != null && valueCandidate.isNotEmpty) {
         if (!RegExp(pattern).hasMatch(valueCandidate)) return errorText;
       }
+      return null;
     };
   }
 
@@ -145,6 +154,7 @@ class FormBuilderValidators {
     return (valueCandidate) {
       if (num.tryParse(valueCandidate) == null && valueCandidate.isNotEmpty)
         return errorText;
+      return null;
     };
   }
 
@@ -156,6 +166,7 @@ class FormBuilderValidators {
       if (valueCandidate != null && valueCandidate.isNotEmpty) {
         if (!isCreditCard(valueCandidate)) return errorText;
       }
+      return null;
     };
   }
 
@@ -169,6 +180,7 @@ class FormBuilderValidators {
       if (valueCandidate != null && valueCandidate.isNotEmpty) {
         if (!isIP(valueCandidate, version)) return errorText;
       }
+      return null;
     };
   }
 
@@ -180,6 +192,7 @@ class FormBuilderValidators {
       if (valueCandidate != null && valueCandidate.isNotEmpty) {
         if (!isDate(valueCandidate)) return errorText;
       }
+      return null;
     };
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
@@ -1,5 +1,5 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   analyzer:
     dependency: transitive
@@ -21,7 +21,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -241,7 +241,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.7.0"
   pool:
     dependency: transitive
     description:
@@ -262,7 +262,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   shelf:
     dependency: transitive
     description:
@@ -358,21 +358,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.1"
+    version: "1.6.3"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.5"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.3"
+    version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
@@ -423,5 +423,5 @@ packages:
     source: hosted
     version: "2.1.15"
 sdks:
-  dart: ">=2.2.0 <3.0.0"
+  dart: ">=2.2.2 <3.0.0"
   flutter: ">=0.1.4 <2.0.0"

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ class MyHomePageState extends State<MyHomePage> {`
`284`	`284`	`val >= 10) {`
`285`	`285`	`return "You can only put more than 10 if you've accepted terms";`
`286`	`286`	`}`
	`287`	`+ return null;`
`287`	`288`	`}`
`288`	`289`	`],`
`289`	`290`	`),`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {`
`84`	`84`	`if (widget.validators[i](val) != null)`
`85`	`85`	`return widget.validators[i](val);`
`86`	`86`	`}`
	`87`	`+ return null;`
`87`	`88`	`},`
`88`	`89`	`onSaved: (val) {`
`89`	`90`	`if (widget.valueTransformer != null) {`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {`
`90`	`90`	`if (widget.validators[i](val) != null)`
`91`	`91`	`return widget.validators[i](val);`
`92`	`92`	`}`
	`93`	`+ return null;`
`93`	`94`	`},`
`94`	`95`	`onSaved: (val) {`
`95`	`96`	`if (widget.valueTransformer != null) {`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {`
`74`	`74`	`if (widget.validators[i](val) != null)`
`75`	`75`	`return widget.validators[i](val);`
`76`	`76`	`}`
	`77`	`+ return null;`
`77`	`78`	`},`
`78`	`79`	`onSaved: (val) {`
`79`	`80`	`if (widget.valueTransformer != null) {`
Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {`
`209`	`209`	`if (widget.validators[i](val) != null)`
`210`	`210`	`return widget.validators[i](val);`
`211`	`211`	`}`
	`212`	`+ return null;`
`212`	`213`	`},`
`213`	`214`	`onChanged: widget.onChanged,`
`214`	`215`	`builder: widget.builder,`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {`
`75`	`75`	`if (widget.validators[i](val) != null)`
`76`	`76`	`return widget.validators[i](val);`
`77`	`77`	`}`
	`78`	`+ return null;`
`78`	`79`	`},`
`79`	`80`	`onSaved: (val) {`
`80`	`81`	`if (widget.valueTransformer != null) {`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {`
`85`	`85`	`if (widget.validators[i](val) != null)`
`86`	`86`	`return widget.validators[i](val);`
`87`	`87`	`}`
	`88`	`+ return null;`
`88`	`89`	`},`
`89`	`90`	`onSaved: (val) {`
`90`	`91`	`if (widget.valueTransformer != null) {`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ class _FormBuilderSegmentedControlState`
`62`	`62`	`if (widget.validators[i](val) != null)`
`63`	`63`	`return widget.validators[i](val);`
`64`	`64`	`}`
	`65`	`+ return null;`
`65`	`66`	`},`
`66`	`67`	`onSaved: (val) {`
`67`	`68`	`if (widget.valueTransformer != null) {`