Fix for inlining async methods/getters.

pkg/analysis_server/test/services/refactoring/inline_method_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.services.refactoring.inline_method;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
 import 'package:analysis_server/src/services/correction/status.dart';
@@ skipping 693 matching lines @@
     _createRefactoring('test() {');
     // validate change
     return _assertSuccessfulRefactoring(r'''
 var topLevelField = 0;
 main() {
   print(topLevelField);
 }
 ''');
   }
 
+  test_getter_async() {

[Brian Wilkerson, 2016/10/31 14:00:38]

Given that we are inlining 'test' into 'foo, perhaps test the cases where
- foo is async
- foo is async*
- foo is sync*
- test is async*
- foo does not return a Future
Also, perhaps test the case where we are inlining into multiple non-async
methods.

[scheglov, 2016/10/31 15:48:29]

Done.

+    indexTestUnit(r'''
+import 'dart:async';
+class A {
+  Future<int> get test async => 42;
+  Future<int> get foo {
+    return test;
+  }
+}
+''');
+    _createRefactoring('test async');
+    // validate change
+    return _assertSuccessfulRefactoring(r'''
+import 'dart:async';
+class A {
+  Future<int> get foo async {
+    return 42;
+  }
+}
+''');
+  }
+
   test_getter_classMember_instance() {
     indexTestUnit(r'''
 class A {
   int f;
   int get result => f + 1;
 }
 main(A a) {
   print(a.result);
 }
 ''');
@@ skipping 72 matching lines @@
 }
 ''');
     _createRefactoring('test(1, 2)');
     deleteSource = false;
     // validate state
     await refactoring.checkInitialConditions();
     expect(refactoring.deleteSource, false);
     expect(refactoring.inlineAll, false);
   }
 
+  test_method_async() {
+    indexTestUnit(r'''
+import 'dart:async';
+class A {
+  Future<int> test() async => 42;
+  Future<int> foo() {
+    return test();
+  }
+}
+''');
+    _createRefactoring('test() async');
+    // validate change
+    return _assertSuccessfulRefactoring(r'''
+import 'dart:async';
+class A {
+  Future<int> foo() async {
+    return 42;
+  }
+}
+''');
+  }
+
+  test_method_async2() {
+    indexTestUnit(r'''
+import 'dart:async';
+class A {
+  Future<int> test() async => 42;
+  Future foo() {
+    return [test(), test()];
+  }
+}
+''');
+    _createRefactoring('test() async');
+    // validate change
+    return _assertSuccessfulRefactoring(r'''
+import 'dart:async';
+class A {
+  Future foo() async {
+    return [42, 42];
+  }
+}
+''');
+  }
+
   test_method_emptyBody() {
     indexTestUnit(r'''
 abstract class A {
   test();
 }
 main(A a) {
   print(a.test());
 }
 ''');
     _createRefactoring('test();');
@@ skipping 704 matching lines @@
     SourceChange change = await refactoring.createChange();
     this.refactoringChange = change;
     assertTestChangeResult(expectedCode);
   }
 
   void _createRefactoring(String search) {
     int offset = findOffset(search);
     refactoring = new InlineMethodRefactoring(searchEngine, testUnit, offset);
   }
 }