Fix for 'Rename Local' refactoring without tasks.

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 182 matching lines @@
 
 /**
  * [InlineMethodRefactoring] implementation.
  */
 class InlineMethodRefactoringImpl extends RefactoringImpl
     implements InlineMethodRefactoring {
   final SearchEngine searchEngine;
   final AstProvider astProvider;
   final CompilationUnit unit;
   final int offset;
-  _UnitCache _unitCache;
+  ResolvedUnitCache _unitCache;
   CorrectionUtils utils;
   SourceChange change;
 
   bool isDeclaration = false;
   bool deleteSource = false;
   bool inlineAll = true;
 
   ExecutableElement _methodElement;
   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.astProvider, this.unit, this.offset) {
-    _unitCache = new _UnitCache(astProvider, unit);
+    _unitCache = new ResolvedUnitCache(astProvider, unit);
     utils = new CorrectionUtils(unit);
   }
 
   @override
   String get className {
     if (_methodElement == null) {
       return null;
     }
     Element classElement = _methodElement.enclosingElement;
     if (classElement is ClassElement) {
@@ skipping 545 matching lines @@
     List<SourceRange> ranges = _variables[element];
     if (ranges == null) {
       ranges = [];
       _variables[element] = ranges;
     }
     range = rangeFromBase(range, _base);
     ranges.add(range);
   }
 }
 
-class _UnitCache {
-  final AstProvider astProvider;
-  final Map<CompilationUnitElement, CompilationUnit> map = {};
-
-  _UnitCache(this.astProvider, CompilationUnit unit) {
-    map[unit.element] = unit;
-  }
-
-  Future<CompilationUnit> getUnit(Element element) async {
-    Element unitElement =
-        element.getAncestor((e) => e is CompilationUnitElement);
-    CompilationUnit unit = map[unitElement];
-    if (unit == null) {
-      unit = await astProvider.getResolvedUnitForElement(element);
-      map[unitElement] = unit;
-    }
-    return unit;
-  }
-}
-
 /**
  * A visitor that fills [_SourcePart] with fields, parameters and variables.
  */
 class _VariablesVisitor extends GeneralizingAstVisitor {
   /**
    * The [ExecutableElement] being inlined.
    */
   final ExecutableElement methodElement;
 
   /**
@@ skipping 80 matching lines @@
   }
 
   void _addVariable(SimpleIdentifier node) {
     VariableElement variableElement = getLocalVariableElement(node);
     if (variableElement != null) {
       SourceRange nodeRange = rangeNode(node);
       result.addVariable(variableElement, nodeRange);
     }
   }
 }