Recognize nested pubspecs (issue 22907)

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:analysis_server/src/analysis_server.dart';
@@ skipping 317 matching lines @@
     try {
       children = folder.getChildren();
     } on FileSystemException {
       // The directory either doesn't exist or cannot be read. Either way, there
       // are no children that need to be added.
       return;
     }
     for (Resource child in children) {
       String path = child.path;
       // ignore excluded files or folders
-      if (_isExcluded(path)) {
+      if (_isExcluded(path) || info.excludes(path)) {
         continue;
       }
       // add files, recurse into folders
       if (child is File) {
         if (_shouldFileBeAnalyzed(child)) {
           Source source = createSourceInContext(info.context, child);
           changeSet.addedSource(source);
           info.sources[path] = source;
         }
       } else if (child is Folder) {
@@ skipping 44 matching lines @@
     info.changeSubscription = folder.changes.listen((WatchEvent event) {
       _handleWatchEvent(folder, info, event);
     });
     UriResolver packageUriResolver = _computePackageUriResolver(folder, info);
     info.context = addContext(folder, packageUriResolver);
     info.context.name = folder.path;
     return info;
   }
 
   /**
-   * Creates a new context associated with [folder].
+   * Potentially create a new context associated with the given [folder].
    *
-   * If there are subfolders with 'pubspec.yaml' files, separate contexts
-   * are created for them, and excluded from the context associated with
+   * If there are subfolders with 'pubspec.yaml' files, separate contexts are
+   * created for them and excluded from the context associated with the
    * [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].
+   * is a 'pubspec.yaml' file in the [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);
-    if (pubspecFile.exists) {
-      _ContextInfo info =
-          _createContextWithSources(folder, pubspecFile, <_ContextInfo>[]);
-      return [info];
-    }
     // try to find subfolders with pubspec files
     List<_ContextInfo> children = <_ContextInfo>[];
     try {
       for (Resource child in folder.getChildren()) {
         if (child is Folder) {
-          List<_ContextInfo> childContexts = _createContexts(child, true);
-          children.addAll(childContexts);
+          children.addAll(_createContexts(child, true));
         }
       }
     } on FileSystemException {
       // The directory either doesn't exist or cannot be read. Either way, there
       // are no subfolders that need to be added.
     }
+    // check whether there is a pubspec in the folder
+    File pubspecFile = folder.getChild(PUBSPEC_NAME);
+    if (pubspecFile.exists) {
+      return <_ContextInfo>[
+        _createContextWithSources(folder, pubspecFile, children)
+      ];
+    }
     // no pubspec, done
     if (withPubspecOnly) {
       return children;
     }
     // OK, create a context without a pubspec
-    _createContextWithSources(folder, pubspecFile, children);
-    return children;
+    return <_ContextInfo>[
+      _createContextWithSources(folder, pubspecFile, children)
+    ];
   }
 
   /**
    * 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);
@@ skipping 299 matching lines @@
     return excludes(resource.path);
   }
 
   /**
    * Returns `true` if [path] is the pubspec file of this context.
    */
   bool isPubspec(String path) {
     return path == pubspecPath;
   }
 }