From 714b2fdc3734e1a4177c67275c80a08d597b0325 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sat, 5 Apr 2025 12:50:33 +0200 Subject: [PATCH] Fix diagnostics (#1226) --- .github/workflows/build.yml | 5 ++--- packages/freezed/CHANGELOG.md | 1 + packages/freezed/example/lib/diagnosticable.dart | 4 +--- packages/freezed/lib/src/templates/abstract_template.dart | 6 ++++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c15855d..3aca38c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,12 +17,11 @@ jobs: matrix: package: - packages/freezed + - packages/freezed/example - packages/freezed_annotation - packages/freezed_lint channel: - master - # BLocked by https://github.com/dart-lang/source_gen/issues/739 - # - stable dependencies: - get - downgrade @@ -38,7 +37,7 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: ${{ matrix.channel }} - cache: ${{ matrix.channel == 'stable' }} + cache: ${{ matrix.channel == 'master' }} # It is executed separately - name: Removing example folder diff --git a/packages/freezed/CHANGELOG.md b/packages/freezed/CHANGELOG.md index c9b68f5..d2e5c93 100644 --- a/packages/freezed/CHANGELOG.md +++ b/packages/freezed/CHANGELOG.md @@ -2,6 +2,7 @@ - Fix ==/hashCode when using inheritance. The generated ==/hashCode now call `super == other` when necessary. +- Fix an issue with `Diagnosticable` and `toString` ## 3.0.4 - 2025-03-16 diff --git a/packages/freezed/example/lib/diagnosticable.dart b/packages/freezed/example/lib/diagnosticable.dart index 6a61c77..45756ce 100644 --- a/packages/freezed/example/lib/diagnosticable.dart +++ b/packages/freezed/example/lib/diagnosticable.dart @@ -25,7 +25,5 @@ abstract class ToString with _$ToString { factory ToString() = _ToString; @override - String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) { - return 'MyToString()'; - } + String toString() => 'MyToString()'; } diff --git a/packages/freezed/lib/src/templates/abstract_template.dart b/packages/freezed/lib/src/templates/abstract_template.dart index d112b9d..c89a2b0 100644 --- a/packages/freezed/lib/src/templates/abstract_template.dart +++ b/packages/freezed/lib/src/templates/abstract_template.dart @@ -33,8 +33,10 @@ class Abstract { .expand((e) => [e.abstractGetter, if (!e.isFinal) e.abstractSetter]) .join(); - var interfaces = - [if (globalData.hasDiagnostics) 'DiagnosticableTreeMixin'].join(); + var interfaces = [ + if (globalData.hasDiagnostics && data.options.asString) + 'DiagnosticableTreeMixin' + ].join(); if (interfaces.isNotEmpty) interfaces = ' implements $interfaces'; return '''