More strong mode changes in analysis_server

pkg/analysis_server/test/services/completion/dart/completion_contributor_util.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.services.completion.dart.util;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol
     show Element, ElementKind;
@@ skipping 501 matching lines @@
           cs = s;
         } else {
           failedCompletion('expected exactly one $cs',
               suggestions.where((s) => s.completion == completion));
         }
       });
     }
     return cs;
   }
 
-  Future performAnalysis(int times, Completer completer) {
-    if (completer.isCompleted) return completer.future;
-    if (times == 0 || context == null) return new Future.value();
+  Future/*<E>*/ performAnalysis/*<E>*/(int times, Completer/*<E>*/ completer) {
+    if (completer.isCompleted) {
+      return completer.future;
+    }
+    if (times == 0 || context == null) {
+      return new Future.value();
+    }
     context.performAnalysisTask();
     // We use a delayed future to allow microtask events to finish. The
     // Future.value or Future() constructors use scheduleMicrotask themselves and
     // would therefore not wait for microtask callbacks that are scheduled after
     // invoking this method.
     return new Future.delayed(
         Duration.ZERO, () => performAnalysis(times - 1, completer));
   }
 
   void resolveSource(String path, String content) {
     Source libSource = addSource(path, content);
     var target = new LibrarySpecificUnit(libSource, libSource);
     context.computeResult(target, RESOLVED_UNIT);
   }
 
   @override
   void setUp() {
     super.setUp();
     index = createMemoryIndex();
     searchEngine = new SearchEngineImpl(index);
     contributor = createContributor();
   }
 }