fix(lint): make the analyzer actually enforce the declared lint rules

claude · claude · commit 0d17f37cee2d · 2026-08-10T19:34:12.000Z
`mise-tasks/analyze.sh` ran `flutter analyze --no-fatal-infos`, so only the seven rules promoted to `warning` in `analysis_options.yaml` could fail. Everything else — including `prefer_const_constructors` and `prefer_single_quotes`, which AGENTS.md advertised as enforced — was advisory, and 9 live violations had already accumulated. Drop the flag so every declared rule is fatal, and turn on the three strict analyzer modes plus four lint rules the code already satisfied, so that property is held rather than merely observed: - `strict-inference`, `strict-raw-types` (alongside existing `strict-casts`) - `avoid_dynamic_calls`, `unawaited_futures`, `use_super_parameters`, `prefer_relative_imports` Fixing the resulting 50 findings is mechanical and behaviour-preserving: explicit type arguments on collection literals and `PopupMenuButton`, `Future<void>.delayed`, null-aware map elements, `unawaited(...)` on fire-and-forget futures, and `const` where it was already implied. Note the issue measured only `lib/` — all 50 remaining findings were in `test/`, and `lib/` needed just the six one-line fixes it predicted. Fixes #524
diff --git a/.claude/skills/build-and-env/SKILL.md b/.claude/skills/build-and-env/SKILL.md
@@ -43,7 +43,7 @@ different version than CI. Always `./bin/mise run <task>` or
    task triggers `flutter pub get` automatically.
 2. `generate` — `dart run build_runner build --delete-conflicting-outputs`,
    producing `.mocks.dart` files consumed by `analyze`/`test`.
-3. `flutter analyze --no-fatal-infos` and `flutter test`.
+3. `flutter analyze` and `flutter test`.
 
 Installation of `flutter=3.44.0`, `node=22`, `shellcheck=0.9.0`, `shfmt=3.8.0`
 (`mise.toml:18-22`) happens transparently the first time any task needs them —
@@ -219,7 +219,7 @@ Currently every task under `analyze`, `test`, `coverage`, `dev`,
 |---|---|---|
 | `flutter pub get` | automatic (`[deps.flutter] auto=true`) | none |
 | `dart run build_runner build --delete-conflicting-outputs` | `./bin/mise run generate` | none |
-| `flutter analyze --no-fatal-infos` | `./bin/mise run analyze` | none |
+| `flutter analyze` | `./bin/mise run analyze` | none |
 | `flutter test --coverage` | `./bin/mise run coverage` | none |
 | `flutter test` | `./bin/mise run test` | none |
 | `flutter build web --release --base-href "/" --source-maps` + 5 `--dart-define`s | `MISE_ENV=dev ./bin/mise run build:web:prod` | **mise's `build:web:prod` (`mise-tasks/build/web/prod.sh`) does NOT pass `--source-maps`** — CI adds it, builds, then strips the `.map` file into a separate artifact before uploading the web build. Run the `flutter build web ... --source-maps` command by hand (see AGENTS.md "Debugging Flutter Web Crashes") when you need a local source map. |
diff --git a/.claude/skills/diagnostics-and-tooling/SKILL.md b/.claude/skills/diagnostics-and-tooling/SKILL.md
@@ -19,7 +19,7 @@ like the bug" — grep the log, decode the stack, read the coverage line.
 
 `./bin/mise run test [path]` and `./bin/mise run analyze [path]` are thin
 wrappers (`mise-tasks/test.sh`, `mise-tasks/analyze.sh`) around `flutter test`
-/ `flutter analyze --no-fatal-infos`. Both:
+/ `flutter analyze`. Both:
 
 1. Print a log path FIRST, before running anything: `TEST_LOG=/tmp/test-XXXXXX.log`
    or `ANALYZE_LOG=/tmp/analyze-XXXXXX.log` (mktemp-generated).
@@ -62,8 +62,8 @@ ANALYZE_LOG=/tmp/my-analyze.log ./bin/mise run analyze lib/screens/
   N.Ns)` (good — verified live against `lib/utils/` and `lib/constants/`), or
   one line per finding, bullet-separated:
   `  info • <message> • <file>:<line>:<col> • <lint_rule_name>`
-  (severity is `info`, `warning`, or `error`; `--no-fatal-infos` means `info`
-  findings don't fail the task, `warning`/`error` do).
+  (severity is `info`, `warning`, or `error`; since #524 the task runs
+  without `--no-fatal-infos`, so **every** severity fails it).
 
 ### Env override reference
 
@@ -315,9 +315,8 @@ severities, not just the pass/fail:
 grep -n 'warning\|error' "$ANALYZE_LOG"   # path printed by the task
 ```
 
