@@ -1116,21 +1116,21 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1116
1116
// TODO(jcollins-g): really, these shouldn't be called "parameters" in
1117
1117
// the span class.
1118
1118
expect (explicitSetter.linkedReturnType,
1119
- '<span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<int></span></span>)</span>' );
1119
+ '<span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature"> <int></span> </span></span>)</span>' );
1120
1120
});
1121
1121
1122
1122
test ('parameterized type from field is correctly displayed' , () {
1123
1123
Field aField = TemplatedInterface .instanceProperties
1124
1124
.singleWhere ((f) => f.name == 'aField' );
1125
1125
expect (aField.linkedReturnType,
1126
- '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><Stream<List<int>>>' );
1126
+ '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><span class="signature"> <Stream<span class="signature"> <List<span class="signature"> <int></span> ></span> ></span> ' );
1127
1127
});
1128
1128
1129
1129
test ('parameterized type from inherited field is correctly displayed' , () {
1130
1130
Field aInheritedField = TemplatedInterface .inheritedProperties
1131
1131
.singleWhere ((f) => f.name == 'aInheritedField' );
1132
1132
expect (aInheritedField.linkedReturnType,
1133
- '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><List<int>>' );
1133
+ '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> ' );
1134
1134
});
1135
1135
1136
1136
test (
@@ -1140,7 +1140,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1140
1140
.singleWhere ((f) => f.name == 'aGetter' )
1141
1141
.getter;
1142
1142
expect (aGetter.linkedReturnType,
1143
- '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><Map<A, List<String>>>' );
1143
+ '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><span class="signature"> <Map<span class="signature"> <A, List<span class="signature"> <String></span> ></span> ></span> ' );
1144
1144
});
1145
1145
1146
1146
test (
@@ -1150,7 +1150,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1150
1150
.singleWhere ((f) => f.name == 'aInheritedGetter' )
1151
1151
.getter;
1152
1152
expect (aInheritedGetter.linkedReturnType,
1153
- '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><List<int>>' );
1153
+ '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> ' );
1154
1154
});
1155
1155
1156
1156
test (
@@ -1160,11 +1160,11 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1160
1160
.singleWhere ((f) => f.name == 'aInheritedSetter' )
1161
1161
.setter;
1162
1162
expect (aInheritedSetter.allParameters.first.modelType.linkedName,
1163
- '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><List<int>>' );
1163
+ '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> ' );
1164
1164
// TODO(jcollins-g): really, these shouldn't be called "parameters" in
1165
1165
// the span class.
1166
1166
expect (aInheritedSetter.enclosingCombo.linkedReturnType,
1167
- '<span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><List<int>></span></span>' );
1167
+ '<span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> </span></span>' );
1168
1168
});
1169
1169
1170
1170
test (
@@ -1173,7 +1173,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1173
1173
Method aMethodInterface = TemplatedInterface .allInstanceMethods
1174
1174
.singleWhere ((m) => m.name == 'aMethodInterface' );
1175
1175
expect (aMethodInterface.linkedReturnType,
1176
- '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><List<int>>' );
1176
+ '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> ' );
1177
1177
});
1178
1178
1179
1179
test (
@@ -1182,7 +1182,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1182
1182
Method aInheritedMethod = TemplatedInterface .allInstanceMethods
1183
1183
.singleWhere ((m) => m.name == 'aInheritedMethod' );
1184
1184
expect (aInheritedMethod.linkedReturnType,
1185
- '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><List<int>>' );
1185
+ '<a href=\" ex/AnotherParameterizedClass-class.html\" >AnotherParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> ' );
1186
1186
});
1187
1187
1188
1188
test (
@@ -1192,7 +1192,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1192
1192
.allInstanceMethods
1193
1193
.singleWhere ((m) => m.name == 'aTypedefReturningMethodInterface' );
1194
1194
expect (aTypedefReturningMethodInterface.linkedReturnType,
1195
- '<a href=\" ex/ParameterizedTypedef.html\" >ParameterizedTypedef</a><List<String>>' );
1195
+ '<a href=\" ex/ParameterizedTypedef.html\" >ParameterizedTypedef</a><span class="signature"> <List<span class="signature"> <String></span> ></span> ' );
1196
1196
});
1197
1197
1198
1198
test (
@@ -1202,7 +1202,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1202
1202
.allInstanceMethods
1203
1203
.singleWhere ((m) => m.name == 'aInheritedTypedefReturningMethod' );
1204
1204
expect (aInheritedTypedefReturningMethod.linkedReturnType,
1205
- '<a href=\" ex/ParameterizedTypedef.html\" >ParameterizedTypedef</a><List<int>>' );
1205
+ '<a href=\" ex/ParameterizedTypedef.html\" >ParameterizedTypedef</a><span class="signature"> <List<span class="signature"> <int></span> ></span> ' );
1206
1206
});
1207
1207
1208
1208
test ('parameterized types for inherited operator is correctly displayed' ,
@@ -1211,9 +1211,9 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1211
1211
.inheritedOperators
1212
1212
.singleWhere ((m) => m.name == 'operator +' );
1213
1213
expect (aInheritedAdditionOperator.linkedReturnType,
1214
- '<a href=\" ex/ParameterizedClass-class.html\" >ParameterizedClass</a><List<int>>' );
1214
+ '<a href=\" ex/ParameterizedClass-class.html\" >ParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> ' );
1215
1215
expect (aInheritedAdditionOperator.linkedParams (),
1216
- '<span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><List<int>></span> <span class="parameter-name">other</span></span>' );
1216
+ '<span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature"> <List<span class="signature"> <int></span> ></span> </span> <span class="parameter-name">other</span></span>' );
1217
1217
});
1218
1218
1219
1219
test ('' , () {});
@@ -1279,7 +1279,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1279
1279
expect (
1280
1280
getAFunctionReturningVoid.linkedReturnType,
1281
1281
equals (
1282
- 'Function(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)' ));
1282
+ 'Function<span class="signature"> (<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span> ' ));
1283
1283
});
1284
1284
1285
1285
test (
@@ -1288,7 +1288,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1288
1288
expect (
1289
1289
getAFunctionReturningBool.linkedReturnType,
1290
1290
equals (
1291
- 'Function<T4>(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)' ));
1291
+ 'Function<span class="signature"> <T4></span><span class="signature"> (<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span> ' ));
1292
1292
});
1293
1293
1294
1294
test ('has a fully qualified name' , () {
@@ -1362,7 +1362,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1362
1362
1363
1363
test ('parameter has generics in signature' , () {
1364
1364
expect (testGeneric.parameters[0 ].modelType.linkedName,
1365
- 'Map<String, dynamic>' );
1365
+ 'Map<span class="signature"> <String, dynamic></span> ' );
1366
1366
});
1367
1367
1368
1368
test ('parameter is a function' , () {
@@ -1768,7 +1768,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
1768
1768
expect (
1769
1769
fieldWithTypedef.linkedReturnType,
1770
1770
equals (
1771
- '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><bool>' ));
1771
+ '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature"> <bool></span> ' ));
1772
1772
});
1773
1773
});
1774
1774
@@ -2040,7 +2040,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
2040
2040
expect (
2041
2041
aComplexTypedef.linkedReturnType,
2042
2042
equals (
2043
- 'Function(<span class="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)' ));
2043
+ 'Function<span class="signature"> (<span class="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)</span> ' ));
2044
2044
expect (
2045
2045
aComplexTypedef.linkedParamsLines,
2046
2046
equals (
@@ -2065,7 +2065,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
2065
2065
2066
2066
test ('linked return type' , () {
2067
2067
expect (t.linkedReturnType, equals ('String' ));
2068
- expect (generic.linkedReturnType, equals ('List<S>' ));
2068
+ expect (generic.linkedReturnType, equals ('List<span class="signature"> <S></span> ' ));
2069
2069
});
2070
2070
2071
2071
test ("name with generics" , () {
0 commit comments