Rename ChangeNotice resolved Dart/Html unit fields.

pkg/analyzer/lib/src/generated/engine.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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine;
 
 import "dart:math" as math;
@@ skipping 2352 matching lines @@
             _cache.storedAst(source);
           } else {
             dartEntry.recordResolutionErrorInLibrary(
                 librarySource,
                 thrownException);
           }
           if (source != librarySource) {
             _workManager.add(source, SourcePriority.PRIORITY_PART);
           }
           ChangeNoticeImpl notice = _getNotice(source);
-          notice.compilationUnit = unit;
+          notice.resolvedDartUnit = unit;
           notice.setErrors(dartEntry.allErrors, lineInfo);
         }
       }
     }
     if (thrownException != null) {
       throw new AnalysisException('<rethrow>', thrownException);
     }
     return unitEntry;
   }
 
@@ skipping 63 matching lines @@
           } else {
             dartEntry.recordResolutionErrorInLibrary(
                 librarySource,
                 thrownException);
             _cache.remove(source);
           }
           if (source != librarySource) {
             _workManager.add(source, SourcePriority.PRIORITY_PART);
           }
           ChangeNoticeImpl notice = _getNotice(source);
-          notice.compilationUnit = unit;
+          notice.resolvedDartUnit = unit;
           notice.setErrors(dartEntry.allErrors, lineInfo);
         }
       }
     }
     if (thrownException != null) {
       throw new AnalysisException('<rethrow>', thrownException);
     }
     return unitEntry;
   }
 
@@ skipping 2151 matching lines @@
    *
    * @param task the task that was performed
    * @return an entry containing the computed results
    * @throws AnalysisException if the results could not be recorded
    */
   DartEntry
       _recordIncrementalAnalysisTaskResults(IncrementalAnalysisTask task) {
     CompilationUnit unit = task.compilationUnit;
     if (unit != null) {
       ChangeNoticeImpl notice = _getNotice(task.source);
-      notice.compilationUnit = unit;
+      notice.resolvedDartUnit = unit;
       _incrementalAnalysisCache =
           IncrementalAnalysisCache.cacheResult(task.cache, unit);
     }
     return null;
   }
 
   /**
    * Record the results produced by performing a [task] and return the cache
    * entry associated with the results.
    */
@@ skipping 40 matching lines @@
         partEntry.addContainingLibrary(source);
       }
     }
     dartEntry.setValue(DartEntry.PARSED_UNIT, task.compilationUnit);
     dartEntry.setValue(DartEntry.PARSE_ERRORS, task.errors);
     dartEntry.setValue(DartEntry.EXPORTED_LIBRARIES, task.exportedSources);
     dartEntry.setValue(DartEntry.IMPORTED_LIBRARIES, task.importedSources);
     dartEntry.setValue(DartEntry.INCLUDED_PARTS, newParts);
     _cache.storedAst(source);
     ChangeNoticeImpl notice = _getNotice(source);
-    if (notice.compilationUnit == null) {
+    if (notice.resolvedDartUnit == null) {
       notice.parsedDartUnit = task.compilationUnit;
     }
     notice.setErrors(dartEntry.allErrors, task.lineInfo);
     // Verify that the incrementally parsed and resolved unit in the incremental
     // cache is structurally equivalent to the fully parsed unit
     _incrementalAnalysisCache = IncrementalAnalysisCache.verifyStructure(
         _incrementalAnalysisCache,
         source,
         task.compilationUnit);
     return dartEntry;
@@ skipping 59 matching lines @@
       htmlEntry.recordResolutionError(thrownException);
       _cache.removedAst(source);
       throw new AnalysisException('<rethrow>', thrownException);
     }
     htmlEntry.setState(HtmlEntry.PARSED_UNIT, CacheState.FLUSHED);
     htmlEntry.setValue(HtmlEntry.RESOLVED_UNIT, task.resolvedUnit);
     htmlEntry.setValue(HtmlEntry.ELEMENT, task.element);
     htmlEntry.setValue(HtmlEntry.RESOLUTION_ERRORS, task.resolutionErrors);
     _cache.storedAst(source);
     ChangeNoticeImpl notice = _getNotice(source);
