Skip to content

Commit 044451d

Browse files
committed
remove workaround
1 parent 87bb753 commit 044451d

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

lib/src/model.dart

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@ abstract class ModelElement implements Comparable {
297297
buf.write(' <span class="parameter-name">${p.name}</span>');
298298
}
299299
buf.write('(');
300-
buf.write(p.modelType.element.linkedParams(
301-
showNames: showNames, showMetadata: showMetadata));
300+
buf.write(p.modelType.element
301+
.linkedParams(showNames: showNames, showMetadata: showMetadata));
302302
buf.write(')');
303303
} else if (p.modelType != null && p.modelType.element != null) {
304304
var mt = p.modelType;
@@ -638,11 +638,9 @@ class Library extends ModelElement {
638638
elements.addAll(_exportedNamespace
639639
.where((element) => element is FunctionTypeAliasElement));
640640
elements..removeWhere(isPrivate);
641-
_typeDefs =
642-
elements.map((e) => new Typedef(e, this)).toList(growable: false);
643-
644-
// XXX working around a VM SDK issue. Once fixed, you can chain the sort()
645-
if (_typeDefs.isNotEmpty) _typeDefs.sort(byName);
641+
_typeDefs = elements
642+
.map((e) => new Typedef(e, this))
643+
.toList(growable: false)..sort(byName);
646644

647645
return _typeDefs;
648646
}
@@ -663,10 +661,7 @@ class Library extends ModelElement {
663661
elements..removeWhere(isPrivate);
664662
_functions = elements.map((e) {
665663
return new ModelFunction(e, this);
666-
}).toList(growable: false);
667-
668-
// XXX working around a VM SDK issue. Once fixed, you can chain the sort()
669-
if (_functions.isNotEmpty) _functions.sort(byName);
664+
}).toList(growable: false)..sort(byName);
670665

671666
return _functions;
672667
}
@@ -700,8 +695,9 @@ class Library extends ModelElement {
700695
}
701696

702697
List<Class> get classes {
703-
return _allClasses.where((c) => !c.isErrorOrException).toList(
704-
growable: false);
698+
return _allClasses
699+
.where((c) => !c.isErrorOrException)
700+
.toList(growable: false);
705701
}
706702

707703
List<Class> get allClasses => _allClasses;
@@ -798,9 +794,9 @@ class Class extends ModelElement {
798794
}
799795

800796
List<TypeParameter> get _typeParameters => _cls.typeParameters.map((f) {
801-
var lib = new Library(f.enclosingElement.library, package);
802-
return new TypeParameter(f, lib);
803-
}).toList();
797+
var lib = new Library(f.enclosingElement.library, package);
798+
return new TypeParameter(f, lib);
799+
}).toList();
804800

805801
String get kind => 'class';
806802

@@ -1229,7 +1225,8 @@ class Enum extends Class {
12291225

12301226
@override
12311227
List<EnumField> get instanceProperties {
1232-
return super.instanceProperties
1228+
return super
1229+
.instanceProperties
12331230
.map((Field p) => new EnumField(p.element, p.library))
12341231
.toList(growable: false);
12351232
}
@@ -1722,8 +1719,10 @@ class ElementType {
17221719

17231720
ElementType get _returnType {
17241721
var rt = (_type as FunctionType).returnType;
1725-
return new ElementType(rt, new ModelElement.from(
1726-
rt.element, new Library(_element.library.element, _element.package)));
1722+
return new ElementType(
1723+
rt,
1724+
new ModelElement.from(rt.element,
1725+
new Library(_element.library.element, _element.package)));
17271726
}
17281727

17291728
ModelElement get returnElement {
@@ -1737,9 +1736,9 @@ class ElementType {
17371736

17381737
List<ElementType> get typeArguments =>
17391738
(_type as ParameterizedType).typeArguments.map((f) {
1740-
var lib = new Library(f.element.library, _element.package);
1741-
return new ElementType(f, new ModelElement.from(f.element, lib));
1742-
}).toList();
1739+
var lib = new Library(f.element.library, _element.package);
1740+
return new ElementType(f, new ModelElement.from(f.element, lib));
1741+
}).toList();
17431742

17441743
String get linkedName {
17451744
if (_linkedName != null) return _linkedName;

0 commit comments

Comments
 (0)