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

pkg/analysis_server/test/edit/refactoring_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.edit.refactoring;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:analysis_server/src/protocol.dart';
@@ skipping 282 matching lines @@
       return sendStringSuffixRequest('1 + 2', '); // marker', 'res', false);
     }, '''
 main() {
   print(1 + 2);
   var res = 1 + 2;
   print(res); // marker
 }
 ''');
   }
 
+  test_names() {
+    addTestFile('''
+class TreeItem {}
+TreeItem getSelectedItem() => null;
+main() {
+  var a = getSelectedItem();
+}
+''');
+    return getRefactoringResult(() {
+      return sendStringSuffixRequest('getSelectedItem()', ';', null, true);
+    }).then((result) {
+      ExtractLocalVariableFeedback feedback = result.feedback;
+      expect(
+          feedback.names,
+          unorderedEquals(['treeItem', 'item', 'selectedItem']));
+      expect(result.change, isNull);
+    });
+  }
+
   test_nameWarning() {
     addTestFile('''
 main() {
   print(1 + 2);
 }
 ''');
     return getRefactoringResult(() {
       return sendStringRequest('1 + 2', 'Name', true);
     }).then((result) {
       assertResultProblemsWarning(
           result.optionsProblems,
           'Variable name should start with a lowercase letter.');
       // ...but there is still a change
       assertTestRefactoringResult(result, '''
 main() {
   var Name = 1 + 2;
   print(Name);
 }
 ''');
     });
   }
 
-  test_names() {
-    addTestFile('''
-class TreeItem {}
-TreeItem getSelectedItem() => null;
-main() {
-  var a = getSelectedItem();
-}
-''');
-    return getRefactoringResult(() {
-      return sendStringSuffixRequest('getSelectedItem()', ';', null, true);
-    }).then((result) {
-      ExtractLocalVariableFeedback feedback = result.feedback;
-      expect(
-          feedback.names,
-          unorderedEquals(['treeItem', 'item', 'selectedItem']));
-      expect(result.change, isNull);
-    });
-  }
-
   test_offsetsLengths() {
     addTestFile('''
 main() {
   print(1 + 2);
   print(1 +  2);
 }
 ''');
     return getRefactoringResult(() {
       return sendStringRequest('1 + 2', 'res', true);
     }).then((result) {
@@ skipping 372 matching lines @@
       List<RefactoringKind> kinds =
           getRefactoringsAtString('// not an element');
       expect(kinds, isNot(contains(RefactoringKind.RENAME)));
     });
   }
 }
 
 
 @ReflectiveTestCase()
 class InlineLocalTest extends _AbstractGetRefactoring_Test {
-  test_OK() {
-    addTestFile('''
-main() {
-  int test = 42;
-  int a = test + 2;
-  print(test);
-}
-''');
-    return assertSuccessfulRefactoring(() {
-      return _sendInlineRequest('test + 2');
-    }, '''
-main() {
-  int a = 42 + 2;
-  print(42);
-}
-''');
-  }
-
   test_feedback() {
     addTestFile('''
 main() {
   int test = 42;
   print(test);
   print(test);
 }
 ''');
     return getRefactoringResult(() {
       return _sendInlineRequest('test =');
@@ skipping 10 matching lines @@
       return _sendInlineRequest('main() {}');
     }).then((result) {
       assertResultProblemsFatal(
           result.initialProblems,
           'Local variable declaration or reference must be selected to activate this refactoring.');
       // ...there is no any change
       expect(result.change, isNull);
     });
   }
 
+  test_OK() {
+    addTestFile('''
+main() {
+  int test = 42;
+  int a = test + 2;
+  print(test);
+}
+''');
+    return assertSuccessfulRefactoring(() {
+      return _sendInlineRequest('test + 2');
+    }, '''
+main() {
+  int a = 42 + 2;
+  print(42);
+}
+''');
+  }
+
   Future<Response> _sendInlineRequest(String search) {
     Request request = new EditGetRefactoringParams(
         RefactoringKind.INLINE_LOCAL_VARIABLE,
         testFile,
         findOffset(search),
         0,
         false).toRequest('0');
     return serverChannel.sendRequest(request);
   }
 }
