AnalysisServer fixes

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/ResolveLibraryTask.java

Index: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/ResolveLibraryTask.java
===================================================================
--- editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/ResolveLibraryTask.java	(revision 5855)
+++ editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/ResolveLibraryTask.java	(working copy)
@@ -58,12 +58,12 @@
       Library lib = todo.get(index);
       LibraryUnit libUnit = lib.getLibraryUnit();
       if (libUnit != null) {
-        resolvedLibs.put(lib.getFile().toURI(), libUnit);
-        continue;
+        resolvedLibs.put(libUnit.getSource().getUri(), libUnit);
+      } else {
+        for (Entry<File, DartUnit> entry : lib.getCachedUnits().entrySet()) {
+          parsedUnits.put(entry.getKey().toURI(), entry.getValue());
+        }
       }
-      for (Entry<File, DartUnit> entry : lib.getCachedUnits().entrySet()) {
-        parsedUnits.put(entry.getKey().toURI(), entry.getValue());
-      }
       for (File file : lib.getImportedFiles()) {
         Library importedLib = context.getCachedLibrary(file);
         if (importedLib != null && !todo.contains(importedLib)) {