diff --git a/lib/src/render/element_type_renderer.dart b/lib/src/render/element_type_renderer.dart index 99dfaf6e56..d5b22cac7b 100644 --- a/lib/src/render/element_type_renderer.dart +++ b/lib/src/render/element_type_renderer.dart @@ -123,7 +123,6 @@ class RecordElementTypeRendererHtml @override String renderLinkedName(RecordElementType elementType) { var buffer = StringBuffer() - ..write(elementType.nameWithGenerics) ..write('(') ..write(const RecordTypeFieldListHtmlRenderer() .renderLinkedFields(elementType) diff --git a/lib/src/render/record_type_field_renderer.dart b/lib/src/render/record_type_field_renderer.dart index f20990dc4a..84e824bcd4 100644 --- a/lib/src/render/record_type_field_renderer.dart +++ b/lib/src/render/record_type_field_renderer.dart @@ -86,14 +86,12 @@ abstract class _RecordTypeFieldListRenderer { var linkedTypeName = typeName(modelType.linkedName); if (linkedTypeName.isNotEmpty) { fieldBuffer.write(linkedTypeName); + } + if (field is RecordTypeNamedField) { fieldBuffer.write(' '); + fieldBuffer.write(fieldName(field.name)); } - var name = field is RecordTypeNamedField - ? field.name - : _fieldName(field, index); - fieldBuffer.write(fieldName(name)); fieldBuffer.write(suffix); - buffer.write(listItem(this.field(fieldBuffer.toString()))); }); } @@ -114,6 +112,4 @@ abstract class _RecordTypeFieldListRenderer { } return orderedList(buffer.toString()); } - - String _fieldName(RecordTypeField field, int index) => '\$$index'; } diff --git a/test/record_test.dart b/test/record_test.dart index 2ccc06f31e..7258afb59f 100644 --- a/test/record_test.dart +++ b/test/record_test.dart @@ -22,34 +22,33 @@ class RecordTest extends DartdocTestBase { String get libraryName => 'records'; @override - String get sdkConstraint => '>=2.19.0-0 <3.0.0'; + String get sdkConstraint => '>=2.19.0-0 <4.0.0'; @override List get experiments => ['records']; void test_noFields() async { var library = await bootPackageWithLibrary(''' -void f(() record) {} +void f(() r) {} '''); var fFunction = library.functions.named('f'); var recordType = fFunction.modelType.parameters.first.modelType; - expect(recordType.linkedName, equals('Record()')); + expect(recordType.linkedName, equals('()')); expect(recordType.nameWithGenerics, equals('Record')); } void test_onePositionalField() async { var library = await bootPackageWithLibrary(''' -void f((int) record) {} +void f((int) r) {} '''); var fFunction = library.functions.named('f'); var recordType = fFunction.modelType.parameters.first.modelType; expect(recordType.linkedName, matchesCompressed(r''' - Record\( + \( int - \$0 \) ''')); @@ -58,23 +57,21 @@ void f((int) record) {} void test_positionalFields() async { var library = await bootPackageWithLibrary(''' -void f((int, String) record) {} +void f((int, String) r) {} '''); var fFunction = library.functions.named('f'); var recordType = fFunction.modelType.parameters.first.modelType; expect(recordType.linkedName, matchesCompressed(r''' - Record\( + \( int - - \$0, + , String - \$1 \) ''')); @@ -88,7 +85,7 @@ void f(({int bbb, String aaa}) record) {} var fFunction = library.functions.named('f'); var recordType = fFunction.modelType.parameters.first.modelType; expect(recordType.linkedName, matchesCompressed(r''' - Record\( + \( \{ @@ -115,18 +112,16 @@ void f((int one, String two, {int ccc, String aaa, int bbb}) record) {} var fFunction = library.functions.named('f'); var recordType = fFunction.modelType.parameters.first.modelType; expect(recordType.linkedName, matchesCompressed(r''' - Record\( + \( int - - \$0, + , String - - \$1, + , \{