Convert analysis server over to use ContextBuilder

pkg/analysis_server/test/integration/analysis/highlights_test2.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.highlights2;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../utils.dart';
 import '../integration_tests.dart';
 
 main() {
   initializeTestEnvironment();
   defineReflectiveTests(AnalysisHighlightsTest);
 }
 
 @reflectiveTest
 class AnalysisHighlightsTest extends AbstractAnalysisServerIntegrationTest {
-  Future startServer({int servicesPort, bool checked: true}) {
+  Future startServer(
+      {bool checked: true, int diagnosticPort, int servicesPort}) {
     return server.start(
+        checked: checked,
+        diagnosticPort: diagnosticPort,
         servicesPort: servicesPort,
-        checked: checked,
         useAnalysisHighlight2: true);
   }
 
   test_highlights() {
     String pathname = sourcePath('test.dart');
     String text = r'''
 import 'dart:async' as async;
 
 /**
  * Doc comment
@@ skipping 65 matching lines @@
       }
     });
     return analysisFinished.then((_) {
       // There should be 1 error due to the fact that unresolvedIdentifier is
       // unresolved.
       expect(currentAnalysisErrors[pathname], hasLength(1));
       void check(HighlightRegionType type, List<String> expected) {
         expect(highlights[type], equals(expected.toSet()));
         highlights.remove(type);
       }
+
       check(HighlightRegionType.ANNOTATION, ['@override']);
       check(HighlightRegionType.BUILT_IN,
           ['as', 'get', 'import', 'set', 'static', 'typedef']);
       check(HighlightRegionType.CLASS,
           ['Class', 'Class2', 'Future', 'Map', 'int']);
       check(HighlightRegionType.COMMENT_BLOCK, ['/* Block comment */']);
       check(HighlightRegionType.COMMENT_DOCUMENTATION,
           ['/**\n * Doc comment\n */']);
       check(
           HighlightRegionType.COMMENT_END_OF_LINE, ['// End of line comment']);
@@ skipping 28 matching lines @@
       check(HighlightRegionType.INSTANCE_SETTER_DECLARATION, ['setter']);
       check(HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE, ['override']);
       check(HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION,
           ['topLevelVariable']);
       check(HighlightRegionType.TYPE_NAME_DYNAMIC, ['dynamic']);
       check(HighlightRegionType.TYPE_PARAMETER, ['TypeParameter']);
       expect(highlights, isEmpty);
     });
   }
 }