Fix for inlining async methods/getters.

pkg/analysis_server/lib/src/services/refactoring/inline_method.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 services.src.refactoring.inline_method;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol_server.dart' hide Element;
 import 'package:analysis_server/src/services/correction/source_range.dart';
@@ skipping 198 matching lines @@
   bool _isAccessor;
   CompilationUnit _methodUnit;
   CorrectionUtils _methodUtils;
   AstNode _methodNode;
   FormalParameterList _methodParameters;
   FunctionBody _methodBody;
   Expression _methodExpression;
   _SourcePart _methodExpressionPart;
   _SourcePart _methodStatementsPart;
   List<_ReferenceProcessor> _referenceProcessors = [];
+  Set<FunctionBody> _alreadyMadeAsync = new Set<FunctionBody>();
 
   InlineMethodRefactoringImpl(this.searchEngine, this.unit, this.offset) {
     utils = new CorrectionUtils(unit);
   }
 
   @override
   String get className {
     if (_methodElement == null) {
       return null;
     }
@@ skipping 324 matching lines @@
     SourceEdit edit = newSourceEdit_range(range, source);
     _addRefEdit(edit);
   }
 
   void _process(RefactoringStatus status) {
     AstNode nodeParent = _node.parent;
     // may be only single place should be inlined
     if (!_shouldProcess()) {
       return;
     }
+    // If the element being inlined is async, ensure that the function
+    // body that encloses the method is also async.
+    if (ref._methodElement.isAsynchronous) {
+      FunctionBody body = _node.getAncestor((n) => n is FunctionBody);
+      if (!body.isAsynchronous && ref._alreadyMadeAsync.add(body)) {
+        SourceRange bodyStart = rangeStartLength(body.offset, 0);
+        _addRefEdit(newSourceEdit_range(bodyStart, 'async '));
+      }
+    }
     // may be invocation of inline method
     if (nodeParent is MethodInvocation) {
       MethodInvocation invocation = nodeParent;
       Expression target = invocation.target;
       List<Expression> arguments = invocation.argumentList.arguments;
       _inlineMethodInvocation(
           status, invocation, invocation.isCascaded, target, arguments);
     } else {
       // cannot inline reference to method: var v = new A().method;
       if (ref._methodElement is MethodElement) {
@@ skipping 252 matching lines @@
   }
 
   void _addVariable(SimpleIdentifier node) {
     VariableElement variableElement = getLocalVariableElement(node);
     if (variableElement != null) {
       SourceRange nodeRange = rangeNode(node);
       result.addVariable(variableElement, nodeRange);
     }
   }
 }