Convert to async/await parts that cause strong mode warnings.

pkg/analysis_server/test/integration/integration_test_methods.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.
 //
 // This file has been automatically generated.  Please do not edit it manually.
 // To regenerate the file, use the script
 // "pkg/analysis_server/tool/spec/generate_files".
 
 /**
  * Convenience methods for running integration tests
@@ skipping 18 matching lines @@
 
   /**
    * Return the version number of the analysis server.
    *
    * Returns
    *
    * version ( String )
    *
    *   The version number of the analysis server.
    */
-  Future<ServerGetVersionResult> sendServerGetVersion() {
-    return server.send("server.getVersion", null)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new ServerGetVersionResult.fromJson(decoder, 'result', result);
-    });
+  Future<ServerGetVersionResult> sendServerGetVersion() async {
+    var result = await server.send("server.getVersion", null);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new ServerGetVersionResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Cleanly shutdown the analysis server. Requests that are received after
    * this request will not be processed. Requests that were received before
    * this request, but for which a response has not yet been sent, will not be
    * responded to. No further responses or notifications will be sent after the
    * response to this request has been sent.
    */
-  Future sendServerShutdown() {
-    return server.send("server.shutdown", null)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+  Future sendServerShutdown() async {
+    var result = await server.send("server.shutdown", null);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Subscribe for services. All previous subscriptions are replaced by the
    * given set of services.
    *
    * It is an error if any of the elements in the list are not valid services.
    * If there is an error, then the current subscriptions will remain
    * unchanged.
    *
    * Parameters
    *
    * subscriptions ( List<ServerService> )
    *
    *   A list of the services being subscribed to.
    */
-  Future sendServerSetSubscriptions(List<ServerService> subscriptions) {
+  Future sendServerSetSubscriptions(List<ServerService> subscriptions) async {
     var params = new ServerSetSubscriptionsParams(subscriptions).toJson();
-    return server.send("server.setSubscriptions", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("server.setSubscriptions", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Reports that the server is running. This notification is issued once after
    * the server has started running but before any requests are processed to
    * let the client know that it started correctly.
    *
    * It is not possible to subscribe to or unsubscribe from this notification.
    *
    * Parameters
@@ skipping 98 matching lines @@
    * file ( FilePath )
    *
    *   The file for which errors are being requested.
    *
    * Returns
    *
    * errors ( List<AnalysisError> )
    *
    *   The errors associated with the file.
    */
-  Future<AnalysisGetErrorsResult> sendAnalysisGetErrors(String file) {
+  Future<AnalysisGetErrorsResult> sendAnalysisGetErrors(String file) async {
     var params = new AnalysisGetErrorsParams(file).toJson();
-    return server.send("analysis.getErrors", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new AnalysisGetErrorsResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("analysis.getErrors", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new AnalysisGetErrorsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Return the hover information associate with the given location. If some or
    * all of the hover information is not available at the time this request is
    * processed the information will be omitted from the response.
    *
    * Parameters
    *
    * file ( FilePath )
    *
    *   The file in which hover information is being requested.
    *
    * offset ( int )
    *
    *   The offset for which hover information is being requested.
    *
    * Returns
    *
    * hovers ( List<HoverInformation> )
    *
    *   The hover information associated with the location. The list will be
    *   empty if no information could be determined for the location. The list
    *   can contain multiple items if the file is being analyzed in multiple
    *   contexts in conflicting ways (such as a part that is included in
    *   multiple libraries).
    */
-  Future<AnalysisGetHoverResult> sendAnalysisGetHover(String file, int offset) {
+  Future<AnalysisGetHoverResult> sendAnalysisGetHover(String file, int offset) async {
     var params = new AnalysisGetHoverParams(file, offset).toJson();
-    return server.send("analysis.getHover", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new AnalysisGetHoverResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("analysis.getHover", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new AnalysisGetHoverResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Return the transitive closure of reachable sources for a given file.
    *
    * If a request is made for a file which does not exist, or which is not
    * currently subject to analysis (e.g. because it is not associated with any
    * analysis root specified to analysis.setAnalysisRoots), an error of type
    * GET_REACHABLE_SOURCES_INVALID_FILE will be generated.
    *
    * Parameters
    *
    * file ( FilePath )
    *
    *   The file for which reachable source information is being requested.
    *
    * Returns
    *
    * sources ( Map<String, List<String>> )
    *
    *   A mapping from source URIs to directly reachable source URIs. For
    *   example, a file "foo.dart" that imports "bar.dart" would have the
    *   corresponding mapping { "file:///foo.dart" : ["file:///bar.dart"] }. If
    *   "bar.dart" has further imports (or exports) there will be a mapping from
    *   the URI "file:///bar.dart" to them. To check if a specific URI is
    *   reachable from a given file, clients can check for its presence in the
    *   resulting key set.
    */
-  Future<AnalysisGetReachableSourcesResult> sendAnalysisGetReachableSources(String file) {
+  Future<AnalysisGetReachableSourcesResult> sendAnalysisGetReachableSources(String file) async {
     var params = new AnalysisGetReachableSourcesParams(file).toJson();
-    return server.send("analysis.getReachableSources", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new AnalysisGetReachableSourcesResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("analysis.getReachableSources", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new AnalysisGetReachableSourcesResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Return library dependency information for use in client-side indexing and
    * package URI resolution.
    *
    * Clients that are only using the libraries field should consider using the
    * analyzedFiles notification instead.
    *
    * Returns
    *
    * libraries ( List<FilePath> )
    *
    *   A list of the paths of library elements referenced by files in existing
    *   analysis roots.
    *
    * packageMap ( Map<String, Map<String, List<FilePath>>> )
    *
    *   A mapping from context source roots to package maps which map package
    *   names to source directories for use in client-side package URI
    *   resolution.
    */
-  Future<AnalysisGetLibraryDependenciesResult> sendAnalysisGetLibraryDependencies() {
-    return server.send("analysis.getLibraryDependencies", null)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new AnalysisGetLibraryDependenciesResult.fromJson(decoder, 'result', result);
-    });
+  Future<AnalysisGetLibraryDependenciesResult> sendAnalysisGetLibraryDependencies() async {
+    var result = await server.send("analysis.getLibraryDependencies", null);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new AnalysisGetLibraryDependenciesResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Return the navigation information associated with the given region of the
    * given file. If the navigation information for the given file has not yet
    * been computed, or the most recently computed navigation information for
    * the given file is out of date, then the response for this request will be
    * delayed until it has been computed. If the content of the file changes
    * after this request was received but before a response could be sent, then
    * an error of type CONTENT_MODIFIED will be generated.
@@ skipping 36 matching lines @@
    * targets ( List<NavigationTarget> )
    *
    *   A list of the navigation targets that are referenced by the navigation
    *   regions.
    *
    * regions ( List<NavigationRegion> )
    *
    *   A list of the navigation regions within the requested region of the
    *   file.
    */
-  Future<AnalysisGetNavigationResult> sendAnalysisGetNavigation(String file, int offset, int length) {
+  Future<AnalysisGetNavigationResult> sendAnalysisGetNavigation(String file, int offset, int length) async {
     var params = new AnalysisGetNavigationParams(file, offset, length).toJson();
-    return server.send("analysis.getNavigation", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new AnalysisGetNavigationResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("analysis.getNavigation", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new AnalysisGetNavigationResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Force the re-analysis of everything contained in the specified analysis
    * roots. This will cause all previously computed analysis results to be
    * discarded and recomputed, and will cause all subscribed notifications to
    * be re-sent.
    *
    * If no analysis roots are provided, then all current analysis roots will be
    * re-analyzed. If an empty list of analysis roots is provided, then nothing
    * will be re-analyzed. If the list contains one or more paths that are not
    * currently analysis roots, then an error of type INVALID_ANALYSIS_ROOT will
    * be generated.
    *
    * Parameters
    *
    * roots ( optional List<FilePath> )
    *
    *   A list of the analysis roots that are to be re-analyzed.
    */
-  Future sendAnalysisReanalyze({List<String> roots}) {
+  Future sendAnalysisReanalyze({List<String> roots}) async {
     var params = new AnalysisReanalyzeParams(roots: roots).toJson();
-    return server.send("analysis.reanalyze", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("analysis.reanalyze", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Sets the root paths used to determine which files to analyze. The set of
    * files to be analyzed are all of the files in one of the root paths that
    * are not either explicitly or implicitly excluded. A file is explicitly
    * excluded if it is in one of the excluded paths. A file is implicitly
    * excluded if it is in a subdirectory of one of the root paths where the
    * name of the subdirectory starts with a period (that is, a hidden
    * directory).
@@ skipping 41 matching lines @@
    *   If a package root is a file, then the analyzer will behave as though
    *   that file is a ".packages" file in the source directory. The effect is
    *   the same as specifying the file as a "--packages" parameter to the Dart
    *   VM when executing any Dart file inside the source directory.
    *
    *   Files in any directories that are not overridden by this mapping have
    *   their package: URI's resolved using the normal pubspec.yaml mechanism.
    *   If this field is absent, or the empty map is specified, that indicates
    *   that the normal pubspec.yaml mechanism should always be used.
    */
-  Future sendAnalysisSetAnalysisRoots(List<String> included, List<String> excluded, {Map<String, String> packageRoots}) {
+  Future sendAnalysisSetAnalysisRoots(List<String> included, List<String> excluded, {Map<String, String> packageRoots}) async {
     var params = new AnalysisSetAnalysisRootsParams(included, excluded, packageRoots: packageRoots).toJson();
-    return server.send("analysis.setAnalysisRoots", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("analysis.setAnalysisRoots", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Subscribe for general services (that is, services that are not specific to
    * individual files). All previous subscriptions are replaced by the given
    * set of services.
    *
    * It is an error if any of the elements in the list are not valid services.
    * If there is an error, then the current subscriptions will remain
    * unchanged.
    *
    * Parameters
    *
    * subscriptions ( List<GeneralAnalysisService> )
    *
    *   A list of the services being subscribed to.
    */
-  Future sendAnalysisSetGeneralSubscriptions(List<GeneralAnalysisService> subscriptions) {
+  Future sendAnalysisSetGeneralSubscriptions(List<GeneralAnalysisService> subscriptions) async {
     var params = new AnalysisSetGeneralSubscriptionsParams(subscriptions).toJson();
-    return server.send("analysis.setGeneralSubscriptions", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("analysis.setGeneralSubscriptions", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Set the priority files to the files in the given list. A priority file is
    * a file that is given priority when scheduling which analysis work to do
    * first. The list typically contains those files that are visible to the
    * user and those for which analysis results will have the biggest impact on
    * the user experience. The order of the files within the list is
    * significant: the first file will be given higher priority than the second,
    * the second higher priority than the third, and so on.
    *
    * Note that this request determines the set of requested priority files. The
    * actual set of priority files is the intersection of the requested set of
    * priority files with the set of files currently subject to analysis. (See
    * analysis.setSubscriptions for a description of files that are subject to
    * analysis.)
    *
    * If a requested priority file is a directory it is ignored, but remains in
    * the set of requested priority files so that if it later becomes a file it
    * can be included in the set of actual priority files.
    *
    * Parameters
    *
    * files ( List<FilePath> )
    *
    *   The files that are to be a priority for analysis.
    */
-  Future sendAnalysisSetPriorityFiles(List<String> files) {
+  Future sendAnalysisSetPriorityFiles(List<String> files) async {
     var params = new AnalysisSetPriorityFilesParams(files).toJson();
-    return server.send("analysis.setPriorityFiles", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("analysis.setPriorityFiles", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Subscribe for services that are specific to individual files. All previous
    * subscriptions are replaced by the current set of subscriptions. If a given
    * service is not included as a key in the map then no files will be
    * subscribed to the service, exactly as if the service had been included in
    * the map with an explicit empty list of files.
    *
    * Note that this request determines the set of requested subscriptions. The
@@ skipping 14 matching lines @@
    * It is an error if any of the keys in the map are not valid services. If
    * there is an error, then the existing subscriptions will remain unchanged.
    *
    * Parameters
    *
    * subscriptions ( Map<AnalysisService, List<FilePath>> )
    *
    *   A table mapping services to a list of the files being subscribed to the
    *   service.
    */
-  Future sendAnalysisSetSubscriptions(Map<AnalysisService, List<String>> subscriptions) {
+  Future sendAnalysisSetSubscriptions(Map<AnalysisService, List<String>> subscriptions) async {
     var params = new AnalysisSetSubscriptionsParams(subscriptions).toJson();
-    return server.send("analysis.setSubscriptions", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("analysis.setSubscriptions", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Update the content of one or more files. Files that were previously
    * updated but not included in this update remain unchanged. This effectively
    * represents an overlay of the filesystem. The files whose content is
    * overridden are therefore seen by server as being files with the given
    * content, even if the files do not exist on the filesystem or if the file
    * path represents the path to a directory on the filesystem.
    *
    * Parameters
    *
    * files ( Map<FilePath, AddContentOverlay | ChangeContentOverlay |
    * RemoveContentOverlay> )
    *
    *   A table mapping the files whose content has changed to a description of
    *   the content change.
    *
    * Returns
    */
-  Future<AnalysisUpdateContentResult> sendAnalysisUpdateContent(Map<String, dynamic> files) {
+  Future<AnalysisUpdateContentResult> sendAnalysisUpdateContent(Map<String, dynamic> files) async {
     var params = new AnalysisUpdateContentParams(files).toJson();
-    return server.send("analysis.updateContent", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new AnalysisUpdateContentResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("analysis.updateContent", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new AnalysisUpdateContentResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Update the options controlling analysis based on the given set of options.
    * Any options that are not included in the analysis options will not be
    * changed. If there are options in the analysis options that are not valid,
    * they will be silently ignored.
    *
    * Parameters
    *
    * options ( AnalysisOptions )
    *
    *   The options that are to be used to control analysis.
    */
-  Future sendAnalysisUpdateOptions(AnalysisOptions options) {
+  Future sendAnalysisUpdateOptions(AnalysisOptions options) async {
     var params = new AnalysisUpdateOptionsParams(options).toJson();
-    return server.send("analysis.updateOptions", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("analysis.updateOptions", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Reports the paths of the files that are being analyzed.
    *
    * This notification is not subscribed to by default. Clients can subscribe
    * by including the value "ANALYZED_FILES" in the list of services passed in
    * an analysis.setGeneralSubscriptions request.
    *
    * Parameters
@@ skipping 316 matching lines @@
    * offset ( int )
    *
    *   The offset within the file at which suggestions are to be made.
    *
    * Returns
    *
    * id ( CompletionId )
    *
    *   The identifier used to associate results with this completion request.
    */
-  Future<CompletionGetSuggestionsResult> sendCompletionGetSuggestions(String file, int offset) {
+  Future<CompletionGetSuggestionsResult> sendCompletionGetSuggestions(String file, int offset) async {
     var params = new CompletionGetSuggestionsParams(file, offset).toJson();
-    return server.send("completion.getSuggestions", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new CompletionGetSuggestionsResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("completion.getSuggestions", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new CompletionGetSuggestionsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Reports the completion suggestions that should be presented to the user.
    * The set of suggestions included in the notification is always a complete
    * list that supersedes any previously reported suggestions.
    *
    * Parameters
    *
    * id ( CompletionId )
@@ skipping 68 matching lines @@
    *   notification.
    *
    * element ( optional Element )
    *
    *   The element referenced or defined at the given offset and whose
    *   references will be returned in the search results.
    *
    *   If no element was found at the given location, this field will be
    *   absent.
    */
-  Future<SearchFindElementReferencesResult> sendSearchFindElementReferences(String file, int offset, bool includePotential) {
+  Future<SearchFindElementReferencesResult> sendSearchFindElementReferences(String file, int offset, bool includePotential) async {
     var params = new SearchFindElementReferencesParams(file, offset, includePotential).toJson();
-    return server.send("search.findElementReferences", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new SearchFindElementReferencesResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("search.findElementReferences", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new SearchFindElementReferencesResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Perform a search for declarations of members whose name is equal to the
    * given name.
    *
    * An identifier is returned immediately, and individual results will be
    * returned via the search.results notification as they become available.
    *
    * Parameters
    *
    * name ( String )
    *
    *   The name of the declarations to be found.
    *
    * Returns
    *
    * id ( SearchId )
    *
    *   The identifier used to associate results with this search request.
    */
-  Future<SearchFindMemberDeclarationsResult> sendSearchFindMemberDeclarations(String name) {
+  Future<SearchFindMemberDeclarationsResult> sendSearchFindMemberDeclarations(String name) async {
     var params = new SearchFindMemberDeclarationsParams(name).toJson();
-    return server.send("search.findMemberDeclarations", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new SearchFindMemberDeclarationsResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("search.findMemberDeclarations", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new SearchFindMemberDeclarationsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Perform a search for references to members whose name is equal to the
    * given name. This search does not check to see that there is a member
    * defined with the given name, so it is able to find references to undefined
    * members as well.
    *
    * An identifier is returned immediately, and individual results will be
    * returned via the search.results notification as they become available.
    *
    * Parameters
    *
    * name ( String )
    *
    *   The name of the references to be found.
    *
    * Returns
    *
    * id ( SearchId )
    *
    *   The identifier used to associate results with this search request.
    */
-  Future<SearchFindMemberReferencesResult> sendSearchFindMemberReferences(String name) {
+  Future<SearchFindMemberReferencesResult> sendSearchFindMemberReferences(String name) async {
     var params = new SearchFindMemberReferencesParams(name).toJson();
-    return server.send("search.findMemberReferences", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new SearchFindMemberReferencesResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("search.findMemberReferences", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new SearchFindMemberReferencesResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Perform a search for declarations of top-level elements (classes,
    * typedefs, getters, setters, functions and fields) whose name matches the
    * given pattern.
    *
    * An identifier is returned immediately, and individual results will be
    * returned via the search.results notification as they become available.
    *
    * Parameters
    *
    * pattern ( String )
    *
    *   The regular expression used to match the names of the declarations to be
    *   found.
    *
    * Returns
    *
    * id ( SearchId )
    *
    *   The identifier used to associate results with this search request.
    */
-  Future<SearchFindTopLevelDeclarationsResult> sendSearchFindTopLevelDeclarations(String pattern) {
+  Future<SearchFindTopLevelDeclarationsResult> sendSearchFindTopLevelDeclarations(String pattern) async {
     var params = new SearchFindTopLevelDeclarationsParams(pattern).toJson();
-    return server.send("search.findTopLevelDeclarations", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new SearchFindTopLevelDeclarationsResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("search.findTopLevelDeclarations", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new SearchFindTopLevelDeclarationsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Return the type hierarchy of the class declared or referenced at the given
    * location.
    *
    * Parameters
    *
    * file ( FilePath )
    *
@@ skipping 16 matching lines @@
    *   A list of the types in the requested hierarchy. The first element of the
    *   list is the item representing the type for which the hierarchy was
    *   requested. The index of other elements of the list is unspecified, but
    *   correspond to the integers used to reference supertype and subtype items
    *   within the items.
    *
    *   This field will be absent if the code at the given file and offset does
    *   not represent a type, or if the file has not been sufficiently analyzed
    *   to allow a type hierarchy to be produced.
    */
-  Future<SearchGetTypeHierarchyResult> sendSearchGetTypeHierarchy(String file, int offset, {bool superOnly}) {
+  Future<SearchGetTypeHierarchyResult> sendSearchGetTypeHierarchy(String file, int offset, {bool superOnly}) async {
     var params = new SearchGetTypeHierarchyParams(file, offset, superOnly: superOnly).toJson();
-    return server.send("search.getTypeHierarchy", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new SearchGetTypeHierarchyResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("search.getTypeHierarchy", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new SearchGetTypeHierarchyResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Reports some or all of the results of performing a requested search.
    * Unlike other notifications, this notification contains search results that
    * should be added to any previously received search results associated with
    * the same search id.
    *
    * Parameters
    *
@@ skipping 58 matching lines @@
    *   empty if the code was already formatted (there are no changes).
    *
    * selectionOffset ( int )
    *
    *   The offset of the selection after formatting the code.
    *
    * selectionLength ( int )
    *
    *   The length of the selection after formatting the code.
    */
-  Future<EditFormatResult> sendEditFormat(String file, int selectionOffset, int selectionLength, {int lineLength}) {
+  Future<EditFormatResult> sendEditFormat(String file, int selectionOffset, int selectionLength, {int lineLength}) async {
     var params = new EditFormatParams(file, selectionOffset, selectionLength, lineLength: lineLength).toJson();
-    return server.send("edit.format", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new EditFormatResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("edit.format", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new EditFormatResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Return the set of assists that are available at the given location. An
    * assist is distinguished from a refactoring primarily by the fact that it
    * affects a single file and does not require user input in order to be
    * performed.
    *
    * Parameters
    *
    * file ( FilePath )
    *
    *   The file containing the code for which assists are being requested.
    *
    * offset ( int )
    *
    *   The offset of the code for which assists are being requested.
    *
    * length ( int )
    *
    *   The length of the code for which assists are being requested.
    *
    * Returns
    *
    * assists ( List<SourceChange> )
    *
    *   The assists that are available at the given location.
    */
-  Future<EditGetAssistsResult> sendEditGetAssists(String file, int offset, int length) {
+  Future<EditGetAssistsResult> sendEditGetAssists(String file, int offset, int length) async {
     var params = new EditGetAssistsParams(file, offset, length).toJson();
-    return server.send("edit.getAssists", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new EditGetAssistsResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("edit.getAssists", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new EditGetAssistsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Get a list of the kinds of refactorings that are valid for the given
    * selection in the given file.
    *
    * Parameters
    *
    * file ( FilePath )
    *
    *   The file containing the code on which the refactoring would be based.
    *
    * offset ( int )
    *
    *   The offset of the code on which the refactoring would be based.
    *
    * length ( int )
    *
    *   The length of the code on which the refactoring would be based.
    *
    * Returns
    *
    * kinds ( List<RefactoringKind> )
    *
    *   The kinds of refactorings that are valid for the given selection.
    */
-  Future<EditGetAvailableRefactoringsResult> sendEditGetAvailableRefactorings(String file, int offset, int length) {
+  Future<EditGetAvailableRefactoringsResult> sendEditGetAvailableRefactorings(String file, int offset, int length) async {
     var params = new EditGetAvailableRefactoringsParams(file, offset, length).toJson();
-    return server.send("edit.getAvailableRefactorings", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new EditGetAvailableRefactoringsResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("edit.getAvailableRefactorings", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new EditGetAvailableRefactoringsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Return the set of fixes that are available for the errors at a given
    * offset in a given file.
    *
    * Parameters
    *
    * file ( FilePath )
    *
    *   The file containing the errors for which fixes are being requested.
    *
    * offset ( int )
    *
    *   The offset used to select the errors for which fixes will be returned.
    *
    * Returns
    *
    * fixes ( List<AnalysisErrorFixes> )
    *
    *   The fixes that are available for the errors at the given offset.
    */
-  Future<EditGetFixesResult> sendEditGetFixes(String file, int offset) {
+  Future<EditGetFixesResult> sendEditGetFixes(String file, int offset) async {
     var params = new EditGetFixesParams(file, offset).toJson();
-    return server.send("edit.getFixes", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new EditGetFixesResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("edit.getFixes", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new EditGetFixesResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Get the changes required to perform a refactoring.
    *
    * If another refactoring request is received during the processing of this
    * one, an error of type REFACTORING_REQUEST_CANCELLED will be generated.
    *
    * Parameters
    *
@@ skipping 63 matching lines @@
    * potentialEdits ( optional List<String> )
    *
    *   The ids of source edits that are not known to be valid. An edit is not
    *   known to be valid if there was insufficient type information for the
    *   server to be able to determine whether or not the code needs to be
    *   modified, such as when a member is being renamed and there is a
    *   reference to a member from an unknown type. This field will be omitted
    *   if the change field is omitted or if there are no potential edits for
    *   the refactoring.
    */
-  Future<EditGetRefactoringResult> sendEditGetRefactoring(RefactoringKind kind, String file, int offset, int length, bool validateOnly, {RefactoringOptions options}) {
+  Future<EditGetRefactoringResult> sendEditGetRefactoring(RefactoringKind kind, String file, int offset, int length, bool validateOnly, {RefactoringOptions options}) async {
     var params = new EditGetRefactoringParams(kind, file, offset, length, validateOnly, options: options).toJson();
-    return server.send("edit.getRefactoring", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(kind);
-      return new EditGetRefactoringResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("edit.getRefactoring", params);
+    ResponseDecoder decoder = new ResponseDecoder(kind);
+    return new EditGetRefactoringResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Sort all of the directives, unit and class members of the given Dart file.
    *
    * If a request is made for a file that does not exist, does not belong to an
    * analysis root or is not a Dart file, SORT_MEMBERS_INVALID_FILE will be
    * generated.
    *
    * If the Dart file has scan or parse errors, SORT_MEMBERS_PARSE_ERRORS will
    * be generated.
    *
    * Parameters
    *
    * file ( FilePath )
    *
    *   The Dart file to sort.
    *
    * Returns
    *
    * edit ( SourceFileEdit )
    *
    *   The file edit that is to be applied to the given file to effect the
    *   sorting.
    */
-  Future<EditSortMembersResult> sendEditSortMembers(String file) {
+  Future<EditSortMembersResult> sendEditSortMembers(String file) async {
     var params = new EditSortMembersParams(file).toJson();
-    return server.send("edit.sortMembers", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new EditSortMembersResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("edit.sortMembers", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new EditSortMembersResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Organizes all of the directives - removes unused imports and sorts
    * directives of the given Dart file according to the Dart Style Guide.
    *
    * If a request is made for a file that does not exist, does not belong to an
    * analysis root or is not a Dart file, FILE_NOT_ANALYZED will be generated.
    *
    * If directives of the Dart file cannot be organized, for example because it
    * has scan or parse errors, or by other reasons, ORGANIZE_DIRECTIVES_ERROR
    * will be generated. The message will provide details about the reason.
    *
    * Parameters
    *
    * file ( FilePath )
    *
    *   The Dart file to organize directives in.
    *
    * Returns
    *
    * edit ( SourceFileEdit )
    *
    *   The file edit that is to be applied to the given file to effect the
    *   organizing.
    */
-  Future<EditOrganizeDirectivesResult> sendEditOrganizeDirectives(String file) {
+  Future<EditOrganizeDirectivesResult> sendEditOrganizeDirectives(String file) async {
     var params = new EditOrganizeDirectivesParams(file).toJson();
-    return server.send("edit.organizeDirectives", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new EditOrganizeDirectivesResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("edit.organizeDirectives", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new EditOrganizeDirectivesResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Create an execution context for the executable file with the given path.
    * The context that is created will persist until execution.deleteContext is
    * used to delete it. Clients, therefore, are responsible for managing the
    * lifetime of execution contexts.
    *
    * Parameters
    *
    * contextRoot ( FilePath )
    *
    *   The path of the Dart or HTML file that will be launched, or the path of
    *   the directory containing the file.
    *
    * Returns
    *
    * id ( ExecutionContextId )
    *
    *   The identifier used to refer to the execution context that was created.
    */
-  Future<ExecutionCreateContextResult> sendExecutionCreateContext(String contextRoot) {
+  Future<ExecutionCreateContextResult> sendExecutionCreateContext(String contextRoot) async {
     var params = new ExecutionCreateContextParams(contextRoot).toJson();
-    return server.send("execution.createContext", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new ExecutionCreateContextResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("execution.createContext", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new ExecutionCreateContextResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Delete the execution context with the given identifier. The context id is
    * no longer valid after this command. The server is allowed to re-use ids
    * when they are no longer valid.
    *
    * Parameters
    *
    * id ( ExecutionContextId )
    *
    *   The identifier of the execution context that is to be deleted.
    */
-  Future sendExecutionDeleteContext(String id) {
+  Future sendExecutionDeleteContext(String id) async {
     var params = new ExecutionDeleteContextParams(id).toJson();
-    return server.send("execution.deleteContext", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("execution.deleteContext", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Map a URI from the execution context to the file that it corresponds to,
    * or map a file to the URI that it corresponds to in the execution context.
    *
    * Exactly one of the file and uri fields must be provided. If both fields
    * are provided, then an error of type INVALID_PARAMETER will be generated.
    * Similarly, if neither field is provided, then an error of type
    * INVALID_PARAMETER will be generated.
@@ skipping 30 matching lines @@
    * file ( optional FilePath )
    *
    *   The file to which the URI was mapped. This field is omitted if the uri
    *   field was not given in the request.
    *
    * uri ( optional String )
    *
    *   The URI to which the file path was mapped. This field is omitted if the
    *   file field was not given in the request.
    */
-  Future<ExecutionMapUriResult> sendExecutionMapUri(String id, {String file, String uri}) {
+  Future<ExecutionMapUriResult> sendExecutionMapUri(String id, {String file, String uri}) async {
     var params = new ExecutionMapUriParams(id, file: file, uri: uri).toJson();
-    return server.send("execution.mapUri", params)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new ExecutionMapUriResult.fromJson(decoder, 'result', result);
-    });
+    var result = await server.send("execution.mapUri", params);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new ExecutionMapUriResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Subscribe for services. All previous subscriptions are replaced by the
    * given set of services.
    *
    * It is an error if any of the elements in the list are not valid services.
    * If there is an error, then the current subscriptions will remain
    * unchanged.
    *
    * Parameters
    *
    * subscriptions ( List<ExecutionService> )
    *
    *   A list of the services being subscribed to.
    */
-  Future sendExecutionSetSubscriptions(List<ExecutionService> subscriptions) {
+  Future sendExecutionSetSubscriptions(List<ExecutionService> subscriptions) async {
     var params = new ExecutionSetSubscriptionsParams(subscriptions).toJson();
-    return server.send("execution.setSubscriptions", params)
-        .then((result) {
-      expect(result, isNull);
-      return null;
-    });
+    var result = await server.send("execution.setSubscriptions", params);
+    expect(result, isNull);
+    return null;
   }
 
   /**
    * Reports information needed to allow a single file to be launched.
    *
    * This notification is not subscribed to by default. Clients can subscribe
    * by including the value "LAUNCH_DATA" in the list of services passed in an
    * execution.setSubscriptions request.
    *
    * Parameters
@@ skipping 22 matching lines @@
 
   /**
    * Return server diagnostics.
    *
    * Returns
    *
    * contexts ( List<ContextData> )
    *
    *   The list of analysis contexts.
    */
-  Future<DiagnosticGetDiagnosticsResult> sendDiagnosticGetDiagnostics() {
-    return server.send("diagnostic.getDiagnostics", null)
-        .then((result) {
-      ResponseDecoder decoder = new ResponseDecoder(null);
-      return new DiagnosticGetDiagnosticsResult.fromJson(decoder, 'result', result);
-    });
+  Future<DiagnosticGetDiagnosticsResult> sendDiagnosticGetDiagnostics() async {
+    var result = await server.send("diagnostic.getDiagnostics", null);
+    ResponseDecoder decoder = new ResponseDecoder(null);
+    return new DiagnosticGetDiagnosticsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Initialize the fields in InttestMixin, and ensure that notifications will
    * be handled.
    */
   void initializeInttestMixin() {
     _onServerConnected = new StreamController<ServerConnectedParams>(sync: true);
     onServerConnected = _onServerConnected.stream.asBroadcastStream();
     _onServerError = new StreamController<ServerErrorParams>(sync: true);
@@ skipping 104 matching lines @@
       case "execution.launchData":
         expect(params, isExecutionLaunchDataParams);
         _onExecutionLaunchData.add(new ExecutionLaunchDataParams.fromJson(decoder, 'params', params));
         break;
       default:
         fail('Unexpected notification: $event');
         break;
     }
   }
 }