-    notice.htmlUnit = task.resolvedUnit;
+    notice.resolvedHtmlUnit = task.resolvedUnit;
     LineInfo lineInfo = htmlEntry.getValue(SourceEntry.LINE_INFO);
     notice.setErrors(htmlEntry.allErrors, lineInfo);
     return htmlEntry;
   }
 
   /**
    * Record the results produced by performing a [task] and return the cache
    * entry associated with the results.
    */
   DartEntry _recordScanDartTaskResults(ScanDartTask task) {
@@ skipping 142 matching lines @@
       DartEntry dartEntry = _cache.get(source);
       _removeFromParts(source, dartEntry);
       dartEntry.modificationTime = getModificationStamp(source);
       dartEntry.invalidateAllInformation();
       _cache.removedAst(source);
       _workManager.add(source, SourcePriority.UNKNOWN);
     }
     // reset unit in the notification, it is out of date now
     ChangeNoticeImpl notice = _pendingNotices[source];
     if (notice != null) {
-      notice.compilationUnit = null;
-      notice.htmlUnit = null;
+      notice.resolvedDartUnit = null;
+      notice.resolvedHtmlUnit = null;
     }
   }
 
   /**
    * <b>Note:</b> This method must only be invoked while we are synchronized on [cacheLock].
    *
    * @param source the source that has been deleted
    */
   void _sourceDeleted(Source source) {
     SourceEntry sourceEntry = _cache.get(source);
@@ skipping 112 matching lines @@
       incrementalResolutionValidation_lastLibrarySource =
           oldUnit.element.library.source;
       incrementalResolutionValidation_lastUnit = oldUnit;
       return false;
     }
     // prepare notices
     units.forEach((Source source, CompilationUnit unit) {
       DartEntry dartEntry = _cache.get(source);
       LineInfo lineInfo = getLineInfo(source);
       ChangeNoticeImpl notice = _getNotice(source);
-      notice.compilationUnit = unit;
+      notice.resolvedDartUnit = unit;
       notice.setErrors(dartEntry.allErrors, lineInfo);
     });
     // OK
     return true;
   }
 
   /**
    * Check the cache for any invalid entries (entries whose modification time does not match the
    * modification time of the source associated with the entry). Invalid entries will be marked as
    * invalid so that the source will be re-analyzed.
@@ skipping 2155 matching lines @@
 
   const CacheState(String name, int ordinal) : super(name, ordinal);
 }
 
 /**
  * An object that represents a change to the analysis results associated with a
  * given source.
  */
 abstract class ChangeNotice implements AnalysisErrorInfo {
   /**
-   * The fully resolved Dart AST that changed as a result of the analysis, or
-   * `null` if the AST was not changed.
-   */
-  CompilationUnit get compilationUnit;
-
-  /**
-   * The fully resolved HTML AST that changed as a result of the analysis, or
-   * `null` if the AST was not changed.
-   */
-  ht.HtmlUnit get htmlUnit;
-
-  /**
    * The parsed, but maybe not resolved Dart AST that changed as a result of
    * the analysis, or `null` if the AST was not changed.
    */
   CompilationUnit get parsedDartUnit;
 
   /**
+   * The fully resolved Dart AST that changed as a result of the analysis, or
+   * `null` if the AST was not changed.
+   */
+  CompilationUnit get resolvedDartUnit;
+
+  /**
+   * The fully resolved HTML AST that changed as a result of the analysis, or
+   * `null` if the AST was not changed.
+   */
+  ht.HtmlUnit get resolvedHtmlUnit;
+
+  /**
    * Return the source for which the result is being reported.
    */
   Source get source;
 }
 
 /**
  * An implementation of a [ChangeNotice].
  */
 class ChangeNoticeImpl implements ChangeNotice {
   /**
    * An empty list of change notices.
    */
   static const List<ChangeNoticeImpl> EMPTY_ARRAY = const <ChangeNoticeImpl>[];
 
   /**
    * The source for which the result is being reported.
    */
   final Source source;
 
   /**
    * The parsed, but maybe not resolved Dart AST that changed as a result of
    * the analysis, or `null` if the AST was not changed.
    */
   CompilationUnit parsedDartUnit;
 
   /**
    * The fully resolved Dart AST that changed as a result of the analysis, or
    * `null` if the AST was not changed.
    */
-  CompilationUnit compilationUnit;
+  CompilationUnit resolvedDartUnit;
 
   /**
    * The fully resolved HTML AST that changed as a result of the analysis, or
    * `null` if the AST was not changed.
    */
-  ht.HtmlUnit htmlUnit;
+  ht.HtmlUnit resolvedHtmlUnit;
 
   /**
    * The errors that changed as a result of the analysis, or `null` if errors
    * were not changed.
    */
   List<AnalysisError> _errors;
 
   /**
    * The line information associated with the source, or `null` if errors were
    * not changed.
@@ skipping 4971 matching lines @@
     if (element.id == _id) {
       result = element;
       throw new _ElementByIdFinderException();
     }
     super.visitElement(element);
   }
 }
 
 class _ElementByIdFinderException {
 }