Add logging to the incremental resolver.

pkg/analyzer/lib/src/generated/incremental_resolver.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 engine.incremental_resolver;
 
 import 'dart:collection';
 import 'dart:math' as math;
 
-import 'package:analyzer/src/generated/error_verifier.dart';
-import 'package:analyzer/src/generated/utilities_dart.dart';
-
 import 'ast.dart';
 import 'element.dart';
 import 'engine.dart';
 import 'error.dart';
+import 'error_verifier.dart';
+import 'incremental_logger.dart' show logger;
 import 'java_engine.dart';
 import 'parser.dart';
 import 'resolver.dart';
 import 'scanner.dart';
 import 'source.dart';
+import 'utilities_dart.dart';
 
 
 /**
  * Instances of the class [DeclarationMatcher] determine whether the element
  * model defined by a given AST structure matches an existing element model.
  */
 class DeclarationMatcher extends RecursiveAstVisitor {
   /**
    * The libary containing the AST nodes being visited.
    */
@@ skipping 881 matching lines @@
 
   PoorMansIncrementalResolver(this._typeProvider, this._unitSource,
       this._librarySource, this._entry);
 
   /**
    * Attempts to update [oldUnit] to the state corresponding to [newCode].
    * Returns `true` if success, or `false` otherwise.
    * The [oldUnit] might be damaged.
    */
   bool resolve(CompilationUnit oldUnit, String newCode) {
+    logger.enter('resolve $_unitSource');
+    logger.log(oldUnit != null ? 'has oldUnit' : 'oldUnit is null');
     try {
       CompilationUnit newUnit = _parseUnit(newCode);
       _TokenPair firstPair =
           _findFirstDifferentToken(oldUnit.beginToken, newUnit.beginToken);
       _TokenPair lastPair =
           _findLastDifferentToken(oldUnit.endToken, newUnit.endToken);
       if (firstPair != null && lastPair != null) {
         int firstOffsetOld = firstPair.oldToken.offset;
         int firstOffsetNew = firstPair.newToken.offset;
         int lastOffsetOld = lastPair.oldToken.end;
         int lastOffsetNew = lastPair.newToken.end;
         int beginOffsetOld = math.min(firstOffsetOld, lastOffsetOld);
         int endOffsetOld = math.max(firstOffsetOld, lastOffsetOld);
         int beginOffsetNew = math.min(firstOffsetNew, lastOffsetNew);
         int endOffsetNew = math.max(firstOffsetNew, lastOffsetNew);
         // check for a whitespace only change
         if (identical(lastPair.oldToken, firstPair.oldToken) &&
             identical(lastPair.newToken, firstPair.newToken)) {
           _updateOffset = beginOffsetOld - 1;
           _updateEndOld = endOffsetOld;
           _updateDelta = newUnit.length - oldUnit.length;
           if (firstPair.atComment && lastPair.atComment) {
+            logger.log('Comment change.');
             _resolveComment(oldUnit, newUnit, firstPair);
           } else {
+            logger.log('Whitespace change.');
             _shiftTokens(firstPair.oldToken);
             IncrementalResolver._updateElementNameOffsets(
                 oldUnit.element,
                 _updateOffset,
                 _updateDelta);
             _updateEntry();
           }
+          logger.log('Success.');
           return true;
         }
         // Find nodes covering the "old" and "new" token ranges.
         AstNode oldNode =
             _findNodeCovering(oldUnit, beginOffsetOld, endOffsetOld);
         AstNode newNode =
             _findNodeCovering(newUnit, beginOffsetNew, endOffsetNew);
-//        print('oldNode: $oldNode');
-//        print('newNode: $newNode');
+        logger.log('oldNode: $oldNode');
+        logger.log('newNode: $newNode');
         // Try to find the smallest common node, a FunctionBody currently.
         {
           List<AstNode> oldParents = _getParents(oldNode);
           List<AstNode> newParents = _getParents(newNode);
           int length = math.min(oldParents.length, newParents.length);
           bool found = false;
           for (int i = 0; i < length; i++) {
             AstNode oldParent = oldParents[i];
             AstNode newParent = newParents[i];
             if (oldParent is FunctionDeclaration &&
                 newParent is FunctionDeclaration ||
                 oldParent is MethodDeclaration && newParent is MethodDeclaration ||
                 oldParent is ConstructorDeclaration && newParent is ConstructorDeclaration) {
               oldNode = oldParent;
               newNode = newParent;
               found = true;
             }
             if (oldParent is FunctionBody && newParent is FunctionBody) {
               oldNode = oldParent;
               newNode = newParent;
               found = true;
               break;
             }
           }
           if (!found) {
+            logger.log('Failure: no enclosing function body or executable.');
             return false;
           }
         }
-//        print('oldNode: $oldNode');
-//        print('newNode: $newNode');
+        logger.log('oldNode: $oldNode');
+        logger.log('newNode: $newNode');
         // prepare update range
         _updateOffset = oldNode.offset;
         _updateEndOld = oldNode.end;
         _updateEndNew = newNode.end;
         _updateDelta = _updateEndNew - _updateEndOld;
         // replace node
         NodeReplacer.replace(oldNode, newNode);
         // update token references
         {
           Token oldBeginToken = _getBeginTokenNotComment(oldNode);
@@ skipping 12 matching lines @@
             _typeProvider,
             oldUnitElement,
             _updateOffset,
             oldNode.length,
             newNode.length);
         incrementalResolver.resolve(newNode);
         _newResolveErrors = incrementalResolver._resolveErrors;
         _newVerifyErrors = incrementalResolver._verifyErrors;
         _newHints = incrementalResolver._hints;
         _updateEntry();
-//        print('Successfully incrementally resolved.');
+        logger.log('Success.');
         return true;
       }
-    } catch (e) {
-      // TODO(scheglov) find a way to log these exceptions
-//      print(e);
-//      print(st);
+    } catch (e, st) {
+      logger.log(e);
+      logger.log(st);
+      logger.log('Failure: exception.');
+    } finally {
+      logger.exit();
     }
     return false;
   }
 
   CompilationUnit _parseUnit(String code) {
     Token token = _scan(code);
     RecordingErrorListener errorListener = new RecordingErrorListener();
     Parser parser = new Parser(_unitSource, errorListener);
     CompilationUnit unit = parser.parseCompilationUnit(token);
     _newParseErrors = errorListener.errors;
     return unit;
   }
 
   void _resolveComment(CompilationUnit oldUnit, CompilationUnit newUnit,
       _TokenPair firstPair) {
     Token oldToken = firstPair.oldToken;
-    int offset = oldToken.precedingComments.offset;
+    CommentToken precedingComments = oldToken.precedingComments;
+    int offset = precedingComments.offset;
+    logger.log('offset: $offset');
     Comment oldComment = _findNodeCovering(oldUnit, offset, offset);
     Comment newComment = _findNodeCovering(newUnit, offset, offset);
+    logger.log('oldComment.beginToken: ${oldComment.beginToken}');
+    logger.log('newComment.beginToken: ${newComment.beginToken}');
     _updateOffset = oldToken.offset - 1;
     // update token references
     _shiftTokens(firstPair.oldToken);
     _setPrecedingComments(oldToken, newComment.tokens.first);
     // replace node
     NodeReplacer.replace(oldComment, newComment);
     // update elements
     IncrementalResolver._updateElementNameOffsets(
         oldUnit.element,
         _updateOffset,
@@ skipping 485 matching lines @@
   }
 }
 
 
 class _TokenPair {
   final Token oldToken;
   final Token newToken;
   final bool atComment;
   _TokenPair(this.oldToken, this.newToken, [this.atComment = false]);
 }