languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 13:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create the new flag --use-cfe in the analyzer, analysis server and analyzer_cli and migrate the old behavior of --preview-dart-2 to --use-cfe. The --preview-dart-2 flag is now a no-op, with functionality coming soon.

Browse source 
See https://github.com/dart-lang/sdk/issues/31640

Change-Id: I2db2e7ef6a324cbd5d369b807e331495fed167df
Reviewed-on: https://dart-review.googlesource.com/33121
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Jaime Wren <jwren@google.com>
This commit is contained in:
Jaime Wren 2018-01-08 13:09:08 -08:00 committed by commit-bot@chromium.org
parent 7139df0e38
commit cd878bc433
91 changed files with 349 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/analysis_server/benchmark/benchmarks.dart
View file

@ -68,7 +68,7 @@ class RunCommand extends Command {
help: 'Run a quick version of the benchmark. This is not useful for '
'gathering accurate times,\nbut can be used to validate that the '
'benchmark works.');
argParser.addFlag('preview-dart-2',
argParser.addFlag('use-cfe',
negatable: false,
help: 'Benchmark against the Dart 2.0 front end implementation.');
argParser.addOption('repeat',
@ -96,7 +96,7 @@ class RunCommand extends Command {
final String benchmarkId = argResults.rest.first;
final int repeatCount = int.parse(argResults['repeat']);
final bool quick = argResults['quick'];
final bool previewDart2 = argResults['preview-dart-2'];
final bool useCFE = argResults['use-cfe'];
final bool verbose = argResults['verbose'];
final Benchmark benchmark =
@ -118,7 +118,7 @@ class RunCommand extends Command {
for (int iteration = 0; iteration < actualIterations; iteration++) {
BenchMarkResult newResult = await benchmark.run(
quick: quick,
previewDart2: previewDart2,
useCFE: useCFE,
verbose: verbose,
);
print(' $newResult');
@ -149,7 +149,7 @@ abstract class Benchmark {
Future<BenchMarkResult> run({
bool quick: false,
bool previewDart2: false,
bool useCFE: false,
bool verbose: false,
});

8
pkg/analysis_server/benchmark/perf/benchmarks_impl.dart
View file

@ -28,7 +28,7 @@ class ColdAnalysisBenchmark extends Benchmark {
@override
Future<BenchMarkResult> run({
bool quick: false,
bool previewDart2: false,
bool useCFE: false,
bool verbose: false,
}) async {
if (!quick) {
@ -38,7 +38,7 @@ class ColdAnalysisBenchmark extends Benchmark {
Stopwatch stopwatch = new Stopwatch()..start();
AnalysisServerMemoryUsageTest test = new AnalysisServerMemoryUsageTest();
await test.setUp(previewDart2: previewDart2);
await test.setUp(useCFE: useCFE);
await test.subscribeToStatusNotifications();
await test.sendAnalysisSetAnalysisRoots(getProjectRoots(quick: quick), []);
await test.analysisFinished;
@ -73,7 +73,7 @@ class AnalysisBenchmark extends Benchmark {
@override
Future<BenchMarkResult> run({
bool quick: false,
bool previewDart2: false,
bool useCFE: false,
bool verbose: false,
}) async {
Stopwatch stopwatch = new Stopwatch()..start();
@ -82,7 +82,7 @@ class AnalysisBenchmark extends Benchmark {
if (verbose) {
test.debugStdio();
}
await test.setUp(previewDart2: previewDart2);
await test.setUp(useCFE: useCFE);
await test.subscribeToStatusNotifications();
await test.sendAnalysisSetAnalysisRoots(getProjectRoots(quick: quick), []);
await test.analysisFinished;

4
pkg/analysis_server/benchmark/perf/memory_tests.dart
View file

@ -55,7 +55,7 @@ class AnalysisServerMemoryUsageTest
* The server is automatically started before every test.
*/
@override
Future setUp({bool previewDart2: false}) {
Future setUp({bool useCFE: false}) {
onAnalysisErrors.listen((AnalysisErrorsParams params) {
currentAnalysisErrors[params.file] = params.errors;
});
@ -70,7 +70,7 @@ class AnalysisServerMemoryUsageTest
});
return startServer(
servicesPort: vmServicePort,
previewDart2: previewDart2,
cfe: useCFE,
).then((_) {
server.listenToOutput(dispatchNotification);
server.exitCode.then((_) {

10
pkg/analysis_server/lib/src/analysis_server.dart
View file

@ -363,7 +363,7 @@ class AnalysisServer {
new PluginWatcher(resourceProvider, pluginManager);
defaultContextOptions.generateImplicitErrors = false;
defaultContextOptions.useFastaParser = options.previewDart2;
defaultContextOptions.useFastaParser = options.useCFE;
{
String name = options.newAnalysisDriverLog;
@ -1122,9 +1122,14 @@ class AnalysisServerOptions {
CrashReportSender crashReportSender;
/**
* Whether to enable the Dart 2.0 Front End.
* Whether to enable the Dart 2.0 preview.
*/
bool previewDart2 = false;
/**
* Whether to enable the Dart 2.0 Common Front End implementation.
*/
bool useCFE = false;
}
/**
@ -1340,6 +1345,7 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
builder.byteStore = analysisServer.byteStore;
builder.fileContentOverlay = analysisServer.fileContentOverlay;
builder.previewDart2 = analysisServer.options.previewDart2;
builder.useCFE = analysisServer.options.useCFE;
return builder;
}

13
pkg/analysis_server/lib/src/server/driver.dart
View file

@ -262,10 +262,15 @@ class Driver implements ServerStarter {
static const String CACHE_FOLDER = "cache";
/**
* Whether to enable the Dart 2.0 Front End.
* Whether to enable the Dart 2.0 preview.
*/
static const String PREVIEW_DART2 = "preview-dart-2";
/**
* Whether to enable the Dart 2.0 Common Front End implementation.
*/
static const String USE_CFE = "use-cfe";
/**
* The instrumentation server that is to be used by the analysis server.
*/
@ -312,6 +317,7 @@ class Driver implements ServerStarter {
analysisServerOptions.clientVersion = results[CLIENT_VERSION];
analysisServerOptions.cacheFolder = results[CACHE_FOLDER];
analysisServerOptions.previewDart2 = results[PREVIEW_DART2];
analysisServerOptions.useCFE = results[USE_CFE];
ContextBuilderOptions.flutterRepo = results[FLUTTER_REPO];
@ -537,8 +543,9 @@ class Driver implements ServerStarter {
defaultsTo: "as-is");
parser.addOption(CACHE_FOLDER,
help: "[path] path to the location where to cache data");
parser.addFlag(PREVIEW_DART2,
help: "Enable the Dart 2.0 Front End implementation.");
parser.addFlag(PREVIEW_DART2, help: "Enable the Dart 2.0 preview");
parser.addFlag(USE_CFE,
help: "Enable the Dart 2.0 Common Front End implementation");
return parser;
}

2
pkg/analysis_server/lib/src/status/diagnostics.dart
View file

@ -1169,6 +1169,8 @@ class StatusPage extends DiagnosticPageWithNav {
h3('Status');
buf.writeln(writeOption('Preview-dart-2',
diagnosticsSite.socketServer.analysisServerOptions.previewDart2));
buf.writeln(writeOption('Use common front end',
diagnosticsSite.socketServer.analysisServerOptions.useCFE));
buf.writeln(writeOption('Instrumentation enabled',
AnalysisEngine.instance.instrumentationService.isActive));
buf.writeln(writeOption('Server process ID', pid));

4
pkg/analysis_server/test/benchmarks_test.dart
View file

@ -38,7 +38,7 @@ void defineTests() {
reason: 'exit: ${r.exitCode}\n${r.stdout}\n${r.stderr}');
});
test('$benchmarkId-preview-dart-2', () {
test('$benchmarkId-use-cfe', () {
ProcessResult r = Process.runSync(
Platform.resolvedExecutable,
[
@ -46,7 +46,7 @@ void defineTests() {
'run',
'--repeat=1',
'--quick',
'--preview-dart-2',
'--use-cfe',
benchmarkId
],
workingDirectory: _serverSourcePath,

6
pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(OptionsIntegrationTest);
defineReflectiveTests(OptionsIntegrationTest_PreviewDart2);
defineReflectiveTests(OptionsIntegrationTest_UseCFE);
});
}
@ -91,7 +91,7 @@ linter:
}
@reflectiveTest
class OptionsIntegrationTest_PreviewDart2 extends OptionsIntegrationTest {
class OptionsIntegrationTest_UseCFE extends OptionsIntegrationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

7
pkg/analysis_server/test/integration/analysis/error_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisErrorIntegrationTest);
defineReflectiveTests(AnalysisErrorIntegrationTest_PreviewDart2);
defineReflectiveTests(AnalysisErrorIntegrationTest_UseCFE);
});
}
@ -101,10 +101,9 @@ abstract class C extends B {
}
@reflectiveTest
class AnalysisErrorIntegrationTest_PreviewDart2
extends AnalysisErrorIntegrationTest {
class AnalysisErrorIntegrationTest_UseCFE extends AnalysisErrorIntegrationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

11
pkg/analysis_server/test/integration/analysis/get_errors_nonStandard_sdk.dart
View file

@ -17,7 +17,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisDomainGetErrorsTest);
defineReflectiveTests(AnalysisDomainGetErrorsTest_PreviewDart2);
defineReflectiveTests(AnalysisDomainGetErrorsTest_UseCFE);
});
}
@ -74,14 +74,14 @@ class AnalysisDomainGetErrorsTest
{bool checked: true,
int diagnosticPort,
int servicesPort,
bool previewDart2: false}) {
bool cfe: false}) {
String sdkPath = createNonStandardSdk();
return server.start(
checked: checked,
diagnosticPort: diagnosticPort,
sdkPath: sdkPath,
servicesPort: servicesPort,
previewDart2: previewDart2);
useCFE: cfe);
}
Future test_getErrors() async {
@ -100,8 +100,7 @@ import 'dart:fake';
}
@reflectiveTest
class AnalysisDomainGetErrorsTest_PreviewDart2
extends AnalysisDomainGetErrorsTest {
class AnalysisDomainGetErrorsTest_UseCFE extends AnalysisDomainGetErrorsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/get_errors_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetErrorsTest);
defineReflectiveTests(GetErrorsTest_PreviewDart2);
defineReflectiveTests(GetErrorsTest_UseCFE);
});
}
@ -37,7 +37,7 @@ main() {
}
@reflectiveTest
class GetErrorsTest_PreviewDart2 extends GetErrorsTest {
class GetErrorsTest_UseCFE extends GetErrorsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/get_hover_test.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisGetHoverIntegrationTest);
defineReflectiveTests(AnalysisGetHoverIntegrationTest_PreviewDart2);
defineReflectiveTests(AnalysisGetHoverIntegrationTest_UseCFE);
});
}
@ -190,10 +190,10 @@ main() {
}
@reflectiveTest
class AnalysisGetHoverIntegrationTest_PreviewDart2
class AnalysisGetHoverIntegrationTest_UseCFE
extends AnalysisGetHoverIntegrationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

7
pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart
View file

@ -15,8 +15,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisGetImportedElementsIntegrationTest);
defineReflectiveTests(
AnalysisGetImportedElementsIntegrationTest_PreviewDart2);
defineReflectiveTests(AnalysisGetImportedElementsIntegrationTest_UseCFE);
});
}
@ -142,8 +141,8 @@ $selection
}
@reflectiveTest
class AnalysisGetImportedElementsIntegrationTest_PreviewDart2
class AnalysisGetImportedElementsIntegrationTest_UseCFE
extends AnalysisGetImportedElementsIntegrationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

