Attempt to fix failures under Windows

pkg/analyzer/lib/src/dart/sdk/sdk.dart

 // Copyright (c) 2016, 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 analyzer.src.generated.sdk2;
 
 import 'dart:collection';
 import 'dart:io' as io;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 98 matching lines @@
   void set useSummary(bool use) {
     if (_analysisContext != null) {
       throw new StateError(
           'The "useSummary" flag cannot be changed after context creation.');
     }
     _useSummary = use;
   }
 
   @override
   Source fromFileUri(Uri uri) {
-    File file = resourceProvider.getFile(uri.toFilePath(windows: false));
-
+    bool isWindows = resourceProvider.pathContext == pathos.windows;
+    File file = resourceProvider.getFile(uri.toFilePath(windows: isWindows));

[scheglov, 2016/08/03 20:03:31]

Maybe pathos.fromUri(uri) to avoid checking for Windows explicitly.

[Brian Wilkerson, 2016/08/03 20:26:32]

Done

     String path = _getPath(file);
     if (path == null) {
       return null;
     }
     try {
       return file.createSource(parseUriWithException(path));
     } on URISyntaxException catch (exception, stackTrace) {
       AnalysisEngine.instance.logger.logInformation(
           "Failed to create URI: $path",
           new CaughtException(exception, stackTrace));
@@ skipping 28 matching lines @@
     }
     SdkLibrary library = getSdkLibrary(libraryName);
     if (library == null) {
       return null;
     }
     String srcPath;
     if (relativePath.isEmpty) {
       srcPath = library.path;
     } else {
       String libraryPath = library.path;
-      int index = libraryPath.lastIndexOf(resourceProvider.pathContext.separator);
+      int index =
+          libraryPath.lastIndexOf(resourceProvider.pathContext.separator);

[scheglov, 2016/08/03 20:03:31]

Maybe extract separator into a field or a getter to avoid long repetitive
expressions.

[Brian Wilkerson, 2016/08/03 20:26:32]

Done

       if (index == -1) {
         index = libraryPath.lastIndexOf('/');
         if (index == -1) {
           return null;
         }
       }
       String prefix = libraryPath.substring(0, index + 1);
       srcPath = '$prefix$relativePath';
     }
-    String filePath = srcPath.replaceAll('/', resourceProvider.pathContext.separator);
+    String filePath =
+        srcPath.replaceAll('/', resourceProvider.pathContext.separator);
     try {
       File file = resourceProvider.getFile(filePath);
       return file.createSource(parseUriWithException(dartUri));
     } on URISyntaxException {
       return null;
     }
   }
 
   @override
   Source mapDartUri(String dartUri) {
     Source source = _uriToSourceMap[dartUri];
     if (source == null) {
       source = internalMapDartUri(dartUri);
       _uriToSourceMap[dartUri] = source;
     }
     return source;
   }
 
   String _getPath(File file) {
     List<SdkLibrary> libraries = libraryMap.sdkLibraries;
     int length = libraries.length;
     List<String> paths = new List(length);
     String filePath = getRelativePathFromFile(file);
     if (filePath == null) {
       return null;
     }
     for (int i = 0; i < length; i++) {
       SdkLibrary library = libraries[i];
-      String libraryPath = library.path.replaceAll('/', resourceProvider.pathContext.separator);
+      String libraryPath =
+          library.path.replaceAll('/', resourceProvider.pathContext.separator);
       if (filePath == libraryPath) {
         return library.shortName;
       }
       paths[i] = libraryPath;
     }
     for (int i = 0; i < length; i++) {
       SdkLibrary library = libraries[i];
       String libraryPath = paths[i];
-      int index = libraryPath.lastIndexOf(resourceProvider.pathContext.separator);
+      int index =
+          libraryPath.lastIndexOf(resourceProvider.pathContext.separator);
       if (index >= 0) {
         String prefix = libraryPath.substring(0, index + 1);
         if (filePath.startsWith(prefix)) {
           String relPath = filePath
               .substring(prefix.length)
               .replaceAll(resourceProvider.pathContext.separator, '/');
           return '${library.shortName}/$relPath';
         }
       }
     }
@@ skipping 45 matching lines @@
     }
     SdkLibrary library = getSdkLibrary(libraryName);
     if (library == null) {
       return null;
     }
     String srcPath;
     if (relativePath.isEmpty) {
       srcPath = library.path;
     } else {
       String libraryPath = library.path;
-      int index = libraryPath.lastIndexOf(resourceProvider.pathContext.separator);
+      int index =
+          libraryPath.lastIndexOf(resourceProvider.pathContext.separator);
       if (index == -1) {
         index = libraryPath.lastIndexOf('/');
         if (index == -1) {
           return null;
         }
       }
       String prefix = libraryPath.substring(0, index + 1);
       srcPath = '$prefix$relativePath';
     }
-    String filePath = srcPath.replaceAll('/', resourceProvider.pathContext.separator);
+    String filePath =
+        srcPath.replaceAll('/', resourceProvider.pathContext.separator);
     try {
       File file = resourceProvider.getFile(filePath);
       return file.createSource(parseUriWithException(dartUri));
     } on URISyntaxException {
       return null;
     }
   }
 
   /**
    * Install the mapping from [name] to [libDir]/[file].
@@ skipping 205 matching lines @@
         .getChildAssumingFile(_LIBRARIES_FILE);
     yield libraryDirectory
         .getChildAssumingFolder(_INTERNAL_DIR)
         .getChildAssumingFile(_LIBRARIES_FILE);
   }
 
   @override
   String getRelativePathFromFile(File file) {
     String filePath = file.path;
     String libPath = libraryDirectory.path;
-    if (!filePath.startsWith("$libPath${resourceProvider.pathContext.separator}")) {
+    if (!filePath
+        .startsWith("$libPath${resourceProvider.pathContext.separator}")) {
       return null;
     }
     return filePath.substring(libPath.length + 1);
   }
 
   /**
    * Return the [PackageBundle] for this SDK, if it exists, or `null` otherwise.
    * This method should not be used outside of `analyzer` and `analyzer_cli`
    * packages.
    */
   PackageBundle getSummarySdkBundle(bool strongMode) {
     String rootPath = directory.path;
     String name = strongMode ? 'strong.sum' : 'spec.sum';
-    String path = resourceProvider.pathContext.join(rootPath, 'lib', '_internal', name);
+    String path =
+        resourceProvider.pathContext.join(rootPath, 'lib', '_internal', name);
     try {
       File file = resourceProvider.getFile(path);
       if (file.exists) {
         List<int> bytes = file.readAsBytesSync();
         return new PackageBundle.fromBuffer(bytes);
       }
     } catch (exception, stackTrace) {
       AnalysisEngine.instance.logger.logError(
           'Failed to load SDK analysis summary from $path',
           new CaughtException(exception, stackTrace));
@@ skipping 147 matching lines @@
     SdkLibrariesReader_LibraryBuilder libraryBuilder =
         new SdkLibrariesReader_LibraryBuilder(_useDart2jsPaths);
     // If any syntactic errors were found then don't try to visit the AST
     // structure.
     if (!errorListener.errorReported) {
       unit.accept(libraryBuilder);
     }
     return libraryBuilder.librariesMap;
   }
 }