From 5f13441d46b83920d8ad4ad1c5826e0a3ddc805b Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Fri, 28 Aug 2020 15:04:28 -0700 Subject: [PATCH] Remove wbr tags around block-displayed elements --- lib/src/render/parameter_renderer.dart | 2 +- test/model_special_cases_test.dart | 6 ++-- test/model_test.dart | 44 +++++++++++++++----------- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/lib/src/render/parameter_renderer.dart b/lib/src/render/parameter_renderer.dart index 7bd55493b4..ee8d78192a 100644 --- a/lib/src/render/parameter_renderer.dart +++ b/lib/src/render/parameter_renderer.dart @@ -22,7 +22,7 @@ class ParameterRendererHtmlList extends ParameterRendererHtml { /// Render HTML suitable for a single, wrapped line. class ParameterRendererHtml extends ParameterRenderer { @override - String listItem(String listItem) => '${listItem}'; + String listItem(String listItem) => '${listItem}'; @override String orderedList(String listItems) => listItems; @override diff --git a/test/model_special_cases_test.dart b/test/model_special_cases_test.dart index 73b80b7a0a..d469184d50 100644 --- a/test/model_special_cases_test.dart +++ b/test/model_special_cases_test.dart @@ -209,7 +209,7 @@ void main() { 'Map<T?, String?>')); expect(aComplexSetterOnlyType.linkedReturnType, equals( // TODO(jcollins-g): fix wrong span class for setter-only return type (#2226) - 'List<Map<T?, String?>?>')); + 'List<Map<T?, String?>?>')); }); test('simple nullable elements are detected and rendered correctly', () { @@ -231,7 +231,7 @@ void main() { expect( methodWithNullables.linkedParams, equals( - 'String? foo')); + 'String? foo')); expect(methodWithNullables.linkedReturnType, equals('int?')); expect( initialized.linkedReturnType, @@ -240,7 +240,7 @@ void main() { expect( operatorStar.linkedParams, equals( - 'NullableMembers? nullableOther')); + 'NullableMembers? nullableOther')); }); }, skip: (!_nullSafetyExperimentAllowed.allows(_platformVersion) && diff --git a/test/model_test.dart b/test/model_test.dart index 88c37b5e21..93abe81476 100644 --- a/test/model_test.dart +++ b/test/model_test.dart @@ -2266,7 +2266,7 @@ void main() { ParameterRendererHtml() .renderLinkedParams(paramOfFutureOrNull.parameters), equals( - 'FutureOr<Null> future')); + 'FutureOr<Null> future')); }); test('function with a bound type to FutureOr', () { @@ -2309,7 +2309,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, params, '' 'VoidCallback ' - 'callback'); + 'callback'); function = fakeLibrary.functions.firstWhere((f) => f.name == 'addCallback2'); @@ -2318,7 +2318,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, params, '' 'Callback2 ' - 'callback'); + 'callback'); }); test('supports generic methods', () { @@ -2329,8 +2329,13 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, test('can resolve functions as parameters', () { var params = ParameterRendererHtml() .renderLinkedParams(doAComplicatedThing.parameters); - expect(params, - 'int x, {void doSomething(int aThingParameter, String anotherThing), void doSomethingElse(int aThingParameter, double somethingElse)}'); + expect( + params, + 'int x, ' + '{void doSomething(int aThingParameter, ' + 'String anotherThing), ' + 'void doSomethingElse(int aThingParameter, ' + 'double somethingElse)}'); }); }); @@ -2349,8 +2354,11 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, .singleWhere((f) => f.name == 'explicitSetter'); // TODO(jcollins-g): really, these shouldn't be called "parameters" in // the span class. - expect(explicitSetter.linkedReturnType, - 'dynamic Function(int, Cool, List<int>)'); + expect( + explicitSetter.linkedReturnType, + 'dynamic Function(int, ' + 'Cool, ' + 'List<int>)'); }); test('parameterized type from field is correctly displayed', () { @@ -2398,7 +2406,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, // TODO(jcollins-g): really, these shouldn't be called "parameters" in // the span class. expect(aInheritedSetter.enclosingCombo.linkedReturnType, - 'AnotherParameterizedClass<List<int>>'); + 'AnotherParameterizedClass<List<int>>'); }); test( @@ -2446,7 +2454,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, expect( ParameterRendererHtml() .renderLinkedParams(aInheritedAdditionOperator.parameters), - 'ParameterizedClass<List<int>> other'); + 'ParameterizedClass<List<int>> other'); }); test('', () {}); @@ -2509,7 +2517,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, expect( getAFunctionReturningVoid.linkedReturnType, equals( - 'void Function(T1, T2)')); + 'void Function(T1, T2)')); }); test( @@ -2518,7 +2526,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, expect( getAFunctionReturningBool.linkedReturnType, equals( - 'bool Function<T4>(String, T1, T4)')); + 'bool Function<T4>(String, T1, T4)')); }); test('has a fully qualified name', () { @@ -3125,11 +3133,11 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, // TODO(jcollins-g): after analyzer 0.39.5 change to 'num' in first // group. matches(RegExp( - r'(dynamic|num) Function\(List<num> a\)'))); + r'(dynamic|num) Function\(List<num> a\)'))); expect( importantComputations.linkedReturnType, matches(RegExp( - r'Map<int, (dynamic|num) Function\(List<num> a\)>'))); + r'Map<int, (dynamic|num) Function\(List<num> a\)>'))); }); test( @@ -3138,7 +3146,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, expect( complicatedReturn.linkedReturnType, equals( - 'ATypeTakingClass<String Function(int)>')); + 'ATypeTakingClass<String Function(int)>')); }); test('@nodoc on simple property works', () { @@ -3423,7 +3431,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, ParameterRendererHtml().renderLinkedParams(aVoidParameter.parameters, showMetadata: true, showNames: true), equals( - 'Future<void> p1')); + 'Future<void> p1')); }); test('a class that extends Future', () { @@ -3505,7 +3513,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, expect( ParameterRendererHtml().renderLinkedParams(theConstructor.parameters), equals( - 'ParameterizedTypedef<double> x')); + 'ParameterizedTypedef<double> x')); }); test('anonymous nested functions inside typedefs are handled', () { @@ -3522,7 +3530,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, expect( aComplexTypedef.linkedReturnType, equals( - 'void Function(A1, A2, A3)')); + 'void Function(A1, A2, A3)')); expect( aComplexTypedef.linkedParamsLines, equals( @@ -3690,7 +3698,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, params, equals('' 'processMessage ' - 'p')); + 'p')); }); });