@@ -297,8 +297,8 @@ abstract class ModelElement implements Comparable {
297
297
buf.write (' <span class="parameter-name">${p .name }</span>' );
298
298
}
299
299
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));
302
302
buf.write (')' );
303
303
} else if (p.modelType != null && p.modelType.element != null ) {
304
304
var mt = p.modelType;
@@ -638,11 +638,9 @@ class Library extends ModelElement {
638
638
elements.addAll (_exportedNamespace
639
639
.where ((element) => element is FunctionTypeAliasElement ));
640
640
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);
646
644
647
645
return _typeDefs;
648
646
}
@@ -663,10 +661,7 @@ class Library extends ModelElement {
663
661
elements..removeWhere (isPrivate);
664
662
_functions = elements.map ((e) {
665
663
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);
670
665
671
666
return _functions;
672
667
}
@@ -700,8 +695,9 @@ class Library extends ModelElement {
700
695
}
701
696
702
697
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 );
705
701
}
706
702
707
703
List <Class > get allClasses => _allClasses;
@@ -798,9 +794,9 @@ class Class extends ModelElement {
798
794
}
799
795
800
796
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 ();
804
800
805
801
String get kind => 'class' ;
806
802
@@ -1229,7 +1225,8 @@ class Enum extends Class {
1229
1225
1230
1226
@override
1231
1227
List <EnumField > get instanceProperties {
1232
- return super .instanceProperties
1228
+ return super
1229
+ .instanceProperties
1233
1230
.map ((Field p) => new EnumField (p.element, p.library))
1234
1231
.toList (growable: false );
1235
1232
}
@@ -1722,8 +1719,10 @@ class ElementType {
1722
1719
1723
1720
ElementType get _returnType {
1724
1721
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)));
1727
1726
}
1728
1727
1729
1728
ModelElement get returnElement {
@@ -1737,9 +1736,9 @@ class ElementType {
1737
1736
1738
1737
List <ElementType > get typeArguments =>
1739
1738
(_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 ();
1743
1742
1744
1743
String get linkedName {
1745
1744
if (_linkedName != null ) return _linkedName;
0 commit comments