Skip to content

Use range for analyzer version #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrousselGit merged 4 commits into from
Sep 10, 2025
Merged

Use range for analyzer version #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
260ba1b
Merge
rrousselGit Sep 10, 2025
072faa4
Revert "Handle analyzer 8 (#1300)"
rrousselGit Sep 10, 2025
5c646bc
Use range
rrousselGit Sep 10, 2025
706678a
Ignore deprecated
rrousselGit Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions analysis_options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ analyzer:
strict-raw-types: true
errors:
invalid_annotation_target: ignore
# Remove when we require analyzer >=8
deprecated_member_use: ignore

linter:
rules:
Expand Down
34 changes: 17 additions & 17 deletions packages/freezed/lib/src/ast.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';

extension AstX on AstNode {
String? get documentation {
Expand Down Expand Up @@ -28,10 +28,10 @@ extension ClassX on ClassDeclaration {
element,
...element.allSupertypes
.where((e) => !e.isDartCoreObject)
.map((e) => e.element),
.map((e) => e.element3),
]) {
for (final method in type.methods) {
if (method.name == 'toString') {
for (final method in type.methods2) {
if (method.name3 == 'toString') {
return true;
}
}
Expand All @@ -42,50 +42,50 @@ extension ClassX on ClassDeclaration {

bool get hasSuperEqual => declaredFragment!.element.allSupertypes
.where((e) => !e.isDartCoreObject)
.map((e) => e.element)
.map((e) => e.element3)
.any((e) => e.hasEqual);

bool get hasCustomEquals => declaredFragment!.element.hasEqual;

bool get hasSuperHashCode => declaredFragment!.element.allSupertypes
.where((e) => !e.isDartCoreObject)
.map((e) => e.element)
.map((e) => e.element3)
.any((e) => e.hasHashCode);
}

extension on InterfaceElement {
bool get hasEqual => methods.any(((e) => e.isOperator && e.name == '=='));
extension on InterfaceElement2 {
bool get hasEqual => methods2.any(((e) => e.isOperator && e.name3 == '=='));

bool get hasHashCode => getters.any((e) => e.name == 'hashCode');
bool get hasHashCode => getters2.any((e) => e.name3 == 'hashCode');
}

extension ConstructorX on ConstructorDeclaration {
String get fullName {
final classElement = declaredFragment!.element.enclosingElement;
final classElement = declaredFragment!.element.enclosingElement2;

var generics = classElement.typeParameters
.map((e) => '\$${e.name}')
var generics = classElement.typeParameters2
.map((e) => '\$${e.name3}')
.join(', ');
if (generics.isNotEmpty) {
generics = '<$generics>';
}

final className = classElement.enclosingElement.name;
final className = classElement.enclosingElement2.name3;

return name == null ? '$className$generics' : '$className$generics.$name';
}
Comment on lines +73 to 76
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Bug: Using library name instead of class name in fullName.

className should come from the class element, not its enclosing library.

Apply this diff:

-    final className = classElement.enclosingElement2.name3;
+    final className = classElement.name3!;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
final className = classElement.enclosingElement2.name3;
return name == null ? '$className$generics' : '$className$generics.$name';
}
final className = classElement.name3!;
return name == null ? '$className$generics' : '$className$generics.$name';
🤖 Prompt for AI Agents 
In packages/freezed/lib/src/ast.dart around lines 73 to 76, fullName is
incorrectly using the enclosing element's name (library) as className; replace
the use of classElement.enclosingElement2.name3 with the class element's own
name (classElement.name) so fullName uses the actual class name when composing
'$className$generics' or '$className$generics.$name'.


String get escapedName {
final classElement = declaredFragment!.element.enclosingElement;
final classElement = declaredFragment!.element.enclosingElement2;

var generics = classElement.typeParameters
.map((e) => '\$${e.name}')
var generics = classElement.typeParameters2
.map((e) => '\$${e.name3}')
.join(', ');
if (generics.isNotEmpty) {
generics = '<$generics>';
}

final escapedElementName = classElement.name!.replaceAll(r'$', r'\$');
final escapedElementName = classElement.name3!.replaceAll(r'$', r'\$');
final escapedConstructorName = name?.lexeme.replaceAll(r'$', r'\$');

return escapedConstructorName == null
Expand Down
87 changes: 42 additions & 45 deletions packages/freezed/lib/src/models.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/constant/value.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:collection/collection.dart';
Expand All @@ -27,7 +27,7 @@ class _Sentinel {
const _Sentinel();
}

extension on Element {
extension on Element2 {
bool get hasJsonSerializable {
return const TypeChecker.typeNamed(
JsonSerializable,
Expand All @@ -36,9 +36,9 @@ extension on Element {
}
}

extension on ConstructorElement {
extension on ConstructorElement2 {
bool isFallbackUnion(String? fallbackConstructorName) {
final constructorName = isDefaultConstructor(this) ? 'default' : name;
final constructorName = isDefaultConstructor(this) ? 'default' : name3;
return constructorName == fallbackConstructorName;
}

Expand All @@ -51,7 +51,7 @@ extension on ConstructorElement {
return annotation.getField('value')!.toStringValue()!;
}

final constructorName = isDefaultConstructor(this) ? 'default' : name!;
final constructorName = isDefaultConstructor(this) ? 'default' : name3!;
switch (unionCase) {
case null:
case FreezedUnionCase.none:
Expand Down Expand Up @@ -97,8 +97,8 @@ class DeepCloneableProperty {

final parameterType = parameter.type;
if (parameterType is! InterfaceType) continue;
final typeElement = parameterType.element;
if (typeElement is! ClassElement) continue;
final typeElement = parameterType.element3;
if (typeElement is! ClassElement2) continue;

final freezedAnnotation = freezedType.firstAnnotationOf(
typeElement,
Expand All @@ -116,10 +116,10 @@ class DeepCloneableProperty {
if (configs.copyWith == false) continue;

yield DeepCloneableProperty(
name: parameter.name!,
name: parameter.name3!,
type: type,
nullable: parameter.type.isNullable,
typeName: typeElement.name!,
typeName: typeElement.name3!,
genericParameters: GenericsParameterTemplate(
(parameter.type as InterfaceType).typeArguments
.map((e) => e.getDisplayString())
Expand Down Expand Up @@ -269,7 +269,7 @@ When specifying fields in non-factory constructor then specifying factory constr
}

final redirectedName =
constructor.redirectedConstructor?.type.name.lexeme;
constructor.redirectedConstructor?.type.name2.lexeme;

if (redirectedName == null) {
_assertValidNormalConstructorUsage(declaration, constructor);
Expand All @@ -283,7 +283,7 @@ When specifying fields in non-factory constructor then specifying factory constr

final excludedProperties =
manualConstructor?.parameters.parameters
.map((e) => e.declaredFragment!.element.name!)
.map((e) => e.declaredFragment!.element.name3!)
.toSet() ??
<String>{};

Expand Down Expand Up @@ -318,7 +318,7 @@ When specifying fields in non-factory constructor then specifying factory constr
decorators: constructor.metadata
.where((element) {
final elementSourceUri =
element.element?.baseElement.library?.uri;
element.element2?.baseElement.library2?.uri;

final isFreezedAnnotation =
elementSourceUri != null &&
Expand Down Expand Up @@ -424,7 +424,7 @@ class ImplementsAnnotation {
ImplementsAnnotation({required this.type});

static Iterable<ImplementsAnnotation> parseAll(
ConstructorElement constructor,
ConstructorElement2 constructor,
) sync* {
for (final meta in const TypeChecker.typeNamed(
Implements,
Expand All @@ -436,7 +436,7 @@ class ImplementsAnnotation {
} else {
yield ImplementsAnnotation(
type: resolveFullTypeStringFrom(
constructor.library,
constructor.library2,
(meta.type! as InterfaceType).typeArguments.single,
),
);
Expand All @@ -451,9 +451,9 @@ class WithAnnotation {
WithAnnotation({required this.type});

static Iterable<WithAnnotation> parseAll(
ConstructorElement constructor,
ConstructorElement2 constructor,
) sync* {
for (final metadata in constructor.metadata.annotations) {
for (final metadata in constructor.metadata2.annotations) {
if (!metadata.isWith) continue;
final object = metadata.computeConstantValue()!;

Expand All @@ -463,7 +463,7 @@ class WithAnnotation {
} else {
yield WithAnnotation(
type: resolveFullTypeStringFrom(
constructor.library,
constructor.library2,
(object.type! as InterfaceType).typeArguments.single,
),
);
Expand Down Expand Up @@ -522,7 +522,7 @@ class CopyWithTarget {

extension on NamedType {
bool isSuperMixin(ClassDeclaration declaration) =>
name.lexeme == '_\$${declaration.name.lexeme.public}';
name2.lexeme == '_\$${declaration.name.lexeme.public}';
}

class Class {
Expand Down Expand Up @@ -552,7 +552,7 @@ class Class {
final ClassDeclaration _node;
final Set<Class> parents = {};

LibraryElement get library => _node.declaredFragment!.element.library;
LibraryElement2 get library => _node.declaredFragment!.element.library2;

static Class _from(
ClassDeclaration declaration,
Expand All @@ -570,7 +570,7 @@ class Class {
);

if (constructors.isNotEmpty) {
for (final field in declaration.declaredFragment!.element.fields) {
for (final field in declaration.declaredFragment!.element.fields2) {
_assertValidFieldUsage(field, shouldUseExtends: privateCtor != null);
}
}
Expand Down Expand Up @@ -676,14 +676,14 @@ To fix, either:
options: configs,
constructors: constructors,
concretePropertiesName: [
for (final p in declaration.declaredFragment!.element.fields)
if (!p.isStatic) p.name!,
for (final p in declaration.declaredFragment!.element.fields2)
if (!p.isStatic) p.name3!,
],
genericsDefinitionTemplate: GenericsDefinitionTemplate.fromGenericElement(
declaration.declaredFragment!.element.typeParameters,
declaration.declaredFragment!.element.typeParameters2,
),
genericsParameterTemplate: GenericsParameterTemplate.fromGenericElement(
declaration.declaredFragment!.element.typeParameters,
declaration.declaredFragment!.element.typeParameters2,
),
);
}
Expand Down Expand Up @@ -745,7 +745,7 @@ To fix, either:
if (clazz._node.extendsClause case final extend?) extend.superclass,
...?clazz._node.implementsClause?.interfaces,
...?clazz._node.withClause?.mixinTypes,
].map((e) => e.name.lexeme);
].map((e) => e.name2.lexeme);

for (final superType in superTypes) {
final superTypeClass = classMap[superType];
Expand Down Expand Up @@ -833,10 +833,7 @@ To fix, either:
isFinal: property.$1.fields.isFinal,
isSynthetic: false,
decorators: switch (property.$1.declaredFragment?.element) {
Fragment(metadata: final metadata) ||
Element(
metadata: final metadata,
) => parseDecorators(metadata.annotations),
final Annotatable e => parseDecorators(e.metadata2.annotations),
_ => [],
},
);
Expand Down Expand Up @@ -865,9 +862,9 @@ To fix, either:
}

late final typeSystem =
declaration.declaredFragment!.element.library.typeSystem;
declaration.declaredFragment!.element.library2.typeSystem;
late final typeProvider =
declaration.declaredFragment!.element.library.typeProvider;
declaration.declaredFragment!.element.library2.typeProvider;

fieldLoop:
for (final entry in typesMap.entries) {
Expand Down Expand Up @@ -921,7 +918,7 @@ To fix, either:
isFinal = true;

typeString = resolveFullTypeStringFrom(
declaration.declaredFragment!.element.library,
declaration.declaredFragment!.element.library2,
type,
);
}
Expand Down Expand Up @@ -967,7 +964,7 @@ To fix, either:
param: parameter.name,
);

final library = parameter.parameterElement!.library!;
final library = parameter.parameterElement!.library2!;

var commonTypeBetweenAllUnionConstructors =
parameter.parameterElement!.type;
Expand Down Expand Up @@ -1064,12 +1061,12 @@ To fix, either:
}

static void _assertValidFieldUsage(
FieldElement field, {
FieldElement2 field, {
required bool shouldUseExtends,
}) {
if (field.isStatic) return;

if (field.setter != null) {
if (field.setter2 != null) {
throw InvalidGenerationSourceError(
'Classes decorated with @freezed cannot have mutable properties',
element: field,
Expand All @@ -1078,9 +1075,9 @@ To fix, either:

// The field is a "Type get name => "
if (!shouldUseExtends &&
field.getter != null &&
!field.getter!.isAbstract &&
!field.getter!.isSynthetic) {
field.getter2 != null &&
!field.getter2!.isAbstract &&
!field.getter2!.isSynthetic) {
throw InvalidGenerationSourceError(
'Getters require a MyClass._() constructor',
element: field,
Expand Down Expand Up @@ -1132,10 +1129,10 @@ class Library {
return Library(
hasJson: units.any(
(unit) =>
unit.declaredFragment!.element.library.importsJsonSerializable,
unit.declaredFragment!.element.library2.importsJsonSerializable,
),
hasDiagnostics: units.any(
(unit) => unit.declaredFragment!.element.library.importsDiagnosticable,
(unit) => unit.declaredFragment!.element.library2.importsDiagnosticable,
),
);
}
Expand Down Expand Up @@ -1360,18 +1357,18 @@ extension ClassDeclarationX on ClassDeclaration {
}
}

extension on LibraryElement {
extension on LibraryElement2 {
bool get importsJsonSerializable {
return findAllAvailableTopLevelElements().any((element) {
return element.name == 'JsonSerializable' &&
(element.library?.isFromPackage('json_annotation') ?? false);
return element.name3 == 'JsonSerializable' &&
(element.library2?.isFromPackage('json_annotation') ?? false);
});
}

bool get importsDiagnosticable {
return findAllAvailableTopLevelElements().any((element) {
return element.name == 'DiagnosticableTreeMixin' &&
(element.library?.isFromPackage('flutter') ?? false);
return element.name3 == 'DiagnosticableTreeMixin' &&
(element.library2?.isFromPackage('flutter') ?? false);
});
}
}
Expand Down
Loading