Make EXTRACT_LOCAL and EXTRACT_METHOD refactorings available when there is a selection.

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 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/edit/fix.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/protocol2.dart' show AnalysisError,
-    EditGetAssistsParams, EditGetAvailableRefactoringsParams,
-    EditGetFixesParams;
+    EditGetAssistsParams, EditGetAvailableRefactoringsParams, EditGetFixesParams;
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/change.dart';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/json.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart' as engine;
 import 'package:analyzer/src/generated/error.dart' as engine;
@@ skipping 21 matching lines @@
     searchEngine = server.searchEngine;
   }
 
   Response getAssists(Request request) {
     var params = new EditGetAssistsParams.fromRequest(request);
     List<Change> changes = <Change>[];
     List<CompilationUnit> units =
         server.getResolvedCompilationUnits(params.file);
     if (units.isNotEmpty) {
       CompilationUnit unit = units[0];
-      List<Assist> assists = computeAssists(searchEngine, unit, params.offset,
-          params.length);
+      List<Assist> assists =
+          computeAssists(searchEngine, unit, params.offset, params.length);
       assists.forEach((Assist assist) {
         changes.add(assist.change);
       });
     }
     // respond
     Response response = new Response(request.id);
     response.setResult(ASSISTS, objectToJson(changes));
     return response;
   }
 
   Response getAvailableRefactorings(Request request) {
     var params = new EditGetAvailableRefactoringsParams.fromRequest(request);
-    // TODO(paulberry): params.length isn't used.  Is this a bug?
+    String file = params.file;
+    int offset = params.offset;
+    int length = params.length;
     List<String> kinds = <String>[];
-    List<Element> elements = server.getElementsAtOffset(params.file,
-        params.offset);
-    if (elements.isNotEmpty) {
-      Element element = elements[0];
-      RenameRefactoring renameRefactoring =
-          new RenameRefactoring(searchEngine, element);
-      if (renameRefactoring != null) {
-        kinds.add(RefactoringKind.RENAME);
+    // try EXTRACT_*
+    if (length != 0) {
+      kinds.add(RefactoringKind.EXTRACT_LOCAL_VARIABLE);
+      kinds.add(RefactoringKind.EXTRACT_METHOD);
+    }
+    // try RENAME
+    {
+      List<Element> elements = server.getElementsAtOffset(file, offset);
+      if (elements.isNotEmpty) {
+        Element element = elements[0];
+        RenameRefactoring renameRefactoring =
+            new RenameRefactoring(searchEngine, element);
+        if (renameRefactoring != null) {
+          kinds.add(RefactoringKind.RENAME);
+        }
       }
     }
     // respond
     return new Response(request.id)..setResult(KINDS, kinds);
   }
 
   Response getFixes(Request request) {
     var params = new EditGetFixesParams.fromRequest(request);
     // TODO(paulberry): params.offset isn't used.  Is this a bug?
     List<ErrorFixes> errorFixesList = <ErrorFixes>[];
-    List<CompilationUnit> units = server.getResolvedCompilationUnits(params.file);
+    List<CompilationUnit> units =
+        server.getResolvedCompilationUnits(params.file);
     for (CompilationUnit unit in units) {
       engine.AnalysisErrorInfo errorInfo = server.getErrors(params.file);
       if (errorInfo != null) {
         for (engine.AnalysisError error in errorInfo.errors) {
           List<Fix> fixes = computeFixes(searchEngine, unit, error);
           if (fixes.isNotEmpty) {
             AnalysisError serverError =
                 new AnalysisError.fromEngine(errorInfo.lineInfo, error);
             ErrorFixes errorFixes = new ErrorFixes(serverError);
             errorFixesList.add(errorFixes);
@@ skipping 29 matching lines @@
 
 class RefactoringKind {
   static const String CONVERT_GETTER_TO_METHOD = 'CONVERT_GETTER_TO_METHOD';
   static const String CONVERT_METHOD_TO_GETTER = 'CONVERT_METHOD_TO_GETTER';
   static const String EXTRACT_LOCAL_VARIABLE = 'EXTRACT_LOCAL_VARIABLE';
   static const String EXTRACT_METHOD = 'EXTRACT_METHOD';
   static const String INLINE_LOCAL_VARIABLE = 'INLINE_LOCAL_VARIABLE';
   static const String INLINE_METHOD = 'INLINE_METHOD';
   static const String RENAME = 'RENAME';
 }