Roll back two files that shouldn't have had dartfmt run.

pkg/analyzer_plugin/test/integration/support/integration_test_methods.dart

 // Copyright (c) 2017, 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 52 matching lines @@
    *   Information that the user can use to use to contact the maintainers of
    *   the plugin when there is a problem.
    *
    * interestingFiles (List<String>)
    *
    *   The glob patterns of the files for which the plugin will provide
    *   information. This value is ignored if the isCompatible field is false.
    *   Otherwise, it will be used to identify the files for which the plugin
    *   should be notified of changes.
    */
-  Future<PluginVersionCheckResult> sendPluginVersionCheck(
-      String byteStorePath, String version) async {
+  Future<PluginVersionCheckResult> sendPluginVersionCheck(String byteStorePath, String version) async {
     var params = new PluginVersionCheckParams(byteStorePath, version).toJson();
     var result = await server.send("plugin.versionCheck", params);
     ResponseDecoder decoder = new ResponseDecoder(null);
     return new PluginVersionCheckResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Used to request that the plugin exit. The server will not send any other
    * requests after this request. The plugin should not send any responses or
    * notifications after sending the response to this request.
@@ skipping 79 matching lines @@
   /**
    * Used to set the options used to build analysis contexts. This request will
    * be sent exactly once before any context roots have been specified.
    *
    * Parameters
    *
    * options (ContextBuilderOptions)
    *
    *   The options used to build the analysis contexts.
    */
-  Future sendAnalysisSetContextBuilderOptions(
-      ContextBuilderOptions options) async {
+  Future sendAnalysisSetContextBuilderOptions(ContextBuilderOptions options) async {
     var params = new AnalysisSetContextBuilderOptionsParams(options).toJson();
     var result = await server.send("analysis.setContextBuilderOptions", params);
     outOfTestExpect(result, isNull);
     return null;
   }
 
   /**
    * Set the list of context roots that should be analyzed.
    *
    * Parameters
@@ skipping 38 matching lines @@
    * no files should be subscribed to the service, exactly as if the service
    * had been included in the map with an explicit empty list of files.
    *
    * 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) async {
+  Future sendAnalysisSetSubscriptions(Map<AnalysisService, List<String>> subscriptions) async {
     var params = new AnalysisSetSubscriptionsParams(subscriptions).toJson();
     var result = await server.send("analysis.setSubscriptions", params);
     outOfTestExpect(result, isNull);
     return null;
   }
 
   /**
    * Used to 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
@@ skipping 231 matching lines @@
    *   (that is, the number of characters in the existing identifier).
    *
    * results (List<CompletionSuggestion>)
    *
    *   The completion suggestions being reported. The notification contains all
    *   possible completions at the requested cursor position, even those that
    *   do not match the characters the user has already typed. This allows the
    *   client to respond to further keystrokes from the user without having to
    *   make additional requests.
    */
-  Future<CompletionGetSuggestionsResult> sendCompletionGetSuggestions(
-      String file, int offset) async {
+  Future<CompletionGetSuggestionsResult> sendCompletionGetSuggestions(String file, int offset) async {
     var params = new CompletionGetSuggestionsParams(file, offset).toJson();
     var result = await server.send("completion.getSuggestions", params);
     ResponseDecoder decoder = new ResponseDecoder(null);
-    return new CompletionGetSuggestionsResult.fromJson(
-        decoder, 'result', result);
+    return new CompletionGetSuggestionsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Used to request 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<PrioritizedSourceChange>)
    *
    *   The assists that are available at the given location.
    */
-  Future<EditGetAssistsResult> sendEditGetAssists(
-      String file, int offset, int length) async {
+  Future<EditGetAssistsResult> sendEditGetAssists(String file, int offset, int length) async {
     var params = new EditGetAssistsParams(file, offset, length).toJson();
     var result = await server.send("edit.getAssists", params);
     ResponseDecoder decoder = new ResponseDecoder(null);
     return new EditGetAssistsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Used to request a list of the kinds of refactorings that are valid for the
    * given selection in the given file.
    *
@@ skipping 15 matching lines @@
    *
    * kinds (List<RefactoringKind>)
    *
    *   The kinds of refactorings that are valid for the given selection.
    *
    *   The list of refactoring kinds is currently limited to those defined by
    *   the server API, preventing plugins from adding their own refactorings.
    *   However, plugins can support pre-defined refactorings, such as a rename
    *   refactoring, at locations not supported by server.
    */
-  Future<EditGetAvailableRefactoringsResult> sendEditGetAvailableRefactorings(
-      String file, int offset, int length) async {
-    var params =
-        new EditGetAvailableRefactoringsParams(file, offset, length).toJson();
+  Future<EditGetAvailableRefactoringsResult> sendEditGetAvailableRefactorings(String file, int offset, int length) async {
+    var params = new EditGetAvailableRefactoringsParams(file, offset, length).toJson();
     var result = await server.send("edit.getAvailableRefactorings", params);
     ResponseDecoder decoder = new ResponseDecoder(null);
-    return new EditGetAvailableRefactoringsResult.fromJson(
-        decoder, 'result', result);
+    return new EditGetAvailableRefactoringsResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Used to request the set of fixes that are available for the errors at a
    * given offset in a given file.
    *
    * Parameters
    *
    * file (FilePath)
    *
@@ skipping 87 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
    *   plugin 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 can 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}) async {
-    var params = new EditGetRefactoringParams(
-            kind, file, offset, length, validateOnly,
-            options: options)
-        .toJson();
+  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();
     var result = await server.send("edit.getRefactoring", params);
     ResponseDecoder decoder = new ResponseDecoder(kind);
     return new EditGetRefactoringResult.fromJson(decoder, 'result', result);
   }
 
   /**
    * Initialize the fields in InttestMixin, and ensure that notifications will
    * be handled.
    */
   void initializeInttestMixin() {
     _onPluginError = new StreamController<PluginErrorParams>(sync: true);
     onPluginError = _onPluginError.stream.asBroadcastStream();
     _onAnalysisErrors = new StreamController<AnalysisErrorsParams>(sync: true);
     onAnalysisErrors = _onAnalysisErrors.stream.asBroadcastStream();
-    _onAnalysisFolding =
-        new StreamController<AnalysisFoldingParams>(sync: true);
+    _onAnalysisFolding = new StreamController<AnalysisFoldingParams>(sync: true);
     onAnalysisFolding = _onAnalysisFolding.stream.asBroadcastStream();
-    _onAnalysisHighlights =
-        new StreamController<AnalysisHighlightsParams>(sync: true);
+    _onAnalysisHighlights = new StreamController<AnalysisHighlightsParams>(sync: true);
     onAnalysisHighlights = _onAnalysisHighlights.stream.asBroadcastStream();
-    _onAnalysisNavigation =
-        new StreamController<AnalysisNavigationParams>(sync: true);
+    _onAnalysisNavigation = new StreamController<AnalysisNavigationParams>(sync: true);
     onAnalysisNavigation = _onAnalysisNavigation.stream.asBroadcastStream();
-    _onAnalysisOccurrences =
-        new StreamController<AnalysisOccurrencesParams>(sync: true);
+    _onAnalysisOccurrences = new StreamController<AnalysisOccurrencesParams>(sync: true);
     onAnalysisOccurrences = _onAnalysisOccurrences.stream.asBroadcastStream();
-    _onAnalysisOutline =
-        new StreamController<AnalysisOutlineParams>(sync: true);
+    _onAnalysisOutline = new StreamController<AnalysisOutlineParams>(sync: true);
     onAnalysisOutline = _onAnalysisOutline.stream.asBroadcastStream();
   }
 
   /**
    * Dispatch the notification named [event], and containing parameters
    * [params], to the appropriate stream.
    */
   void dispatchNotification(String event, params) {
     ResponseDecoder decoder = new ResponseDecoder(null);
     switch (event) {
       case "plugin.error":
         outOfTestExpect(params, isPluginErrorParams);
-        _onPluginError
-            .add(new PluginErrorParams.fromJson(decoder, 'params', params));
+        _onPluginError.add(new PluginErrorParams.fromJson(decoder, 'params', params));
         break;
       case "analysis.errors":
         outOfTestExpect(params, isAnalysisErrorsParams);
-        _onAnalysisErrors
-            .add(new AnalysisErrorsParams.fromJson(decoder, 'params', params));
+        _onAnalysisErrors.add(new AnalysisErrorsParams.fromJson(decoder, 'params', params));
         break;
       case "analysis.folding":
         outOfTestExpect(params, isAnalysisFoldingParams);
-        _onAnalysisFolding
-            .add(new AnalysisFoldingParams.fromJson(decoder, 'params', params));
+        _onAnalysisFolding.add(new AnalysisFoldingParams.fromJson(decoder, 'params', params));
         break;
       case "analysis.highlights":
         outOfTestExpect(params, isAnalysisHighlightsParams);
-        _onAnalysisHighlights.add(
-            new AnalysisHighlightsParams.fromJson(decoder, 'params', params));
+        _onAnalysisHighlights.add(new AnalysisHighlightsParams.fromJson(decoder, 'params', params));
         break;
       case "analysis.navigation":
         outOfTestExpect(params, isAnalysisNavigationParams);
-        _onAnalysisNavigation.add(
-            new AnalysisNavigationParams.fromJson(decoder, 'params', params));
+        _onAnalysisNavigation.add(new AnalysisNavigationParams.fromJson(decoder, 'params', params));
         break;
       case "analysis.occurrences":
         outOfTestExpect(params, isAnalysisOccurrencesParams);
-        _onAnalysisOccurrences.add(
-            new AnalysisOccurrencesParams.fromJson(decoder, 'params', params));
+        _onAnalysisOccurrences.add(new AnalysisOccurrencesParams.fromJson(decoder, 'params', params));
         break;
       case "analysis.outline":
         outOfTestExpect(params, isAnalysisOutlineParams);
-        _onAnalysisOutline
-            .add(new AnalysisOutlineParams.fromJson(decoder, 'params', params));
+        _onAnalysisOutline.add(new AnalysisOutlineParams.fromJson(decoder, 'params', params));
         break;
       default:
         fail('Unexpected notification: $event');
         break;
     }
   }
 }