AnalysisServer fixes

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

Index: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/ParseLibraryFileTask.java
===================================================================
--- editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/ParseLibraryFileTask.java	(revision 5855)
+++ editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/ParseLibraryFileTask.java	(working copy)
@@ -19,6 +19,7 @@
 import static com.google.dart.tools.core.analysis.AnalysisUtility.parse;
 
 import java.io.File;
+import java.net.URI;
 
 /**
  * Parse a library source file and create the associated {@link Library}
@@ -33,7 +34,10 @@
     this.server = server;
     this.context = context;
     this.libraryFile = libraryFile;
-    this.librarySource = new UrlLibrarySource(libraryFile.toURI(), server.getLibraryManager());
+    URI fileUri = libraryFile.toURI();
+    URI shortUri = server.getLibraryManager().getShortUri(fileUri);
+    URI libUri = shortUri != null ? shortUri : fileUri;
+    this.librarySource = new UrlLibrarySource(libUri, server.getLibraryManager());
   }
 
   @Override