| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library driver; | 5 library driver; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'dart:io'; | 8 import 'dart:io'; |
| 9 | 9 |
| 10 import 'package:analysis_server/http_server.dart'; | 10 import 'package:analysis_server/http_server.dart'; |
| 11 import 'package:analysis_server/src/analysis_server.dart'; | 11 import 'package:analysis_server/src/analysis_server.dart'; |
| 12 import 'package:analysis_server/src/socket_server.dart'; | 12 import 'package:analysis_server/src/socket_server.dart'; |
| 13 import 'package:analysis_server/stdio_server.dart'; | 13 import 'package:analysis_server/stdio_server.dart'; |
| 14 import 'package:analyzer/instrumentation/instrumentation.dart'; | 14 import 'package:analyzer/instrumentation/instrumentation.dart'; |
| 15 import 'package:analyzer/src/generated/engine.dart'; |
| 15 import 'package:analyzer/src/generated/incremental_logger.dart'; | 16 import 'package:analyzer/src/generated/incremental_logger.dart'; |
| 16 import 'package:analyzer/src/generated/java_io.dart'; | 17 import 'package:analyzer/src/generated/java_io.dart'; |
| 17 import 'package:analyzer/src/generated/sdk.dart'; | 18 import 'package:analyzer/src/generated/sdk.dart'; |
| 18 import 'package:analyzer/src/generated/sdk_io.dart'; | 19 import 'package:analyzer/src/generated/sdk_io.dart'; |
| 19 import 'package:args/args.dart'; | 20 import 'package:args/args.dart'; |
| 20 | 21 |
| 21 | 22 |
| 22 /** | 23 /** |
| 23 * Initializes incremental logger. | 24 * Initializes incremental logger. |
| 24 * | 25 * |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 defaultSdk = new DirectoryBasedDartSdk(new JavaFile(results[SDK_OPTION])); | 225 defaultSdk = new DirectoryBasedDartSdk(new JavaFile(results[SDK_OPTION])); |
| 225 } else { | 226 } else { |
| 226 // No path to the SDK provided; use DirectoryBasedDartSdk.defaultSdk, | 227 // No path to the SDK provided; use DirectoryBasedDartSdk.defaultSdk, |
| 227 // which will make a guess. | 228 // which will make a guess. |
| 228 defaultSdk = DirectoryBasedDartSdk.defaultSdk; | 229 defaultSdk = DirectoryBasedDartSdk.defaultSdk; |
| 229 } | 230 } |
| 230 | 231 |
| 231 InstrumentationService service = | 232 InstrumentationService service = |
| 232 new InstrumentationService(instrumentationServer); | 233 new InstrumentationService(instrumentationServer); |
| 233 // service.logVersion(results[CLIENT_ID], defaultSdk.sdkVersion); | 234 // service.logVersion(results[CLIENT_ID], defaultSdk.sdkVersion); |
| 235 AnalysisEngine.instance.instrumentationService = service; |
| 234 | 236 |
| 235 socketServer = new SocketServer(analysisServerOptions, defaultSdk, service); | 237 socketServer = new SocketServer(analysisServerOptions, defaultSdk, service); |
| 236 httpServer = new HttpAnalysisServer(socketServer); | 238 httpServer = new HttpAnalysisServer(socketServer); |
| 237 stdioServer = new StdioAnalysisServer(socketServer); | 239 stdioServer = new StdioAnalysisServer(socketServer); |
| 238 | 240 |
| 239 if (serve_http) { | 241 if (serve_http) { |
| 240 httpServer.serveHttp(port); | 242 httpServer.serveHttp(port); |
| 241 } | 243 } |
| 242 | 244 |
| 243 if (results[INTERNAL_PRINT_TO_CONSOLE]) { | 245 if (results[INTERNAL_PRINT_TO_CONSOLE]) { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 /** | 278 /** |
| 277 * Print information about how to use the server. | 279 * Print information about how to use the server. |
| 278 */ | 280 */ |
| 279 void _printUsage(ArgParser parser) { | 281 void _printUsage(ArgParser parser) { |
| 280 print('Usage: $BINARY_NAME [flags]'); | 282 print('Usage: $BINARY_NAME [flags]'); |
| 281 print(''); | 283 print(''); |
| 282 print('Supported flags are:'); | 284 print('Supported flags are:'); |
| 283 print(parser.usage); | 285 print(parser.usage); |
| 284 } | 286 } |
| 285 } | 287 } |
| OLD | NEW |