Move cache consistency validation into Analysis Server.

pkg/analysis_server/lib/src/operation/operation_analysis.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 operation.analysis;
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_highlights.dart';
 import 'package:analysis_server/src/computer/computer_navigation.dart';
 import 'package:analysis_server/src/computer/computer_occurrences.dart';
@@ skipping 222 matching lines @@
     //
     // AnalysisResult result = context.performAnalysisTask((taskDescription) {
     //   sendStatusNotification(context.toString(), taskDescription);
     // });
     if (!isContinue) {
       setCacheSize(context, WORKING_CACHE_SIZE);
     }
     // prepare results
     AnalysisResult result = context.performAnalysisTask();
     List<ChangeNotice> notices = result.changeNotices;
+    // nothing to analyze
     if (notices == null) {
+      // TODO(scheglov) Move cache validation into a separate operation.
+      bool cacheIsInconsistent = _validateCacheConsistency();
+      print('cacheIsInconsistent: $cacheIsInconsistent');

[Brian Wilkerson, 2015/06/21 15:52:39]

Remove debug line? If we want to capture this we should consider creating an
instrumentation hook for it.

+      // there was a cache inconsistency, analyze again
+      if (cacheIsInconsistent) {
+        server.addOperation(new PerformAnalysisOperation(context, true));
+        return;
+      }
+      // analysis is done
       setCacheSize(context, IDLE_CACHE_SIZE);
       server.sendContextAnalysisDoneNotifications(
           context, AnalysisDoneReason.COMPLETE);
       return;
     }
     // process results
     ServerPerformanceStatistics.notices.makeCurrentWhile(() {
       _sendNotices(server, notices);
       _updateIndex(server, notices);
     });
@@ skipping 38 matching lines @@
       try {
         HtmlUnit htmlUnit = notice.resolvedHtmlUnit;
         if (htmlUnit != null) {
           server.addOperation(new _HtmlIndexOperation(context, file, htmlUnit));
         }
       } catch (exception, stackTrace) {
         server.sendServerErrorNotification(exception, stackTrace);
       }
     }
   }
+
+  /**
+   * Checks whether all of the cache entries of [context] are consistent.
+   * If there is an inconsistent entry, returns `true`.
+   */
+  bool _validateCacheConsistency() {

[Brian Wilkerson, 2015/06/21 15:52:39]

I'd move this method to AnalysisContext. I'd rather have a high-level method
like this exposed in the API rather than 'validateSourceCacheConsistency'.

+    bool hasInconsistentEntries = false;
+    InternalAnalysisContext context = this.context;
+    for (Source source in context.sources) {
+      if (context.validateSourceCacheConsistency(source)) {
+        hasInconsistentEntries = true;
+      }
+    }
+    return hasInconsistentEntries;
+  }
 }
 
 class _DartHighlightsOperation extends _DartNotificationOperation {
   _DartHighlightsOperation(
       AnalysisContext context, String file, CompilationUnit unit)
       : super(context, file, unit);
 
   @override
   void perform(AnalysisServer server) {
     sendAnalysisNotificationHighlights(server, file, unit);
@@ skipping 122 matching lines @@
 abstract class _SingleFileOperation extends SourceSensitiveOperation {
   final String file;
 
   _SingleFileOperation(AnalysisContext context, this.file) : super(context);
 
   @override
   bool shouldBeDiscardedOnSourceChange(Source source) {
     return source.fullName == file;
   }
 }