Create package: URIs everywhere

pkg/analysis_server/lib/src/context_manager.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 context.directory.manager;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 254 matching lines @@
           continue;
         }
         // ignore if was not excluded
         bool wasExcluded =
             _isExcludedBy(oldExcludedPaths, path) &&
             !_isExcludedBy(excludedPaths, path);
         if (!wasExcluded) {
           continue;
         }
         // do add the file
-        Source source = child.createSource();
+        Source source = createSourceInContext(info.context, child);
         changeSet.addedSource(source);
         info.sources[path] = source;
       } else if (child is Folder) {
         if (child.shortName == PACKAGES_NAME) {
           continue;
         }
         _addPreviouslyExcludedSources(info, changeSet, child, oldExcludedPaths);
       }
     }
   }
 
   /**
    * Resursively adds all Dart and HTML files to the [changeSet].
    */
-  void _addSourceFiles(ChangeSet changeSet, Folder folder, _ContextInfo info,
-      bool pubspecExists, bool createPackageUri) {
+  void _addSourceFiles(ChangeSet changeSet, Folder folder, _ContextInfo info) {
     if (info.excludesResource(folder) || folder.shortName.startsWith('.')) {
       return;
     }
     List<Resource> children = folder.getChildren();
     for (Resource child in children) {
       String path = child.path;
       // ignore excluded files or folders
       if (_isExcluded(path)) {
         continue;
       }
       // add files, recurse into folders
       if (child is File) {
         if (_shouldFileBeAnalyzed(child)) {
-          Source source = child.createSource();
-          if (createPackageUri) {
-            //
-            // It should be possible to generate the uri by executing:
-            //
-            //   Uri uri = info.context.sourceFactory.restoreUri(source);
-            //
-            // but for some reason this doesn't produce the same result as the
-            // code below. This needs to be investigated.
-            // (See https://code.google.com/p/dart/issues/detail?id=22463).
-            //
-            String packagePath = info.folder.path;
-            String packageName =
-                resourceProvider.pathContext.basename(packagePath);
-            String libPath =
-                resourceProvider.pathContext.join(packagePath, LIB_DIR_NAME);
-            String relPath = source.fullName.substring(libPath.length);
-            Uri uri =
-                Uri.parse('${PackageMapUriResolver.PACKAGE_SCHEME}:$packageName$relPath');
-            source = child.createSource(uri);
-          }
+          Source source = createSourceInContext(info.context, child);
           changeSet.addedSource(source);
           info.sources[path] = source;
         }
       } else if (child is Folder) {
         String shortName = child.shortName;
         if (shortName == PACKAGES_NAME) {
           continue;
         }
-        if (pubspecExists &&
-            !createPackageUri &&
-            shortName == LIB_DIR_NAME &&
-            child.parent == info.folder) {
-          _addSourceFiles(changeSet, child, info, pubspecExists, true);
-        } else {
-          _addSourceFiles(
-              changeSet,
-              child,
-              info,
-              pubspecExists,
-              createPackageUri);
-        }
+        _addSourceFiles(changeSet, child, info);
       }
     }
   }
 
   /**
    * Compute the appropriate package URI resolver for [folder], and store
    * dependency information in [info]. Return `null` if no package map can
    * be computed.
    */
   UriResolver _computePackageUriResolver(Folder folder, _ContextInfo info) {
@@ skipping 30 matching lines @@
     _contexts[folder] = info;
     info.changeSubscription = folder.changes.listen((WatchEvent event) {
       _handleWatchEvent(folder, info, event);
     });
     UriResolver packageUriResolver = _computePackageUriResolver(folder, info);
     info.context = addContext(folder, packageUriResolver);
     return info;
   }
 
   /**
+   * Create a new context associated with the given [folder]. The [pubspecFile]
+   * is the `pubspec.yaml` file contained in the folder. Add any sources that
+   * are not included in one of the [children] to the context.
+   */
+  _ContextInfo _createContextWithSources(Folder folder, File pubspecFile,
+      List<_ContextInfo> children) {
+    _ContextInfo info = _createContext(folder, pubspecFile, children);
+    ChangeSet changeSet = new ChangeSet();
+    _addSourceFiles(changeSet, folder, info);
+    applyChangesToContext(folder, changeSet);
+    return info;
+  }
+
+  /**
    * Creates a new context associated with [folder].
    *
    * If there are subfolders with 'pubspec.yaml' files, separate contexts
    * are created for them, and excluded from the context associated with
    * [folder].
    *
    * If [folder] itself contains a 'pubspec.yaml' file, subfolders are ignored.
    *
    * If [withPubspecOnly] is `true`, a context will be created only if there
    * is a 'pubspec.yaml' file in [folder].
    *
    * Returns create pubspec-based contexts.
    */
   List<_ContextInfo> _createContexts(Folder folder, bool withPubspecOnly) {
     // check whether there is a pubspec in the folder
     File pubspecFile = folder.getChild(PUBSPEC_NAME);
-    bool pubspecExists = pubspecFile.exists;
-    if (pubspecExists) {
-      _ContextInfo info = _createContextWithSources(
-          folder,
-          pubspecFile,
-          pubspecExists,
-          <_ContextInfo>[]);
+    if (pubspecFile.exists) {
+      _ContextInfo info =
+          _createContextWithSources(folder, pubspecFile, <_ContextInfo>[]);
       return [info];
     }
     // try to find subfolders with pubspec files
     List<_ContextInfo> children = <_ContextInfo>[];
     for (Resource child in folder.getChildren()) {
       if (child is Folder) {
         List<_ContextInfo> childContexts = _createContexts(child, true);
         children.addAll(childContexts);
       }
     }
     // no pubspec, done
     if (withPubspecOnly) {
       return children;
     }
     // OK, create a context without a pubspec
-    _createContextWithSources(folder, pubspecFile, pubspecExists, children);
+    _createContextWithSources(folder, pubspecFile, children);
     return children;
   }
 
   /**
-   * Create a new context associated with the given [folder]. The [pubspecFile]
-   * is the `pubspec.yaml` file contained in the folder, and [pubspecExists] is
-   * `true` if the file exists. Add any sources that are not included in one of
-   * the [children] to the context.
-   */
-  _ContextInfo _createContextWithSources(Folder folder, File pubspecFile,
-      bool pubspecExists, List<_ContextInfo> children) {
-    _ContextInfo info = _createContext(folder, pubspecFile, children);
-    ChangeSet changeSet = new ChangeSet();
-    _addSourceFiles(changeSet, folder, info, pubspecExists, false);
-    applyChangesToContext(folder, changeSet);
-    return info;
-  }
-
-  /**
    * Clean up and destroy the context associated with the given folder.
    */
   void _destroyContext(Folder folder) {
     _contexts[folder].changeSubscription.cancel();
     _contexts.remove(folder);
     removeContext(folder);
   }
 
   /**
    * Extract a new [pubspecFile]-based context from [oldInfo].
@@ skipping 51 matching lines @@
           _extractContext(info, resource);
           return;
         }
         // If the file went away and was replaced by a folder before we
         // had a chance to process the event, resource might be a Folder.  In
         // that case don't add it.
         if (resource is File) {
           File file = resource;
           if (_shouldFileBeAnalyzed(file)) {
             ChangeSet changeSet = new ChangeSet();
-            Source source = file.createSource();
+            Source source = createSourceInContext(info.context, file);
             changeSet.addedSource(source);
             applyChangesToContext(folder, changeSet);
             info.sources[path] = source;
           }
         }
         break;
       case ChangeType.REMOVE:
         // pubspec was removed, merge the context into its parent
         if (info.isPubspec(path) && !info.isRoot) {
           _mergeContext(info);
@@ skipping 84 matching lines @@
   void _recomputePackageUriResolver(_ContextInfo info) {
     // TODO(paulberry): when computePackageMap is changed into an
     // asynchronous API call, we'll want to suspend analysis for this context
     // while we're rerunning "pub list", since any analysis we complete while
     // "pub list" is in progress is just going to get thrown away anyhow.
     UriResolver packageUriResolver =
         _computePackageUriResolver(info.folder, info);
     updateContextPackageUriResolver(info.folder, packageUriResolver);
   }
 
+  /**
+   * Create and return a source representing the given [file] within the given
+   * [context].
+   */
+  static Source createSourceInContext(AnalysisContext context, File file) {
+    // TODO(brianwilkerson) Optimize this, by allowing support for source
+    // factories to restore URI's from a file path rather than a source.
+    Source source = file.createSource();
+    if (context == null) {
+      return source;
+    }
+    Uri uri = context.sourceFactory.restoreUri(source);
+    return file.createSource(uri);
+  }
+
   static bool _shouldFileBeAnalyzed(File file) {
     if (!(AnalysisEngine.isDartFileName(file.path) ||
         AnalysisEngine.isHtmlFileName(file.path))) {
       return false;
     }
     // Emacs creates dummy links to track the fact that a file is open for
     // editing and has unsaved changes (e.g. having unsaved changes to
     // 'foo.dart' causes a link '.#foo.dart' to be created, which points to the
     // non-existent file 'username@hostname.pid'.  To avoid these dummy links
     // causing the analyzer to thrash, just ignore links to non-existent files.
@@ skipping 81 matching lines @@
     return excludes(resource.path);
   }
 
   /**
    * Returns `true` if [path] is the pubspec file of this context.
    */
   bool isPubspec(String path) {
     return path == pubspecPath;
   }
 }