Fix for issue 22709

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:collection';
 import 'dart:io';
 
@@ skipping 126 matching lines @@
    * synchronous algorithm over the analysis engine. If [printMode] is `0`,
    * then no error or performance information is printed. If [printMode] is `1`,
    * then both will be printed. If [printMode] is `2`, then only performance
    * information will be printed, and it will be marked as being for a cold VM.
    */
   ErrorSeverity analyzeSync({int printMode: 1}) {
     setupForAnalysis();
     return _analyzeSync(printMode);
   }
 
-  void prepareAnalysisContext(JavaFile sourceFile, Source source) {
+  Source computeLibrarySource() {
+    JavaFile sourceFile = new JavaFile(sourcePath);
+    Source source = sdk.fromFileUri(sourceFile.toURI());
+    if (source != null) {
+      return source;
+    }
+    source = new FileBasedSource.con2(sourceFile.toURI(), sourceFile);
+    Uri uri = context.sourceFactory.restoreUri(source);
+    return new FileBasedSource.con2(uri, sourceFile);
+  }
+
+  /**
+   * Create and return the source factory to be used by the analysis context.
+   */
+  SourceFactory createSourceFactory() {
     List<UriResolver> resolvers = [
       new CustomUriResolver(options.customUrlMappings),
-      new DartUriResolver(sdk),
-      new FileUriResolver()
+      new DartUriResolver(sdk)
     ];
-    // maybe add package resolver
-    {
-      JavaFile packageDirectory;
-      if (options.packageRootPath != null) {
-        packageDirectory = new JavaFile(options.packageRootPath);
-        resolvers.add(new PackageUriResolver([packageDirectory]));
-      } else {
-        PubPackageMapProvider pubPackageMapProvider =
-            new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
-        PackageMapInfo packageMapInfo = pubPackageMapProvider.computePackageMap(
-            PhysicalResourceProvider.INSTANCE.getResource('.'));
-        Map<String, List<Folder>> packageMap = packageMapInfo.packageMap;
-        if (packageMap != null) {
-          resolvers.add(new PackageMapUriResolver(
-              PhysicalResourceProvider.INSTANCE, packageMap));
-        }
+    if (options.packageRootPath != null) {
+      JavaFile packageDirectory = new JavaFile(options.packageRootPath);
+      resolvers.add(new PackageUriResolver([packageDirectory]));
+    } else {
+      PubPackageMapProvider pubPackageMapProvider =
+          new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
+      PackageMapInfo packageMapInfo = pubPackageMapProvider.computePackageMap(
+          PhysicalResourceProvider.INSTANCE.getResource('.'));
+      Map<String, List<Folder>> packageMap = packageMapInfo.packageMap;
+      if (packageMap != null) {
+        resolvers.add(new PackageMapUriResolver(
+            PhysicalResourceProvider.INSTANCE, packageMap));
       }
     }
-    sourceFactory = new SourceFactory(resolvers);
+    resolvers.add(new FileUriResolver());
+    return new SourceFactory(resolvers);
+  }
+
+  void prepareAnalysisContext() {
+    sourceFactory = createSourceFactory();
     context = AnalysisEngine.instance.createAnalysisContext();
     context.sourceFactory = sourceFactory;
     Map<String, String> definedVariables = options.definedVariables;
     if (!definedVariables.isEmpty) {
       DeclaredVariables declaredVariables = context.declaredVariables;
       definedVariables.forEach((String variableName, String value) {
         declaredVariables.define(variableName, value);
       });
     }
     // Uncomment the following to have errors reported on stdout and stderr
     AnalysisEngine.instance.logger = new StdLogger(options.log);
 
     // set options for context
     AnalysisOptionsImpl contextOptions = new AnalysisOptionsImpl();
     contextOptions.cacheSize = _MAX_CACHE_SIZE;
     contextOptions.hint = !options.disableHints;
     contextOptions.analyzeFunctionBodiesPredicate =
         _analyzeFunctionBodiesPredicate;
     contextOptions.generateImplicitErrors = options.showPackageWarnings;
     contextOptions.generateSdkErrors = options.showSdkWarnings;
     context.analysisOptions = contextOptions;
 
+    librarySource = computeLibrarySource();
+
     // Create and add a ChangeSet
     ChangeSet changeSet = new ChangeSet();
-    changeSet.addedSource(source);
+    changeSet.addedSource(librarySource);
     context.applyChanges(changeSet);
   }
 
   /// Fills [errorInfos] using [sources].
   void prepareErrors() {
     for (Source source in sources) {
       context.computeErrors(source);
       var sourceErrors = context.getErrors(source);
       errorInfos.add(sourceErrors);
     }
   }
 
   /// Fills [sources].
   void prepareSources(LibraryElement library) {
     var units = new Set<CompilationUnitElement>();
     var libraries = new Set<LibraryElement>();
     addLibrarySources(library, libraries, units);
   }
 
   /**
    * 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);
-    Uri uri = getUri(sourceFile);
-    librarySource = new FileBasedSource.con2(uri, sourceFile);
-
     // prepare context
-    prepareAnalysisContext(sourceFile, librarySource);
+    prepareAnalysisContext();
   }
 
   /// The async version of the analysis
   void _analyzeAsync() {
     new Future(context.performAnalysisTask).then((AnalysisResult result) {
       List<ChangeNotice> notices = result.changeNotices;
       if (result.hasMoreWork) {
         // There is more work, record the set of sources, and then call self
         // again to perform next task
         for (ChangeNotice notice in notices) {
@@ skipping 155 matching lines @@
       if (packagesDir.exists()) {
         return packagesDir;
       }
       dir = dir.getParentFile();
     }
     // not found
     return null;
   }
 
   /**
-   * 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 Uri getUri(JavaFile file) {
-    // may be file in SDK
-    {
-      Source source = sdk.fromFileUri(file.toURI());
-      if (source != null) {
-        return source.uri;
-      }
-    }
-    // some generic file
-    return file.toURI();
-  }
-
-  /**
    * Convert [sourcePath] into an absolute path.
    */
   static String _normalizeSourcePath(String sourcePath) {
     return new File(sourcePath).absolute.path;
   }
 }
 
 /**
  * This [Logger] prints out information comments to [stdout] and error messages
  * to [stderr].
@@ skipping 26 matching lines @@
     }
   }
 
   @override
   void logInformation2(String message, Object exception) {
     if (log) {
       stdout.writeln(message);
     }
   }
 }