Issue 21552. Fixes for navigation, hover and rename in instance creation expressions.

pkg/analysis_server/test/analysis/notification_navigation_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 test.analysis.notification.navigation;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
@@ skipping 49 matching lines @@
   void assertHasRegion(String search, [int length = -1]) {
     int offset = findOffset(search);
     if (length == -1) {
       length = findIdentifierLength(search);
     }
     findRegion(offset, length, true);
   }
 
   /**
    * Validates that there is a region at the offset of [search] in [testFile]
    * with the length of [search].

[Brian Wilkerson, 2014/11/10 21:04:23]

The comment needs to be updated.

[scheglov, 2014/11/11 03:01:06]

Done.

    */
-  void assertHasRegionString(String search) {
+  void assertHasRegionString(String search, [int length = -1]) {
     int offset = findOffset(search);
-    int length = search.length;
+    if (length == -1) {
+      length = search.length;
+    }
     findRegion(offset, length, true);
   }
 
   /**
    * Validates that there is an identifier region at [regionSearch] with target
    * at [targetSearch].
    */
   void assertHasRegionTarget(String regionSearch, String targetSearch) {
     assertHasRegion(regionSearch);
     assertHasTarget(targetSearch);
@@ skipping 52 matching lines @@
   /**
    * Finds the navigation region with the given [offset] and [length].
    * If [length] is `-1`, then it is ignored.
    *
    * If [exists] is `true`, then fails if such region does not exist.
    * Otherwise remembers this it into [testRegion].
    * Also fills [testTargets] with its targets.
    *
    * If [exists] is `false`, then fails if such region exists.
    */
-  void findRegion(int offset, int length, [bool exists]) {
+  void findRegion(int offset, int length, bool exists) {
     for (NavigationRegion region in regions) {
       if (region.offset == offset &&
           (length == -1 || region.length == length)) {
         if (exists == false) {
           fail(
               'Not expected to find (offset=$offset; length=$length) in\n'
                   '${regions.join('\n')}');
         }
         testRegion = region;
         testTargets = region.targets;
@@ skipping 153 matching lines @@
 
   test_instanceCreation_implicit() {
     addTestFile('''
 class A {
 }
 main() {
   new A();
 }
 ''');
     return prepareNavigation().then((_) {
-      {
-        findRegion(findOffset('new A'), 'new'.length, true);
-        assertHasTarget('A {');
-      }
-      {
-        findRegion(findOffset('A()'), 'A'.length, true);
-        assertHasTarget('A {');
-      }
+      assertHasRegionString('new A');
+      assertHasTarget('A {');
     });
   }
 
   test_instanceCreation_implicit_withTypeArgument() {
     addTestFile('''
 class A {}
-class B<T> {
-}
+class B<T> {}
 main() {
   new B<A>();
 }
 ''');
     return prepareNavigation().then((_) {
       {
-        findRegion(findOffset('new B'), 'new'.length, true);
+        assertHasRegion('new B<A>', 'new B'.length);
         assertHasTarget('B<T> {');
       }
       {
-        findRegion(findOffset('A>();'), 'A'.length, true);
+        assertHasRegion('A>();', 'A'.length);
         assertHasTarget('A {');
       }
     });
   }
 
   test_instanceCreation_named() {
     addTestFile('''
 class A {
   A.named() {}
 }
 main() {
   new A.named();
 }
 ''');
     return prepareNavigation().then((_) {
-      {
-        findRegion(findOffset('new '), 'new'.length, true);
-        assertHasTarget('named() {}');
-      }
-      {
-        findRegion(findOffset('A.named();'), 'A'.length, true);
-        assertHasTarget('A {');
-      }
-      {
-        findRegion(findOffset('.named();'), '.named'.length, true);
-        assertHasTarget('named() {}');
-      }
+      assertHasRegionString('new A.named');
+      assertHasTarget('named() {}');
     });
   }
 
   test_instanceCreation_named_withTypeArgument() {
     addTestFile('''
 class A {}
 class B<T> {
   A.named() {}
 }
 main() {
   new B<A>.named();
 }
 ''');
     return prepareNavigation().then((_) {
       {
-        findRegion(findOffset('new '), 'new'.length, true);
+        assertHasRegionString('new B');
         assertHasTarget('named() {}');
       }
       {
-        findRegion(findOffset('B<A>.named();'), 'B'.length, true);
-        assertHasTarget('B<T> {');
+        assertHasRegion('A>.named');
+        assertHasTarget('A {');
       }
       {
-        findRegion(findOffset('.named();'), '.named'.length, true);
+        assertHasRegion('.named();', '.named'.length);
         assertHasTarget('named() {}');
       }
-      {
-        findRegion(findOffset('A>.named();'), 'A'.length, true);
-        assertHasTarget('A {');
-      }
     });
   }
 
   test_instanceCreation_unnamed() {
     addTestFile('''
 class A {
   A() {}
 }
 main() {
   new A();
 }
 ''');
     return prepareNavigation().then((_) {
-      {
-        findRegion(findOffset('new '), 'new'.length, true);
-        assertHasTarget('A() {}', 0);
-      }
-      {
-        findRegion(findOffset('A();'), 'A'.length, true);
-        assertHasTarget('A {');
-      }
+      assertHasRegionString('new A');
+      assertHasTarget('A() {}', 0);
     });
   }
 
   test_instanceCreation_unnamed_withTypeArgument() {
     addTestFile('''
 class A {}
 class B<T> {
   B() {}
 }
 main() {
   new B<A>();
 }
 ''');
     return prepareNavigation().then((_) {
       {
-        findRegion(findOffset('new '), 'new'.length, true);
+        assertHasRegionString('new B');
         assertHasTarget('B() {}', 0);
       }
       {
-        findRegion(findOffset('B<A>();'), 'B'.length, true);
-        assertHasTarget('B<T> {');
-      }
-      {
-        findRegion(findOffset('A>();'), 'A'.length, true);
+        assertHasRegion('A>();');
         assertHasTarget('A {');
       }
     });
   }
 
   test_multiplyDefinedElement() {
     addFile('$projectPath/bin/libA.dart', 'library A; int TEST = 1;');
     addFile('$projectPath/bin/libB.dart', 'library B; int TEST = 2;');
     addTestFile('''
 import 'libA.dart';
@@ skipping 175 matching lines @@
   test_type_void() {
     addTestFile('''
 void main() {
 }
 ''');
     return prepareNavigation().then((_) {
       assertNoRegionAt('void');
     });
   }
 }