diff --git a/analysis_options.yaml b/analysis_options.yaml index fa5e27ef9e..30c9dd54e8 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -175,7 +175,7 @@ linter: - prefer_is_not_operator - prefer_iterable_whereType # - prefer_mixin # https://github.com/dart-lang/language/issues/32 - # - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932 + - prefer_null_aware_operators # - prefer_relative_imports # not yet tested - prefer_single_quotes - prefer_spread_collections diff --git a/packages/flutter/lib/src/gestures/arena.dart b/packages/flutter/lib/src/gestures/arena.dart index cfed21fb04..fbb509d029 100644 --- a/packages/flutter/lib/src/gestures/arena.dart +++ b/packages/flutter/lib/src/gestures/arena.dart @@ -267,7 +267,7 @@ class GestureArenaManager { bool _debugLogDiagnostic(int pointer, String message, [ _GestureArena? state ]) { assert(() { if (debugPrintGestureArenaDiagnostics) { - final int? count = state != null ? state.members.length : null; + final int? count = state?.members.length; final String s = count != 1 ? 's' : ''; debugPrint('Gesture arena ${pointer.toString().padRight(4)} ❙ $message${ count != null ? " with $count member$s." : ""}'); } diff --git a/packages/flutter/test/material/dropdown_form_field_test.dart b/packages/flutter/test/material/dropdown_form_field_test.dart index 2f45004276..cf2af53a17 100644 --- a/packages/flutter/test/material/dropdown_form_field_test.dart +++ b/packages/flutter/test/material/dropdown_form_field_test.dart @@ -65,7 +65,7 @@ Widget buildFormFrame({ iconEnabledColor: iconEnabledColor, isDense: isDense, isExpanded: isExpanded, - items: items == null ? null : items.map>((String item) { + items: items?.map>((String item) { return DropdownMenuItem( key: ValueKey(item), value: item, diff --git a/packages/flutter/test/material/dropdown_test.dart b/packages/flutter/test/material/dropdown_test.dart index 0670bef9fd..b96086f0f2 100644 --- a/packages/flutter/test/material/dropdown_test.dart +++ b/packages/flutter/test/material/dropdown_test.dart @@ -54,9 +54,7 @@ Widget buildDropdown({ Color? focusColor, Color? dropdownColor, }) { - final List>? listItems = items == null - ? null - : items.map>((String item) { + final List>? listItems = items?.map>((String item) { return DropdownMenuItem( key: ValueKey(item), value: item, diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index 05d4a1df62..68a8d15f3b 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart @@ -692,7 +692,7 @@ class _IOSSimulatorLogReader extends DeviceLogReader { onListen: _start, onCancel: _stop, ); - _appName = app == null ? null : app.name.replaceAll('.app', ''); + _appName = app?.name?.replaceAll('.app', ''); } final IOSSimulator device;