Rename CONSTANT_RESOLVED_UNIT to RESOLVED_UNIT.

pkg/analyzer/lib/src/context/context.dart

 // Copyright (c) 2015, 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 analyzer.src.context.context;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/src/cancelable_future.dart';
@@ skipping 585 matching lines @@
 
   @override
   CancelableFuture<CompilationUnit> computeResolvedCompilationUnitAsync(
       Source unitSource, Source librarySource) {
     if (!AnalysisEngine.isDartFileName(unitSource.shortName) ||
         !AnalysisEngine.isDartFileName(librarySource.shortName)) {
       return new CancelableFuture.error(new AnalysisNotScheduledError());
     }
     return new _AnalysisFutureHelper<CompilationUnit>(this).computeAsync(
         new LibrarySpecificUnit(librarySource, unitSource), (CacheEntry entry) {
-      CacheState state = entry.getState(RESOLVED_UNIT);
+      CacheState state = entry.getState(RESOLVED_UNIT6);

[Brian Wilkerson, 2015/05/12 00:43:22]

These two uses need to remain RESOLVED_UNIT.

       if (state == CacheState.ERROR) {
         throw entry.exception;
       } else if (state == CacheState.INVALID) {
         return null;
       }
-      return entry.getValue(RESOLVED_UNIT);
+      return entry.getValue(RESOLVED_UNIT6);
     });
   }
 
   /**
    * Create an analysis cache based on the given source [factory].
    */
   AnalysisCache createCacheFromSourceFactory(SourceFactory factory) {
     if (factory == null) {
       return new AnalysisCache(<CachePartition>[_privatePartition]);
     }
@@ skipping 19 matching lines @@
   }
 
   @override
   List<CompilationUnit> ensureResolvedDartUnits(Source unitSource) {
     // Check every library.
     List<CompilationUnit> units = <CompilationUnit>[];
     List<Source> containingLibraries = getLibrariesContaining(unitSource);
     for (Source librarySource in containingLibraries) {
       LibrarySpecificUnit target =
           new LibrarySpecificUnit(librarySource, unitSource);
-      CompilationUnit unit = _cache.getValue(target, RESOLVED_UNIT);
+      CompilationUnit unit = _cache.getValue(target, RESOLVED_UNIT6);

[Brian Wilkerson, 2015/05/12 00:43:22]

I'm fairly confident that these three uses need to remain RESOLVED_UNIT.

       if (unit == null) {
         units = null;
         break;
       }
       units.add(unit);
     }
     // If we have results, then we're done.
     if (units != null) {
       return units;
     }
     // Schedule recomputing RESOLVED_UNIT results.
     for (Source librarySource in containingLibraries) {
       LibrarySpecificUnit target =
           new LibrarySpecificUnit(librarySource, unitSource);
-      if (_cache.getState(target, RESOLVED_UNIT) == CacheState.FLUSHED) {
-        dartWorkManager.addPriorityResult(target, RESOLVED_UNIT);
+      if (_cache.getState(target, RESOLVED_UNIT6) == CacheState.FLUSHED) {
+        dartWorkManager.addPriorityResult(target, RESOLVED_UNIT6);
       }
     }
     return null;
   }
 
   @override
   bool exists(Source source) {
     if (source == null) {
       return false;
     }
@@ skipping 255 matching lines @@
   }
 
   @override
   CompilationUnit getResolvedCompilationUnit2(
       Source unitSource, Source librarySource) {
     if (!AnalysisEngine.isDartFileName(unitSource.shortName) ||
         !AnalysisEngine.isDartFileName(librarySource.shortName)) {
       return null;
     }
     return _cache.getValue(
-        new LibrarySpecificUnit(librarySource, unitSource), RESOLVED_UNIT);
+        new LibrarySpecificUnit(librarySource, unitSource), RESOLVED_UNIT6);

[Brian Wilkerson, 2015/05/12 00:43:22]

This needs to remain RESOLVED_UNIT.

   }
 
   @override
   ht.HtmlUnit getResolvedHtmlUnit(Source htmlSource) {
     // TODO(brianwilkerson) Implement this.
 //    SourceEntry sourceEntry = getReadableSourceEntryOrNull(htmlSource);
 //    if (sourceEntry is HtmlEntry) {
 //      HtmlEntry htmlEntry = sourceEntry;
 //      return htmlEntry.getValue(HtmlEntry.RESOLVED_UNIT);
 //    }
@@ skipping 149 matching lines @@
       setValue(SOURCE_KIND, SourceKind.LIBRARY);
       entry.setState(TOKEN_STREAM, CacheState.FLUSHED);
       setValue(UNITS, <Source>[librarySource]);
 
       LibrarySpecificUnit unit =
           new LibrarySpecificUnit(librarySource, librarySource);
       entry = getCacheEntry(unit);
       setValue(HINTS, AnalysisError.NO_ERRORS);
       // dartEntry.setValue(LINTS, AnalysisError.NO_ERRORS);
       entry.setState(RESOLVE_REFERENCES_ERRORS, CacheState.FLUSHED);
-      entry.setState(RESOLVED_UNIT, CacheState.FLUSHED);
+      entry.setState(RESOLVED_UNIT6, CacheState.FLUSHED);

[Brian Wilkerson, 2015/05/12 00:43:22]

This needs to remain RESOLVED_UNIT, with RESOLVED_UNIT6 being added to the end
of the list.

       entry.setState(RESOLVED_UNIT1, CacheState.FLUSHED);
       entry.setState(RESOLVED_UNIT2, CacheState.FLUSHED);
       entry.setState(RESOLVED_UNIT3, CacheState.FLUSHED);
       entry.setState(RESOLVED_UNIT4, CacheState.FLUSHED);
       entry.setState(RESOLVED_UNIT5, CacheState.FLUSHED);
       // USED_IMPORTED_ELEMENTS
       // USED_LOCAL_ELEMENTS
       setValue(VERIFY_ERRORS, AnalysisError.NO_ERRORS);
     });
 