-A clean run with zero `warning`/`error` lines (infos are non-fatal, per
-`--no-fatal-infos`) is the closest thing to a "not too complex" signal this
-repo has.
+A clean run with zero findings at any severity is the closest thing to a
+"not too complex" signal this repo has.
 
 ---
 
diff --git a/.claude/skills/validation-and-qa/SKILL.md b/.claude/skills/validation-and-qa/SKILL.md
@@ -542,7 +542,7 @@ to paint that delegation line green.
 |---|---|---|
 | Coverage (project) | ≥70%, 1% threshold | `codecov.yml` `coverage.status.project.default` |
 | Coverage (patch) | ≥70%, 1% threshold | `codecov.yml` `coverage.status.patch.default` |
-| Analyzer | clean at `flutter analyze --no-fatal-infos` | CI `analyze` job / `./bin/mise run analyze` |
+| Analyzer | clean at `flutter analyze` — infos are fatal too (#524) | CI `analyze` job / `./bin/mise run analyze` |
 | Dart format | `dart format --output=none --set-exit-if-changed .` | CI `fmt` job (`dart:format:check`) |
 | Prettier (JS/TS) | `prettier --check` | CI `fmt` job |
 | Shell scripts | `shfmt -d` clean | CI `fmt` job |
diff --git a/AGENTS.md b/AGENTS.md
@@ -200,7 +200,9 @@ Container(
 )
 ```
 
-**Linter rules enforced** (among others): `prefer_const_constructors`, `prefer_const_declarations`, `prefer_final_locals`, `prefer_final_fields`, `avoid_print`, `prefer_single_quotes`, `sort_child_properties_last`, `use_key_in_widget_constructors`.
+**Linter rules enforced** — `analyze` runs `flutter analyze` *without* `--no-fatal-infos`, so **every** rule in `analysis_options.yaml` fails the build, at any severity. There are no advisory lints. Among them: `prefer_const_constructors`, `prefer_const_declarations`, `prefer_final_locals`, `prefer_final_fields`, `avoid_print`, `prefer_single_quotes`, `sort_child_properties_last`, `use_key_in_widget_constructors`, `use_super_parameters`, `unawaited_futures`, `avoid_dynamic_calls`, `prefer_relative_imports`.
+
+The analyzer also runs in `strict-casts`, `strict-inference` and `strict-raw-types` mode. In practice that means: no bare `[]` / `{}` literal whose element type can't be inferred (write `<Map<String, dynamic>>[]`), no raw generic type (`PopupMenuButton` → `PopupMenuButton<String>`), and every `Future` either `await`ed or wrapped in `unawaited(...)` — in tests too. This applies to `test/` exactly as it does to `lib/`.
 
 ### Patterns
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -3,6 +3,8 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   language:
     strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
   errors:
     dead_code: error
     unused_element: warning
@@ -26,3 +28,10 @@ linter:
     cascade_invocations: true
     require_trailing_commas: true
     unnecessary_lambdas: true
+    use_super_parameters: true
+    # Async correctness — every future is awaited or explicitly unawaited()
+    unawaited_futures: true
+    # Type safety
+    avoid_dynamic_calls: true
+    # Imports
+    prefer_relative_imports: true
diff --git a/lib/screens/about_screen.dart b/lib/screens/about_screen.dart
@@ -459,7 +459,7 @@ class _AboutScreenState extends State<AboutScreen> {
   }
 
   void _showThemeSelector(BuildContext context, BeerProvider provider) {
-    showModalBottomSheet(
+    showModalBottomSheet<void>(
       context: context,
       builder: (context) => ThemeSelectorSheet(provider: provider),
     );
diff --git a/lib/screens/drink_detail_screen.dart b/lib/screens/drink_detail_screen.dart
@@ -97,7 +97,7 @@ class _DrinkDetailScreenState extends State<DrinkDetailScreen>
   Future<void> _logTasting(BeerProvider provider, Drink drink) async {
     final messenger = _messengerKey.currentState;
     unawaited(HapticFeedback.mediumImpact());
-    _pulseController.forward(from: 0);
+    unawaited(_pulseController.forward(from: 0));
 
     // addTasting returns the exact timestamp it logged, so Undo removes that
     // precise pour rather than guessing at the newest event.
diff --git a/lib/widgets/drink_filter_sheets.dart b/lib/widgets/drink_filter_sheets.dart
@@ -24,7 +24,7 @@ void showVisibilityFilter(BuildContext context) =>
     _showSheet(context, (_) => const VisibilityFilterSheet());
 
 void _showSheet(BuildContext context, WidgetBuilder builder) {
-  showModalBottomSheet(
+  showModalBottomSheet<void>(
     context: context,
     isScrollControlled: true,
     builder: builder,
diff --git a/lib/widgets/festival_menu_sheets.dart b/lib/widgets/festival_menu_sheets.dart
@@ -18,7 +18,7 @@ void showFestivalBrowser(BuildContext context) {
   } catch (_) {
     // GoRouterState unavailable (e.g., in tests)
   }
-  showModalBottomSheet(
+  showModalBottomSheet<void>(
     context: context,
     isScrollControlled: true,
     builder: (context) =>
@@ -29,7 +29,7 @@ void showFestivalBrowser(BuildContext context) {
 /// Shows the settings modal with theme selector
 void showSettingsSheet(BuildContext context) {
   final provider = context.read<BeerProvider>();
-  showModalBottomSheet(
+  showModalBottomSheet<void>(
     context: context,
     builder: (context) => SettingsSheet(provider: provider),
   );
@@ -477,7 +477,7 @@ class SettingsSheet extends StatelessWidget {
   }
 
   void _showThemeSelector(BuildContext context, BeerProvider provider) {
-    showModalBottomSheet(
+    showModalBottomSheet<void>(
       context: context,
       builder: (context) => ThemeSelectorSheet(provider: provider),
     );
diff --git a/mise-tasks/analyze.sh b/mise-tasks/analyze.sh
@@ -5,7 +5,7 @@
 set -uo pipefail
 ANALYZE_LOG="${ANALYZE_LOG:-$(mktemp /tmp/analyze-XXXXXX.log)}"
 echo "ANALYZE_LOG=$ANALYZE_LOG"
-flutter analyze --no-fatal-infos "$@" 2>&1 |
+flutter analyze "$@" 2>&1 |
 	grep -v -E "Woah! You appear|superuser privileges" |
 	tee "$ANALYZE_LOG"
 EXIT_CODE=${PIPESTATUS[0]}
diff --git a/test/beer_api_service_test.dart b/test/beer_api_service_test.dart
@@ -182,7 +182,9 @@ void main() {
           availableBeverageTypes: ['beer'],
         );
 
-        final responseBody = json.encode({'producers': []});
+        final responseBody = json.encode({
+          'producers': <Map<String, dynamic>>[],
+        });
 
         when(
           mockClient.get(Uri.parse('https://example.com/beer.json')),
diff --git a/test/beer_provider_test.dart b/test/beer_provider_test.dart
@@ -25,14 +25,14 @@ List<Drink> createSampleDrinks() {
     'id': 'brewery-1',
     'name': 'Test Brewery',
     'location': 'Cambridge',
-    'products': [],
+    'products': <Map<String, dynamic>>[],
   });
 
   final producer2 = Producer.fromJson({
     'id': 'brewery-2',
     'name': 'Another Brewery',
     'location': 'London',
-    'products': [],
+    'products': <Map<String, dynamic>>[],
   });
 
   final product1 = Product.fromJson({
@@ -1042,7 +1042,7 @@ void main() {
           'id': 'brewery-1',
           'name': 'Test Brewery',
           'location': 'Cambridge',
-          'products': [],
+          'products': <Map<String, dynamic>>[],
         });
 
         final availableDrink = Drink(
@@ -1121,7 +1121,7 @@ void main() {
             'id': 'brewery-1',
             'name': 'Test Brewery',
             'location': 'Cambridge',
-            'products': [],
+            'products': <Map<String, dynamic>>[],
           });
 
           final availableDrink = Drink(
@@ -1400,7 +1400,7 @@ void main() {
           'id': 'brewery-1',
           'name': 'Test Brewery',
           'location': 'Cambridge',
-          'products': [],
+          'products': <Map<String, dynamic>>[],
         });
         final drinks = [
           Drink(product: veganProduct, producer: producer, festivalId: 'test'),
@@ -1446,7 +1446,7 @@ void main() {
           'id': 'brewery-1',
           'name': 'Test Brewery',
           'location': 'Cambridge',
-          'products': [],
+          'products': <Map<String, dynamic>>[],
         });
         glutenDrink = Drink(
           product: Product.fromJson({
@@ -1479,7 +1479,7 @@ void main() {
             'category': 'beer',
             'dispense': 'cask',
             'abv': '4.0',
-            'allergens': {},
+            'allergens': <String, int>{},
           }),
           producer: producer,
           festivalId: 'test',
@@ -2138,13 +2138,13 @@ void main() {
             'id': 'brewery-a',
             'name': 'Brewery A',
             'location': 'City',
-            'products': [],
+            'products': <Map<String, dynamic>>[],
           });
           final producerB = Producer.fromJson({
             'id': 'brewery-b',
             'name': 'Brewery B',
             'location': 'City',
-            'products': [],
+            'products': <Map<String, dynamic>>[],
           });
           final drinkA = Drink(
             product: Product.fromJson({
@@ -2175,7 +2175,7 @@ void main() {
           ) async {
             final festival = invocation.positionalArguments[0] as Festival;
             if (festival.id == 'cbf2024') {
-              await Future.delayed(const Duration(milliseconds: 100));
+              await Future<void>.delayed(const Duration(milliseconds: 100));
               return [drinkA];
             }
             return [drinkB];
@@ -2311,7 +2311,7 @@ void main() {
         when(mockDrinkRepository.getDrinks(any)).thenAnswer((_) async {
           loadCallCount++;
           // Simulate slow network
-          await Future.delayed(const Duration(milliseconds: 100));
+          await Future<void>.delayed(const Duration(milliseconds: 100));
           return createSampleDrinks();
         });
 
diff --git a/test/domain/controllers/drink_filter_controller_test.dart b/test/domain/controllers/drink_filter_controller_test.dart
@@ -30,16 +30,16 @@ Drink _drink({
     'id': 'brewery-$breweryName',
     'name': breweryName,
     'location': 'Cambridge',
-    'products': const [],
+    'products': const <Map<String, dynamic>>[],
   });
   final product = Product.fromJson({
     'id': id,
     'name': name,
     'category': category,
-    if (style != null) 'style': style,
+    'style': ?style,
     'dispense': 'cask',
     'abv': abv,
-    if (notes != null) 'notes': notes,
+    'notes': ?notes,
     if (allergens.isNotEmpty) 'allergens': allergens,
   });
   return Drink(
diff --git a/test/domain/controllers/user_drink_state_controller_test.dart b/test/domain/controllers/user_drink_state_controller_test.dart
@@ -25,7 +25,7 @@ Drink _drink({required String id, UserDrinkState? userState}) {
     'id': 'brewery-1',
     'name': 'Test Brewery',
     'location': 'Cambridge',
-    'products': const [],
+    'products': const <Map<String, dynamic>>[],
   });
   final product = Product.fromJson({
     'id': id,
diff --git a/test/domain/services/drink_filter_service_test.dart b/test/domain/services/drink_filter_service_test.dart
@@ -16,14 +16,14 @@ void main() {
         'id': 'brewery-1',
         'name': 'Alpha Brewery',
         'location': 'Cambridge',
-        'products': [],
+        'products': <Map<String, dynamic>>[],
       });
 
       final producer2 = Producer.fromJson({
         'id': 'brewery-2',
         'name': 'Beta Cidery',
         'location': 'London',
-        'products': [],
+        'products': <Map<String, dynamic>>[],
       });
 
       final product1 = Product.fromJson({
@@ -65,7 +65,7 @@ void main() {
         'notes': 'Sweet and fruity',
         'status_text': 'Sold Out',
         'is_vegan': true,
-        'allergens': {},
+        'allergens': <String, int>{},
       });
 
       final product5 = Product.fromJson({
@@ -325,7 +325,7 @@ void main() {
             'category': 'beer',
             'dispense': 'cask',
             'abv': '4.0',
-            'allergens': {},
+            'allergens': <String, int>{},
           }),
           producer: producer,
           festivalId: 'test',
@@ -570,7 +570,7 @@ void main() {
             'category': 'beer',
             'dispense': 'cask',
             'abv': '4.0',
-            'allergens': {},
+            'allergens': <String, int>{},
           }),
           producer: producer,
           festivalId: 'test',
diff --git a/test/domain/services/drink_sort_service_test.dart b/test/domain/services/drink_sort_service_test.dart
@@ -16,14 +16,14 @@ void main() {
         'id': 'brewery-1',
         'name': 'Zeta Brewery',
         'location': 'Cambridge',
-        'products': [],
+        'products': <Map<String, dynamic>>[],
       });
 
       final producer2 = Producer.fromJson({
         'id': 'brewery-2',
         'name': 'Alpha Brewery',
         'location': 'London',
-        'products': [],
+        'products': <Map<String, dynamic>>[],
       });
 
       final product1 = Product.fromJson({
diff --git a/test/domain/services/search_match_service_test.dart b/test/domain/services/search_match_service_test.dart
@@ -112,7 +112,7 @@ void main() {
     });
 
     test('windows a long field with ellipses around the match', () {
-      final longText =
+      const longText =
           'The quick brown fox jumps over the lazy dog before finding '
           'a hidden treasure buried deep beneath the ancient oak tree.';
       final drink = createDrink(description: longText);
diff --git a/test/drinks_screen_scroll_position_test.dart b/test/drinks_screen_scroll_position_test.dart
@@ -34,7 +34,7 @@ List<Drink> createSampleDrinks(int count) {
     'id': 'brewery-1',
     'name': 'Test Brewery',
     'location': 'Cambridge',
-    'products': [],
+    'products': <Map<String, dynamic>>[],
   });
 
   return List.generate(count, (i) {
diff --git a/test/drinks_screen_style_filter_test.dart b/test/drinks_screen_style_filter_test.dart
@@ -573,7 +573,7 @@ void main() {
         analyticsService: mockAnalyticsService,
       );
       await provider.initialize();
-      provider.loadDrinks(); // intentionally not awaited
+      unawaited(provider.loadDrinks()); // intentionally not awaited
 
       await tester.pumpWidget(
         ChangeNotifierProvider<BeerProvider>.value(
diff --git a/test/models_test.dart b/test/models_test.dart
diff --git a/test/router_test.dart b/test/router_test.dart
diff --git a/test/widgets/drink_card_test.dart b/test/widgets/drink_card_test.dart
diff --git a/test/widgets/festival_menu_sheets_test.dart b/test/widgets/festival_menu_sheets_test.dart
diff --git a/test/widgets/overflow_menu_test.dart b/test/widgets/overflow_menu_test.dart
diff --git a/test/widgets/your_take_card_test.dart b/test/widgets/your_take_card_test.dart

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,9 @@ Container(`
`200`	`200`	`)`
`201`	`201`	```
`202`	`202`
`203`		-Linter rules enforced (among others): `prefer_const_constructors`, `prefer_const_declarations`, `prefer_final_locals`, `prefer_final_fields`, `avoid_print`, `prefer_single_quotes`, `sort_child_properties_last`, `use_key_in_widget_constructors`.
	`203`	+Linter rules enforced — `analyze` runs `flutter analyze` without `--no-fatal-infos`, so every rule in `analysis_options.yaml` fails the build, at any severity. There are no advisory lints. Among them: `prefer_const_constructors`, `prefer_const_declarations`, `prefer_final_locals`, `prefer_final_fields`, `avoid_print`, `prefer_single_quotes`, `sort_child_properties_last`, `use_key_in_widget_constructors`, `use_super_parameters`, `unawaited_futures`, `avoid_dynamic_calls`, `prefer_relative_imports`.
	`204`	`+`
	`205`	+The analyzer also runs in `strict-casts`, `strict-inference` and `strict-raw-types` mode. In practice that means: no bare `[]` / `{}` literal whose element type can't be inferred (write `<Map<String, dynamic>>[]`), no raw generic type (`PopupMenuButton` → `PopupMenuButton<String>`), and every `Future` either `await`ed or wrapped in `unawaited(...)` — in tests too. This applies to `test/` exactly as it does to `lib/`.
`204`	`206`
`205`	`207`	`### Patterns`
`206`	`208`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ class _AboutScreenState extends State<AboutScreen> {`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`void _showThemeSelector(BuildContext context, BeerProvider provider) {`
`462`		`- showModalBottomSheet(`
	`462`	`+ showModalBottomSheet<void>(`
`463`	`463`	`context: context,`
`464`	`464`	`builder: (context) => ThemeSelectorSheet(provider: provider),`
`465`	`465`	`);`