Tweaks for refactoring manager.

pkg/analysis_server/lib/src/edit/edit_domain.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 edit.domain;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/collections.dart';
@@ skipping 290 matching lines @@
     result = new EditGetRefactoringResult(
         EMPTY_PROBLEM_LIST,
         EMPTY_PROBLEM_LIST,
         EMPTY_PROBLEM_LIST);
     // process the request
     var params = new EditGetRefactoringParams.fromRequest(request);
     runZoned(() async {
       await _init(params.kind, params.file, params.offset, params.length);
       if (initStatus.hasFatalError) {
         feedback = null;
-        return _sendResultResponse();
+        _sendResultResponse();
+        return;
       }
       // set options
       if (_requiresOptions) {
         if (params.options == null) {
           optionsStatus = new RefactoringStatus();
-          return _sendResultResponse();
+          _sendResultResponse();
+          return;
         }
         optionsStatus = _setOptions(params);
         if (_hasFatalError) {
-          return _sendResultResponse();
+          _sendResultResponse();
+          return;
         }
       }
       // done if just validation
       if (params.validateOnly) {
         finalStatus = new RefactoringStatus();
-        return _sendResultResponse();
+        _sendResultResponse();
+        return;
       }
       // simulate an exception
       if (test_simulateRefactoringException_final) {
         throw 'A simulated refactoring exception - final.';
       }
       // validation and create change
       finalStatus = await refactoring.checkFinalConditions();
       if (_hasFatalError) {
-        return _sendResultResponse();
+        _sendResultResponse();
+        return;
       }
       // simulate an exception
       if (test_simulateRefactoringException_change) {
         throw 'A simulated refactoring exception - change.';
       }
       // create change
       result.change = await refactoring.createChange();
       result.potentialEdits = nullIfEmpty(refactoring.potentialEditIds);
       _sendResultResponse();
     }, onError: (exception, stackTrace) {
       server.instrumentationService.logException(exception, stackTrace);
       server.sendResponse(
           new Response.serverError(request, exception, stackTrace));
       _reset();
     });
   }
 
   /**
    * Initializes this context to perform a refactoring with the specified
    * parameters. The existing [Refactoring] is reused or created as needed.
    */
-  _init(RefactoringKind kind, String file,
+  Future _init(RefactoringKind kind, String file,
       int offset, int length) async {
     await server.onAnalysisComplete;
     // check if we can continue with the existing Refactoring instance
     if (this.kind == kind &&
         this.file == file &&
         this.offset == offset &&
         this.length == length) {
-      return;
+      return null;

[Paul Berry, 2015/01/26 23:32:39]

Aw, man, I didn't realize you would have to do this to avoid a warning.  That's
a shame.

In fact, thinking about it more, I suspect this is due to an analyzer bug. 
IMHO, the following code should be warning and hint free:

  Future f() async {
    return;
  }  

For the same reason that this code is warning free:

  dynamic f() {
    return;
  }

I'll reread the spec and see if we are analyzing the code correctly or not, and
I'll follow up with a bug report.

     }
     _reset();
     this.kind = kind;
     this.file = file;
     this.offset = offset;
     this.length = length;
     // simulate an exception
     if (test_simulateRefactoringException_init) {
       throw 'A simulated refactoring exception - init.';
     }
@@ skipping 76 matching lines @@
         }
         // do create the refactoring
         refactoring = new RenameRefactoring(searchEngine, element);
         feedback =
             new RenameFeedback(node.offset, node.length, 'kind', 'oldName');
       }
     }
     if (refactoring == null) {
       initStatus =
           new RefactoringStatus.fatal('Unable to create a refactoring');
-      return;
+      return null;
     }
     // check initial conditions
     initStatus = await refactoring.checkInitialConditions();
     if (refactoring is ExtractLocalRefactoring) {
       ExtractLocalRefactoring refactoring = this.refactoring;
       ExtractLocalVariableFeedback feedback = this.feedback;
       feedback.names = refactoring.names;
       feedback.offsets = refactoring.offsets;
       feedback.lengths = refactoring.lengths;
     }
@@ skipping 23 matching lines @@
             refactoring.isDeclaration,
             className: refactoring.className);
       }
     }
     if (refactoring is RenameRefactoring) {
       RenameRefactoring refactoring = this.refactoring;
       RenameFeedback feedback = this.feedback;
       feedback.elementKindName = refactoring.elementKindName;
       feedback.oldName = refactoring.oldName;
     }
+    return null;
   }
 
   void _reset([engine.AnalysisContext context]) {
     kind = null;
     offset = null;
     length = null;
     refactoring = null;
     feedback = null;
     initStatus = new RefactoringStatus();
     optionsStatus = new RefactoringStatus();
@@ skipping 48 matching lines @@
     }
     if (refactoring is RenameRefactoring) {
       RenameRefactoring renameRefactoring = refactoring;
       RenameOptions renameOptions = params.options;
       renameRefactoring.newName = renameOptions.newName;
       return renameRefactoring.checkNewName();
     }
     return new RefactoringStatus();
   }
 }