From c6f7bacb94062b437432ba224b0b327162ae286e Mon Sep 17 00:00:00 2001 From: devmil Date: Tue, 14 Jan 2025 20:09:47 +0100 Subject: [PATCH] bump analyzer version to ^7.0.0 --- .../api_relevant_elements_collector.dart | 22 +++++++++---------- pubspec.yaml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/src/analyze/api_relevant_elements_collector.dart b/lib/src/analyze/api_relevant_elements_collector.dart index 7b1dfdc..5b341e6 100644 --- a/lib/src/analyze/api_relevant_elements_collector.dart +++ b/lib/src/analyze/api_relevant_elements_collector.dart @@ -90,7 +90,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { void _onTypeUsed(DartType type, Element referringElement, {required TypeUsageKind typeUsageKind}) { - final directElement = type.element2; + final directElement = type.element; final directElementLibrary = directElement?.library; if (directElement == null || directElementLibrary == null) { return; @@ -203,7 +203,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { // (like Enum constructors) if (element is ConstructorElement) { // constructors of enums aren't collected - if (element.enclosingElement is EnumElement) { + if (element.enclosingElement3 is EnumElement) { return false; } } @@ -292,7 +292,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { rootPath: _context.rootPath, )); super.visitFieldElement(element); - if (element.type.element2 != null) { + if (element.type.element != null) { bool canBeSet = !element.isFinal && !element.isConst && !element.isPrivate && @@ -319,7 +319,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { rootPath: _context.rootPath, )); super.visitTopLevelVariableElement(element); - if (element.type.element2 != null) { + if (element.type.element != null) { bool canBeSet = !element.isFinal && !element.isConst && !element.isPrivate; _onTypeUsed(element.type, element, typeUsageKind: TypeUsageKind.output); @@ -334,11 +334,11 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { _onVisitAnyElement(element); super.visitParameterElement(element); // exclude parameters for fields and properties as they are handled separately - if (element.enclosingElement is PropertyAccessorElement) { + if (element.enclosingElement3 is PropertyAccessorElement) { return; } // this includes method, function and constructor calls - if (element.type.element2 != null) { + if (element.type.element != null) { _onTypeUsed(element.type, element, typeUsageKind: TypeUsageKind.input); } } @@ -358,7 +358,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { rootPath: _context.rootPath, )); super.visitMethodElement(element); - if (element.returnType.element2 != null) { + if (element.returnType.element != null) { _onTypeUsed(element.returnType, element, typeUsageKind: TypeUsageKind.output); } @@ -380,7 +380,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { rootPath: _context.rootPath, )); super.visitFunctionElement(element); - if (element.returnType.element2 != null) { + if (element.returnType.element != null) { _onTypeUsed(element.returnType, element, typeUsageKind: TypeUsageKind.output); } @@ -421,7 +421,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { rootPath: _context.rootPath, )); super.visitTypeAliasElement(element); - if (element.aliasedType.element2 != null) { + if (element.aliasedType.element != null) { _onTypeUsed(element.aliasedType, element, typeUsageKind: TypeUsageKind.hierarchy); } @@ -431,7 +431,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { visitTypeParameterElement(TypeParameterElement element) { _onVisitAnyElement(element); super.visitTypeParameterElement(element); - if (element.bound?.element2 != null) { + if (element.bound?.element != null) { _onTypeUsed(element.bound!, element, typeUsageKind: TypeUsageKind.hierarchy); } @@ -455,7 +455,7 @@ class APIRelevantElementsCollector extends RecursiveElementVisitor { namespace: _context.namespace, rootPath: _context.rootPath, )); - if (element.extendedType.element2 != null) { + if (element.extendedType.element != null) { _onTypeUsed(element.extendedType, element, typeUsageKind: TypeUsageKind.hierarchy); } diff --git a/pubspec.yaml b/pubspec.yaml index 9127b01..eece93e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - analyzer: ^6.9.0 + analyzer: ^7.0.0 args: ^2.3.1 collection: ^1.19.0 colorize: ^3.0.0