Update errors during incremental resolution.

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;
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/src/task/task_dart.dart';
 
 import 'ast.dart';
 import 'constant.dart';
 import 'element.dart';
 import 'error.dart';
 import 'error_verifier.dart';
 import 'html.dart' as ht;
 import 'incremental_scanner.dart';
 import 'incremental_resolver.dart' show IncrementalResolver,
-    poorMansIncrementalResolution;
+    PoorMansIncrementalResolver;
 import 'instrumentation.dart';
 import 'java_core.dart';
 import 'java_engine.dart';
 import 'parser.dart' show Parser, IncrementalParser;
 import 'resolver.dart';
 import 'scanner.dart';
 import 'sdk.dart' show DartSdk;
 import 'source.dart';
 import 'utilities_collection.dart';
 import 'utilities_general.dart';
@@ skipping 4882 matching lines @@
               null));
     }
     _workManager.remove(source);
     _removeFromPriorityOrder(source);
   }
 
   /**
    * TODO(scheglov) A hackish, limited incremental resolution implementation.
    */
   bool _tryPoorMansIncrementalResolution(Source unitSource, String newCode) {
+    DartEntry dartEntry = _cache.get(unitSource);
+    if (dartEntry == null) {
+      return false;
+    }
+    // prepare the (only) library
     List<Source> librarySources = getLibrariesContaining(unitSource);
     if (librarySources.length != 1) {
       return false;
     }
+    // do resolution
+    Source librarySource = librarySources[0];
     CompilationUnit oldUnit =
-        getResolvedCompilationUnit2(unitSource, librarySources[0]);
-    bool success = poorMansIncrementalResolution(typeProvider, oldUnit, newCode);
+        getResolvedCompilationUnit2(unitSource, librarySource);
+    PoorMansIncrementalResolver resolver = new PoorMansIncrementalResolver(
+        typeProvider,
+        unitSource,
+        librarySource,
+        dartEntry);
+    bool success = resolver.resolve(oldUnit, newCode);
     if (!success) {
       return false;
     }
+    // prepare notice
     ChangeNoticeImpl notice = _getNotice(unitSource);
     notice.compilationUnit = oldUnit;
     // TODO(scheglov) apply updated errors
     {
       LineInfo lineInfo = getLineInfo(unitSource);
-      DartEntry dartEntry = _cache.get(unitSource);
       notice.setErrors(dartEntry.allErrors, lineInfo);
     }
     return true;
   }
 
   /**
    * <b>Note:</b> This method must only be invoked while we are synchronized on [cacheLock].
    *
    * @param source the source that has been removed
    */
@@ skipping 5504 matching lines @@
         cache.offset,
         cache.offset + cache.oldLength);
     // Update the resolution
     TypeProvider typeProvider = this.typeProvider;
     if (_updatedUnit != null && typeProvider != null) {
       CompilationUnitElement element = _updatedUnit.element;
       if (element != null) {
         LibraryElement library = element.library;
         if (library != null) {
           IncrementalResolver resolver = new IncrementalResolver(
-              errorListener,
               typeProvider,
               library,
               element,
               cache.source,
               cache.offset,
               cache.oldLength,
               cache.newLength);
           resolver.resolve(parser.updatedNode);
         }
       }
@@ skipping 4379 matching lines @@
 
   @override
   Object visitPolymerTagDartElement(PolymerTagDartElement element) {
     if (element.name == PolymerHtmlUnitBuilder_this._elementName) {
       throw new PolymerHtmlUnitBuilder_FoundTagDartElementError(
           element as PolymerTagDartElementImpl);
     }
     return null;
   }
 }