@@ skipping 16 matching lines @@
   }
 
   @override
   CompilationUnit resolveCompilationUnit2(
       Source unitSource, Source librarySource) {
     if (!AnalysisEngine.isDartFileName(unitSource.shortName) ||
         !AnalysisEngine.isDartFileName(librarySource.shortName)) {
       return null;
     }
     return _computeResult(
-        new LibrarySpecificUnit(librarySource, unitSource), RESOLVED_UNIT);
+        new LibrarySpecificUnit(librarySource, unitSource), RESOLVED_UNIT6);

[scheglov, 2015/05/11 23:58:30]

I think we should return RESOLVED_UNIT from AnalysisContext.

[Brian Wilkerson, 2015/05/12 00:43:22]

Yes, this needs to remain RESOLVED_UNIT.

   }
 
   @override
   ht.HtmlUnit resolveHtmlUnit(Source htmlSource) {
     computeHtmlElement(htmlSource);
     return parseHtmlUnit(htmlSource);
   }
 
   @override
   void setChangedContents(Source source, String contents, int offset,
@@ skipping 336 matching lines @@
         state = libraryEntry.getState(LIBRARY_ELEMENT);
         if (state == CacheState.INVALID ||
             (isPriority && state == CacheState.FLUSHED)) {
           sources.add(source);
           return;
         } else if (state == CacheState.ERROR) {
           return;
         }
         CacheEntry unitEntry =
             _cache.get(new LibrarySpecificUnit(librarySource, source));
-        state = unitEntry.getState(RESOLVED_UNIT);
+        state = unitEntry.getState(RESOLVED_UNIT6);

[Brian Wilkerson, 2015/05/12 00:43:22]

This needs to remain RESOLVED_UNIT.

         if (state == CacheState.INVALID ||
             (isPriority && state == CacheState.FLUSHED)) {
           sources.add(source);
           return;
         } else if (state == CacheState.ERROR) {
           return;
         }
         if (_shouldErrorsBeAnalyzed(source, unitEntry)) {
           state = unitEntry.getState(VERIFY_ERRORS);
           if (state == CacheState.INVALID ||
@@ skipping 512 matching lines @@
     PendingFuture pendingFuture =
         new PendingFuture<T>(_context, target, computeValue);
     if (!pendingFuture.evaluate(entry)) {
       _context._pendingFutureTargets
           .putIfAbsent(target, () => <PendingFuture>[])
           .add(pendingFuture);
     }
     return pendingFuture.future;
   }
 }