Clean up imports in analysis_server and analyzer_cli (and one missed in analyzer)

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/constants.dart';
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/provisional/index/index_core.dart';
 import 'package:analysis_server/src/search/element_references.dart';
 import 'package:analysis_server/src/search/type_hierarchy.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/indexable_file.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/ast.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 {
   /**
    * The analysis server that is using this handler to process requests.
    */
   final AnalysisServer server;
@@ skipping 141 matching lines @@
     if (elements.isEmpty) {
       _sendTypeHierarchyNull(request);
       return;
     }
     Element element = elements.first;
     // maybe supertype hierarchy only
     if (params.superOnly == true) {
       TypeHierarchyComputer computer =
           new TypeHierarchyComputer(searchEngine, element);
       List<protocol.TypeHierarchyItem> items = computer.computeSuper();
-      protocol.Response response = new protocol.SearchGetTypeHierarchyResult(
-          hierarchyItems: items).toResponse(request.id);
+      protocol.Response response =
+          new protocol.SearchGetTypeHierarchyResult(hierarchyItems: items)
+              .toResponse(request.id);
       server.sendResponse(response);
       return;
     }
     // prepare type hierarchy
     TypeHierarchyComputer computer =
         new TypeHierarchyComputer(searchEngine, element);
     List<protocol.TypeHierarchyItem> items = await computer.compute();
-    protocol.Response response = new protocol.SearchGetTypeHierarchyResult(
-        hierarchyItems: items).toResponse(request.id);
+    protocol.Response response =
+        new protocol.SearchGetTypeHierarchyResult(hierarchyItems: items)
+            .toResponse(request.id);
     server.sendResponse(response);
   }
 
   @override
   protocol.Response handleRequest(protocol.Request request) {
     if (searchEngine == null) {
       return new protocol.Response.noIndexGenerated(request);
     }
     try {
       String requestName = request.method;
@@ skipping 62 matching lines @@
   void _sendTypeHierarchyNull(protocol.Request request) {
     protocol.Response response =
         new protocol.SearchGetTypeHierarchyResult().toResponse(request.id);
     server.sendResponse(response);
   }
 
   static protocol.SearchResult toResult(SearchMatch match) {
     return protocol.newSearchResult_fromMatch(match);
   }
 }