Fix errors in analyzer

pkg/analysis_server/test/integration/integration_tests.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 test.integration.analysis;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
@@ skipping 107 matching lines @@
    * True if the teardown process should skip sending a "server.shutdown"
    * request (e.g. because the server is known to have already shutdown).
    */
   bool skipShutdown = false;
 
   /**
    * True if we are currently subscribed to [SERVER_STATUS] updates.
    */
   bool _subscribedToServerStatus = false;
 
-  List<AnalysisError> getErrors(String pathname) =>
-      currentAnalysisErrors[pathname];
-
   AbstractAnalysisServerIntegrationTest() {
     initializeInttestMixin();
   }
 
   /**
    * Return a future which will complete when a 'server.status' notification is
    * received from the server with 'analyzing' set to false.
    *
    * The future will only be completed by 'server.status' notifications that are
    * received after this function call.  So it is safe to use this getter
@@ skipping 21 matching lines @@
   bool get enableNewAnalysisDriver => false;
 
   /**
    * Print out any messages exchanged with the server.  If some messages have
    * already been exchanged with the server, they are printed out immediately.
    */
   void debugStdio() {
     server.debugStdio();
   }
 
+  List<AnalysisError> getErrors(String pathname) =>
+      currentAnalysisErrors[pathname];
+
+  /**
+   * Read a source file with the given absolute [pathname].
+   */
+  String readFile(String pathname) => new File(pathname).readAsStringSync();
+
   @override
   Future sendServerSetSubscriptions(List<ServerService> subscriptions) {
     _subscribedToServerStatus = subscriptions.contains(ServerService.STATUS);
     return super.sendServerSetSubscriptions(subscriptions);
   }
 
   /**
    * The server is automatically started before every test, and a temporary
    * [sourceDirectory] is created.
    */
@@ skipping 92 matching lines @@
    * Parent directories are created as necessary.
    *
    * Return a normalized path to the file (with symbolic links resolved).
    */
   String writeFile(String pathname, String contents) {
     new Directory(dirname(pathname)).createSync(recursive: true);
     File file = new File(pathname);
     file.writeAsStringSync(contents);
     return file.resolveSymbolicLinksSync();
   }
-
-  /**
-   * Read a source file with the given absolute [pathname].
-   */
-  String readFile(String pathname) => new File(pathname).readAsStringSync();
 }
 
 /**
- * An error result from a server request.
- */
-class ServerErrorMessage {
-  final Map message;
-
-  ServerErrorMessage(this.message);
-
-  dynamic get error => message['error'];
-
-  String toString() => message.toString();
-}
-
-/**
  * Wrapper class for Matcher which doesn't create the underlying Matcher object
  * until it is needed.  This is necessary in order to create matchers that can
  * refer to themselves (so that recursive data structures can be represented).
  */
 class LazyMatcher implements Matcher {
   /**
    * Callback that will be used to create the matcher the first time it is
    * needed.
    */
   final MatcherCreator _creator;
@@ skipping 236 matching lines @@
    * Return a future that will complete when all commands that have been sent
    * to the server so far have been flushed to the OS buffer.
    */
   Future flushCommands() {
     return _process.stdin.flush();
   }
 
   /**
    * Stop the server.
    */
-  Future kill(String reason) {
+  Future<int> kill(String reason) {
     debugStdio();
     _recordStdio('FORCIBLY TERMINATING PROCESS: $reason');
     _process.kill();
     return _process.exitCode;
   }
 
   /**
    * Start listening to output from the server, and deliver notifications to
    * [notificationProcessor].
    */
@@ skipping 192 matching lines @@
     double elapsedTime = currentElapseTime;
     line = "$elapsedTime: $line";
     if (_debuggingStdio) {
       print(line);
     }
     _recordedStdio.add(line);
   }
 }
 
 /**
+ * An error result from a server request.
+ */
+class ServerErrorMessage {
+  final Map message;
+
+  ServerErrorMessage(this.message);
+
+  dynamic get error => message['error'];
+
+  String toString() => message.toString();
+}
+
+/**
  * Matcher that matches a list of objects, each of which satisfies the given
  * matcher.
  */
 class _ListOf extends Matcher {
   /**
    * Matcher which every element of the list must satisfy.
    */
   final Matcher elementMatcher;
 
   /**
@@ skipping 198 matching lines @@
   void populateMismatches(item, List<MismatchDescriber> mismatches);
 
   /**
    * Create a [MismatchDescriber] describing a mismatch with a simple string.
    */
   MismatchDescriber simpleDescription(String description) =>
       (Description mismatchDescription) {
         mismatchDescription.add(description);
       };
 }