Breaking changes in 'analyzer' package.

pkg/analyzer/lib/src/generated/source_io.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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.source.io;
 
 import 'source.dart';
 import 'java_core.dart';
 import 'java_io.dart';
 import 'utilities_general.dart';
 import 'instrumentation.dart';
 import 'engine.dart';
+import 'java_engine.dart';
 export 'source.dart';
 
 /**
  * Instances of the class [DirectoryBasedSourceContainer] represent a source container that
  * contains all sources within a given directory.
  */
 class DirectoryBasedSourceContainer implements SourceContainer {
   /**
    * Append the system file separator to the given path unless the path already ends with a
    * separator.
@@ skipping 51 matching lines @@
 
   @override
   String toString() => "SourceContainer[${_path}]";
 }
 
 /**
  * Instances of the class `FileBasedSource` implement a source that represents a file.
  */
 class FileBasedSource implements Source {
   /**
+   * The URI from which this source was originally derived.
+   */
+  final Uri uri;
+
+  /**
    * The file represented by this source.
    */
   final JavaFile file;
 
   /**
    * The cached encoding for this source.
    */
   String _encoding;
 
   /**
-   * The kind of URI from which this source was originally derived.
-   */
-  final UriKind uriKind;
-
-  /**
-   * Initialize a newly created source object. The source object is assumed to not be in a system
-   * library.
-   *
-   * @param file the file represented by this source
-   */
-  FileBasedSource.con1(JavaFile file) : this.con2(file, UriKind.FILE_URI);
-
-  /**
    * Initialize a newly created source object.
    *
    * @param file the file represented by this source
-   * @param flags `true` if this source is in one of the system libraries
    */
-  FileBasedSource.con2(this.file, this.uriKind);
+  FileBasedSource.con1(JavaFile file) : this.con2(file.toURI(), file);
+
+  /**
+   * Initialize a newly created source object.
+   *
+   * @param file the file represented by this source
+   * @param uri the URI from which this source was originally derived
+   */
+  FileBasedSource.con2(this.uri, this.file);
 
   @override
   bool operator ==(Object object) => object != null && object is FileBasedSource && file == object.file;
 
   @override
   bool exists() => file.isFile();
 
   @override
   TimestampedData<String> get contents {
     TimeCounter_TimeCounterHandle handle = PerformanceStatistics.io.start();
     try {
       return contentsFromFile;
     } finally {
       _reportIfSlowIO(handle.stop());
     }
   }
 
   @override
   String get encoding {
     if (_encoding == null) {
-      _encoding = "${new String.fromCharCode(uriKind.encoding)}${file.toURI().toString()}";
+      _encoding = uri.toString();
     }
     return _encoding;
   }
 
   @override
   String get fullName => file.getAbsolutePath();
 
   @override
   int get modificationStamp => file.lastModified();
 
   @override
   String get shortName => file.getName();
 
   @override
+  UriKind get uriKind {
+    String scheme = uri.scheme;
+    if (scheme == PackageUriResolver.PACKAGE_SCHEME) {
+      return UriKind.PACKAGE_URI;
+    } else if (scheme == DartUriResolver.DART_SCHEME) {
+      return UriKind.DART_URI;
+    } else if (scheme == FileUriResolver.FILE_SCHEME) {
+      return UriKind.FILE_URI;
+    }
+    return UriKind.FILE_URI;
+  }
+
+  @override
   int get hashCode => file.hashCode;
 
   @override
-  bool get isInSystemLibrary => uriKind == UriKind.DART_URI;
+  bool get isInSystemLibrary => uri.scheme == DartUriResolver.DART_SCHEME;
 
   @override
-  Source resolveRelative(Uri containedUri) {
+  Uri resolveRelativeUri(Uri containedUri) {
     try {
-      Uri resolvedUri = file.toURI().resolveUri(containedUri);
-      return new FileBasedSource.con2(new JavaFile.fromUri(resolvedUri), uriKind);
-    } catch (exception) {
+      Uri baseUri = uri;
+      bool isOpaque = uri.isAbsolute && !uri.path.startsWith('/');
+      if (isOpaque) {
+        String scheme = uri.scheme;
+        String part = uri.path;
+        if (scheme == DartUriResolver.DART_SCHEME && part.indexOf('/') < 0) {
+          part = "${part}/${part}.dart";
+        }
+        baseUri = parseUriWithException("${scheme}:/${part}");
+      }
+      Uri result = baseUri.resolveUri(containedUri);
+      if (isOpaque) {
+        result = parseUriWithException("${result.scheme}:${result.path.substring(1)}");
+      }
+      return result;
+    } catch (exception, stackTrace) {
+      throw new AnalysisException("Could not resolve URI (${containedUri}) relative to source (${uri})", new CaughtException(exception, stackTrace));
     }
-    return null;
   }
 
   @override
   String toString() {
     if (file == null) {
       return "<unknown source>";
     }
     return file.getAbsolutePath();
   }
 
@@ skipping 40 matching lines @@
 
   /**
    * Return `true` if the given URI is a `file` URI.
    *
    * @param uri the URI being tested
    * @return `true` if the given URI is a `file` URI
    */
   static bool isFileUri(Uri uri) => uri.scheme == FILE_SCHEME;
 
   @override
-  Source fromEncoding(UriKind kind, Uri uri) {
-    if (kind == UriKind.FILE_URI) {
-      return new FileBasedSource.con2(new JavaFile.fromUri(uri), kind);
-    }
-    return null;
-  }
-
-  @override
   Source resolveAbsolute(Uri uri) {
     if (!isFileUri(uri)) {
       return null;
     }
-    return new FileBasedSource.con1(new JavaFile.fromUri(uri));
+    return new FileBasedSource.con2(uri, new JavaFile.fromUri(uri));
   }
 }
 
 /**
  * Instances of interface `LocalSourcePredicate` are used to determine if the given
  * [Source] is "local" in some sense, so can be updated.
  */
 abstract class LocalSourcePredicate {
   /**
    * Instance of [LocalSourcePredicate] that always returns `false`.
@@ skipping 74 matching lines @@
    * @param packagesDirectories the package directories that `package` URI's are assumed to be
    *          relative to
    */
   PackageUriResolver(this._packagesDirectories) {
     if (_packagesDirectories.length < 1) {
       throw new IllegalArgumentException("At least one package directory must be provided");
     }
   }
 
   @override
-  Source fromEncoding(UriKind kind, Uri uri) {
-    if (kind == UriKind.PACKAGE_URI) {
-      return new FileBasedSource.con2(new JavaFile.fromUri(uri), kind);
-    }
-    return null;
-  }
-
-  @override
   Source resolveAbsolute(Uri uri) {
     if (!isPackageUri(uri)) {
       return null;
     }
     String path = uri.path;
     if (path == null) {
       path = uri.path;
       if (path == null) {
         return null;
       }
@@ skipping 10 matching lines @@
       return null;
     } else {
       // <pkgName>/<relPath>
       pkgName = path.substring(0, index);
       relPath = path.substring(index + 1);
     }
     for (JavaFile packagesDirectory in _packagesDirectories) {
       JavaFile resolvedFile = new JavaFile.relative(packagesDirectory, path);
       if (resolvedFile.exists()) {
         JavaFile canonicalFile = getCanonicalFile(packagesDirectory, pkgName, relPath);
-        UriKind uriKind = _isSelfReference(packagesDirectory, canonicalFile) ? UriKind.FILE_URI : UriKind.PACKAGE_URI;
-        return new FileBasedSource.con2(canonicalFile, uriKind);
+        if (_isSelfReference(packagesDirectory, canonicalFile)) {
+          uri = canonicalFile.toURI();
+        }
+        return new FileBasedSource.con2(uri, canonicalFile);
       }
     }
-    return new FileBasedSource.con2(getCanonicalFile(_packagesDirectories[0], pkgName, relPath), UriKind.PACKAGE_URI);
+    return new FileBasedSource.con2(uri, getCanonicalFile(_packagesDirectories[0], pkgName, relPath));
   }
 
   @override
   Uri restoreAbsolute(Source source) {
     if (source is FileBasedSource) {
       String sourcePath = source.file.getPath();
       for (JavaFile packagesDirectory in _packagesDirectories) {
         List<JavaFile> pkgFolders = packagesDirectory.listFiles();
         if (pkgFolders != null) {
           for (JavaFile pkgFolder in pkgFolders) {
@@ skipping 78 matching lines @@
    */
   final JavaFile _rootDirectory;
 
   /**
    * Initialize a newly created resolver to resolve `file` URI's relative to the given root
    * directory.
    */
   RelativeFileUriResolver(this._rootDirectory, this._relativeDirectories) : super();
 
   @override
-  Source fromEncoding(UriKind kind, Uri uri) {
-    if (kind == UriKind.FILE_URI) {
-      return new FileBasedSource.con2(new JavaFile.fromUri(uri), kind);
-    }
-    return null;
-  }
-
-  @override
   Source resolveAbsolute(Uri uri) {
     String rootPath = _rootDirectory.toURI().path;
     String uriPath = uri.path;
     if (uriPath != null && uriPath.startsWith(rootPath)) {
       String filePath = uri.path.substring(rootPath.length);
       for (JavaFile dir in _relativeDirectories) {
         JavaFile file = new JavaFile.relative(dir, filePath);
         if (file.exists()) {
-          return new FileBasedSource.con2(file, UriKind.FILE_URI);
+          return new FileBasedSource.con2(uri, file);
         }
       }
     }
     return null;
   }
 }