[wildcards] optimize initializer scope checking; test cleanup

Follow-up from: https://dart-review.googlesource.com/c/sdk/+/380160

Change-Id: I3268ba1a519ef295019679b87f773fd008379c75
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/380582
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>

Author: pq

pkg/analyzer/lib/src/dart/element/scope.dart

@@ -14,11 +14,13 @@ import 'package:analyzer/src/utilities/extensions/collection.dart';
 /// The scope for the initializers in a constructor.
 class ConstructorInitializerScope extends EnclosedScope {
   ConstructorInitializerScope(super.parent, ConstructorElement element) {
-    var wildcardsEnabled = element.library.hasWildcardVariablesFeatureEnabled;
     for (var parameter in element.parameters) {
-      if (!(wildcardsEnabled && parameter.name == '_')) {
-        _addGetter(parameter);
+      // Skip wildcards.
+      if (parameter.name == '_' &&
+          element.library.featureSet.isEnabled(Feature.wildcard_variables)) {
+        continue;
       }
+      _addGetter(parameter);
     }
   }
 }

pkg/analyzer/test/src/dart/resolution/constructor_test.dart

@@ -46,6 +46,32 @@ ConstructorName
 ''');
   }
 
+  test_fieldShadowingWildcardParameter() async {
+    await assertErrorsInCode(r'''
+class A {
+  var v;
+  var _;
+  A(var _) : v = _;
+}
+''', [
+      error(CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER, 45, 1),
+    ]);
+
+    var node = findNode.constructorFieldInitializer('v = _');
+    assertResolvedNodeText(node, r'''
+ConstructorFieldInitializer
+  fieldName: SimpleIdentifier
+    token: v
+    staticElement: <testLibraryFragment>::@class::A::@field::v
+    staticType: null
+  equals: =
+  expression: SimpleIdentifier
+    token: _
+    staticElement: <testLibraryFragment>::@class::A::@getter::_
+    staticType: dynamic
+''');
+  }
+
   test_formalParameterScope() async {
     await assertNoErrorsInCode('''
 class a {}

pkg/analyzer/test/src/diagnostics/implicit_this_reference_in_initializer_test.dart

@@ -108,30 +108,6 @@ class A {
     ]);
   }
 
-  test_constructorInitializer_field_shadowingWildcard() async {
-    await assertErrorsInCode(r'''
-class A {
-  var v;
-  var _;
-  A(var _) : v = _;
-}
-''', [
-      error(CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER, 45, 1),
-    ]);
-  }
-
-  test_constructorInitializer_fieldFormalWildcard() async {
-    await assertErrorsInCode(r'''
-class C {
-  var _;
-  var f;
-  C(this._) : f = _;
-}
-''', [
-      error(CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER, 46, 1),
-    ]);
-  }
-
   test_constructorName() async {
     await assertNoErrorsInCode(r'''
 class A {