Fixes for identifying changed token ranges and updating them.

pkg/analyzer/test/generated/incremental_resolver_test.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_test;
 
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
@@ skipping 1852 matching lines @@
 }
 ''');
     _updateAndValidate(r'''
 main() {
   int v = 42;
   print(v);
 }
 ''');
   }
 
-  void test_twice() {
+  void test_multiple_emptyLine() {
+    _resolveUnit(r'''
+class A {
+  m() {
+    return true;
+  }
+}''');
+    for (int i = 0; i < 6; i++) {
+      if (i.isEven) {
+        _updateAndValidate(r'''
+class A {
+  m() {
+    return true;
+
+  }
+}''', false);
+      } else {
+        _updateAndValidate(r'''
+class A {
+  m() {
+    return true;
+  }
+}''', false);
+      }
+    }
+  }
+
+  void test_multiple_expression() {
     _resolveUnit(r'''
 main() {
   print(1);
 }''');
-    _updateAndValidate(r'''
+    for (int i = 0; i < 6; i++) {
+      if (i.isEven) {
+        _updateAndValidate(r'''
 main() {
   print(12);
 }''', false);
-    _updateAndValidate(r'''
+      } else {
+        _updateAndValidate(r'''
 main() {
   print(1);
 }''', false);
-  }
-
-  void test_twice2() {
-    _resolveUnit(r'''
-class A {
-  m() {
-    int vvvvvvvv = 42;
-    print(vvvvvvvv);
-  }
-}''');
-    _updateAndValidate(r'''
-class A {
-  m() {
-    int vvvvvvvv2 = 42;
-    print(vvvvvvvv2);
-  }
-}''', false);
-    _updateAndValidate(r'''
-class A {
-  m() {
-    int vvvvvvvv = 42;
-    print(vvvvvvvv);
-  }
-}''', false);
+      }
+    }
   }
 
   void test_updateErrors_addNew_hints() {
     _resolveUnit(r'''
 main() {
   int v = 0;
   print(v);
-  print(42);
 }
 ''');
-    // TODO(scheglov) "print(42)" is here because it seems we have bug with
-    // incremental analysis and the end of a function body.
     _updateAndValidate(r'''
 main() {
   int v = 0;
-  print(42);
 }
 ''');
   }
 
   void test_updateErrors_addNew_parse() {
     _resolveUnit(r'''
 main() {
   print(42);
 }
 ''');
@@ skipping 1262 matching lines @@
     _visitList(node.metadata, other.metadata);
     _visitNode(node.identifier, other.identifier);
   }
 
   static void assertSameResolution(CompilationUnit actual,
       CompilationUnit expected) {
     _SameResolutionValidator validator = new _SameResolutionValidator(expected);
     actual.accept(validator);
   }
 }