Support for 'superOnly' in 'search.getTypeHierarchy'.

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';
@@ skipping 109 matching lines @@
     List<SearchMatch> matches =
         await searchEngine.searchTopLevelDeclarations(params.pattern);
     _sendSearchNotification(searchId, true, matches.map(toResult));
   }
 
   /**
    * Implement the `search.getTypeHierarchy` request.
    */
   Future getTypeHierarchy(protocol.Request request) async {
     var params = new protocol.SearchGetTypeHierarchyParams.fromRequest(request);
-    await server.onAnalysisComplete;
+    String file = params.file;
+    // wait for analysis
+    if (params.superOnly == true) {
+      await server.onFileAnalysisComplete(file);
+    } else {
+      await server.onAnalysisComplete;
+    }
     // prepare element
-    List<Element> elements =
-        server.getElementsAtOffset(params.file, params.offset);
+    List<Element> elements = server.getElementsAtOffset(file, params.offset);
     if (elements.isEmpty) {
-      protocol.Response response =
-          new protocol.SearchGetTypeHierarchyResult().toResponse(request.id);
+      _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);
       server.sendResponse(response);
       return;
     }
-    Element element = elements.first;
     // prepare type hierarchy
-    TypeHierarchyComputer computer = new TypeHierarchyComputer(searchEngine);
-    List<protocol.TypeHierarchyItem> items = await computer.compute(element);
+    TypeHierarchyComputer computer =
+        new TypeHierarchyComputer(searchEngine, element);
+    List<protocol.TypeHierarchyItem> items = await computer.compute();
     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);
     }
@@ skipping 29 matching lines @@
   }
 
   /**
    * Send a search response with the given [result] to the given [request].
    */
   void _sendSearchResult(protocol.Request request, result) {
     protocol.Response response = result.toResponse(request.id);
     server.sendResponse(response);
   }
 
+  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);
   }
 }