Make ContextDirectoryManager responsible for scanning directory contents.

pkg/analysis_server/lib/src/analysis_server.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 analysis.server;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_logger.dart';
 import 'package:analysis_server/src/channel.dart';
@@ skipping 16 matching lines @@
  * [AnalysisServer] instances to improve performance.
  */
 final DirectoryBasedDartSdk SHARED_SDK = DirectoryBasedDartSdk.defaultSdk;
 
 class AnalysisServerContextDirectoryManager extends ContextDirectoryManager {
   final AnalysisServer analysisServer;
 
   AnalysisServerContextDirectoryManager(this.analysisServer, ResourceProvider resourceProvider)
       : super(resourceProvider);
 
-  void addContext(Folder folder) {
-    PubFolder pubFolder = new PubFolder(analysisServer.defaultSdk, folder);
+  void addContext(Folder folder, File pubspecFile) {
+    PubFolder pubFolder = new PubFolder(analysisServer.defaultSdk, folder, pubspecFile);
     analysisServer.folderMap[folder] = pubFolder;
     analysisServer.addContextToWorkQueue(pubFolder.context);
   }
+
+  void applyChangesToContext(Folder contextFolder, ChangeSet changeSet) {
+    analysisServer.folderMap[contextFolder].context.applyChanges(changeSet);
+  }
 }
 
 /**
  * Instances of the class [AnalysisServer] implement a server that listens on a
  * [CommunicationChannel] for analysis requests and process them.
  */
 class AnalysisServer {
   /**
    * The name of the parameter whose value is a list of errors.
    */
@@ skipping 377 matching lines @@
 
 
 /**
  * Instances of [PubFolder] represents a [Folder] with a Pub `pubspec.yaml`.
  *
  * TODO(scheglov) implement complete projects/contexts semantics.
  *
  * This class is intentionally simplified to serve as a base to start working
  * on services while work on complete semantics is being done in parallel.
  */
 class PubFolder {

[danrubel, 2014/05/29 12:07:19]

This now represents an analysis root folder which may or may not have a pubspec.
Perhaps update the comment and rename the class to reflect this?
AnalysisRootFolder or something like that?

[Paul Berry, 2014/05/29 15:22:17]

Ok, will do in a future CL.

   /**
    * The root [Folder] of this [PubFolder].
    */
   final Folder _folder;
 
   /**
-   * The `pubspec.yaml` file in [_folder].
+   * The `pubspec.yaml` file in [_folder], or null if there isn't one.
    */
   File _pubspecFile;
 
   /**
    * The [AnalysisContext] of this [_folder].
    */
   AnalysisContext _context;
 
-  PubFolder(DartSdk sdk, this._folder) {
-    // prepare pubspec.yaml
-    _pubspecFile = _folder.getChild('pubspec.yaml');
-    if (!_pubspecFile.exists) {
-      throw new ArgumentError('$_pubspecFile does not exist');
-    }
+  PubFolder(DartSdk sdk, this._folder, this._pubspecFile) {
     // create AnalysisContext
     _context = AnalysisEngine.instance.createAnalysisContext();
     // TODO(scheglov) replace FileUriResolver with an Resource based resolver
     // TODO(scheglov) create packages resolver
     _context.sourceFactory = new SourceFactory([
       new DartUriResolver(sdk),
       new FileUriResolver(),
       // new PackageUriResolver(),
     ]);
-    // add folder files
-    {
-      ChangeSet changeSet = new ChangeSet();
-      _addSourceFiles(changeSet, _folder);
-      _context.applyChanges(changeSet);
-    }
   }
 
   /**
    * Return the [AnalysisContext] of this folder.
    */
   AnalysisContext get context => _context;
-
-  /**
-   * Resursively adds all Dart and HTML files to the [changeSet].
-   */
-  static void _addSourceFiles(ChangeSet changeSet, Folder folder) {
-    List<Resource> children = folder.getChildren();
-    for (Resource child in children) {
-      if (child is File) {
-        String fileName = child.shortName;
-        if (AnalysisEngine.isDartFileName(fileName)
-            || AnalysisEngine.isHtmlFileName(fileName)) {
-          Source source = child.createSource(UriKind.FILE_URI);
-          changeSet.addedSource(source);
-        }
-      } else if (child is Folder) {
-        _addSourceFiles(changeSet, child);
-      }
-    }
-  }
 }
 
 
 /**
  * An enumeration of the services provided by the server domain.
  */
 class ServerService extends Enum2<ServerService> {
   static const ServerService STATUS = const ServerService('STATUS', 0);
 
   static const List<ServerService> VALUES = const [STATUS];
 
   const ServerService(String name, int ordinal) : super(name, ordinal);
 }