Issue 22617. Add/remove overlay-only sources to their containing contexts.

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 'dart:collection';
 import 'dart:math' show max;
 
@@ skipping 1020 matching lines @@
               error: new RequestError(RequestErrorCode.INVALID_OVERLAY_CHANGE,
                   'Invalid overlay change')));
         }
       } else if (change is RemoveContentOverlay) {
         newContents = null;
       } else {
         // Protocol parsing should have ensured that we never get here.
         throw new AnalysisException('Illegal change type');
       }
       overlayState.setContents(source, newContents);
+      // If the source does not exist, then it was an overlay-only one.
+      // Remove it from contexts.
+      if (newContents == null && !source.exists()) {
+        for (InternalAnalysisContext context in folderMap.values) {
+          List<Source> sources = context.getSourcesWithFullName(file);
+          ChangeSet changeSet = new ChangeSet();
+          sources.forEach(changeSet.removedSource);
+          context.applyChanges(changeSet);
+          schedulePerformAnalysisOperation(context);
+        }
+        return;
+      }
       // Update all contexts.
+      bool anyContextUpdated = false;
       for (InternalAnalysisContext context in folderMap.values) {
         List<Source> sources = context.getSourcesWithFullName(file);
         sources.forEach((Source source) {
+          anyContextUpdated = true;
           if (context.handleContentsChanged(
               source, oldContents, newContents, true)) {
             schedulePerformAnalysisOperation(context);
           } else {
             // When the client sends any change for a source, we should resend
             // subscribed notifications, even if there were no changes in the
             // source contents.
             // TODO(scheglov) consider checking if there are subscriptions.
             if (AnalysisEngine.isDartFileName(file)) {
               List<CompilationUnit> dartUnits =
                   context.ensureResolvedDartUnits(source);
               if (dartUnits != null) {
                 AnalysisErrorInfo errorInfo = context.getErrors(source);
                 for (var dartUnit in dartUnits) {
                   scheduleNotificationOperations(this, file, errorInfo.lineInfo,
                       context, null, dartUnit, errorInfo.errors);
                   scheduleIndexOperation(this, file, context, dartUnit);
                 }
               } else {
                 schedulePerformAnalysisOperation(context);
               }
             }
           }
         });
       }
+      // The source is not analyzed by any context, add to the containing one.
+      if (!anyContextUpdated) {
+        AnalysisContext context = contextSource.context;
+        if (context != null && source != null) {
+          ChangeSet changeSet = new ChangeSet();
+          changeSet.addedSource(source);
+          context.applyChanges(changeSet);
+          schedulePerformAnalysisOperation(context);
+        }
+      }
     });
   }
 
   /**
    * Use the given updaters to update the values of the options in every
    * existing analysis context.
    */
   void updateOptions(List<OptionUpdater> optionUpdaters) {
     //
     // Update existing contexts.
@@ skipping 343 matching lines @@
   /**
    * The [PerformanceTag] for time spent in server request handlers.
    */
   static PerformanceTag serverRequests = new PerformanceTag('serverRequests');
 
   /**
    * The [PerformanceTag] for time spent in split store microtasks.
    */
   static PerformanceTag splitStore = new PerformanceTag('splitStore');
 }