Remove references to Engine classes from protocol.dart

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 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
-import 'package:analysis_server/src/protocol.dart' as protocol;
+import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/search/element_references.dart';
 import 'package:analysis_server/src/search/type_hierarchy.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 protocol.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;
   }
 
   protocol.Response findElementReferences(protocol.Request request) {
-    var params = new protocol.SearchFindElementReferencesParams.fromRequest(request);
+    var params =
+        new protocol.SearchFindElementReferencesParams.fromRequest(request);
     // prepare elements
-    List<Element> elements = server.getElementsAtOffset(params.file,
-        params.offset);
+    List<Element> elements =
+        server.getElementsAtOffset(params.file, params.offset);
     elements = elements.map((Element element) {
       if (element is ImportElement) {
         return element.prefix;
       }
       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<protocol.SearchResult> results) {
         bool isLast = identical(element, elements.last);
         _sendSearchNotification(searchId, isLast, results);
       });
     });
     // respond
     var result = new protocol.SearchFindElementReferencesResult();
     if (elements.isNotEmpty) {
       result.id = searchId;
-      result.element = new protocol.Element.fromEngine(elements[0]);
+      result.element = protocol.newElement_fromEngine(elements[0]);
     }
     return result.toResponse(request.id);
   }
 
   protocol.Response findMemberDeclarations(protocol.Request request) {
-    var params = new protocol.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 protocol.SearchFindMemberDeclarationsResult(
         searchId).toResponse(request.id);
   }
 
   protocol.Response findMemberReferences(protocol.Request request) {
-    var params = new protocol.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 protocol.SearchFindMemberReferencesResult(searchId).toResponse(
-        request.id);
+    return new protocol.SearchFindMemberReferencesResult(
+        searchId).toResponse(request.id);
   }
 
   protocol.Response findTopLevelDeclarations(protocol.Request request) {
-    var params = new protocol.SearchFindTopLevelDeclarationsParams.fromRequest(request);
+    var params =
+        new protocol.SearchFindTopLevelDeclarationsParams.fromRequest(request);
     // schedule search
     String searchId = (_nextSearchId++).toString();
     {
-      var matchesFuture = searchEngine.searchTopLevelDeclarations(params.pattern);
+      var matchesFuture =
+          searchEngine.searchTopLevelDeclarations(params.pattern);
       matchesFuture.then((List<SearchMatch> matches) {
         _sendSearchNotification(searchId, true, matches.map(toResult));
       });
     }
     // respond
     return new protocol.SearchFindTopLevelDeclarationsResult(
         searchId).toResponse(request.id);
   }
 
   /**
    * Implement the `search.getTypeHierarchy` request.
    */
   protocol.Response getTypeHierarchy(protocol.Request request) {
     var params = new protocol.SearchGetTypeHierarchyParams.fromRequest(request);
     // prepare parameters
     // prepare Element
-    List<Element> elements = server.getElementsAtOffset(params.file,
-        params.offset);
+    List<Element> elements =
+        server.getElementsAtOffset(params.file, params.offset);
     if (elements.isEmpty) {
       protocol.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<protocol.TypeHierarchyItem> items) {
       protocol.Response response = new protocol.SearchGetTypeHierarchyResult(
@@ skipping 20 matching lines @@
         return getTypeHierarchy(request);
       }
     } on protocol.RequestFailure catch (exception) {
       return exception.response;
     }
     return null;
   }
 
   void _sendSearchNotification(String searchId, bool isLast,
       Iterable<protocol.SearchResult> results) {
-    server.sendNotification(new protocol.SearchResultsParams(searchId,
-        results.toList(), isLast).toNotification());
+    server.sendNotification(
+        new protocol.SearchResultsParams(
+            searchId,
+            results.toList(),
+            isLast).toNotification());
   }
 
   static protocol.SearchResult toResult(SearchMatch match) {
-    return new protocol.SearchResult.fromMatch(match);
+    return protocol.newSearchResult_fromMatch(match);
   }
 }