WIP

Author: sethladd

lib/src/model.dart

@@ -571,10 +571,7 @@ class Library extends ModelElement {
     elements..removeWhere(isPrivate);
     _variables = elements
         .map((e) => new TopLevelVariable(e, this))
-        .toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_variables.isNotEmpty) _variables.sort(byName);
+        .toList(growable: false)..sort(byName);
 
     return _variables;
   }
@@ -583,22 +580,15 @@ class Library extends ModelElement {
 
   /// All variables ("properties") except constants.
   List<TopLevelVariable> get properties {
-    List temp =
-        _getVariables().where((v) => !v.isConst).toList(growable: false);
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (temp.isNotEmpty) temp.sort(byName);
-    return temp;
+    return _getVariables().where((v) => !v.isConst).toList(growable: false)
+      ..sort(byName);
   }
 
   bool get hasConstants => _getVariables().any((v) => v.isConst);
 
   List<TopLevelVariable> get constants {
-    List temp = _getVariables().where((v) => v.isConst).toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (temp.isNotEmpty) temp.sort(byName);
-
-    return temp;
+    return _getVariables().where((v) => v.isConst).toList(growable: false)
+      ..sort(byName);
   }
 
   bool get hasEnums => enums.isNotEmpty;
@@ -612,10 +602,7 @@ class Library extends ModelElement {
     _enums = enumClasses
         .where(isPublic)
         .map((e) => new Enum(e, this))
-        .toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_enums.isNotEmpty) _enums.sort(byName);
+        .toList(growable: false)..sort(byName);
 
     return _enums;
   }
@@ -686,10 +673,7 @@ class Library extends ModelElement {
     _classes = types
         .where(isPublic)
         .map((e) => new Class(e, this))
-        .toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_classes.isNotEmpty) _classes.sort(byName);
+        .toList(growable: false)..sort(byName);
 
     return _classes;
   }
@@ -707,13 +691,9 @@ class Library extends ModelElement {
   bool get hasExceptions => _allClasses.any((c) => c.isErrorOrException);
 
   List<Class> get exceptions {
-    List temp =
-        _allClasses.where((c) => c.isErrorOrException).toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (temp.isNotEmpty) temp.sort(byName);
-
-    return temp;
+    return _allClasses
+        .where((c) => c.isErrorOrException)
+        .toList(growable: false)..sort(byName);
   }
 
   @override
@@ -846,10 +826,7 @@ class Class extends ModelElement {
     _fields = _cls.fields
         .where(isPublic)
         .map((e) => new Field(e, library))
-        .toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_fields.isNotEmpty) _fields.sort(byName);
+        .toList(growable: false)..sort(byName);
 
     return _fields;
   }
@@ -859,10 +836,7 @@ class Class extends ModelElement {
     _staticFields = _allFields
         .where((f) => f.isStatic)
         .where((f) => !f.isConst)
-        .toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_staticFields.isNotEmpty) _staticFields.sort(byName);
+        .toList(growable: false)..sort(byName);
 
     return _staticFields;
   }
@@ -871,21 +845,17 @@ class Class extends ModelElement {
 
   List<Field> get instanceProperties {
     if (_instanceFields != null) return _instanceFields;
-    _instanceFields =
-        _allFields.where((f) => !f.isStatic).toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_instanceFields.isNotEmpty) _instanceFields.sort(byName);
+    _instanceFields = _allFields
+        .where((f) => !f.isStatic)
+        .toList(growable: false)..sort(byName);
 
     return _instanceFields;
   }
 
   List<Field> get constants {
     if (_constants != null) return _constants;
-    _constants = _allFields.where((f) => f.isConst).toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_constants.isNotEmpty) _constants.sort(byName);
+    _constants = _allFields.where((f) => f.isConst).toList(growable: false)
+      ..sort(byName);
 
     return _constants;
   }
@@ -899,10 +869,7 @@ class Class extends ModelElement {
 
     _constructors = _cls.constructors.where(isPublic).map((e) {
       return new Constructor(e, library);
-    }).toList(growable: true);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_constructors.isNotEmpty) _constructors.sort(byName);
+    }).toList(growable: true)..sort(byName);
 
     return _constructors;
   }
@@ -918,21 +885,16 @@ class Class extends ModelElement {
       } else {
         return new Operator(e, library);
       }
-    }).toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_allMethods.isNotEmpty) _allMethods.sort(byName);
+    }).toList(growable: false)..sort(byName);
 
     return _allMethods;
   }
 
   List<Operator> get operators {
     if (_operators != null) return _operators;
 
-    _operators = _methods.where((m) => m.isOperator).toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_operators.isNotEmpty) _operators.sort(byName);
+    _operators = _methods.where((m) => m.isOperator).toList(growable: false)
+      ..sort(byName);
 
     return _operators;
   }
@@ -952,10 +914,8 @@ class Class extends ModelElement {
   List<Method> get staticMethods {
     if (_staticMethods != null) return _staticMethods;
 
-    _staticMethods = _methods.where((m) => m.isStatic).toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_staticMethods.isNotEmpty) _staticMethods.sort(byName);
+    _staticMethods = _methods.where((m) => m.isStatic).toList(growable: false)
+      ..sort(byName);
 
     return _staticMethods;
   }
@@ -967,10 +927,7 @@ class Class extends ModelElement {
 
     _instanceMethods = _methods
         .where((m) => !m.isStatic && !m.isOperator)
-        .toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_instanceMethods.isNotEmpty) _instanceMethods.sort(byName);
+        .toList(growable: false)..sort(byName);
 
     return _instanceMethods;
   }
@@ -1215,10 +1172,7 @@ class Enum extends Class {
         .where(isPublic)
         .where((f) => f.isConst)
         .map((field) => new EnumField.forConstant(index++, field, library))
-        .toList(growable: false);
-
-    // XXX working around a VM SDK issue. Once fixed, you can chain the sort()
-    if (_constants.isNotEmpty) _constants.sort(byName);
+        .toList(growable: false)..sort(byName);
 
     return _constants;
   }