| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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 /** | 5 /** |
| 6 * Support for interacting with an analysis server that is running in a separate | 6 * Support for interacting with an analysis server that is running in a separate |
| 7 * process. | 7 * process. |
| 8 */ | 8 */ |
| 9 import 'dart:async'; | 9 import 'dart:async'; |
| 10 import 'dart:collection'; | 10 import 'dart:collection'; |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 * | 617 * |
| 618 * If [profileServer] is `true`, the server will be started with "--observe" | 618 * If [profileServer] is `true`, the server will be started with "--observe" |
| 619 * and "--pause-isolates-on-exit", allowing the observatory to be used. | 619 * and "--pause-isolates-on-exit", allowing the observatory to be used. |
| 620 * | 620 * |
| 621 * If [useAnalysisHighlight2] is `true`, the server will use the new highlight | 621 * If [useAnalysisHighlight2] is `true`, the server will use the new highlight |
| 622 * APIs. | 622 * APIs. |
| 623 */ | 623 */ |
| 624 Future<Null> start( | 624 Future<Null> start( |
| 625 {bool checked: true, | 625 {bool checked: true, |
| 626 int diagnosticPort, | 626 int diagnosticPort, |
| 627 bool enableNewAnalysisDriver: false, | |
| 628 bool profileServer: false, | 627 bool profileServer: false, |
| 629 String sdkPath, | 628 String sdkPath, |
| 630 int servicesPort, | 629 int servicesPort, |
| 631 bool useAnalysisHighlight2: false}) async { | 630 bool useAnalysisHighlight2: false}) async { |
| 632 if (_process != null) { | 631 if (_process != null) { |
| 633 throw new Exception('Process already started'); | 632 throw new Exception('Process already started'); |
| 634 } | 633 } |
| 635 String dartBinary = Platform.executable; | 634 String dartBinary = Platform.executable; |
| 636 String rootDir = | 635 String rootDir = |
| 637 _findRoot(Platform.script.toFilePath(windows: Platform.isWindows)); | 636 _findRoot(Platform.script.toFilePath(windows: Platform.isWindows)); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 if (diagnosticPort != null) { | 669 if (diagnosticPort != null) { |
| 671 arguments.add('--port'); | 670 arguments.add('--port'); |
| 672 arguments.add(diagnosticPort.toString()); | 671 arguments.add(diagnosticPort.toString()); |
| 673 } | 672 } |
| 674 if (sdkPath != null) { | 673 if (sdkPath != null) { |
| 675 arguments.add('--sdk=$sdkPath'); | 674 arguments.add('--sdk=$sdkPath'); |
| 676 } | 675 } |
| 677 if (useAnalysisHighlight2) { | 676 if (useAnalysisHighlight2) { |
| 678 arguments.add('--useAnalysisHighlight2'); | 677 arguments.add('--useAnalysisHighlight2'); |
| 679 } | 678 } |
| 680 if (!enableNewAnalysisDriver) { | |
| 681 arguments.add('--disable-new-analysis-driver'); | |
| 682 } | |
| 683 // stdout.writeln('Launching $serverPath'); | 679 // stdout.writeln('Launching $serverPath'); |
| 684 // stdout.writeln('$dartBinary ${arguments.join(' ')}'); | 680 // stdout.writeln('$dartBinary ${arguments.join(' ')}'); |
| 685 _process = await Process.start(dartBinary, arguments); | 681 _process = await Process.start(dartBinary, arguments); |
| 686 _process.exitCode.then((int code) { | 682 _process.exitCode.then((int code) { |
| 687 if (code != 0) { | 683 if (code != 0) { |
| 688 throw new StateError('Server terminated with exit code $code'); | 684 throw new StateError('Server terminated with exit code $code'); |
| 689 } | 685 } |
| 690 }); | 686 }); |
| 691 _listenToOutput(); | 687 _listenToOutput(); |
| 692 _serverConnectedCompleter = new Completer(); | 688 _serverConnectedCompleter = new Completer(); |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1078 if (buffer.length > 0) { | 1074 if (buffer.length > 0) { |
| 1079 buffer.writeln(); | 1075 buffer.writeln(); |
| 1080 buffer.writeln(); | 1076 buffer.writeln(); |
| 1081 } | 1077 } |
| 1082 buffer.writeln(filePath); | 1078 buffer.writeln(filePath); |
| 1083 _writeErrors(' Expected ', expectedErrors); | 1079 _writeErrors(' Expected ', expectedErrors); |
| 1084 buffer.writeln(); | 1080 buffer.writeln(); |
| 1085 _writeErrors(' Found ', actualErrors); | 1081 _writeErrors(' Found ', actualErrors); |
| 1086 } | 1082 } |
| 1087 } | 1083 } |
| OLD | NEW |