7
pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetLibraryDependenciesTest);
defineReflectiveTests(GetLibraryDependenciesTest_PreviewDart2);
defineReflectiveTests(GetLibraryDependenciesTest_UseCFE);
});
}
@ -48,8 +48,7 @@ class Bar {
}
@reflectiveTest
class GetLibraryDependenciesTest_PreviewDart2
extends GetLibraryDependenciesTest {
class GetLibraryDependenciesTest_UseCFE extends GetLibraryDependenciesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/get_navigation_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetNavigationTest);
defineReflectiveTests(GetNavigationTest_PreviewDart2);
defineReflectiveTests(GetNavigationTest_UseCFE);
});
}
@ -68,9 +68,9 @@ class Bar {
}
@reflectiveTest
class GetNavigationTest_PreviewDart2 extends GetNavigationTest {
class GetNavigationTest_UseCFE extends GetNavigationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

6
pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart
View file

@ -13,7 +13,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetReachableSourcesTest);
defineReflectiveTests(GetReachableSourcesTest_PreviewDart2);
defineReflectiveTests(GetReachableSourcesTest_UseCFE);
});
}
@ -50,7 +50,7 @@ class Bar {
}
@reflectiveTest
class GetReachableSourcesTest_PreviewDart2 extends GetReachableSourcesTest {
class GetReachableSourcesTest_UseCFE extends GetReachableSourcesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/highlights_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisHighlightsTest);
defineReflectiveTests(AnalysisHighlightsTest_PreviewDart2);
defineReflectiveTests(AnalysisHighlightsTest_UseCFE);
});
}
@ -147,9 +147,9 @@ int topLevelVariable;
}
@reflectiveTest
class AnalysisHighlightsTest_PreviewDart2 extends AnalysisHighlightsTest {
class AnalysisHighlightsTest_UseCFE extends AnalysisHighlightsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

10
pkg/analysis_server/test/integration/analysis/highlights_test2.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisHighlightsTest);
defineReflectiveTests(AnalysisHighlightsTest_PreviewDart2);
defineReflectiveTests(AnalysisHighlightsTest_UseCFE);
});
}
@ -24,14 +24,14 @@ class AnalysisHighlightsTest extends AbstractAnalysisServerIntegrationTest {
bool checked: true,
int diagnosticPort,
int servicesPort,
bool previewDart2: false,
bool cfe: false,
}) {
return server.start(
checked: checked,
diagnosticPort: diagnosticPort,
servicesPort: servicesPort,
useAnalysisHighlight2: true,
previewDart2: previewDart2);
useCFE: cfe);
}
test_highlights() {
@ -167,7 +167,7 @@ int topLevelVariable;
}
@reflectiveTest
class AnalysisHighlightsTest_PreviewDart2 extends AnalysisHighlightsTest {
class AnalysisHighlightsTest_UseCFE extends AnalysisHighlightsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/lint_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(LintIntegrationTest);
defineReflectiveTests(LintIntegrationTest_PreviewDart2);
defineReflectiveTests(LintIntegrationTest_UseCFE);
});
}
@ -84,7 +84,7 @@ class a { // lint: not CamelCase
}
@reflectiveTest
class LintIntegrationTest_PreviewDart2 extends LintIntegrationTest {
class LintIntegrationTest_UseCFE extends LintIntegrationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/navigation_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisNavigationTest);
defineReflectiveTests(AnalysisNavigationTest_PreviewDart2);
defineReflectiveTests(AnalysisNavigationTest_UseCFE);
});
}
@ -136,9 +136,9 @@ part of foo;
}
@reflectiveTest
class AnalysisNavigationTest_PreviewDart2 extends AnalysisNavigationTest {
class AnalysisNavigationTest_UseCFE extends AnalysisNavigationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

6
pkg/analysis_server/test/integration/analysis/occurrences_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(OccurrencesTest);
defineReflectiveTests(OccurrencesTest_PreviewDart2);
defineReflectiveTests(OccurrencesTest_UseCFE);
});
}
@ -68,7 +68,7 @@ main() {
}
@reflectiveTest
class OccurrencesTest_PreviewDart2 extends OccurrencesTest {
class OccurrencesTest_UseCFE extends OccurrencesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/outline_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(OutlineTest);
defineReflectiveTests(OutlineTest_PreviewDart2);
defineReflectiveTests(OutlineTest_UseCFE);
});
}
@ -85,7 +85,7 @@ class Class2 {
}
@reflectiveTest
class OutlineTest_PreviewDart2 extends OutlineTest {
class OutlineTest_UseCFE extends OutlineTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/overrides_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(OverridesTest);
defineReflectiveTests(OverridesTest_PreviewDart2);
defineReflectiveTests(OverridesTest_UseCFE);
});
}
@ -123,7 +123,7 @@ class Target extends Base implements Interface1, Interface2 {
}
@reflectiveTest
class OverridesTest_PreviewDart2 extends OverridesTest {
class OverridesTest_UseCFE extends OverridesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/package_root_test.dart
View file

@ -13,7 +13,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetAnalysisRootsTest);
defineReflectiveTests(SetAnalysisRootsTest_PreviewDart2);
defineReflectiveTests(SetAnalysisRootsTest_UseCFE);
});
}
@ -80,7 +80,7 @@ f() {}
}
@reflectiveTest
class SetAnalysisRootsTest_PreviewDart2 extends SetAnalysisRootsTest {
class SetAnalysisRootsTest_UseCFE extends SetAnalysisRootsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart
View file

@ -17,7 +17,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ReanalyzeTest);
defineReflectiveTests(ReanalyzeTest_PreviewDart2);
defineReflectiveTests(ReanalyzeTest_UseCFE);
});
}
@ -50,7 +50,7 @@ main() {}''';
}
@reflectiveTest
class ReanalyzeTest_PreviewDart2 extends ReanalyzeTest {
class ReanalyzeTest_UseCFE extends ReanalyzeTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/reanalyze_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ReanalyzeTest);
defineReflectiveTests(ReanalyzeTest_PreviewDart2);
defineReflectiveTests(ReanalyzeTest_UseCFE);
});
}
@ -41,7 +41,7 @@ class ReanalyzeTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class ReanalyzeTest_PreviewDart2 extends ReanalyzeTest {
class ReanalyzeTest_UseCFE extends ReanalyzeTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart
View file

@ -10,7 +10,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetAnalysisRootsTest);
defineReflectiveTests(SetAnalysisRootsTest_PreviewDart2);
defineReflectiveTests(SetAnalysisRootsTest_UseCFE);
});
}
@ -33,7 +33,7 @@ class Foo {
}
@reflectiveTest
class SetAnalysisRootsTest_PreviewDart2 extends SetAnalysisRootsTest {
class SetAnalysisRootsTest_UseCFE extends SetAnalysisRootsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

7
pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetGeneralSubscriptionsTest);
defineReflectiveTests(SetGeneralSubscriptionsTest_PreviewDart2);
defineReflectiveTests(SetGeneralSubscriptionsTest_UseCFE);
});
}
@ -41,8 +41,7 @@ class Foo {
}
@reflectiveTest
class SetGeneralSubscriptionsTest_PreviewDart2
extends SetGeneralSubscriptionsTest {
class SetGeneralSubscriptionsTest_UseCFE extends SetGeneralSubscriptionsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetPriorityFilesTest);
defineReflectiveTests(SetPriorityFilesTest_PreviewDart2);
defineReflectiveTests(SetPriorityFilesTest_UseCFE);
});
}
@ -31,7 +31,7 @@ class SetPriorityFilesTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class SetPriorityFilesTest_PreviewDart2 extends SetPriorityFilesTest {
class SetPriorityFilesTest_UseCFE extends SetPriorityFilesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart
View file

@ -10,7 +10,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetSubscriptionsTest);
defineReflectiveTests(SetSubscriptionsTest_PreviewDart2);
defineReflectiveTests(SetSubscriptionsTest_UseCFE);
});
}
@ -33,7 +33,7 @@ class Foo {
}
@reflectiveTest
class SetSubscriptionsTest_PreviewDart2 extends SetSubscriptionsTest {
class SetSubscriptionsTest_UseCFE extends SetSubscriptionsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/update_content_list_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(UpdateContentTest);
defineReflectiveTests(UpdateContentTest_PreviewDart2);
defineReflectiveTests(UpdateContentTest_UseCFE);
});
}
@ -53,9 +53,9 @@ main() {
}
@reflectiveTest
class UpdateContentTest_PreviewDart2 extends UpdateContentTest {
class UpdateContentTest_UseCFE extends UpdateContentTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

6
pkg/analysis_server/test/integration/analysis/update_content_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(UpdateContentTest);
defineReflectiveTests(UpdateContentTest_PreviewDart2);
defineReflectiveTests(UpdateContentTest_UseCFE);
});
}
@ -108,7 +108,7 @@ void main() {
}
@reflectiveTest
class UpdateContentTest_PreviewDart2 extends UpdateContentTest {
class UpdateContentTest_UseCFE extends UpdateContentTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analysis/update_options_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(UpdateOptionsTest);
defineReflectiveTests(UpdateOptionsTest_PreviewDart2);
defineReflectiveTests(UpdateOptionsTest_UseCFE);
});
}
@ -48,7 +48,7 @@ class Foo {
}
@reflectiveTest
class UpdateOptionsTest_PreviewDart2 extends UpdateOptionsTest {
class UpdateOptionsTest_UseCFE extends UpdateOptionsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analytics/enable_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(EnableTest);
defineReflectiveTests(EnableTest_PreviewDart2);
defineReflectiveTests(EnableTest_UseCFE);
});
}
@ -34,7 +34,7 @@ class EnableTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class EnableTest_PreviewDart2 extends EnableTest {
class EnableTest_UseCFE extends EnableTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analytics/is_enabled_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(IsEnabledTest);
defineReflectiveTests(IsEnabledTest_PreviewDart2);
defineReflectiveTests(IsEnabledTest_UseCFE);
});
}
@ -27,7 +27,7 @@ class IsEnabledTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class IsEnabledTest_PreviewDart2 extends IsEnabledTest {
class IsEnabledTest_UseCFE extends IsEnabledTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analytics/send_event_test.dart
View file

@ -10,7 +10,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SendEventTest);
defineReflectiveTests(SendEventTest_PreviewDart2);
defineReflectiveTests(SendEventTest_UseCFE);
});
}
@ -32,7 +32,7 @@ class SendEventTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class SendEventTest_PreviewDart2 extends SendEventTest {
class SendEventTest_UseCFE extends SendEventTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/analytics/send_timing_test.dart
View file

@ -10,7 +10,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SendTimingTest);
defineReflectiveTests(SendTimingTest_PreviewDart2);
defineReflectiveTests(SendTimingTest_UseCFE);
});
}
@ -32,7 +32,7 @@ class SendTimingTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class SendTimingTest_PreviewDart2 extends SendTimingTest {
class SendTimingTest_UseCFE extends SendTimingTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/completion/get_suggestions_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetSuggestionsTest);
defineReflectiveTests(GetSuggestionsTest_PreviewDart2);
defineReflectiveTests(GetSuggestionsTest_UseCFE);
});
}
@ -119,7 +119,7 @@ main() {
}
@reflectiveTest
class GetSuggestionsTest_PreviewDart2 extends GetSuggestionsTest {
class GetSuggestionsTest_UseCFE extends GetSuggestionsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetDiagnosticsTest);
defineReflectiveTests(GetDiagnosticsTest_PreviewDart2);
defineReflectiveTests(GetDiagnosticsTest_UseCFE);
});
}
@ -31,7 +31,7 @@ class GetDiagnosticsTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class GetDiagnosticsTest_PreviewDart2 extends GetDiagnosticsTest {
class GetDiagnosticsTest_UseCFE extends GetDiagnosticsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetServerPortTest);
defineReflectiveTests(GetServerPortTest_PreviewDart2);
defineReflectiveTests(GetServerPortTest_UseCFE);
});
}
@ -38,7 +38,7 @@ class GetServerPortTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class GetServerPortTest_PreviewDart2 extends GetServerPortTest {
class GetServerPortTest_UseCFE extends GetServerPortTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/format_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(FormatTest);
defineReflectiveTests(FormatTest_PreviewDart2);
defineReflectiveTests(FormatTest_UseCFE);
});
}
@ -81,7 +81,7 @@ class Class1 {
}
@reflectiveTest
class FormatTest_PreviewDart2 extends FormatTest {
class FormatTest_UseCFE extends FormatTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/get_assists_test.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetAssistsTest);
defineReflectiveTests(GetAssistsTest_PreviewDart2);
defineReflectiveTests(GetAssistsTest_UseCFE);
});
}
@ -53,9 +53,9 @@ Future f;
}
@reflectiveTest
class GetAssistsTest_PreviewDart2 extends GetAssistsTest {
class GetAssistsTest_UseCFE extends GetAssistsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

7
pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetAvailableRefactoringsTest);
defineReflectiveTests(GetAvailableRefactoringsTest_PreviewDart2);
defineReflectiveTests(GetAvailableRefactoringsTest_UseCFE);
});
}
@ -38,8 +38,7 @@ void foo() { }
}
@reflectiveTest
class GetAvailableRefactoringsTest_PreviewDart2
extends GetAvailableRefactoringsTest {
class GetAvailableRefactoringsTest_UseCFE extends GetAvailableRefactoringsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/get_fixes_test.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetFixesTest);
defineReflectiveTests(GetFixesTest_PreviewDart2);
defineReflectiveTests(GetFixesTest_UseCFE);
});
}
@ -63,9 +63,9 @@ Future f;
}
@reflectiveTest
class GetFixesTest_PreviewDart2 extends GetFixesTest {
class GetFixesTest_UseCFE extends GetFixesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

6
pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetPostfixCompletionTest);
defineReflectiveTests(GetPostfixCompletionTest_PreviewDart2);
defineReflectiveTests(GetPostfixCompletionTest_UseCFE);
});
}
@ -53,7 +53,7 @@ void foo() { }
}
@reflectiveTest
class GetPostfixCompletionTest_PreviewDart2 extends GetPostfixCompletionTest {
class GetPostfixCompletionTest_UseCFE extends GetPostfixCompletionTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/get_refactoring_test.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetRefactoringTest);
defineReflectiveTests(GetRefactoringTest_PreviewDart2);
defineReflectiveTests(GetRefactoringTest_UseCFE);
});
}
@ -69,9 +69,9 @@ void bar() {
}
@reflectiveTest
class GetRefactoringTest_PreviewDart2 extends GetRefactoringTest {
class GetRefactoringTest_UseCFE extends GetRefactoringTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

7
pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetStatementCompletionTest);
defineReflectiveTests(GetStatementCompletionTest_PreviewDart2);
defineReflectiveTests(GetStatementCompletionTest_UseCFE);
});
}
@ -55,10 +55,9 @@ void foo() { }''');
}
@reflectiveTest
class GetStatementCompletionTest_PreviewDart2
extends GetStatementCompletionTest {
class GetStatementCompletionTest_UseCFE extends GetStatementCompletionTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

7
pkg/analysis_server/test/integration/edit/import_elements_test.dart
View file

@ -16,8 +16,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisGetImportElementsIntegrationTest);
defineReflectiveTests(
AnalysisGetImportElementsIntegrationTest_PreviewDart2);
defineReflectiveTests(AnalysisGetImportElementsIntegrationTest_UseCFE);
});
}
@ -141,8 +140,8 @@ class C {}
}
@reflectiveTest
class AnalysisGetImportElementsIntegrationTest_PreviewDart2
class AnalysisGetImportElementsIntegrationTest_UseCFE
extends AnalysisGetImportElementsIntegrationTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(IsPostfixCompletionApplicableTest);
defineReflectiveTests(IsPostfixCompletionApplicableTest_PreviewDart2);
defineReflectiveTests(IsPostfixCompletionApplicableTest_UseCFE);
});
}
@ -42,8 +42,8 @@ void foo() { }
}
@reflectiveTest
class IsPostfixCompletionApplicableTest_PreviewDart2
class IsPostfixCompletionApplicableTest_UseCFE
extends IsPostfixCompletionApplicableTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ListPostfixCompletionTemplatesTest);
defineReflectiveTests(ListPostfixCompletionTemplatesTest_PreviewDart2);
defineReflectiveTests(ListPostfixCompletionTemplatesTest_UseCFE);
});
}
@ -42,8 +42,8 @@ void foo() { }
}
@reflectiveTest
class ListPostfixCompletionTemplatesTest_PreviewDart2
class ListPostfixCompletionTemplatesTest_UseCFE
extends ListPostfixCompletionTemplatesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/organize_directives_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(OrganizeDirectivesTest);
defineReflectiveTests(OrganizeDirectivesTest_PreviewDart2);
defineReflectiveTests(OrganizeDirectivesTest_UseCFE);
});
}
@ -77,7 +77,7 @@ int minified(int x, int y) => min(x, y);
}
@reflectiveTest
class OrganizeDirectivesTest_PreviewDart2 extends OrganizeDirectivesTest {
class OrganizeDirectivesTest_UseCFE extends OrganizeDirectivesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/edit/sort_members_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SortMembersTest);
defineReflectiveTests(SortMembersTest_PreviewDart2);
defineReflectiveTests(SortMembersTest_UseCFE);
});
}
@ -65,7 +65,7 @@ int bar;
}
@reflectiveTest
class SortMembersTest_PreviewDart2 extends SortMembersTest {
class SortMembersTest_UseCFE extends SortMembersTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/execution/create_context_test.dart
View file

@ -10,7 +10,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(CreateContextTest);
defineReflectiveTests(CreateContextTest_PreviewDart2);
defineReflectiveTests(CreateContextTest_UseCFE);
});
}
@ -25,7 +25,7 @@ class CreateContextTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class CreateContextTest_PreviewDart2 extends CreateContextTest {
class CreateContextTest_UseCFE extends CreateContextTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/execution/delete_context_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(DeleteContextTest);
defineReflectiveTests(DeleteContextTest_PreviewDart2);
defineReflectiveTests(DeleteContextTest_UseCFE);
});
}
@ -44,7 +44,7 @@ class DeleteContextTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class DeleteContextTest_PreviewDart2 extends DeleteContextTest {
class DeleteContextTest_UseCFE extends DeleteContextTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/execution/map_uri_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(MapUriTest);
defineReflectiveTests(MapUriTest_PreviewDart2);
defineReflectiveTests(MapUriTest_UseCFE);
});
}
@ -41,7 +41,7 @@ class MapUriTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class MapUriTest_PreviewDart2 extends MapUriTest {
class MapUriTest_UseCFE extends MapUriTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart
View file

@ -10,7 +10,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetSubscriptionsTest);
defineReflectiveTests(SetSubscriptionsTest_PreviewDart2);
defineReflectiveTests(SetSubscriptionsTest_UseCFE);
});
}
@ -24,7 +24,7 @@ class SetSubscriptionsTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class SetSubscriptionsTest_PreviewDart2 extends SetSubscriptionsTest {
class SetSubscriptionsTest_UseCFE extends SetSubscriptionsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetKytheEntriesTest);
defineReflectiveTests(GetKytheEntriesTest_PreviewDart2);
defineReflectiveTests(GetKytheEntriesTest_UseCFE);
});
}
@ -40,7 +40,7 @@ class Bar {
}
@reflectiveTest
class GetKytheEntriesTest_PreviewDart2 extends GetKytheEntriesTest {
class GetKytheEntriesTest_UseCFE extends GetKytheEntriesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/search/find_element_references_test.dart
View file

@ -13,7 +13,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(FindElementReferencesTest);
defineReflectiveTests(FindElementReferencesTest_PreviewDart2);
defineReflectiveTests(FindElementReferencesTest_UseCFE);
});
}
@ -73,9 +73,9 @@ main() {
}
@reflectiveTest
class FindElementReferencesTest_PreviewDart2 extends FindElementReferencesTest {
class FindElementReferencesTest_UseCFE extends FindElementReferencesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

7
pkg/analysis_server/test/integration/search/find_member_declarations_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(FindMemberDeclarationsTest);
defineReflectiveTests(FindMemberDeclarationsTest_PreviewDart2);
defineReflectiveTests(FindMemberDeclarationsTest_UseCFE);
});
}
@ -52,8 +52,7 @@ class Foo {
}
@reflectiveTest
class FindMemberDeclarationsTest_PreviewDart2
extends FindMemberDeclarationsTest {
class FindMemberDeclarationsTest_UseCFE extends FindMemberDeclarationsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/search/find_member_references_test.dart
View file

@ -13,7 +13,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(FindMemberReferencesTest);
defineReflectiveTests(FindMemberReferencesTest_PreviewDart2);
defineReflectiveTests(FindMemberReferencesTest_UseCFE);
});
}
@ -55,9 +55,9 @@ class Foo {
}
@reflectiveTest
class FindMemberReferencesTest_PreviewDart2 extends FindMemberReferencesTest {
class FindMemberReferencesTest_UseCFE extends FindMemberReferencesTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

7
pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart
View file

@ -11,7 +11,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(FindTopLevelDeclarationsTest);
defineReflectiveTests(FindTopLevelDeclarationsTest_PreviewDart2);
defineReflectiveTests(FindTopLevelDeclarationsTest_UseCFE);
});
}
@ -57,8 +57,7 @@ class Foo {
}
@reflectiveTest
class FindTopLevelDeclarationsTest_PreviewDart2
extends FindTopLevelDeclarationsTest {
class FindTopLevelDeclarationsTest_UseCFE extends FindTopLevelDeclarationsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart
View file

@ -14,7 +14,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetTypeHierarchyTest);
defineReflectiveTests(GetTypeHierarchyTest_PreviewDart2);
defineReflectiveTests(GetTypeHierarchyTest_UseCFE);
});
}
@ -275,9 +275,9 @@ class HierarchyResults {
}
@reflectiveTest
class GetTypeHierarchyTest_PreviewDart2 extends GetTypeHierarchyTest {
class GetTypeHierarchyTest_UseCFE extends GetTypeHierarchyTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
@override
@failingTest

6
pkg/analysis_server/test/integration/server/get_version_test.dart
View file

@ -9,7 +9,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetVersionTest);
defineReflectiveTests(GetVersionTest_PreviewDart2);
defineReflectiveTests(GetVersionTest_UseCFE);
});
}
@ -21,7 +21,7 @@ class GetVersionTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class GetVersionTest_PreviewDart2 extends GetVersionTest {
class GetVersionTest_UseCFE extends GetVersionTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

7
pkg/analysis_server/test/integration/server/set_subscriptions_invalid_service_test.dart
View file

@ -10,7 +10,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetSubscriptionsInvalidTest);
defineReflectiveTests(SetSubscriptionsInvalidTest_PreviewDart2);
defineReflectiveTests(SetSubscriptionsInvalidTest_UseCFE);
});
}
@ -31,8 +31,7 @@ class SetSubscriptionsInvalidTest
}
@reflectiveTest
class SetSubscriptionsInvalidTest_PreviewDart2
extends SetSubscriptionsInvalidTest {
class SetSubscriptionsInvalidTest_UseCFE extends SetSubscriptionsInvalidTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/server/set_subscriptions_test.dart
View file

@ -13,7 +13,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(SetSubscriptionsTest);
defineReflectiveTests(SetSubscriptionsTest_PreviewDart2);
defineReflectiveTests(SetSubscriptionsTest_UseCFE);
});
}
@ -74,7 +74,7 @@ main() {
}
@reflectiveTest
class SetSubscriptionsTest_PreviewDart2 extends SetSubscriptionsTest {
class SetSubscriptionsTest_UseCFE extends SetSubscriptionsTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/server/shutdown_test.dart
View file

@ -12,7 +12,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ShutdownTest);
defineReflectiveTests(ShutdownTest_PreviewDart2);
defineReflectiveTests(ShutdownTest_UseCFE);
});
}
@ -32,7 +32,7 @@ class ShutdownTest extends AbstractAnalysisServerIntegrationTest {
}
@reflectiveTest
class ShutdownTest_PreviewDart2 extends ShutdownTest {
class ShutdownTest_UseCFE extends ShutdownTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

6
pkg/analysis_server/test/integration/server/status_test.dart
View file

@ -13,7 +13,7 @@ import '../support/integration_tests.dart';
main() {
defineReflectiveSuite(() {
defineReflectiveTests(StatusTest);
defineReflectiveTests(StatusTest_PreviewDart2);
defineReflectiveTests(StatusTest_UseCFE);
});
}
@ -51,7 +51,7 @@ main() {
}
@reflectiveTest
class StatusTest_PreviewDart2 extends StatusTest {
class StatusTest_UseCFE extends StatusTest {
@override
bool get usePreviewDart2 => true;
bool get useCFE => true;
}

16
pkg/analysis_server/test/integration/support/integration_tests.dart
View file

@ -253,10 +253,10 @@ abstract class AbstractAnalysisServerIntegrationTest
}
/**
* Whether to run integration tests with the --preview-dart-2 flag.
* Whether to run integration tests with the --use-cfe flag.
*/
// TODO(devoncarew): Remove this when --preview-dart-2 goes away.
bool get usePreviewDart2 => false;
// TODO(devoncarew): Remove this when --use-cfe goes away.
bool get useCFE => false;
/**
* Start [server].
@ -265,13 +265,13 @@ abstract class AbstractAnalysisServerIntegrationTest
bool checked: true,
int diagnosticPort,
int servicesPort,
bool previewDart2: false,
bool cfe: false,
}) {
return server.start(
checked: checked,
diagnosticPort: diagnosticPort,
servicesPort: servicesPort,
previewDart2: previewDart2 || usePreviewDart2);
useCFE: cfe || useCFE);
}
/**
@ -669,7 +669,7 @@ class Server {
bool profileServer: false,
String sdkPath,
int servicesPort,
bool previewDart2: false,
bool useCFE: false,
bool useAnalysisHighlight2: false,
}) async {
if (_process != null) {
@ -724,8 +724,8 @@ class Server {
if (useAnalysisHighlight2) {
arguments.add('--useAnalysisHighlight2');
}
if (previewDart2) {
arguments.add('--preview-dart-2');
if (useCFE) {
arguments.add('--use-cfe');
}
// TODO(devoncarew): We could experiment with instead launching the analysis
// server in a separate isolate. This would make it easier to debug the

11
pkg/analyzer/lib/src/context/builder.dart
View file

@ -131,10 +131,15 @@ class ContextBuilder {
FileContentOverlay fileContentOverlay;
/**
* Whether to enable the Dart 2.0 Front End.
* Whether to enable the Dart 2.0 preview.
*/
bool previewDart2 = false;
/**
* Whether to enable the Dart 2.0 Common Front End implementation.
*/
bool useCFE = false;
/**
* Initialize a newly created builder to be ready to build a context rooted in
* the directory with the given [rootDirectoryPath].
@ -175,7 +180,7 @@ class ContextBuilder {
// The folder with `vm_platform_strong.dill`, which has required patches.
Folder kernelPlatformFolder;
if (previewDart2) {
if (useCFE) {
DartSdk sdk = sf.dartSdk;
if (sdk is FolderBasedDartSdk) {
var binariesPath = computePlatformBinariesPath(sdk.directory.path);
@ -194,7 +199,7 @@ class ContextBuilder {
contextRoot,
sf,
options,
enableKernelDriver: previewDart2,
enableKernelDriver: useCFE,
kernelPlatformFolder: kernelPlatformFolder);
// temporary plugin support:
if (onCreateAnalysisDriver != null) {

2
pkg/analyzer/lib/src/dart/analysis/driver.dart
View file

@ -1199,7 +1199,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
kernelContext.resynthesizer,
library,
enableKernelDriver: true,
previewDart2: _analysisOptions.useFastaParser,
useCFE: _analysisOptions.useFastaParser,
kernelDriver: _kernelDriver);
} else {
libraryContext = await _createLibraryContext(library);

13
pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
View file

@ -52,7 +52,7 @@ class LibraryAnalyzer {
final FileState _library;
final bool _enableKernelDriver;
final bool _previewDart2;
final bool _useCFE;
final KernelDriver _kernelDriver;
final bool Function(Uri) _isLibraryUri;
@ -81,11 +81,11 @@ class LibraryAnalyzer {
this._resynthesizer,
this._library,
{bool enableKernelDriver: false,
bool previewDart2: false,
bool useCFE: false,
KernelDriver kernelDriver})
: _typeProvider = _context.typeProvider,
_enableKernelDriver = enableKernelDriver,
_previewDart2 = previewDart2,
_useCFE = useCFE,
_kernelDriver = kernelDriver;
/**
@ -93,7 +93,7 @@ class LibraryAnalyzer {
*/
Future<Map<FileState, UnitAnalysisResult>> analyze() async {
return PerformanceStatistics.analysis.makeCurrentWhileAsync(() async {
if (_previewDart2) {
if (_useCFE) {
return await _analyze2();
} else {
return _analyze();
@ -513,9 +513,8 @@ class LibraryAnalyzer {
* Return a new parsed unresolved [CompilationUnit].
*/
CompilationUnit _parse(FileState file) {
AnalysisErrorListener errorListener = _previewDart2
? AnalysisErrorListener.NULL_LISTENER
: _getErrorListener(file);
AnalysisErrorListener errorListener =
_useCFE ? AnalysisErrorListener.NULL_LISTENER : _getErrorListener(file);
String content = file.content;
CompilationUnit unit = file.parse(errorListener);

2
pkg/analyzer/test/generated/checked_mode_compile_time_error_code_kernel_test.dart
View file

@ -19,7 +19,7 @@ class CheckedModeCompileTimeErrorCodeTest_Kernel
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@failingTest
@override

2
pkg/analyzer/test/generated/compile_time_error_code_kernel_test.dart
View file

@ -22,7 +22,7 @@ class CompileTimeErrorCodeTest_Kernel extends CompileTimeErrorCodeTest_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest

2
pkg/analyzer/test/generated/error_suppression_kernel_test.dart
View file

@ -18,7 +18,7 @@ class ErrorSuppressionTest_Kernel extends ErrorSuppressionTest_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest

2
pkg/analyzer/test/generated/hint_code_kernel_test.dart
View file

@ -18,7 +18,7 @@ class HintCodeTest_Kernel extends HintCodeTest_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@failingTest
@override

2
pkg/analyzer/test/generated/invalid_code_kernel_test.dart
View file

@ -21,7 +21,7 @@ class InvalidCodeTest_Kernel extends InvalidCodeTest {
bool get enableNewAnalysisDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@failingTest
@override

2
pkg/analyzer/test/generated/non_error_resolver_kernel_test.dart
View file

@ -32,7 +32,7 @@ class NonErrorResolverTest_Kernel extends NonErrorResolverTest_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest

2
pkg/analyzer/test/generated/non_hint_code_kernel_test.dart
View file

@ -35,7 +35,7 @@ class NonHintCodeTest_Kernel extends NonHintCodeTest_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@failingTest
@override

2
pkg/analyzer/test/generated/resolver_kernel_test.dart
View file

@ -18,7 +18,7 @@ class StrictModeTest_Kernel extends StrictModeTest_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest

4
pkg/analyzer/test/generated/resolver_test_case.dart
View file

@ -350,7 +350,7 @@ class ResolverTestCase extends EngineTestCase {
bool get enableNewAnalysisDriver => false;
bool get previewDart2 => false;
bool get useCFE => false;
/**
* Return a type provider that can be used to test the results of resolution.
@ -666,7 +666,7 @@ class ResolverTestCase extends EngineTestCase {
}
options ??= defaultAnalysisOptions;
if (enableNewAnalysisDriver) {
if (previewDart2) {
if (useCFE) {
(options as AnalysisOptionsImpl)
..strongMode = true
..useFastaParser = true;

2
pkg/analyzer/test/generated/static_type_analyzer_kernel_test.dart
View file

@ -18,7 +18,7 @@ class StaticTypeAnalyzer2Test_Kernel extends StaticTypeAnalyzer2Test_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest

4
pkg/analyzer/test/generated/static_type_warning_code_kernel_test.dart
View file

@ -25,7 +25,7 @@ class StaticTypeWarningCodeTest_Kernel
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest
@ -1049,7 +1049,7 @@ class StrongModeStaticTypeWarningCodeTest_Kernel
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest

2
pkg/analyzer/test/generated/static_warning_code_kernel_test.dart
View file

@ -25,7 +25,7 @@ class StaticWarningCodeTest_Kernel extends StaticWarningCodeTest_Driver {
bool get enableKernelDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest

6
pkg/analyzer/test/generated/strong_mode_kernel_test.dart
View file

@ -33,7 +33,7 @@ class StrongModeLocalInferenceTest_Kernel extends StrongModeLocalInferenceTest {
bool get enableNewAnalysisDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest
@ -278,7 +278,7 @@ class StrongModeStaticTypeAnalyzer2Test_Kernel
bool get enableNewAnalysisDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
test_futureOr_promotion3() async {
@ -472,5 +472,5 @@ class StrongModeTypePropagationTest_Kernel
bool get enableNewAnalysisDriver => true;
@override
bool get previewDart2 => true;
bool get useCFE => true;
}

13
pkg/analyzer/test/src/dart/analysis/base.dart
View file

@ -68,9 +68,14 @@ class BaseAnalysisDriverTest {
bool get disableChangesAndCacheAllResults => false;
/**
* Whether to enable the Dart 2.0 Front End.
* Whether to enable the Dart 2.0 preview.
*/
bool get previewDart2 => false;
bool previewDart2 = false;
/**
* Whether to enable the Dart 2.0 Common Front End.
*/
bool useCFE = false;
void addTestFile(String content, {bool priority: false}) {
testCode = content;
@ -100,13 +105,13 @@ class BaseAnalysisDriverTest {
createAnalysisOptions(),
disableChangesAndCacheAllResults: disableChangesAndCacheAllResults,
externalSummaries: externalSummaries,
enableKernelDriver: previewDart2);
enableKernelDriver: useCFE);
}
AnalysisOptionsImpl createAnalysisOptions() => new AnalysisOptionsImpl()
..strongMode = true
..enableUriInPartOf = true
..useFastaParser = previewDart2;
..useFastaParser = useCFE;
int findOffset(String search) {
int offset = testCode.indexOf(search);

4
pkg/analyzer/test/src/dart/analysis/driver_kernel_test.dart
View file

@ -30,7 +30,7 @@ void _fail(String message) {
@reflectiveTest
class AnalysisDriverResolutionTest_Kernel extends AnalysisDriverResolutionTest {
@override
bool get previewDart2 => true;
bool get useCFE => true;
@override
@failingTest
@ -43,7 +43,7 @@ class AnalysisDriverResolutionTest_Kernel extends AnalysisDriverResolutionTest {
@reflectiveTest
class AnalysisDriverTest_Kernel extends AnalysisDriverTest {
@override
bool get previewDart2 => true;
bool get useCFE => true;
// @failingTest
// @potentialAnalyzerProblem

34
pkg/analyzer/test/src/dart/analysis/driver_test.dart
View file

@ -1693,7 +1693,7 @@ main() {
TypeName typeName = statement.variables.type;
expect(typeName.type, isUndefinedType);
if (previewDart2) {
if (useCFE) {
expect(typeName.typeArguments.arguments[0].type, isUndefinedType);
} else {
expect(typeName.typeArguments.arguments[0].type, typeProvider.intType);
@ -2124,7 +2124,7 @@ main() {
PrefixedIdentifier typeIdentifier = typeName.name;
expect(typeIdentifier.staticElement, same(cElement));
if (previewDart2) {
if (useCFE) {
expect(typeIdentifier.staticType, cTypeInt);
} else {
expect(typeIdentifier.staticType, cTypeDynamic);
@ -2153,7 +2153,7 @@ main() {
PrefixedIdentifier typeIdentifier = typeName.name;
expect(typeIdentifier.staticElement, cElement);
if (previewDart2) {
if (useCFE) {
expect(typeIdentifier.staticType, cTypeDouble);
} else {
expect(typeIdentifier.staticType, cTypeDynamic);
@ -2506,7 +2506,7 @@ void main() {
expect(fInvocation.methodName.staticElement, same(fElement));
expect(fInvocation.staticType, typeProvider.intType);
// TODO(scheglov) We don't support invoke types well.
// if (previewDart2) {
// if (useCFE) {
// String fInstantiatedType = '(int, String) → int';
// expect(fInvocation.methodName.staticType.toString(), fInstantiatedType);
// expect(fInvocation.staticInvokeType.toString(), fInstantiatedType);
@ -3234,7 +3234,7 @@ class C<T, U> {
var invokeTypeStr = '(int) → void';
expect(invocation.staticType.toString(), 'void');
expect(invocation.staticInvokeType.toString(), invokeTypeStr);
if (previewDart2) {
if (useCFE) {
expect(invocation.methodName.staticElement, same(mElement));
expect(invocation.methodName.staticType.toString(), invokeTypeStr);
} else {
@ -3270,12 +3270,12 @@ class C<T> {
var invokeTypeStr = '(int, double) → Map<int, double>';
expect(invocation.staticType.toString(), 'Map<int, double>');
expect(invocation.staticInvokeType.toString(), invokeTypeStr);
if (previewDart2) {
if (useCFE) {
expect(invocation.methodName.staticElement, same(mElement));
expect(invocation.methodName.staticType.toString(), invokeTypeStr);
}
if (previewDart2) {
if (useCFE) {
expect(arguments[0].staticParameterElement, isNull);
expect(arguments[1].staticParameterElement, isNull);
} else {
@ -3338,7 +3338,7 @@ class C {
ExpressionStatement statement = fooStatements[0];
MethodInvocation invocation = statement.expression;
expect(invocation.methodName.staticElement, same(fElement.getter));
if (previewDart2) {
if (useCFE) {
_assertDynamicFunctionType(invocation.staticInvokeType);
} else {
expect(invocation.staticInvokeType, DynamicTypeImpl.instance);
@ -3372,7 +3372,7 @@ class C {
ExpressionStatement statement = fooStatements[0];
MethodInvocation invocation = statement.expression;
expect(invocation.methodName.staticElement, same(fElement));
if (previewDart2) {
if (useCFE) {
_assertDynamicFunctionType(invocation.staticInvokeType);
} else {
expect(invocation.staticInvokeType, DynamicTypeImpl.instance);
@ -3534,7 +3534,7 @@ class C {
var invokeTypeStr = '(int) → void';
expect(invocation.staticType.toString(), 'void');
expect(invocation.staticInvokeType.toString(), invokeTypeStr);
if (!previewDart2) {
if (!useCFE) {
expect(invocation.staticInvokeType.element, same(mElement));
}
expect(invocation.methodName.staticElement, same(mElement));
@ -3558,7 +3558,7 @@ class C {
var invokeTypeStr = '(int) → void';
expect(invocation.staticType.toString(), 'void');
expect(invocation.staticInvokeType.toString(), invokeTypeStr);
if (!previewDart2) {
if (!useCFE) {
expect(invocation.staticInvokeType.element, same(mElement));
}
expect(invocation.methodName.staticElement, same(mElement));
@ -3664,7 +3664,7 @@ void f<T, U>(T a, U b) {}
List<Expression> arguments = invocation.argumentList.arguments;
expect(invocation.methodName.staticElement, same(fElement));
if (previewDart2) {
if (useCFE) {
expect(invocation.methodName.staticType.toString(), fTypeString);
}
expect(invocation.staticType, VoidTypeImpl.instance);
@ -3684,7 +3684,7 @@ void f<T, U>(T a, U b) {}
List<Expression> arguments = invocation.argumentList.arguments;
expect(invocation.methodName.staticElement, same(fElement));
if (previewDart2) {
if (useCFE) {
expect(invocation.methodName.staticType.toString(), fTypeString);
}
expect(invocation.staticType, VoidTypeImpl.instance);
@ -4625,7 +4625,7 @@ enum MyEnum {
SimpleIdentifier dName = enumNode.name;
expect(dName.staticElement, same(enumElement));
if (previewDart2) {
if (useCFE) {
expect(dName.staticType, typeProvider.typeType);
}
@ -5463,13 +5463,13 @@ typedef void F(int p);
}
/// Assert that the [argument] is associated with the [expectedParameter],
/// if [previewDart2] is `null`. If the [argument] is a [NamedExpression],
/// if [useCFE] is `null`. If the [argument] is a [NamedExpression],
/// the name must be resolved to the parameter in both cases.
void _assertArgumentToParameter(
Expression argument, ParameterElement expectedParameter,
{DartType parameterMemberType}) {
ParameterElement actualParameter = argument.staticParameterElement;
if (previewDart2) {
if (useCFE) {
expect(actualParameter, isNull);
if (argument is NamedExpression) {
SimpleIdentifier name = argument.name.label;
@ -5510,7 +5510,7 @@ typedef void F(int p);
/// Assert that the [type] is a function type `() -> dynamic`.
void _assertDynamicFunctionType(DartType type) {
if (previewDart2) {
if (useCFE) {
expect(type.toString(), '() → dynamic');
} else {
expect(type, DynamicTypeImpl.instance);

4
pkg/analyzer_cli/lib/src/driver.dart
View file

@ -643,7 +643,7 @@ class Driver implements CommandLineStarter {
PerformanceLog log = new PerformanceLog(null);
AnalysisDriverScheduler scheduler = new AnalysisDriverScheduler(log);
bool enableKernelDriver = options.previewDart2;
bool enableKernelDriver = options.useCFE;
file_system.Folder kernelPlatformBinariesFolder;
if (enableKernelDriver && options.dartSdkPlatformBinariesPath != null) {
kernelPlatformBinariesFolder =
@ -873,7 +873,7 @@ class Driver implements CommandLineStarter {
contextOptions.hint = !options.disableHints;
contextOptions.generateImplicitErrors = options.showPackageWarnings;
contextOptions.generateSdkErrors = options.showSdkWarnings;
if (options.previewDart2) {
if (options.useCFE) {
contextOptions.useFastaParser = true;
}

13
pkg/analyzer_cli/lib/src/options.dart
View file

@ -113,7 +113,10 @@ class CommandLineOptions {
/// (Or null if not enabled.)
final String perfReport;
/// Whether to enable the Dart 2.0 Front End.
/// Whether to enable the Dart 2.0 Common Front End.
final bool useCFE;
/// Whether to enable the Dart 2.0 Preview.
final bool previewDart2;
/// Batch mode (for unit testing)
@ -187,6 +190,7 @@ class CommandLineOptions {
log = args['log'],
machineFormat = args['format'] == 'machine',
perfReport = args['x-perf-report'],
useCFE = args['use-cfe'],
previewDart2 = args['preview-dart-2'],
batchMode = args['batch'],
showPackageWarnings = args['show-package-warnings'] ||
@ -514,8 +518,13 @@ class CommandLineOptions {
allowMultiple: true,
splitCommas: false,
hide: hide)
..addFlag('use-cfe',
help: 'Enable the Dart 2.0 Common Front End implementation.',
defaultsTo: false,
negatable: false,
hide: hide)
..addFlag('preview-dart-2',
help: 'Enable the Dart 2.0 Front End implementation.',
help: 'Enable the Dart 2.0 preview.',
defaultsTo: false,
negatable: false,
hide: hide);

45
pkg/analyzer_cli/test/driver_test.dart
View file

@ -31,10 +31,13 @@ main() {
defineReflectiveTests(BuildModeTest);
defineReflectiveTests(ExitCodesTest);
defineReflectiveTests(ExitCodesTest_PreviewDart2);
defineReflectiveTests(ExitCodesTest_UseCFE);
defineReflectiveTests(LinterTest);
defineReflectiveTests(LinterTest_PreviewDart2);
defineReflectiveTests(LinterTest_UseCFE);
defineReflectiveTests(OptionsTest);
defineReflectiveTests(OptionsTest_PreviewDart2);
defineReflectiveTests(OptionsTest_UseCFE);
}, name: 'Driver');
}
@ -52,6 +55,8 @@ class BaseTest {
bool get usePreviewDart2 => false;
bool get useCFE => false;
/// Start a driver for the given [source], optionally providing additional
/// [args] and an [options] file path. The value of [options] defaults to an
/// empty options file to avoid unwanted configuration from an otherwise
@ -70,6 +75,9 @@ class BaseTest {
if (usePreviewDart2) {
cmd.insert(0, '--preview-dart-2');
}
if (useCFE) {
cmd.insert(0, '--use-cfe');
}
await driver.start(cmd);
}
@ -611,6 +619,19 @@ class ExitCodesTest_PreviewDart2 extends ExitCodesTest {
// TODO(devoncarew): This test times out when used with @failingTest.
return new Future.error('failing test');
}
}
@reflectiveTest
class ExitCodesTest_UseCFE extends ExitCodesTest {
@override
bool get useCFE => true;
@override
@failingTest
test_fatalErrors() {
// TODO(devoncarew): This test times out when used with @failingTest.
return new Future.error('failing test');
}
@override
@failingTest
@ -724,6 +745,12 @@ class LinterTest_PreviewDart2 extends LinterTest {
bool get usePreviewDart2 => true;
}
@reflectiveTest
class LinterTest_UseCFE extends LinterTest {
@override
bool get useCFE => true;
}
@reflectiveTest
class OptionsTest extends BaseTest {
String get optionsFileName => AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE;
@ -788,10 +815,16 @@ class OptionsTest extends BaseTest {
expect(outSink.toString(), contains('Avoid empty else statements'));
}
@failingTest
test_previewDart2() async {
await drive('data/options_tests_project/test_file.dart',
args: ['--preview-dart-2']);
expect(driver.context.analysisOptions.useFastaParser, isFalse);
}
@failingTest
test_useCFE() async {
await drive('data/options_tests_project/test_file.dart',
args: ['--use-cfe']);
expect(driver.context.analysisOptions.useFastaParser, isTrue);
}
@ -835,6 +868,12 @@ class OptionsTest extends BaseTest {
class OptionsTest_PreviewDart2 extends OptionsTest {
@override
bool get usePreviewDart2 => true;
}
@reflectiveTest
class OptionsTest_UseCFE extends OptionsTest {
@override
bool get useCFE => true;
@override
@failingTest
@ -856,6 +895,10 @@ class OptionsTest_PreviewDart2 extends OptionsTest {
@failingTest
test_withFlags_overrideFatalWarning() =>
super.test_withFlags_overrideFatalWarning();
@override
@failingTest
test_previewDart2() => super.test_previewDart2();
}
class TestSource implements Source {

9
pkg/analyzer_cli/test/options_test.dart
View file

@ -75,6 +75,7 @@ main() {
expect(options.warningsAreFatal, isFalse);
expect(options.strongMode, isFalse);
expect(options.lintsAreFatal, isFalse);
expect(options.useCFE, isFalse);
expect(options.previewDart2, isFalse);
});
@ -251,7 +252,13 @@ main() {
});
}
test('preview FE', () {
test('--use-cfe', () {
CommandLineOptions options =
CommandLineOptions.parse(['--use-cfe', 'foo.dart']);
expect(options.useCFE, isTrue);
});
test('--preview-dart-2', () {
CommandLineOptions options =
CommandLineOptions.parse(['--preview-dart-2', 'foo.dart']);
expect(options.previewDart2, isTrue);