[element model] migrate avoid_types_as_parameter_names

Bug: https://github.com/dart-lang/linter/issues/5099 Change-Id: I279df798db88bec35276e5e0c66793da9d45fde0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/394601 Reviewed-by: Brian Wilkerson <[email protected]> Auto-Submit: Phil Quitslund <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
dart-lang · Nov 11, 2024 · 0095085 · 0095085
1 parent 9a76ff8
commit 0095085
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/pkg/linter/lib/src/rules/avoid_types_as_parameter_names.dart b/pkg/linter/lib/src/rules/avoid_types_as_parameter_names.dart
@@ -5,7 +5,7 @@
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 // ignore: implementation_imports
 import 'package:analyzer/src/dart/element/extensions.dart';
 
@@ -50,10 +50,10 @@ class _Visitor extends SimpleAstVisitor<void> {
   @override
   void visitFormalParameterList(FormalParameterList node) {
     for (var parameter in node.parameters) {
-      var declaredElement = parameter.declaredElement;
+      var declaredElement = parameter.declaredFragment?.element;
       var name = parameter.name;
       if (declaredElement != null &&
-          declaredElement is! FieldFormalParameterElement &&
+          declaredElement is! FieldFormalParameterElement2 &&
           declaredElement.hasImplicitType &&
           name != null &&
           _isTypeName(node, name)) {
@@ -66,11 +66,11 @@ class _Visitor extends SimpleAstVisitor<void> {
     var result =
         resolveNameInScope(name.lexeme, scope, shouldResolveSetter: false);
     if (result.isRequestedName) {
-      var element = result.element;
-      return element is ClassElement ||
-          element is ExtensionTypeElement ||
-          element is TypeAliasElement ||
-          (element is TypeParameterElement && !element.isWildcardVariable);
+      var element = result.element2;
+      return element is ClassElement2 ||
+          element is ExtensionTypeElement2 ||
+          element is TypeAliasElement2 ||
+          (element is TypeParameterElement2 && !element.isWildcardVariable);
     }
     return false;
   }

diff --git a/pkg/linter/lib/src/util/scope.dart b/pkg/linter/lib/src/util/scope.dart
@@ -3,11 +3,14 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/scope.dart';
 // ignore: implementation_imports
 import 'package:analyzer/src/dart/ast/ast.dart';
 // ignore: implementation_imports
 import 'package:analyzer/src/generated/resolver.dart' show ScopeResolverVisitor;
+// ignore: implementation_imports
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 LinterNameInScopeResolutionResult resolveNameInScope(
   String id,
@@ -57,6 +60,9 @@ class LinterNameInScopeResolutionResult {
   const LinterNameInScopeResolutionResult._requestedName(this.element)
       : _state = _LinterNameInScopeResolutionResultState.requestedName;
 
+  /// The element with the requested basename, `null` is [isNone].
+  Element2? get element2 => element.asElement2;
+
   bool get isDifferentName =>
       _state == _LinterNameInScopeResolutionResultState.differentName;