Elements. Turn FormalParameterFragmentImpl.defaultValueCode into a getter.

I'd like to reduce the nomenclature of VariableElement(s).

Change-Id: I97ce163222c9c968e2c51ff11a77c8bea300a20a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/437581
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

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

@@ -3379,9 +3379,6 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   @override
   final ParameterKind parameterKind;
 
-  @override
-  String? defaultValueCode;
-
   /// True if this parameter inherits from a covariant parameter. This happens
   /// when it overrides a method in a supertype that has a corresponding
   /// covariant parameter.
@@ -3426,6 +3423,9 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   @override
   FormalParameterFragmentImpl get declaration => this;
 
+  @override
+  String? get defaultValueCode => null;
+
   @override
   FormalParameterElementImpl get element {
     if (_element != null) {

pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart

@@ -1142,19 +1142,14 @@ class _MockSdkElementsBuilder {
     return fragment;
   }
 
-  FormalParameterElement _namedParameter(
-    String name,
-    TypeImpl type, {
-    String? initializerCode,
-  }) {
+  FormalParameterElement _namedParameter(String name, TypeImpl type) {
     var fragment = DefaultParameterFragmentImpl(
       nameOffset: 0,
       name2: name,
       nameOffset2: 0,
       parameterKind: ParameterKind.NAMED,
     );
     fragment.type = type;
-    fragment.defaultValueCode = initializerCode;
     return FormalParameterElementImpl(fragment);
   }
 

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -536,7 +536,6 @@ mixin ElementsTypesMixin {
     String? name,
     required TypeImpl type,
     bool isCovariant = false,
-    String? defaultValueCode,
   }) {
     var fragment = FormalParameterFragmentImpl(
       nameOffset: 0,
@@ -546,7 +545,6 @@ mixin ElementsTypesMixin {
     );
     fragment.type = type;
     fragment.isExplicitlyCovariant = isCovariant;
-    fragment.defaultValueCode = defaultValueCode;
     return fragment.asElement2;
   }
 

pkg/analyzer/test/src/dart/element/display_string_test.dart

@@ -3,11 +3,10 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/src/dart/element/element.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../../generated/type_system_base.dart';
+import '../resolution/context_collection_resolution.dart';
 
 main() {
   defineReflectiveSuite(() {
@@ -16,68 +15,72 @@ main() {
 }
 
 @reflectiveTest
-class ElementDisplayStringTest extends AbstractTypeSystemTest {
-  void test_class() {
-    var classA = class_(
-      name: 'A',
-      isAbstract: true,
-      superType: stringNone,
-      typeParameters: [typeParameter('T')],
-    );
-
-    var displayString = classA.getDisplayString();
-    expect(displayString, 'abstract class A<T> extends String');
+class ElementDisplayStringTest extends PubPackageResolutionTest {
+  test_class() async {
+    await assertNoErrorsInCode(r'''
+class A {}
+abstract class B<T> extends A {}
+''');
+
+    var B = findElement2.class_('B').firstFragment as ClassFragmentImpl;
+    var displayString = B.getDisplayString();
+    expect(displayString, 'abstract class B<T> extends A');
   }
 
-  void test_extension_named() {
-    var element = extension(name: 'StringExtension', extendedType: stringNone);
+  test_extension_named() async {
+    await assertNoErrorsInCode(r'''
+extension StringExtension on String {}
+''');
+
+    var element = findElement2.extension_('StringExtension');
+    var fragment = element.firstFragment as ExtensionFragmentImpl;
 
-    var displayString = element.getDisplayString();
+    var displayString = fragment.getDisplayString();
     expect(displayString, 'extension StringExtension on String');
   }
 
-  void test_extension_unnamed() {
-    var element = extension(extendedType: stringNone);
+  test_extension_unnamed() async {
+    await assertNoErrorsInCode(r'''
+extension on String {}
+''');
 
-    var displayString = element.getDisplayString();
+    var element = result.libraryElement2.extensions.single;
+    var fragment = element.firstFragment;
+
+    var displayString = fragment.getDisplayString();
     expect(displayString, 'extension on String');
   }
 
-  void test_extensionType() {
-    var element = extensionType(
-      'MyString',
-      representationType: stringNone,
-      interfaces: [stringNone],
-      typeParameters: [typeParameter('T')],
-    );
+  test_extensionType() async {
+    await assertNoErrorsInCode(r'''
+extension type MyString<T>(String it) implements String {}
+''');
 
-    var displayString = element.getDisplayString();
+    var element = findElement2.extensionType('MyString');
+    var fragment = element.firstFragment as ExtensionTypeFragmentImpl;
+
+    var displayString = fragment.getDisplayString();
     expect(
       displayString,
       'extension type MyString<T>(String it) implements String',
     );
   }
 
-  void test_longMethod() {
-    var methodA = method(
-      'longMethodName',
-      stringQuestion,
-      formalParameters: [
-        requiredParameter(name: 'aaa', type: stringQuestion),
-        positionalParameter(
-          name: 'bbb',
-          type: stringQuestion,
-          defaultValueCode: "'a'",
-        ),
-        positionalParameter(name: 'ccc', type: stringQuestion),
-      ],
-    );
+  test_longMethod() async {
+    await assertNoErrorsInCode(r'''
+abstract class A {
+  String? longMethodName(String? aaa, [String? bbb = 'a', String? ccc]);
+}
+''');
+
+    var methodElement = findElement2.method('longMethodName');
+    var methodFragment = methodElement.firstFragment as MethodFragmentImpl;
 
-    var singleLine = methodA.getDisplayString();
+    var singleLine = methodFragment.getDisplayString();
     expect(singleLine, '''
 String? longMethodName(String? aaa, [String? bbb = 'a', String? ccc])''');
 
-    var multiLine = methodA.getDisplayString(multiline: true);
+    var multiLine = methodFragment.getDisplayString(multiline: true);
     expect(multiLine, '''
 String? longMethodName(
   String? aaa, [
@@ -86,37 +89,28 @@ String? longMethodName(
 ])''');
   }
 
-  void test_longMethod_functionType() {
-    // Function types are always kept on one line, even nested within multiline
-    // signatures.
-    var methodA = method(
-      'longMethodName',
-      stringQuestion,
-      formalParameters: [
-        requiredParameter(name: 'aaa', type: stringQuestion),
-        positionalParameter(
-          name: 'bbb',
-          type: functionTypeNone(
-            formalParameters: [
-              requiredParameter(name: 'xxx', type: stringQuestion),
-              requiredParameter(name: 'yyy', type: stringQuestion),
-              requiredParameter(name: 'zzz', type: stringQuestion),
-            ],
-            returnType: stringQuestion,
-          ),
-        ),
-        positionalParameter(name: 'ccc', type: stringQuestion),
-      ],
-    );
+  test_longMethod_functionType() async {
+    await assertNoErrorsInCode(r'''
+abstract class A {
+  String? longMethodName(
+    String? aaa, 
+    [String? Function(String?, String?, String?) bbb,
+    String? ccc]
+  );
+}
+''');
+
+    var methodElement = findElement2.method('longMethodName');
+    var methodFragment = methodElement.firstFragment as MethodFragmentImpl;
 
-    var singleLine = methodA.getDisplayString();
+    var singleLine = methodFragment.getDisplayString();
     expect(
       singleLine,
       '''
 String? longMethodName(String? aaa, [String? Function(String?, String?, String?) bbb, String? ccc])''',
     );
 
-    var multiLine = methodA.getDisplayString(multiline: true);
+    var multiLine = methodFragment.getDisplayString(multiline: true);
     expect(multiLine, '''
 String? longMethodName(
   String? aaa, [
@@ -125,41 +119,42 @@ String? longMethodName(
 ])''');
   }
 
-  void test_property_getter() {
-    var getterA = GetterFragmentImpl.forVariable(
-      TopLevelVariableFragmentImpl(name2: 'a', nameOffset: 0),
-    )..returnType = stringNone;
+  test_property_getter() async {
+    await assertNoErrorsInCode(r'''
+String get a => '';
+''');
 
-    expect(getterA.getDisplayString(), 'String get a');
+    var element = findElement2.topGet('a');
+    var fragment = element.firstFragment as GetterFragmentImpl;
+
+    expect(fragment.getDisplayString(), 'String get a');
   }
 
-  void test_property_setter() {
-    var setterA =
-        SetterFragmentImpl.forVariable(
-            TopLevelVariableFragmentImpl(name2: 'a', nameOffset: 0),
-          )
-          ..returnType = voidNone
-          ..parameters = [
-            requiredParameter(name: 'value', type: stringNone).asElement,
-          ];
-
-    expect(setterA.getDisplayString(), 'set a(String value)');
+  test_property_setter() async {
+    await assertNoErrorsInCode(r'''
+set a(String value) {}
+''');
+
+    var element = findElement2.topSet('a');
+    var fragment = element.firstFragment as SetterFragmentImpl;
+
+    expect(fragment.getDisplayString(), 'set a(String value)');
   }
 
-  void test_shortMethod() {
-    var methodA = method(
-      'm',
-      stringQuestion,
-      formalParameters: [
-        requiredParameter(name: 'a', type: stringQuestion),
-        positionalParameter(name: 'b', type: stringQuestion),
-      ],
-    );
+  test_shortMethod() async {
+    await assertNoErrorsInCode(r'''
+abstract class A {
+  String? m(String? a, [String? b]);
+}
+''');
+
+    var element = findElement2.method('m');
+    var fragment = element.firstFragment as MethodFragmentImpl;
 
-    var singleLine = methodA.getDisplayString();
+    var singleLine = fragment.getDisplayString();
     expect(singleLine, 'String? m(String? a, [String? b])');
 
-    var multiLine = methodA.getDisplayString(multiline: true);
+    var multiLine = fragment.getDisplayString(multiline: true);
     // The signature is short enough that it remains on one line even for
     // multiline: true.
     expect(multiLine, 'String? m(String? a, [String? b])');