From 9926992adbfde6614335a7fa17c9bb46dba5cadb Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 18 May 2021 15:08:12 -0700 Subject: [PATCH] dartfmt --- lib/src/element_type.dart | 9 ++++-- lib/src/model/typedef.dart | 3 +- lib/src/render/type_parameters_renderer.dart | 27 ++++++++++++----- lib/src/render/typedef_renderer.dart | 31 +++++++++++++++----- test/end2end/model_special_cases_test.dart | 10 +++++-- test/end2end/model_test.dart | 12 +++++--- 6 files changed, 66 insertions(+), 26 deletions(-) diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart index 2fdba3f5e0..5ca366d1f2 100644 --- a/lib/src/element_type.dart +++ b/lib/src/element_type.dart @@ -404,8 +404,10 @@ mixin CallableElementTypeMixin implements ElementType { Iterable _typeArguments; Iterable get typeArguments => - _typeArguments ??= type.aliasArguments?.map((f) => ElementType.from(f, library, packageGraph)) - ?.toList() ?? []; + _typeArguments ??= type.aliasArguments + ?.map((f) => ElementType.from(f, library, packageGraph)) + ?.toList() ?? + []; } /// A callable type that may or may not be backed by a declaration using the generic @@ -417,7 +419,8 @@ class CallableElementType extends ParameterizedElementType : super(t, library, packageGraph, element, returnedFrom); @override - String get name => super.name != null && super.name.isNotEmpty ? super.name : 'Function'; + String get name => + super.name != null && super.name.isNotEmpty ? super.name : 'Function'; @override ElementTypeRenderer get _renderer => diff --git a/lib/src/model/typedef.dart b/lib/src/model/typedef.dart index 7379d67e1c..8f4e8527e7 100644 --- a/lib/src/model/typedef.dart +++ b/lib/src/model/typedef.dart @@ -34,7 +34,8 @@ class Typedef extends ModelElement String get genericParameters => _renderer.renderGenericParameters(this); @override - String get linkedGenericParameters => _renderer.renderLinkedGenericParameters(this); + String get linkedGenericParameters => + _renderer.renderLinkedGenericParameters(this); @override String get filePath => '${library.dirName}/$fileName'; diff --git a/lib/src/render/type_parameters_renderer.dart b/lib/src/render/type_parameters_renderer.dart index 4ceda63248..26d947a103 100644 --- a/lib/src/render/type_parameters_renderer.dart +++ b/lib/src/render/type_parameters_renderer.dart @@ -21,8 +21,11 @@ class TypeParametersRendererHtml implements TypeParametersRenderer { return ''; } var joined = typeParameters.typeParameters - .map((t) => [...t.annotations.map((a) => a.linkedNameWithParameters), t.name].join(' ') - ).join(', '); + .map((t) => [ + ...t.annotations.map((a) => a.linkedNameWithParameters), + t.name + ].join(' ')) + .join(', '); return '<$joined>'; } @@ -32,8 +35,11 @@ class TypeParametersRendererHtml implements TypeParametersRenderer { return ''; } var joined = typeParameters.typeParameters - .map((t) => [...t.annotations.map((a) => a.linkedNameWithParameters), t.linkedName].join(' ') - ).join(', '); + .map((t) => [ + ...t.annotations.map((a) => a.linkedNameWithParameters), + t.linkedName + ].join(' ')) + .join(', '); return '<$joined>'; } } @@ -42,12 +48,19 @@ class TypeParametersRendererMd implements TypeParametersRenderer { const TypeParametersRendererMd(); @override - String renderGenericParameters(TypeParameters typeParameters) => - _compose(typeParameters.typeParameters, (t) => [...t.annotations.map((a) => a.linkedNameWithParameters), t.name].join(' ')); + String renderGenericParameters(TypeParameters typeParameters) => _compose( + typeParameters.typeParameters, + (t) => [...t.annotations.map((a) => a.linkedNameWithParameters), t.name] + .join(' ')); @override String renderLinkedGenericParameters(TypeParameters typeParameters) => - _compose(typeParameters.typeParameters, (t) => [...t.annotations.map((a) => a.linkedNameWithParameters), t.linkedName].join(' ')); + _compose( + typeParameters.typeParameters, + (t) => [ + ...t.annotations.map((a) => a.linkedNameWithParameters), + t.linkedName + ].join(' ')); String _compose(List typeParameters, String Function(TypeParameter) mapfn) { diff --git a/lib/src/render/typedef_renderer.dart b/lib/src/render/typedef_renderer.dart index 6e5143a86e..0a0e224716 100644 --- a/lib/src/render/typedef_renderer.dart +++ b/lib/src/render/typedef_renderer.dart @@ -20,13 +20,18 @@ abstract class TypedefRenderer { class TypedefRendererHtml extends TypedefRenderer { const TypedefRendererHtml(); - String _renderTypeParameters(Iterable typeParameters, String Function(TypeParameter t) getName) { + String _renderTypeParameters(Iterable typeParameters, + String Function(TypeParameter t) getName) { if (typeParameters.isEmpty) { return ''; } final buffer = StringBuffer('<'); - buffer.writeAll(typeParameters.map((t) => [...t.annotations.map((a) => a.linkedNameWithParameters), getName(t)].join(' ')), + buffer.writeAll( + typeParameters.map((t) => [ + ...t.annotations.map((a) => a.linkedNameWithParameters), + getName(t) + ].join(' ')), ', '); buffer.write('>'); @@ -34,31 +39,41 @@ class TypedefRendererHtml extends TypedefRenderer { } @override - String renderGenericParameters(Typedef typedef) => _renderTypeParameters(typedef.typeParameters, (t) => t.name); + String renderGenericParameters(Typedef typedef) => + _renderTypeParameters(typedef.typeParameters, (t) => t.name); @override - String renderLinkedGenericParameters(Typedef typedef) => _renderTypeParameters(typedef.typeParameters, (t) => t.linkedName); + String renderLinkedGenericParameters(Typedef typedef) => + _renderTypeParameters(typedef.typeParameters, (t) => t.linkedName); } /// A markdown renderer for a [Typedef]. class TypedefRendererMd extends TypedefRenderer { const TypedefRendererMd(); - String _renderTypeParameters(Iterable typeParameters, String Function(TypeParameter t) getName) { + String _renderTypeParameters(Iterable typeParameters, + String Function(TypeParameter t) getName) { if (typeParameters.isEmpty) { return ''; } final buffer = StringBuffer('<{'); - buffer.writeAll(typeParameters.map((t) => [...t.annotations.map((a) => a.linkedNameWithParameters), getName(t)].join(' ')), ', '); + buffer.writeAll( + typeParameters.map((t) => [ + ...t.annotations.map((a) => a.linkedNameWithParameters), + getName(t) + ].join(' ')), + ', '); buffer.write('}>'); return buffer.toString(); } @override - String renderGenericParameters(Typedef typedef) => _renderTypeParameters(typedef.typeParameters, (t) => t.name); + String renderGenericParameters(Typedef typedef) => + _renderTypeParameters(typedef.typeParameters, (t) => t.name); @override - String renderLinkedGenericParameters(Typedef typedef) => _renderTypeParameters(typedef.typeParameters, (t) => t.linkedName); + String renderLinkedGenericParameters(Typedef typedef) => + _renderTypeParameters(typedef.typeParameters, (t) => t.linkedName); } diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart index f7924b0b51..6b87630a7c 100644 --- a/test/end2end/model_special_cases_test.dart +++ b/test/end2end/model_special_cases_test.dart @@ -151,9 +151,13 @@ void main() { mn = C.instanceMethods.firstWhere((m) => m.name == 'mn'); }); - test('Verify annotations and their type arguments render on type parameters for typedefs', () { - expect((F.aliasedType as FunctionType).typeFormals.first.metadata, isNotEmpty); - expect((F.aliasedType as FunctionType).parameters.first.metadata, isNotEmpty); + test( + 'Verify annotations and their type arguments render on type parameters for typedefs', + () { + expect((F.aliasedType as FunctionType).typeFormals.first.metadata, + isNotEmpty); + expect((F.aliasedType as FunctionType).parameters.first.metadata, + isNotEmpty); // TODO(jcollins-g): add rendering verification once we have data from // analyzer. }, skip: 'dart-lang/sdk#46064'); diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart index 73882f4e83..076cd6f6d5 100644 --- a/test/end2end/model_test.dart +++ b/test/end2end/model_test.dart @@ -3794,10 +3794,14 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, }); test('return type', () { - expect(oldgeneric.modelType.linkedName, - equals('Function(T) → T')); - expect(generic.modelType.linkedName, - equals('List<S> Function<S>(T, int, bool)')); + expect( + oldgeneric.modelType.linkedName, + equals( + 'Function(T) → T')); + expect( + generic.modelType.linkedName, + equals( + 'List<S> Function<S>(T, int, bool)')); }); test('name with generics', () {