Disable incremental resolution of comments outside function bodies.

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/services/lint.dart';
@@ skipping 1171 matching lines @@
         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;
           _updateEndNew = endOffsetNew;
           _updateDelta = newUnit.length - _oldUnit.length;
-          // A comment change.
-          if (firstPair.kind == _TokenDifferenceKind.COMMENT) {
-            bool success = _resolveComment(newUnit, firstPair);
-            logger.log('Comment change: $success');
-            return success;
-          }
           // A Dart documentation comment change.
           if (firstPair.kind == _TokenDifferenceKind.COMMENT_DOC) {
             bool success = _resolveCommentDoc(newUnit, firstPair);
             logger.log('Documentation comment resolved: $success');
             return success;
           }
           // A pure whitespace change.
           if (firstPair.kind == _TokenDifferenceKind.OFFSET) {
             logger.log('Whitespace change.');
             _shiftTokens(firstPair.oldToken);
@@ skipping 39 matching lines @@
               oldNode = oldParent;
               newNode = newParent;
               found = true;
               break;
             }
           }
           if (!found) {
             logger.log('Failure: no enclosing function body or executable.');
             return false;
           }
+          // fail if a comment change outside the bodies
+          if (firstPair.kind == _TokenDifferenceKind.COMMENT) {
+            if (beginOffsetOld <= oldNode.offset || beginOffsetNew <= newNode.offset) {
+              logger.log('Failure: comment outside a function body.');
+              return false;
+            }
+          }
         }
         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);
@@ skipping 41 matching lines @@
       Parser parser = new Parser(_unitSource, errorListener);
       CompilationUnit unit = parser.parseCompilationUnit(token);
       _newParseErrors = errorListener.errors;
       return unit;
     } finally {
       timer.stop('parse');
     }
   }
 
   /**
-   * Attempts to resolve a comment change.
-   * Returns `true` if success.
-   */
-  bool _resolveComment(CompilationUnit newUnit, _TokenPair firstPair) {
-    Token oldToken = firstPair.oldToken;
-    Token newToken = firstPair.newToken;
-    CommentToken newComments = newToken.precedingComments;
-    // update token references
-    _updateOffset = oldToken.offset - 1;
-    _shiftTokens(firstPair.oldToken);
-    _setPrecedingComments(oldToken, newComments);
-    // update elements
-    IncrementalResolver incrementalResolver = new IncrementalResolver(
-        _unitElement, _updateOffset, _updateEndOld, _updateEndNew);
-    incrementalResolver._updateElementNameOffsets();
-    incrementalResolver._shiftEntryErrors();
-    _updateEntry();
-    // OK
-    return true;
-  }
-
-  /**
    * Attempts to resolve a documentation comment change.
    * Returns `true` if success.
    */
   bool _resolveCommentDoc(CompilationUnit newUnit, _TokenPair firstPair) {
     Token oldToken = firstPair.oldToken;
     Token newToken = firstPair.newToken;
     CommentToken oldComments = oldToken.precedingComments;
     CommentToken newComments = newToken.precedingComments;
     if (oldComments == null || newComments == null) {
       return false;
@@ skipping 33 matching lines @@
   }
 
   /**
    * Set the given [comment] as a "precedingComments" for [token].
    */
   void _setPrecedingComments(Token token, CommentToken comment) {
     if (token is BeginTokenWithComment) {
       token.precedingComments = comment;
     } else if (token is KeywordTokenWithComment) {
       token.precedingComments = comment;
-    } else if (token is KeywordToken) {
-      KeywordTokenWithComment newToken =
-          new KeywordTokenWithComment(token.keyword, token.offset, comment);
-      token.previous.setNext(newToken);
-      newToken.setNext(token.next);
-      if (_oldUnit.beginToken == token) {
-        _oldUnit.beginToken = newToken;
-      }
     } else if (token is StringTokenWithComment) {
       token.precedingComments = comment;
-    } else if (token is StringToken) {
-      StringTokenWithComment newToken = new StringTokenWithComment(
-          token.type, token.value(), token.offset, comment);
-      token.previous.setNext(newToken);
-      newToken.setNext(token.next);
-      if (_oldUnit.beginToken == token) {
-        _oldUnit.beginToken = newToken;
-      }
     } else if (token is TokenWithComment) {
       token.precedingComments = comment;
     } else {
       Type parentType = token != null ? token.runtimeType : null;
       throw new AnalysisException('Uknown parent token type: $parentType');
     }
   }
 
   void _shiftTokens(Token token) {
     while (token != null) {
@@ skipping 421 matching lines @@
   @override
   String toString() => name;
 }
 
 class _TokenPair {
   final _TokenDifferenceKind kind;
   final Token oldToken;
   final Token newToken;
   _TokenPair(this.kind, this.oldToken, this.newToken);
 }