Index: lib/src/mirror_loader.dart |
diff --git a/lib/src/mirror_loader.dart b/lib/src/mirror_loader.dart |
index ba49566ccfbd69e97453466a2c0396be8ad0cf15..2f836cd305dddedc1182bf5ae1f2879fb509a1b2 100644 |
--- a/lib/src/mirror_loader.dart |
+++ b/lib/src/mirror_loader.dart |
@@ -98,7 +98,7 @@ class InitializationCrawler { |
librariesSeen.add(lib); |
// First visit all our dependencies. |
- for (var dependency in _sortedLibraryDependencies(lib)) { |
+ for (var dependency in lib.libraryDependencies) { |
// Skip dart: imports, they never use this package. |
if (dependency.targetLibrary.uri.toString().startsWith('dart:')) continue; |
if (librariesSeen.contains(dependency.targetLibrary)) continue; |
@@ -123,25 +123,6 @@ class InitializationCrawler { |
return queue; |
} |
- Iterable<LibraryDependencyMirror> _sortedLibraryDependencies( |
- LibraryMirror lib) => new List.from(lib.libraryDependencies) |
- ..sort((a, b) { |
- var aScheme = a.targetLibrary.uri.scheme; |
- var bScheme = b.targetLibrary.uri.scheme; |
- if (aScheme != 'file' && bScheme == 'file') return -1; |
- if (bScheme != 'file' && aScheme == 'file') return 1; |
- return _relativeLibraryUri(a).compareTo(_relativeLibraryUri(b)); |
- }); |
- |
- String _relativeLibraryUri(LibraryDependencyMirror lib) { |
- if (lib.targetLibrary.uri.scheme == 'file' && |
- lib.sourceLibrary.uri.scheme == 'file') { |
- return path.relative(lib.targetLibrary.uri.path, |
- from: path.dirname(lib.sourceLibrary.uri.path)); |
- } |
- return lib.targetLibrary.uri.toString(); |
- } |
- |
Iterable<DeclarationMirror> _sortedLibraryDeclarations(LibraryMirror lib) => |
lib.declarations.values |
.where((d) => d is ClassMirror || d is MethodMirror) |
@@ -149,7 +130,7 @@ class InitializationCrawler { |
..sort((a, b) { |
if (a is MethodMirror && b is ClassMirror) return -1; |
if (a is ClassMirror && b is MethodMirror) return 1; |
- return _declarationName(a).compareTo(_declarationName(b)); |
+ return 0; |
Siggi Cherem (dart-lang)
2015/03/17 19:50:29
this might be problematic depending on the size of
jakemac
2015/03/17 21:54:03
This now filters out all declarations that don't h
|
}); |
String _declarationName(DeclarationMirror declaration) => |