Breaking changes in 'analyzer' package.

pkg/analyzer/lib/file_system/memory_file_system.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 memory_file_system;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/src/generated/engine.dart' show TimestampedData;
@@ skipping 142 matching lines @@
   @override
   bool get exists => false;
 
   String get _content {
     throw new MemoryResourceException(path, "File '$path' could not be read");
   }
 
   int get _timestamp => _provider._pathToTimestamp[path];
 
   @override
-  Source createSource(UriKind uriKind) {
+  Source createSource([Uri uri]) {
     throw new MemoryResourceException(path, "File '$path' could not be read");
   }
 }
 
 
 /**
  * An in-memory implementation of [File].
  */
 class _MemoryFile extends _MemoryResource implements File {
   _MemoryFile(MemoryResourceProvider provider, String path) :
       super(provider, path);
 
   String get _content {
     String content = _provider._pathToContent[path];
     if (content == null) {
       throw new MemoryResourceException(path, "File '$path' does not exist");
     }
     return content;
   }
 
   int get _timestamp => _provider._pathToTimestamp[path];
 
   @override
-  Source createSource(UriKind uriKind) {
-    return new _MemoryFileSource(this, uriKind);
+  Source createSource([Uri uri]) {
+    if (uri == null) {
+      uri = toUri(path);
+    }
+    return new _MemoryFileSource(this, uri);
   }
 }
 
 
 /**
  * An in-memory implementation of [Source].
  */
 class _MemoryFileSource implements Source {
   final _MemoryFile _file;
 
-  final UriKind uriKind;
+  final Uri uri;
 
-  _MemoryFileSource(this._file, this.uriKind);
+  _MemoryFileSource(this._file, this.uri);
 
   @override
   TimestampedData<String> get contents {
     return new TimestampedData<String>(modificationStamp, _file._content);
   }
 
   @override
   String get encoding {
-    return '${new String.fromCharCode(uriKind.encoding)}${_file.path}';
+    return uri.toString();
   }
 
   @override
   String get fullName => _file.path;
 
   @override
   int get hashCode => _file.hashCode;
 
   @override
   bool get isInSystemLibrary => uriKind == UriKind.DART_URI;
 
   @override
   int get modificationStamp => _file._timestamp;
 
   @override
   String get shortName => _file.shortName;
 
   @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
   bool operator ==(other) {
     if (other is _MemoryFileSource) {
       return other._file == _file;
     }
     return false;
   }
 
   @override
   bool exists() => _file.exists;
 
   @override
-  Source resolveRelative(Uri relativeUri) {
-    String relativePath = posix.fromUri(relativeUri);
-    String folderPath = posix.dirname(_file.path);
-    String path = posix.join(folderPath, relativePath);
-    path = posix.normalize(path);
-    _MemoryFile file = new _MemoryFile(_file._provider, path);
-    return new _MemoryFileSource(file, uriKind);
+  Uri resolveRelativeUri(Uri relativeUri) {
+    return uri.resolveUri(relativeUri);
   }
 }
 
 
 /**
  * An in-memory implementation of [Folder].
  */
 class _MemoryFolder extends _MemoryResource implements Folder {
   _MemoryFolder(MemoryResourceProvider provider, String path) :
       super(provider, path);
@@ skipping 75 matching lines @@
   bool operator ==(other) {
     if (runtimeType != other.runtimeType) {
       return false;
     }
     return path == other.path;
   }
 
   @override
   String toString() => path;
 }