Index: packages/initialize/lib/src/mirror_loader.dart |
diff --git a/packages/initialize/lib/src/mirror_loader.dart b/packages/initialize/lib/src/mirror_loader.dart |
index 11722c152acf5e85225df75c4bcf60cb69344216..95da50dcd6dd11035ad52a5f789e3eee5a802eef 100644 |
--- a/packages/initialize/lib/src/mirror_loader.dart |
+++ b/packages/initialize/lib/src/mirror_loader.dart |
@@ -8,8 +8,8 @@ import 'dart:mirrors'; |
import 'package:path/path.dart' as path; |
import 'package:initialize/initialize.dart'; |
-final _root = currentMirrorSystem().isolate.rootLibrary; |
-final _libs = currentMirrorSystem().libraries; |
+final LibraryMirror _root = currentMirrorSystem().isolate.rootLibrary; |
+final Map<Uri, LibraryMirror> _libs = currentMirrorSystem().libraries; |
Queue<Function> loadInitializers( |
{List<Type> typeFilter, InitializerFilter customFilter, Uri from}) { |
@@ -37,9 +37,7 @@ class InitializationCrawler { |
/// Note: The [from] argument is only supported in the mirror_loader.dart. It |
/// is not supported statically. |
InitializationCrawler(this.typeFilter, this.customFilter, {Uri from}) |
- : _rootLibrary = from == null |
- ? _root |
- : _libs[from] { |
+ : _rootLibrary = from == null ? _root : _libs[from] { |
if (_rootLibrary == null) throw 'Unable to find library at $from.'; |
} |
@@ -124,10 +122,14 @@ class InitializationCrawler { |
Iterable<DeclarationMirror> _sortedDeclarationsWithMetadata( |
LibraryMirror lib) { |
return new List() |
- ..addAll(_sortDeclarations(lib, lib.declarations.values |
- .where((d) => d is MethodMirror && d.metadata.isNotEmpty))) |
- ..addAll(_sortDeclarations(lib, lib.declarations.values |
- .where((d) => d is ClassMirror && d.metadata.isNotEmpty))); |
+ ..addAll(_sortDeclarations( |
+ lib, |
+ lib.declarations.values |
+ .where((d) => d is MethodMirror && d.metadata.isNotEmpty))) |
+ ..addAll(_sortDeclarations( |
+ lib, |
+ lib.declarations.values |
+ .where((d) => d is ClassMirror && d.metadata.isNotEmpty))); |
} |
List<DeclarationMirror> _sortDeclarations( |
@@ -202,7 +204,8 @@ class InitializationCrawler { |
throw _TOP_LEVEL_FUNCTIONS_ONLY; |
} |
annotatedValue = (declaration.owner as ObjectMirror) |
- .getField(declaration.simpleName).reflectee; |
+ .getField(declaration.simpleName) |
+ .reflectee; |
} else if (declaration is LibraryMirror) { |
var package; |
var filePath; |