@@ skipping 168 matching lines @@
         testFile,
         findOffset(search),
         0,
         validateOnly,
         options: options).toRequest('0');
     return serverChannel.sendRequest(request);
   }
 
   test_class() {
     addTestFile('''
+class Test {
+  Test() {}
+  Test.named() {}
+}
+main() {
+  Test v;
+  new Test();
+  new Test.named();
+}
+''');
+    return assertSuccessfulRefactoring(() {
+      return sendRenameRequest('Test {', 'NewName');
+    }, '''
+class NewName {
+  NewName() {}
+  NewName.named() {}
+}
+main() {
+  NewName v;
+  new NewName();
+  new NewName.named();
+}
+''');
+  }
+
+  test_class_options_fatalError() {
+    addTestFile('''
 class Test {}
 main() {
   Test v;
 }
 ''');
-    return assertSuccessfulRefactoring(() {
-      return sendRenameRequest('Test {}', 'NewName');
-    }, '''
+    return getRefactoringResult(() {
+      return sendRenameRequest('Test {}', '');
+    }).then((result) {
+      assertResultProblemsFatal(
+          result.optionsProblems,
+          'Class name must not be empty.');
+      // ...there is no any change
+      expect(result.change, isNull);
+    });
+  }
+
+  test_class_validateOnly() {
+    addTestFile('''
+class Test {}
+main() {
+  Test v;
+}
+''');
+    return getRefactoringResult(() {
+      return sendRenameRequest('Test {}', 'NewName', true);
+    }).then((result) {
+      RenameFeedback feedback = result.feedback;
+      assertResultProblemsOK(result);
+      expect(feedback.elementKindName, 'class');
+      expect(feedback.oldName, 'Test');
+      expect(result.change, isNull);
+    });
+  }
+
+  test_class_warning() {
+    addTestFile('''
+class Test {}
+main() {
+  Test v;
+}
+''');
+    return getRefactoringResult(() {
+      return sendRenameRequest('Test {}', 'newName');
+    }).then((result) {
+      assertResultProblemsWarning(
+          result.optionsProblems,
+          'Class name should start with an uppercase letter.');
+      // ...but there is still a change
+      assertTestRefactoringResult(result, '''
+class newName {}
+main() {
+  newName v;
+}
+''');
+    }).then((_) {
+      // "NewName" is a perfectly valid name
+      return getRefactoringResult(() {
+        return sendRenameRequest('Test {}', 'NewName');
+      }).then((result) {
+        assertResultProblemsOK(result);
+        // ...and there is a new change
+        assertTestRefactoringResult(result, '''
 class NewName {}
 main() {
   NewName v;
 }
 ''');
+      });
+    });
   }
 
   test_classMember_field() {
     addTestFile('''
 class A {
   var test = 0;
   main() {
     print(test);
   }
 }
@@ skipping 99 matching lines @@
     }, '''
 class A {
   set newName(x) {}
   main() {
     newName = 0;
   }
 }
 ''');
   }
 
-  test_class_fromInstanceCreation() {
-    addTestFile('''
-class Test {
-  Test() {}
-  Test.named() {}
-}
-main() {
-  new Test();
-  new Test.named();
-}
-''');
-    return assertSuccessfulRefactoring(() {
-      return sendRenameRequest('Test();', 'NewName');
-    }, '''
-class NewName {
-  NewName() {}
-  NewName.named() {}
-}
-main() {
-  new NewName();
-  new NewName.named();
-}
-''');
-  }
-
-  test_class_options_fatalError() {
-    addTestFile('''
-class Test {}
-main() {
-  Test v;
-}
-''');
-    return getRefactoringResult(() {
-      return sendRenameRequest('Test {}', '');
-    }).then((result) {
-      assertResultProblemsFatal(
-          result.optionsProblems,
-          'Class name must not be empty.');
-      // ...there is no any change
-      expect(result.change, isNull);
-    });
-  }
-
-  test_class_validateOnly() {
-    addTestFile('''
-class Test {}
-main() {
-  Test v;
-}
-''');
-    return getRefactoringResult(() {
-      return sendRenameRequest('Test {}', 'NewName', true);
-    }).then((result) {
-      RenameFeedback feedback = result.feedback;
-      assertResultProblemsOK(result);
-      expect(feedback.elementKindName, 'class');
-      expect(feedback.oldName, 'Test');
-      expect(result.change, isNull);
-    });
-  }
-
-  test_class_warning() {
-    addTestFile('''
-class Test {}
-main() {
-  Test v;
-}
-''');
-    return getRefactoringResult(() {
-      return sendRenameRequest('Test {}', 'newName');
-    }).then((result) {
-      assertResultProblemsWarning(
-          result.optionsProblems,
-          'Class name should start with an uppercase letter.');
-      // ...but there is still a change
-      assertTestRefactoringResult(result, '''
-class newName {}
-main() {
-  newName v;
-}
-''');
-    }).then((_) {
-      // "NewName" is a perfectly valid name
-      return getRefactoringResult(() {
-        return sendRenameRequest('Test {}', 'NewName');
-      }).then((result) {
-        assertResultProblemsOK(result);
-        // ...and there is a new change
-        assertTestRefactoringResult(result, '''
-class NewName {}
-main() {
-  NewName v;
-}
-''');
-      });
-    });
-  }
-
   test_constructor_fromInstanceCreation() {
     addTestFile('''
 class A {
   A.test() {}
 }
 main() {
   new A.test();
 }
 ''');
     return assertSuccessfulRefactoring(() {
       return sendRenameRequest('test();', 'newName');
     }, '''
 class A {
   A.newName() {}
+}
+main() {
+  new A.newName();
+}
+''');
+  }
+
+  test_constructor_fromInstanceCreation_default_onClassName() {
+    addTestFile('''
+class A {
+  A() {}
+}
+main() {
+  new A();
+}
+''');
+    return assertSuccessfulRefactoring(() {
+      return sendRenameRequest('A();', 'newName');
+    }, '''
+class A {
+  A.newName() {}
+}
+main() {
+  new A.newName();
+}
+''');
+  }
+
+  test_constructor_fromInstanceCreation_default_onNew() {
+    addTestFile('''
+class A {
+  A() {}
+}
+main() {
+  new A();
+}
+''');
+    return assertSuccessfulRefactoring(() {
+      return sendRenameRequest('new A();', 'newName');
+    }, '''
+class A {
+  A.newName() {}
 }
 main() {
   new A.newName();
 }
 ''');
   }
 
   test_feedback() {
     addTestFile('''
 class Test {}
@@ skipping 316 matching lines @@
   }
 
   @override
   void setUp() {
     super.setUp();
     server.handlers = [new EditDomainHandler(server),];
     createProject();
     handler = new EditDomainHandler(server);
   }
 }