Fixes for the 'pub' bot and 'analysis_server' on Windows.

pkg/analysis_server/lib/src/analysis_server.dart

 // Copyright (c) 2014, 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.
 
 library analysis.server;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 87 matching lines @@
  * [CommunicationChannel] for analysis requests and process them.
  */
 class AnalysisServer {
   /**
    * The channel from which requests are received and to which responses should
    * be sent.
    */
   final ServerCommunicationChannel channel;
 
   /**
+   * The [ResourceProvider] using which paths are converted into [Resource]s.
+   */
+  final ResourceProvider resourceProvider;
+
+  /**
    * The [Index] for this server.
    */
   final Index index;
 
   /**
    * The [SearchEngine] for this server.
    */
   SearchEngine searchEngine;
 
   /**
@@ skipping 68 matching lines @@
 
   /**
    * Initialize a newly created server to receive requests from and send
    * responses to the given [channel].
    *
    * If [rethrowExceptions] is true, then any exceptions thrown by analysis are
    * propagated up the call stack.  The default is true to allow analysis
    * exceptions to show up in unit tests, but it should be set to false when
    * running a full analysis server.
    */
-  AnalysisServer(this.channel, ResourceProvider resourceProvider,
+  AnalysisServer(this.channel, this.resourceProvider,
       PackageMapProvider packageMapProvider, this.index, this.defaultSdk,
       {this.rethrowExceptions: true}) {
     searchEngine = createSearchEngine(index);
     operationQueue = new ServerOperationQueue(this);
     contextDirectoryManager = new AnalysisServerContextDirectoryManager(
         this, resourceProvider, packageMapProvider);

[Brian Wilkerson, 2014/08/07 14:40:29]

We no longer need to pass the resource provider in explicitly because we're
passing in 'this' and can access it indirectly.

     AnalysisEngine.instance.logger = new AnalysisLogger();
     running = true;
     Notification notification = new Notification(SERVER_CONNECTED);
     channel.sendNotification(notification);
     channel.listen(handleRequest, onDone: done, onError: error);
   }
 
   /**
    * Schedules execution of the given [ServerOperation].
    */
@@ skipping 342 matching lines @@
     }
     return null;
   }
 
   /**
    * Return the [Source] of the Dart file with the given [path].
    */
   Source getSource(String path) {
     // try SDK
     {
-      Uri uri = toUri(path);
+      Uri uri = resourceProvider.pathContext.toUri(path);
       Source sdkSource = defaultSdk.fromFileUri(uri);
       if (sdkSource != null) {
         return sdkSource;
       }
     }
     // file-based source
-    File file = contextDirectoryManager.resourceProvider.getResource(path);
+    File file = resourceProvider.getResource(path);
     return file.createSource();
   }
 
   /**
    * Returns the [CompilationUnit] of the Dart file with the given [path] that
    * should be used to resend notifications for already resolved unit.
    * Returns `null` if the file is not a part of any context, library has not
    * been yet resolved, or any problem happened.
    */
   CompilationUnit getResolvedCompilationUnitToResendNotification(String path) {
@@ skipping 228 matching lines @@
 /**
  * An enumeration of the services provided by the server domain.
  */
 class ServerService extends Enum2<ServerService> {
   static const ServerService STATUS = const ServerService('STATUS', 0);
 
   static const List<ServerService> VALUES = const [STATUS];
 
   const ServerService(String name, int ordinal) : super(name, ordinal);
 }