diff --git a/analysis_options.yaml b/analysis_options.yaml index a9d29631e1..4da1e9f1fb 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -116,7 +116,7 @@ linter: - library_prefixes - library_private_types_in_public_api # - lines_longer_than_80_chars # not required by flutter style - # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/linter/issues/453 + - literal_only_boolean_expressions # - matching_super_parameters # blocked on https://github.com/dart-lang/language/issues/2509 - missing_whitespace_between_adjacent_strings - no_adjacent_strings_in_list diff --git a/packages/flutter/lib/src/material/calendar_date_picker.dart b/packages/flutter/lib/src/material/calendar_date_picker.dart index 878439b61b..2a3e842ddd 100644 --- a/packages/flutter/lib/src/material/calendar_date_picker.dart +++ b/packages/flutter/lib/src/material/calendar_date_picker.dart @@ -915,14 +915,11 @@ class _DayPickerState extends State<_DayPicker> { /// List _dayHeaders(TextStyle? headerStyle, MaterialLocalizations localizations) { final List result = []; - for (int i = localizations.firstDayOfWeekIndex; true; i = (i + 1) % 7) { + for (int i = localizations.firstDayOfWeekIndex; result.length < DateTime.daysPerWeek; i = (i + 1) % DateTime.daysPerWeek) { final String weekday = localizations.narrowWeekdays[i]; result.add(ExcludeSemantics( child: Center(child: Text(weekday, style: headerStyle)), )); - if (i == (localizations.firstDayOfWeekIndex - 1) % 7) { - break; - } } return result; } diff --git a/packages/flutter/lib/src/material/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart index d5d2e1d0d0..ea585561f5 100644 --- a/packages/flutter/lib/src/material/date_picker.dart +++ b/packages/flutter/lib/src/material/date_picker.dart @@ -2093,14 +2093,11 @@ class _DayHeaders extends StatelessWidget { /// List _getDayHeaders(TextStyle headerStyle, MaterialLocalizations localizations) { final List result = []; - for (int i = localizations.firstDayOfWeekIndex; true; i = (i + 1) % 7) { + for (int i = localizations.firstDayOfWeekIndex; result.length < DateTime.daysPerWeek; i = (i + 1) % DateTime.daysPerWeek) { final String weekday = localizations.narrowWeekdays[i]; result.add(ExcludeSemantics( child: Center(child: Text(weekday, style: headerStyle)), )); - if (i == (localizations.firstDayOfWeekIndex - 1) % 7) { - break; - } } return result; } @@ -2512,13 +2509,9 @@ class _MonthItemState extends State<_MonthItem> { final double gridHeight = weeks * _monthItemRowHeight + (weeks - 1) * _monthItemSpaceBetweenRows; final List dayItems = []; - for (int i = 0; true; i += 1) { - // 1-based day of month, e.g. 1-31 for January, and 1-29 for February on - // a leap year. - final int day = i - dayOffset + 1; - if (day > daysInMonth) { - break; - } + // 1-based day of month, e.g. 1-31 for January, and 1-29 for February on + // a leap year. + for (int day = 0 - dayOffset + 1; day <= daysInMonth; day += 1) { if (day < 1) { dayItems.add(Container()); } else { diff --git a/packages/flutter/lib/src/rendering/viewport.dart b/packages/flutter/lib/src/rendering/viewport.dart index 44876d8326..66560c8521 100644 --- a/packages/flutter/lib/src/rendering/viewport.dart +++ b/packages/flutter/lib/src/rendering/viewport.dart @@ -1830,7 +1830,7 @@ class RenderShrinkWrappingViewport extends RenderViewportBase { } ddsEnabled = !boolArg('disable-dds'); // TODO(ianh): enable the following code once google3 is migrated away from --disable-dds (and add test to flutter_command_test.dart) - if (false) { // ignore: dead_code + if (false) { // ignore: dead_code, literal_only_boolean_expressions if (ddsEnabled) { globals.printWarning('${globals.logger.terminal .warningMark} The "--no-disable-dds" argument is deprecated and redundant, and should be omitted.');