Merge branch 'master' of https://github.com/rrousselGit/freezed

Author: rrousselGit

.github/workflows/build.yml

@@ -22,7 +22,8 @@ jobs:
           # Disabled until custom_lint is removed
           # - packages/freezed_lint
         channel:
-          - stable
+          # - stable
+          - master
         dependencies:
           - get
           - downgrade
@@ -54,7 +55,7 @@ jobs:
 
       - name: Check format
         # Check dart format only on stable
-        if: matrix.channel == 'stable'
+        if: matrix.channel == 'master'
         run: dart format --set-exit-if-changed .
         working-directory: ${{ matrix.package }}
 
@@ -71,7 +72,7 @@ jobs:
 
       - name: Run tests
         run: |
-          if grep -q "name: example" "pubspec.yaml"; then
+          if grep -q "name: freezed_example" "pubspec.yaml"; then
             flutter test
           else
             dart test

.gitignore

@@ -2,4 +2,5 @@
 *.iml
 build/
 node_modules
-/package-lock.json
+/package-lock.json
+.dart_tool

packages/freezed/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Unreleased 3.2.6-dev.1
+
+Support analyzer 12.0
+
 ## 3.2.5 - 2026-02-03
 
 Support analyzer 10.0

packages/freezed/example/pubspec.yaml

@@ -19,6 +19,8 @@ dev_dependencies:
   build_runner:
   flutter_test:
     sdk: flutter
+  # To support "downgrade" checks due to a transitive dependency not handling it correctly
+  file: ">=7.0.0"
 
 dependency_overrides:
   freezed:

packages/freezed/lib/src/ast.dart

@@ -1,22 +1,18 @@
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 
 extension AstX on AstNode {
   String? get documentation {
-    final builder = StringBuffer();
-
-    for (
-      Token? token = beginToken.precedingComments;
-      token != null;
-      token = token.next
-    ) {
-      builder.writeln(token);
-    }
+    final node = switch (this) {
+      DefaultFormalParameter(:final parameter) => parameter,
+      _ => this,
+    };
 
-    if (builder.isEmpty) return null;
+    if (node case AnnotatedNode(:final documentationComment?)) {
+      return '${documentationComment.tokens.map((token) => token.lexeme).join('\n')}\n';
+    }
 
-    return builder.toString();
+    return null;
   }
 }
 

packages/freezed/lib/src/models.dart

@@ -278,7 +278,7 @@ When specifying fields in non-factory constructor then specifying factory constr
 
       _assertValidFreezedConstructorUsage(
         constructor,
-        className: declaration.name.lexeme,
+        className: declaration.namePart.typeName.lexeme,
       );
 
       final excludedProperties =
@@ -299,7 +299,7 @@ When specifying fields in non-factory constructor then specifying factory constr
       final isEjected = unitsExcludingGeneratedFiles.any(
         (e) => e.declarations
             .whereType<ClassDeclaration>()
-            .map((e) => e.name.lexeme)
+            .map((e) => e.namePart.typeName.lexeme)
             .contains(redirectedName),
       );
 
