Version 2.19.0-36.0.dev

Merge commit '4359108a8bb2c3939b84ccbadbec070e1a78fbb3' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/services/correction/dart/add_diagnostic_property_reference.dart

@@ -12,6 +12,7 @@ import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
+import 'package:collection/collection.dart';
 
 class AddDiagnosticPropertyReference extends CorrectionProducer {
   @override
@@ -113,8 +114,10 @@ class AddDiagnosticPropertyReference extends CorrectionProducer {
       builder.writeln("$constructorName('${node.name}', ${node.name}));");
     }
 
-    final debugFillProperties =
-        classDeclaration.getMethod('debugFillProperties');
+    final debugFillProperties = classDeclaration.members
+        .whereType<MethodDeclaration>()
+        .where((e) => e.name.name == 'debugFillProperties')
+        .singleOrNull;
     if (debugFillProperties == null) {
       var location = utils.prepareNewMethodLocation(classDeclaration);
       if (location == null) {

pkg/analyzer/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## 4.4.0-dev
 * Deprecated `ClassDeclaration.isAbstract`, use `abstractKeyword` instead.
 * Deprecated `ClassTypeAlias.isAbstract`, use `abstractKeyword` instead.
+* Deprecated `ClassOrMixinDeclaration.getField`, filter `members` instead.
+* Deprecated `ClassOrMixinDeclaration.getMethod`, filter `members` instead.
+* Deprecated `ClassDeclaration.getConstructor`, filter `members` instead.
 
 ## 4.3.1
 * Fix `identifier` for `LibraryExportElement` and `LibraryImportElement`.

pkg/analyzer/lib/dart/ast/ast.dart

@@ -860,6 +860,7 @@ abstract class ClassDeclaration implements ClassOrMixinDeclaration {
   ///
   /// If the [name] is `null` then the default constructor will be searched
   /// for.
+  @Deprecated('Filter members instead')
   ConstructorDeclaration? getConstructor(String? name);
 }
 
@@ -900,10 +901,12 @@ abstract class ClassOrMixinDeclaration implements NamedCompilationUnitMember {
 
   /// Returns the field declared in the class/mixin with the given [name], or
   /// `null` if there is no such field.
+  @Deprecated('Filter members instead')
   VariableDeclaration? getField(String name);
 
   /// Returns the method declared in the class/mixin with the given [name], or
   /// `null` if there is no such method.
+  @Deprecated('Filter members instead')
   MethodDeclaration? getMethod(String name);
 }
 

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -1699,6 +1699,7 @@ class ClassDeclarationImpl extends ClassOrMixinDeclarationImpl
   @override
   E? accept<E>(AstVisitor<E> visitor) => visitor.visitClassDeclaration(this);
 
+  @Deprecated('Filter members instead')
   @override
   ConstructorDeclaration? getConstructor(String? name) {
     int length = _members.length;
@@ -1795,6 +1796,7 @@ abstract class ClassOrMixinDeclarationImpl
     _typeParameters = _becomeParentOf(typeParameters as TypeParameterListImpl?);
   }
 
+  @Deprecated('Filter members instead')
   @override
   VariableDeclaration? getField(String name) {
     int memberLength = _members.length;
@@ -1816,6 +1818,7 @@ abstract class ClassOrMixinDeclarationImpl
     return null;
   }
 
+  @Deprecated('Filter members instead')
   @override
   MethodDeclaration? getMethod(String name) {
     int length = _members.length;

pkg/analyzer/test/dart/ast/ast_test.dart

@@ -42,6 +42,7 @@ main() {
 
 @reflectiveTest
 class ClassDeclarationTest extends ParserTestCase {
+  @Deprecated('Filter members instead')
   void test_getConstructor() {
     List<ConstructorInitializer> initializers = <ConstructorInitializer>[];
     ConstructorDeclaration defaultConstructor =
@@ -69,6 +70,7 @@ class ClassDeclarationTest extends ParserTestCase {
     expect(clazz.getConstructor("noSuchConstructor"), isNull);
   }
 
+  @Deprecated('Filter members instead')
   void test_getField() {
     VariableDeclaration aVar = AstTestFactory.variableDeclaration("a");
     VariableDeclaration bVar = AstTestFactory.variableDeclaration("b");
@@ -85,6 +87,7 @@ class ClassDeclarationTest extends ParserTestCase {
     expect(clazz.getField("noSuchField"), isNull);
   }
 
+  @Deprecated('Filter members instead')
   void test_getMethod() {
     MethodDeclaration aMethod = AstTestFactory.methodDeclaration(
         null,

pkg/analyzer/test/generated/nnbd_parser_test.dart

@@ -390,7 +390,7 @@ class Foo {
 ''');
     var classDeclaration = unit.declarations.first as ClassDeclaration;
     var constructor =
-        classDeclaration.getConstructor(null) as ConstructorDeclaration;
+        classDeclaration.members.whereType<ConstructorDeclaration>().single;
 
     // Object? o
     var parameter =
@@ -436,7 +436,7 @@ class Foo {
 ''');
     var classDeclaration = unit.declarations.first as ClassDeclaration;
     var constructor =
-        classDeclaration.getConstructor(null) as ConstructorDeclaration;
+        classDeclaration.members.whereType<ConstructorDeclaration>().single;
 
     // Object? o
     var parameter =
@@ -489,7 +489,7 @@ class Foo {
 ''');
     var classDeclaration = unit.declarations.first as ClassDeclaration;
     var constructor =
-        classDeclaration.getConstructor(null) as ConstructorDeclaration;
+        classDeclaration.members.whereType<ConstructorDeclaration>().single;
 
     // Object? o
     var parameter =

pkg/analyzer_plugin/test/utilities/range_factory_test.dart

@@ -198,7 +198,7 @@ class RangeFactory_NodeInListTest extends AbstractSingleUnitTest {
   /// return the list of initializers in that constructor.
   NodeList<ConstructorInitializer> get _constructorInitializers {
     var c = testUnit.declarations[0] as ClassDeclaration;
-    var constructor = c.getConstructor(null) as ConstructorDeclaration;
+    var constructor = c.members.whereType<ConstructorDeclaration>().single;
     return constructor.initializers;
   }
 

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 35
+PRERELEASE 36
 PRERELEASE_PATCH 0