Breaking changes in 'analyzer' package.

pkg/analyzer/lib/src/analyzer_impl.dart

 // Copyright (c) 2013, 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_impl;
 
 import 'dart:async';
 
 import 'dart:io';
 
-import 'package:path/path.dart' as pathos;
-
 import 'generated/constant.dart';
 import 'generated/engine.dart';
 import 'generated/element.dart';
 import 'generated/error.dart';
 import 'generated/java_io.dart';
 import 'generated/sdk.dart';
 import 'generated/sdk_io.dart';
 import 'generated/source_io.dart';
 import '../options.dart';
 
@@ skipping 59 matching lines @@
   /**
    * Setup local fields such as the analysis context for analysis.
    */
   void setupForAnalysis() {
     sources.clear();
     errorInfos.clear();
     if (sourcePath == null) {
       throw new ArgumentError("sourcePath cannot be null");
     }
     JavaFile sourceFile = new JavaFile(sourcePath);
-    UriKind uriKind = getUriKind(sourceFile);
-    librarySource = new FileBasedSource.con2(sourceFile, uriKind);
+    Uri uri = getUri(sourceFile);
+    librarySource = new FileBasedSource.con2(uri, sourceFile);
 
     // prepare context
     prepareAnalysisContext(sourceFile, librarySource);
   }
 
   /// The sync version of analysis.
   ErrorSeverity _analyzeSync(int printMode) {
     // don't try to analyze parts
     if (context.computeKindOf(librarySource) == SourceKind.PART) {
       print("Only libraries can be analyzed.");
@@ skipping 236 matching lines @@
       if (packagesDir.exists()) {
         return packagesDir;
       }
       dir = dir.getParentFile();
     }
     // not found
     return null;
   }
 
   /**
-   * Returns the [UriKind] for the given input file. Usually {@link UriKind#FILE_URI}, but if
-   * the given file is located in the "lib" directory of the [sdk], then returns
-   * {@link UriKind#DART_URI}.
+   * Returns the [Uri] for the given input file.
+   *
+   * Usually it is a `file:` [Uri], but if [file] is located in the `lib`
+   * directory of the [sdk], then returns a `dart:` [Uri].
    */
-  static UriKind getUriKind(JavaFile file) {
+  static Uri getUri(JavaFile file) {
     // may be file in SDK
-    if (sdk is DirectoryBasedDartSdk) {
-      DirectoryBasedDartSdk directoryBasedSdk = sdk;
-      var libraryDirectory = directoryBasedSdk.libraryDirectory.getAbsolutePath();
-      var sdkLibPath = libraryDirectory + pathos.separator;
-      var filePath = file.getPath();
-      if (filePath.startsWith(sdkLibPath)) {
-        var internalPath = pathos.join(libraryDirectory, '_internal') + pathos.separator;
-        if (!filePath.startsWith(internalPath)) {
-          return UriKind.DART_URI;
-        }
+    {
+      Source source = sdk.fromFileUri(file.toURI());
+      if (source != null) {
+        return source.uri;
       }
     }
     // some generic file
-    return UriKind.FILE_URI;
+    return file.toURI();
   }
 }
 
 /**
  * This [Logger] prints out information comments to [stdout] and error messages
  * to [stderr].
  */
 class StdLogger extends Logger {
   final bool log;
 
@@ skipping 16 matching lines @@
     }
   }
 
   @override
   void logInformation2(String message, Exception exception) {
     if (log) {
       stdout.writeln(message);
     }
   }
 }