@@ -522,7 +522,7 @@ class CopyWithTarget {
 
 extension on NamedType {
   bool isSuperMixin(ClassDeclaration declaration) =>
-      name.lexeme == '_\$${declaration.name.lexeme.public}';
+      name.lexeme == '_\$${declaration.namePart.typeName.lexeme.public}';
 }
 
 class Class {
@@ -582,7 +582,7 @@ class Class {
         false;
     if (!has$ClassMixin) {
       throw InvalidGenerationSourceError(
-        'Classes using @freezed must use `with _\$${declaration.name.lexeme.public}`.',
+        'Classes using @freezed must use `with _\$${declaration.namePart.typeName.lexeme.public}`.',
         element: declaration.declaredFragment?.element,
         node: declaration,
       );
@@ -624,7 +624,7 @@ class Class {
         if (cloneableProperty == null) {
           throw InvalidGenerationSourceError(
             '''
-The class ${declaration.name.lexeme} requested a copyWith implementation, yet the parameter `${param.name}` is not cloneable.
+The class ${declaration.namePart.typeName.lexeme} requested a copyWith implementation, yet the parameter `${param.name}` is not cloneable.
 
 To fix, either:
 - Disable copyWith using @Freezed(copyWith: false)
@@ -669,7 +669,7 @@ To fix, either:
 
     return Class(
       node: declaration,
-      name: declaration.name.lexeme,
+      name: declaration.namePart.typeName.lexeme,
       copyWithTarget: copyWithInvocation,
       properties: properties,
       superCall: superCall,
@@ -1076,7 +1076,7 @@ To fix, either:
     if (!shouldUseExtends &&
         field.getter != null &&
         !field.getter!.isAbstract &&
-        !field.getter!.isSynthetic) {
+        field.getter!.isOriginDeclaration) {
       throw InvalidGenerationSourceError(
         'Getters require a MyClass._() constructor',
         element: field,
@@ -1332,14 +1332,26 @@ extension ClassDeclarationX on ClassDeclaration {
   }
 
   Iterable<ConstructorDeclaration> get constructors {
-    return members.whereType<ConstructorDeclaration>();
+    final that = body;
+    switch (that) {
+      case BlockClassBody():
+        return that.members.whereType<ConstructorDeclaration>();
+      default:
+        return const [];
+    }
   }
 
   Iterable<(FieldDeclaration, VariableDeclaration)> get properties {
-    return members
-        .whereType<FieldDeclaration>()
-        .where((e) => !e.isStatic)
-        .expand((e) => e.fields.variables.map((f) => (e, f)));
+    final that = body;
+    switch (that) {
+      case BlockClassBody():
+        return that.members
+            .whereType<FieldDeclaration>()
+            .where((e) => !e.isStatic)
+            .expand((e) => e.fields.variables.map((f) => (e, f)));
+      default:
+        return const [];
+    }
   }
 
   bool needsJsonSerializable(Library library) {

packages/freezed/pubspec.yaml

@@ -10,7 +10,7 @@ environment:
   sdk: ">=3.8.0 <4.0.0"
 
 dependencies:
-  analyzer: '>=9.0.0 <11.0.0'
+  analyzer: '>=12.0.0 <13.0.0'
   build: ">=3.0.0 <5.0.0"
   build_config: ^1.1.0
   collection: ^1.15.0
@@ -31,3 +31,6 @@ dev_dependencies:
   expect_error: ^1.0.10
   flutter:
     sdk: flutter
+
+  # To support "downgrade" checks due to a transitive dependency not handling it correctly
+  file: '>=7.0.0'

packages/freezed/test/common_types_test.dart

@@ -83,7 +83,7 @@ void main() {
     nullabilityDifference: 42,
     typeDifference: 21,
   );
-  // expect-error: UNDEFINED_GETTER
+  // expect-error: undefined_getter
   value.unknown;
 }
 '''),
@@ -120,10 +120,10 @@ void main() {
   param.copyWith(
     // Since not all unions have a nullable property, we cannot assign "null"
     // on the shared interface.
-    // expect-error: ARGUMENT_TYPE_NOT_ASSIGNABLE
+    // expect-error: argument_type_not_assignable
     nullabilityDifference: null,
     // Since not all unions use the same type, we can't clone that property at all.
-    // expect-error: UNDEFINED_NAMED_PARAMETER
+    // expect-error: undefined_named_parameter
     typeDifference: 42,
   );
 }
@@ -174,10 +174,10 @@ void main() {
   param.copyWith.value(
     // Since not all unions have a nullable property, we cannot assign "null"
     // on the shared interface.
-    // expect-error: ARGUMENT_TYPE_NOT_ASSIGNABLE
+    // expect-error: argument_type_not_assignable
     nullabilityDifference: null,
     // Since not all unions use the same type, we can't clone that property at all.
-    // expect-error: UNDEFINED_NAMED_PARAMETER
+    // expect-error: undefined_named_parameter
     typeDifference: 42,
   );
 }
@@ -204,7 +204,7 @@ import 'integration/common_types.dart';
 
 void main() {
   final param = CommonUnfreezed.one(a: 42, b: 3.14);
-  // expect-error: ASSIGNMENT_TO_FINAL_NO_SETTER
+  // expect-error: assignment_to_final_no_setter
   param.a = 42.24;
   // OK since all union cases are typed the same
   param.b = 42;

packages/freezed/test/decorator_test.dart

@@ -97,20 +97,20 @@ void main() {
       errorResult.errors.map((e) => e.errorCode.name),
       anyOf([
         [
-          'UNUSED_RESULT',
-          'UNUSED_RESULT',
-          'DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE',
-          'DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE',
-          'DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE',
-          'DEPRECATED_MEMBER_USE_FROM_SAME_PACKAGE',
+          'unused_result',
+          'unused_result',
+          'deprecated_member_use_from_same_package',
+          'deprecated_member_use_from_same_package',
+          'deprecated_member_use_from_same_package',
+          'deprecated_member_use_from_same_package',
         ],
         [
-          'UNUSED_RESULT',
-          'UNUSED_RESULT',
-          'DEPRECATED_MEMBER_USE',
-          'DEPRECATED_MEMBER_USE',
-          'DEPRECATED_MEMBER_USE',
-          'DEPRECATED_MEMBER_USE',
+          'unused_result',
+          'unused_result',
+          'deprecated_member_use',
+          'deprecated_member_use',
+          'deprecated_member_use',
+          'deprecated_member_use',
         ],
       ]),
     );

packages/freezed/test/deep_copy_test.dart

@@ -734,8 +734,8 @@ void main() {
             as ErrorsResult;
 
     expect(errorResult.errors.map((e) => e.errorCode.name), [
-      'UNUSED_RESULT',
-      'UNUSED_RESULT',
+      'unused_result',
+      'unused_result',
     ]);
   });
 }