Correctly sort libraries by name, not key.

utils/dartdoc/dartdoc.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * To use it, from this directory, run:
  *
  *     $ ./dartdoc <path to .dart file>
  *
  * This will create a "docs" directory with the docs for your libraries. To
@@ skipping 115 matching lines @@
    * this is `null` then no search box will be shown.
    */
   String searchEngineId = null;
 
   /* The URL that the embedded search results should be displayed on. */
   String searchResultsUrl = 'results.html';
 
   /** Set this to add footer text to each generated page. */
   String footerText = '';
 
+  /**
+   * From exposes the set of libraries in `world.libraries`. That maps library
+   * *keys* to [Library] objects. The keys are *not* exactly the same as their
+   * names. This means if we order by key, we won't actually have them sorted
+   * correctly. This list contains the libraries in correct order by their
+   * *name*.
+   */
+  List<Library> _sortedLibraries;
+
   CommentMap _comments;
 
   /** The library that we're currently generating docs for. */
   Library _currentLibrary;
 
   /** The type that we're currently generating docs for. */
   Type _currentType;
 
   /** The member that we're currently generating docs for. */
   Member _currentMember;
@@ skipping 51 matching lines @@
           world.process();
           break;
 
         default:
           // Normal entrypoint script.
           world.processDartScript(entrypoint);
       }
 
       world.resolveAll();
 
+      // Sort the libraries by name (not key).
+      _sortedLibraries = world.libraries.getValues();
+      _sortedLibraries.sort((a, b) {
+        return a.name.toUpperCase().compareTo(b.name.toUpperCase());
+      });
+
       // Generate the docs.
       if (mode == MODE_LIVE_NAV) docNavigationJson();
 
       docIndex();
-      for (final library in world.libraries.getValues()) {
+      for (final library in _sortedLibraries) {
         docLibrary(library);
       }
     } finally {
       options.dietParse = oldDietParse;
     }
   }
 
   void startFile(String path) {
     _filePath = path;
     _file = new StringBuffer();
@@ skipping 118 matching lines @@
   }
 
   void docIndex() {
     startFile('index.html');
 
     writeHeader(mainTitle, []);
 
     writeln('<h2>$mainTitle</h2>');
     writeln('<h3>Libraries</h3>');
 
-    for (final library in orderByName(world.libraries)) {
+    for (final library in _sortedLibraries) {
       docIndexLibrary(library);
     }
 
     writeFooter();
     endFile();
   }
 
   void docIndexLibrary(Library library) {
     writeln('<h4>${a(libraryUrl(library), library.name)}</h4>');
   }
 
   /**
    * Walks the libraries and creates a JSON object containing the data needed
    * to generate navigation for them.
    */
   void docNavigationJson() {
     startFile('nav.json');
 
     final libraries = {};
 
-    for (final library in orderByName(world.libraries)) {
+    for (final library in _sortedLibraries) {
       docLibraryNavigationJson(library, libraries);
     }
 
     writeln(JSON.stringify(libraries));
     endFile();
   }
 
   void docLibraryNavigationJson(Library library, Map libraries) {
     final types = [];
 
     for (final type in orderByName(library.types)) {
       if (type.isTop) continue;
       if (type.name.startsWith('_')) continue;
 
       final kind = type.isClass ? 'class' : 'interface';
       final url = typeUrl(type);
       types.add({ 'name': typeName(type), 'kind': kind, 'url': url });
     }
 
     libraries[library.name] = types;
   }
 
   void docNavigation() {
     writeln(
         '''
         <div class="nav">
         ''');
 
     if (mode == MODE_STATIC) {
-      for (final library in orderByName(world.libraries)) {
+      for (final library in _sortedLibraries) {
         write('<h2><div class="icon-library"></div>');
 
         if ((_currentLibrary == library) && (_currentType == null)) {
           write('<strong>${library.name}</strong>');
         } else {
           write('${a(libraryUrl(library), library.name)}');
         }
         write('</h2>');
 
         // Only expand classes in navigation for current library.
@@ skipping 774 matching lines @@
 
     return new md.Element.text('code', name);
   }
 
   // TODO(rnystrom): Move into SourceSpan?
   int getSpanColumn(SourceSpan span) {
     final line = span.file.getLine(span.start);
     return span.file.getColumn(line, span.start);
   }
 }