Include 'element' into 'search.findElementReferences' response.

pkg/analysis_server/lib/src/search/search_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 search.domain;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
+import 'package:analysis_server/src/computer/element.dart' as se;
 import 'package:analysis_server/src/search/element_references.dart';
 import 'package:analysis_server/src/search/search_result.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_services/search/search_engine.dart';
 import 'package:analyzer/src/generated/element.dart';
 
 /**
  * Instances of the class [SearchDomainHandler] implement a [RequestHandler]
  * that handles requests in the search domain.
@@ skipping 19 matching lines @@
    */
   SearchDomainHandler(this.server) {
     searchEngine = server.searchEngine;
   }
 
   Response findElementReferences(Request request) {
     String file = request.getRequiredParameter(FILE).asString();
     int offset = request.getRequiredParameter(OFFSET).asInt();
     bool includePotential =
         request.getRequiredParameter(INCLUDE_POTENTIAL).asBool();
+    // prepare elements
+    List<Element> elements = server.getElementsAtOffset(file, offset);
+    elements = elements.map((Element element) {
+      if (element is FieldFormalParameterElement) {
+        return element.field;
+      }
+      if (element is PropertyAccessorElement) {
+        return element.variable;
+      }
+      return element;
+    }).toList();
     // schedule search
     String searchId = (_nextSearchId++).toString();
-    List<Element> elements = server.getElementsAtOffset(file, offset);
     elements.forEach((Element element) {
       var computer = new ElementReferencesComputer(searchEngine);
       var future = computer.compute(element, includePotential);
       return future.then((List<SearchResult> results) {
         bool isLast = identical(element, elements.last);
         _sendSearchNotification(searchId, isLast, results);
       });
     });
     if (elements.isEmpty) {
       new Future.microtask(() {
         _sendSearchNotification(searchId, true, []);
       });
     }
     // respond
-    return new Response(request.id)..setResult(ID, searchId);
+    Response response = new Response(request.id);
+    response.setResult(ID, searchId);
+    if (elements.isNotEmpty) {
+      var serverElement = new se.Element.fromEngine(elements[0]);
+      response.setResult(ELEMENT, serverElement);
+    }
+    return response;
   }
 
   Response findMemberDeclarations(Request request) {
     // name
     RequestDatum nameDatum = request.getRequiredParameter(FILE);
     String name = nameDatum.asString();
     // TODO(brianwilkerson) implement
     return null;
   }
 
@@ skipping 34 matching lines @@
 
   void _sendSearchNotification(String searchId, bool isLast,
       List<SearchResult> results) {
     Notification notification = new Notification(SEARCH_RESULTS);
     notification.setParameter(ID, searchId);
     notification.setParameter(LAST, isLast);
     notification.setParameter(RESULTS, results);
     server.sendNotification(notification);
   }
 }