Make more use of generated code in analysis server.

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/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
-import 'package:analysis_server/src/protocol2.dart' show
-    SearchFindElementReferencesParams, SearchFindMemberDeclarationsParams,
-    SearchFindMemberReferencesParams, SearchFindTopLevelDeclarationsParams,
-    SearchGetTypeHierarchyParams;
+import 'package:analysis_server/src/protocol2.dart' as protocol;
 import 'package:analysis_server/src/search/element_references.dart';
-import 'package:analysis_server/src/search/search_result.dart';
 import 'package:analysis_server/src/search/type_hierarchy.dart';
 import 'package:analysis_server/src/services/json.dart';
 import 'package:analysis_server/src/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.
  */
 class SearchDomainHandler implements RequestHandler {
@@ skipping 13 matching lines @@
   int _nextSearchId = 0;
 
   /**
    * Initialize a newly created handler to handle requests for the given [server].
    */
   SearchDomainHandler(this.server) {
     searchEngine = server.searchEngine;
   }
 
   Response findElementReferences(Request request) {
-    var params = new SearchFindElementReferencesParams.fromRequest(request);
+    var params = new protocol.SearchFindElementReferencesParams.fromRequest(request);
     // prepare elements
     List<Element> elements = server.getElementsAtOffset(params.file,
         params.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();
     elements.forEach((Element element) {
       var computer = new ElementReferencesComputer(searchEngine);
       var future = computer.compute(element, params.includePotential);
-      future.then((List<SearchResult> results) {
+      future.then((List<protocol.SearchResult> results) {
         bool isLast = identical(element, elements.last);
         _sendSearchNotification(searchId, isLast, results);
       });
     });
     if (elements.isEmpty) {
       new Future.microtask(() {
         _sendSearchNotification(searchId, true, []);
       });
     }
     // respond
-    Response response = new Response(request.id);
-    response.setResult(ID, searchId);
+    protocol.Element element;
     if (elements.isNotEmpty) {
-      var serverElement = new se.Element.fromEngine(elements[0]);
-      response.setResult(ELEMENT, serverElement.toJson());
+      element = new protocol.Element.fromEngine(elements[0]);
     }
-    return response;
+    return new protocol.SearchFindElementReferencesResult(searchId,
+        element: element).toResponse(request.id);
   }
 
   Response findMemberDeclarations(Request request) {
-    var params = new SearchFindMemberDeclarationsParams.fromRequest(request);
+    var params = new protocol.SearchFindMemberDeclarationsParams.fromRequest(request);
     // schedule search
     String searchId = (_nextSearchId++).toString();
     {
       var matchesFuture = searchEngine.searchMemberDeclarations(params.name);
       matchesFuture.then((List<SearchMatch> matches) {
         _sendSearchNotification(searchId, true, matches.map(toResult));
       });
     }
     // respond
-    return new Response(request.id)..setResult(ID, searchId);
+    return new protocol.SearchFindMemberDeclarationsResult(
+        searchId).toResponse(request.id);
   }
 
   Response findMemberReferences(Request request) {
-    var params = new SearchFindMemberReferencesParams.fromRequest(request);
+    var params = new protocol.SearchFindMemberReferencesParams.fromRequest(request);
     // schedule search
     String searchId = (_nextSearchId++).toString();
     {
       var matchesFuture = searchEngine.searchMemberReferences(params.name);
       matchesFuture.then((List<SearchMatch> matches) {
         _sendSearchNotification(searchId, true, matches.map(toResult));
       });
     }
     // respond
-    return new Response(request.id)..setResult(ID, searchId);
+    return new protocol.SearchFindMemberReferencesResult(searchId).toResponse(
+        request.id);
   }
 
   Response findTopLevelDeclarations(Request request) {
-    var params = new SearchFindTopLevelDeclarationsParams.fromRequest(request);
+    var params = new protocol.SearchFindTopLevelDeclarationsParams.fromRequest(request);
     // schedule search
     String searchId = (_nextSearchId++).toString();
     {
       var matchesFuture = searchEngine.searchTopLevelDeclarations(params.pattern);
       matchesFuture.then((List<SearchMatch> matches) {
         _sendSearchNotification(searchId, true, matches.map(toResult));
       });
     }
     // respond
-    return new Response(request.id)..setResult(ID, searchId);
+    return new protocol.SearchFindTopLevelDeclarationsResult(
+        searchId).toResponse(request.id);
   }
 
   /**
    * Implement the `search.getTypeHierarchy` request.
    */
   Response getTypeHierarchy(Request request) {
-    var params = new SearchGetTypeHierarchyParams.fromRequest(request);
+    var params = new protocol.SearchGetTypeHierarchyParams.fromRequest(request);
     // prepare parameters
     // prepare Element
     List<Element> elements = server.getElementsAtOffset(params.file,
         params.offset);
-    Response response = new Response(request.id);
     if (elements.isEmpty) {
-      response.setEmptyResult();
+      Response response = new protocol.SearchGetTypeHierarchyResult().toResponse(request.id);
       return response;
     }
     Element element = elements.first;
     // prepare type hierarchy
     TypeHierarchyComputer computer = new TypeHierarchyComputer(searchEngine);
-    computer.compute(element).then((List<TypeHierarchyItem> items) {
-      if (items != null) {
-        response.setResult(HIERARCHY_ITEMS, objectToJson(items));
-      } else {
-        response.setEmptyResult();
-      }
+    computer.compute(element).then((List<protocol.TypeHierarchyItem> items) {
+      Response response = new protocol.SearchGetTypeHierarchyResult(
+          hierarchyItems: items).toResponse(request.id);
       server.sendResponse(response);
     });
     // delay response
     return Response.DELAYED_RESPONSE;
   }
 
   @override
   Response handleRequest(Request request) {
     try {
       String requestName = request.method;
       if (requestName == SEARCH_FIND_ELEMENT_REFERENCES) {
         return findElementReferences(request);
       } else if (requestName == SEARCH_FIND_MEMBER_DECLARATIONS) {
         return findMemberDeclarations(request);
       } else if (requestName == SEARCH_FIND_MEMBER_REFERENCES) {
         return findMemberReferences(request);
       } else if (requestName == SEARCH_FIND_TOP_LEVEL_DECLARATIONS) {
         return findTopLevelDeclarations(request);
       } else if (requestName == SEARCH_GET_TYPE_HIERARCHY) {
         return getTypeHierarchy(request);
       }
     } on RequestFailure catch (exception) {
       return exception.response;
     }
     return null;
   }
 
   void _sendSearchNotification(String searchId, bool isLast,
-      Iterable<SearchResult> results) {
+      Iterable<protocol.SearchResult> results) {
     Notification notification = new Notification(SEARCH_RESULTS);
     notification.setParameter(ID, searchId);
     notification.setParameter(LAST, isLast);
     notification.setParameter(RESULTS, objectToJson(results));
     server.sendNotification(notification);
   }
 
-  static SearchResult toResult(SearchMatch match) {
-    return new SearchResult.fromMatch(match);
+  static protocol.SearchResult toResult(SearchMatch match) {
+    return new protocol.SearchResult.fromMatch(match);
   }
 }